From b3d9c4c2b9ef0379ad00e91a44ad93c1c2e59630 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Fri, 19 Oct 2018 20:04:32 +0800
Subject: [PATCH] Apply theme to Security

---
 .../java/com/hippo/widget/lockpattern/LockPatternView.java  | 6 +++---
 app/src/main/res/layout/activity_set_security.xml           | 2 ++
 app/src/main/res/values/colors.xml                          | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/hippo/widget/lockpattern/LockPatternView.java b/app/src/main/java/com/hippo/widget/lockpattern/LockPatternView.java
index d2167c0b0..561e6f59f 100644
--- a/app/src/main/java/com/hippo/widget/lockpattern/LockPatternView.java
+++ b/app/src/main/java/com/hippo/widget/lockpattern/LockPatternView.java
@@ -38,9 +38,8 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.accessibility.AccessibilityManager;
 import android.view.animation.Interpolator;
-
+import com.hippo.android.resource.AttrResources;
 import com.hippo.ehviewer.R;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -270,7 +269,8 @@ public class LockPatternView extends View {
         mPathPaint.setAntiAlias(true);
         mPathPaint.setDither(true);
 
-        mRegularColor = getResources().getColor(R.color.lock_pattern_view_regular_color);
+        mRegularColor = getResources().getColor(AttrResources.getAttrBoolean(context, R.attr.isLightTheme) ?
+            R.color.lock_pattern_view_regular_color_light : R.color.lock_pattern_view_regular_color_dark);
         mErrorColor = getResources().getColor(R.color.lock_pattern_view_error_color);
         mSuccessColor = getResources().getColor(R.color.lock_pattern_view_success_color);
 
diff --git a/app/src/main/res/layout/activity_set_security.xml b/app/src/main/res/layout/activity_set_security.xml
index 9509f1f85..78328fc72 100755
--- a/app/src/main/res/layout/activity_set_security.xml
+++ b/app/src/main/res/layout/activity_set_security.xml
@@ -78,6 +78,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:textColor="?attr/textColorThemeAccent"
             android:text="@android:string/cancel"/>
 
         <Button
@@ -86,6 +87,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:textColor="?attr/textColorThemePrimary"
             android:text="@string/set"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7b31cbc91..10eeb7435 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -114,7 +114,8 @@
     <color name="guide_bg">#e5009688</color>
 
     <!-- Lock pattern view -->
-    <color name="lock_pattern_view_regular_color">#8a000000</color>
+    <color name="lock_pattern_view_regular_color_light">#8a000000</color>
+    <color name="lock_pattern_view_regular_color_dark">#8affffff</color>
     <color name="lock_pattern_view_success_color">@color/colorPrimary</color>
     <color name="lock_pattern_view_error_color">@color/red_500</color>