From 61d87976e8b29ed25061ae98743a6cf4f4274542 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 22 Jul 2017 16:08:08 -0700 Subject: Support sdk 19 where possible and add image picker (#10) * Fix plural * Switch to long * Test plural again * Comment * Major update to image picker and view utils * Make image activity full screen * Update min sdk and prefix * Lower sdk requirement and make string private * Bring kpref activity to sdk 19 --- .../kau/ui/activities/ElasticRecyclerActivity.kt | 14 ++++------- .../ca/allanwang/kau/ui/views/MeasuredImageView.kt | 5 ++-- .../ui/widgets/ElasticDragDismissFrameLayout.kt | 3 +++ core-ui/src/main/res-public/values-v21/styles.xml | 22 +++++++++++++++++ core-ui/src/main/res-public/values/colors.xml | 4 ++++ core-ui/src/main/res-public/values/public.xml | 8 +++++++ core-ui/src/main/res-public/values/styles.xml | 19 +++++++++++++++ .../src/main/res/drawable/kau_selectable_white.xml | 6 ----- core-ui/src/main/res/values/colors.xml | 6 ----- core-ui/src/main/res/values/strings.xml | 4 ---- core-ui/src/main/res/values/styles.xml | 28 ---------------------- 11 files changed, 63 insertions(+), 56 deletions(-) create mode 100644 core-ui/src/main/res-public/values-v21/styles.xml create mode 100644 core-ui/src/main/res-public/values/colors.xml create mode 100644 core-ui/src/main/res-public/values/public.xml create mode 100644 core-ui/src/main/res-public/values/styles.xml delete mode 100644 core-ui/src/main/res/drawable/kau_selectable_white.xml delete mode 100644 core-ui/src/main/res/values/colors.xml delete mode 100644 core-ui/src/main/res/values/strings.xml delete mode 100644 core-ui/src/main/res/values/styles.xml (limited to 'core-ui/src/main') 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 1dcf14b..20a81e4 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 @@ -1,6 +1,8 @@ package ca.allanwang.kau.ui.activities +import android.os.Build import android.os.Bundle +import android.support.annotation.RequiresApi import android.support.design.widget.AppBarLayout import android.support.design.widget.CoordinatorLayout import android.support.design.widget.FloatingActionButton @@ -23,7 +25,8 @@ import ca.allanwang.kau.utils.bindView * * The exit animation is set to slide out, but the entrance must be defined yourself */ -abstract class ElasticRecyclerActivity() : AppCompatActivity() { +@RequiresApi(Build.VERSION_CODES.LOLLIPOP) +abstract class ElasticRecyclerActivity : AppCompatActivity() { val appBar: AppBarLayout by bindView(R.id.kau_appbar) val toolbar: Toolbar by bindView(R.id.kau_toolbar) @@ -68,14 +71,5 @@ abstract class ElasticRecyclerActivity() : AppCompatActivity() { draggableFrame.setOnClickListener { listener() } } - fun hideFabOnUpwardsScroll() { - recycler.addOnScrollListener(object :RecyclerView.OnScrollListener(){ - override fun onScrolled(recyclerView: RecyclerView?, dx: Int, dy: Int) { - if (dy > 0 && fab.isShown) fab.hide() - else if (dy < 0 && !fab.isShown) fab.show() - } - }) - } - } diff --git a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/views/MeasuredImageView.kt b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/views/MeasuredImageView.kt index 2627d13..ebb6397 100644 --- a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/views/MeasuredImageView.kt +++ b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/views/MeasuredImageView.kt @@ -1,6 +1,7 @@ package ca.allanwang.kau.ui.views import android.content.Context +import android.support.v7.widget.AppCompatImageView import android.util.AttributeSet import android.widget.ImageView @@ -8,8 +9,8 @@ import android.widget.ImageView * Created by Allan Wang on 2017-07-14. */ class MeasuredImageView @JvmOverloads constructor( - context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0, defStyleRes: Int = 0 -) : ImageView(context, attrs, defStyleAttr, defStyleRes), MeasureSpecContract by MeasureSpecDelegate() { + context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 +) : AppCompatImageView(context, attrs, defStyleAttr), MeasureSpecContract by MeasureSpecDelegate() { init { initAttrs(context, attrs) 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 c208210..995ccab 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 @@ -19,6 +19,8 @@ package ca.allanwang.kau.ui.widgets import android.app.Activity import android.content.Context import android.graphics.Color +import android.os.Build +import android.support.annotation.RequiresApi import android.util.AttributeSet import android.view.View import android.widget.FrameLayout @@ -30,6 +32,7 @@ import ca.allanwang.kau.utils.* * Applies an elasticity factor to reduce movement as you approach the given dismiss distance. * Optionally also scales down content during drag. */ +@RequiresApi(Build.VERSION_CODES.LOLLIPOP) class ElasticDragDismissFrameLayout @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0, defStyleRes: Int = 0 ) : FrameLayout(context, attrs, defStyleAttr, defStyleRes) { diff --git a/core-ui/src/main/res-public/values-v21/styles.xml b/core-ui/src/main/res-public/values-v21/styles.xml new file mode 100644 index 0000000..fe2c9bf --- /dev/null +++ b/core-ui/src/main/res-public/values-v21/styles.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/core-ui/src/main/res-public/values/colors.xml b/core-ui/src/main/res-public/values/colors.xml new file mode 100644 index 0000000..82bf172 --- /dev/null +++ b/core-ui/src/main/res-public/values/colors.xml @@ -0,0 +1,4 @@ + + + #80000000 + diff --git a/core-ui/src/main/res-public/values/public.xml b/core-ui/src/main/res-public/values/public.xml new file mode 100644 index 0000000..59e34a6 --- /dev/null +++ b/core-ui/src/main/res-public/values/public.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/core-ui/src/main/res-public/values/styles.xml b/core-ui/src/main/res-public/values/styles.xml new file mode 100644 index 0000000..583ede7 --- /dev/null +++ b/core-ui/src/main/res-public/values/styles.xml @@ -0,0 +1,19 @@ + + + + + + + - - - - - - - -- cgit v1.2.3