From 0492e638620812298a800f24e54aced54be5d312 Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Tue, 11 Feb 2020 19:27:38 +0100
Subject: [PATCH] Added unified switches to install screen

---
 app/src/main/res/drawable/ic_checkbox.xml        | 16 +++++++++++++---
 .../main/res/drawable/ic_compound_checkbox.xml   |  5 +++++
 app/src/main/res/layout/fragment_install_md2.xml |  3 ---
 app/src/main/res/values/styles_md2_impl.xml      |  4 ++--
 4 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_compound_checkbox.xml

diff --git a/app/src/main/res/drawable/ic_checkbox.xml b/app/src/main/res/drawable/ic_checkbox.xml
index ee0e1c24e..533e6ae69 100644
--- a/app/src/main/res/drawable/ic_checkbox.xml
+++ b/app/src/main/res/drawable/ic_checkbox.xml
@@ -1,11 +1,21 @@
 <?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">
         <layer-list>
             <item android:left="16dp">
                 <shape android:shape="oval">
                     <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>
             </item>
         </layer-list>
@@ -15,7 +25,7 @@
             <item android:right="16dp">
                 <shape android:shape="oval">
                     <size android:width="16dp" android:height="16dp" />
-                    <solid android:color="?colorDisabledVariant" />
+                    <solid android:color="?colorDisabledVariant" tools:color="#000" />
                 </shape>
             </item>
         </layer-list>
diff --git a/app/src/main/res/drawable/ic_compound_checkbox.xml b/app/src/main/res/drawable/ic_compound_checkbox.xml
new file mode 100644
index 000000000..5b1c6b06e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_compound_checkbox.xml
@@ -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>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_install_md2.xml b/app/src/main/res/layout/fragment_install_md2.xml
index 0c50d2fa6..9282b3111 100644
--- a/app/src/main/res/layout/fragment_install_md2.xml
+++ b/app/src/main/res/layout/fragment_install_md2.xml
@@ -193,7 +193,6 @@
                                 style="@style/WidgetFoundation.RadioButton"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                app:buttonCompat="@drawable/ic_radio_check_button"
                                 android:text="@string/select_patch_file" />
 
                             <com.google.android.material.radiobutton.MaterialRadioButton
@@ -202,7 +201,6 @@
                                 gone="@{!viewModel.rooted}"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                app:buttonCompat="@drawable/ic_radio_check_button"
                                 android:text="@string/direct_install" />
 
                             <com.google.android.material.radiobutton.MaterialRadioButton
@@ -211,7 +209,6 @@
                                 gone="@{!viewModel.rooted || !viewModel.aB}"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                app:buttonCompat="@drawable/ic_radio_check_button"
                                 android:text="@string/install_inactive_slot" />
 
                         </RadioGroup>
diff --git a/app/src/main/res/values/styles_md2_impl.xml b/app/src/main/res/values/styles_md2_impl.xml
index 8c6b58491..052c37236 100644
--- a/app/src/main/res/values/styles_md2_impl.xml
+++ b/app/src/main/res/values/styles_md2_impl.xml
@@ -168,7 +168,7 @@
         <item name="android:paddingStart">@dimen/l1</item>
         <item name="android:paddingEnd">@dimen/l1</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 name="WidgetFoundation.RadioButton" parent="Widget.AppCompat.CompoundButton.RadioButton">
@@ -177,7 +177,7 @@
         <item name="android:paddingStart">@dimen/l1</item>
         <item name="android:paddingEnd">@dimen/l1</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 name="WidgetFoundation.ProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal">