aboutsummaryrefslogtreecommitdiff
path: root/core-ui
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2018-10-18 00:32:08 -0400
committerAllan Wang <me@allanwang.ca>2018-10-18 00:32:08 -0400
commit096172ead4674bffd5dd83eb994dd68ac48b88ae (patch)
tree7806e238993cb4370f385a5753d3a5ec8f6a5fbc /core-ui
parent5b3762b3e04042447b9bf2758c37237d0c8af1b6 (diff)
parent9dd6249d634c8b70d152907a4cda80da1626cddc (diff)
downloadkau-096172ead4674bffd5dd83eb994dd68ac48b88ae.tar.gz
kau-096172ead4674bffd5dd83eb994dd68ac48b88ae.tar.bz2
kau-096172ead4674bffd5dd83eb994dd68ac48b88ae.zip
Merge dev
Diffstat (limited to 'core-ui')
-rw-r--r--core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/ElasticDragDismissFrameLayout.kt2
-rw-r--r--core-ui/src/main/res-public/values-v21/styles.xml1
-rw-r--r--core-ui/src/main/res/values/attr.xml40
3 files changed, 22 insertions, 21 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/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>