diff options
| author | Allan Wang <me@allanwang.ca> | 2017-06-24 12:16:44 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-06-24 12:16:44 -0700 |
| commit | be1dc924a7b7cce61fabe0b03ff26c780920db95 (patch) | |
| tree | 18bdaa371482bd1d79dcda0c4761611dc75a164a /library/src/main/res/layout | |
| parent | 245791389eb09a56658d81e9894881584a712461 (diff) | |
| download | kau-be1dc924a7b7cce61fabe0b03ff26c780920db95.tar.gz kau-be1dc924a7b7cce61fabe0b03ff26c780920db95.tar.bz2 kau-be1dc924a7b7cce61fabe0b03ff26c780920db95.zip | |
Update searchview logic and add travis
Diffstat (limited to 'library/src/main/res/layout')
| -rw-r--r-- | library/src/main/res/layout/kau_activity_kpref.xml | 1 | ||||
| -rw-r--r-- | library/src/main/res/layout/kau_search_view.xml | 15 |
2 files changed, 9 insertions, 7 deletions
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" |