From d4589716aaa274aff9032acb3b525362ea273083 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 12 Aug 2023 18:20:15 +0300
Subject: [PATCH] Improve tablet layout

---
 .../kotatsu/core/ui/BasePreferenceFragment.kt |  4 +-
 .../activity_categories.xml                   | 70 -------------------
 .../layout-w600dp-land/activity_details.xml   |  1 +
 .../activity_manga_list.xml                   |  1 +
 .../layout-w600dp-land/activity_settings.xml  |  5 +-
 .../fragment_settings_sources.xml             | 15 ++++
 .../item_recommendation.xml                   | 67 ++++++++++++++++++
 .../res/layout/fragment_settings_sources.xml  |  2 +-
 app/src/main/res/layout/item_manga_grid.xml   |  3 +-
 app/src/main/res/layout/item_manga_list.xml   |  1 +
 .../res/layout/item_manga_list_details.xml    |  1 +
 .../main/res/layout/item_recommendation.xml   |  2 +-
 .../main/res/values-w600dp-land/integers.xml  |  4 +-
 app/src/main/res/values/styles.xml            |  8 +++
 14 files changed, 106 insertions(+), 78 deletions(-)
 delete mode 100644 app/src/main/res/layout-w600dp-land/activity_categories.xml
 create mode 100644 app/src/main/res/layout-w600dp-land/fragment_settings_sources.xml
 create mode 100644 app/src/main/res/layout-w600dp-land/item_recommendation.xml

diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BasePreferenceFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BasePreferenceFragment.kt
index ce407ddca..331802824 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BasePreferenceFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BasePreferenceFragment.kt
@@ -13,6 +13,7 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
+import org.koitharu.kotatsu.core.util.ext.parentView
 import org.koitharu.kotatsu.settings.SettingsActivity
 import javax.inject.Inject
 
@@ -33,7 +34,8 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		view.setBackgroundColor(view.context.getThemeColor(android.R.attr.colorBackground))
+		val themedContext = (view.parentView ?: view).context
+		view.setBackgroundColor(themedContext.getThemeColor(android.R.attr.colorBackground))
 		listView.clipToPadding = false
 		insetsDelegate.onViewCreated(view)
 		insetsDelegate.addInsetsListener(this)
diff --git a/app/src/main/res/layout-w600dp-land/activity_categories.xml b/app/src/main/res/layout-w600dp-land/activity_categories.xml
deleted file mode 100644
index a7c07c39e..000000000
--- a/app/src/main/res/layout-w600dp-land/activity_categories.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-	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="match_parent">
-
-	<com.google.android.material.appbar.AppBarLayout
-		android:id="@+id/appbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:fitsSystemWindows="true">
-
-		<com.google.android.material.appbar.CollapsingToolbarLayout
-			android:id="@+id/collapsingToolbarLayout"
-			style="?attr/collapsingToolbarLayoutLargeStyle"
-			android:layout_width="match_parent"
-			android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
-			app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
-			app:toolbarId="@id/toolbar">
-
-			<com.google.android.material.appbar.MaterialToolbar
-				android:id="@id/toolbar"
-				android:layout_width="match_parent"
-				android:layout_height="?attr/actionBarSize"
-				app:layout_collapseMode="pin">
-
-				<Button
-					android:id="@+id/button_done"
-					style="@style/Widget.Material3.Button.UnelevatedButton"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_gravity="end"
-					android:layout_marginHorizontal="@dimen/toolbar_button_margin"
-					android:text="@string/done"
-					android:visibility="gone" />
-
-			</com.google.android.material.appbar.MaterialToolbar>
-
-		</com.google.android.material.appbar.CollapsingToolbarLayout>
-
-	</com.google.android.material.appbar.AppBarLayout>
-
-	<androidx.recyclerview.widget.RecyclerView
-		android:id="@+id/recyclerView"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:clipToPadding="false"
-		android:orientation="vertical"
-		android:paddingVertical="@dimen/list_spacing"
-		android:scrollbars="vertical"
-		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-		app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
-
-	<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-		android:id="@+id/fab_add"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_margin="16dp"
-		android:contentDescription="@string/add_new_category"
-		android:src="@drawable/ic_add"
-		android:text="@string/create_category"
-		app:fabSize="normal"
-		app:icon="@drawable/ic_add"
-		app:layout_anchor="@id/recyclerView"
-		app:layout_anchorGravity="bottom|end"
-		app:layout_behavior="org.koitharu.kotatsu.core.ui.util.ShrinkOnScrollBehavior"
-		app:layout_dodgeInsetEdges="bottom" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-w600dp-land/activity_details.xml b/app/src/main/res/layout-w600dp-land/activity_details.xml
index 03faa2f1f..6dd525f7b 100644
--- a/app/src/main/res/layout-w600dp-land/activity_details.xml
+++ b/app/src/main/res/layout-w600dp-land/activity_details.xml
@@ -102,6 +102,7 @@
 
 	<com.google.android.material.card.MaterialCardView
 		android:id="@+id/card_chapters"
