better theming

KingsMentor · Jul 31, 2017 · 798878f · 798878f
1 parent 529c8b3
commit 798878f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/apk/app-debug.apk b/apk/app-debug.apk
diff --git a/luhn/src/main/res/drawable/card_next_btn_selector.xml b/luhn/src/main/res/drawable/card_next_btn_selector.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@color/ln_colorGrey_disabled" android:state_enabled="false" />
-    <item android:drawable="@color/ln_colorBlack_enabled" android:state_enabled="true" />
-    <item android:drawable="@color/ln_colorBlack__pressed_80" android:state_pressed="true" />
+    <item android:drawable="@color/ln_verify_btn_disabled" android:state_enabled="false" />
+    <item android:drawable="@color/ln_verify_btn_enabled" android:state_enabled="true" />
+    <item android:drawable="@color/ln_verify_btn_pressed" android:state_pressed="true" />
 </selector>
diff --git a/luhn/src/main/res/layout/card_info_layout.xml b/luhn/src/main/res/layout/card_info_layout.xml
@@ -54,7 +54,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:background="@color/colorAccent"
+            android:background="@color/ln_info_bg"
             android:gravity="center"
             android:padding="16dp"
             android:text="Ok"

diff --git a/luhn/src/main/res/values/colors.xml b/luhn/src/main/res/values/colors.xml
@@ -6,6 +6,7 @@
     <color name="colorAccent">#ff000000</color>
 
     <color name="ln_colorControlHighlight">#ff000000</color>
+    <color name="ln_info_bg">#ff000000</color>
     <color name="ln_colorControlActivated">#ff151525</color>
     <color name="ln_colorHint">#aaaaaa</color>
     <color name="ln_colorError">#ffdd0031</color>
@@ -14,8 +15,8 @@
     <color name="ln_colorInfoDesc">#ff6b6b76</color>
     <color name="ln_colorWhite">#ffffff</color>
     <color name="ln_actionMenuTextColor">#ffffff</color>
-    <color name="ln_colorBlack_enabled">#ff000000</color>
-    <color name="ln_colorBlack__pressed_80">#ff3a3a48</color>
-    <color name="ln_colorGrey_disabled">#ffa4a4ac</color>
+    <color name="ln_verify_btn_enabled">#ff000000</color>
+    <color name="ln_verify_btn_pressed">#ff3a3a48</color>
+    <color name="ln_verify_btn_disabled">#ffa4a4ac</color>
 
 </resources>