diff options
| author | Allan Wang <me@allanwang.ca> | 2017-08-18 14:39:40 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-08-30 12:24:19 -0400 |
| commit | a101b528efdee74fc1970b7f1fe68263f0b20269 (patch) | |
| tree | 8fbd0fea544ec543cdf5ea2b74d81099d4ebd554 /mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityBase.kt | |
| parent | 9432652b03ae4d01e3dda4325984637d9523b9e2 (diff) | |
| download | kau-a101b528efdee74fc1970b7f1fe68263f0b20269.tar.gz kau-a101b528efdee74fc1970b7f1fe68263f0b20269.tar.bz2 kau-a101b528efdee74fc1970b7f1fe68263f0b20269.zip | |
Create media picker action items (#40)
* Create action items
* Increment version
* Update camera action
* Abstract camera action
* Add and test
* Refactor and add docs
Diffstat (limited to 'mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityBase.kt')
| -rw-r--r-- | mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityBase.kt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityBase.kt b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityBase.kt index 2ba6b43..c3b6396 100644 --- a/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityBase.kt +++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityBase.kt @@ -1,6 +1,5 @@ package ca.allanwang.kau.mediapicker -import android.content.Intent import android.database.Cursor import android.os.Bundle import android.support.design.widget.AppBarLayout @@ -21,7 +20,10 @@ import com.mikepenz.google_material_typeface_library.GoogleMaterial * Images are blurred when selected, and multiple images can be selected at a time. * Having three layered images makes this slightly slower than [MediaPickerActivityOverlayBase] */ -abstract class MediaPickerActivityBase(mediaType: MediaType) : MediaPickerCore<MediaItem>(mediaType) { +abstract class MediaPickerActivityBase( + mediaType: MediaType, + mediaActions: List<MediaAction> = emptyList() +) : MediaPickerCore<MediaItem>(mediaType, mediaActions) { val coordinator: CoordinatorLayout by bindView(R.id.kau_coordinator) val toolbar: Toolbar by bindView(R.id.kau_toolbar) @@ -57,11 +59,7 @@ abstract class MediaPickerActivityBase(mediaType: MediaType) : MediaPickerCore<M if (selection.isEmpty()) { toast(R.string.kau_no_items_selected) } else { - val intent = Intent() - val data = ArrayList(selection.map { it.data }) - intent.putParcelableArrayListExtra(MEDIA_PICKER_RESULT, data) - setResult(RESULT_OK, intent) - finish() + finish(ArrayList(selection.map { it.data })) } } hideOnDownwardsScroll(recycler) |