fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-06-27 09:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix #57

Browse Source
This commit is contained in:
Nikola Trubitsyn
2017-06-14 01:32:18 +03:00
parent da8c3c5930
commit ebd53d94e8
17 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/camera/Config.kt
View File

@ -38,6 +38,10 @@ class Config(context: Context) : BaseConfig(context) {
get() = prefs.getBoolean(VOLUME_BUTTONS_AS_SHUTTER, false)
set(volumeButtonsAsShutter) = prefs.edit().putBoolean(VOLUME_BUTTONS_AS_SHUTTER, volumeButtonsAsShutter).apply()
var turnFlashOffAtStartup: Boolean
get() = prefs.getBoolean(TURN_FLASH_OFF_AT_STARTUP, false)
set(turnFlashOffAtStartup) = prefs.edit().putBoolean(TURN_FLASH_OFF_AT_STARTUP, turnFlashOffAtStartup).apply()
var lastUsedCamera: Int
get() = prefs.getInt(LAST_USED_CAMERA, Camera.CameraInfo.CAMERA_FACING_BACK)
set(cameraId) = prefs.edit().putInt(LAST_USED_CAMERA, cameraId).apply()

1
app/src/main/kotlin/com/simplemobiletools/camera/Constants.kt
View File

@ -10,6 +10,7 @@ val SHOW_PREVIEW = "show_preview"
val SOUND = "sound"
val FOCUS_BEFORE_CAPTURE = "focus_before_capture"
val VOLUME_BUTTONS_AS_SHUTTER = "volume_buttons_as_shutter"
val TURN_FLASH_OFF_AT_STARTUP = "turn_flash_off_at_startup"
val LAST_USED_CAMERA = "last_used_camera"
val FLASHLIGHT_STATE = "flashlight_state"
val BACK_PHOTO_RESOLUTION_INDEX = "back_photo_resolution_index"

2
app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
View File

@ -155,7 +155,7 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave
mIsInPhotoMode = true
mTimerHandler = Handler()
mFadeHandler = Handler()
mFlashlightState = config.flashlightState
mFlashlightState = if (config.turnFlashOffAtStartup) FLASH_OFF else config.flashlightState
setupPreviewImage(true)
}

9
app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
View File

@ -29,6 +29,7 @@ class SettingsActivity : SimpleActivity() {
setupSound()
setupFocusBeforeCapture()
setupVolumeButtonsAsShutter()
setupTurnFlashOffAtStartup()
updateTextColors(settings_holder)
}
@ -99,4 +100,12 @@ class SettingsActivity : SimpleActivity() {
config.volumeButtonsAsShutter = settings_volume_buttons_as_shutter.isChecked
}
}
private fun setupTurnFlashOffAtStartup() {
settings_turn_flash_off_at_startup.isChecked = config.turnFlashOffAtStartup
settings_turn_flash_off_at_startup_holder.setOnClickListener {
settings_turn_flash_off_at_startup.toggle()
config.turnFlashOffAtStartup = settings_turn_flash_off_at_startup.isChecked
}
}
}