From be1dc924a7b7cce61fabe0b03ff26c780920db95 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sat, 24 Jun 2017 12:16:44 -0700
Subject: Update searchview logic and add travis

---
 library/src/main/res/layout/kau_activity_kpref.xml |  1 +
 library/src/main/res/layout/kau_search_view.xml    | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'library/src/main/res/layout')

diff --git a/library/src/main/res/layout/kau_activity_kpref.xml b/library/src/main/res/layout/kau_activity_kpref.xml
index acc1f76..856f168 100644
--- a/library/src/main/res/layout/kau_activity_kpref.xml
+++ b/library/src/main/res/layout/kau_activity_kpref.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/kau_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/library/src/main/res/layout/kau_search_view.xml b/library/src/main/res/layout/kau_search_view.xml
index 799d4df..72cfd02 100644
--- a/library/src/main/res/layout/kau_search_view.xml
+++ b/library/src/main/res/layout/kau_search_view.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <View
         android:id="@+id/search_shadow"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:background="@color/kau_search_full_shadow"
+        android:visibility="gone" />
 
     <android.support.v7.widget.CardView
         android:id="@+id/search_cardview"
@@ -38,7 +39,7 @@
                     android:focusable="true"
                     android:scaleType="centerInside" />
 
-                <com.lapism.searchview.SearchEditText
+                <android.support.v7.widget.AppCompatEditText
                     android:id="@+id/search_edit_text"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
@@ -61,8 +62,8 @@
                     android:id="@+id/search_progress"
                     style="?android:attr/indeterminateProgressStyle"
                     android:layout_width="@dimen/kau_search_progress"
-                    android:visibility="gone"
-                    android:layout_height="match_parent" />
+                    android:layout_height="match_parent"
+                    android:visibility="gone" />
 
                 <FrameLayout
                     android:layout_width="48dp"
@@ -76,8 +77,8 @@
                         android:clickable="true"
                         android:contentDescription="@string/kau_search"
                         android:focusable="true"
-                        android:visibility="gone"
-                        android:scaleType="center" />
+                        android:scaleType="center"
+                        android:visibility="gone" />
 
                     <ImageView
                         android:id="@+id/search_clear"
-- 
cgit v1.2.3