From fc1f290b855820516a0a4d7fffe8f55e6fe191e0 Mon Sep 17 00:00:00 2001
From: Carlos <cargo8005@gmail.com>
Date: Sun, 18 Feb 2018 13:36:34 -0500
Subject: [PATCH] removed extra blank lines (#1259)

fixed results not showing for jellybean
made edit text max line 1 to prevent it newlines being added and moving the edit text into the list view
---
 .../tachiyomi/ui/manga/track/TrackSearchAdapter.kt  |  5 +----
 app/src/main/res/layout/track_search_dialog.xml     |  3 ++-
 app/src/main/res/layout/track_search_item.xml       | 13 +++++++++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
index fe9e0012c6..c11a9bdd0a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
@@ -6,8 +6,8 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.track.model.TrackSearch
 import eu.kanade.tachiyomi.data.glide.GlideApp
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
 import eu.kanade.tachiyomi.util.gone
 import eu.kanade.tachiyomi.util.inflate
 import kotlinx.android.synthetic.main.track_search_item.view.*
@@ -53,7 +53,6 @@ class TrackSearchAdapter(context: Context)
                         .centerCrop()
                         .into(view.track_search_cover)
 
-
                 if (track.publishing_status.isNullOrBlank()) {
                     view.track_search_status.gone()
                     view.track_search_status_result.gone()
@@ -74,9 +73,7 @@ class TrackSearchAdapter(context: Context)
                 } else {
                     view.track_search_start_result.text = track.start_date
                 }
-
             }
         }
     }
-
 }
\ 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 1fdd70ee00..84f9a3d54c 100644
--- a/app/src/main/res/layout/track_search_dialog.xml
+++ b/app/src/main/res/layout/track_search_dialog.xml
@@ -14,6 +14,7 @@
         android:hint="@string/title"
         android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
+        android:maxLines="1"
         app:layout_constraintTop_toTopOf="parent"/>
 
     <ProgressBar
@@ -34,7 +35,7 @@
         android:id="@+id/track_search_list"
         style="@style/Theme.Widget.CardView"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="match_parent"
         android:layout_marginTop="40dp"
         android:choiceMode="singleChoice"
         android:clipToPadding="false"
diff --git a/app/src/main/res/layout/track_search_item.xml b/app/src/main/res/layout/track_search_item.xml
index 51b9a8a9bd..2c5c7c7eea 100644
--- a/app/src/main/res/layout/track_search_item.xml
+++ b/app/src/main/res/layout/track_search_item.xml
@@ -21,6 +21,8 @@
             android:layout_marginBottom="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
             android:layout_marginTop="8dp"
             android:contentDescription="@string/description_cover"
             android:scaleType="centerCrop"
@@ -29,13 +31,13 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="0.0"
             tools:src="@drawable/branded_logo_icon"/>
-
-
         <TextView
             android:id="@+id/track_search_title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
             android:maxLines="3"
@@ -50,6 +52,7 @@
             android:id="@+id/track_search_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:maxLines="1"
             android:text="@string/track_type"
@@ -63,6 +66,7 @@
             android:id="@+id/track_search_type_result"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:maxLines="1"
             android:textAppearance="@style/TextAppearance.Regular.Body1.Secondary"
@@ -76,6 +80,7 @@
             android:id="@+id/track_search_start"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:maxLines="1"
             android:text="@string/track_start_date"
@@ -89,6 +94,7 @@
             android:id="@+id/track_search_start_result"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:maxLines="1"
             android:textAppearance="@style/TextAppearance.Regular.Body1.Secondary"
@@ -102,6 +108,7 @@
             android:id="@+id/track_search_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:maxLines="1"
             android:text="@string/track_status"
@@ -115,6 +122,7 @@
             android:id="@+id/track_search_status_result"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
+            android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:maxLines="1"
             android:textAppearance="@style/TextAppearance.Regular.Body1.Secondary"
@@ -129,6 +137,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginBottom="8dp"
+            android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"