From 5d0dac69475692cc724e20cebe17d4a1fc16cfc9 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Sat, 16 Jul 2022 17:42:35 +0300
Subject: [PATCH] Some cleanup

---
 app/src/main/res/drawable/list_thumb.xml        |  5 -----
 app/src/main/res/drawable/list_track.xml        |  5 -----
 app/src/main/res/drawable/thumb.xml             | 12 ------------
 app/src/main/res/drawable/thumb_activated.xml   | 12 ------------
 app/src/main/res/drawable/track.xml             |  4 ----
 .../main/res/layout-w600dp/fragment_details.xml |  1 +
 app/src/main/res/layout/fragment_details.xml    |  1 +
 app/src/main/res/values/styles.xml              | 17 -----------------
 app/src/main/res/values/themes.xml              |  3 ---
 9 files changed, 2 insertions(+), 58 deletions(-)
 delete mode 100644 app/src/main/res/drawable/list_thumb.xml
 delete mode 100644 app/src/main/res/drawable/list_track.xml
 delete mode 100644 app/src/main/res/drawable/thumb.xml
 delete mode 100644 app/src/main/res/drawable/thumb_activated.xml
 delete mode 100644 app/src/main/res/drawable/track.xml

diff --git a/app/src/main/res/drawable/list_thumb.xml b/app/src/main/res/drawable/list_thumb.xml
deleted file mode 100644
index 5d9290f87..000000000
--- a/app/src/main/res/drawable/list_thumb.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:drawable="@drawable/thumb_activated" android:state_pressed="true" />
-	<item android:drawable="@drawable/thumb" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/list_track.xml b/app/src/main/res/drawable/list_track.xml
deleted file mode 100644
index 599a4728d..000000000
--- a/app/src/main/res/drawable/list_track.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:drawable="@drawable/track" android:state_pressed="true" />
-	<item android:drawable="@drawable/track" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/thumb.xml b/app/src/main/res/drawable/thumb.xml
deleted file mode 100644
index 72ace3cdb..000000000
--- a/app/src/main/res/drawable/thumb.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<corners android:radius="10dp" />
-	<padding
-		android:bottom="10dp"
-		android:left="10dp"
-		android:right="10dp"
-		android:top="10dp" />
-	<solid android:color="@color/scrollbar" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/thumb_activated.xml b/app/src/main/res/drawable/thumb_activated.xml
deleted file mode 100644
index 48f91fca7..000000000
--- a/app/src/main/res/drawable/thumb_activated.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<corners android:radius="10dp" />
-	<padding
-		android:bottom="10dp"
-		android:left="10dp"
-		android:right="10dp"
-		android:top="10dp" />
-	<solid android:color="?colorControlActivated" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/track.xml b/app/src/main/res/drawable/track.xml
deleted file mode 100644
index 00bd82d2e..000000000
--- a/app/src/main/res/drawable/track.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle" />
\ No newline at end of file
diff --git a/app/src/main/res/layout-w600dp/fragment_details.xml b/app/src/main/res/layout-w600dp/fragment_details.xml
index e45f03909..591c31b99 100644
--- a/app/src/main/res/layout-w600dp/fragment_details.xml
+++ b/app/src/main/res/layout-w600dp/fragment_details.xml
@@ -193,6 +193,7 @@
 			android:layout_marginTop="4dp"
 			android:layout_marginBottom="6dp"
 			android:clipToPadding="false"
+			android:nestedScrollingEnabled="false"
 			android:orientation="horizontal"
 			android:paddingStart="12dp"
 			android:paddingEnd="12dp"
diff --git a/app/src/main/res/layout/fragment_details.xml b/app/src/main/res/layout/fragment_details.xml
index bd3430cfc..bc8154691 100644
--- a/app/src/main/res/layout/fragment_details.xml
+++ b/app/src/main/res/layout/fragment_details.xml
@@ -190,6 +190,7 @@
 			android:layout_marginTop="4dp"
 			android:layout_marginBottom="6dp"
 			android:clipToPadding="false"
+			android:nestedScrollingEnabled="false"
 			android:orientation="horizontal"
 			android:paddingStart="12dp"
 			android:paddingEnd="12dp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c13aa33f4..02f0925de 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -17,15 +17,6 @@
 		<item name="theme">@style/ThemeOverlay.Kotatsu.ActionMode</item>
 	</style>
 
-	<!--AlertDialog-->
-
-	<style name="ThemeOverlay.Kotatsu.MaterialAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
-		<item name="android:background">?attr/colorSurface</item>
-		<item name="android:textColorPrimary">?attr/colorOnSurface</item>
-		<item name="android:textColor">?attr/colorOnSurface</item>
-		<item name="dialogCornerRadius">28dp</item>
-	</style>
-
 	<!-- Bottom sheet -->
 
 	<style name="ThemeOverlay.Kotatsu.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
@@ -107,14 +98,6 @@
 		<item name="iconPadding">16dp</item>
 	</style>
 
-	<style name="Widget.Kotatsu.RecyclerView" parent="">
-		<item name="fastScrollHorizontalThumbDrawable">@drawable/list_thumb</item>
-		<item name="fastScrollVerticalThumbDrawable">@drawable/list_thumb</item>
-		<item name="fastScrollHorizontalTrackDrawable">@drawable/list_track</item>
-		<item name="fastScrollVerticalTrackDrawable">@drawable/list_track</item>
-		<item name="android:scrollbarStyle">outsideOverlay</item>
-	</style>
-
 	<style name="Widget.Kotatsu.FastScroller" parent="">
 		<item name="thumbColor">?colorTertiary</item>
 		<item name="bubbleColor">?colorTertiary</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 6aa43ec28..0c7146559 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -52,9 +52,7 @@
 		<item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
 		<item name="android:enforceStatusBarContrast" tools:targetApi="Q">false</item>
 		<item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item>
-		<item name="alertDialogTheme">@style/ThemeOverlay.Kotatsu.MaterialAlertDialog</item>
 		<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Kotatsu.BottomSheetDialog</item>
-		<item name="materialAlertDialogTheme">@style/ThemeOverlay.Kotatsu.MaterialAlertDialog</item>
 		<item name="textAppearanceButton">@style/TextAppearance.Kotatsu.Button</item>
 		<item name="android:buttonStyle">?attr/borderlessButtonStyle</item>
 		<item name="android:backgroundDimAmount">0.32</item>
@@ -70,7 +68,6 @@
 		<item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView</item>
 		<item name="tabStyle">@style/Widget.Kotatsu.Tabs</item>
 		<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Filled</item>
-		<item name="recyclerViewStyle">@style/Widget.Kotatsu.RecyclerView</item>
 		<item name="fastScrollerStyle">@style/Widget.Kotatsu.FastScroller</item>
 		<item name="listItemTextViewStyle">@style/Widget.Kotatsu.ListItemTextView</item>
 		<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>