diff options
author | Allan Wang <me@allanwang.ca> | 2017-07-22 16:08:08 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-22 16:08:08 -0700 |
commit | 61d87976e8b29ed25061ae98743a6cf4f4274542 (patch) | |
tree | fa4d9bca5fe1b9478ba2f1cc1e6c7d8d18bf15ce /imagepicker/src/main/res | |
parent | 8f2b5ac043f47cc44f43c3788d1377083fb339a2 (diff) | |
download | kau-61d87976e8b29ed25061ae98743a6cf4f4274542.tar.gz kau-61d87976e8b29ed25061ae98743a6cf4f4274542.tar.bz2 kau-61d87976e8b29ed25061ae98743a6cf4f4274542.zip |
Support sdk 19 where possible and add image picker (#10)3.0
* 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
Diffstat (limited to 'imagepicker/src/main/res')
-rw-r--r-- | imagepicker/src/main/res/layout/kau_activity_image_picker.xml | 57 | ||||
-rw-r--r-- | imagepicker/src/main/res/values/strings.xml | 6 | ||||
-rw-r--r-- | imagepicker/src/main/res/values/styles.xml | 4 |
3 files changed, 50 insertions, 17 deletions
diff --git a/imagepicker/src/main/res/layout/kau_activity_image_picker.xml b/imagepicker/src/main/res/layout/kau_activity_image_picker.xml index 6e0bf67..5b0300d 100644 --- a/imagepicker/src/main/res/layout/kau_activity_image_picker.xml +++ b/imagepicker/src/main/res/layout/kau_activity_image_picker.xml @@ -1,29 +1,54 @@ <?xml version="1.0" encoding="utf-8"?> -<ca.allanwang.kau.ui.widgets.ElasticDragDismissFrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/kau_coordinator" android:layout_width="match_parent" android:layout_height="match_parent" - android:id="@+id/kau_draggable" - app:dragDismissDistance="@dimen/kau_drag_dismiss_distance" - app:dragDismissScale="0.95"> + android:fitsSystemWindows="true"> - <LinearLayout + <android.support.design.widget.AppBarLayout + android:id="@+id/kau_appbar" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginTop="@dimen/kau_drag_dismiss_distance" - android:orientation="vertical"> + android:layout_height="wrap_content" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> <android.support.v7.widget.Toolbar android:id="@+id/kau_toolbar" android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" /> + android:layout_height="?attr/actionBarSize" + app:layout_scrollFlags="scroll|enterAlways" + app:popupTheme="@style/ThemeOverlay.AppCompat.Light"> - <android.support.v7.widget.RecyclerView - android:id="@+id/kau_recycler" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?android:colorBackground" /> + <TextView + android:id="@+id/kau_selection_count" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end" + android:drawablePadding="@dimen/kau_padding_small" + android:gravity="center_vertical" + android:paddingEnd="@dimen/kau_padding_normal" + android:paddingStart="@dimen/kau_padding_normal" + android:text="@string/kau_0" /> + + </android.support.v7.widget.Toolbar> + + </android.support.design.widget.AppBarLayout> + + <android.support.v7.widget.RecyclerView + android:id="@+id/kau_recyclerview" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> + + <android.support.design.widget.FloatingActionButton + android:id="@+id/kau_fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/kau_fab_margin" + android:clickable="true" + app:backgroundTint="?colorAccent" + app:layout_anchor="@id/kau_recyclerview" + app:layout_anchorGravity="bottom|right|end" /> - </LinearLayout> -</ca.allanwang.kau.ui.widgets.ElasticDragDismissFrameLayout>
\ No newline at end of file +</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/imagepicker/src/main/res/values/strings.xml b/imagepicker/src/main/res/values/strings.xml new file mode 100644 index 0000000..7aa7f3e --- /dev/null +++ b/imagepicker/src/main/res/values/strings.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="kau_no_images_found">No images found</string> + <string name="kau_no_images_selected">No images have been selected</string> + <string name="kau_blurrable_imageview">Blurrable ImageView</string> +</resources>
\ No newline at end of file diff --git a/imagepicker/src/main/res/values/styles.xml b/imagepicker/src/main/res/values/styles.xml index 1fbb184..0d9ce64 100644 --- a/imagepicker/src/main/res/values/styles.xml +++ b/imagepicker/src/main/res/values/styles.xml @@ -1,5 +1,7 @@ <resources> - <style name="Kau.Translucent.ImagePicker" parent="Kau.Translucent.SlideBottom" /> + <style name="Kau.ImagePicker"> + <item name="android:windowAnimationStyle">@style/KauSlideInSlideOutBottom</item> + </style> </resources> |