+		style="@style/Widget.Kotatsu.CardView.Light"
 		android:layout_width="0dp"
 		android:layout_height="0dp"
 		android:layout_marginStart="@dimen/side_card_offset"
diff --git a/app/src/main/res/layout-w600dp-land/activity_manga_list.xml b/app/src/main/res/layout-w600dp-land/activity_manga_list.xml
index 36cf59f1a..ba9e74670 100644
--- a/app/src/main/res/layout-w600dp-land/activity_manga_list.xml
+++ b/app/src/main/res/layout-w600dp-land/activity_manga_list.xml
@@ -35,6 +35,7 @@
 
 	<com.google.android.material.card.MaterialCardView
 		android:id="@+id/card_side"
+		style="@style/Widget.Kotatsu.CardView.Light"
 		android:layout_width="0dp"
 		android:layout_height="0dp"
 		android:layout_marginStart="@dimen/side_card_offset"
diff --git a/app/src/main/res/layout-w600dp-land/activity_settings.xml b/app/src/main/res/layout-w600dp-land/activity_settings.xml
index bbbd8dadf..b4e60d72e 100644
--- a/app/src/main/res/layout-w600dp-land/activity_settings.xml
+++ b/app/src/main/res/layout-w600dp-land/activity_settings.xml
@@ -39,13 +39,13 @@
 
 	<com.google.android.material.card.MaterialCardView
 		android:id="@+id/card_details"
+		style="@style/Widget.Kotatsu.CardView.Light"
 		android:layout_width="0dp"
 		android:layout_height="0dp"
 		android:layout_marginStart="@dimen/side_card_offset"
 		android:layout_marginTop="2dp"
 		android:layout_marginEnd="@dimen/side_card_offset"
 		android:layout_marginBottom="@dimen/side_card_offset"
-		app:cardBackgroundColor="?colorBackgroundFloating"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@id/container_master"
@@ -71,7 +71,8 @@
 			<androidx.fragment.app.FragmentContainerView
 				android:id="@+id/container"
 				android:layout_width="match_parent"
-				android:layout_height="match_parent" />
+				android:layout_height="match_parent"
+				android:theme="@style/ThemeOverlay.Kotatsu.CardContainer" />
 
 		</LinearLayout>
 
diff --git a/app/src/main/res/layout-w600dp-land/fragment_settings_sources.xml b/app/src/main/res/layout-w600dp-land/fragment_settings_sources.xml
new file mode 100644
index 000000000..1697cf808
--- /dev/null
+++ b/app/src/main/res/layout-w600dp-land/fragment_settings_sources.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.recyclerview.widget.RecyclerView
+	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:id="@+id/recyclerView"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?android:colorBackground"
+	android:clipToPadding="false"
+	android:orientation="vertical"
+	android:scrollbars="vertical"
+	android:theme="@style/ThemeOverlay.Kotatsu.CardContainer"
+	app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+	tools:listitem="@layout/item_source_config" />
diff --git a/app/src/main/res/layout-w600dp-land/item_recommendation.xml b/app/src/main/res/layout-w600dp-land/item_recommendation.xml
new file mode 100644
index 000000000..62f495c04
--- /dev/null
+++ b/app/src/main/res/layout-w600dp-land/item_recommendation.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+	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="wrap_content"
+	android:background="@drawable/list_selector"
+	android:clipChildren="false">
+
+	<com.google.android.material.imageview.ShapeableImageView
+		android:id="@+id/imageView_cover"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="16dp"
+		android:scaleType="centerCrop"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
+		tools:src="@tools:sample/backgrounds/scenic" />
+
+	<TextView
+		android:id="@+id/textView_title"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginEnd="8dp"
+		android:ellipsize="end"
+		android:maxLines="1"
+		android:textAppearance="?attr/textAppearanceBodyLarge"
+		app:layout_constraintBottom_toTopOf="@+id/textView_subtitle"
+		app:layout_constraintEnd_toStartOf="@id/button_more"
+		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
+		app:layout_constraintTop_toTopOf="@+id/imageView_cover"
+		tools:text="@tools:sample/lorem" />
+
+	<TextView
+		android:id="@+id/textView_subtitle"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginEnd="8dp"
+		android:ellipsize="end"
+		android:maxLines="1"
+		android:textAppearance="?attr/textAppearanceBodyMedium"
+		app:layout_constraintBottom_toBottomOf="@+id/imageView_cover"
+		app:layout_constraintEnd_toStartOf="@id/button_more"
+		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
+		app:layout_constraintTop_toBottomOf="@+id/textView_title"
+		tools:text="@tools:sample/lorem/random" />
+
+	<Button
+		android:id="@+id/button_more"
+		style="@style/Widget.Kotatsu.ExploreButton"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_margin="8dp"
+		android:gravity="center"
+		android:minWidth="120dp"
+		android:text="@string/more"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
diff --git a/app/src/main/res/layout/fragment_settings_sources.xml b/app/src/main/res/layout/fragment_settings_sources.xml
index 4a59b7c92..93255b2d2 100644
--- a/app/src/main/res/layout/fragment_settings_sources.xml
+++ b/app/src/main/res/layout/fragment_settings_sources.xml
@@ -11,4 +11,4 @@
 	android:orientation="vertical"
 	android:scrollbars="vertical"
 	app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-	tools:listitem="@layout/item_source_config_checkable" />
