From 0af7d3c50baec701e4577b48465671638f86a30e Mon Sep 17 00:00:00 2001
From: Thialfihar <thi@thialfihar.org>
Date: Fri, 26 Jun 2015 12:12:19 +0200
Subject: [PATCH] Give password strength indicator colors their own name

Also prune the android color definitions, most of which aren't used.
---
 .../keychain/ui/widget/PasswordStrengthView.java          | 6 +++---
 .../src/main/res/layout/passphrase_repeat_dialog.xml      | 8 ++++----
 OpenKeychain/src/main/res/values/colors.xml               | 7 ++++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/PasswordStrengthView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/PasswordStrengthView.java
index 30bdfb92a..a7ead8039 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/PasswordStrengthView.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/PasswordStrengthView.java
@@ -99,9 +99,9 @@ public class PasswordStrengthView extends View {
     public PasswordStrengthView(Context context, AttributeSet attrs) {
         super(context, attrs);
 
-        int COLOR_FAIL = getResources().getColor(R.color.android_red_light);
-        int COLOR_WEAK = getResources().getColor(R.color.android_orange_light);
-        int COLOR_STRONG = getResources().getColor(R.color.android_green_light);
+        int COLOR_FAIL = getResources().getColor(R.color.password_strength_low);
+        int COLOR_WEAK = getResources().getColor(R.color.password_strength_medium);
+        int COLOR_STRONG = getResources().getColor(R.color.password_strength_high);
 
         TypedArray style = context.getTheme().obtainStyledAttributes(
                 attrs,
diff --git a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml
index ffc5266b5..9ce8f01fa 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml
@@ -40,9 +40,9 @@
             android:layout_gravity="end|center_vertical"
             custom:strength="medium"
             custom:showGuides="false"
-            custom:color_fail="@color/android_red_light"
-            custom:color_weak="@color/android_orange_light"
-            custom:color_strong="@color/android_green_light" />
+            custom:color_fail="@color/password_strength_low"
+            custom:color_weak="@color/password_strength_medium"
+            custom:color_strong="@color/password_strength_high" />
 
     </FrameLayout>
 
@@ -57,4 +57,4 @@
         android:ems="10"
         android:layout_gravity="center_horizontal" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index c42fb48b9..f66a065e0 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -14,12 +14,16 @@
     <color name="tab_text_selected">#FFFFFF</color>
     <color name="tab_indicator">#FFFFFF</color>
 
+    <color name="password_strength_low">#f44336</color>
+    <color name="password_strength_medium">#ff9800</color>
+    <color name="password_strength_high">#7bad45</color>
 
     <!-- floating action buttons -->
     <color name="black">#000000</color>
     <color name="white">#fafafa</color>
 
     <!--
+        Standard Android colors:
         http://www.google.com/design/spec/style/color.html#color-color-palette
         light = normal color
         dark = 900
@@ -29,10 +33,7 @@
     <color name="android_red_light">#f44336</color>
     <color name="android_red_dark">#b71c1c</color>
     <color name="android_orange_light">#ff9800</color>
-    <color name="android_orange_dark">#e65100</color>
     <color name="android_green_light">#7bad45</color>
     <color name="android_green_dark">#6c983d</color>
-    <color name="android_purple_light">#673ab7</color>
-    <color name="android_purple_dark">#311b92</color>
 
 </resources>