From ea640f96ca9e98f98a3c49900d296e77248e69f7 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 5 Jun 2018 23:16:34 +0200 Subject: [PATCH] minor code style cleanup --- .../camera/views/PreviewCameraTwo.kt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt b/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt index c0a21d6d..47ece6ee 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt @@ -209,7 +209,7 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie } private val imageAvailableListener = ImageReader.OnImageAvailableListener { reader -> - val buffer = reader.acquireNextImage().planes[0].buffer + val buffer = reader.acquireNextImage().planes.first().buffer val bytes = ByteArray(buffer.remaining()) buffer.get(bytes) PhotoProcessor(mActivity, mTargetUri, mRotationAtCapture, getJPEGOrientation(), mUseFrontCamera).execute(bytes) @@ -278,9 +278,11 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie mPreviewSize = chooseOptimalSize(outputSizes, rotatedPreviewWidth, rotatedPreviewHeight, maxPreviewWidth, maxPreviewHeight, currentResolution) mTextureView.setAspectRatio(mPreviewSize!!.height, mPreviewSize!!.width) - mIsFlashSupported = characteristics.get(CameraCharacteristics.FLASH_INFO_AVAILABLE) ?: false - mIsZoomSupported = characteristics.get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM) ?: 0f > 0f - mIsFocusSupported = characteristics.get(CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES).size > 1 + characteristics.apply { + mIsFlashSupported = get(CameraCharacteristics.FLASH_INFO_AVAILABLE) ?: false + mIsZoomSupported = get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM) ?: 0f > 0f + mIsFocusSupported = get(CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES).size > 1 + } mActivity.setFlashAvailable(mIsFlashSupported) return } @@ -304,9 +306,9 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie } return when { - bigEnough.size > 0 -> bigEnough.minBy { it.width * it.height }!! - notBigEnough.size > 0 -> notBigEnough.maxBy { it.width * it.height }!! - else -> choices[0] + bigEnough.isNotEmpty() -> bigEnough.minBy { it.width * it.height }!! + notBigEnough.isNotEmpty() -> notBigEnough.maxBy { it.width * it.height }!! + else -> choices.first() } }