From 8f2e56eb5ecfc6b5ce2f1530ead6fe73f5bfe89c Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Thu, 29 Jun 2017 00:29:46 -0700
Subject: Completely rewrite about activity

---
 .../main/res/layout/kau_about_iitem_library.xml    | 107 +++++++++++++++++++++
 .../src/main/res/layout/kau_about_item_library.xml | 107 ---------------------
 .../src/main/res/layout/kau_about_section_main.xml |   2 +-
 library/src/main/res/layout/kau_iitem_card.xml     |  76 +++++++++++++++
 library/src/main/res/layout/kau_iitem_cutout.xml   |   9 ++
 .../layout/kau_recycler_detached_background.xml    |  27 ++++++
 library/src/main/res/layout/kau_search_iitem.xml   |  61 ++++++++++++
 library/src/main/res/layout/kau_search_item.xml    |  61 ------------
 .../src/main/res/transition/kau_about_enter.xml    |  38 --------
 .../main/res/transition/kau_enter_slide_top.xml    |  38 ++++++++
 library/src/main/res/values/attr.xml               |   3 +-
 library/src/main/res/values/dimens.xml             |   7 +-
 library/src/main/res/values/ids.xml                |   2 +
 library/src/main/res/values/styles.xml             |   2 +-
 14 files changed, 330 insertions(+), 210 deletions(-)
 create mode 100644 library/src/main/res/layout/kau_about_iitem_library.xml
 delete mode 100644 library/src/main/res/layout/kau_about_item_library.xml
 create mode 100644 library/src/main/res/layout/kau_iitem_card.xml
 create mode 100644 library/src/main/res/layout/kau_iitem_cutout.xml
 create mode 100644 library/src/main/res/layout/kau_recycler_detached_background.xml
 create mode 100644 library/src/main/res/layout/kau_search_iitem.xml
 delete mode 100644 library/src/main/res/layout/kau_search_item.xml
 delete mode 100644 library/src/main/res/transition/kau_about_enter.xml
 create mode 100644 library/src/main/res/transition/kau_enter_slide_top.xml

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

diff --git a/library/src/main/res/layout/kau_about_iitem_library.xml b/library/src/main/res/layout/kau_about_iitem_library.xml
new file mode 100644
index 0000000..0129512
--- /dev/null
+++ b/library/src/main/res/layout/kau_about_iitem_library.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/lib_item_card"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="8dp"
+    android:paddingTop="8dp"
+    android:clickable="true"
+    android:foreground="?selectableItemBackground"
+    android:layoutDirection="ltr">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="6dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp">
+
+            <TextView
+                android:id="@+id/lib_item_name"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="5"
+                android:ellipsize="end"
+                android:gravity="start"
+                android:maxLines="1"
+                android:textSize="@dimen/textSizeLarge_openSource"
+                android:textStyle="normal"
+                tools:text="Library name" />
+
+            <TextView
+                android:id="@+id/lib_item_author"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:layout_weight="2"
+                android:gravity="end"
+                android:maxLines="2"
+                android:textSize="@dimen/textSizeSmall_openSource"
+                android:textStyle="normal"
+                tools:text="Author" />
+        </LinearLayout>
+
+        <View
+            android:id="@+id/lib_item_top_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:layout_marginTop="4dp" />
+
+        <TextView
+            android:id="@+id/lib_item_description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLines="20"
+            android:padding="8dp"
+            android:textSize="@dimen/textSizeSmall_openSource"
+            android:textStyle="normal"
+            tools:text="Description"/>
+
+        <View
+            android:id="@+id/lib_item_bottom_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:layout_marginTop="4dp" />
+
+        <LinearLayout
+            android:id="@+id/lib_item_bottom_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:paddingTop="4dp">
+
+            <TextView
+                android:id="@+id/lib_item_version"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="start"
+                android:maxLines="1"
+                android:textSize="@dimen/textSizeSmall_openSource"
+                android:textStyle="normal"
+                tools:text="Version" />
+
+            <TextView
+                android:id="@+id/lib_item_license"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="end"
+                android:maxLines="1"
+                android:textSize="@dimen/textSizeSmall_openSource"
+                android:textStyle="normal"
+                tools:text="License" />
+        </LinearLayout>
+    </LinearLayout>
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/library/src/main/res/layout/kau_about_item_library.xml b/library/src/main/res/layout/kau_about_item_library.xml
deleted file mode 100644
index 0129512..0000000
--- a/library/src/main/res/layout/kau_about_item_library.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/lib_item_card"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingBottom="8dp"
-    android:paddingTop="8dp"
-    android:clickable="true"
-    android:foreground="?selectableItemBackground"
-    android:layoutDirection="ltr">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="6dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp">
-
-            <TextView
-                android:id="@+id/lib_item_name"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:ellipsize="end"
-                android:gravity="start"
-                android:maxLines="1"
-                android:textSize="@dimen/textSizeLarge_openSource"
-                android:textStyle="normal"
-                tools:text="Library name" />
-
-            <TextView
-                android:id="@+id/lib_item_author"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:layout_weight="2"
-                android:gravity="end"
-                android:maxLines="2"
-                android:textSize="@dimen/textSizeSmall_openSource"
-                android:textStyle="normal"
-                tools:text="Author" />
-        </LinearLayout>
-
-        <View
-            android:id="@+id/lib_item_top_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:layout_marginTop="4dp" />
-
-        <TextView
-            android:id="@+id/lib_item_description"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:maxLines="20"
-            android:padding="8dp"
-            android:textSize="@dimen/textSizeSmall_openSource"
-            android:textStyle="normal"
-            tools:text="Description"/>
-
-        <View
-            android:id="@+id/lib_item_bottom_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:layout_marginTop="4dp" />
-
-        <LinearLayout
-            android:id="@+id/lib_item_bottom_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:paddingTop="4dp">
-
-            <TextView
-                android:id="@+id/lib_item_version"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="start"
-                android:maxLines="1"
-                android:textSize="@dimen/textSizeSmall_openSource"
-                android:textStyle="normal"
-                tools:text="Version" />
-
-            <TextView
-                android:id="@+id/lib_item_license"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="end"
-                android:maxLines="1"
-                android:textSize="@dimen/textSizeSmall_openSource"
-                android:textStyle="normal"
-                tools:text="License" />
-        </LinearLayout>
-    </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/library/src/main/res/layout/kau_about_section_main.xml b/library/src/main/res/layout/kau_about_section_main.xml
index aa338ee..40d8dfb 100644
--- a/library/src/main/res/layout/kau_about_section_main.xml
+++ b/library/src/main/res/layout/kau_about_section_main.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <ca.allanwang.kau.views.CutoutTextView
+        <ca.allanwang.kau.views.CutoutView
             android:id="@+id/about_main_cutout"
             android:layout_width="0dp"
             android:layout_height="@dimen/kau_about_header_height"
