From 48213d0b427c478865c75fee912ff1ae8bbaffb5 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Mon, 31 Jul 2017 23:02:01 -0700
Subject: Major update to core and kotterknife; create mediapicker (#15)

* Readme

* Fix kau direction bits

* Truly support transparent ripples

* Update changelog

* Test rect as base

* Replace fab transition with generic fade scale transition

* Add scalexy func

* Add scaleXY

* Add arguments to fadeScaleTransition

* Clean up ink indicator

* Create setOnSingleTapListener

* Fix lint and add rndColor

* Create kotterknife resettables

* Add readme and missing object

* Create lazy resettable registered

* Update core docs

* Opt for separate class for resettable registry

* Clean up resettable registry

* Rename functions

* Add ripple callback listener

* Adjust kprefactivity desc color

* Add more transitions

* Add delete keys option

* Add instrumentation tests

* switch id

* Revert automatic instrumental tests

* Generify imagepickercore and prepare video alternative

* Create working video picker

* Address possible null issue

* Update searchview

* Make layouts public

* Add changelog test

* Update logo link

* Add custom color gif
---
 core-ui/build.gradle                               |  1 -
 .../ui/widgets/ElasticDragDismissFrameLayout.kt    | 12 ++---
 .../allanwang/kau/ui/widgets/InkPageIndicator.java | 11 +++--
 .../layout/kau_elastic_recycler_activity.xml       | 51 ++++++++++++++++++++++
 .../layout/kau_recycler_detached_background.xml    | 27 ++++++++++++
 .../res-public/layout/kau_recycler_textslider.xml  | 34 +++++++++++++++
 core-ui/src/main/res-public/values/public.xml      |  3 ++
 .../res/layout/kau_elastic_recycler_activity.xml   | 51 ----------------------
 .../layout/kau_recycler_detached_background.xml    | 27 ------------
 .../main/res/layout/kau_recycler_textslider.xml    | 34 ---------------
 10 files changed, 123 insertions(+), 128 deletions(-)
 create mode 100644 core-ui/src/main/res-public/layout/kau_elastic_recycler_activity.xml
 create mode 100644 core-ui/src/main/res-public/layout/kau_recycler_detached_background.xml
 create mode 100644 core-ui/src/main/res-public/layout/kau_recycler_textslider.xml
 delete mode 100644 core-ui/src/main/res/layout/kau_elastic_recycler_activity.xml
 delete mode 100644 core-ui/src/main/res/layout/kau_recycler_detached_background.xml
 delete mode 100644 core-ui/src/main/res/layout/kau_recycler_textslider.xml

(limited to 'core-ui')

diff --git a/core-ui/build.gradle b/core-ui/build.gradle
index c4dcc72..da6715c 100644
--- a/core-ui/build.gradle
+++ b/core-ui/build.gradle
@@ -3,7 +3,6 @@ ext.kauSubModuleMinSdk = project.CORE_MIN_SDK
 apply from: '../android-lib.gradle'
 
 dependencies {
-
     compile project(':core')
     compile project(':adapter')
 
diff --git a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/ElasticDragDismissFrameLayout.kt b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/ElasticDragDismissFrameLayout.kt
index 5cdfc92..3c477c1 100644
--- a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/ElasticDragDismissFrameLayout.kt
+++ b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/ElasticDragDismissFrameLayout.kt
@@ -119,8 +119,7 @@ class ElasticDragDismissFrameLayout @JvmOverloads constructor(
         } else { // settle back to natural position
             animate()
                     .translationY(0f)
-                    .scaleX(1f)
-                    .scaleY(1f)
+                    .scaleXY(1f)
                     .setDuration(200L)
                     .setInterpolator(AnimHolder.fastOutSlowInInterpolator(context))
                     .setListener(null)
@@ -176,11 +175,7 @@ class ElasticDragDismissFrameLayout @JvmOverloads constructor(
         }
         translationY = dragTo
 
-        if (shouldScale) {
-            val scale = 1 - (1 - dragDismissScale) * dragFraction
-            scaleX = scale
-            scaleY = scale
-        }
+        if (shouldScale) scaleXY = 1 - (1 - dragDismissScale) * dragFraction
 
         // if we've reversed direction and gone past the settle point then clear the flags to
         // allow the list to get the scroll events & reset any transforms
@@ -191,8 +186,7 @@ class ElasticDragDismissFrameLayout @JvmOverloads constructor(
             draggingUp = false
             draggingDown = draggingUp
             translationY = 0f
-            scaleX = 1f
-            scaleY = 1f
+            scaleXY = 1f
         }
         dispatchDragCallback(dragFraction, dragTo,
                 Math.min(1f, Math.abs(totalDrag) / dragDismissDistance), totalDrag)
diff --git a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/InkPageIndicator.java b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/InkPageIndicator.java
index cad6997..65eb5b7 100644
--- a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/InkPageIndicator.java
+++ b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/InkPageIndicator.java
@@ -36,6 +36,7 @@ import android.view.animation.Interpolator;
 
 import java.util.Arrays;
 
+import ca.allanwang.kau.logging.KL;
 import ca.allanwang.kau.ui.R;
 import ca.allanwang.kau.utils.AnimHolder;
 import ca.allanwang.kau.utils.ColorUtilsKt;
@@ -384,7 +385,7 @@ public class InkPageIndicator extends View implements ViewPager.OnPageChangeList
 
         if ((joiningFraction == 0f || joiningFraction == INVALID_FRACTION)
                 && dotRevealFraction == 0f
-                && !(page == currentPage && selectedDotInPosition == true)) {
+                && !(page == currentPage && selectedDotInPosition)) {
 
             // case #1 – At rest
             unselectedDotPath.addCircle(dotCenterX[page], dotCenterY, dotRadius, Path.Direction.CW);
@@ -632,8 +633,8 @@ public class InkPageIndicator extends View implements ViewPager.OnPageChangeList
         });
         // slightly delay the start to give the joins a chance to run
         // unless dot isn't in position yet – then don't delay!
-        moveSelected.setStartDelay(selectedDotInPosition ? animDuration / 4l : 0l);
-        moveSelected.setDuration(animDuration * 3l / 4l);
+        moveSelected.setStartDelay(selectedDotInPosition ? animDuration / 4L : 0L);
+        moveSelected.setDuration(animDuration * 3L / 4L);
         moveSelected.setInterpolator(interpolator);
         return moveSelected;
     }
@@ -641,9 +642,7 @@ public class InkPageIndicator extends View implements ViewPager.OnPageChangeList
     private void setJoiningFraction(int leftDot, float fraction) {
         if (leftDot < joiningFractions.length) {
 
-            if (leftDot == 1) {
-                Log.d("PageIndicator", "dot 1 fraction:\t" + fraction);
-            }
+            if (leftDot == 1) KL.INSTANCE.v("PageIndicator dot 1 fraction:\t$fraction");
 
             joiningFractions[leftDot] = fraction;
             postInvalidateOnAnimation();
diff --git a/core-ui/src/main/res-public/layout/kau_elastic_recycler_activity.xml b/core-ui/src/main/res-public/layout/kau_elastic_recycler_activity.xml
new file mode 100644
index 0000000..055d61d
--- /dev/null
+++ b/core-ui/src/main/res-public/layout/kau_elastic_recycler_activity.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ca.allanwang.kau.ui.widgets.ElasticDragDismissFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/kau_draggable"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:dragDismissDistance="@dimen/kau_drag_dismiss_distance_large"
+    app:dragDismissScale="0.95">
+
+    <android.support.design.widget.CoordinatorLayout
+        android:id="@+id/kau_coordinator"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/kau_drag_dismiss_distance"
+        android:background="?android:colorBackground"
+        android:orientation="vertical">
+
+        <android.support.design.widget.AppBarLayout
+            android:id="@+id/kau_appbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/kau_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+
+        </android.support.design.widget.AppBarLayout>
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/kau_recycler"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layoutManager="android.support.v7.widget.LinearLayoutManager"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/kau_fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/kau_fab_margin"
+            android:clickable="true"
+            android:visibility="gone"
+            app:backgroundTint="?colorAccent"
+            app:layout_anchor="@id/kau_recycler"
+            app:layout_anchorGravity="bottom|right|end" />
+
+    </android.support.design.widget.CoordinatorLayout>
+
+</ca.allanwang.kau.ui.widgets.ElasticDragDismissFrameLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res-public/layout/kau_recycler_detached_background.xml b/core-ui/src/main/res-public/layout/kau_recycler_detached_background.xml
new file mode 100644
index 0000000..7295d66
--- /dev/null
+++ b/core-ui/src/main/res-public/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/core-ui/src/main/res-public/layout/kau_recycler_textslider.xml b/core-ui/src/main/res-public/layout/kau_recycler_textslider.xml
new file mode 100644
index 0000000..eacd5be
--- /dev/null
+++ b/core-ui/src/main/res-public/layout/kau_recycler_textslider.xml
@@ -0,0 +1,34 @@
+<?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">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/kau_toolbar"
+        android:layout_width="0dp"
+        android:layout_height="?attr/actionBarSize"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ca.allanwang.kau.ui.widgets.TextSlider
+            android:id="@+id/kau_toolbar_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            app:animation_type="slide_vertical" />
+
+    </android.support.v7.widget.Toolbar>
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/kau_recycler"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/kau_toolbar" />
+
+</android.support.constraint.ConstraintLayout>
diff --git a/core-ui/src/main/res-public/values/public.xml b/core-ui/src/main/res-public/values/public.xml
index 59e34a6..aed5f9f 100644
--- a/core-ui/src/main/res-public/values/public.xml
+++ b/core-ui/src/main/res-public/values/public.xml
@@ -1,5 +1,8 @@
 <resources xmlns:tools='http://schemas.android.com/tools' tools:ignore='ResourceName'>
 <!-- AUTO-GENERATED FILE.  DO NOT MODIFY. public.xml is generated by the generatepublicxml gradle task -->
+    <public name='kau_elastic_recycler_activity' type='layout' />
+    <public name='kau_recycler_detached_background' type='layout' />
+    <public name='kau_recycler_textslider' type='layout' />
     <public name='kau_shadow_overlay' type='color' />
     <public name='Kau.Translucent' type='style' />
     <public name='Kau.Translucent.NoAnimation' type='style' />
diff --git a/core-ui/src/main/res/layout/kau_elastic_recycler_activity.xml b/core-ui/src/main/res/layout/kau_elastic_recycler_activity.xml
deleted file mode 100644
index 055d61d..0000000
--- a/core-ui/src/main/res/layout/kau_elastic_recycler_activity.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ca.allanwang.kau.ui.widgets.ElasticDragDismissFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/kau_draggable"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:dragDismissDistance="@dimen/kau_drag_dismiss_distance_large"
-    app:dragDismissScale="0.95">
-
-    <android.support.design.widget.CoordinatorLayout
-        android:id="@+id/kau_coordinator"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/kau_drag_dismiss_distance"
-        android:background="?android:colorBackground"
-        android:orientation="vertical">
-
-        <android.support.design.widget.AppBarLayout
-            android:id="@+id/kau_appbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/kau_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
-
-        </android.support.design.widget.AppBarLayout>
-
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/kau_recycler"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layoutManager="android.support.v7.widget.LinearLayoutManager"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-        <android.support.design.widget.FloatingActionButton
-            android:id="@+id/kau_fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/kau_fab_margin"
-            android:clickable="true"
-            android:visibility="gone"
-            app:backgroundTint="?colorAccent"
-            app:layout_anchor="@id/kau_recycler"
-            app:layout_anchorGravity="bottom|right|end" />
-
-    </android.support.design.widget.CoordinatorLayout>
-
-</ca.allanwang.kau.ui.widgets.ElasticDragDismissFrameLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/kau_recycler_detached_background.xml b/core-ui/src/main/res/layout/kau_recycler_detached_background.xml
deleted file mode 100644
index 7295d66..0000000
--- a/core-ui/src/main/res/layout/kau_recycler_detached_background.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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/core-ui/src/main/res/layout/kau_recycler_textslider.xml b/core-ui/src/main/res/layout/kau_recycler_textslider.xml
deleted file mode 100644
index eacd5be..0000000
--- a/core-ui/src/main/res/layout/kau_recycler_textslider.xml
+++ /dev/null
@@ -1,34 +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/kau_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/kau_toolbar"
-        android:layout_width="0dp"
-        android:layout_height="?attr/actionBarSize"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ca.allanwang.kau.ui.widgets.TextSlider
-            android:id="@+id/kau_toolbar_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            app:animation_type="slide_vertical" />
-
-    </android.support.v7.widget.Toolbar>
-
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/kau_recycler"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/kau_toolbar" />
-
-</android.support.constraint.ConstraintLayout>
-- 
cgit v1.2.3