diff options
| author | Allan Wang <me@allanwang.ca> | 2017-08-19 09:47:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-19 09:47:05 -0700 |
| commit | 84bf883a47b956865d31b1b618d5495fcd7d4876 (patch) | |
| tree | 0fb0f83af4862a127bca7d8451ef2c7188a08d83 /app/src/main/kotlin/com/pitchedapps/frost/activities/MediaPickerActivity.kt | |
| parent | 5d9a3fd7fb8f2f9d0f592c89446824980c9841c6 (diff) | |
| download | frost-1.4.7.tar.gz frost-1.4.7.tar.bz2 frost-1.4.7.zip | |
v1.4.7 (#195)v1.4.7
* Add try catch (#179)
* Add checks before injections (#180)
* Enhancement/url redirect manager (#182)
* Initial blacklist
* Move js checks to java
* Optimize imports and clean up request interceptor
* 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
* Update themes (#183)
* Theme content now found view
* Update verified bg and bg2 for transparent themes
* Fix check in star text
* Various fixes
* Create base svg sass images
* Feature/theme accent (#192)
* Add lots of theming components
* Optimize and add
* Update accents
* Misc 2 (#191)
* Add further checks for iab and remove generic error dialog
* Theme all snackbars
* Add dynamic media action tile
* Enhancement/media-camera-picker (#194)
* Update kau
* Update changelog
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 | 28 |
1 files changed, 24 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..162baf20 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,30 @@ 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 ca.allanwang.kau.utils.colorToBackground +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(): List<MediaAction> { + val color = Prefs.accentColorForWhite + return listOf(object : MediaActionCamera(color) { + + 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 = color.colorToBackground(0.1f))) +} + +class ImagePickerActivity : MediaPickerActivityOverlayBase(MediaType.IMAGE, actions()) + +class VideoPickerActivity : MediaPickerActivityOverlayBase(MediaType.VIDEO, actions())
\ No newline at end of file |