From 8f80fcc83fab06df394c5e77186fbf60e82127fe Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 6 Oct 2022 18:54:35 +0200 Subject: [PATCH] removing some empty lines here and there --- .../camera/activities/MainActivity.kt | 13 +++---------- .../camera/activities/SettingsActivity.kt | 5 +++-- .../camera/implementations/CameraXPreview.kt | 4 ++-- .../simplemobiletools/camera/views/CameraPreview.kt | 1 - app/src/main/res/layout/activity_main.xml | 4 +--- app/src/main/res/layout/activity_settings.xml | 3 --- 6 files changed, 9 insertions(+), 21 deletions(-) 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 871b9674..0acb4542 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt @@ -38,16 +38,10 @@ import com.simplemobiletools.camera.views.FocusCircleView import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.models.Release -import java.util.concurrent.TimeUnit import kotlinx.android.synthetic.main.activity_main.* -import kotlinx.android.synthetic.main.layout_flash.flash_auto -import kotlinx.android.synthetic.main.layout_flash.flash_off -import kotlinx.android.synthetic.main.layout_flash.flash_on -import kotlinx.android.synthetic.main.layout_flash.flash_toggle_group -import kotlinx.android.synthetic.main.layout_top.change_resolution -import kotlinx.android.synthetic.main.layout_top.default_icons -import kotlinx.android.synthetic.main.layout_top.settings -import kotlinx.android.synthetic.main.layout_top.toggle_flash +import kotlinx.android.synthetic.main.layout_flash.* +import kotlinx.android.synthetic.main.layout_top.* +import java.util.concurrent.TimeUnit class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, CameraXPreviewListener { private companion object { @@ -105,7 +99,6 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera WindowManager.LayoutParams.FLAG_FULLSCREEN ) } - } private fun selectPhotoTab(triggerListener: Boolean = false) { 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 8337ff81..6a196f89 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt @@ -105,8 +105,9 @@ class SettingsActivity : SimpleActivity() { settings_language.text = Locale.getDefault().displayLanguage settings_language_holder.beVisibleIf(isTiramisuPlus()) - settings_general_settings_holder.beGoneIf(settings_use_english_holder.isGone() && settings_purchase_thank_you_holder.isGone() && settings_language_holder.isGone()) - settings_general_settings_label.beGoneIf(settings_use_english_holder.isGone() && settings_purchase_thank_you_holder.isGone() && settings_language_holder.isGone()) + listOf(settings_general_settings_holder, settings_general_settings_label).forEach { + it.beGoneIf(settings_use_english_holder.isGone() && settings_purchase_thank_you_holder.isGone() && settings_language_holder.isGone()) + } settings_language_holder.setOnClickListener { launchChangeAppLanguageIntent() diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt b/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt index 9fde9c45..0b77a5f0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt @@ -342,12 +342,12 @@ class CameraXPreview( } override fun showChangeResolution() { - val selectedResolution = if (isPhotoCapture) { imageQualityManager.getUserSelectedResolution(cameraSelector).toResolutionOption() } else { videoQualityManager.getUserSelectedQuality(cameraSelector).toResolutionOption() } + val resolutions = if (isPhotoCapture) { imageQualityManager.getSupportedResolutions(cameraSelector).map { it.toResolutionOption() } } else { @@ -394,6 +394,7 @@ class CameraXPreview( } else { CameraSelector.DEFAULT_FRONT_CAMERA } + cameraSelector = newCameraSelector config.lastUsedCameraLens = newCameraSelector.toLensFacing() startCamera(switching = true) @@ -437,7 +438,6 @@ class CameraXPreview( } val mediaOutput = mediaOutputHelper.getImageMediaOutput() - if (mediaOutput is MediaOutput.BitmapOutput) { imageCapture.takePicture(mainExecutor, object : OnImageCapturedCallback() { override fun onCaptureSuccess(image: ImageProxy) { diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/views/CameraPreview.kt b/app/src/main/kotlin/com/simplemobiletools/camera/views/CameraPreview.kt index 410519ac..8aaeb856 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/views/CameraPreview.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/views/CameraPreview.kt @@ -10,7 +10,6 @@ import android.hardware.camera2.* import android.hardware.camera2.params.MeteringRectangle import android.hardware.camera2.params.StreamConfigurationMap import android.media.ImageReader -import android.media.MediaActionSound import android.media.MediaRecorder import android.net.Uri import android.os.Handler diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 11a63854..d26a0659 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -14,7 +14,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + @@ -75,7 +75,6 @@ - - - - -