diff options
author | Allan Wang <me@allanwang.ca> | 2017-08-18 14:40:08 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-18 14:40:08 -0700 |
commit | 52bfdb66ca8d44986b3f1ae51c921a939db17ac6 (patch) | |
tree | 32f58037b4091ed19a15f71b6cf7ee358a6f5820 /app/src/main/kotlin/com/pitchedapps/frost/activities/MediaPickerActivity.kt | |
parent | 2eaad9b72746d57c187d2ded7f40d803f88dfcee (diff) | |
download | frost-52bfdb66ca8d44986b3f1ae51c921a939db17ac6.tar.gz frost-52bfdb66ca8d44986b3f1ae51c921a939db17ac6.tar.bz2 frost-52bfdb66ca8d44986b3f1ae51c921a939db17ac6.zip |
Misc (#190)
* Update play store description
* Finalize description
* Update kotlin and bg2 for custom themes
* Update to Android Studio 3.0 beta 2
* Update test dependencies and add logging to image activity
* Rename throwable to errorRef
* Update searchview and media picker through kau
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/MediaPickerActivity.kt')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/MediaPickerActivity.kt | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/MediaPickerActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/MediaPickerActivity.kt index 0d041e7a..9b73f9b7 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/MediaPickerActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/MediaPickerActivity.kt @@ -1,10 +1,26 @@ package com.pitchedapps.frost.activities -import ca.allanwang.kau.mediapicker.MediaPickerActivityOverlayBase -import ca.allanwang.kau.mediapicker.MediaType +import android.content.Context +import android.net.Uri +import android.support.v4.content.FileProvider +import ca.allanwang.kau.mediapicker.* +import com.pitchedapps.frost.BuildConfig +import com.pitchedapps.frost.utils.Prefs +import java.io.File /** * Created by Allan Wang on 2017-07-23. */ -class ImagePickerActivity : MediaPickerActivityOverlayBase(MediaType.IMAGE) -class VideoPickerActivity : MediaPickerActivityOverlayBase(MediaType.VIDEO)
\ No newline at end of file +private fun actions() = listOf(object : MediaActionCamera(Prefs.accentColor) { + + override fun createFile(context: Context): File + = createMediaFile("Frost", ".jpg") + + override fun createUri(context: Context, file: File): Uri + = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".provider", file) + +}, MediaActionGallery(color = Prefs.accentColor)) + +class ImagePickerActivity : MediaPickerActivityOverlayBase(MediaType.IMAGE, actions()) + +class VideoPickerActivity : MediaPickerActivityOverlayBase(MediaType.VIDEO, actions())
\ No newline at end of file |