* Fix for camera rotation

* Added feature to dynamically update clock screensaver position
* Updates for Swedish translations

Author: thanksmister

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/modules/CameraReader.kt

@@ -287,9 +287,6 @@ constructor(private val context: Context) {
             return
         }
         cameraOrientation = info.orientation
-        if(configuration.cameraRotate != 0f) {
-            cameraOrientation = configuration.cameraRotate.toInt()
-        }
         val multiDetectorBuilder = MultiDetector.Builder()
         var detectorAdded = false
 
@@ -307,7 +304,7 @@ constructor(private val context: Context) {
                                 }
                             })
                             bitmapComplete = false
-                            byteArrayCreateTask!!.execute(stream.byteArray, stream.width, stream.height, cameraOrientation)
+                            byteArrayCreateTask!!.execute(stream.byteArray, stream.width, stream.height, cameraOrientation, configuration.cameraRotate)
                         }
                     }
                 }
@@ -426,24 +423,27 @@ constructor(private val context: Context) {
             val width = params[1] as Int
             val height = params[2] as Int
             val orientation = params[3] as Int
+            val rotation = params[4] as Float
 
             val windowService = contextRef.get()!!.getSystemService(Context.WINDOW_SERVICE) as WindowManager
             val currentRotation = windowService.defaultDisplay.rotation
             val nv21Bitmap = Nv21Image.nv21ToBitmap(renderScript, byteArray, width, height)
-
             var rotate = orientation
+
             when (currentRotation) {
                 Surface.ROTATION_90 -> {
-                    rotate += 90
+                    rotate -= 90
                 }
                 Surface.ROTATION_180 -> {
-                    rotate += 180
+                    rotate -= 180
                 }
                 Surface.ROTATION_270 -> {
-                    rotate += 270
+                    rotate -= 270
                 }
             }
+
             rotate %= 360
+            rotate += rotation.toInt()
 
             val matrix = Matrix()
             matrix.postRotate(rotate.toFloat())

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/fragments/CameraSettingsFragment.kt

@@ -90,11 +90,11 @@ class CameraSettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnS
         rotatePreference!!.value = configuration.cameraRotate.toString()
         if(configuration.cameraRotate == 0f) {
             rotatePreference!!.setValueIndex(0)
-        } else if (configuration.cameraRotate == -360f) {
+        } else if (configuration.cameraRotate == -90f) {
             rotatePreference!!.setValueIndex(1)
-        } else if (configuration.cameraRotate == 180f) {
+        } else if (configuration.cameraRotate == 90f) {
             rotatePreference!!.setValueIndex(2)
-        } else if (configuration.cameraRotate == -270f) {
+        } else if (configuration.cameraRotate == -180f) {
             rotatePreference!!.setValueIndex(3)
         }
         cameraListPreference = findPreference(getString(R.string.key_setting_camera_cameraid)) as ListPreference

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/views/ScreenSaverView.kt

@@ -49,6 +49,7 @@ import retrofit2.Response
 import timber.log.Timber
 import java.text.DateFormat
 import java.util.*
+import java.util.concurrent.TimeUnit
 
 class ScreenSaverView : RelativeLayout {
 
@@ -65,6 +66,9 @@ class ScreenSaverView : RelativeLayout {
     private var dataSource: DarkSkyDao? = null
     private var useImageSaver: Boolean = false
     private var hasWeather: Boolean = false
+    private var parentWidth: Int = 0
+    private var parentHeight: Int = 0
+    private val calendar: Calendar = Calendar.getInstance()
 
     private val delayRotationRunnable = object : Runnable {
         override fun run() {
@@ -75,12 +79,27 @@ class ScreenSaverView : RelativeLayout {
 
     private val timeRunnable = object : Runnable {
         override fun run() {
-            val currentTimeString = DateUtils.formatDateTime(context, Date().time, DateUtils.FORMAT_SHOW_TIME)
-            screenSaverClockSmall.text = currentTimeString
+            val date = Date()
+            calendar.time = date
+            val currentTimeString = DateUtils.formatDateTime(context, date.time, DateUtils.FORMAT_SHOW_TIME)
             screenSaverClock.text = currentTimeString
-            if (timeHandler != null) {
-                timeHandler!!.postDelayed(this, 1000)
+
+            // use this only with the clock feature
+            if (!useImageSaver) {
+                val width = screenSaverClockLayout.width
+                val height = screenSaverClockLayout.height
+                parentWidth = screenSaverView.width
+                parentHeight = screenSaverView.height
+                if (width > 0 && height > 0) {
+                    val newX = Random().nextInt(parentWidth - width)
+                    val newY = Random().nextInt(parentHeight - height)
+                    screenSaverClockLayout.x = newX.toFloat()
+                    screenSaverClockLayout.y = newY.toFloat()
+                }
             }
+
+            val offset = 60L - calendar.get(Calendar.SECOND)
+            timeHandler?.postDelayed(this, TimeUnit.SECONDS.toMillis(offset))
         }
     }
 

app/src/main/res/values/donottranslate.xml

@@ -108,9 +108,9 @@
 
     <string-array name="flip_values">
         <item>0F</item>
-        <item>-360f</item>
-        <item>180f</item>
-        <item>-270f</item>
+        <item>-90f</item>
+        <item>90f</item>
+        <item>-180f</item>
     </string-array>
 
     <string-array name="zoom_level_names">