diff options
| author | Allan Wang <allanwang@google.com> | 2019-07-27 17:46:04 -0700 |
|---|---|---|
| committer | Allan Wang <allanwang@google.com> | 2019-07-27 17:46:04 -0700 |
| commit | 50c8012e2fe88d6b275d1a3269033590962caa7f (patch) | |
| tree | 65ebb32525be83441e6caac8362e3e9ae022bfd1 /core-ui | |
| parent | 01058912580a3ecfe77eaf6af209e1c46a97f2d7 (diff) | |
| parent | d94017e6f6df67e80604111028ea16f6c7f4e077 (diff) | |
| download | kau-50c8012e2fe88d6b275d1a3269033590962caa7f.tar.gz kau-50c8012e2fe88d6b275d1a3269033590962caa7f.tar.bz2 kau-50c8012e2fe88d6b275d1a3269033590962caa7f.zip | |
Fix initial conflicts
Diffstat (limited to 'core-ui')
| -rw-r--r-- | core-ui/build.gradle | 2 | ||||
| -rw-r--r-- | core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/ElasticDragDismissFrameLayout.kt | 2 | ||||
| -rw-r--r-- | core-ui/src/main/res-public/values/public.xml | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/core-ui/build.gradle b/core-ui/build.gradle index c2732c6..23d601d 100644 --- a/core-ui/build.gradle +++ b/core-ui/build.gradle @@ -4,8 +4,6 @@ apply from: '../android-lib.gradle' dependencies { api project(':core') - implementation project(':adapter') - } apply from: '../artifacts.gradle' 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 f4578f2..2cf005a 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 @@ -50,7 +50,7 @@ class ElasticDragDismissFrameLayout @JvmOverloads constructor( ) : FrameLayout(context, attrs, defStyleAttr, defStyleRes) { // configurable attribs - var dragDismissDistance = context.dimen(R.dimen.kau_drag_dismiss_distance).dpToPx + var dragDismissDistance = context.dimen(R.dimen.kau_drag_dismiss_distance) var dragDismissFraction = -1f var dragDismissScale = 1f set(value) { diff --git a/core-ui/src/main/res-public/values/public.xml b/core-ui/src/main/res-public/values/public.xml index af7ce44..71657d6 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'> +<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' /> |