From 574f409cfe0a3585594e22abf325dbf14196311a Mon Sep 17 00:00:00 2001
From: ShirosakiMio <852468399@qq.com>
Date: Sat, 14 Sep 2024 12:29:45 +0800
Subject: [PATCH] update account skin dialog

---
 .../main/res/layout/dialog_offline_account_skin.xml  |  7 +++++++
 .../fcllibrary/component/view/FCLRadioButton.java    | 12 ++++++++++++
 FCLLibrary/src/main/res/values/attrs.xml             |  3 +++
 3 files changed, 22 insertions(+)

diff --git a/FCL/src/main/res/layout/dialog_offline_account_skin.xml b/FCL/src/main/res/layout/dialog_offline_account_skin.xml
index b7c7b96c..9e1321f4 100644
--- a/FCL/src/main/res/layout/dialog_offline_account_skin.xml
+++ b/FCL/src/main/res/layout/dialog_offline_account_skin.xml
@@ -50,30 +50,35 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/default_skin"
+                    app:text_with_theme_color="true"
                     android:text="@string/account_skin_type_default"/>
 
                 <com.tungsten.fcllibrary.component.view.FCLRadioButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/steve"
+                    app:text_with_theme_color="true"
                     android:text="@string/account_skin_type_steve"/>
 
                 <com.tungsten.fcllibrary.component.view.FCLRadioButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/alex"
+                    app:text_with_theme_color="true"
                     android:text="@string/account_skin_type_alex"/>
 
                 <com.tungsten.fcllibrary.component.view.FCLRadioButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/local"
+                    app:text_with_theme_color="true"
                     android:text="@string/account_skin_type_local_file"/>
 
                 <com.tungsten.fcllibrary.component.view.FCLRadioButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/csl"
+                    app:text_with_theme_color="true"
                     android:text="@string/account_skin_type_csl_api"/>
 
                 <com.tungsten.fcllibrary.component.view.FCLLinearLayout
@@ -92,6 +97,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
                             android:singleLine="true"
+                            app:auto_text_tint="true"
                             android:text="@string/account_skin"/>
 
                         <View
@@ -128,6 +134,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
                             android:singleLine="true"
+                            app:auto_text_tint="true"
                             android:text="@string/account_cape"/>
 
                         <View
diff --git a/FCLLibrary/src/main/java/com/tungsten/fcllibrary/component/view/FCLRadioButton.java b/FCLLibrary/src/main/java/com/tungsten/fcllibrary/component/view/FCLRadioButton.java
index 3f253c92..dc11130e 100644
--- a/FCLLibrary/src/main/java/com/tungsten/fcllibrary/component/view/FCLRadioButton.java
+++ b/FCLLibrary/src/main/java/com/tungsten/fcllibrary/component/view/FCLRadioButton.java
@@ -2,6 +2,7 @@ package com.tungsten.fcllibrary.component.view;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
+import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.util.AttributeSet;
 
@@ -13,6 +14,7 @@ import com.tungsten.fclcore.fakefx.beans.property.BooleanPropertyBase;
 import com.tungsten.fclcore.fakefx.beans.property.IntegerProperty;
 import com.tungsten.fclcore.fakefx.beans.property.IntegerPropertyBase;
 import com.tungsten.fclcore.task.Schedulers;
+import com.tungsten.fcllibrary.R;
 import com.tungsten.fcllibrary.component.theme.ThemeEngine;
 
 public class FCLRadioButton extends AppCompatRadioButton {
@@ -20,6 +22,7 @@ public class FCLRadioButton extends AppCompatRadioButton {
     private BooleanProperty visibilityProperty;
     private BooleanProperty checkProperty;
     private BooleanProperty disableProperty;
+    private boolean textWithThemeColor = false;
 
     private final IntegerProperty theme = new IntegerPropertyBase() {
 
@@ -39,6 +42,9 @@ public class FCLRadioButton extends AppCompatRadioButton {
                     Color.GRAY
             };
             setButtonTintList(new ColorStateList(state, color));
+            if (textWithThemeColor) {
+                setTextColor(ThemeEngine.getInstance().getTheme().getColor());
+            }
         }
 
         @Override
@@ -59,11 +65,17 @@ public class FCLRadioButton extends AppCompatRadioButton {
 
     public FCLRadioButton(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
+        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.FCLRadioButton);
+        textWithThemeColor = typedArray.getBoolean(R.styleable.FCLRadioButton_text_with_theme_color, false);
+        typedArray.recycle();
         theme.bind(ThemeEngine.getInstance().getTheme().colorProperty());
     }
 
     public FCLRadioButton(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
+        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.FCLRadioButton);
+        textWithThemeColor = typedArray.getBoolean(R.styleable.FCLRadioButton_text_with_theme_color, false);
+        typedArray.recycle();
         theme.bind(ThemeEngine.getInstance().getTheme().colorProperty());
     }
 
diff --git a/FCLLibrary/src/main/res/values/attrs.xml b/FCLLibrary/src/main/res/values/attrs.xml
index 166de69a..e7cb8506 100644
--- a/FCLLibrary/src/main/res/values/attrs.xml
+++ b/FCLLibrary/src/main/res/values/attrs.xml
@@ -43,6 +43,9 @@
     <declare-styleable name="FCLConstraintLayout">
         <attr name="auto_constraint_background_tint" format="boolean"/>
     </declare-styleable>
+    <declare-styleable name="FCLRadioButton">
+        <attr name="text_with_theme_color" format="boolean"/>
+    </declare-styleable>
 
     <declare-styleable name="ColorPickerView" parent="ColorPanelView">
         <attr format="boolean|reference" name="cpv_alphaChannelVisible"/>