From b7eec4948d2d78c35eb4806106fed2ca3a947b3a Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Sat, 13 Oct 2018 12:40:21 +0200
Subject: [PATCH] Fix issue in light mode + removing timeline in settings

---
 .../mastodon/drawers/StatusListAdapter.java      | 16 ++++++++++------
 .../mastodon/fragments/SettingsFragment.java     |  2 --
 app/src/main/res/layout/drawer_status.xml        |  1 -
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index 6804d2823..57070b2b1 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -114,6 +114,7 @@ import fr.gouv.etalab.mastodon.sqlite.TempMuteDAO;
 import static fr.gouv.etalab.mastodon.activities.MainActivity.currentLocale;
 import static fr.gouv.etalab.mastodon.helper.Helper.THEME_BLACK;
 import static fr.gouv.etalab.mastodon.helper.Helper.THEME_DARK;
+import static fr.gouv.etalab.mastodon.helper.Helper.THEME_LIGHT;
 import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor;
 import static fr.gouv.etalab.mastodon.helper.Helper.getLiveInstance;
 
@@ -409,10 +410,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 status.setBookmarked(true);
             else
                 status.setBookmarked(false);
-            if( status.isBookmarked())
-                holder.status_bookmark.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_bookmark));
-            else
-                holder.status_bookmark.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_bookmark_border));
 
             if( status.isNew())
                 holder.new_element.setVisibility(View.VISIBLE);
@@ -500,8 +497,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 changeDrawableColor(context, R.drawable.ic_pin_drop, R.color.black);
                 changeDrawableColor(context, R.drawable.ic_photo,R.color.mastodonC4);
                 changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.mastodonC4);
-                changeDrawableColor(context, R.drawable.ic_translate,R.color.white);
-
+                changeDrawableColor(context, R.drawable.ic_translate,R.color.black);
+                changeDrawableColor(context, R.drawable.ic_bookmark,R.color.black);
+                changeDrawableColor(context, R.drawable.ic_bookmark_border,R.color.black);
                 holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.black));
                 holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.black));
                 holder.status_toot_date.setTextColor(ContextCompat.getColor(context, R.color.black));
@@ -509,6 +507,12 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 holder.status_account_displayname.setTextColor(ContextCompat.getColor(context, R.color.black));
             }
 
+            if( status.isBookmarked())
+                holder.status_bookmark.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_bookmark));
+            else
+                holder.status_bookmark.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_bookmark_border));
+
+
             //Redraws top icons (boost/reply)
             final float scale = context.getResources().getDisplayMetrics().density;
             if( status.getReblog() != null){
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
index 500aa2605..b889b8e0b 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
@@ -284,7 +284,6 @@ public class SettingsFragment extends Fragment {
                 if( getActivity() != null)
                     getActivity().recreate();
                 Intent intent = new Intent(context, MainActivity.class);
-                intent.putExtra(INTENT_ACTION, CHANGE_THEME_INTENT);
                 if(getActivity() != null)
                     getActivity().finish();
                 startActivity(intent);
@@ -304,7 +303,6 @@ public class SettingsFragment extends Fragment {
                 if( getActivity() != null)
                     getActivity().recreate();
                 Intent intent = new Intent(context, MainActivity.class);
-                intent.putExtra(INTENT_ACTION, CHANGE_THEME_INTENT);
                 if(getActivity() != null)
                     getActivity().finish();
                 startActivity(intent);
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 81f257a42..6ae01ba45 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -84,7 +84,6 @@
             <ImageButton
                 android:id="@+id/status_translate"
                 android:gravity="center"
-                android:tint="@android:color/white"
                 style="@style/Base.Widget.AppCompat.Button.Borderless"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"