From 57111f628de1a824c306d005e7b790fa73547b52 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Thu, 29 Jul 2021 22:35:04 +0300
Subject: [PATCH] Minor tweaks

---
 .../kotatsu/base/ui/widgets/ChipsView.kt      |  2 +-
 .../koitharu/kotatsu/main/ui/MainActivity.kt  |  6 +++---
 app/src/main/res/layout/item_empty_state.xml  | 19 +++++++----------
 app/src/main/res/values/dimens.xml            | 21 +++----------------
 app/src/main/res/values/styles.xml            | 21 +++++++++++++++++--
 5 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt
index f8a839efc..84a34261e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt
@@ -68,7 +68,7 @@ class ChipsView @JvmOverloads constructor(
 		val chip = Chip(context)
 		val drawable = ChipDrawable.createFromAttributes(context, null, 0, R.style.Widget_Kotatsu_Chip)
 		chip.setChipDrawable(drawable)
-		chip.setTextColor(ContextCompat.getColor(context, R.color.blue_primary))
+		chip.setTextColor(ContextCompat.getColor(context, R.color.color_primary))
 		chip.isCloseIconVisible = false
 		chip.setEnsureMinTouchTargetSize(false)
 		chip.setOnClickListener(chipOnClickListener)
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 2788a6ee0..95437d333 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
@@ -204,9 +204,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
 
 	override fun onWindowInsetsChanged(insets: Insets) {
 		binding.toolbarCard.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-			topMargin = insets.top + 16
-			leftMargin = insets.left + 32
-			rightMargin = insets.right + 32
+			topMargin = insets.top + resources.resolveDp(8)
+			leftMargin = insets.left + resources.resolveDp(16)
+			rightMargin = insets.right + resources.resolveDp(16)
 		}
 		binding.fab.updateLayoutParams<ViewGroup.MarginLayoutParams> {
 			bottomMargin = insets.bottom + topMargin
diff --git a/app/src/main/res/layout/item_empty_state.xml b/app/src/main/res/layout/item_empty_state.xml
index 0d7f40c65..54e7c747a 100644
--- a/app/src/main/res/layout/item_empty_state.xml
+++ b/app/src/main/res/layout/item_empty_state.xml
@@ -1,38 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:gravity="center"
 	android:orientation="vertical"
-	android:padding="16dp">
+	android:gravity="center">
 
 	<ImageView
 		android:id="@+id/icon"
 		android:layout_width="98dp"
 		android:layout_height="98dp"
-		android:layout_marginBottom="16dp"
-		tools:ignore="ContentDescription"
-		tools:src="@drawable/ic_alert_outline" />
+		android:src="@drawable/ic_alert_outline" />
 
 	<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:padding="4dp"
-		android:textAppearance="?android:textAppearanceLarge"
+		android:textAppearance="@style/TextAppearance.Kotatsu.H1"
 		tools:text="@tools:sample/lorem[3]" />
 
 	<TextView
 		android:id="@+id/textSecondary"
+		style="@style/TextAppearance.Kotatsu.NoticeBody"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/margin_normal"
 		android:gravity="center"
-		android:padding="4dp"
-		android:textAppearance="?android:textAppearanceMedium"
-		android:textColor="?android:textColorSecondary"
-		tools:text="@tools:sample/lorem[3]" />
+		tools:text="@tools:sample/lorem[15]" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index a08cbf9eb..c308cb1f7 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,7 +3,7 @@
 
 	<!-- Common dimensions -->
 	<dimen name="margin_normal">16dp</dimen>
-
+	<dimen name="margin_small">8dp</dimen>
 	<!-- Navigation -->
 	<dimen name="nav_header_logo_size">36dp</dimen>
 	<dimen name="nav_item_horizontal_padding">24dp</dimen>
@@ -26,22 +26,7 @@
 	<dimen name="list_footer_height_outer">48dp</dimen>
 	<dimen name="screen_padding">16dp</dimen>
 
-	<!--SearchView dimens-->
-
-	<dimen name="search_dp_16">16dp</dimen>
-	<dimen name="search_sp_16">16sp</dimen>
-	<dimen name="search_icon_48">48dp</dimen>
-	<dimen name="search_icon_56">56dp</dimen>
-	<dimen name="search_divider">1dp</dimen>
-	<dimen name="search_stroke_width_focus">0dp</dimen>
-	<dimen name="search_layout_height">48dp</dimen>
-	<dimen name="search_layout_height_focus">56dp</dimen>
-	<dimen name="search_radius">8dp</dimen>
-	<dimen name="search_radius_focus">0dp</dimen>
-	<dimen name="search_elevation">3dp</dimen>
-	<dimen name="search_elevation_focus">0dp</dimen>
-	<dimen name="search_margins_left_right">16dp</dimen>
-	<dimen name="search_margins_top_bottom">8dp</dimen>
-	<dimen name="search_margins_focus">0dp</dimen>
+	<!--Text dimens-->
+	<dimen name="text_size_h1">22sp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ce368d8a2..9d246d5e3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,6 +2,8 @@
 
 	<!-- Widget styles -->
 
+	<style name="Widget.Kotatsu" parent="@android:style/Widget.Material" />
+
 	<style name="Widget.Kotatsu.AppBar" parent="@style/Widget.Design.AppBarLayout">
 		<item name="android:background">?attr/colorSurface</item>
 		<item name="android:elevation">8dp</item>
@@ -37,10 +39,9 @@
 
 	<style name="Widget.Kotatsu.Chip" parent="Widget.MaterialComponents.Chip.Action">
 		<item name="chipStrokeWidth">1dp</item>
-		<item name="chipStrokeColor">?attr/colorAccent</item>
+		<item name="chipStrokeColor">?attr/colorPrimary</item>
 		<item name="chipBackgroundColor">@android:color/transparent</item>
 		<item name="chipIconTint">?attr/colorPrimary</item>
-		<item name="android:textColor">?attr/colorAccent</item>
 
 		<!-- Smaller text/height -->
 		<item name="android:textSize">12sp</item>
@@ -63,6 +64,14 @@
 		<item name="subtitleTextStyle">?attr/textAppearanceSubtitle1</item>
 	</style>
 
+	<!-- textAppearance alone doesn't support line spacing attrs. Multiline body text will use
+         style="Widget.Kotatsu.MultilineBody" instead of the equivalent textAppearance.
+	-->
+	<style name="Widget.Kotatsu.MultilineBody">
+		<item name="android:lineSpacingExtra">4sp</item>
+		<item name="android:textColor">?android:textColorSecondary</item>
+	</style>
+
 	<!-- TextAppearance -->
 
 	<style name="TextAppearance.Kotatsu.ToolbarTitle" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Title">
@@ -89,4 +98,12 @@
 
 	<style name="TextAppearance.Kotatsu.Body2" parent="TextAppearance.MaterialComponents.Body2" />
 
+	<style name="TextAppearance.Kotatsu.H1" parent="@style/TextAppearance.MaterialComponents.Headline5">
+		<item name="android:textSize">@dimen/text_size_h1</item>
+	</style>
+
+	<style name="TextAppearance.Kotatsu.NoticeBody" parent="@style/Widget.Kotatsu.MultilineBody">
+		<item name="android:textSize">18sp</item>
+	</style>
+
 </resources>
\ No newline at end of file