+	tools:listitem="@layout/item_source_config" />
diff --git a/app/src/main/res/layout/item_manga_grid.xml b/app/src/main/res/layout/item_manga_grid.xml
index 534b0b03e..18330e25b 100644
--- a/app/src/main/res/layout/item_manga_grid.xml
+++ b/app/src/main/res/layout/item_manga_grid.xml
@@ -4,10 +4,10 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	style="@style/Widget.Kotatsu.CardView.Outlined"
-	app:cardBackgroundColor="?attr/colorSurfaceContainerHighest"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:clipChildren="false"
+	app:cardBackgroundColor="?attr/colorSurfaceContainerHighest"
 	app:cardCornerRadius="12dp"
 	tools:layout_width="140dp">
 
@@ -24,6 +24,7 @@
 				android:id="@+id/imageView_cover"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
+				android:background="?colorSurfaceContainer"
 				android:orientation="horizontal"
 				android:scaleType="centerCrop"
 				app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
diff --git a/app/src/main/res/layout/item_manga_list.xml b/app/src/main/res/layout/item_manga_list.xml
index 81bb24814..e28499024 100644
--- a/app/src/main/res/layout/item_manga_list.xml
+++ b/app/src/main/res/layout/item_manga_list.xml
@@ -15,6 +15,7 @@
 		android:layout_marginStart="8dp"
 		android:layout_marginTop="16dp"
 		android:layout_marginBottom="16dp"
+		android:background="?colorSurfaceContainer"
 		android:scaleType="centerCrop"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
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 b61d5497c..68f851c3e 100644
--- a/app/src/main/res/layout/item_manga_list_details.xml
+++ b/app/src/main/res/layout/item_manga_list_details.xml
@@ -15,6 +15,7 @@
 			android:id="@+id/imageView_cover"
 			android:layout_width="98dp"
 			android:layout_height="0dp"
+			android:background="?colorSurfaceContainer"
 			android:scaleType="centerCrop"
 			app:layout_constraintDimensionRatio="13:18"
 			app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_recommendation.xml b/app/src/main/res/layout/item_recommendation.xml
index dc76a680b..08777e553 100644
--- a/app/src/main/res/layout/item_recommendation.xml
+++ b/app/src/main/res/layout/item_recommendation.xml
@@ -53,7 +53,7 @@
 	<Button
 		android:id="@+id/button_more"
 		style="@style/Widget.Kotatsu.ExploreButton"
-		android:layout_width="match_parent"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="8dp"
 		android:layout_marginTop="16dp"
diff --git a/app/src/main/res/values-w600dp-land/integers.xml b/app/src/main/res/values-w600dp-land/integers.xml
index 1736bebc3..573393f74 100644
--- a/app/src/main/res/values-w600dp-land/integers.xml
+++ b/app/src/main/res/values-w600dp-land/integers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<integer name="explore_buttons_columns">3</integer>
-</resources>
\ No newline at end of file
+	<integer name="explore_buttons_columns">4</integer>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bcd778ce9..73fdec650 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -73,6 +73,10 @@
 		<item name="cardBackgroundColor">?attr/colorSurfaceContainerLow</item>
 	</style>
 
+	<style name="Widget.Kotatsu.CardView.Light" parent="Widget.Material3.CardView.Filled">
+		<item name="cardBackgroundColor">?colorBackgroundFloating</item>
+	</style>
+
 	<style name="Widget.Kotatsu.Tabs" parent="@style/Widget.Material3.TabLayout">
 		<item name="android:background">@drawable/tabs_background</item>
 		<item name="tabGravity">center</item>
@@ -212,6 +216,10 @@
 		<item name="colorControlHighlight">@color/selector_overlay</item>
 	</style>
 
+	<style name="ThemeOverlay.Kotatsu.CardContainer" parent="">
+		<item name="android:colorBackground">?colorBackgroundFloating</item>
+	</style>
+
 	<style name="ThemeOverlay.Kotatsu.ActionMode" parent="">
 		<item name="colorOnSurface">?colorPrimary</item>
 		<item name="colorControlNormal">?colorPrimary</item>