diff --git a/library/src/main/res/layout/kau_iitem_card.xml b/library/src/main/res/layout/kau_iitem_card.xml
new file mode 100644
index 0000000..4967a2e
--- /dev/null
+++ b/library/src/main/res/layout/kau_iitem_card.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Generic card with an imageview, title, description, and button
+  -->
+
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/kau_card_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="@dimen/kau_padding_normal"
+    android:foreground="?android:selectableItemBackground"
+    android:minHeight="?android:listPreferredItemHeight"
+    android:paddingBottom="@dimen/kau_padding_normal"
+    android:paddingEnd="@dimen/kau_padding_normal"
+    android:paddingTop="@dimen/kau_padding_normal">
+
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/kau_card_image"
+            android:layout_width="@dimen/kau_avatar_bounds"
+            android:layout_height="@dimen/kau_avatar_bounds"
+            android:layout_marginEnd="@dimen/kau_avatar_margin"
+            android:layout_marginStart="@dimen/kau_avatar_margin"
+            android:padding="@dimen/kau_avatar_padding"
+            android:visibility="gone"
+            android:scaleType="fitCenter"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/kau_card_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/kau_card_image"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/kau_card_description"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/kau_card_image"
+            app:layout_constraintTop_toBottomOf="@id/kau_card_title" />
+
+        <LinearLayout
+            android:id="@+id/kau_card_bottom_row"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/kau_card_image"
+            app:layout_constraintTop_toBottomOf="@id/kau_card_description">
+
+            <Button
+                android:id="@+id/kau_card_button"
+                style="?android:borderlessButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/kau_spacing_normal"
+                android:textColor="?attr/colorAccent" />
+
+        </LinearLayout>
+
+    </android.support.constraint.ConstraintLayout>
+
+</android.support.v7.widget.CardView>
diff --git a/library/src/main/res/layout/kau_iitem_cutout.xml b/library/src/main/res/layout/kau_iitem_cutout.xml
new file mode 100644
index 0000000..a4b17ac
--- /dev/null
+++ b/library/src/main/res/layout/kau_iitem_cutout.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ca.allanwang.kau.views.CutoutView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/kau_cutout"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/kau_about_header_height"
+    android:minHeight="@dimen/kau_about_header_height"
+    app:foregroundColor="?android:colorAccent"
+    app:heightPercentageToScreen="0.5" />
\ No newline at end of file
diff --git a/library/src/main/res/layout/kau_recycler_detached_background.xml b/library/src/main/res/layout/kau_recycler_detached_background.xml
new file mode 100644
index 0000000..7295d66
--- /dev/null
+++ b/library/src/main/res/layout/kau_recycler_detached_background.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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">
+
+    <!-- we use a parallel view for the background rather than just setting a background on the
+         recycler view for a nicer return transition. i.e. we want the background to fade and the
+         list to slide out separately -->
+    <View
+        android:id="@+id/kau_recycler_detached_background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?android:colorBackground" />
+
+    <!--defaults to a LinearLayoutManager-->
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/kau_recycler_detached"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipToPadding="false"
+        android:paddingBottom="@dimen/kau_spacing_normal"
+        android:scrollbars="vertical"
+        app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
+
+</FrameLayout>
diff --git a/library/src/main/res/layout/kau_search_iitem.xml b/library/src/main/res/layout/kau_search_iitem.xml
new file mode 100644
index 0000000..efd7260
--- /dev/null
+++ b/library/src/main/res/layout/kau_search_iitem.xml
@@ -0,0 +1,61 @@
+<?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/search_item_frame"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/kau_search_item_height"
+    android:background="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:gravity="start|center_vertical"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/search_icon"
+        android:layout_width="@dimen/kau_search_icon"
+        android:layout_height="0dp"
+        android:contentDescription="@string/kau_search"
+        android:scaleType="centerInside"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/search_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|center_vertical"
+        android:layout_weight="1"
+        android:ellipsize="end"
+        android:gravity="start|center_vertical"
+        android:maxLines="1"
+        android:paddingEnd="@dimen/kau_search_key_line_16"
+        android:paddingStart="@dimen/kau_search_key_line_8"
+        android:textIsSelectable="false"
+        android:textSize="@dimen/kau_search_text_small"
+        app:layout_constraintBottom_toTopOf="@+id/search_desc"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/search_icon"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.5" />
+
+    <TextView
+        android:id="@id/search_desc"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|center_vertical"
+        android:layout_weight="1"
+        android:ellipsize="end"
+        android:gravity="start|center_vertical"
+        android:maxLines="1"
+        android:paddingEnd="@dimen/kau_search_key_line_16"
+        android:paddingStart="@dimen/kau_search_key_line_8"
+        android:textIsSelectable="false"
+        android:textSize="@dimen/kau_search_text_micro"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/search_icon"
+        app:layout_constraintTop_toBottomOf="@id/search_title" />
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/library/src/main/res/layout/kau_search_item.xml b/library/src/main/res/layout/kau_search_item.xml
deleted file mode 100644
index efd7260..0000000
--- a/library/src/main/res/layout/kau_search_item.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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/search_item_frame"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/kau_search_item_height"
-    android:background="?android:attr/selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true"
-    android:gravity="start|center_vertical"
-    android:orientation="horizontal">
-
-    <ImageView
-        android:id="@+id/search_icon"
-        android:layout_width="@dimen/kau_search_icon"
-        android:layout_height="0dp"
-        android:contentDescription="@string/kau_search"
-        android:scaleType="centerInside"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/search_title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start|center_vertical"
-        android:layout_weight="1"
-        android:ellipsize="end"
-        android:gravity="start|center_vertical"
-        android:maxLines="1"
-        android:paddingEnd="@dimen/kau_search_key_line_16"
-        android:paddingStart="@dimen/kau_search_key_line_8"
-        android:textIsSelectable="false"
-        android:textSize="@dimen/kau_search_text_small"
-        app:layout_constraintBottom_toTopOf="@+id/search_desc"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/search_icon"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.5" />
-
-    <TextView
-        android:id="@id/search_desc"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start|center_vertical"
-        android:layout_weight="1"
-        android:ellipsize="end"
-        android:gravity="start|center_vertical"
-        android:maxLines="1"
-        android:paddingEnd="@dimen/kau_search_key_line_16"
-        android:paddingStart="@dimen/kau_search_key_line_8"
-        android:textIsSelectable="false"
-        android:textSize="@dimen/kau_search_text_micro"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/search_icon"
-        app:layout_constraintTop_toBottomOf="@id/search_title" />
-
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/library/src/main/res/transition/kau_about_enter.xml b/library/src/main/res/transition/kau_about_enter.xml
deleted file mode 100644
index 0089b84..0000000
--- a/library/src/main/res/transition/kau_about_enter.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2015 Google Inc.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<transitionSet
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:transitionOrdering="together"
-    android:duration="400"
-    android:interpolator="@android:interpolator/linear_out_slow_in">
-
-    <slide android:slideEdge="top">
-        <targets>
-            <target android:excludeId="@android:id/navigationBarBackground" />
-            <target android:excludeId="@android:id/statusBarBackground" />
-        </targets>
-    </slide>
-
-    <fade android:duration="@android:integer/config_mediumAnimTime">
-        <targets>
-            <target android:targetId="@android:id/navigationBarBackground" />
-            <target android:targetId="@android:id/statusBarBackground" />
-        </targets>
-    </fade>
-
-</transitionSet>
diff --git a/library/src/main/res/transition/kau_enter_slide_top.xml b/library/src/main/res/transition/kau_enter_slide_top.xml
new file mode 100644
index 0000000..0089b84
--- /dev/null
+++ b/library/src/main/res/transition/kau_enter_slide_top.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2015 Google Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<transitionSet
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:transitionOrdering="together"
+    android:duration="400"
+    android:interpolator="@android:interpolator/linear_out_slow_in">
+
+    <slide android:slideEdge="top">
+        <targets>
+            <target android:excludeId="@android:id/navigationBarBackground" />
+            <target android:excludeId="@android:id/statusBarBackground" />
+        </targets>
+    </slide>
+
+    <fade android:duration="@android:integer/config_mediumAnimTime">
+        <targets>
+            <target android:targetId="@android:id/navigationBarBackground" />
+            <target android:targetId="@android:id/statusBarBackground" />
+        </targets>
+    </fade>
+
+</transitionSet>
diff --git a/library/src/main/res/values/attr.xml b/library/src/main/res/values/attr.xml
index daeb5e3..49be8d9 100644
--- a/library/src/main/res/values/attr.xml
+++ b/library/src/main/res/values/attr.xml
@@ -29,9 +29,10 @@
         <attr name="dragElasticity" format="float" />
     </declare-styleable>
 
