diff options
author | Allan Wang <me@allanwang.ca> | 2019-09-22 21:47:12 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2019-09-22 21:47:12 -0700 |
commit | 53ee262302fadfb3c42e951145511ba2c588e227 (patch) | |
tree | 9ca12a913a42895b6cb5961003d2c88e28399f37 /core-ui | |
parent | 00ba1bcf7a756252baa808e62a0916fd18e95946 (diff) | |
parent | bfba246d84aa6a22bc02837f9fcbd97780867d10 (diff) | |
download | kau-53ee262302fadfb3c42e951145511ba2c588e227.tar.gz kau-53ee262302fadfb3c42e951145511ba2c588e227.tar.bz2 kau-53ee262302fadfb3c42e951145511ba2c588e227.zip |
Merge dev
Diffstat (limited to 'core-ui')
4 files changed, 8 insertions, 5 deletions
diff --git a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/activities/ElasticRecyclerActivity.kt b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/activities/ElasticRecyclerActivity.kt index aff4d1c..3e7254f 100644 --- a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/activities/ElasticRecyclerActivity.kt +++ b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/activities/ElasticRecyclerActivity.kt @@ -53,7 +53,9 @@ abstract class ElasticRecyclerActivity : KauBaseActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.kau_elastic_recycler_activity) setSupportActionBar(kau_toolbar) - if (!onCreate(savedInstanceState, configs)) return + if (!onCreate(savedInstanceState, configs)) { + return + } kau_draggable.addListener(object : ElasticDragDismissFrameLayout.SystemChromeFader(this) { override fun onDragDismissed() { 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 2cf005a..6095a32 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 @@ -29,7 +29,6 @@ import ca.allanwang.kau.logging.KL import ca.allanwang.kau.ui.R import ca.allanwang.kau.utils.AnimHolder import ca.allanwang.kau.utils.dimen -import ca.allanwang.kau.utils.dpToPx import ca.allanwang.kau.utils.isNavBarOnBottom import ca.allanwang.kau.utils.navigationBarColor import ca.allanwang.kau.utils.scaleXY @@ -205,7 +204,9 @@ class ElasticDragDismissFrameLayout @JvmOverloads constructor( } translationY = dragTo - if (shouldScale) scaleXY = 1 - (1 - dragDismissScale) * dragFraction + 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 diff --git a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/TextSlider.kt b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/TextSlider.kt index 51f7ab9..726f5b6 100644 --- a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/TextSlider.kt +++ b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/TextSlider.kt @@ -138,7 +138,7 @@ class TextSlider @JvmOverloads constructor( init { setFactory { TextView(context).apply { - //replica of toolbar title + // replica of toolbar title gravity = Gravity.START setSingleLine() ellipsize = TextUtils.TruncateAt.END diff --git a/core-ui/src/main/res-public/values/public.xml b/core-ui/src/main/res-public/values/public.xml index af7ce44..c8c2e56 100644 --- a/core-ui/src/main/res-public/values/public.xml +++ b/core-ui/src/main/res-public/values/public.xml @@ -1,4 +1,4 @@ -<resources xmlns:tools='http://schemas.android.com/tools' tools:ignore='ResourceName'> +<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' /> |