From 369f5e93947632dcce7539157bc0f48bf37c08d5 Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Thu, 5 Oct 2023 17:05:02 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E9=A2=9C=E8=89=B2=E9=80=89=E5=8F=96?=
 =?UTF-8?q?=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                |  2 +-
 .../post/activities/TranslucentThemeActivity.kt |  9 ++++++---
 .../components/dialogs/CustomThemeDialog.kt     | 17 +++++++++++------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 504bddb2..a9fc0b6e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -253,7 +253,7 @@ dependencies {
     implementation 'com.github.DSAppTeam:PanelSwitchHelper:v1.5.2'
     implementation "org.litepal.android:kotlin:3.0.0"
     implementation 'cn.jzvd:jiaozivideoplayer:7.7.2.3300'
-    implementation "com.jrummyapps:colorpicker:2.1.7"
+    implementation 'com.jaredrummler:colorpicker:1.1.0'
 
     implementation "com.scwang.smart:refresh-layout-kernel:2.0.1"
     implementation "com.scwang.smart:refresh-header-material:2.0.1"
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/TranslucentThemeActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/TranslucentThemeActivity.kt
index 198d1608..d21642a5 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/activities/TranslucentThemeActivity.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/TranslucentThemeActivity.kt
@@ -47,8 +47,8 @@ import com.huanchengfly.tieba.post.ui.widgets.theme.TintMaterialButton
 import com.huanchengfly.tieba.post.utils.*
 import com.huanchengfly.tieba.post.utils.ThemeUtil.TRANSLUCENT_THEME_DARK
 import com.huanchengfly.tieba.post.utils.ThemeUtil.TRANSLUCENT_THEME_LIGHT
-import com.jrummyapps.android.colorpicker.ColorPickerDialog
-import com.jrummyapps.android.colorpicker.ColorPickerDialogListener
+import com.jaredrummler.android.colorpicker.ColorPickerDialog
+import com.jaredrummler.android.colorpicker.ColorPickerDialogListener
 import com.yalantis.ucrop.UCrop
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
@@ -510,7 +510,10 @@ class TranslucentThemeActivity : BaseActivity(), View.OnClickListener, OnSeekBar
                     .setColor(ThemeUtils.getColorById(this, R.color.default_color_primary))
                     .create()
                 primaryColorPicker.setColorPickerDialogListener(this)
-                primaryColorPicker.show(fragmentManager, "ColorPicker_TranslucentThemePrimaryColor")
+                primaryColorPicker.show(
+                    supportFragmentManager,
+                    "ColorPicker_TranslucentThemePrimaryColor"
+                )
             }
             R.id.dark_color -> {
                 appPreferences.translucentBackgroundTheme = TRANSLUCENT_THEME_DARK
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/components/dialogs/CustomThemeDialog.kt b/app/src/main/java/com/huanchengfly/tieba/post/components/dialogs/CustomThemeDialog.kt
index 054858aa..116a7e20 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/components/dialogs/CustomThemeDialog.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/components/dialogs/CustomThemeDialog.kt
@@ -11,13 +11,14 @@ import android.widget.CompoundButton
 import android.widget.LinearLayout
 import androidx.annotation.ColorInt
 import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.FragmentActivity
 import com.huanchengfly.tieba.post.App.ThemeDelegate.getColorByAttr
 import com.huanchengfly.tieba.post.R
 import com.huanchengfly.tieba.post.ui.common.theme.utils.ThemeUtils
 import com.huanchengfly.tieba.post.utils.ThemeUtil
 import com.huanchengfly.tieba.post.utils.appPreferences
-import com.jrummyapps.android.colorpicker.ColorPickerDialog
-import com.jrummyapps.android.colorpicker.ColorPickerDialogListener
+import com.jaredrummler.android.colorpicker.ColorPickerDialog
+import com.jaredrummler.android.colorpicker.ColorPickerDialogListener
 
 class CustomThemeDialog(context: Context) : AlertDialog(context),
     View.OnClickListener, DialogInterface.OnClickListener, CompoundButton.OnCheckedChangeListener,
@@ -67,10 +68,14 @@ class CustomThemeDialog(context: Context) : AlertDialog(context),
                 .setColor(primaryColor)
                 .create()
             primaryColorPicker.setColorPickerDialogListener(this)
-            primaryColorPicker.show(
-                ThemeUtils.getWrapperActivity(context)!!.fragmentManager,
-                "ColorPicker_PrimaryColor"
-            )
+            val activity = ThemeUtils.getWrapperActivity(context)
+            if (activity is FragmentActivity) {
+                primaryColorPicker.show(
+                    activity.supportFragmentManager,
+                    "ColorPicker_PrimaryColor"
+                )
+                return
+            }
         }
         refreshView()
     }