-    <declare-styleable name="CutoutTextView">
+    <declare-styleable name="CutoutView">
         <attr name="foregroundColor" format="color" />
         <attr name="android:text" />
+        <attr name="android:drawable" />
         <attr name="android:minHeight" />
         <attr name="heightPercentageToScreen" format="float" />
         <attr name="font"/>
diff --git a/library/src/main/res/values/dimens.xml b/library/src/main/res/values/dimens.xml
index d45643e..5bf6da4 100644
--- a/library/src/main/res/values/dimens.xml
+++ b/library/src/main/res/values/dimens.xml
@@ -28,5 +28,10 @@
 
     <dimen name="kau_about_header_height">224dp</dimen>
 
-
+    <!-- avatar should be a 40dp asset in a 48dp touch target & optically aligned with standard padding -->
+    <dimen name="kau_avatar_size">40dp</dimen>
+    <dimen name="kau_avatar_bounds">48dp</dimen>
+    <dimen name="kau_avatar_padding">4dp</dimen> <!-- (avatar_bounds - avatar_size) / 2 -->
+    <dimen name="kau_avatar_margin">12dp</dimen> <!-- padding_normal - avatar_padding -->
+    <dimen name="kau_avatar_ripple_radius">20dp</dimen> <!-- avatar_size / 2 -->
 </resources>
diff --git a/library/src/main/res/values/ids.xml b/library/src/main/res/values/ids.xml
index a21175a..fe0d411 100644
--- a/library/src/main/res/values/ids.xml
+++ b/library/src/main/res/values/ids.xml
@@ -8,6 +8,8 @@
     <item name="kau_item_pref_sub_item" type="id" />
     <item name="kau_item_pref_plain_text" type="id" />
     <item name="kau_item_search" type="id" />
+    <item name="kau_item_cutout" type="id" />
+    <item name="kau_item_card" type="id" />
     <item name="kau_item_about_library" type="id" />
     <item name="kau_item_about_main" type="id" />
 </resources>
\ No newline at end of file
diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml
index 6f5e3c1..2067c6d 100644
--- a/library/src/main/res/values/styles.xml
+++ b/library/src/main/res/values/styles.xml
@@ -14,7 +14,7 @@
     </style>
 
     <style name="Kau.Translucent.About">
-        <item name="android:windowEnterTransition">@transition/kau_about_enter</item>
+        <item name="android:windowEnterTransition">@transition/kau_enter_slide_top</item>
         <item name="android:windowReturnTransition">@transition/kau_about_return_upwards</item>
     </style>
 
-- 
cgit v1.2.3