From 647157dc5a9682aee113c9801705a932354f7573 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Sat, 16 Dec 2017 10:02:37 +0100
Subject: [PATCH] Fixes some color icons issues

---
 .../fr/gouv/etalab/mastodon/drawers/ListAdapter.java     | 9 +++++++++
 .../etalab/mastodon/drawers/SearchTootsListAdapter.java  | 7 +++++++
 app/src/main/res/layout/drawer_search.xml                | 2 --
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ListAdapter.java
index 9d2a4623c..ec7938b7f 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ListAdapter.java
@@ -19,8 +19,10 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -94,6 +96,7 @@ public class ListAdapter extends BaseAdapter implements OnListActionInterface {
         }
         SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
         int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
+
         if( theme == Helper.THEME_LIGHT){
             holder.search_container.setBackgroundResource(R.color.mastodonC3__);
             changeDrawableColor(context, R.drawable.ic_keyboard_arrow_right,R.color.black);
@@ -101,7 +104,13 @@ public class ListAdapter extends BaseAdapter implements OnListActionInterface {
             holder.search_container.setBackgroundResource(R.color.mastodonC1_);
             changeDrawableColor(context, R.drawable.ic_keyboard_arrow_right,R.color.dark_text);
         }
+        Drawable next = ContextCompat.getDrawable(context, R.drawable.ic_keyboard_arrow_right);
         holder.search_title.setText(list.getTitle());
+        assert next != null;
+        next.setBounds(0,0,100,100);
+        assert next != null;
+        holder.search_title.setCompoundDrawables(null, null, next, null);
+
         holder.search_container.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchTootsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchTootsListAdapter.java
index 1aa61d4a2..c5ac0d468 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchTootsListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchTootsListAdapter.java
@@ -20,7 +20,9 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -99,7 +101,12 @@ public class SearchTootsListAdapter extends BaseAdapter  {
             holder.search_container.setBackgroundResource(R.color.mastodonC1_);
             changeDrawableColor(context, R.drawable.ic_keyboard_arrow_right,R.color.dark_text);
         }
+        Drawable next = ContextCompat.getDrawable(context, R.drawable.ic_keyboard_arrow_right);
         holder.search_title.setText(search);
+        assert next != null;
+        next.setBounds(0,0,100,100);
+        holder.search_title.setCompoundDrawables(null, null, next, null);
+
         holder.search_container.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/res/layout/drawer_search.xml b/app/src/main/res/layout/drawer_search.xml
index 5d6bb6abf..9a3f32d9d 100644
--- a/app/src/main/res/layout/drawer_search.xml
+++ b/app/src/main/res/layout/drawer_search.xml
@@ -24,8 +24,6 @@
     android:paddingTop="5dp"
     android:orientation="vertical">
     <TextView
-        android:drawableRight="@drawable/ic_keyboard_arrow_right"
-        android:drawableEnd="@drawable/ic_keyboard_arrow_right"
         android:id="@+id/search_keyword"
         android:textSize="18sp"
         android:paddingBottom="10dp"