diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt b/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt index ada1854a..42ad2707 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/Config.kt @@ -73,4 +73,8 @@ class Config(context: Context) : BaseConfig(context) { var wasPhotoPreviewHintShown: Boolean get() = prefs.getBoolean(PHOTO_PREVIEW_HINT_SHOWN, false) set(wasPhotoPreviewHintShown) = prefs.edit().putBoolean(PHOTO_PREVIEW_HINT_SHOWN, wasPhotoPreviewHintShown).apply() + + var keepSettingsVisible: Boolean + get() = prefs.getBoolean(KEEP_SETTINGS_VISIBLE, false) + set(keepSettingsVisible) = prefs.edit().putBoolean(KEEP_SETTINGS_VISIBLE, keepSettingsVisible).apply() } diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt index 24256dd7..ad9bde73 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt @@ -19,6 +19,7 @@ val BACK_VIDEO_RESOLUTION_INDEX = "back_video_resolution_index" val FRONT_PHOTO_RESOLUTION_INDEX = "front_photo_resolution_index" val FRONT_VIDEO_RESOLUTION_INDEX = "front_video_resolution_index" val PHOTO_PREVIEW_HINT_SHOWN = "photo_preview_hint_shown" +val KEEP_SETTINGS_VISIBLE = "keep_settings_visible" val FLASH_OFF = 0 val FLASH_ON = 1 diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt index e561d232..b734add4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt @@ -378,7 +378,10 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave } } - private fun scheduleFadeOut() = mFadeHandler.postDelayed({ fadeOutButtons() }, FADE_DELAY.toLong()) + private fun scheduleFadeOut() { + if (!config.keepSettingsVisible) + mFadeHandler.postDelayed({ fadeOutButtons() }, FADE_DELAY.toLong()) + } private fun fadeOutButtons() { fadeAnim(settings, .5f) 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 17db9d88..0453a153 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt @@ -31,6 +31,7 @@ class SettingsActivity : SimpleActivity() { setupVolumeButtonsAsShutter() setupTurnFlashOffAtStartup() setupFlipPhotos() + setupKeepSettingsVisible() updateTextColors(settings_holder) } @@ -117,4 +118,12 @@ class SettingsActivity : SimpleActivity() { config.flipPhotos = settings_flip_photos.isChecked } } + + private fun setupKeepSettingsVisible() { + settings_keep_settings_visible.isChecked = config.keepSettingsVisible + settings_keep_settings_visible_holder.setOnClickListener { + settings_keep_settings_visible.toggle() + config.keepSettingsVisible = settings_keep_settings_visible.isChecked + } + } } diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index af32a959..3f12f989 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -184,5 +184,25 @@ android:text="@string/flip_front_camera_photos_horizontally"/> + + + + + +