Merge remote-tracking branch 'origin/feat/camera-x' into feat/camera-x

This commit is contained in:
darthpaul 2022-07-13 16:39:43 +01:00
commit 05ec3598b8
2 changed files with 6 additions and 4 deletions

View File

@ -33,8 +33,9 @@ class ChangeResolutionDialog(
.setPositiveButton(R.string.ok, null)
.setOnDismissListener { callback() }
.apply {
activity.setupDialogStuff(view, this, if (isFrontCamera) R.string.front_camera else R.string.back_camera) {
dialog = it
val titleId = if (isFrontCamera) R.string.front_camera else R.string.back_camera
activity.setupDialogStuff(view, this, titleId) { alertDialog ->
dialog = alertDialog
if (openVideoResolutions) {
view.change_resolution_video_holder.performClick()
}

View File

@ -38,8 +38,9 @@ class ChangeResolutionDialogX(
activity.getAlertDialogBuilder()
.setPositiveButton(R.string.ok, null)
.apply {
activity.setupDialogStuff(view, this, if (isFrontCamera) R.string.front_camera else R.string.back_camera){
dialog = it
val titleId = if (isFrontCamera) R.string.front_camera else R.string.back_camera
activity.setupDialogStuff(view, this, titleId) { alertDialog ->
dialog = alertDialog
}
}
}