Update to match master

4 files changed, 23 insertions, 22 deletions

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 0c9f306..f357f79 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
@@ -250,7 +250,7 @@ class ElasticDragDismissFrameLayout @JvmOverloads constructor(
     fun addExitListener(activity: Activity, transitionBottom: Int = R.transition.kau_exit_slide_bottom, transitionTop: Int = R.transition.kau_exit_slide_top) {
         addListener(object : ElasticDragDismissFrameLayout.SystemChromeFader(activity) {
             override fun onDragDismissed() {
-                KL.v{"New transition"}
+                KL.v { "New transition" }
                 activity.window.returnTransition = TransitionInflater.from(activity)
                         .inflateTransition(if (translationY > 0) transitionBottom else transitionTop)
                 activity.finishAfterTransition()
diff --git a/core-ui/src/main/res-public/values-v21/styles.xml b/core-ui/src/main/res-public/values-v21/styles.xml
index 782f9bb..e6c33c3 100644
--- a/core-ui/src/main/res-public/values-v21/styles.xml
+++ b/core-ui/src/main/res-public/values-v21/styles.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
+
     <style name="Kau.Translucent.SlideBottom">
         <item name="android:windowEnterTransition">@transition/kau_enter_slide_bottom</item>
         <item name="android:windowReturnTransition">@transition/kau_exit_slide_bottom</item>
diff --git a/core-ui/src/main/res-public/values/public.xml b/core-ui/src/main/res-public/values/public.xml
index f46b3eb..dcaa583 100644
--- a/core-ui/src/main/res-public/values/public.xml
+++ b/core-ui/src/main/res-public/values/public.xml
@@ -1,8 +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_recycler_detached_background' type='layout' />
-    <public name='kau_elastic_recycler_activity' type='layout' />
     <public name='kau_recycler_textslider' type='layout' />
+    <public name='kau_elastic_recycler_activity' type='layout' />
     <public name='Kau.Translucent' type='style' />
     <public name='Kau.Translucent.NoAnimation' type='style' />
     <public name='Kau.Translucent.SlideBottom' type='style' />
diff --git a/core-ui/src/main/res/values/attr.xml b/core-ui/src/main/res/values/attr.xml
index 271d132..a5f9907 100644
--- a/core-ui/src/main/res/values/attr.xml
+++ b/core-ui/src/main/res/values/attr.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
     <declare-styleable name="BoundedCardView">
-        <attr format="dimension" name="maxHeight"/>
-        <attr format="float" name="maxHeightPercent"/>
+        <attr format="dimension" name="maxHeight" />
+        <attr format="float" name="maxHeightPercent" />
     </declare-styleable>
 
     <declare-styleable name="CutoutView">
-        <attr format="color" name="foregroundColor"/>
-        <attr name="android:text"/>
-        <attr name="android:drawable"/>
-        <attr name="android:minHeight"/>
-        <attr format="float" name="heightPercentageToScreen"/>
-        <attr name="font"/>
+        <attr format="color" name="foregroundColor" />
+        <attr name="android:text" />
+        <attr name="android:drawable" />
+        <attr name="android:minHeight" />
+        <attr format="float" name="heightPercentageToScreen" />
+        <attr name="font" />
     </declare-styleable>
 
     <declare-styleable name="ElasticDragDismissFrameLayout">
-        <attr format="dimension" name="dragDismissDistance"/>
-        <attr format="float" name="dragDismissFraction"/>
-        <attr format="float" name="dragDismissScale"/>
-        <attr format="float" name="dragElasticity"/>
+        <attr format="dimension" name="dragDismissDistance" />
+        <attr format="float" name="dragDismissFraction" />
+        <attr format="float" name="dragDismissScale" />
+        <attr format="float" name="dragElasticity" />
     </declare-styleable>
 
     <declare-styleable name="InkPageIndicator">
-        <attr format="dimension" name="dotDiameter"/>
-        <attr format="dimension" name="dotGap"/>
-        <attr format="integer" name="animationDuration"/>
-        <attr format="color" name="pageIndicatorColor"/>
-        <attr format="color" name="currentPageIndicatorColor"/>
+        <attr format="dimension" name="dotDiameter" />
+        <attr format="dimension" name="dotGap" />
+        <attr format="integer" name="animationDuration" />
+        <attr format="color" name="pageIndicatorColor" />
+        <attr format="color" name="currentPageIndicatorColor" />
     </declare-styleable>
 
     <declare-styleable name="TextSlider">
         <attr format="enum" name="animation_type">
-            <enum name="none" value="1000"/>
-            <enum name="slide_horizontal" value="1001"/>
-            <enum name="slide_vertical" value="1002"/>
+            <enum name="none" value="1000" />
+            <enum name="slide_horizontal" value="1001" />
+            <enum name="slide_vertical" value="1002" />
         </attr>
     </declare-styleable>
 </resources>