Make main text color themeable

4 files changed, 13 insertions, 8 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
index 85986a10a..cae82b445 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
@@ -244,7 +244,7 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
                 if (entry.isRevoked() || entry.isExpired()) {
                     uidView.setTextColor(getContext().getResources().getColor(R.color.key_flag_gray));
                 } else {
-                    uidView.setTextColor(getContext().getResources().getColor(R.color.black));
+                    uidView.setTextColor(FormattingUtils.getColorFromAttr(getContext(), R.attr.colorText));
                 }
 
                 holder.userIdsList.addView(uidView);
@@ -260,7 +260,7 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
                     if (entry.isRevoked() || entry.isExpired()) {
                         emailView.setTextColor(getContext().getResources().getColor(R.color.key_flag_gray));
                     } else {
-                        emailView.setTextColor(getContext().getResources().getColor(R.color.black));
+                        emailView.setTextColor(FormattingUtils.getColorFromAttr(getContext(), R.attr.colorText));
                     }
 
                     holder.userIdsList.addView(emailView);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
index ff3171ea1..8f5b97148 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
@@ -160,7 +160,7 @@ public class KeyAdapter extends CursorAdapter {
                     } else {
                         mSlinger.setVisibility(View.GONE);
                     }
-                    textColor = R.color.black;
+                    textColor = FormattingUtils.getColorFromAttr(context, R.attr.colorText);
                 } else {
                     // this is a public key - show if it's verified
                     if (item.mIsVerified) {
@@ -171,7 +171,7 @@ public class KeyAdapter extends CursorAdapter {
                         mStatus.setVisibility(View.VISIBLE);
                     }
                     mSlinger.setVisibility(View.GONE);
-                    textColor = R.color.black;
+                    textColor = FormattingUtils.getColorFromAttr(context, R.attr.colorText);
                 }
 
                 if (!enabled) {
diff --git a/OpenKeychain/src/main/res/values/attrs.xml b/OpenKeychain/src/main/res/values/attrs.xml
index 7865bae2e..17035f4b4 100644
--- a/OpenKeychain/src/main/res/values/attrs.xml
+++ b/OpenKeychain/src/main/res/values/attrs.xml
@@ -11,5 +11,6 @@
         <attr name="colorButtonRow" format="color" />
         <attr name="colorLogBackground" format="color" />
         <attr name="colorCardViewHeaderDivider" format="color" />
+        <attr name="colorText" format="color" />
     </declare-styleable>
 </resources>
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 5a9721fac..28e9a429c 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -12,12 +12,14 @@
         <item name="colorFabText">#fafafa</item>
 
         <item name="colorEmphasis">#2196f3</item>
-        <item name="colorHeaderText">#212121</item>
-        <item name="colorTertiaryText">#808080</item>
         <item name="colorButtonRow">#33cccccc</item>
         <item name="colorLogBackground">#cecbce</item>
         <item name="colorCardViewHeaderDivider">#808080</item>
 
+        <item name="colorText">#000000</item>
+        <item name="colorHeaderText">#212121</item>
+        <item name="colorTertiaryText">#808080</item>
+
         <!-- remove actionbar and title, we use toolbar! -->
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
@@ -37,12 +39,14 @@
         <item name="colorFabText">#fafafa</item>
 
         <item name="colorEmphasis">#2196f3</item>
-        <item name="colorHeaderText">#a0a0a0</item>
-        <item name="colorTertiaryText">#808080</item>
         <item name="colorButtonRow">#33cccccc</item>
         <item name="colorLogBackground">#303030</item>
         <item name="colorCardViewHeaderDivider">#808080</item>
 
+        <item name="colorText">#ffffff</item>
+        <item name="colorHeaderText">#d0d0d0</item>
+        <item name="colorTertiaryText">#808080</item>
+
         <!-- remove actionbar and title, we use toolbar! -->
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>