From 7fb67be1b640af67160f482d8386af50d4a33352 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Mon, 28 Feb 2022 01:24:21 +0300
Subject: [PATCH] Some UI changes

---
 .../kotatsu/base/ui/widgets/CoverImageView.kt |   5 +-
 .../ui/categories/CategoriesActivity.kt       |   4 +-
 .../kotatsu/list/ui/MangaListFragment.kt      |   2 +-
 .../koitharu/kotatsu/utils/ext/AndroidExt.kt  |   1 -
 .../org/koitharu/kotatsu/utils/ext/UiExt.kt   |  21 ----
 .../main/res/color/navigation_bar_scrim.xml   |   4 +
 app/src/main/res/drawable/list_selector.xml   |   6 +-
 .../drawable/navigation_item_background.xml   |  19 ---
 .../main/res/layout/activity_categories.xml   |   2 +-
 app/src/main/res/layout/activity_main.xml     |   6 +-
 .../main/res/layout/item_current_filter.xml   |   4 +-
 app/src/main/res/layout/item_header.xml       |   2 -
 app/src/main/res/layout/item_manga_grid.xml   |  15 ++-
 app/src/main/res/layout/item_manga_list.xml   |  66 +++++------
 .../res/layout/item_manga_list_details.xml    | 108 +++++++++---------
 .../layout/item_source_config_draggable.xml   |   1 -
 app/src/main/res/values-v23/themes.xml        |  10 ++
 app/src/main/res/values-v27/themes.xml        |   3 +-
 app/src/main/res/values/dimens.xml            |   9 +-
 app/src/main/res/values/styles.xml            |   6 +
 app/src/main/res/values/themes.xml            |   6 +-
 21 files changed, 134 insertions(+), 166 deletions(-)
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/ext/UiExt.kt
 create mode 100644 app/src/main/res/color/navigation_bar_scrim.xml
 delete mode 100644 app/src/main/res/drawable/navigation_item_background.xml
 create mode 100644 app/src/main/res/values-v23/themes.xml

diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CoverImageView.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CoverImageView.kt
index a4e7bf748..6f0c9e4e2 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CoverImageView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CoverImageView.kt
@@ -3,15 +3,14 @@ package org.koitharu.kotatsu.base.ui.widgets
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.LinearLayout
-import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.content.withStyledAttributes
+import com.google.android.material.imageview.ShapeableImageView
 import org.koitharu.kotatsu.R
 import kotlin.math.roundToInt
 
-
 class CoverImageView @JvmOverloads constructor(
 	context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0,
-) : AppCompatImageView(context, attrs, defStyleAttr) {
+) : ShapeableImageView(context, attrs, defStyleAttr) {
 
 	private var orientation: Int = HORIZONTAL
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
index f08a83032..8a1076d37 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
@@ -148,7 +148,7 @@ class CategoriesActivity : BaseActivity<ActivityCategoriesBinding>(),
 		override fun onMove(
 			recyclerView: RecyclerView,
 			viewHolder: RecyclerView.ViewHolder,
-			target: RecyclerView.ViewHolder
+			target: RecyclerView.ViewHolder,
 		): Boolean = true
 
 		override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) = Unit
@@ -160,7 +160,7 @@ class CategoriesActivity : BaseActivity<ActivityCategoriesBinding>(),
 			target: RecyclerView.ViewHolder,
 			toPos: Int,
 			x: Int,
