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 000000000..161f62f9f Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_delete_floating.png differ 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 000000000..7eca4c095 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_delete_floating.png differ 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 000000000..6ca25e0d5 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_delete_floating.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_delete_floating.png b/app/src/main/res/drawable-xhdpi/ic_delete_floating.png new file mode 100644 index 000000000..484ed5656 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_delete_floating.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_floating.png b/app/src/main/res/drawable-xxhdpi/ic_delete_floating.png new file mode 100644 index 000000000..7f845c5de Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_delete_floating.png differ 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 000000000..8a9c20320 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_delete_floating.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 465cc8338..838592635 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -125,7 +125,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" - app:srcCompat="@drawable/ic_delete" + app:srcCompat="@drawable/ic_delete_floating" tools:ignore="VectorDrawableCompat" /> 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 @@