From 11710d36d19a4f8a6fed8c87cd10eccfcb6af3c0 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Fri, 22 Jul 2022 23:41:06 +0300
Subject: [PATCH] Update BS UI

---
 app/src/main/res/layout/sheet_base.xml        | 11 ++++-
 app/src/main/res/layout/sheet_chapters.xml    | 41 +++++++++++++------
 ...ries.xml => sheet_favorite_categories.xml} | 12 +++++-
 app/src/main/res/layout/sheet_filter.xml      | 11 ++++-
 app/src/main/res/layout/sheet_pages.xml       | 11 ++++-
 .../main/res/layout/sheet_reader_config.xml   |  9 ++++
 app/src/main/res/layout/sheet_scrobbling.xml  | 22 ++++++++--
 .../res/layout/sheet_scrobbling_selector.xml  | 17 +++++++-
 8 files changed, 113 insertions(+), 21 deletions(-)
 rename app/src/main/res/layout/{dialog_favorite_categories.xml => sheet_favorite_categories.xml} (79%)

diff --git a/app/src/main/res/layout/sheet_base.xml b/app/src/main/res/layout/sheet_base.xml
index 5746e4fd8..8aab8eb2b 100644
--- a/app/src/main/res/layout/sheet_base.xml
+++ b/app/src/main/res/layout/sheet_base.xml
@@ -7,6 +7,15 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
+	<ImageView
+		android:layout_width="36dp"
+		android:layout_height="3dp"
+		android:layout_gravity="center"
+		android:layout_marginTop="12dp"
+		android:alpha="0.2"
+		android:src="@drawable/tab_rounded_rectangle"
+		app:tint="?attr/colorOnSurfaceVariant"/>
+
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbar"
 		android:layout_width="match_parent"
@@ -43,4 +52,4 @@
 		android:orientation="vertical"
 		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 		tools:listitem="@layout/item_checkable_new" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/sheet_chapters.xml b/app/src/main/res/layout/sheet_chapters.xml
index 7bb4f031e..c75552777 100644
--- a/app/src/main/res/layout/sheet_chapters.xml
+++ b/app/src/main/res/layout/sheet_chapters.xml
@@ -7,29 +7,46 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
-	<com.google.android.material.appbar.AppBarLayout
-		android:id="@+id/appbar"
+	<LinearLayout
+		android:id="@+id/toolbar_layout"
 		android:layout_width="match_parent"
-		android:layout_height="?attr/actionBarSize"
-		android:background="@drawable/sheet_toolbar_background">
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
 
-		<com.google.android.material.appbar.MaterialToolbar
-			android:id="@+id/toolbar"
+		<ImageView
+			android:layout_width="36dp"
+			android:layout_height="3dp"
+			android:layout_gravity="center"
+			android:layout_marginTop="12dp"
+			android:alpha="0.2"
+			android:src="@drawable/tab_rounded_rectangle"
+			app:tint="?attr/colorOnSurfaceVariant" />
+
+		<com.google.android.material.appbar.AppBarLayout
+			android:id="@+id/appbar"
 			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			app:navigationIcon="?actionModeCloseDrawable"
-			app:title="@string/chapters" />
+			android:layout_height="?attr/actionBarSize"
+			android:background="@drawable/sheet_toolbar_background">
 
-	</com.google.android.material.appbar.AppBarLayout>
+			<com.google.android.material.appbar.MaterialToolbar
+				android:id="@+id/toolbar"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				app:navigationIcon="?actionModeCloseDrawable"
+				app:title="@string/chapters" />
+
+		</com.google.android.material.appbar.AppBarLayout>
+		
+	</LinearLayout>
 
 	<org.koitharu.kotatsu.base.ui.list.fastscroll.FastScrollRecyclerView
 		android:id="@+id/recyclerView"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:layout_below="@id/appbar"
+		android:layout_below="@id/toolbar_layout"
 		android:orientation="vertical"
 		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 		app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
 		tools:listitem="@layout/item_chapter" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_favorite_categories.xml b/app/src/main/res/layout/sheet_favorite_categories.xml
similarity index 79%
rename from app/src/main/res/layout/dialog_favorite_categories.xml
rename to app/src/main/res/layout/sheet_favorite_categories.xml
index 7718eb661..1753eb690 100644
--- a/app/src/main/res/layout/dialog_favorite_categories.xml
+++ b/app/src/main/res/layout/sheet_favorite_categories.xml
@@ -8,12 +8,22 @@
 	android:orientation="vertical"
 	android:paddingBottom="@dimen/list_spacing">
 
+	<ImageView
+		android:layout_width="36dp"
+		android:layout_height="3dp"
+		android:layout_gravity="center"
+		android:layout_marginTop="12dp"
+		android:alpha="0.2"
+		android:src="@drawable/tab_rounded_rectangle"
+		app:tint="?attr/colorOnSurfaceVariant"/>
+
 	<com.google.android.material.appbar.MaterialToolbar
 		android:id="@+id/toolbar"
 		android:layout_width="match_parent"
 		android:layout_height="?attr/actionBarSize"
 		app:menu="@menu/opt_categories_bs"
-		app:title="@string/add_to_favourites">
+		app:title="@string/add_to_favourites"
+		android:background="@drawable/sheet_toolbar_background">
 
 		<Button
 			android:id="@+id/button_done"
