From eb7e2554301e393284a8959ad6c5deae42fc13d6 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Fri, 4 Mar 2022 19:09:58 +0200
Subject: [PATCH] Small ui fixes

---
 app/build.gradle                                          | 8 ++++----
 .../java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt | 3 ++-
 .../java/org/koitharu/kotatsu/main/ui/MainActivity.kt     | 2 +-
 app/src/main/res/layout/activity_main.xml                 | 6 +++---
 app/src/main/res/layout/fragment_favourites.xml           | 1 -
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d8ccb45bf..de3d3fa5b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -87,9 +87,9 @@ dependencies {
 	//noinspection LifecycleAnnotationProcessorWithJava8
 	kapt 'androidx.lifecycle:lifecycle-compiler:2.4.1'
 
-	implementation 'androidx.room:room-runtime:2.4.1'
-	implementation 'androidx.room:room-ktx:2.4.1'
-	kapt 'androidx.room:room-compiler:2.4.1'
+	implementation 'androidx.room:room-runtime:2.4.2'
+	implementation 'androidx.room:room-ktx:2.4.2'
+	kapt 'androidx.room:room-compiler:2.4.2'
 
 	implementation 'com.squareup.okhttp3:okhttp:4.9.3'
 	implementation 'com.squareup.okio:okio:3.0.0'
@@ -115,6 +115,6 @@ dependencies {
 	androidTestImplementation 'androidx.test:rules:1.4.0'
 	androidTestImplementation 'androidx.test:core-ktx:1.4.0'
 	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
-	androidTestImplementation 'androidx.room:room-testing:2.4.1'
+	androidTestImplementation 'androidx.room:room-testing:2.4.2'
 	androidTestImplementation 'com.google.truth:truth:1.1.3'
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt
index 3e25b0bed..6b3b6a94b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt
@@ -6,6 +6,7 @@ import androidx.room.PrimaryKey
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.model.MangaTag
 import org.koitharu.kotatsu.utils.ext.longHashCode
+import org.koitharu.kotatsu.utils.ext.toTitleCase
 
 @Entity(tableName = "tags")
 class TagEntity(
@@ -18,7 +19,7 @@ class TagEntity(
 
 	fun toMangaTag() = MangaTag(
 		key = this.key,
-		title = this.title,
+		title = this.title.toTitleCase(),
 		source = MangaSource.valueOf(this.source)
 	)
 
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 2b258bb53..329591adc 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
@@ -292,7 +292,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
 		if (isLoading) {
 			binding.fab.setImageDrawable(CircularProgressDrawable(this).also {
 				it.setColorSchemeColors(R.color.kotatsu_onPrimaryContainer)
-				it.strokeWidth = resources.resolveDp(2f)
+				it.strokeWidth = resources.resolveDp(3.5f)
 				it.start()
 			})
 		} else {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b944dcc54..446d1ae2f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -22,7 +22,7 @@
 			android:id="@+id/appbar"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:background="@android:color/transparent"
+			android:background="@null"
 			android:stateListAnimator="@null">
 
 			<FrameLayout
@@ -39,7 +39,7 @@
 					android:id="@id/toolbar"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:background="@android:color/transparent"
+					android:background="@null"
 					android:focusable="true"
 					android:focusableInTouchMode="true"
 					app:contentInsetStartWithNavigation="0dp"
@@ -74,6 +74,7 @@
 			android:contentDescription="@string/_continue"
 			android:src="@drawable/ic_read_fill"
 			android:visibility="gone"
+			app:backgroundTint="?attr/colorContainer"
 			app:fabSize="normal"
 			app:layout_anchor="@id/container"
 			app:layout_anchorGravity="bottom|end"
@@ -89,7 +90,6 @@
 		android:layout_height="match_parent"
 		android:layout_gravity="start"
 		android:fitsSystemWindows="true"
-		app:insetForeground="@android:color/transparent"
 		app:menu="@menu/nav_drawer" />
 
 </androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_favourites.xml b/app/src/main/res/layout/fragment_favourites.xml
index 47b8c515d..0f7e61994 100644
--- a/app/src/main/res/layout/fragment_favourites.xml
+++ b/app/src/main/res/layout/fragment_favourites.xml
@@ -10,7 +10,6 @@
 		android:id="@+id/tabs"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		app:tabGravity="center"
 		app:tabMode="scrollable" />
 
 	<androidx.viewpager2.widget.ViewPager2