From 7d894be6de118357ec908d2d171b6152ce67307d Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Tue, 1 Aug 2017 10:48:37 -0700 Subject: Imagepicker -> mediapicker (#16) * Readme * Fix kau direction bits * Truly support transparent ripples * Update changelog * Test rect as base * Replace fab transition with generic fade scale transition * Add scalexy func * Add scaleXY * Add arguments to fadeScaleTransition * Clean up ink indicator * Create setOnSingleTapListener * Fix lint and add rndColor * Create kotterknife resettables * Add readme and missing objec * Create lazy resettable registered * Update core docs * Opt for separate class for resettable registry * Clean up resettable registry * Rename functions * Add ripple callback listener * Adjust kprefactivity desc color * Add more transitions * Add delete keys option * Add instrumentation tests * switch id * Revert automatic instrumental tests * Generify imagepickercore and prepare video alternative * Create working video picker * Address possible null issue * Update searchview * Make layouts public * Add changelog test * Update logo link * Add custom color gif * Rename imagepicker to mediapicker * Clean up * Fix remaining merge conflicts * Update readme * Update readme --- .../main/kotlin/ca/allanwang/kau/sample/ImagePicker.kt | 16 ---------------- .../main/kotlin/ca/allanwang/kau/sample/MainActivity.kt | 5 +++-- .../main/kotlin/ca/allanwang/kau/sample/MediaPicker.kt | 16 ++++++++++++++++ sample/src/main/res/xml/kau_changelog.xml | 6 +----- 4 files changed, 20 insertions(+), 23 deletions(-) delete mode 100644 sample/src/main/kotlin/ca/allanwang/kau/sample/ImagePicker.kt create mode 100644 sample/src/main/kotlin/ca/allanwang/kau/sample/MediaPicker.kt (limited to 'sample/src/main') diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/ImagePicker.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/ImagePicker.kt deleted file mode 100644 index eebc5ca..0000000 --- a/sample/src/main/kotlin/ca/allanwang/kau/sample/ImagePicker.kt +++ /dev/null @@ -1,16 +0,0 @@ -package ca.allanwang.kau.sample - -import ca.allanwang.kau.imagepicker.MediaPickerActivityBase -import ca.allanwang.kau.imagepicker.MediaPickerActivityOverlayBase -import ca.allanwang.kau.imagepicker.MediaType - -/** - * Created by Allan Wang on 2017-07-23. - */ -class ImagePickerActivity : MediaPickerActivityBase(MediaType.IMAGE) - -class ImagePickerActivityOverlay : MediaPickerActivityOverlayBase(MediaType.IMAGE) - -class VideoPickerActivity : MediaPickerActivityBase(MediaType.VIDEO) - -class VideoPickerActivityOverlay : MediaPickerActivityOverlayBase(MediaType.VIDEO) \ No newline at end of file diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt index 0cc41fb..4c9107c 100644 --- a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt +++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt @@ -6,8 +6,9 @@ import android.view.Menu import android.view.MenuItem import ca.allanwang.kau.about.kauLaunchAbout import ca.allanwang.kau.email.sendEmail -import ca.allanwang.kau.imagepicker.kauLaunchMediaPicker -import ca.allanwang.kau.imagepicker.kauOnMediaPickerResult + +import ca.allanwang.kau.mediapicker.kauLaunchMediaPicker +import ca.allanwang.kau.mediapicker.kauOnMediaPickerResult import ca.allanwang.kau.kpref.activity.CoreAttributeContract import ca.allanwang.kau.kpref.activity.KPrefActivity import ca.allanwang.kau.kpref.activity.KPrefAdapterBuilder diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/MediaPicker.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/MediaPicker.kt new file mode 100644 index 0000000..7aac0ef --- /dev/null +++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/MediaPicker.kt @@ -0,0 +1,16 @@ +package ca.allanwang.kau.sample + +import ca.allanwang.kau.mediapicker.MediaPickerActivityBase +import ca.allanwang.kau.mediapicker.MediaPickerActivityOverlayBase +import ca.allanwang.kau.mediapicker.MediaType + +/** + * Created by Allan Wang on 2017-07-23. + */ +class ImagePickerActivity : MediaPickerActivityBase(MediaType.IMAGE) + +class ImagePickerActivityOverlay : MediaPickerActivityOverlayBase(MediaType.IMAGE) + +class VideoPickerActivity : MediaPickerActivityBase(MediaType.VIDEO) + +class VideoPickerActivityOverlay : MediaPickerActivityOverlayBase(MediaType.VIDEO) \ No newline at end of file diff --git a/sample/src/main/res/xml/kau_changelog.xml b/sample/src/main/res/xml/kau_changelog.xml index b7bb8e4..59d51c2 100644 --- a/sample/src/main/res/xml/kau_changelog.xml +++ b/sample/src/main/res/xml/kau_changelog.xml @@ -18,11 +18,7 @@ - - - - - + -- cgit v1.2.3