-			y: Int
+			y: Int,
 		) {
 			super.onMoved(recyclerView, viewHolder, fromPos, target, toPos, x, y)
 			viewModel.reorderCategories(fromPos, toPos)
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
index bee787480..a91d3924b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
@@ -257,7 +257,7 @@ abstract class MangaListFragment : BaseFragment<FragmentListBinding>(),
 				}
 				ListMode.DETAILED_LIST -> {
 					layoutManager = LinearLayoutManager(context)
-					val spacing = resources.getDimensionPixelOffset(R.dimen.grid_spacing)
+					val spacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
 					updatePadding(left = spacing, right = spacing)
 					addItemDecoration(SpacingItemDecoration(spacing))
 				}
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
index 6eef68d17..215e2d185 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkRequest
-import android.os.Build
 import androidx.appcompat.app.AlertDialog
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.suspendCancellableCoroutine
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/UiExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/UiExt.kt
deleted file mode 100644
index f66e9f880..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/UiExt.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.koitharu.kotatsu.utils.ext
-
-import android.content.Context
-import android.graphics.drawable.Drawable
-import androidx.appcompat.content.res.AppCompatResources
-import androidx.core.graphics.drawable.DrawableCompat
-import org.koitharu.kotatsu.R
-
-fun navigationItemBackground(context: Context): Drawable? {
-	// Need to inflate the drawable and CSL via AppCompatResources to work on Lollipop
-	// From Google I/O repo (https://github.com/google/iosched)
-	var background = AppCompatResources.getDrawable(context, R.drawable.navigation_item_background)
-	if (background != null) {
-		val tint = AppCompatResources.getColorStateList(
-			context, R.color.navigation_item_background_tint
-		)
-		background = DrawableCompat.wrap(background.mutate())
-		background.setTintList(tint)
-	}
-	return background
-}
\ No newline at end of file
diff --git a/app/src/main/res/color/navigation_bar_scrim.xml b/app/src/main/res/color/navigation_bar_scrim.xml
new file mode 100644
index 000000000..6d9fe48af
--- /dev/null
+++ b/app/src/main/res/color/navigation_bar_scrim.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:alpha="0.7" android:color="?attr/colorSurface" />
+</selector>
diff --git a/app/src/main/res/drawable/list_selector.xml b/app/src/main/res/drawable/list_selector.xml
index 14508c152..99d9a4cfc 100644
--- a/app/src/main/res/drawable/list_selector.xml
+++ b/app/src/main/res/drawable/list_selector.xml
@@ -10,7 +10,7 @@
 				android:bottom="2dp"
 				android:left="2dp">
 				<shape android:shape="rectangle">
-					<corners android:radius="4dp" />
+					<corners android:radius="12dp" />
 					<solid android:color="@color/selector_overlay" />
 				</shape>
 			</item>
@@ -22,7 +22,7 @@
 				android:bottom="2dp"
 				android:left="2dp">
 				<shape android:shape="rectangle">
-					<corners android:radius="4dp" />
+					<corners android:radius="12dp" />
 					<solid android:color="@color/selector_overlay" />
 				</shape>
 			</item>
@@ -33,7 +33,7 @@
 				android:bottom="2dp"
 				android:left="2dp">
 				<shape android:shape="rectangle">
-					<corners android:radius="4dp" />
+					<corners android:radius="12dp" />
 					<solid android:color="?android:attr/windowBackground" />
 				</shape>
 			</item>
diff --git a/app/src/main/res/drawable/navigation_item_background.xml b/app/src/main/res/drawable/navigation_item_background.xml
deleted file mode 100644
index 8c635e7a3..000000000
--- a/app/src/main/res/drawable/navigation_item_background.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_checked="true">
-		<inset
-			android:insetLeft="@dimen/nav_item_background_inset_left"
-			android:insetRight="@dimen/nav_item_background_inset_right">
-			<shape>
-				<corners
-					android:bottomLeftRadius="@dimen/nav_item_background_corner_radius_left"
-					android:bottomRightRadius="@dimen/nav_item_background_corner_radius_right"
-					android:topLeftRadius="@dimen/nav_item_background_corner_radius_left"
-					android:topRightRadius="@dimen/nav_item_background_corner_radius_right" />
-			</shape>
-		</inset>
-	</item>
-	<item>
-		<color android:color="@android:color/transparent" />
-	</item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_categories.xml b/app/src/main/res/layout/activity_categories.xml
index 5dcfe622d..d553d862d 100644
--- a/app/src/main/res/layout/activity_categories.xml
+++ b/app/src/main/res/layout/activity_categories.xml
@@ -15,7 +15,7 @@
 			android:id="@+id/toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="?attr/actionBarSize"
-			android:theme="?attr/actionBarTheme"/>
+			android:theme="?attr/actionBarTheme" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f02321df3..b944dcc54 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -27,21 +27,21 @@
 
 			<FrameLayout
 				android:id="@+id/toolbar_card"
-				android:background="@drawable/toolbar_background"
 				android:layout_width="match_parent"
 				android:layout_height="48dp"
 				android:layout_marginStart="16dp"
 				android:layout_marginTop="8dp"
 				android:layout_marginEnd="16dp"
-				android:layout_marginBottom="8dp">
+				android:layout_marginBottom="8dp"
+				android:background="@drawable/toolbar_background">
 
 				<com.google.android.material.appbar.MaterialToolbar
 					android:id="@id/toolbar"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
