From 28bb406d42d156d6b9d05599ad9450f0f2fe7331 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 5 May 2017 11:27:26 +0200
Subject: [PATCH] pass the config parameter to ChangeResolutionDialog

---
 .../com/simplemobiletools/camera/Preview.kt    |  2 +-
 .../camera/dialogs/ChangeResolutionDialog.kt   | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt b/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt
index 4831ed22..8e4ddf94 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt
@@ -343,7 +343,7 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
     fun showChangeResolutionDialog() {
         val oldResolution = getSelectedResolution()
         if (mCamera != null) {
-            ChangeResolutionDialog(mActivity, config.lastUsedCamera == Camera.CameraInfo.CAMERA_FACING_BACK, mCamera!!) {
+            ChangeResolutionDialog(mActivity, config, mCamera!!) {
                 if (oldResolution != getSelectedResolution()) {
                     refreshPreview()
                 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/dialogs/ChangeResolutionDialog.kt b/app/src/main/kotlin/com/simplemobiletools/camera/dialogs/ChangeResolutionDialog.kt
index e1569cfb..c03dc1de 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/dialogs/ChangeResolutionDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/dialogs/ChangeResolutionDialog.kt
@@ -4,17 +4,19 @@ import android.hardware.Camera
 import android.support.v7.app.AlertDialog
 import android.view.LayoutInflater
 import android.view.View
+import com.simplemobiletools.camera.Config
+import com.simplemobiletools.camera.Preview
 import com.simplemobiletools.camera.R
 import com.simplemobiletools.camera.activities.SimpleActivity
-import com.simplemobiletools.camera.extensions.config
 import com.simplemobiletools.camera.extensions.getAspectRatio
 import com.simplemobiletools.commons.dialogs.RadioGroupDialog
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import com.simplemobiletools.commons.models.RadioItem
 import kotlinx.android.synthetic.main.dialog_change_resolution.view.*
 
-class ChangeResolutionDialog(val activity: SimpleActivity, val isBackCamera: Boolean, val camera: Camera, val callback: () -> Unit) {
+class ChangeResolutionDialog(val activity: SimpleActivity, val config: Config, val camera: Camera, val callback: () -> Unit) {
     var dialog: AlertDialog
+    val isBackCamera = Preview.config.lastUsedCamera == Camera.CameraInfo.CAMERA_FACING_BACK
 
     init {
         val view = LayoutInflater.from(activity).inflate(R.layout.dialog_change_resolution, null).apply {
@@ -32,7 +34,7 @@ class ChangeResolutionDialog(val activity: SimpleActivity, val isBackCamera: Boo
 
     private fun setupPhotoResolutionPicker(view: View) {
         val items = getFormattedResolutions(camera.parameters.supportedPictureSizes)
-        var selectionIndex = if (isBackCamera) activity.config.backPhotoResIndex else activity.config.frontPhotoResIndex
+        var selectionIndex = if (isBackCamera) config.backPhotoResIndex else config.frontPhotoResIndex
         selectionIndex = Math.max(selectionIndex, 0)
 
         view.change_resolution_photo_holder.setOnClickListener {
@@ -40,9 +42,9 @@ class ChangeResolutionDialog(val activity: SimpleActivity, val isBackCamera: Boo
                 selectionIndex = it as Int
                 view.change_resolution_photo.text = items[selectionIndex].title
                 if (isBackCamera)
-                    activity.config.backPhotoResIndex = it
+                    config.backPhotoResIndex = it
                 else
-                    activity.config.frontPhotoResIndex = it
+                    config.frontPhotoResIndex = it
                 dialog.dismiss()
             }
         }
@@ -51,16 +53,16 @@ class ChangeResolutionDialog(val activity: SimpleActivity, val isBackCamera: Boo
 
     private fun setupVideoResolutionPicker(view: View) {
         val items = getFormattedResolutions(camera.parameters.supportedVideoSizes ?: camera.parameters.supportedPreviewSizes)
-        var selectionIndex = if (isBackCamera) activity.config.backVideoResIndex else activity.config.frontVideoResIndex
+        var selectionIndex = if (isBackCamera) config.backVideoResIndex else config.frontVideoResIndex
 
         view.change_resolution_video_holder.setOnClickListener {
             RadioGroupDialog(activity, items, selectionIndex) {
                 selectionIndex = it as Int
                 view.change_resolution_video.text = items[selectionIndex].title
                 if (isBackCamera)
-                    activity.config.backVideoResIndex = it
+                    config.backVideoResIndex = it
                 else
-                    activity.config.frontVideoResIndex = it
+                    config.frontVideoResIndex = it
                 dialog.dismiss()
             }
         }