From 6de36a88c04363a4669b62fbec0c7b8a3f2b64c3 Mon Sep 17 00:00:00 2001
From: inorichi <len@kanade.eu>
Date: Fri, 13 Apr 2018 16:28:09 +0200
Subject: [PATCH] Fix tracking search layout

---
 .../ui/manga/track/TrackSearchDialog.kt       | 10 +--
 .../main/res/layout/track_search_dialog.xml   | 86 +++++++++----------
 app/src/main/res/layout/track_search_item.xml |  3 +-
 3 files changed, 47 insertions(+), 52 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt
index 691800058d..9856ce2e5c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt
@@ -8,9 +8,9 @@ import com.jakewharton.rxbinding.widget.itemClicks
 import com.jakewharton.rxbinding.widget.textChanges
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Track
-import eu.kanade.tachiyomi.data.track.model.TrackSearch
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.track.TrackService
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.util.plusAssign
 import kotlinx.android.synthetic.main.track_search_dialog.view.*
@@ -114,14 +114,14 @@ class TrackSearchDialog : DialogController {
     private fun search(query: String) {
         val view = dialogView ?: return
         view.progress.visibility = View.VISIBLE
-        view.track_search_list.visibility = View.GONE
+        view.track_search_list.visibility = View.INVISIBLE
         trackController.presenter.search(query, service)
     }
 
     fun onSearchResults(results: List<TrackSearch>) {
         selectedItem = null
         val view = dialogView ?: return
-        view.progress.visibility = View.GONE
+        view.progress.visibility = View.INVISIBLE
         view.track_search_list.visibility = View.VISIBLE
         adapter?.setItems(results)
     }
@@ -129,7 +129,7 @@ class TrackSearchDialog : DialogController {
     fun onSearchResultsError() {
         val view = dialogView ?: return
         view.progress.visibility = View.VISIBLE
-        view.track_search_list.visibility = View.GONE
+        view.track_search_list.visibility = View.INVISIBLE
         adapter?.setItems(emptyList())
     }
 
@@ -141,4 +141,4 @@ class TrackSearchDialog : DialogController {
         const val KEY_SERVICE = "service_id"
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/track_search_dialog.xml b/app/src/main/res/layout/track_search_dialog.xml
index 84f9a3d54c..0c9d8191ec 100644
--- a/app/src/main/res/layout/track_search_dialog.xml
+++ b/app/src/main/res/layout/track_search_dialog.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<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="wrap_content"
+    android:layout_height="match_parent"
     android:orientation="vertical">
 
     <EditText
@@ -14,52 +13,49 @@
         android:hint="@string/title"
         android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
-        android:maxLines="1"
-        app:layout_constraintTop_toTopOf="parent"/>
+        android:inputType="text"
+        android:maxLines="1"/>
 
-    <ProgressBar
-        android:id="@+id/progress"
-        style="?android:attr/progressBarStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="32dp"
-        android:layout_marginTop="32dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@id/divider1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/track_search"
-        tools:visibility="visible"/>
-
-    <ListView
-        android:id="@+id/track_search_list"
-        style="@style/Theme.Widget.CardView"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="40dp"
-        android:choiceMode="singleChoice"
-        android:clipToPadding="false"
-        android:divider="@null"
-        android:dividerHeight="10dp"
-        android:footerDividersEnabled="true"
-        android:headerDividersEnabled="true"
-        android:listSelector="?attr/selectable_list_drawable"
-        android:paddingBottom="4dp"
-        android:paddingTop="4dp"
-        android:scrollbars="none"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/track_search"
-        tools:listitem="@layout/track_search_item"
-        tools:visibility="visible"/>
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <ProgressBar
+            android:id="@+id/progress"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="32dp"
+            android:layout_marginTop="32dp"
+            android:layout_gravity="center"
+            android:visibility="invisible"
+            tools:visibility="visible"/>
+
+        <ListView
+            android:id="@+id/track_search_list"
+            style="@style/Theme.Widget.CardView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:choiceMode="singleChoice"
+            android:divider="@null"
+            android:dividerHeight="10dp"
+            android:footerDividersEnabled="true"
+            android:headerDividersEnabled="true"
+            android:listSelector="?attr/selectable_list_drawable"
+            android:paddingBottom="4dp"
+            android:paddingTop="4dp"
+            android:scrollbars="none"
+            android:visibility="invisible"
+            tools:listitem="@layout/track_search_item"
+            tools:visibility="visible"/>
+
+    </FrameLayout>
 
     <View
-        android:id="@+id/divider1"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?android:attr/divider"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/track_search_list"/>
+        android:background="?android:attr/divider"/>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/track_search_item.xml b/app/src/main/res/layout/track_search_item.xml
index 2c5c7c7eea..acab56c218 100644
--- a/app/src/main/res/layout/track_search_item.xml
+++ b/app/src/main/res/layout/track_search_item.xml
@@ -12,7 +12,6 @@
         android:layout_height="216dp"
         android:background="?attr/selectable_list_drawable"
         android:orientation="horizontal">
-        >
 
         <ImageView
             android:id="@+id/track_search_cover"
@@ -161,4 +160,4 @@
             app:layout_constraintGuide_begin="150dp"/>
 
     </android.support.constraint.ConstraintLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</android.support.v7.widget.CardView>