better theming

KingsMentor · Jul 31, 2017 · 36969be · 36969be
1 parent 798878f
commit 36969be
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/apk/app-debug.apk b/apk/app-debug.apk
diff --git a/luhn/src/main/java/xyz/belvi/luhn/Luhn.java b/luhn/src/main/java/xyz/belvi/luhn/Luhn.java
@@ -209,7 +209,7 @@ private void initStyle(int style) {
         retrievePin = ta.getBoolean(R.styleable.luhnStyle_luhn_show_pin, false);
         ((AppCompatTextView) findViewById(R.id.toolbar_title)).setText(TextUtils.isEmpty(title) ? "Add Card" : title);
         findViewById(R.id.btn_proceed).setBackground(ta.getDrawable(R.styleable.luhnStyle_luhn_btn_verify_selector));
-        findViewById(R.id.toolbar).setBackgroundColor(ta.getColor(R.styleable.luhnStyle_luhn_show_toolbar_color, ContextCompat.getColor(this, R.color.colorPrimary)));
+        findViewById(R.id.toolbar).setBackgroundColor(ta.getColor(R.styleable.luhnStyle_luhn_show_toolbar_color, ContextCompat.getColor(this, R.color.ln_colorPrimary)));
     }
 
     private void initViews() {

diff --git a/luhn/src/main/res/values/colors.xml b/luhn/src/main/res/values/colors.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#ff000000</color>
+    <color name="ln_colorPrimary">#ff000000</color>
+    <color name="ln_colorPrimaryDark">#303F9F</color>
+    <color name="ln_colorAccent">#ff000000</color>
 
     <color name="ln_colorControlHighlight">#ff000000</color>
     <color name="ln_info_bg">#ff000000</color>

diff --git a/luhn/src/main/res/values/styles.xml b/luhn/src/main/res/values/styles.xml
@@ -3,9 +3,9 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorAccent</item>
-        <item name="colorPrimaryDark">@color/colorAccent</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorPrimary">@color/ln_colorPrimary</item>
+        <item name="colorPrimaryDark">@color/ln_colorPrimaryDark</item>
+        <item name="colorAccent">@color/ln_colorAccent</item>
         <item name="colorControlHighlight">@color/ln_colorControlHighlight</item>
         <item name="actionMenuTextColor">@color/ln_actionMenuTextColor</item>
     </style>
@@ -55,7 +55,7 @@
         <item name="luhn_title">Add Card</item>
         <item name="luhn_typeface">fonts/ClanMedium.ttf</item>
         <item name="luhn_btn_verify_selector">@drawable/card_next_btn_selector</item>
-        <item name="luhn_show_toolbar_color">@color/colorAccent</item>
+        <item name="luhn_show_toolbar_color">@color/ln_colorAccent</item>
         <item name="luhn_show_pin">true</item>
     </style>