Skip to content

Commit 6b18128

Browse files
committed
Merge code
1 parent 553098f commit 6b18128

2 files changed

Lines changed: 24 additions & 21 deletions

File tree

app/src/main/java/com/fankes/miui/notify/utils/tool/IconRuleManagerTool.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,20 +94,14 @@ object IconRuleManagerTool {
9494
binding.sourceRadio2.isChecked = sourceType == TYPE_SOURCE_SYNC_WAY_2
9595
binding.sourceRadio3.isChecked = sourceType == TYPE_SOURCE_SYNC_WAY_3
9696
binding.sourceRadio1.setOnClickListener {
97-
binding.sourceRadio2.isChecked = false
98-
binding.sourceRadio3.isChecked = false
9997
binding.sourceFromTextLin.isVisible = false
10098
sourceType = TYPE_SOURCE_SYNC_WAY_1
10199
}
102100
binding.sourceRadio2.setOnClickListener {
103-
binding.sourceRadio1.isChecked = false
104-
binding.sourceRadio3.isChecked = false
105101
binding.sourceFromTextLin.isVisible = false
106102
sourceType = TYPE_SOURCE_SYNC_WAY_2
107103
}
108104
binding.sourceRadio3.setOnClickListener {
109-
binding.sourceRadio1.isChecked = false
110-
binding.sourceRadio2.isChecked = false
111105
binding.sourceFromTextLin.isVisible = true
112106
sourceType = TYPE_SOURCE_SYNC_WAY_3
113107
}

app/src/main/res/layout/dia_source_from.xml

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
34
xmlns:tools="http://schemas.android.com/tools"
45
android:layout_width="match_parent"
56
android:layout_height="wrap_content"
@@ -19,23 +20,31 @@
1920
android:text="在线规则将不定期更新,建议定期同步列表以适配更多 APP,若无法同步请自行寻找解决方法或魔法上网。"
2021
android:textSize="14sp" />
2122

22-
<com.google.android.material.radiobutton.MaterialRadioButton
23-
android:id="@+id/source_radio_1"
24-
android:layout_width="wrap_content"
25-
android:layout_height="wrap_content"
26-
android:text="从 FastGit 获取" />
23+
<RadioGroup
24+
android:layout_width="match_parent"
25+
android:layout_height="wrap_content">
2726

28-
<com.google.android.material.radiobutton.MaterialRadioButton
29-
android:id="@+id/source_radio_2"
30-
android:layout_width="wrap_content"
31-
android:layout_height="wrap_content"
32-
android:text="从 Github Raw 获取" />
27+
<com.google.android.material.radiobutton.MaterialRadioButton
28+
android:id="@+id/source_radio_1"
29+
android:layout_width="wrap_content"
30+
android:layout_height="wrap_content"
31+
android:text="从 FastGit 获取"
32+
app:buttonTint="@color/colorPrimaryAccent" />
3333

34-
<com.google.android.material.radiobutton.MaterialRadioButton
35-
android:id="@+id/source_radio_3"
36-
android:layout_width="wrap_content"
37-
android:layout_height="wrap_content"
38-
android:text="从自定义地址获取" />
34+
<com.google.android.material.radiobutton.MaterialRadioButton
35+
android:id="@+id/source_radio_2"
36+
android:layout_width="wrap_content"
37+
android:layout_height="wrap_content"
38+
android:text="从 Github Raw 获取"
39+
app:buttonTint="@color/colorPrimaryAccent" />
40+
41+
<com.google.android.material.radiobutton.MaterialRadioButton
42+
android:id="@+id/source_radio_3"
43+
android:layout_width="wrap_content"
44+
android:layout_height="wrap_content"
45+
android:text="从自定义地址获取"
46+
app:buttonTint="@color/colorPrimaryAccent" />
47+
</RadioGroup>
3948

4049
<com.google.android.material.textfield.TextInputLayout
4150
android:id="@+id/source_from_text_lin"

0 commit comments

Comments
 (0)