From 6aea7ca11fda8e6a1c5914bcb51f8aca8555bc1d Mon Sep 17 00:00:00 2001
From: fankesyooni <qzmmcn@163.com>
Date: Wed, 8 Jun 2022 19:11:05 +0800
Subject: [PATCH] Merge code

---
 .../notify/utils/tool/IconRuleManagerTool.kt  |  6 ---
 app/src/main/res/layout/dia_source_from.xml   | 39 ++++++++++++-------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/fankes/coloros/notify/utils/tool/IconRuleManagerTool.kt b/app/src/main/java/com/fankes/coloros/notify/utils/tool/IconRuleManagerTool.kt
index b85da65..8f1a758 100644
--- a/app/src/main/java/com/fankes/coloros/notify/utils/tool/IconRuleManagerTool.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/utils/tool/IconRuleManagerTool.kt
@@ -94,20 +94,14 @@ object IconRuleManagerTool {
             binding.sourceRadio2.isChecked = sourceType == TYPE_SOURCE_SYNC_WAY_2
             binding.sourceRadio3.isChecked = sourceType == TYPE_SOURCE_SYNC_WAY_3
             binding.sourceRadio1.setOnClickListener {
-                binding.sourceRadio2.isChecked = false
-                binding.sourceRadio3.isChecked = false
                 binding.sourceFromTextLin.isVisible = false
                 sourceType = TYPE_SOURCE_SYNC_WAY_1
             }
             binding.sourceRadio2.setOnClickListener {
-                binding.sourceRadio1.isChecked = false
-                binding.sourceRadio3.isChecked = false
                 binding.sourceFromTextLin.isVisible = false
                 sourceType = TYPE_SOURCE_SYNC_WAY_2
             }
             binding.sourceRadio3.setOnClickListener {
-                binding.sourceRadio1.isChecked = false
-                binding.sourceRadio2.isChecked = false
                 binding.sourceFromTextLin.isVisible = true
                 sourceType = TYPE_SOURCE_SYNC_WAY_3
             }
diff --git a/app/src/main/res/layout/dia_source_from.xml b/app/src/main/res/layout/dia_source_from.xml
index 8bc17db..4a0d59d 100644
--- a/app/src/main/res/layout/dia_source_from.xml
+++ b/app/src/main/res/layout/dia_source_from.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -19,23 +20,31 @@
         android:text="在线规则将不定期更新，建议定期同步列表以适配更多 APP，若无法同步请自行寻找解决方法或魔法上网。"
         android:textSize="14sp" />
 
-    <com.google.android.material.radiobutton.MaterialRadioButton
-        android:id="@+id/source_radio_1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="从 FastGit 获取" />
+    <RadioGroup
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <com.google.android.material.radiobutton.MaterialRadioButton
-        android:id="@+id/source_radio_2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="从 Github Raw 获取" />
+        <com.google.android.material.radiobutton.MaterialRadioButton
+            android:id="@+id/source_radio_1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="从 FastGit 获取"
+            app:buttonTint="@color/colorPrimaryAccent" />
 
-    <com.google.android.material.radiobutton.MaterialRadioButton
-        android:id="@+id/source_radio_3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="从自定义地址获取" />
+        <com.google.android.material.radiobutton.MaterialRadioButton
+            android:id="@+id/source_radio_2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="从 Github Raw 获取"
+            app:buttonTint="@color/colorPrimaryAccent" />
+
+        <com.google.android.material.radiobutton.MaterialRadioButton
+            android:id="@+id/source_radio_3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="从自定义地址获取"
+            app:buttonTint="@color/colorPrimaryAccent" />
+    </RadioGroup>
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/source_from_text_lin"