From b1bc94b1e9a8ea7e67d8d340ea31d9db0e42a724 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Fri, 2 Jun 2023 09:03:05 +0300
Subject: [PATCH] Improve tablet ui

---
 .../kotatsu/details/ui/DetailsActivity.kt     |  5 ++
 .../filter/ui/model/FilterHeaderModel.kt      |  3 ++
 .../kotatsu/search/ui/MangaListActivity.kt    | 13 ++++-
 .../main/res/layout-land/item_empty_state.xml | 47 +++++++++++++++++++
 .../res/layout-w600dp/activity_container.xml  | 19 ++------
 .../activity_details.xml                      | 34 +++++++-------
 .../res/layout-w600dp/activity_manga_list.xml |  7 +--
 app/src/main/res/values-w600dp/dimens.xml     |  1 +
 app/src/main/res/values/dimens.xml            |  2 +
 9 files changed, 95 insertions(+), 36 deletions(-)
 create mode 100644 app/src/main/res/layout-land/item_empty_state.xml
 rename app/src/main/res/{layout-w720dp => layout-w600dp}/activity_details.xml (85%)

diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
index 723fc99e3..1206fa6ce 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
@@ -11,6 +11,7 @@ import android.view.Gravity
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.widget.Toast
 import androidx.activity.viewModels
@@ -18,6 +19,7 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.core.graphics.Insets
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.snackbar.BaseTransientBottomBar
@@ -238,6 +240,9 @@ class DetailsActivity :
 		if (insets.bottom > 0) {
 			window.setNavigationBarTransparentCompat(this, viewBinding.layoutBottom?.elevation ?: 0f, 0.9f)
 		}
+		viewBinding.cardChapters?.updateLayoutParams<MarginLayoutParams> {
+			bottomMargin = insets.bottom + marginEnd
+		}
 	}
 
 	private fun onHistoryChanged(info: HistoryInfo) {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/model/FilterHeaderModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/model/FilterHeaderModel.kt
index c9733a3b3..cf9dcd834 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/model/FilterHeaderModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/model/FilterHeaderModel.kt
@@ -10,6 +10,9 @@ class FilterHeaderModel(
 	val hasSelectedTags: Boolean,
 ) : ListModel {
 
+	val textSummary: String
+		get() = chips.mapNotNull { if (it.isChecked) it.title else null }.joinToString()
+
 	override fun equals(other: Any?): Boolean {
 		if (this === other) return true
 		if (javaClass != other?.javaClass) return false
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/MangaListActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/MangaListActivity.kt
index 898b33237..bec248475 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/MangaListActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/MangaListActivity.kt
@@ -11,6 +11,9 @@ import androidx.core.view.updatePadding
 import androidx.fragment.app.commit
 import com.google.android.material.appbar.AppBarLayout
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaTags
 import org.koitharu.kotatsu.core.ui.BaseActivity
@@ -106,11 +109,19 @@ class MangaListActivity :
 				}
 			}
 		}
+		val filterOwner = FilterOwner.from(this)
 		val chipSort = viewBinding.chipSort
 		if (chipSort != null) {
-			FilterOwner.from(this).header.observe(this) {
+			filterOwner.header.observe(this) {
 				chipSort.setTextAndVisible(it.sortOrder?.titleRes ?: 0)
 			}
+		} else {
+			filterOwner.header.map {
+				it.textSummary
+			}.flowOn(Dispatchers.Default)
+				.observe(this) {
+					supportActionBar?.subtitle = it
+				}
 		}
 	}
 
diff --git a/app/src/main/res/layout-land/item_empty_state.xml b/app/src/main/res/layout-land/item_empty_state.xml
new file mode 100644
index 000000000..f039c9cbc
--- /dev/null
+++ b/app/src/main/res/layout-land/item_empty_state.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:gravity="center"
+	android:orientation="vertical"
+	android:paddingHorizontal="32dp">
+
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="192dp"
+		android:layout_height="192dp"
+		android:contentDescription="@null"
+		android:scaleType="fitCenter"
+		tools:src="@drawable/ic_empty_favourites" />
+
+	<TextView
+		android:id="@+id/textPrimary"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/margin_normal"
+		android:gravity="center"
+		android:textAppearance="?attr/textAppearanceTitleLarge"
+		tools:text="@tools:sample/lorem[3]" />
+
+	<TextView
+		android:id="@+id/textSecondary"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/margin_normal"
+		android:gravity="center"
+		android:textAppearance="?attr/textAppearanceBodyMedium"
+		tools:text="@tools:sample/lorem[15]" />
+
+	<Button
+		android:id="@+id/button_retry"
+		style="@style/Widget.Material3.Button.TonalButton"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/margin_normal"
+		android:visibility="gone"
+		tools:text="@string/try_again"
+		tools:visibility="visible" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout-w600dp/activity_container.xml b/app/src/main/res/layout-w600dp/activity_container.xml
index ed5643060..02364f5bf 100644
--- a/app/src/main/res/layout-w600dp/activity_container.xml
+++ b/app/src/main/res/layout-w600dp/activity_container.xml
@@ -12,22 +12,11 @@
 		android:layout_height="wrap_content"
 		android:fitsSystemWindows="true">
 
