From 52dbd70c2f99638fdce228abac1d8e65279fa242 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Fri, 11 Mar 2022 21:50:49 +0300
Subject: [PATCH] Some adjustments

---
 .../koitharu/kotatsu/main/ui/MainActivity.kt  |  6 ++--
 .../res/layout-w720dp-land/activity_main.xml  | 31 ++++++++-----------
 app/src/main/res/layout/activity_main.xml     |  6 +---
 3 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
index 474ea72ba..989159104 100644
--- a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
@@ -227,10 +227,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
 			leftMargin = insets.left + topMargin
 			rightMargin = insets.right + topMargin
 		}
-		if (drawer != null) {
-			binding.container.updateLayoutParams<MarginLayoutParams> {
-				topMargin = -(binding.appbar.measureHeight())
-			}
+		binding.container.updateLayoutParams<MarginLayoutParams> {
+			topMargin = -(binding.appbar.measureHeight())
 		}
 	}
 
diff --git a/app/src/main/res/layout-w720dp-land/activity_main.xml b/app/src/main/res/layout-w720dp-land/activity_main.xml
index 63b80ee61..df67c21a0 100644
--- a/app/src/main/res/layout-w720dp-land/activity_main.xml
+++ b/app/src/main/res/layout-w720dp-land/activity_main.xml
@@ -11,26 +11,33 @@
 		android:id="@+id/navigationView"
 		android:layout_width="260dp"
 		android:layout_height="match_parent"
+		android:fitsSystemWindows="false"
 		app:drawerLayoutCornerSize="0dp"
 		app:elevation="0dp"
-		android:fitsSystemWindows="false"
 		app:menu="@menu/nav_drawer" />
 
 	<androidx.coordinatorlayout.widget.CoordinatorLayout
 		android:layout_width="match_parent"
 		android:layout_height="match_parent">
 
+		<androidx.fragment.app.FragmentContainerView
+			android:id="@id/container"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+			tools:layout="@layout/fragment_list" />
+
 		<com.google.android.material.appbar.AppBarLayout
 			android:id="@+id/appbar"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:background="@null"
-			android:stateListAnimator="@null">
+			app:elevation="0dp"
+			app:liftOnScroll="false">
 
 			<FrameLayout
 				android:id="@+id/toolbar_card"
 				android:layout_width="match_parent"
-				android:layout_height="48dp"
+				android:layout_height="54dp"
 				android:layout_marginStart="16dp"
 				android:layout_marginTop="8dp"
 				android:layout_marginEnd="16dp"
@@ -43,11 +50,7 @@
 					android:layout_height="wrap_content"
 					android:background="@null"
 					android:focusable="true"
-					android:focusableInTouchMode="true"
-					app:contentInsetStartWithNavigation="0dp"
-					app:titleTextAppearance="@style/TextAppearance.Kotatsu.PersistentToolbarTitle"
-					app:titleTextColor="?android:colorControlNormal"
-					tools:title="@string/app_name">
+					android:focusableInTouchMode="true">
 
 					<org.koitharu.kotatsu.search.ui.widget.SearchEditText
 						android:id="@+id/searchView"
@@ -55,12 +58,11 @@
 						android:layout_width="match_parent"
 						android:layout_height="match_parent"
 						android:background="@null"
-						android:drawablePadding="6dp"
+						android:drawablePadding="16dp"
 						android:gravity="center_vertical"
 						android:hint="@string/search_manga"
 						android:imeOptions="actionSearch"
 						android:importantForAutofill="no"
-						android:paddingBottom="1dp"
 						android:singleLine="true" />
 
 				</com.google.android.material.appbar.MaterialToolbar>
@@ -69,13 +71,6 @@
 
 		</com.google.android.material.appbar.AppBarLayout>
 
-		<androidx.fragment.app.FragmentContainerView
-			android:id="@id/container"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-			tools:layout="@layout/fragment_list" />
-
 		<com.google.android.material.floatingactionbutton.FloatingActionButton
 			android:id="@+id/fab"
 			android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 85c1bc8c4..0eebe2857 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -42,10 +42,7 @@
 					android:background="@null"
 					android:focusable="true"
 					android:focusableInTouchMode="true"
-					app:contentInsetStartWithNavigation="0dp"
-					app:titleTextAppearance="@style/TextAppearance.Kotatsu.PersistentToolbarTitle"
-					app:titleTextColor="?android:colorControlNormal"
-					tools:title="@string/app_name">
+					app:contentInsetStartWithNavigation="0dp">
 
 					<org.koitharu.kotatsu.search.ui.widget.SearchEditText
 						android:id="@+id/searchView"
@@ -57,7 +54,6 @@
 						android:hint="@string/search_manga"
 						android:imeOptions="actionSearch"
 						android:importantForAutofill="no"
-						android:paddingBottom="1dp"
 						android:singleLine="true" />
 
 				</com.google.android.material.appbar.MaterialToolbar>