diff --git a/app/src/main/res/layout/sheet_filter.xml b/app/src/main/res/layout/sheet_filter.xml
index 69a7a6b5b..6d1f5dc3d 100644
--- a/app/src/main/res/layout/sheet_filter.xml
+++ b/app/src/main/res/layout/sheet_filter.xml
@@ -7,6 +7,15 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
+	<ImageView
+		android:layout_width="36dp"
+		android:layout_height="3dp"
+		android:layout_gravity="center"
+		android:layout_marginTop="12dp"
+		android:alpha="0.2"
+		android:src="@drawable/tab_rounded_rectangle"
+		app:tint="?attr/colorOnSurfaceVariant" />
+
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbar"
 		android:layout_width="match_parent"
@@ -30,4 +39,4 @@
 		android:orientation="vertical"
 		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 		tools:listitem="@layout/item_checkable_new" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/sheet_pages.xml b/app/src/main/res/layout/sheet_pages.xml
index 4b7ecf79b..a55cf6d3c 100644
--- a/app/src/main/res/layout/sheet_pages.xml
+++ b/app/src/main/res/layout/sheet_pages.xml
@@ -7,6 +7,15 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
+	<ImageView
+		android:layout_width="36dp"
+		android:layout_height="3dp"
+		android:layout_gravity="center"
+		android:layout_marginTop="12dp"
+		android:alpha="0.2"
+		android:src="@drawable/tab_rounded_rectangle"
+		app:tint="?attr/colorOnSurfaceVariant" />
+
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbar"
 		android:layout_width="match_parent"
@@ -33,4 +42,4 @@
 		app:spanCount="3"
 		tools:listitem="@layout/item_page_thumb" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/sheet_reader_config.xml b/app/src/main/res/layout/sheet_reader_config.xml
index 128e31bb2..e599b17c1 100644
--- a/app/src/main/res/layout/sheet_reader_config.xml
+++ b/app/src/main/res/layout/sheet_reader_config.xml
@@ -7,6 +7,15 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
+	<ImageView
+		android:layout_width="36dp"
+		android:layout_height="3dp"
+		android:layout_gravity="center"
+		android:layout_marginTop="12dp"
+		android:alpha="0.2"
+		android:src="@drawable/tab_rounded_rectangle"
+		app:tint="?attr/colorOnSurfaceVariant" />
+
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbar"
 		android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/sheet_scrobbling.xml b/app/src/main/res/layout/sheet_scrobbling.xml
index fb9cface4..8506b1784 100644
--- a/app/src/main/res/layout/sheet_scrobbling.xml
+++ b/app/src/main/res/layout/sheet_scrobbling.xml
@@ -10,12 +10,26 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
+		<ImageView
+			android:layout_width="36dp"
+			android:layout_height="3dp"
+			android:layout_gravity="center"
+			android:layout_marginTop="12dp"
+			android:layout_marginBottom="12dp"
+			android:alpha="0.2"
+			android:src="@drawable/tab_rounded_rectangle"
+			app:layout_constraintBottom_toTopOf="@+id/textView_title"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:tint="?attr/colorOnSurfaceVariant" />
+
 		<com.google.android.material.imageview.ShapeableImageView
 			android:id="@+id/imageView_cover"
 			android:layout_width="0dp"
 			android:layout_height="0dp"
 			android:layout_marginStart="16dp"
-			android:layout_marginTop="16dp"
+			android:layout_marginTop="28dp"
 			android:foreground="?selectableItemBackground"
 			android:scaleType="centerCrop"
 			app:layout_constraintDimensionRatio="H,13:18"
@@ -33,7 +47,7 @@
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_marginStart="16dp"
-			android:layout_marginTop="16dp"
+			android:layout_marginTop="28dp"
 			android:layout_marginEnd="6dp"
 			android:ellipsize="end"
 			android:maxLines="2"
@@ -48,7 +62,7 @@
 			style="?android:attr/actionOverflowButtonStyle"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
+			android:layout_marginTop="20dp"
 			android:layout_marginEnd="8dp"
 			android:background="?selectableItemBackgroundBorderless"
 			android:contentDescription="@string/open_in_browser"
@@ -109,4 +123,4 @@
 			tools:text="@tools:sample/lorem/random[250]" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/sheet_scrobbling_selector.xml b/app/src/main/res/layout/sheet_scrobbling_selector.xml
index 34a489cd1..dbc89bb2e 100644
--- a/app/src/main/res/layout/sheet_scrobbling_selector.xml
+++ b/app/src/main/res/layout/sheet_scrobbling_selector.xml
@@ -7,6 +7,20 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
+	<ImageView
+		android:layout_width="36dp"
+		android:layout_height="3dp"
+		android:layout_gravity="center"
+		android:layout_marginTop="12dp"
+		android:layout_marginBottom="12dp"
+		android:alpha="0.2"
+		android:src="@drawable/tab_rounded_rectangle"
+		app:layout_constraintBottom_toTopOf="@+id/textView_title"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:tint="?attr/colorOnSurfaceVariant" />
+
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbar"
 		android:layout_width="match_parent"
@@ -16,6 +30,7 @@
 			android:id="@+id/toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
+			android:background="@drawable/sheet_toolbar_background"
 			app:navigationIcon="?actionModeCloseDrawable"
 			app:title="@string/tracking">
 
@@ -43,4 +58,4 @@
 		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 		tools:listitem="@layout/item_manga_list" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>