From b1d51bbefbcb9bdea442662b4322ddb95df01517 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Mon, 27 Jun 2022 12:11:22 +0300
Subject: [PATCH] Migrate to MaterialSwitch component

---
 .../main/res/layout/activity_category_edit.xml    |  2 +-
 .../res/layout/item_search_suggestion_header.xml  |  2 +-
 app/src/main/res/layout/item_source_config.xml    |  2 +-
 .../res/layout/item_source_config_draggable.xml   |  2 +-
 .../layout/preference_widget_material_switch.xml  |  9 +++++++++
 app/src/main/res/values-night/bools.xml           |  1 -
 app/src/main/res/values-v23/styles.xml            | 11 -----------
 app/src/main/res/values/bools.xml                 |  1 -
 app/src/main/res/values/styles.xml                | 15 ++++-----------
 app/src/main/res/values/themes.xml                |  2 +-
 10 files changed, 18 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/res/layout/preference_widget_material_switch.xml
 delete mode 100644 app/src/main/res/values-v23/styles.xml

diff --git a/app/src/main/res/layout/activity_category_edit.xml b/app/src/main/res/layout/activity_category_edit.xml
index 4cd3a7afe..93eef7b49 100644
--- a/app/src/main/res/layout/activity_category_edit.xml
+++ b/app/src/main/res/layout/activity_category_edit.xml
@@ -68,7 +68,7 @@
 
 			</com.google.android.material.textfield.TextInputLayout>
 
-			<com.google.android.material.switchmaterial.SwitchMaterial
+			<com.google.android.material.materialswitch.MaterialSwitch
 				android:id="@+id/switch_tracker"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_search_suggestion_header.xml b/app/src/main/res/layout/item_search_suggestion_header.xml
index 62b29b12d..7dfd54154 100644
--- a/app/src/main/res/layout/item_search_suggestion_header.xml
+++ b/app/src/main/res/layout/item_search_suggestion_header.xml
@@ -9,7 +9,7 @@
 	android:paddingStart="?listPreferredItemPaddingStart"
 	android:paddingEnd="?listPreferredItemPaddingEnd">
 
-	<com.google.android.material.switchmaterial.SwitchMaterial
+	<com.google.android.material.materialswitch.MaterialSwitch
 		android:id="@+id/switch_local"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_source_config.xml b/app/src/main/res/layout/item_source_config.xml
index 859105c96..de07db26a 100644
--- a/app/src/main/res/layout/item_source_config.xml
+++ b/app/src/main/res/layout/item_source_config.xml
@@ -48,7 +48,7 @@
 
 	</LinearLayout>
 
-	<com.google.android.material.switchmaterial.SwitchMaterial
+	<com.google.android.material.materialswitch.MaterialSwitch
 		android:id="@+id/switch_toggle"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_source_config_draggable.xml b/app/src/main/res/layout/item_source_config_draggable.xml
index 3af85fe59..f6ae672dd 100644
--- a/app/src/main/res/layout/item_source_config_draggable.xml
+++ b/app/src/main/res/layout/item_source_config_draggable.xml
@@ -47,7 +47,7 @@
 
 	</LinearLayout>
 
-	<com.google.android.material.switchmaterial.SwitchMaterial
+	<com.google.android.material.materialswitch.MaterialSwitch
 		android:id="@+id/switch_toggle"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/preference_widget_material_switch.xml b/app/src/main/res/layout/preference_widget_material_switch.xml
new file mode 100644
index 000000000..f4e6866c1
--- /dev/null
+++ b/app/src/main/res/layout/preference_widget_material_switch.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.materialswitch.MaterialSwitch
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/switchWidget"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:background="@null"
+	android:clickable="false"
+	android:focusable="false" />
\ No newline at end of file
diff --git a/app/src/main/res/values-night/bools.xml b/app/src/main/res/values-night/bools.xml
index bd0cb49f5..869e5dabd 100644
--- a/app/src/main/res/values-night/bools.xml
+++ b/app/src/main/res/values-night/bools.xml
@@ -2,5 +2,4 @@
 <resources>
 	<bool name="light_status_bar">false</bool>
 	<bool name="light_navigation_bar">false</bool>
-	<bool name="elevation_overlay_enabled">true</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
deleted file mode 100644
index f7eb9b21e..000000000
--- a/app/src/main/res/values-v23/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-	<style name="Widget.Kotatsu.Switch" parent="Widget.Material3.CompoundButton.Switch">
-		<item name="android:thumb">@drawable/switch_thumb</item>
-		<item name="thumbTint">@color/selector_switch_thumb</item>
-		<item name="track">@drawable/switch_track</item>
-		<item name="trackTint">@color/selector_switch_track</item>
-		<item name="materialThemeOverlay">@style/ThemeOverlay.Kotatsu.Switch</item>
-	</style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index 6cb53be9e..0940b1dbb 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -3,5 +3,4 @@
 	<bool name="is_tablet">false</bool>
 	<bool name="light_status_bar">true</bool>
 	<bool name="light_navigation_bar">false</bool>
-	<bool name="elevation_overlay_enabled">false</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8951634e9..b4f3f77cf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -86,13 +86,6 @@
 		<item name="iconPadding">16dp</item>
 	</style>
 
-	<style name="Widget.Kotatsu.Switch" parent="Widget.Material3.CompoundButton.Switch">
-		<item name="android:thumb">@drawable/switch_thumb</item>
-		<item name="track">@drawable/switch_track</item>
-		<item name="useMaterialThemeColors">false</item>
-		<item name="materialThemeOverlay">@style/ThemeOverlay.Kotatsu.Switch</item>
-	</style>
-
 	<style name="Widget.Kotatsu.RecyclerView" parent="">
 		<item name="fastScrollHorizontalThumbDrawable">@drawable/list_thumb</item>
 		<item name="fastScrollVerticalThumbDrawable">@drawable/list_thumb</item>
@@ -113,10 +106,6 @@
 		<item name="android:insetBottom">2dp</item>
 	</style>
 
-	<style name="ThemeOverlay.Kotatsu.Switch" parent="">
-		<item name="elevationOverlayEnabled">@bool/elevation_overlay_enabled</item>
-	</style>
-
 	<style name="ThemeOverlay.Kotatsu.MainToolbar" parent="">
 		<item name="colorControlHighlight">@color/selector_overlay</item>
 	</style>
@@ -180,4 +169,8 @@
 		<item name="android:dialogLayout">@layout/preference_dialog_autocompletetextview</item>
 	</style>
 
+	<style name="Preference.SwitchPreferenceCompat.M3" parent="Preference.SwitchPreferenceCompat.Material">
+		<item name="android:widgetLayout">@layout/preference_widget_material_switch</item>
+	</style>
+
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 691c50251..f23f676ba 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -68,11 +68,11 @@
 		<item name="toolbarStyle">@style/Widget.Material3.Toolbar</item>
 		<item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
 		<item name="tabStyle">@style/Widget.Kotatsu.Tabs</item>
-		<item name="switchStyle">@style/Widget.Kotatsu.Switch</item>
 		<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Filled</item>
 		<item name="recyclerViewStyle">@style/Widget.Kotatsu.RecyclerView</item>
 		<item name="listItemTextViewStyle">@style/Widget.Kotatsu.ListItemTextView</item>
 		<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
+		<item name="switchPreferenceCompatStyle">@style/Preference.SwitchPreferenceCompat.M3</item>
 
 		<!-- Text appearance -->
 		<item name="actionMenuTextAppearance">@style/TextAppearance.Kotatsu.Menu</item>