From d332c9dd4b56b46f48461a6cc506472c2bff8190 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sun, 4 Oct 2015 13:50:57 -0500 Subject: [PATCH] Use drawable compat tint for file explore icons --- .../com/todoroo/astrid/files/FileExplore.java | 25 ++++++++++-------- .../drawable-hdpi/ic_folder_white_24dp.png | Bin 135 -> 0 bytes .../ic_insert_drive_file_white_24dp.png | Bin 153 -> 0 bytes .../drawable-xhdpi/ic_folder_white_24dp.png | Bin 181 -> 0 bytes .../ic_insert_drive_file_white_24dp.png | Bin 206 -> 0 bytes .../drawable-xxhdpi/ic_folder_white_24dp.png | Bin 245 -> 0 bytes .../ic_insert_drive_file_white_24dp.png | Bin 283 -> 0 bytes .../res/drawable/ic_folder_white_24dp.png | Bin 122 -> 0 bytes .../ic_insert_drive_file_white_24dp.png | Bin 133 -> 0 bytes src/main/res/values/attrs.xml | 3 --- src/main/res/values/styles_dark.xml | 3 --- src/main/res/values/styles_light.xml | 3 --- 12 files changed, 14 insertions(+), 20 deletions(-) delete mode 100644 src/main/res/drawable-hdpi/ic_folder_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_insert_drive_file_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_folder_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_insert_drive_file_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_insert_drive_file_white_24dp.png delete mode 100644 src/main/res/drawable/ic_folder_white_24dp.png delete mode 100644 src/main/res/drawable/ic_insert_drive_file_white_24dp.png diff --git a/src/main/java/com/todoroo/astrid/files/FileExplore.java b/src/main/java/com/todoroo/astrid/files/FileExplore.java index 118a04280..498276348 100644 --- a/src/main/java/com/todoroo/astrid/files/FileExplore.java +++ b/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( - fileList[position].icon, 0, 0, 0); - for (Drawable drawable : textView.getCompoundDrawables()) { - if (drawable != null) { - drawable.setAlpha(138); - } + int icon = fileList[position].icon; + Drawable drawable = getResources().getDrawable(icon, getTheme()); + if (activityPreferences.isDarkTheme()) { + Drawable wrapDrawable = DrawableCompat.wrap(drawable); + 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) diff --git a/src/main/res/drawable-hdpi/ic_folder_white_24dp.png b/src/main/res/drawable-hdpi/ic_folder_white_24dp.png deleted file mode 100644 index 02ea533a8d662e512843bf218e372653e95d843b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;pQnpsh{y4_S5I>?DDbdcG|@|k0wldT1B8K8f~SjPh{y4_XAbf<81OJ3(CJ7} zndX``b76v-N7DYNg?AXzx0$@j_%O$-MDb9#M4)m=#h>FoD;{~Q*wnG^Q^%Sa9jkV9 zthk}E_JdQ<#r;ZwuA-qP*1MK2|9P?TocWEMO!)@USli?GV)cP`F?hQAxvXpz2)3<9-DOK6&2^5E;t7@iOv_Z za^ku1A-hLl9mAHDjh3bd#2aH97>pYj7@1i1Fnhmp-(Sr7N?SnU?z8GoH}30QFuL9E fEIT*+)p6OLF7v?Cmm9c&?qKkA^>bP0l+XkK)+RzI diff --git a/src/main/res/drawable-xhdpi/ic_insert_drive_file_white_24dp.png b/src/main/res/drawable-xhdpi/ic_insert_drive_file_white_24dp.png deleted file mode 100644 index 798ebd4e25f68b658c82e773eea97bd2ad412f17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0Dsh%#5ArXh)UUTGX4&Z5dST1#X z_fmE(jjwTCSC_smS-D$9cp}$l`2@QYT1!{h^YDMEIJ_$LxwOxRqkmdKI;Vst E0NwCNssI20 diff --git a/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png deleted file mode 100644 index b93d5a1e4a48fb9cddfa530aacfc84e5ea4ad9c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw_ISEDhGg7(d&7~dDL|z4q4_1- z7ebF0dKZ*BYIUwt;W*;>)jV%O+J|}OmjAiz^vX--1bb;NmdKI;Vst0GcUV@&Et; diff --git a/src/main/res/drawable-xxhdpi/ic_insert_drive_file_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_insert_drive_file_white_24dp.png deleted file mode 100644 index f3e153b45eb7886c314afd8642bc9018c1f2b5bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw9(lSrhGg7(d+8wOAqSC`hqkR( z1O(pr7kRR-^fM4B-pJrB!18rLU;5WcwbqN9K8JrW^zk~kQ@@Q%*UUm`d)(nn1I4KI z5$WBNZm6sYkec37%CT|!!~%}SX+}cp1pU2?gz^k0^oX!`dZ;RJuH;csnA-GWNs++J zBMgC_G6EBiFkSSp5$HU^66g_g!CF(k6j7})P zi3R_eVwcPdw#%5()K(Lq&bsyI0x4_Bbf>AG4m-Kby09c-#l^%UGs{zXGMryqJkPLY Y&L2`{{(qt) zvm)<`Q=Hj9{dp?B-k)#6`~UxbmC(cg19_d}4r?#Evfm-&!|_RRhEx83m({x|$*?rj VKUyK^_-~+L44$rjF6*2Ung9auEG+;4 diff --git a/src/main/res/drawable/ic_insert_drive_file_white_24dp.png b/src/main/res/drawable/ic_insert_drive_file_white_24dp.png deleted file mode 100644 index b51ce3ed95a437af48d672cb4b8494807587c080..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1A5Ry@5R21q&u~5;q+UmdnXs1e(j>>FVdQ&MBb@07N}3VE_OC diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index bd05fbbd9..93e627759 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -33,9 +33,6 @@ - - - diff --git a/src/main/res/values/styles_dark.xml b/src/main/res/values/styles_dark.xml index ee5573fae..e99cdedf4 100644 --- a/src/main/res/values/styles_dark.xml +++ b/src/main/res/values/styles_dark.xml @@ -57,9 +57,6 @@ @color/dark_blue_theme_color @android:color/white #dddddd - @drawable/ic_arrow_back_white_24dp - @drawable/ic_folder_white_24dp - @drawable/ic_insert_drive_file_white_24dp \ No newline at end of file diff --git a/src/main/res/values/styles_light.xml b/src/main/res/values/styles_light.xml index c5020a989..8ba3e137b 100644 --- a/src/main/res/values/styles_light.xml +++ b/src/main/res/values/styles_light.xml @@ -57,9 +57,6 @@ @color/dark_blue_theme_color @android:color/black #dddddd - @drawable/ic_arrow_back_black_24dp - @drawable/ic_folder_black_24dp - @drawable/ic_insert_drive_file_black_24dp \ No newline at end of file