-		<com.google.android.material.appbar.CollapsingToolbarLayout
-			android:id="@+id/collapsingToolbarLayout"
-			style="?attr/collapsingToolbarLayoutLargeStyle"
+		<com.google.android.material.appbar.MaterialToolbar
+			android:id="@id/toolbar"
 			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"
-				tools:title="Title" />
-
-		</com.google.android.material.appbar.CollapsingToolbarLayout>
+			android:layout_height="?attr/actionBarSize"
+			tools:title="Title" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout-w720dp/activity_details.xml b/app/src/main/res/layout-w600dp/activity_details.xml
similarity index 85%
rename from app/src/main/res/layout-w720dp/activity_details.xml
rename to app/src/main/res/layout-w600dp/activity_details.xml
index 6fe5b7452..9221f7ed0 100644
--- a/app/src/main/res/layout-w720dp/activity_details.xml
+++ b/app/src/main/res/layout-w600dp/activity_details.xml
@@ -67,8 +67,8 @@
 		android:id="@+id/group_header"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="@id/container_chapters"
+		app:layout_constraintEnd_toEndOf="@id/card_chapters"
+		app:layout_constraintStart_toStartOf="@id/card_chapters"
 		app:layout_constraintTop_toBottomOf="@id/appbar">
 
 		<TextView
@@ -113,27 +113,27 @@
 			android:padding="@dimen/margin_small"
 			android:src="@drawable/ic_expand_more" />
 
-		<View
-			android:id="@+id/divider"
-			android:layout_width="0dp"
-			android:layout_height="1dp"
-			android:layout_below="@id/textView_subtitle"
-			android:layout_alignParentStart="true"
-			android:layout_alignParentEnd="true"
-			android:layout_marginTop="4dp"
-			android:background="?colorSecondaryContainer" />
-
 	</RelativeLayout>
 
-	<androidx.fragment.app.FragmentContainerView
-		android:id="@+id/container_chapters"
-		android:name="org.koitharu.kotatsu.details.ui.ChaptersFragment"
+	<com.google.android.material.card.MaterialCardView
+		android:id="@+id/card_chapters"
 		android:layout_width="0dp"
 		android:layout_height="0dp"
+		android:layout_marginStart="@dimen/side_card_offset"
+		android:layout_marginEnd="@dimen/side_card_offset"
+		android:layout_marginBottom="@dimen/side_card_offset"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@id/container_details"
-		app:layout_constraintTop_toBottomOf="@id/group_header"
-		tools:layout="@layout/fragment_chapters" />
+		app:layout_constraintTop_toBottomOf="@id/group_header">
+
+		<androidx.fragment.app.FragmentContainerView
+			android:id="@+id/container_chapters"
+			android:name="org.koitharu.kotatsu.details.ui.ChaptersFragment"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			tools:layout="@layout/fragment_chapters" />
+
+	</com.google.android.material.card.MaterialCardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-w600dp/activity_manga_list.xml b/app/src/main/res/layout-w600dp/activity_manga_list.xml
index c3daad6ac..6d5eae09b 100644
--- a/app/src/main/res/layout-w600dp/activity_manga_list.xml
+++ b/app/src/main/res/layout-w600dp/activity_manga_list.xml
@@ -37,9 +37,10 @@
 		android:id="@+id/card_filter"
 		android:layout_width="0dp"
 		android:layout_height="0dp"
-		android:layout_marginStart="12dp"
-		android:layout_marginEnd="16dp"
-		android:layout_marginBottom="12dp"
+		android:layout_marginStart="@dimen/side_card_offset"
+		android:layout_marginTop="@dimen/grid_spacing_outer_double"
+		android:layout_marginEnd="@dimen/side_card_offset"
+		android:layout_marginBottom="@dimen/side_card_offset"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@id/container"
diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml
index a23f53572..ac2490cc9 100644
--- a/app/src/main/res/values-w600dp/dimens.xml
+++ b/app/src/main/res/values-w600dp/dimens.xml
@@ -2,6 +2,7 @@
 <resources>
 	<dimen name="grid_spacing">6dp</dimen>
 	<dimen name="grid_spacing_outer">2dp</dimen>
+	<dimen name="grid_spacing_outer_double">4dp</dimen>
 	<dimen name="preferred_grid_width">140dp</dimen>
 	<dimen name="bottom_sheet_width">420dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index eeae7f939..487bae75d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -11,6 +11,7 @@
 	<dimen name="grid_spacing">8dp</dimen>
 	<dimen name="list_spacing">8dp</dimen>
 	<dimen name="grid_spacing_outer">2dp</dimen>
+	<dimen name="grid_spacing_outer_double">4dp</dimen>
 	<dimen name="manga_list_item_height">86dp</dimen>
 	<dimen name="manga_list_details_item_height">120dp</dimen>
 	<dimen name="bookmark_item_height">120dp</dimen>
@@ -32,6 +33,7 @@
 	<dimen name="reader_bar_inset_fallback">8dp</dimen>
 	<dimen name="scrobbling_list_spacing">12dp</dimen>
 	<dimen name="explore_grid_width">120dp</dimen>
+	<dimen name="side_card_offset">8dp</dimen>
 
 	<dimen name="search_suggestions_manga_height">124dp</dimen>
 	<dimen name="search_suggestions_manga_spacing">4dp</dimen>