+					android:background="@android:color/transparent"
 					android:focusable="true"
 					android:focusableInTouchMode="true"
-					android:background="@android:color/transparent"
 					app:contentInsetStartWithNavigation="0dp"
 					app:titleTextAppearance="@style/TextAppearance.Kotatsu.PersistentToolbarTitle"
 					app:titleTextColor="?android:colorControlNormal"
diff --git a/app/src/main/res/layout/item_current_filter.xml b/app/src/main/res/layout/item_current_filter.xml
index 363c385d4..1014b0fdd 100644
--- a/app/src/main/res/layout/item_current_filter.xml
+++ b/app/src/main/res/layout/item_current_filter.xml
@@ -3,9 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:paddingStart="8dp"
-	android:paddingEnd="8dp">
+	android:layout_height="wrap_content">
 
 	<org.koitharu.kotatsu.base.ui.widgets.ChipsView
 		android:id="@+id/chips_tags"
diff --git a/app/src/main/res/layout/item_header.xml b/app/src/main/res/layout/item_header.xml
index 2473dbf63..cf3a899f9 100644
--- a/app/src/main/res/layout/item_header.xml
+++ b/app/src/main/res/layout/item_header.xml
@@ -5,8 +5,6 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:gravity="center_vertical|start"
-	android:paddingStart="8dp"
-	android:paddingEnd="8dp"
 	android:singleLine="true"
 	android:textAppearance="@style/TextAppearance.Kotatsu.SectionHeader"
 	tools:text="@tools:sample/lorem[2]" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_manga_grid.xml b/app/src/main/res/layout/item_manga_grid.xml
index 866f9c975..13833e6a8 100644
--- a/app/src/main/res/layout/item_manga_grid.xml
+++ b/app/src/main/res/layout/item_manga_grid.xml
@@ -4,6 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:background="@drawable/list_selector"
 	android:orientation="vertical">
 
@@ -11,9 +12,7 @@
 		android:id="@+id/card"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginHorizontal="8dp"
-		android:layout_marginTop="8dp"
-		android:layout_marginBottom="4dp">
+		app:cardCornerRadius="12dp">
 
 		<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
 			android:id="@+id/imageView_cover"
@@ -28,15 +27,15 @@
 
 	<TextView
 		android:id="@+id/textView_title"
-		style="?attr/textAppearanceBodyMedium"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:elegantTextHeight="false"
 		android:ellipsize="end"
-		android:lineSpacingExtra="-2dp"
 		android:maxLines="2"
-		android:paddingHorizontal="8dp"
-		android:paddingBottom="4dp"
+		android:padding="4dp"
+		android:textAppearance="?attr/textAppearanceTitleSmall"
+		android:textColor="?android:attr/textColorPrimary"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/thumbnail"
 		tools:text="Sample name" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_manga_list.xml b/app/src/main/res/layout/item_manga_list.xml
index 52ee08093..fef7a5c33 100644
--- a/app/src/main/res/layout/item_manga_list.xml
+++ b/app/src/main/res/layout/item_manga_list.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
 	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"
 	android:layout_width="match_parent"
 	android:layout_height="@dimen/manga_list_item_height"
-	android:background="@drawable/list_selector"
-	android:gravity="center_vertical"
-	android:orientation="horizontal">
+	app:cardCornerRadius="12dp">
 
-	<com.google.android.material.card.MaterialCardView
-		android:layout_width="wrap_content"
+	<LinearLayout
+		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:layout_margin="8dp">
+		android:orientation="horizontal">
 
 		<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
 			android:id="@+id/imageView_cover"
@@ -19,37 +18,38 @@
 			android:layout_height="match_parent"
 			android:orientation="vertical"
 			android:scaleType="centerCrop"
+			app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
 			tools:src="@tools:sample/backgrounds/scenic" />
 
-	</com.google.android.material.card.MaterialCardView>
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_vertical"
-		android:orientation="vertical"
-		android:paddingStart="20dp"
-		android:paddingEnd="16dp">
-
-		<TextView
-			android:id="@+id/textView_title"
+		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:ellipsize="end"
-			android:maxLines="2"
-			android:textAppearance="?attr/textAppearanceBodyLarge"
-			tools:text="@tools:sample/lorem/random" />
+			android:layout_gravity="center_vertical"
+			android:orientation="vertical"
+			android:paddingStart="20dp"
+			android:paddingEnd="16dp">
 
