mirror of
https://github.com/SimpleMobileTools/Simple-Camera.git
synced 2025-02-17 03:40:38 +01:00
add a setting for Focus before Capture
This commit is contained in:
parent
14f30ffb6f
commit
e0f4cf4688
@ -30,6 +30,10 @@ class Config(context: Context) : BaseConfig(context) {
|
|||||||
get() = prefs.getBoolean(SOUND, true)
|
get() = prefs.getBoolean(SOUND, true)
|
||||||
set(enabled) = prefs.edit().putBoolean(SOUND, enabled).apply()
|
set(enabled) = prefs.edit().putBoolean(SOUND, enabled).apply()
|
||||||
|
|
||||||
|
var focusBeforeCapture: Boolean
|
||||||
|
get() = prefs.getBoolean(FOCUS_BEFORE_CAPTURE, true)
|
||||||
|
set(focus) = prefs.edit().putBoolean(FOCUS_BEFORE_CAPTURE, focus).apply()
|
||||||
|
|
||||||
var lastUsedCamera: Int
|
var lastUsedCamera: Int
|
||||||
get() = prefs.getInt(LAST_USED_CAMERA, Camera.CameraInfo.CAMERA_FACING_BACK)
|
get() = prefs.getInt(LAST_USED_CAMERA, Camera.CameraInfo.CAMERA_FACING_BACK)
|
||||||
set(cameraId) = prefs.edit().putInt(LAST_USED_CAMERA, cameraId).apply()
|
set(cameraId) = prefs.edit().putInt(LAST_USED_CAMERA, cameraId).apply()
|
||||||
|
@ -8,6 +8,7 @@ val ORIENT_LANDSCAPE_RIGHT = 2
|
|||||||
val SAVE_PHOTOS = "save_photos"
|
val SAVE_PHOTOS = "save_photos"
|
||||||
val SHOW_PREVIEW = "show_preview"
|
val SHOW_PREVIEW = "show_preview"
|
||||||
val SOUND = "sound"
|
val SOUND = "sound"
|
||||||
|
val FOCUS_BEFORE_CAPTURE = "focus_before_capture"
|
||||||
val LAST_USED_CAMERA = "last_used_camera"
|
val LAST_USED_CAMERA = "last_used_camera"
|
||||||
val FLASHLIGHT_STATE = "flashlight_state"
|
val FLASHLIGHT_STATE = "flashlight_state"
|
||||||
val BACK_PHOTO_RESOLUTION_INDEX = "back_photo_resolution_index"
|
val BACK_PHOTO_RESOLUTION_INDEX = "back_photo_resolution_index"
|
||||||
|
@ -27,6 +27,7 @@ class SettingsActivity : SimpleActivity() {
|
|||||||
setupSavePhotosFolder()
|
setupSavePhotosFolder()
|
||||||
setupShowPreview()
|
setupShowPreview()
|
||||||
setupSound()
|
setupSound()
|
||||||
|
setupFocusBeforeCapture()
|
||||||
updateTextColors(settings_holder)
|
updateTextColors(settings_holder)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -81,4 +82,12 @@ class SettingsActivity : SimpleActivity() {
|
|||||||
config.isSoundEnabled = settings_sound.isChecked
|
config.isSoundEnabled = settings_sound.isChecked
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun setupFocusBeforeCapture() {
|
||||||
|
settings_focus_before_capture.isChecked = config.focusBeforeCapture
|
||||||
|
settings_focus_before_capture_holder.setOnClickListener {
|
||||||
|
settings_focus_before_capture.toggle()
|
||||||
|
config.focusBeforeCapture = settings_focus_before_capture.isChecked
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -104,5 +104,25 @@
|
|||||||
android:text="@string/shutter_sound"/>
|
android:text="@string/shutter_sound"/>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/settings_focus_before_capture_holder"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/medium_margin"
|
||||||
|
android:background="?attr/selectableItemBackground"
|
||||||
|
android:padding="@dimen/activity_margin">
|
||||||
|
|
||||||
|
<com.simplemobiletools.commons.views.MySwitchCompat
|
||||||
|
android:id="@+id/settings_focus_before_capture"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@null"
|
||||||
|
android:clickable="false"
|
||||||
|
android:paddingLeft="@dimen/medium_margin"
|
||||||
|
android:paddingStart="@dimen/medium_margin"
|
||||||
|
android:text="@string/focus_before_capture"/>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
<string name="front_camera">Front camera resolutions</string>
|
<string name="front_camera">Front camera resolutions</string>
|
||||||
<string name="photo">Photo</string>
|
<string name="photo">Photo</string>
|
||||||
<string name="video">Video</string>
|
<string name="video">Video</string>
|
||||||
|
<string name="focus_before_capture">Focus before capture</string>
|
||||||
|
|
||||||
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
||||||
<!-- Short description has to have less than 80 chars -->
|
<!-- Short description has to have less than 80 chars -->
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
<string name="front_camera">Front camera resolutions</string>
|
<string name="front_camera">Front camera resolutions</string>
|
||||||
<string name="photo">Photo</string>
|
<string name="photo">Photo</string>
|
||||||
<string name="video">Video</string>
|
<string name="video">Video</string>
|
||||||
|
<string name="focus_before_capture">Focus before capture</string>
|
||||||
|
|
||||||
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
||||||
<!-- Short description has to have less than 80 chars -->
|
<!-- Short description has to have less than 80 chars -->
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
<string name="front_camera">Front camera resolutions</string>
|
<string name="front_camera">Front camera resolutions</string>
|
||||||
<string name="photo">Photo</string>
|
<string name="photo">Photo</string>
|
||||||
<string name="video">Video</string>
|
<string name="video">Video</string>
|
||||||
|
<string name="focus_before_capture">Focus before capture</string>
|
||||||
|
|
||||||
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
||||||
<!-- Short description has to have less than 80 chars -->
|
<!-- Short description has to have less than 80 chars -->
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
<string name="front_camera">Front camera resolutions</string>
|
<string name="front_camera">Front camera resolutions</string>
|
||||||
<string name="photo">Photo</string>
|
<string name="photo">Photo</string>
|
||||||
<string name="video">Video</string>
|
<string name="video">Video</string>
|
||||||
|
<string name="focus_before_capture">Focus before capture</string>
|
||||||
|
|
||||||
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
||||||
<!-- Short description has to have less than 80 chars -->
|
<!-- Short description has to have less than 80 chars -->
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
<string name="front_camera">Front camera resolutions</string>
|
<string name="front_camera">Front camera resolutions</string>
|
||||||
<string name="photo">Photo</string>
|
<string name="photo">Photo</string>
|
||||||
<string name="video">Video</string>
|
<string name="video">Video</string>
|
||||||
|
<string name="focus_before_capture">Focus before capture</string>
|
||||||
|
|
||||||
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
||||||
<!-- Short description has to have less than 80 chars -->
|
<!-- Short description has to have less than 80 chars -->
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
<string name="front_camera">Front camera resolutions</string>
|
<string name="front_camera">Front camera resolutions</string>
|
||||||
<string name="photo">Photo</string>
|
<string name="photo">Photo</string>
|
||||||
<string name="video">Video</string>
|
<string name="video">Video</string>
|
||||||
|
<string name="focus_before_capture">Focus before capture</string>
|
||||||
|
|
||||||
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
||||||
<!-- Short description has to have less than 80 chars -->
|
<!-- Short description has to have less than 80 chars -->
|
||||||
|
@ -25,6 +25,7 @@
|
|||||||
<string name="front_camera">Camera aan de voorkant resoluties</string>
|
<string name="front_camera">Camera aan de voorkant resoluties</string>
|
||||||
<string name="photo">Foto</string>
|
<string name="photo">Foto</string>
|
||||||
<string name="video">Video</string>
|
<string name="video">Video</string>
|
||||||
|
<string name="focus_before_capture">Focus before capture</string>
|
||||||
|
|
||||||
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
||||||
<!-- Short description has to have less than 80 chars -->
|
<!-- Short description has to have less than 80 chars -->
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
<string name="front_camera">Resoluções da câmera frontal</string>
|
<string name="front_camera">Resoluções da câmera frontal</string>
|
||||||
<string name="photo">Foto</string>
|
<string name="photo">Foto</string>
|
||||||
<string name="video">Vídeo</string>
|
<string name="video">Vídeo</string>
|
||||||
|
<string name="focus_before_capture">Focus before capture</string>
|
||||||
|
|
||||||
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
||||||
<!-- Short description has to have less than 80 chars -->
|
<!-- Short description has to have less than 80 chars -->
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
<string name="front_camera">Resoluções da câmara frontal</string>
|
<string name="front_camera">Resoluções da câmara frontal</string>
|
||||||
<string name="photo">Foto</string>
|
<string name="photo">Foto</string>
|
||||||
<string name="video">Vídeo</string>
|
<string name="video">Vídeo</string>
|
||||||
|
<string name="focus_before_capture">Focus before capture</string>
|
||||||
|
|
||||||
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
||||||
<!-- Short description has to have less than 80 chars -->
|
<!-- Short description has to have less than 80 chars -->
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
<string name="front_camera">Разрешения фронтальной камеры</string>
|
<string name="front_camera">Разрешения фронтальной камеры</string>
|
||||||
<string name="photo">Фото</string>
|
<string name="photo">Фото</string>
|
||||||
<string name="video">Видео</string>
|
<string name="video">Видео</string>
|
||||||
|
<string name="focus_before_capture">Focus before capture</string>
|
||||||
|
|
||||||
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
||||||
<!-- Short description has to have less than 80 chars -->
|
<!-- Short description has to have less than 80 chars -->
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
<string name="front_camera">Front camera resolutions</string>
|
<string name="front_camera">Front camera resolutions</string>
|
||||||
<string name="photo">Photo</string>
|
<string name="photo">Photo</string>
|
||||||
<string name="video">Video</string>
|
<string name="video">Video</string>
|
||||||
|
<string name="focus_before_capture">Focus before capture</string>
|
||||||
|
|
||||||
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
||||||
<!-- Short description has to have less than 80 chars -->
|
<!-- Short description has to have less than 80 chars -->
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
<string name="front_camera">Front camera resolutions</string>
|
<string name="front_camera">Front camera resolutions</string>
|
||||||
<string name="photo">Photo</string>
|
<string name="photo">Photo</string>
|
||||||
<string name="video">Video</string>
|
<string name="video">Video</string>
|
||||||
|
<string name="focus_before_capture">Focus before capture</string>
|
||||||
|
|
||||||
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
|
||||||
<!-- Short description has to have less than 80 chars -->
|
<!-- Short description has to have less than 80 chars -->
|
||||||
|
Loading…
x
Reference in New Issue
Block a user