Merge pull request #16 from triniwiz/feat/3.0.0-alpha17

feat(): 3.0.0 alpha17

Author: triniwiz

fancycamera/build.gradle

@@ -8,7 +8,7 @@ group = 'com.github.triniwiz.fancycamera'
 ext {
     PUBLISH_GROUP_ID = 'com.github.triniwiz'
     PUBLISH_ARTIFACT_ID = 'fancycamera'
-    PUBLISH_VERSION = '3.0.0-alpha16'
+    PUBLISH_VERSION = '3.0.0-alpha17'
 }
 
 android {

fancycamera/publish.gradle

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'com.jfrog.bintray'
 
 group 'com.github.triniwiz.fancycamera'
-version '3.0.0-alpha15'
+version '3.0.0-alpha17'
 
 
 afterEvaluate {
@@ -16,7 +16,7 @@ afterEvaluate {
                 // You can then customize attributes of the publication as shown below.
                 groupId = 'com.github.triniwiz'
                 artifactId = 'fancycamera'
-                version = '3.0.0-alpha16'
+                version = '3.0.0-alpha17'
             }
         }
     }

fancycamera/src/main/java/com/github/triniwiz/fancycamera/Camera2.kt

@@ -432,7 +432,15 @@ class Camera2 @JvmOverloads constructor(
 
     @SuppressLint("RestrictedApi", "UnsafeExperimentalUsageError")
     override fun orientationUpdated() {
-
+        val rotation =  when (currentOrientation) {
+            270 -> Surface.ROTATION_270
+            180 -> Surface.ROTATION_180
+            90 -> Surface.ROTATION_90
+            else -> Surface.ROTATION_0
+        }
+        imageCapture?.targetRotation = rotation
+        videoCapture?.setTargetRotation(rotation)
+        imageAnalysis?.targetRotation = rotation
     }
 
     private fun getDeviceRotation(): Int {
@@ -507,6 +515,9 @@ class Camera2 @JvmOverloads constructor(
     private fun setUpAnalysis() {
         val builder = androidx.camera.core.ImageAnalysis.Builder()
                 .apply {
+                    if(getDeviceRotation() > -1){
+                        setTargetRotation(getDeviceRotation())
+                    }
                     setBackpressureStrategy(STRATEGY_KEEP_ONLY_LATEST)
                 }
         val extender = Camera2Interop.Extender(builder)
@@ -574,6 +585,9 @@ class Camera2 @JvmOverloads constructor(
         }
 
         val builder = ImageCapture.Builder().apply {
+            if(getDeviceRotation() > -1){
+                setTargetRotation(getDeviceRotation())
+            }
             if (pictureSize == "0x0") {
                 setTargetAspectRatio(
                         when (displayRatio) {
@@ -683,6 +697,9 @@ class Camera2 @JvmOverloads constructor(
             val profile = getCamcorderProfile(quality)
             val builder = VideoCapture.Builder()
                     .apply {
+                        if(getDeviceRotation() > -1){
+                            setTargetRotation(getDeviceRotation())
+                        }
                         setTargetResolution(android.util.Size(profile.videoFrameWidth, profile.videoFrameHeight))
                         setMaxResolution(android.util.Size(profile.videoFrameWidth, profile.videoFrameHeight))
 
@@ -1033,7 +1050,6 @@ class Camera2 @JvmOverloads constructor(
             // Registering image's required rotation, provided by Androidx ImageAnalysis
             var imageTargetRotation = image.imageInfo.rotationDegrees
             matrix.postRotate(imageTargetRotation.toFloat())
-            Log.d("Camera2", "takePhoto: imageTargetRotation=$imageTargetRotation")
 
             // Flipping over the image in case it is the front camera
             if (position == CameraPosition.FRONT)
@@ -1052,7 +1068,6 @@ class Camera2 @JvmOverloads constructor(
                     originalWidth = originalHeight;
                 }
             }
-            Log.d("Camera2", "takePhoto: originalWidth=$originalWidth, originalHeight=$originalHeight")
             val rotated = Bitmap.createBitmap(bm, offsetWidth, offsetHeight, originalWidth, originalHeight, matrix, false)
             outputStream = FileOutputStream(file!!, false)
             var override: Bitmap? = null

fancycamera/src/main/java/com/github/triniwiz/fancycamera/CameraBase.kt

@@ -3,6 +3,7 @@ package com.github.triniwiz.fancycamera
 import android.Manifest
 import android.app.Activity
 import android.content.Context
+import android.content.pm.ActivityInfo
 import android.content.pm.PackageManager
 import android.media.CamcorderProfile
 import android.media.MediaRecorder
@@ -220,9 +221,9 @@ abstract class CameraBase @JvmOverloads constructor(
     }
 
     /** Device orientation in degrees 0-359 */
-    internal var currentOrientation: Int = OrientationEventListener.ORIENTATION_UNKNOWN
+    var currentOrientation: Int = OrientationEventListener.ORIENTATION_UNKNOWN
 
-    internal abstract fun orientationUpdated();
+    abstract fun orientationUpdated();
 
     internal val VIDEO_RECORDER_PERMISSIONS_REQUEST = 868
     internal val VIDEO_RECORDER_PERMISSIONS = arrayOf(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
@@ -244,17 +245,18 @@ abstract class CameraBase @JvmOverloads constructor(
 
     private val orientationEventListener = object : OrientationEventListener(context) {
         override fun onOrientationChanged(orientation: Int) {
-            // Based on: https://developer.android.com/reference/androidx/camera/core/ImageAnalysis#setTargetRotation(int)
-            val newOrientation = when (orientation) {
-                in 0..20, in 340..359 -> 0
-                in 70..110 -> 90
-                in 250..290 -> 270
-                in 160..200 -> 180
-                else -> currentOrientation
-            }
-            if (newOrientation != currentOrientation) {
-                Log.d("CameraBase", "Event: onOrientationChanged($orientation) -> currentOrientation = $currentOrientation to $newOrientation");
-                currentOrientation = newOrientation
+            if(rotation == CameraOrientation.UNKNOWN){
+                val newOrientation = when (orientation) {
+                    in 45 until 135 -> 270
+                    in 135 until 225 -> 180
+                    in 225 until 315 -> 90
+                    else -> 0
+                }
+
+                if (newOrientation != currentOrientation) {
+                    currentOrientation = newOrientation
+                    orientationUpdated()
+                }
             }
         }
     }
@@ -263,6 +265,12 @@ abstract class CameraBase @JvmOverloads constructor(
         orientationEventListener.enable()
     }
 
+    @Synchronized
+    @Throws(Throwable::class)
+    protected fun finalize() {
+        orientationEventListener.disable()
+    }
+
 
     private var timerLock: Any = Any()
 

fancycamera/src/main/java/com/github/triniwiz/fancycamera/CameraOrientation.kt

@@ -1,11 +1,11 @@
 package com.github.triniwiz.fancycamera
 
 enum class CameraOrientation constructor(val value: Int) {
-    UNKNOWN(0),
-    PORTRAIT(1),
-    PORTRAIT_UPSIDE_DOWN(2),
-    LANDSCAPE_LEFT(3),
-    LANDSCAPE_RIGHT(4);
+    UNKNOWN(1000),
+    PORTRAIT(1001),
+    PORTRAIT_UPSIDE_DOWN(1002),
+    LANDSCAPE_LEFT(1003),
+    LANDSCAPE_RIGHT(1004);
 
     companion object {
         fun from(value: Int): CameraOrientation = values().first { it.value == value }