From 7f8bfd759fed17ba10204f5f5dc20dc0248d2c35 Mon Sep 17 00:00:00 2001
From: len <len@kanade.eu>
Date: Sat, 21 Jan 2017 20:31:25 +0100
Subject: [PATCH] Fix filter input text introducing a new line. Also fix filter
 drawer clicks propagated to the views below

---
 .../kanade/tachiyomi/ui/catalogue/filter/TextItem.kt   |  1 -
 app/src/main/res/layout/catalogue_drawer_content.xml   | 10 ++++++----
 app/src/main/res/layout/navigation_view_text.xml       |  1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/TextItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/TextItem.kt
index 4056190ebc..9d4321dcb3 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/TextItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/TextItem.kt
@@ -23,7 +23,6 @@ open class TextItem(val filter: Filter.Text) : AbstractFlexibleItem<TextItem.Hol
     }
 
     override fun bindViewHolder(adapter: FlexibleAdapter<*>, holder: Holder, position: Int, payloads: List<Any?>?) {
-        holder.wrapper.visibility = if (filter.name.isEmpty()) View.GONE else View.VISIBLE
         holder.wrapper.hint = filter.name
         holder.edit.setText(filter.state)
         holder.edit.addTextChangedListener(object : SimpleTextWatcher() {
diff --git a/app/src/main/res/layout/catalogue_drawer_content.xml b/app/src/main/res/layout/catalogue_drawer_content.xml
index 1eced05732..4e04cc6557 100644
--- a/app/src/main/res/layout/catalogue_drawer_content.xml
+++ b/app/src/main/res/layout/catalogue_drawer_content.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clickable="true">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/navigation_view_text.xml b/app/src/main/res/layout/navigation_view_text.xml
index 5ca0da1755..5a3ce8e5eb 100644
--- a/app/src/main/res/layout/navigation_view_text.xml
+++ b/app/src/main/res/layout/navigation_view_text.xml
@@ -20,6 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:maxLines="1"
+            android:inputType="text"
             android:imeOptions="actionDone"
             android:textAppearance="@style/TextAppearance.AppCompat.Body2" />