aboutsummaryrefslogtreecommitdiff
path: root/library/src/main/res
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-06-24 20:00:35 -0700
committerAllan Wang <me@allanwang.ca>2017-06-24 20:00:35 -0700
commit35b26d771199c1dbf0d67377627c9d8b27da388c (patch)
tree7b8aa38ef8c0cc43cd5484626c6540bff7798940 /library/src/main/res
parent6ad176dde0a84a0eb96dea2f9c7eb34394045526 (diff)
downloadkau-35b26d771199c1dbf0d67377627c9d8b27da388c.tar.gz
kau-35b26d771199c1dbf0d67377627c9d8b27da388c.tar.bz2
kau-35b26d771199c1dbf0d67377627c9d8b27da388c.zip
Create tintable ripples
Diffstat (limited to 'library/src/main/res')
-rw-r--r--library/src/main/res/layout/kau_search_item.xml2
-rw-r--r--library/src/main/res/layout/kau_search_view.xml7
-rw-r--r--library/src/main/res/transition/kau_auto.xml4
-rw-r--r--library/src/main/res/values/dimens.xml2
-rw-r--r--library/src/main/res/values/dimens_search.xml2
5 files changed, 7 insertions, 10 deletions
diff --git a/library/src/main/res/layout/kau_search_item.xml b/library/src/main/res/layout/kau_search_item.xml
index fbdc826..20f3ef2 100644
--- a/library/src/main/res/layout/kau_search_item.xml
+++ b/library/src/main/res/layout/kau_search_item.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/linearLayout"
+ android:id="@+id/search_item_frame"
android:layout_width="match_parent"
android:layout_height="@dimen/kau_search_item_height"
android:background="?android:attr/selectableItemBackground"
diff --git a/library/src/main/res/layout/kau_search_view.xml b/library/src/main/res/layout/kau_search_view.xml
index 5626c4b..5c2ad27 100644
--- a/library/src/main/res/layout/kau_search_view.xml
+++ b/library/src/main/res/layout/kau_search_view.xml
@@ -1,5 +1,6 @@
<?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">
@@ -14,8 +15,9 @@
android:id="@+id/search_cardview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingEnd="2dp"
- android:paddingStart="2dp">
+ android:layout_marginEnd="@dimen/kau_search_base_margin"
+ android:layout_marginStart="@dimen/kau_search_base_margin"
+ app:cardCornerRadius="@dimen/kau_search_base_corners">
<LinearLayout
android:layout_width="match_parent"
@@ -23,7 +25,6 @@
android:orientation="vertical">
<LinearLayout
- android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="@dimen/kau_search_height"
android:focusable="true"
diff --git a/library/src/main/res/transition/kau_auto.xml b/library/src/main/res/transition/kau_auto.xml
deleted file mode 100644
index 8cda329..0000000
--- a/library/src/main/res/transition/kau_auto.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<autoTransition xmlns:android="http://schemas.android.com/apk/res/android"
- android:duration="300"
- android:interpolator="@android:interpolator/fast_out_slow_in" /> \ No newline at end of file
diff --git a/library/src/main/res/values/dimens.xml b/library/src/main/res/values/dimens.xml
index 0c0e749..cbb378a 100644
--- a/library/src/main/res/values/dimens.xml
+++ b/library/src/main/res/values/dimens.xml
@@ -14,6 +14,4 @@
<dimen name="kau_status_bar_height">24dp</dimen>
- <dimen name="kau_search_dropdownitem_icon_width">32dip</dimen>
-
</resources>
diff --git a/library/src/main/res/values/dimens_search.xml b/library/src/main/res/values/dimens_search.xml
index 3664403..9d4ea5e 100644
--- a/library/src/main/res/values/dimens_search.xml
+++ b/library/src/main/res/values/dimens_search.xml
@@ -3,6 +3,8 @@
<dimen name="kau_search_height">46dp</dimen>
+ <dimen name="kau_search_base_margin">4dp</dimen>
+ <dimen name="kau_search_base_corners">2dp</dimen>
<dimen name="kau_search_key_line_8">8dp</dimen>
<dimen name="kau_search_key_line_16">16dp</dimen>
<dimen name="kau_search_divider">1dp</dimen>