Use drawable compat tint for file explore icons

src/main/java/com/todoroo/astrid/files/FileExplore.java

@@ -12,6 +12,7 @@ import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Environment;
+import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v7.app.AlertDialog;
 import android.view.View;
 import android.view.ViewGroup;
@@ -26,7 +27,6 @@ import org.tasks.R;
 import org.tasks.dialogs.DialogBuilder;
 import org.tasks.injection.InjectingAppCompatActivity;
 import org.tasks.preferences.ActivityPreferences;
-import org.tasks.preferences.ResourceResolver;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -54,7 +54,6 @@ public class FileExplore extends InjectingAppCompatActivity {
 
 	@Inject DialogBuilder dialogBuilder;
 	@Inject ActivityPreferences activityPreferences;
-	@Inject ResourceResolver resourceResolver;
 
 	private Item[] fileList;
 	private File path;
@@ -108,21 +107,21 @@ public class FileExplore extends InjectingAppCompatActivity {
 			String[] fList = path.list(filter);
 			fileList = new Item[fList.length];
 			for (int i = 0; i < fList.length; i++) {
-				fileList[i] = new Item(fList[i], resourceResolver.getResource(R.attr.ic_file));
+				fileList[i] = new Item(fList[i], R.drawable.ic_insert_drive_file_black_24dp);
 
 				// Convert into file path
 				File sel = new File(path, fList[i]);
 
 				// Set drawables
 				if (sel.isDirectory()) {
-					fileList[i].icon = resourceResolver.getResource(R.attr.ic_folder);
+					fileList[i].icon = R.drawable.ic_folder_black_24dp;
 				}
 			}
 
 			if (!firstLvl) {
 				Item temp[] = new Item[fileList.length + 1];
                 System.arraycopy(fileList, 0, temp, 1, fileList.length);
-				temp[0] = new Item(upString, resourceResolver.getResource(R.attr.ic_arrow_back));
+				temp[0] = new Item(upString, R.drawable.ic_arrow_back_black_24dp);
 				fileList = temp;
 			}
 		} else {
@@ -140,13 +139,17 @@ public class FileExplore extends InjectingAppCompatActivity {
 						.findViewById(android.R.id.text1);
 
 				// put the image on the text view
-				textView.setCompoundDrawablesWithIntrinsicBounds(
+				int icon = fileList[position].icon;
-						fileList[position].icon, 0, 0, 0);
+				Drawable drawable = getResources().getDrawable(icon, getTheme());
-				for (Drawable drawable : textView.getCompoundDrawables()) {
+				if (activityPreferences.isDarkTheme()) {
-					if (drawable != null) {
+					Drawable wrapDrawable = DrawableCompat.wrap(drawable);
-						drawable.setAlpha(138);
+					DrawableCompat.setTint(wrapDrawable, getResources().getColor(android.R.color.white));
-					}
+					drawable = wrapDrawable;
+				}
+				if (drawable != null) {
+					drawable.setAlpha(138);
 				}
+				textView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
 
 				// add margin between image and text (support various screen
 				// densities)

src/main/res/values/attrs.xml

@@ -33,9 +33,6 @@
     <attr name="separatorHeight" format="dimension" />
     <attr name="ic_action_discard" format="reference" />
     <attr name="popup_theme" format="reference" />
-    <attr name="ic_arrow_back" format="reference" />
-    <attr name="ic_folder" format="reference" />
-    <attr name="ic_file" format="reference" />
     <attr name="textfield_underline" format="reference" />
     <attr name="ic_cancel" format="reference" />
 

src/main/res/values/styles_dark.xml

@@ -57,9 +57,6 @@
         <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
         <item name="asTextColor">@android:color/white</item>
         <item name="asListDividerColor">#dddddd</item>
-        <item name="ic_arrow_back">@drawable/ic_arrow_back_white_24dp</item>
-        <item name="ic_folder">@drawable/ic_folder_white_24dp</item>
-        <item name="ic_file">@drawable/ic_insert_drive_file_white_24dp</item>
     </style>
 
 </resources>

src/main/res/values/styles_light.xml

@@ -57,9 +57,6 @@
         <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
         <item name="asTextColor">@android:color/black</item>
         <item name="asListDividerColor">#dddddd</item>
-        <item name="ic_arrow_back">@drawable/ic_arrow_back_black_24dp</item>
-        <item name="ic_folder">@drawable/ic_folder_black_24dp</item>
-        <item name="ic_file">@drawable/ic_insert_drive_file_black_24dp</item>
     </style>
 
 </resources>