From 3166350b9794b4f446061a9ae5bc754c3501e624 Mon Sep 17 00:00:00 2001 From: stom79 Date: Thu, 2 Nov 2017 15:55:14 +0100 Subject: [PATCH] Fixes some color issues --- .../mastodon/activities/BaseMainActivity.java | 28 ------------------ .../drawers/NotificationsListAdapter.java | 6 ++++ .../drawable-anydpi/ic_delete_floating.xml | 9 ++++++ .../res/drawable-hdpi/ic_delete_floating.png | Bin 0 -> 160 bytes .../res/drawable-ldpi/ic_delete_floating.png | Bin 0 -> 257 bytes .../res/drawable-mdpi/ic_delete_floating.png | Bin 0 -> 132 bytes .../res/drawable-xhdpi/ic_delete_floating.png | Bin 0 -> 161 bytes .../drawable-xxhdpi/ic_delete_floating.png | Bin 0 -> 210 bytes .../drawable-xxxhdpi/ic_delete_floating.png | Bin 0 -> 200 bytes app/src/main/res/layout/activity_main.xml | 2 +- .../main/res/layout/drawer_notification.xml | 1 - 11 files changed, 16 insertions(+), 30 deletions(-) create mode 100644 app/src/main/res/drawable-anydpi/ic_delete_floating.xml create mode 100644 app/src/main/res/drawable-hdpi/ic_delete_floating.png create mode 100644 app/src/main/res/drawable-ldpi/ic_delete_floating.png create mode 100644 app/src/main/res/drawable-mdpi/ic_delete_floating.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_delete_floating.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_delete_floating.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_delete_floating.png diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java index 60e190e9c..6534af263 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java @@ -992,34 +992,6 @@ public abstract class BaseMainActivity extends AppCompatActivity final NavigationView navigationView = findViewById(R.id.nav_view); unCheckAllMenuItems(navigationView); toot.setVisibility(View.VISIBLE); - //Manages theme for icon colors - SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); - if( theme == Helper.THEME_DARK){ - changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.dark_icon); - changeDrawableColor(getApplicationContext(), R.drawable.ic_more_horiz,R.color.dark_icon); - changeDrawableColor(getApplicationContext(), R.drawable.ic_public,R.color.dark_icon); - changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_open,R.color.dark_icon); - changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_outline,R.color.dark_icon); - changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.dark_icon); - changeDrawableColor(getApplicationContext(), R.drawable.ic_repeat,R.color.dark_icon); - changeDrawableColor(getApplicationContext(), R.drawable.ic_star_border,R.color.dark_icon); - changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.dark_text); - }else { - changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.black); - changeDrawableColor(getApplicationContext(), R.drawable.ic_more_horiz,R.color.black); - changeDrawableColor(getApplicationContext(), R.drawable.ic_public,R.color.black); - changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_open,R.color.black); - changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_outline,R.color.black); - changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.black); - changeDrawableColor(getApplicationContext(), R.drawable.ic_repeat,R.color.black); - changeDrawableColor(getApplicationContext(), R.drawable.ic_star_border,R.color.black); - changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.white); - changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.white); - changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.white); - } switch (viewPager.getCurrentItem()){ case 1: toot.setVisibility(View.GONE); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java index 5b8d519a9..2969ffac4 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java @@ -133,6 +133,12 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On String type = notification.getType(); String typeString = ""; int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); + + if (theme == THEME_DARK){ + holder.main_container_trans.setAlpha(.3f); + }else { + holder.main_container_trans.setAlpha(.1f); + } Drawable imgH = null; switch (type){ case "mention": diff --git a/app/src/main/res/drawable-anydpi/ic_delete_floating.xml b/app/src/main/res/drawable-anydpi/ic_delete_floating.xml new file mode 100644 index 000000000..f9213d2b5 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_delete_floating.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable-hdpi/ic_delete_floating.png b/app/src/main/res/drawable-hdpi/ic_delete_floating.png new file mode 100644 index 0000000000000000000000000000000000000000..161f62f9f5e313a2f5503b3f25cab3b0a45e0483 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i0wmS%+S~(D>7Fi*Ar-fh6C_qWs6X|ewP1#m z$Hs&I*$n1lzapRS_m3$u3*2u0kM(%U!Bh5kx@4295<^~uQO)IA@i?HB44$rj JF6*2Ung9Z_Kf(Y2 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-ldpi/ic_delete_floating.png b/app/src/main/res/drawable-ldpi/ic_delete_floating.png new file mode 100644 index 0000000000000000000000000000000000000000..7eca4c09593d2578248e1a4b0620cc11184b05f6 GIT binary patch literal 257 zcmV+c0sj7pP)MBEIo9^`@V04YKVZLJ)GeJ*W#4^06`qb zbv@(|8X~rEgj4C<$&0+?=pma+54naLJTx-c;5#x`4z-a>xGS@ykHmi)TKz2){TlMh zAz5w{IWP8;X-L1ow`9&J*#V-@KnOF9ko$qLqfh^?>i<0fvL14lQ8@f700000NkvXX Hu0mjfK1ps3 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_delete_floating.png b/app/src/main/res/drawable-mdpi/ic_delete_floating.png new file mode 100644 index 0000000000000000000000000000000000000000..6ca25e0d5179cb370fae46dbabac07e8451bfbd9 GIT binary patch literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|myggkULn>}1CoJInk^iOs{(okN z9q;!Gnq{{CztObKKrLM@J_V@Rp1+y|k0wldT1B8K8hNp{TNX4z>1PNA=hW|4Ewf~tb z9PIip^F(s-FKmRW+J}dc&f#K)gg?bl4l$?QfGI+ZB KxvXGl9FwM4~2@@2IO?EbEZ8$VV^l0oA zNg1{sDGJ{hra4=i)c+K0Kc;*yTjTJS7kf<%la6!xbSb>gY@O1Ta JS?83{1OP8KPn7@w literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_delete_floating.png b/app/src/main/res/drawable-xxxhdpi/ic_delete_floating.png new file mode 100644 index 0000000000000000000000000000000000000000..8a9c20320c4b9ee9a95faf93ed51e88a0f3f5ba3 GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw`aNA7Ln>~)y>Xhe!9jo}(0^8Q zoKJv>pQwxS4GppUT((6y+I6dxDtMTgC#Sl&Jn`7t^o?uP{3AQ3mvj`1dWy4f2q^qI z^t9^MHwGpU+o6Gh5sC34cEQz0opu*87{A&Dq%)e@1uRsZX{=dZw@UkL=bTG_ZS=2X m1=#FA_3CQGa%Yz>>& diff --git a/app/src/main/res/layout/drawer_notification.xml b/app/src/main/res/layout/drawer_notification.xml index 3363fba70..198f9215d 100644 --- a/app/src/main/res/layout/drawer_notification.xml +++ b/app/src/main/res/layout/drawer_notification.xml @@ -292,7 +292,6 @@