From f2566abdcd8ffe42da8d48ac88b910eacde86ddf Mon Sep 17 00:00:00 2001
From: J-Jamet <jamet.jeremy@outlook.com>
Date: Mon, 19 Mar 2018 16:20:38 +0100
Subject: [PATCH] Solve bug of icon information color

---
 .../fileselect/FileSelectAdapter.java            | 16 +++++++++++++---
 app/src/main/res/layout/file_row.xml             |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/keepassdroid/fileselect/FileSelectAdapter.java b/app/src/main/java/com/keepassdroid/fileselect/FileSelectAdapter.java
index 12e30af90..a95ade729 100644
--- a/app/src/main/java/com/keepassdroid/fileselect/FileSelectAdapter.java
+++ b/app/src/main/java/com/keepassdroid/fileselect/FileSelectAdapter.java
@@ -23,6 +23,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.net.Uri;
 import android.support.annotation.ColorInt;
+import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.util.TypedValue;
 import android.view.ContextMenu;
@@ -48,6 +49,8 @@ public class FileSelectAdapter extends RecyclerView.Adapter<FileSelectViewHolder
     private FileSelectClearListener fileSelectClearListener;
     private FileInformationShowListener fileInformationShowListener;
 
+    private @ColorInt
+    int defaultColor;
     private @ColorInt
     int warningColor;
 
@@ -60,16 +63,19 @@ public class FileSelectAdapter extends RecyclerView.Adapter<FileSelectViewHolder
         Resources.Theme theme = context.getTheme();
         theme.resolveAttribute(R.attr.colorAccentCompat, typedValue, true);
         warningColor = typedValue.data;
+        theme.resolveAttribute(android.R.attr.textColorPrimary, typedValue, true);
+        defaultColor = typedValue.data;
     }
 
+    @NonNull
     @Override
-    public FileSelectViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+    public FileSelectViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View view = inflater.inflate(R.layout.file_row, parent, false);
         return new FileSelectViewHolder(view);
     }
 
     @Override
-    public void onBindViewHolder(FileSelectViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull FileSelectViewHolder holder, int position) {
         FileSelectBean fileSelectBean = new FileSelectBean(context, listFiles.get(position));
         // Context menu creation
         holder.fileContainer.setOnCreateContextMenuListener(new ContextMenuBuilder(fileSelectBean));
@@ -87,6 +93,10 @@ public class FileSelectAdapter extends RecyclerView.Adapter<FileSelectViewHolder
             holder.fileInformation.setColorFilter(
                     warningColor,
                     android.graphics.PorterDuff.Mode.MULTIPLY);
+        } else {
+            holder.fileInformation.setColorFilter(
+                    defaultColor,
+                    android.graphics.PorterDuff.Mode.MULTIPLY);
         }
         // Click on information
         if (fileInformationShowListener != null)
@@ -154,7 +164,7 @@ public class FileSelectAdapter extends RecyclerView.Adapter<FileSelectViewHolder
 
         private FileSelectBean fileSelectBean;
 
-        public ContextMenuBuilder(FileSelectBean fileSelectBean) {
+        ContextMenuBuilder(FileSelectBean fileSelectBean) {
             this.fileSelectBean = fileSelectBean;
         }
 
diff --git a/app/src/main/res/layout/file_row.xml b/app/src/main/res/layout/file_row.xml
index 351c68e66..cda488e3a 100644
--- a/app/src/main/res/layout/file_row.xml
+++ b/app/src/main/res/layout/file_row.xml
@@ -47,5 +47,5 @@
         android:src="@drawable/ic_info_white_24dp"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:tint="?attr/colorPrimary"/>
+        android:tint="?android:attr/textColorPrimary"/>
 </RelativeLayout>
\ No newline at end of file