From 612a6918b7539b9d491e89448914a0ec35a12b6b Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 20 Sep 2017 23:34:13 +0200
Subject: [PATCH] couple minor code style and string updates

---
 .../simplemobiletools/camera/PhotoProcessor.kt |  7 +++----
 .../camera/activities/MainActivity.kt          |  6 +++---
 .../simplemobiletools/camera/extensions/int.kt | 16 +++++-----------
 .../camera/extensions/size.kt                  | 18 ++++++------------
 .../camera/views/FocusRectView.kt              |  4 +++-
 app/src/main/res/values-de/strings.xml         |  2 +-
 app/src/main/res/values-es/strings.xml         |  2 +-
 app/src/main/res/values-fr/strings.xml         |  2 +-
 app/src/main/res/values-it/strings.xml         |  2 +-
 app/src/main/res/values-ja/strings.xml         |  2 +-
 app/src/main/res/values-lt/strings.xml         |  2 +-
 app/src/main/res/values-nl/strings.xml         |  4 ++--
 app/src/main/res/values-pl/strings.xml         |  2 +-
 app/src/main/res/values-pt-rBR/strings.xml     |  2 +-
 app/src/main/res/values-pt/strings.xml         |  2 +-
 app/src/main/res/values-ru/strings.xml         |  2 +-
 app/src/main/res/values-sv/strings.xml         |  2 +-
 app/src/main/res/values/strings.xml            |  2 +-
 18 files changed, 34 insertions(+), 45 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/PhotoProcessor.kt b/app/src/main/kotlin/com/simplemobiletools/camera/PhotoProcessor.kt
