#1 landscape issue fix

hongbeomi · Nov 26, 2020 · b0fdfdd · b0fdfdd
1 parent 4525113
commit b0fdfdd
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 9 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/app/src/main/java/github/hongbeomi/macgyver/camerax/GraphicOverlay.kt b/app/src/main/java/github/hongbeomi/macgyver/camerax/GraphicOverlay.kt
@@ -1,6 +1,7 @@
 package github.hongbeomi.macgyver.camerax
 
 import android.content.Context
+import android.content.res.Configuration
 import android.graphics.Canvas
 import android.graphics.Rect
 import android.graphics.RectF
@@ -25,16 +26,33 @@ open class GraphicOverlay(context: Context?, attrs: AttributeSet?) :
 
         fun calculateRect(height: Float, width: Float, boundingBoxT: Rect): RectF {
 
-            // why hight, width?
-            // because analyze image rotate value is 90
-            val scaleX = overlay.width.toFloat() / height
-            val scaleY = overlay.height.toFloat() / width
+            // for land scape
+            fun isLandScapeMode(): Boolean {
+                return overlay.context.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+            }
+
+            fun whenLandScapeModeWidth(): Float {
+                return when(isLandScapeMode()) {
+                    true -> width
+                    false -> height
+                }
+            }
+
+            fun whenLandScapeModeHeight(): Float {
+                return when(isLandScapeMode()) {
+                    true -> height
+                    false -> width
+                }
+            }
+
+            val scaleX = overlay.width.toFloat() / whenLandScapeModeWidth()
+            val scaleY = overlay.height.toFloat() / whenLandScapeModeHeight()
             val scale = scaleX.coerceAtLeast(scaleY)
             overlay.mScale = scale
 
             // Calculate offset (we need to center the overlay on the target)
-            val offsetX = (overlay.width.toFloat() - ceil(height * scale)) / 2.0f
-            val offsetY = (overlay.height.toFloat() - ceil(width * scale)) / 2.0f
+            val offsetX = (overlay.width.toFloat() - ceil(whenLandScapeModeWidth() * scale)) / 2.0f
+            val offsetY = (overlay.height.toFloat() - ceil(whenLandScapeModeHeight() * scale)) / 2.0f
 
             overlay.mOffsetX = offsetX
             overlay.mOffsetY = offsetY

diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
             'cameraX'  : '1.0.0-beta07',
     ]
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.0-beta01"
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Aug 03 18:49:13 KST 2020
+#Thu Nov 26 18:12:09 KST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip