From 61e047d7e929416b87af99f9c3a50b2e6a90ccd3 Mon Sep 17 00:00:00 2001
From: Andrea Torlaschi <runnerway@gmail.com>
Date: Thu, 4 Aug 2016 12:15:24 +0200
Subject: [PATCH] ImportKeys: Fix text color and refactoring

---
 .../ui/adapter/ImportKeysAdapterBinding.java  | 25 ++++++++++---------
 .../main/res/layout/import_keys_list_item.xml |  3 ---
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapterBinding.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapterBinding.java
index 82cb85328..59b87341a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapterBinding.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapterBinding.java
@@ -7,6 +7,7 @@ import android.graphics.Color;
 import android.widget.TextView;
 
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
 import org.sufficientlysecure.keychain.ui.util.Highlighter;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.LruCache;
@@ -30,10 +31,9 @@ public class ImportKeysAdapterBinding {
             userId = highlighter.highlight(userId);
         }
         textView.setText(userId);
+        textView.setTextColor(getColor(context, revokedOrExpired));
 
-        if (revokedOrExpired) {
-            textView.setTextColor(resources.getColor(R.color.key_flag_gray));
-        } else if (secret) {
+        if (secret) {
             textView.setTextColor(Color.RED);
         }
     }
@@ -49,11 +49,7 @@ public class ImportKeysAdapterBinding {
 
         Highlighter highlighter = getHighlighter(context, query);
         textView.setText(highlighter.highlight(userEmail));
-
-        if (revokedOrExpired) {
-            Resources resources = context.getResources();
-            textView.setTextColor(resources.getColor(R.color.key_flag_gray));
-        }
+        textView.setTextColor(getColor(context, revokedOrExpired));
     }
 
     @BindingAdapter({"app:keyId", "app:revokedOrExpired"})
@@ -63,11 +59,16 @@ public class ImportKeysAdapterBinding {
         if (keyId == null)
             keyId = "";
 
-        if (revokedOrExpired) {
-            Resources resources = context.getResources();
-            textView.setTextColor(resources.getColor(R.color.key_flag_gray));
-        }
         textView.setText(KeyFormattingUtils.beautifyKeyIdWithPrefix(keyId));
+        textView.setTextColor(getColor(context, revokedOrExpired));
+    }
+
+    private static int getColor(Context context, boolean revokedOrExpired) {
+        if (revokedOrExpired) {
+            return context.getResources().getColor(R.color.key_flag_gray);
+        } else {
+            return FormattingUtils.getColorFromAttr(context, R.attr.colorText);
+        }
     }
 
     private static LruCache<String, Highlighter> highlighterCache = new LruCache<>(1);
diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_item.xml b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
index 3aed07d21..227e819fe 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
@@ -53,7 +53,6 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textAppearance="?android:attr/textAppearanceMedium"
-                            android:textColor="?attr/colorText"
                             app:query="@{entry.query}"
                             app:revokedOrExpired="@{entry.revokedOrExpired}"
                             app:secret="@{entry.secretKey}"
@@ -64,7 +63,6 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="4dp"
                             android:textAppearance="?android:attr/textAppearanceSmall"
-                            android:textColor="?attr/colorText"
                             app:query="@{entry.query}"
                             app:revokedOrExpired="@{entry.revokedOrExpired}"
                             app:userEmail="@{entry.primaryUserId.email}" />
@@ -73,7 +71,6 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textAppearance="?android:attr/textAppearanceSmall"
-                            android:textColor="?attr/colorText"
                             app:keyId="@{entry.keyIdHex}"
                             app:revokedOrExpired="@{entry.revokedOrExpired}" />