index e96626c0..94d4eaf0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/PhotoProcessor.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/PhotoProcessor.kt
@@ -36,10 +36,10 @@ class PhotoProcessor(val activity: MainActivity, val uri: Uri?, val currCameraId
         var fos: OutputStream? = null
         val path: String
         try {
-            if (uri != null) {
-                path = uri.path
+            path = if (uri != null) {
+                uri.path
             } else {
-                path = activity.getOutputMediaFile(true)
+                activity.getOutputMediaFile(true)
             }
 
             if (path.isEmpty()) {
@@ -114,7 +114,6 @@ class PhotoProcessor(val activity: MainActivity, val uri: Uri?, val currCameraId
 
     override fun onPostExecute(path: String) {
         super.onPostExecute(path)
-
         mActivity?.get()?.mediaSaved(path)
     }
 
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 f1520ff5..f8b13db7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
@@ -201,10 +201,10 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave
             return
         }
 
-        if (mCurrCameraId == Camera.CameraInfo.CAMERA_FACING_BACK) {
-            mCurrCameraId = Camera.CameraInfo.CAMERA_FACING_FRONT
+        mCurrCameraId = if (mCurrCameraId == Camera.CameraInfo.CAMERA_FACING_BACK) {
+            Camera.CameraInfo.CAMERA_FACING_FRONT
         } else {
-            mCurrCameraId = Camera.CameraInfo.CAMERA_FACING_BACK
+            Camera.CameraInfo.CAMERA_FACING_BACK
         }
 
         config.lastUsedCamera = mCurrCameraId
diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/extensions/int.kt b/app/src/main/kotlin/com/simplemobiletools/camera/extensions/int.kt
index 47b1a40c..67c2840c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/extensions/int.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/extensions/int.kt
@@ -4,15 +4,9 @@ import android.hardware.Camera
 import com.simplemobiletools.camera.ORIENT_LANDSCAPE_LEFT
 import com.simplemobiletools.camera.ORIENT_LANDSCAPE_RIGHT
 
-fun Int.compensateDeviceRotation(currCameraId: Int): Int {
-    val isFrontCamera = currCameraId == Camera.CameraInfo.CAMERA_FACING_FRONT
-    return if (this == ORIENT_LANDSCAPE_LEFT) {
-        270
-    } else if (this == ORIENT_LANDSCAPE_RIGHT) {
-        90
-    } else if (isFrontCamera) {
-        180
-    } else {
-        0
-    }
+fun Int.compensateDeviceRotation(currCameraId: Int) = when {
+    this == ORIENT_LANDSCAPE_LEFT -> 270
+    this == ORIENT_LANDSCAPE_RIGHT -> 90
+    currCameraId == Camera.CameraInfo.CAMERA_FACING_FRONT -> 180
+    else -> 0
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/extensions/size.kt b/app/src/main/kotlin/com/simplemobiletools/camera/extensions/size.kt
index f34cfb49..94a0c31e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/extensions/size.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/extensions/size.kt
@@ -34,16 +34,10 @@ fun Camera.Size.isSixToFive(): Boolean {
     return diff < RATIO_TOLERANCE
 }
 
-fun Camera.Size.getAspectRatio(context: Context): String {
-    return if (isSixteenToNine()) {
-        "16:9"
-    } else if (isFourToThree()) {
-        "4:3"
-    } else if (isThreeToTwo()) {
-        "3:2"
-    } else if (isSixToFive()) {
-        "6:5"
-    } else {
-        context.resources.getString(R.string.other)
-    }
+fun Camera.Size.getAspectRatio(context: Context) = when {
+    isSixteenToNine() -> "16:9"
+    isFourToThree() -> "4:3"
+    isThreeToTwo() -> "3:2"
+    isSixToFive() -> "6:5"
+    else -> context.resources.getString(R.string.other)
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/views/FocusRectView.kt b/app/src/main/kotlin/com/simplemobiletools/camera/views/FocusRectView.kt
index acf20819..cfbd366c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/views/FocusRectView.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/views/FocusRectView.kt
@@ -43,7 +43,9 @@ class FocusRectView(context: Context) : ViewGroup(context) {
         toggleRect(true)
 
         mHandler.removeCallbacksAndMessages(null)
-        mHandler.postDelayed({ toggleRect(false) }, RECT_DURATION.toLong())
+        mHandler.postDelayed({
+            toggleRect(false)
+        }, RECT_DURATION.toLong())
     }
 
     private fun toggleRect(show: Boolean) {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8bf38f58..edfab615 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -46,6 +46,6 @@
 
     <!--
         Haven't found some strings? There's more at
-        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/library/src/main/res
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d90a180a..5c727066 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -46,6 +46,6 @@
 
     <!--
         Haven't found some strings? There's more at
-        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/library/src/main/res
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 80e53999..369abd40 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -46,6 +46,6 @@
 
     <!--
         Haven't found some strings? There's more at
-        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/library/src/main/res
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 23d0bcbb..205293a1 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -46,6 +46,6 @@
 
     <!--
         Haven't found some strings? There's more at
-        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/library/src/main/res
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 8c4b3d69..4d3ef82b 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -46,6 +46,6 @@
 
     <!--
         Haven't found some strings? There's more at
-        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/library/src/main/res
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
 </resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 9713a228..7274ded1 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -46,6 +46,6 @@
 
     <!--
         Haven't found some strings? There's more at
-        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/library/src/main/res
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 7323ecf5..63dfe7f2 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -46,6 +46,6 @@
 
     <!--
         Haven't found some strings? There's more at
-        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/library/src/main/res
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 10f93609..76e6d17c 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -45,6 +45,6 @@
 
     <!--
         Haven't found some strings? There's more at
-        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/library/src/main/res
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 93e17732..967fc94a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -46,6 +46,6 @@
 
     <!--
         Não encontrou todas as cadeias a traduzir? Existem mais algumas em:
-        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/library/src/main/res
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 973a9226..9d5819f0 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -46,6 +46,6 @@
 
     <!--
         Não encontrou todas as cadeias a traduzir? Existem mais algumas em:
-        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/library/src/main/res
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 170b927c..c6e68078 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -46,6 +46,6 @@
 
     <!--
         Haven't found some strings? There's more at
-        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/library/src/main/res
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index fc97e73d..aade4d02 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -45,6 +45,6 @@
 
     <!--
         Haven't found some strings? There's more at
-        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/library/src/main/res
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aeade50f..654b6d3b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -45,6 +45,6 @@
 
     <!--
         Haven't found some strings? There's more at
-        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/library/src/main/res
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
 </resources>