From 21891d2d9d34f687486bdc7e89ff879568ce9f1f Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Sun, 10 Jul 2022 12:51:48 +0300
Subject: [PATCH] Tweak collapsing toolbars

---
 .../org/koitharu/kotatsu/core/github/GithubRepository.kt    | 2 +-
 app/src/main/res/layout/activity_categories.xml             | 4 ++--
 app/src/main/res/layout/activity_downloads.xml              | 3 ++-
 app/src/main/res/layout/activity_settings.xml               | 3 ++-
 app/src/main/res/layout/fragment_library.xml                | 5 +----
 app/src/main/res/menu/nav_bottom.xml                        | 6 +++---
 app/src/main/res/values/constants.xml                       | 2 +-
 app/src/main/res/values/strings.xml                         | 3 +++
 8 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt
index 8b9f4e793..0176823db 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt
@@ -10,7 +10,7 @@ class GithubRepository(private val okHttp: OkHttpClient) {
 	suspend fun getLatestVersion(): AppVersion {
 		val request = Request.Builder()
 			.get()
-			.url("https://api.github.com/repos/nv95/Kotatsu/releases/latest")
+			.url("https://api.github.com/repos/KotatsuApp/Kotatsu/releases/latest")
 		val json = okHttp.newCall(request.build()).await().parseJson()
 		val asset = json.getJSONArray("assets").getJSONObject(0)
 		return AppVersion(
diff --git a/app/src/main/res/layout/activity_categories.xml b/app/src/main/res/layout/activity_categories.xml
index fa0dba0a4..3e13bccac 100644
--- a/app/src/main/res/layout/activity_categories.xml
+++ b/app/src/main/res/layout/activity_categories.xml
@@ -13,9 +13,9 @@
 
 		<com.google.android.material.appbar.CollapsingToolbarLayout
 			android:id="@+id/collapsingToolbarLayout"
-			style="?attr/collapsingToolbarLayoutMediumStyle"
+			style="?attr/collapsingToolbarLayoutLargeStyle"
 			android:layout_width="match_parent"
-			android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
+			android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
 			app:layout_scrollFlags="scroll|exitUntilCollapsed"
 			app:toolbarId="@id/toolbar">
 
diff --git a/app/src/main/res/layout/activity_downloads.xml b/app/src/main/res/layout/activity_downloads.xml
index 7d4120729..e3f24f2cb 100644
--- a/app/src/main/res/layout/activity_downloads.xml
+++ b/app/src/main/res/layout/activity_downloads.xml
@@ -14,8 +14,9 @@
 
 		<com.google.android.material.appbar.CollapsingToolbarLayout
 			android:id="@+id/collapsingToolbarLayout"
+			style="?attr/collapsingToolbarLayoutLargeStyle"
 			android:layout_width="match_parent"
-			android:layout_height="@dimen/toolbar_height_expanded"
+			android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
 			app:layout_scrollFlags="scroll|exitUntilCollapsed"
 			app:toolbarId="@id/toolbar">
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index dedfbb835..bc7def9e7 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -13,8 +13,9 @@
 
 		<com.google.android.material.appbar.CollapsingToolbarLayout
 			android:id="@+id/collapsingToolbarLayout"
+			style="?attr/collapsingToolbarLayoutLargeStyle"
 			android:layout_width="match_parent"
-			android:layout_height="@dimen/toolbar_height_expanded"
+			android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
 			app:layout_scrollFlags="scroll|exitUntilCollapsed"
 			app:toolbarId="@id/toolbar">
 
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 16720dd8e..e520c6868 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -6,10 +6,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:clipToPadding="false"
-	android:paddingLeft="@dimen/list_spacing"
-	android:paddingTop="@dimen/grid_spacing_outer"
-	android:paddingRight="@dimen/list_spacing"
-	android:paddingBottom="@dimen/grid_spacing_outer">
+	android:paddingHorizontal="@dimen/list_spacing">
 
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recyclerView"
diff --git a/app/src/main/res/menu/nav_bottom.xml b/app/src/main/res/menu/nav_bottom.xml
index b73e6cbad..4d5b08184 100644
--- a/app/src/main/res/menu/nav_bottom.xml
+++ b/app/src/main/res/menu/nav_bottom.xml
@@ -5,12 +5,12 @@
 	<item
 		android:id="@+id/nav_library"
 		android:icon="@drawable/ic_bookshelf_selector"
-		android:title="Library" />
+		android:title="@string/manga_shelf" />
 
 	<item
 		android:id="@+id/nav_explore"
 		android:icon="@drawable/ic_explore_selector"
-		android:title="Explore" />
+		android:title="@string/explore" />
 
 	<item
 		android:id="@+id/nav_feed"
@@ -20,6 +20,6 @@
 	<item
 		android:id="@+id/nav_tools"
 		android:icon="@drawable/ic_tools"
-		android:title="Tools" />
+		android:title="@string/tools" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/constants.xml b/app/src/main/res/values/constants.xml
index 98011f83d..2691718af 100644
--- a/app/src/main/res/values/constants.xml
+++ b/app/src/main/res/values/constants.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="url_github">https://github.com/nv95/Kotatsu</string>
+	<string name="url_github">https://github.com/KotatsuApp/Kotatsu</string>
 	<string name="url_discord">https://discord.gg/NNJ5RgVBC5</string>
 	<string name="url_forpda">https://4pda.to/forum/index.php?showtopic=697669</string>
 	<string name="url_twitter">https://twitter.com/kotatsuapp</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2be38fcad..ba59c26e8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -333,4 +333,7 @@
 	<string name="categories_delete_confirm">Are you sure you want to delete the selected favorite categories?\nAll manga in it will be lost and this cannot be undone.</string>
 	<string name="reorder">Reorder</string>
 	<string name="empty">Empty</string>
+	<string name="changelog">Changelog</string>
+	<string name="explore">Explore</string>
+	<string name="tools">Tools</string>
 </resources>
\ No newline at end of file