Merge pull request #13 from furkanturkn/master

master to dev (wrong push)
furkanturkn · Feb 21, 2023 · 44f6a6a · 44f6a6a
2 parents b81899f + 788a36a
commit 44f6a6a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -74,7 +74,7 @@ No need to waste time on CameraX and ML Kit app anymore. This library will speed
    ```sh
    dependencies {
        ...
-       implementation 'com.github.furkanturkn:camerax-mlkit-pack:1.0.4'
+       implementation 'com.github.furkanturkn:camerax-mlkit-pack:1.0.7'
    }
    ```
 <p align="right">(<a href="#readme-top">back to top</a>)</p>

diff --git a/app/build.gradle b/app/build.gradle
@@ -46,5 +46,5 @@ dependencies {
     implementation "androidx.camera:camera-view:1.2.1"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1"
 
-    implementation 'com.github.furkanturkn:camerax-mlkit-pack:1.0.4'
+    implementation 'com.github.furkanturkn:camerax-mlkit-pack:1.0.7'
 }
diff --git a/camerax-mlkit-pack/build.gradle b/camerax-mlkit-pack/build.gradle
@@ -50,7 +50,7 @@ afterEvaluate {
 
                 groupId = 'com.github.furkanturkn'
                 artifactId = 'camerax-mlkit-pack'
-                version = '1.0.4'
+                version = '1.0.7'
             }
         }
     }

diff --git a/camerax-mlkit-pack/src/main/java/com/furkan/camerax_mlkit_pack/CameraxManager.kt b/camerax-mlkit-pack/src/main/java/com/furkan/camerax_mlkit_pack/CameraxManager.kt
@@ -19,6 +19,7 @@ import androidx.camera.core.*
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.camera.view.PreviewView
 import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
 import androidx.lifecycle.LifecycleOwner
 import com.furkan.camerax_mlkit_pack.core.Constants
 import com.furkan.camerax_mlkit_pack.core.Constants.CAMERA_RESOLUTION_HEIGHT
@@ -47,13 +48,15 @@ import java.util.concurrent.TimeUnit
 
 class CameraxManager(
     context: Context,
+    fragment: Fragment?,
     previewView: PreviewView,
     focusRing: ImageView,
     cameraSelectorType: Int? = CameraSelector.LENS_FACING_BACK,
     accuracyLevel: Int = Constants.BARCODE_ACCURACY_DEFAULT_COUNT
 ) {
 
     private var mContext = context
+    private var mFragment = fragment
     private var mPreviewView = previewView
     private var mFocusRing = focusRing
     private var cameraControl: CameraControl? = null
@@ -120,6 +123,7 @@ class CameraxManager(
 
         fun getInstance(
             context: Context,
+            fragment: Fragment,
             previewView: PreviewView,
             focusRing: ImageView,
             cameraSelectorType: Int? = CameraSelector.LENS_FACING_BACK,
@@ -128,6 +132,7 @@ class CameraxManager(
             ?: synchronized(this) {
                 INSTANCE ?: CameraxManager(
                     context,
+                    fragment,
                     previewView,
                     focusRing,
                     cameraSelectorType,
@@ -148,7 +153,7 @@ class CameraxManager(
     }
 
     fun startCamera() {
-        if(cameraExecutor.isShutdown || cameraExecutor.isTerminated) {
+        if (cameraExecutor.isShutdown || cameraExecutor.isTerminated) {
             cameraExecutor = Executors.newSingleThreadExecutor()
         }
         addCameraProviderFeatureListener()
@@ -352,10 +357,18 @@ class CameraxManager(
         preview.setSurfaceProvider(mPreviewView.surfaceProvider)
 
         cameraProvider.unbindAll()
-        val camera: Camera = cameraProvider.bindToLifecycle(
-            (mContext as LifecycleOwner), cameraSelector!!,
-            imageAnalysisUseCase, preview, imageCaptureBuilder
-        )
+        val camera: Camera = if (mFragment != null) {
+            cameraProvider.bindToLifecycle(
+                (mFragment as LifecycleOwner), cameraSelector!!,
+                imageAnalysisUseCase, preview, imageCaptureBuilder
+            )
+        } else {
+            cameraProvider.bindToLifecycle(
+                (mContext as LifecycleOwner), cameraSelector!!,
+                imageAnalysisUseCase, preview, imageCaptureBuilder
+            )
+        }
+
         cameraControl = camera.cameraControl
     }