From 0ffb9cb4aff1f77b2c6133112e3ad5a8645a6b01 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 29 Feb 2020 14:04:54 +0200
Subject: [PATCH] UI fixes

---
 .../org/koitharu/kotatsu/ui/main/list/MangaListFragment.kt  | 6 +++++-
 .../java/org/koitharu/kotatsu/ui/search/SearchActivity.kt   | 2 +-
 app/src/main/res/layout-sw600dp/fragment_list.xml           | 5 ++++-
 app/src/main/res/layout/item_manga_grid.xml                 | 2 +-
 app/src/main/res/layout/item_manga_list_details.xml         | 2 +-
 app/src/main/res/values/strings.xml                         | 1 +
 app/src/main/res/xml/pref_appearance.xml                    | 2 +-
 7 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListFragment.kt
index b0d248a41..597bb3c7f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListFragment.kt
@@ -6,6 +6,7 @@ import android.view.*
 import androidx.annotation.CallSuper
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.view.GravityCompat
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -191,7 +192,10 @@ abstract class MangaListFragment<E> : BaseFragment(R.layout.fragment_list), Mang
 			} else {
 				DrawerLayout.LOCK_MODE_UNLOCKED
 			}
-		)
+		) ?: divider_filter?.let {
+			it.isGone = sortOrders.isEmpty() && tags.isEmpty()
+			recyclerView_filter.isVisible = it.isVisible
+		}
 		activity?.invalidateOptionsMenu()
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/search/SearchActivity.kt b/app/src/main/java/org/koitharu/kotatsu/ui/search/SearchActivity.kt
index 89035096e..eb43b0727 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/search/SearchActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/search/SearchActivity.kt
@@ -23,7 +23,7 @@ class SearchActivity : BaseActivity() {
 
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 		title = query
-		supportActionBar?.setSubtitle(R.string.search_results)
+		supportActionBar?.subtitle = getString(R.string.search_results_on_s, source.title)
 		supportFragmentManager
 			.beginTransaction()
 			.replace(R.id.container, SearchFragment.newInstance(source, query))
diff --git a/app/src/main/res/layout-sw600dp/fragment_list.xml b/app/src/main/res/layout-sw600dp/fragment_list.xml
index 830f116c5..2672a6cd6 100644
--- a/app/src/main/res/layout-sw600dp/fragment_list.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_list.xml
@@ -6,7 +6,7 @@
 	android:orientation="horizontal"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	tools:openDrawer="end">
+	android:animateLayoutChanges="true">
 
 	<FrameLayout
 		android:layout_width="0dp"
@@ -62,6 +62,8 @@
 
 	<View
 		android:layout_width="1dp"
+		android:id="@+id/divider_filter"
+		android:visibility="gone"
 		android:layout_height="match_parent"
 		android:background="?dividerVertical" />
 
@@ -70,6 +72,7 @@
 		android:layout_width="240dp"
 		android:layout_height="match_parent"
 		android:layout_gravity="end"
+		android:visibility="gone"
 		android:background="?android:windowBackground"
 		android:orientation="vertical"
 		android:scrollbars="vertical"
diff --git a/app/src/main/res/layout/item_manga_grid.xml b/app/src/main/res/layout/item_manga_grid.xml
index 91713e10d..cf08715f2 100644
--- a/app/src/main/res/layout/item_manga_grid.xml
+++ b/app/src/main/res/layout/item_manga_grid.xml
@@ -8,7 +8,7 @@
 	app:cardBackgroundColor="?android:windowBackground"
 	app:cardElevation="0dp"
 	app:cardMaxElevation="0dp"
-	app:strokeColor="?android:textColorPrimary"
+	app:strokeColor="?android:colorControlNormal"
 	app:strokeWidth="1px">
 
 	<LinearLayout
diff --git a/app/src/main/res/layout/item_manga_list_details.xml b/app/src/main/res/layout/item_manga_list_details.xml
index c2fb85f0e..157a4fe1c 100644
--- a/app/src/main/res/layout/item_manga_list_details.xml
+++ b/app/src/main/res/layout/item_manga_list_details.xml
@@ -8,7 +8,7 @@
 	app:cardBackgroundColor="?android:windowBackground"
 	app:cardElevation="0dp"
 	app:cardMaxElevation="0dp"
-	app:strokeColor="?android:textColorPrimary"
+	app:strokeColor="?android:colorControlNormal"
 	app:strokeWidth="1px">
 
 	<RelativeLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 55246fe2d..bc9eb4be8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,4 +85,5 @@
 	<string name="read_mode">Read mode</string>
 	<string name="put_items_below_to_disable_it">Put items below to disable it</string>
 	<string name="grid_size">Grid size</string>
+	<string name="search_results_on_s">Search results on %s</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_appearance.xml b/app/src/main/res/xml/pref_appearance.xml
index bf94ba89f..bee6fef8b 100644
--- a/app/src/main/res/xml/pref_appearance.xml
+++ b/app/src/main/res/xml/pref_appearance.xml
@@ -9,13 +9,13 @@
 		android:entryValues="@array/values_theme"
 		android:key="@string/key_theme"
 		android:title="@string/theme"
-		app:allowDividerBelow="true"
 		app:iconSpaceReserved="false" />
 
 	<Preference
 		android:key="@string/key_list_mode"
 		android:persistent="false"
 		android:title="@string/list_mode"
+		app:allowDividerAbove="true"
 		app:iconSpaceReserved="false" />
 
 	<SeekBarPreference