fix #76, add a toggle for always opening the back camera at startup
This commit is contained in:
parent
e1528e5416
commit
406236cb2e
|
@ -77,4 +77,8 @@ class Config(context: Context) : BaseConfig(context) {
|
||||||
var keepSettingsVisible: Boolean
|
var keepSettingsVisible: Boolean
|
||||||
get() = prefs.getBoolean(KEEP_SETTINGS_VISIBLE, false)
|
get() = prefs.getBoolean(KEEP_SETTINGS_VISIBLE, false)
|
||||||
set(keepSettingsVisible) = prefs.edit().putBoolean(KEEP_SETTINGS_VISIBLE, keepSettingsVisible).apply()
|
set(keepSettingsVisible) = prefs.edit().putBoolean(KEEP_SETTINGS_VISIBLE, keepSettingsVisible).apply()
|
||||||
|
|
||||||
|
var alwaysOpenBackCamera: Boolean
|
||||||
|
get() = prefs.getBoolean(ALWAYS_OPEN_BACK_CAMERA, false)
|
||||||
|
set(alwaysOpenBackCamera) = prefs.edit().putBoolean(ALWAYS_OPEN_BACK_CAMERA, alwaysOpenBackCamera).apply()
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,7 @@ val FRONT_PHOTO_RESOLUTION_INDEX = "front_photo_resolution_index"
|
||||||
val FRONT_VIDEO_RESOLUTION_INDEX = "front_video_resolution_index"
|
val FRONT_VIDEO_RESOLUTION_INDEX = "front_video_resolution_index"
|
||||||
val PHOTO_PREVIEW_HINT_SHOWN = "photo_preview_hint_shown"
|
val PHOTO_PREVIEW_HINT_SHOWN = "photo_preview_hint_shown"
|
||||||
val KEEP_SETTINGS_VISIBLE = "keep_settings_visible"
|
val KEEP_SETTINGS_VISIBLE = "keep_settings_visible"
|
||||||
|
val ALWAYS_OPEN_BACK_CAMERA = "always_open_back_camera"
|
||||||
|
|
||||||
val FLASH_OFF = 0
|
val FLASH_OFF = 0
|
||||||
val FLASH_ON = 1
|
val FLASH_ON = 1
|
||||||
|
|
|
@ -56,6 +56,9 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
requestWindowFeature(Window.FEATURE_NO_TITLE)
|
requestWindowFeature(Window.FEATURE_NO_TITLE)
|
||||||
window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
|
window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
|
||||||
|
if (config.alwaysOpenBackCamera)
|
||||||
|
config.lastUsedCamera = Camera.CameraInfo.CAMERA_FACING_BACK
|
||||||
|
|
||||||
initVariables()
|
initVariables()
|
||||||
tryInitCamera()
|
tryInitCamera()
|
||||||
supportActionBar?.hide()
|
supportActionBar?.hide()
|
||||||
|
|
|
@ -32,6 +32,7 @@ class SettingsActivity : SimpleActivity() {
|
||||||
setupTurnFlashOffAtStartup()
|
setupTurnFlashOffAtStartup()
|
||||||
setupFlipPhotos()
|
setupFlipPhotos()
|
||||||
setupKeepSettingsVisible()
|
setupKeepSettingsVisible()
|
||||||
|
setupAlwaysOpenBackCamera()
|
||||||
updateTextColors(settings_holder)
|
updateTextColors(settings_holder)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -126,4 +127,12 @@ class SettingsActivity : SimpleActivity() {
|
||||||
config.keepSettingsVisible = settings_keep_settings_visible.isChecked
|
config.keepSettingsVisible = settings_keep_settings_visible.isChecked
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun setupAlwaysOpenBackCamera() {
|
||||||
|
settings_always_open_back_camera.isChecked = config.alwaysOpenBackCamera
|
||||||
|
settings_always_open_back_camera_holder.setOnClickListener {
|
||||||
|
settings_always_open_back_camera.toggle()
|
||||||
|
config.alwaysOpenBackCamera = settings_always_open_back_camera.isChecked
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -204,5 +204,25 @@
|
||||||
android:text="@string/keep_settings_visible"/>
|
android:text="@string/keep_settings_visible"/>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/settings_always_open_back_camera_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_always_open_back_camera"
|
||||||
|
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/always_open_back_camera"/>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|
Loading…
Reference in New Issue