From 987cf4846712203befa18cf5a4f0062b18a8f6a1 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 24 Nov 2016 18:56:15 +0100 Subject: [PATCH] add a toggle for showing photo preview after capturing --- .../com/simplemobiletools/camera/Config.kt | 4 +++ .../com/simplemobiletools/camera/Constants.kt | 3 +-- .../camera/activities/SettingsActivity.kt | 9 +++++++ app/src/main/res/layout/activity_settings.xml | 26 +++++++++++++++++++ app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-lt/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 13 files changed, 49 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt b/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt index b88fbafb..447e7300 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt @@ -28,6 +28,10 @@ class Config(context: Context) { get() = mPrefs.getString(SAVE_PHOTOS, Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).toString()) set(path) = mPrefs.edit().putString(SAVE_PHOTOS, path).apply() + var isShowPreviewEnabled: Boolean + get() = mPrefs.getBoolean(SHOW_PREVIEW, false) + set(enabled) = mPrefs.edit().putBoolean(SHOW_PREVIEW, enabled).apply() + var forceRatioEnabled: Boolean get() = mPrefs.getBoolean(FORCE_RATIO, true) set(enabled) = mPrefs.edit().putBoolean(FORCE_RATIO, enabled).apply() diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt index 62ad796b..b6d5e8cd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt @@ -19,12 +19,11 @@ val PREFS_KEY = "Camera" val IS_FIRST_RUN = "is_first_run" val IS_DARK_THEME = "is_dark_theme" val SAVE_PHOTOS = "save_photos" +val SHOW_PREVIEW = "show_preview" val SOUND = "sound" val FORCE_RATIO = "force_ratio" val MAX_PHOTO_RESOLUTION = "max_photo_resolution" val MAX_VIDEO_RESOLUTION = "max_video_resolution" -val MAX_RESOLUTION = "max_resolution" val LAST_USED_CAMERA = "last_used_camera" val LAST_FLASHLIGHT_STATE = "last_flashlight_state" val TREE_URI = "tree_uri" - diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt index 33cfe278..34517d5f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt @@ -29,6 +29,7 @@ class SettingsActivity : SimpleActivity() { setupDarkTheme() setupSavePhotosFolder() + setupShowPreview() setupSound() setupForceRatio() setupMaxPhotoResolution() @@ -116,6 +117,14 @@ class SettingsActivity : SimpleActivity() { contentResolver.takePersistableUriPermission(treeUri, takeFlags) } + private fun setupShowPreview() { + settings_show_preview.isChecked = config.isShowPreviewEnabled + settings_show_preview_holder.setOnClickListener { + settings_show_preview.toggle() + config.isShowPreviewEnabled = settings_show_preview.isChecked + } + } + private fun setupSound() { settings_sound.isChecked = config.isSoundEnabled settings_sound_holder.setOnClickListener { diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index e395e4f1..1c81f367 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -66,6 +66,32 @@ + + + + + + + + Dunkles Design Save photos and videos to Erzwinge 16:9 Format + Show a photo preview after capturing Maximale Fotoauflösung Maximale Videoauflösung Kein Limit diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 342a9f2d..4f4580dc 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -20,6 +20,7 @@ Tema oscuro Guardar fotografías y vídeos en Usar proporción de aspecto 16:9 + Show a photo preview after capturing Resolución máxima para fotografía Resolución máxima para vídeo Sin límite diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index b1c297d2..0d5e9355 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -20,6 +20,7 @@ Tema scuro Save photos and videos to Forza proporzione 16:9 + Show a photo preview after capturing Limite risoluzione foto Video resolution limit nessuno diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ea997066..c450538a 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -20,6 +20,7 @@ ダークテーマ Save photos and videos to 強制的に 16:9 レシオにする + Show a photo preview after capturing 写真解像度の限度 Video resolution limit なし diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index a41250b8..792cffdf 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -20,6 +20,7 @@ Tamsi tema Išsaugoti nuotraukas ir vaizdo įrašus į Naudoti 16:9 santykį + Show a photo preview after capturing Maksimalios nuotraukos raiškos limitas Maksimalios vaizdo įrašo raiškos limitas nieko diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 66eaf1c3..a257e23a 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -20,6 +20,7 @@ Tema escuro Guardar fotos e vídeos em Utilizar rácio 16:9 + Show a photo preview after capturing Resolução máxima das fotos Resolução máxima dos vídeos sem limite diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2095be0d..7828a18f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -20,6 +20,7 @@ темная тема Save photos and videos to Принудительное соотношение сторон 16:9 + Show a photo preview after capturing Лимит разрешения фото Video resolution limit нет diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 063fee14..0819b709 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -20,6 +20,7 @@ Mörkt tema Save photos and videos to Tvinga 16:9-förhållande + Show a photo preview after capturing Bildupplösningsgräns Video resolution limit inga diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ce739080..f7fee8f5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -20,6 +20,7 @@ Dark theme Save photos and videos to Use 16:9 ratio + Show a photo preview after capturing Max photo resolution limit Max video resolution limit none