camera bug rotation camera type fixed

Author: Pavel

app/src/main/java/com/haretskiy/pavel/magiccamera/Constants.kt

@@ -20,6 +20,8 @@ const val BUNDLE_KEY_PREFS_CAMERA_SIZE = "camera_size_prefs"
 const val BUNDLE_KEY_CAMERA1_ID = "BUNDLE_KEY_CAMERA1_ID"
 const val BUNDLE_KEY_CAMERA_GOOGLE = "BUNDLE_KEY_CAMERA_GOOGLE"
 const val BUNDLE_KEY_FRAGMENT_ID = "BUNDLE_KEY_FRAGMENT_ID"
+const val BUNDLE_KEY_CAMERA_TYPE_STATE = "BUNDLE_KEY_CAMERA_TYPE_STATE"
+
 //Camera2 constants
 const val CODE_REQUEST_CAMERA_PERMISSION = 1
 const val PIC_FILE_NAME = "photo.jpg"
@@ -48,7 +50,7 @@ const val MAX_PREVIEW_HEIGHT = 1080
 const val TWO_CAMERAS = 2
 const val ONE_CAMERA = 1
 const val NO_CAMERA = 0
-const val NOTHING_CAMERA = -1
+const val CAMERA_TYPE_NOT_FOUND = -1
 
 //Camera constants
 const val FULL_SCREEN = true

app/src/main/java/com/haretskiy/pavel/magiccamera/ui/fragments/GoogleVisionFragment.kt

@@ -38,13 +38,13 @@ class GoogleVisionFragment : Fragment() {
     private val cameraSourceManager: CameraSourceManager by inject()
     private val router: Router by inject()
 
-    private var cameraType = NOTHING_CAMERA
+    private var cameraType = CAMERA_TYPE_NOT_FOUND
     private var cameras = Camera.getNumberOfCameras()
     private var mCameraSource: CameraSource? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        cameraType = savedInstanceState?.getInt(BUNDLE_KEY_CAMERA_GOOGLE, NOTHING_CAMERA) ?: NOTHING_CAMERA
+        cameraType = prefs.getCameraType()
         cameraSourceManager.cameraSourceLiveData.observe(this, Observer {
             if (mCameraSource != null) {
                 mCameraSource?.release()
@@ -70,11 +70,6 @@ class GoogleVisionFragment : Fragment() {
         })
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putInt(BUNDLE_KEY_CAMERA_GOOGLE, cameraType)
-    }
-
     /**
      * Restarts the camera.
      */
@@ -97,6 +92,7 @@ class GoogleVisionFragment : Fragment() {
         activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
         preview.stop()
         setViewsVisible(false)
+        prefs.saveCameraType(cameraType)
     }
 
     /**
@@ -161,9 +157,9 @@ class GoogleVisionFragment : Fragment() {
     }
 
     private fun initCameraType() {
-        if (cameraType == NOTHING_CAMERA) {
+        if (cameraType == CAMERA_TYPE_NOT_FOUND) {
             when (cameras) {
-                NO_CAMERA -> cameraType = NOTHING_CAMERA
+                NO_CAMERA -> cameraType = CAMERA_TYPE_NOT_FOUND
                 ONE_CAMERA -> cameraType = CameraSource.CAMERA_FACING_BACK
                 TWO_CAMERAS -> cameraType = CameraSource.CAMERA_FACING_FRONT
             }
@@ -172,7 +168,7 @@ class GoogleVisionFragment : Fragment() {
 
     private fun choseCamera() {
         when (cameras) {
-            NO_CAMERA -> cameraType = NOTHING_CAMERA
+            NO_CAMERA -> cameraType = CAMERA_TYPE_NOT_FOUND
             ONE_CAMERA -> cameraType = CameraSource.CAMERA_FACING_BACK
             TWO_CAMERAS -> cameraType = when (cameraType) {
                 CameraSource.CAMERA_FACING_BACK -> CameraSource.CAMERA_FACING_FRONT

app/src/main/java/com/haretskiy/pavel/magiccamera/utils/Prefs.kt

@@ -26,6 +26,12 @@ class Prefs(context: Context) {
         if (email != null) save(BUNDLE_KEY_EMAIL, email)
     }
 
+    fun saveCameraType(camera: Int) {
+        save(BUNDLE_KEY_CAMERA_TYPE_STATE, camera)
+    }
+
+    fun getCameraType() = getInt(BUNDLE_KEY_CAMERA_TYPE_STATE, CAMERA_TYPE_NOT_FOUND)
+
     fun getUserEmail(): String = getString(BUNDLE_KEY_EMAIL, EMPTY_STRING)
 
     fun saveLastPhotoUri(email: String, uri: String) {

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.40'
+    ext.kotlin_version = '1.2.41'
     repositories {
         google()
         jcenter()
@@ -12,7 +12,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'io.fabric.tools:gradle:1.25.2'
+        classpath 'io.fabric.tools:gradle:1.25.3'
         classpath 'com.google.gms:google-services:3.2.0'
     }
 }