From 3989eca8e8558b01a536b75824c309c2a449dc58 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 28 Oct 2022 15:59:02 +0200 Subject: [PATCH] renaming some functions and variables --- .../camera/activities/MainActivity.kt | 10 +++++----- .../camera/implementations/CameraXInitializer.kt | 8 ++++---- 2 files changed, 9 insertions(+), 9 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 d2f6c140..ddcc8b4b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt @@ -257,7 +257,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera } } - private fun is3rdPartyIntent() = isVideoCaptureIntent() || isImageCaptureIntent() + private fun isThirdPartyIntent() = isVideoCaptureIntent() || isImageCaptureIntent() private fun isImageCaptureIntent(): Boolean = intent?.action == MediaStore.ACTION_IMAGE_CAPTURE || intent?.action == MediaStore.ACTION_IMAGE_CAPTURE_SECURE @@ -321,12 +321,12 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera } val outputUri = intent.extras?.get(MediaStore.EXTRA_OUTPUT) as? Uri - val is3rdPartyIntent = is3rdPartyIntent() + val isThirdPartyIntent = isThirdPartyIntent() mPreview = CameraXInitializer(this).createCameraXPreview( preview_view, listener = this, outputUri = outputUri, - is3rdPartyIntent = is3rdPartyIntent, + isThirdPartyIntent = isThirdPartyIntent, initInPhotoMode = mIsInPhotoMode, ) checkImageCaptureIntent() @@ -409,13 +409,13 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera } private fun onSwipeLeft() { - if (!is3rdPartyIntent() && camera_mode_tab.isVisible()) { + if (!isThirdPartyIntent() && camera_mode_tab.isVisible()) { selectPhotoTab(triggerListener = true) } } private fun onSwipeRight() { - if (!is3rdPartyIntent() && camera_mode_tab.isVisible()) { + if (!isThirdPartyIntent() && camera_mode_tab.isVisible()) { selectVideoTab(triggerListener = true) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXInitializer.kt b/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXInitializer.kt index cd47df64..fce3bea2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXInitializer.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXInitializer.kt @@ -12,11 +12,11 @@ class CameraXInitializer(private val activity: BaseSimpleActivity) { previewView: PreviewView, listener: CameraXPreviewListener, outputUri: Uri?, - is3rdPartyIntent: Boolean, + isThirdPartyIntent: Boolean, initInPhotoMode: Boolean, ): CameraXPreview { val cameraErrorHandler = newCameraErrorHandler() - val mediaOutputHelper = newMediaOutputHelper(cameraErrorHandler, outputUri, is3rdPartyIntent) + val mediaOutputHelper = newMediaOutputHelper(cameraErrorHandler, outputUri, isThirdPartyIntent) return CameraXPreview( activity, previewView, @@ -30,13 +30,13 @@ class CameraXInitializer(private val activity: BaseSimpleActivity) { private fun newMediaOutputHelper( cameraErrorHandler: CameraErrorHandler, outputUri: Uri?, - is3rdPartyIntent: Boolean, + isThirdPartyIntent: Boolean, ): MediaOutputHelper { return MediaOutputHelper( activity, cameraErrorHandler, outputUri, - is3rdPartyIntent, + isThirdPartyIntent, ) }