MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added unified switches to install screen

Browse Source
This commit is contained in:
Viktor De Pasquale 2020-02-11 19:27:38 +01:00 committed by John Wu
parent 9952387356
commit 0492e63862
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/res/drawable/ic_checkbox.xml
View File

@ -1,11 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<item android:state_selected="true"> <item android:state_selected="true">
<layer-list> <layer-list>
<item android:left="16dp"> <item android:left="16dp">
<shape android:shape="oval"> <shape android:shape="oval">
<size android:width="16dp" android:height="16dp" /> <size android:width="16dp" android:height="16dp" />
<solid android:color="?colorPrimary" /> <solid android:color="?colorPrimary" tools:color="#000" />
</shape>
</item>
</layer-list>
</item>
<item android:state_checked="true">
<layer-list>
<item android:left="16dp">
<shape android:shape="oval">
<size android:width="16dp" android:height="16dp" />
<solid android:color="?colorPrimary" tools:color="#000" />
</shape> </shape>
</item> </item>
</layer-list> </layer-list>
@ -15,7 +25,7 @@
<item android:right="16dp"> <item android:right="16dp">
<shape android:shape="oval"> <shape android:shape="oval">
<size android:width="16dp" android:height="16dp" /> <size android:width="16dp" android:height="16dp" />
<solid android:color="?colorDisabledVariant" /> <solid android:color="?colorDisabledVariant" tools:color="#000" />
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

5
app/src/main/res/drawable/ic_compound_checkbox.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_checkbox" />
<item android:drawable="@drawable/ic_checkbox" />
</layer-list>

3
app/src/main/res/layout/fragment_install_md2.xml
View File

@ -193,7 +193,6 @@
style="@style/WidgetFoundation.RadioButton" style="@style/WidgetFoundation.RadioButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:buttonCompat="@drawable/ic_radio_check_button"
android:text="@string/select_patch_file" /> android:text="@string/select_patch_file" />
<com.google.android.material.radiobutton.MaterialRadioButton <com.google.android.material.radiobutton.MaterialRadioButton
@ -202,7 +201,6 @@
gone="@{!viewModel.rooted}" gone="@{!viewModel.rooted}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:buttonCompat="@drawable/ic_radio_check_button"
android:text="@string/direct_install" /> android:text="@string/direct_install" />
<com.google.android.material.radiobutton.MaterialRadioButton <com.google.android.material.radiobutton.MaterialRadioButton
@ -211,7 +209,6 @@
gone="@{!viewModel.rooted || !viewModel.aB}" gone="@{!viewModel.rooted || !viewModel.aB}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:buttonCompat="@drawable/ic_radio_check_button"
android:text="@string/install_inactive_slot" /> android:text="@string/install_inactive_slot" />
</RadioGroup> </RadioGroup>

4
app/src/main/res/values/styles_md2_impl.xml
View File

@ -168,7 +168,7 @@
<item name="android:paddingStart">@dimen/l1</item> <item name="android:paddingStart">@dimen/l1</item>
<item name="android:paddingEnd">@dimen/l1</item> <item name="android:paddingEnd">@dimen/l1</item>
<item name="tint">?colorPrimary</item> <item name="tint">?colorPrimary</item>
<item name="buttonCompat">@drawable/ic_radio_check_button</item> <item name="buttonCompat">@drawable/ic_compound_checkbox</item>
</style> </style>
<style name="WidgetFoundation.RadioButton" parent="Widget.AppCompat.CompoundButton.RadioButton"> <style name="WidgetFoundation.RadioButton" parent="Widget.AppCompat.CompoundButton.RadioButton">
@ -177,7 +177,7 @@
<item name="android:paddingStart">@dimen/l1</item> <item name="android:paddingStart">@dimen/l1</item>
<item name="android:paddingEnd">@dimen/l1</item> <item name="android:paddingEnd">@dimen/l1</item>
<item name="tint">?colorPrimary</item> <item name="tint">?colorPrimary</item>
<item name="buttonCompat">@drawable/ic_radio_check_button</item> <item name="buttonCompat">@drawable/ic_compound_checkbox</item>
</style> </style>
<style name="WidgetFoundation.ProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal"> <style name="WidgetFoundation.ProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal">