From 15f5c4a67b781eeb2ed39955949ecf90d51b9d69 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Sun, 28 Nov 2021 14:54:49 +0100
Subject: [PATCH] Make cropper respect custom theme choice

---
 app/src/main/AndroidManifest.xml                            | 6 +++---
 .../java/protect/card_locker/LoyaltyCardEditActivity.java   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2f7674721..848cc08bc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -37,11 +37,11 @@
         <activity
             android:name=".AboutActivity"
             android:label="@string/about"
-            android:theme="@style/AppTheme.NoActionBar"></activity>
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".ManageGroupsActivity"
             android:label="@string/groups"
-            android:theme="@style/AppTheme.NoActionBar"></activity>
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".ManageGroupActivity"
             android:label="@string/group_edit"
@@ -117,7 +117,7 @@
 
         <activity
             android:name="com.yalantis.ucrop.UCropActivity"
-            android:theme="@style/Theme.AppCompat.NoActionBar"/>
+            android:theme="@style/AppTheme.NoActionBar" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index baf23e5e2..e3cec9049 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -679,10 +679,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     }
 
     private void setCropperTheme() {
-        mCropperOptions.setToolbarColor(ContextCompat.getColor(this, R.color.colorPrimary));
-        mCropperOptions.setStatusBarColor(ContextCompat.getColor(this, R.color.colorPrimaryDark));
+        mCropperOptions.setToolbarColor(getThemeColor());
+        mCropperOptions.setStatusBarColor(getThemeColor());
         mCropperOptions.setToolbarWidgetColor(Color.WHITE);
-        mCropperOptions.setActiveControlsWidgetColor(ContextCompat.getColor(this, R.color.colorPrimary));
+        mCropperOptions.setActiveControlsWidgetColor(getThemeColor());
     }
 
     @Override