Merge branch 'thialfihar-feature/add-theme-setting'

5 files changed, 35 insertions, 32 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 93c6593ab..0be7e8f76 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
@@ -177,9 +177,9 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
         }
 
         if (entry.isRevoked()) {
-            KeyFormattingUtils.setStatusImage(getContext(), holder.status, null, State.REVOKED, R.color.bg_gray);
+            KeyFormattingUtils.setStatusImage(getContext(), holder.status, null, State.REVOKED, R.color.key_flag_gray);
         } else if (entry.isExpired()) {
-            KeyFormattingUtils.setStatusImage(getContext(), holder.status, null, State.EXPIRED, R.color.bg_gray);
+            KeyFormattingUtils.setStatusImage(getContext(), holder.status, null, State.EXPIRED, R.color.key_flag_gray);
         }
 
         if (entry.isRevoked() || entry.isExpired()) {
@@ -188,9 +188,9 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
             // no more space for algorithm display
             holder.algorithm.setVisibility(View.GONE);
 
-            holder.mainUserId.setTextColor(getContext().getResources().getColor(R.color.bg_gray));
-            holder.mainUserIdRest.setTextColor(getContext().getResources().getColor(R.color.bg_gray));
-            holder.keyId.setTextColor(getContext().getResources().getColor(R.color.bg_gray));
+            holder.mainUserId.setTextColor(getContext().getResources().getColor(R.color.key_flag_gray));
+            holder.mainUserIdRest.setTextColor(getContext().getResources().getColor(R.color.key_flag_gray));
+            holder.keyId.setTextColor(getContext().getResources().getColor(R.color.key_flag_gray));
         } else {
             holder.status.setVisibility(View.GONE);
             holder.algorithm.setVisibility(View.VISIBLE);
@@ -198,11 +198,11 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
             if (entry.isSecretKey()) {
                 holder.mainUserId.setTextColor(Color.RED);
             } else {
-                holder.mainUserId.setTextColor(Color.BLACK);
+                holder.mainUserId.setTextColor(FormattingUtils.getColorFromAttr(mActivity, R.attr.colorText));
             }
 
-            holder.mainUserIdRest.setTextColor(Color.BLACK);
-            holder.keyId.setTextColor(Color.BLACK);
+            holder.mainUserIdRest.setTextColor(FormattingUtils.getColorFromAttr(mActivity, R.attr.colorText));
+            holder.keyId.setTextColor(FormattingUtils.getColorFromAttr(mActivity, R.attr.colorText));
         }
 
         if (entry.getUserIds().size() == 1) {
@@ -242,9 +242,9 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
                 uidView.setPadding(0, 0, FormattingUtils.dpToPx(getContext(), 8), 0);
 
                 if (entry.isRevoked() || entry.isExpired()) {
-                    uidView.setTextColor(getContext().getResources().getColor(R.color.bg_gray));
+                    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);
@@ -258,9 +258,9 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
                     emailView.setText(highlighter.highlight(email));
 
                     if (entry.isRevoked() || entry.isExpired()) {
-                        emailView.setTextColor(getContext().getResources().getColor(R.color.bg_gray));
+                        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 fbab1959a..aba1eb0d8 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
@@ -42,6 +42,7 @@ import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKeyRing;
 import org.sufficientlysecure.keychain.pgp.KeyRing;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.ui.util.Highlighter;
+import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State;
 
@@ -49,6 +50,7 @@ public class KeyAdapter extends CursorAdapter {
 
     protected String mQuery;
     protected LayoutInflater mInflater;
+    protected Context mContext;
 
     // These are the rows that we will retrieve.
     public static final String[] PROJECTION = new String[]{
@@ -77,6 +79,7 @@ public class KeyAdapter extends CursorAdapter {
     public KeyAdapter(Context context, Cursor c, int flags) {
         super(context, c, flags);
 
+        mContext = context;
         mInflater = LayoutInflater.from(context);
     }
 
@@ -138,26 +141,26 @@ public class KeyAdapter extends CursorAdapter {
                 // Note: order is important!
                 if (item.mIsRevoked) {
                     KeyFormattingUtils
-                            .setStatusImage(context, mStatus, null, State.REVOKED, R.color.bg_gray);
+                            .setStatusImage(context, mStatus, null, State.REVOKED, R.color.key_flag_gray);
                     mStatus.setVisibility(View.VISIBLE);
                     mSlinger.setVisibility(View.GONE);
-                    textColor = R.color.bg_gray;
+                    textColor = context.getResources().getColor(R.color.key_flag_gray);
                 } else if (item.mIsExpired) {
-                    KeyFormattingUtils.setStatusImage(context, mStatus, null, State.EXPIRED, R.color.bg_gray);
+                    KeyFormattingUtils.setStatusImage(context, mStatus, null, State.EXPIRED, R.color.key_flag_gray);
                     mStatus.setVisibility(View.VISIBLE);
                     mSlinger.setVisibility(View.GONE);
-                    textColor = R.color.bg_gray;
+                    textColor = context.getResources().getColor(R.color.key_flag_gray);
                 } else if (item.mIsSecret) {
                     mStatus.setVisibility(View.GONE);
                     if (mSlingerButton.hasOnClickListeners()) {
                         mSlingerButton.setColorFilter(
-                                context.getResources().getColor(R.color.tertiary_text_light),
+                                FormattingUtils.getColorFromAttr(context, R.attr.colorTertiaryText),
                                 PorterDuff.Mode.SRC_IN);
                         mSlinger.setVisibility(View.VISIBLE);
                     } 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) {
@@ -168,15 +171,15 @@ 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) {
-                    textColor = R.color.bg_gray;
+                    textColor = context.getResources().getColor(R.color.key_flag_gray);
                 }
 
-                mMainUserId.setTextColor(context.getResources().getColor(textColor));
-                mMainUserIdRest.setTextColor(context.getResources().getColor(textColor));
+                mMainUserId.setTextColor(textColor);
+                mMainUserIdRest.setTextColor(textColor);
 
                 if (item.mHasDuplicate) {
                     String dateTime = DateUtils.formatDateTime(context,
@@ -187,7 +190,7 @@ public class KeyAdapter extends CursorAdapter {
 
                     mCreationDate.setText(context.getString(R.string.label_key_created,
                             dateTime));
-                    mCreationDate.setTextColor(context.getResources().getColor(textColor));
+                    mCreationDate.setTextColor(textColor);
                     mCreationDate.setVisibility(View.VISIBLE);
                 } else {
                     mCreationDate.setVisibility(View.GONE);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
index a6cb52977..4ea651bb5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
@@ -149,11 +149,11 @@ abstract public class SelectKeyCursorAdapter extends CursorAdapter {
         boolean enabled;
         if (cursor.getInt(mIndexIsRevoked) != 0) {
             h.statusIcon.setVisibility(View.VISIBLE);
-            KeyFormattingUtils.setStatusImage(mContext, h.statusIcon, null, State.REVOKED, R.color.bg_gray);
+            KeyFormattingUtils.setStatusImage(mContext, h.statusIcon, null, State.REVOKED, R.color.key_flag_gray);
             enabled = false;
         } else if (cursor.getInt(mIndexIsExpiry) != 0) {
             h.statusIcon.setVisibility(View.VISIBLE);
-            KeyFormattingUtils.setStatusImage(mContext, h.statusIcon, null, State.EXPIRED, R.color.bg_gray);
+            KeyFormattingUtils.setStatusImage(mContext, h.statusIcon, null, State.EXPIRED, R.color.key_flag_gray);
             enabled = false;
         } else {
             h.statusIcon.setVisibility(View.GONE);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
index 87539ea05..24f5f04a1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
@@ -284,27 +284,27 @@ public class SubkeysAdapter extends CursorAdapter {
             vStatus.setVisibility(View.VISIBLE);
 
             vCertifyIcon.setColorFilter(
-                    mContext.getResources().getColor(R.color.bg_gray),
+                    mContext.getResources().getColor(R.color.key_flag_gray),
                     PorterDuff.Mode.SRC_IN);
             vSignIcon.setColorFilter(
-                    mContext.getResources().getColor(R.color.bg_gray),
+                    mContext.getResources().getColor(R.color.key_flag_gray),
                     PorterDuff.Mode.SRC_IN);
             vEncryptIcon.setColorFilter(
-                    mContext.getResources().getColor(R.color.bg_gray),
+                    mContext.getResources().getColor(R.color.key_flag_gray),
                     PorterDuff.Mode.SRC_IN);
             vAuthenticateIcon.setColorFilter(
-                    mContext.getResources().getColor(R.color.bg_gray),
+                    mContext.getResources().getColor(R.color.key_flag_gray),
                     PorterDuff.Mode.SRC_IN);
 
             if (isRevoked) {
                 vStatus.setImageResource(R.drawable.status_signature_revoked_cutout_24dp);
                 vStatus.setColorFilter(
-                        mContext.getResources().getColor(R.color.bg_gray),
+                        mContext.getResources().getColor(R.color.key_flag_gray),
                         PorterDuff.Mode.SRC_IN);
             } else if (isExpired) {
                 vStatus.setImageResource(R.drawable.status_signature_expired_cutout_24dp);
                 vStatus.setColorFilter(
-                        mContext.getResources().getColor(R.color.bg_gray),
+                        mContext.getResources().getColor(R.color.key_flag_gray),
                         PorterDuff.Mode.SRC_IN);
             }
         } else {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java
index d1103ac1f..e2c6b0928 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java
@@ -128,7 +128,7 @@ public class UserIdsAdapter extends UserAttributesAdapter {
 
         if (isRevoked) {
             // set revocation icon (can this even be primary?)
-            KeyFormattingUtils.setStatusImage(mContext, vVerified, null, State.REVOKED, R.color.bg_gray);
+            KeyFormattingUtils.setStatusImage(mContext, vVerified, null, State.REVOKED, R.color.key_flag_gray);
 
             // disable revoked user ids
             vName.setEnabled(false);