-		<TextView
-			android:id="@+id/textView_subtitle"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:ellipsize="end"
-			android:maxLines="1"
-			android:textAppearance="?attr/textAppearanceBodyMedium"
-			android:textColor="?android:textColorSecondary"
-			tools:text="@tools:sample/lorem/random" />
+			<TextView
+				android:id="@+id/textView_title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:ellipsize="end"
+				android:maxLines="2"
+				android:textAppearance="?attr/textAppearanceBodyLarge"
+				tools:text="@tools:sample/lorem/random" />
+
+			<TextView
+				android:id="@+id/textView_subtitle"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:ellipsize="end"
+				android:maxLines="1"
+				android:textAppearance="?attr/textAppearanceBodyMedium"
+				android:textColor="?android:textColorSecondary"
+				tools:text="@tools:sample/lorem/random" />
+
+		</LinearLayout>
 
 	</LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_manga_list_details.xml b/app/src/main/res/layout/item_manga_list_details.xml
index e3ebb7148..468a1b476 100644
--- a/app/src/main/res/layout/item_manga_list_details.xml
+++ b/app/src/main/res/layout/item_manga_list_details.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
 	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"
 	android:layout_width="match_parent"
 	android:layout_height="@dimen/manga_list_details_item_height"
-	android:background="@drawable/list_selector"
-	android:orientation="horizontal">
+	app:cardCornerRadius="12dp">
 
-	<com.google.android.material.card.MaterialCardView
-		android:layout_width="wrap_content"
+	<LinearLayout
+		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:layout_margin="8dp">
+		android:orientation="horizontal">
 
 		<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
 			android:id="@+id/imageView_cover"
@@ -19,70 +18,71 @@
 			android:layout_height="match_parent"
 			android:orientation="vertical"
 			android:scaleType="centerCrop"
-			tools:src="@tools:sample/backgrounds/scenic"/>
-
-	</com.google.android.material.card.MaterialCardView>
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_vertical"
-		android:layout_margin="8dp"
-		android:orientation="vertical">
-
-		<TextView
-			android:id="@+id/textView_title"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginBottom="4dp"
-			android:ellipsize="end"
-			android:maxLines="2"
-			android:textAppearance="?attr/textAppearanceTitleMedium"
-			tools:text="@tools:sample/lorem/random" />
-
-		<TextView
-			android:id="@+id/textView_subtitle"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginBottom="4dp"
-			android:ellipsize="none"
-			android:gravity="center_vertical"
-			android:requiresFadingEdge="horizontal"
-			android:singleLine="true"
-			android:textAppearance="?attr/textAppearanceBodyMedium"
-			tools:text="@tools:sample/lorem/random" />
+			tools:src="@tools:sample/backgrounds/scenic"
+			app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"/>
 
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:orientation="horizontal"
-			android:gravity="center">
+			android:layout_gravity="center_vertical"
+			android:layout_margin="16dp"
+			android:orientation="vertical">
 
 			<TextView
-				android:id="@+id/textView_tags"
-				android:layout_width="0dp"
+				android:id="@+id/textView_title"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_weight="1"
+				android:layout_marginBottom="4dp"
+				android:ellipsize="end"
+				android:maxLines="2"
+				android:textAppearance="?attr/textAppearanceTitleMedium"
+				tools:text="@tools:sample/lorem/random" />
+
+			<TextView
+				android:id="@+id/textView_subtitle"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="4dp"
 				android:ellipsize="none"
 				android:gravity="center_vertical"
 				android:requiresFadingEdge="horizontal"
 				android:singleLine="true"
-				android:textAppearance="?attr/textAppearanceBodySmall"
+				android:textAppearance="?attr/textAppearanceBodyMedium"
 				tools:text="@tools:sample/lorem/random" />
 
