mirror of
https://github.com/fankes/ColorOSNotifyIcon.git
synced 2025-09-04 17:55:20 +08:00
Merge code
This commit is contained in:
@@ -94,20 +94,14 @@ object IconRuleManagerTool {
|
|||||||
binding.sourceRadio2.isChecked = sourceType == TYPE_SOURCE_SYNC_WAY_2
|
binding.sourceRadio2.isChecked = sourceType == TYPE_SOURCE_SYNC_WAY_2
|
||||||
binding.sourceRadio3.isChecked = sourceType == TYPE_SOURCE_SYNC_WAY_3
|
binding.sourceRadio3.isChecked = sourceType == TYPE_SOURCE_SYNC_WAY_3
|
||||||
binding.sourceRadio1.setOnClickListener {
|
binding.sourceRadio1.setOnClickListener {
|
||||||
binding.sourceRadio2.isChecked = false
|
|
||||||
binding.sourceRadio3.isChecked = false
|
|
||||||
binding.sourceFromTextLin.isVisible = false
|
binding.sourceFromTextLin.isVisible = false
|
||||||
sourceType = TYPE_SOURCE_SYNC_WAY_1
|
sourceType = TYPE_SOURCE_SYNC_WAY_1
|
||||||
}
|
}
|
||||||
binding.sourceRadio2.setOnClickListener {
|
binding.sourceRadio2.setOnClickListener {
|
||||||
binding.sourceRadio1.isChecked = false
|
|
||||||
binding.sourceRadio3.isChecked = false
|
|
||||||
binding.sourceFromTextLin.isVisible = false
|
binding.sourceFromTextLin.isVisible = false
|
||||||
sourceType = TYPE_SOURCE_SYNC_WAY_2
|
sourceType = TYPE_SOURCE_SYNC_WAY_2
|
||||||
}
|
}
|
||||||
binding.sourceRadio3.setOnClickListener {
|
binding.sourceRadio3.setOnClickListener {
|
||||||
binding.sourceRadio1.isChecked = false
|
|
||||||
binding.sourceRadio2.isChecked = false
|
|
||||||
binding.sourceFromTextLin.isVisible = true
|
binding.sourceFromTextLin.isVisible = true
|
||||||
sourceType = TYPE_SOURCE_SYNC_WAY_3
|
sourceType = TYPE_SOURCE_SYNC_WAY_3
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<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"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -19,23 +20,31 @@
|
|||||||
android:text="在线规则将不定期更新,建议定期同步列表以适配更多 APP,若无法同步请自行寻找解决方法或魔法上网。"
|
android:text="在线规则将不定期更新,建议定期同步列表以适配更多 APP,若无法同步请自行寻找解决方法或魔法上网。"
|
||||||
android:textSize="14sp" />
|
android:textSize="14sp" />
|
||||||
|
|
||||||
<com.google.android.material.radiobutton.MaterialRadioButton
|
<RadioGroup
|
||||||
android:id="@+id/source_radio_1"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="wrap_content"
|
android:layout_height="wrap_content">
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="从 FastGit 获取" />
|
|
||||||
|
|
||||||
<com.google.android.material.radiobutton.MaterialRadioButton
|
<com.google.android.material.radiobutton.MaterialRadioButton
|
||||||
android:id="@+id/source_radio_2"
|
android:id="@+id/source_radio_1"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="从 Github Raw 获取" />
|
android:text="从 FastGit 获取"
|
||||||
|
app:buttonTint="@color/colorPrimaryAccent" />
|
||||||
|
|
||||||
<com.google.android.material.radiobutton.MaterialRadioButton
|
<com.google.android.material.radiobutton.MaterialRadioButton
|
||||||
android:id="@+id/source_radio_3"
|
android:id="@+id/source_radio_2"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="从自定义地址获取" />
|
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
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/source_from_text_lin"
|
android:id="@+id/source_from_text_lin"
|
||||||
|
Reference in New Issue
Block a user