-			<TextView
-				android:id="@+id/textView_rating"
-				android:layout_width="wrap_content"
+			<LinearLayout
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_gravity="bottom"
-				android:drawablePadding="4dp"
-				android:paddingStart="6dp"
-				app:drawableEndCompat="@drawable/ic_star"
-				tools:ignore="RtlSymmetry"
-				tools:text="9.6" />
+				android:orientation="horizontal"
+				android:gravity="center">
+
+				<TextView
+					android:id="@+id/textView_tags"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:ellipsize="none"
+					android:gravity="center_vertical"
+					android:requiresFadingEdge="horizontal"
+					android:singleLine="true"
+					android:textAppearance="?attr/textAppearanceBodySmall"
+					tools:text="@tools:sample/lorem/random" />
+
+				<TextView
+					android:id="@+id/textView_rating"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="bottom"
+					android:drawablePadding="4dp"
+					android:paddingStart="6dp"
+					app:drawableEndCompat="@drawable/ic_star"
+					tools:ignore="RtlSymmetry"
+					tools:text="9.6" />
+
+			</LinearLayout>
 
 		</LinearLayout>
 
 	</LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
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 ffa9a68e5..2e4ae2c57 100644
--- a/app/src/main/res/layout/item_source_config_draggable.xml
+++ b/app/src/main/res/layout/item_source_config_draggable.xml
@@ -4,7 +4,6 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="?android:listPreferredItemHeightSmall"
-	android:background="?android:windowBackground"
 	android:gravity="center_vertical"
 	android:orientation="horizontal">
 
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
new file mode 100644
index 000000000..a0b9e171e
--- /dev/null
+++ b/app/src/main/res/values-v23/themes.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<style name="Base.V23.Kotatsu" parent="Base.Theme.Kotatsu">
+		<item name="android:statusBarColor">@android:color/transparent</item>
+	</style>
+
+	<style name="Theme.Kotatsu" parent="Base.V23.Kotatsu" />
+
+</resources>
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
index 6e14e07fb..b811f2eb6 100644
--- a/app/src/main/res/values-v27/themes.xml
+++ b/app/src/main/res/values-v27/themes.xml
@@ -2,7 +2,8 @@
 <resources>
 
 	<style name="Base.V27.Kotatsu" parent="Base.Theme.Kotatsu">
-		<item name="android:navigationBarColor">@android:color/transparent</item>
+		<item name="android:statusBarColor">@android:color/transparent</item>
+		<item name="android:navigationBarColor">@color/navigation_bar_scrim</item>
 		<item name="android:windowLightNavigationBar">@bool/light_navigation_bar</item>
 	</style>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 0f4b7d260..c99c2e193 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -7,14 +7,9 @@
 	<!-- Navigation -->
 	<dimen name="nav_header_logo_size">36dp</dimen>
 	<dimen name="nav_item_horizontal_padding">24dp</dimen>
-	<!-- Intrinsic height may vary. Use a large radius to ensure a semicircle. -->
-	<dimen name="nav_item_background_corner_radius_left">0dp</dimen>
-	<dimen name="nav_item_background_corner_radius_right">100dp</dimen>
-	<dimen name="nav_item_background_inset_left">0dp</dimen>
-	<dimen name="nav_item_background_inset_right">8dp</dimen>>
 
-	<dimen name="grid_spacing">4dp</dimen>
-	<dimen name="list_spacing">4dp</dimen>
+	<dimen name="grid_spacing">8dp</dimen>
+	<dimen name="list_spacing">8dp</dimen>
 	<dimen name="grid_spacing_outer">2dp</dimen>
 	<dimen name="manga_list_item_height">86dp</dimen>
 	<dimen name="manga_list_details_item_height">120dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a7593b677..2cdf110c3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -137,6 +137,12 @@
 		<item name="android:textColor">?android:attr/textColorSecondary</item>
 	</style>
 
+	<!-- Shapes -->
+
+	<style name="ShapeAppearanceOverlay.Kotatsu.Cover" parent="">
+		<item name="cornerSize">12dp</item>
+	</style>
+
 	<!--Preferences-->
 
 	<style name="PreferenceThemeOverlay.Kotatsu">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ac59adba4..d1b29006e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -44,7 +44,7 @@
 
 		<!-- Themes -->
 		<item name="android:windowLightStatusBar" tools:targetApi="M">@bool/light_status_bar</item>
-		<item name="android:statusBarColor">@android:color/transparent</item>
+		<item name="android:statusBarColor">@color/surface_amoled</item>
 		<item name="android:navigationBarColor">@color/surface_amoled</item>
 		<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
 		<item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
@@ -66,7 +66,7 @@
 		<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.Elevated</item>
+		<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Filled</item>
 		<item name="recyclerViewStyle">@style/Widget.Kotatsu.RecyclerView</item>
 
 		<!-- Preference text appearance -->
@@ -85,4 +85,4 @@
 
 	<style name="ThemeOverlay.Kotatsu.AMOLED" parent="" />
 
-</resources>
\ No newline at end of file
+</resources>