Implement Android

mrousavy · Jul 12, 2024 · cd9e6e7 · cd9e6e7
1 parent 7e70c1f
commit cd9e6e7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/package/android/src/main/java/com/mrousavy/camera/core/CameraConfiguration.kt b/package/android/src/main/java/com/mrousavy/camera/core/CameraConfiguration.kt
@@ -29,7 +29,8 @@ data class CameraConfiguration(
   var format: CameraDeviceFormat? = null,
 
   // Side-Props
-  var fps: Int? = null,
+  var minFps: Int? = null,
+  var maxFps: Int? = null,
   var enableLowLightBoost: Boolean = false,
   var torch: Torch = Torch.OFF,
   var videoStabilizationMode: VideoStabilizationMode = VideoStabilizationMode.OFF,
@@ -54,9 +55,8 @@ data class CameraConfiguration(
 
   val targetFpsRange: Range<Int>?
     get() {
-      val maxFps = fps ?: return null
-      val format = format ?: throw PropRequiresFormatToBeNonNullError("fps")
-      val minFps = format.minFps.toInt()
+      val minFps = minFps ?: return null
+      val maxFps = maxFps ?: return null
       return Range(minFps, maxFps)
     }
 

diff --git a/package/android/src/main/java/com/mrousavy/camera/react/CameraView.kt b/package/android/src/main/java/com/mrousavy/camera/react/CameraView.kt
@@ -70,7 +70,8 @@ class CameraView(context: Context) :
 
   // props that require format reconfiguring
   var format: CameraDeviceFormat? = null
-  var fps: Int? = null
+  var minFps: Int? = null
+  var maxFps: Int? = null
   var videoStabilizationMode: VideoStabilizationMode? = null
   var videoHdr = false
   var photoHdr = false
@@ -218,7 +219,8 @@ class CameraView(context: Context) :
         config.format = format
 
         // Side-Props
-        config.fps = fps
+        config.minFps = minFps
+        config.maxFps = maxFps
         config.enableLowLightBoost = lowLightBoost
         config.torch = torch
         config.exposure = exposure

diff --git a/package/android/src/main/java/com/mrousavy/camera/react/CameraViewManager.kt b/package/android/src/main/java/com/mrousavy/camera/react/CameraViewManager.kt
@@ -158,9 +158,17 @@ class CameraViewManager : ViewGroupManager<CameraView>() {
   // TODO: Change when TurboModules release.
   // We're treating -1 as "null" here, because when I make the fps parameter
   // of type "Int?" the react bridge throws an error.
-  @ReactProp(name = "fps", defaultInt = -1)
-  fun setFps(view: CameraView, fps: Int) {
-    view.fps = if (fps > 0) fps else null
+  @ReactProp(name = "minFps", defaultInt = -1)
+  fun setMinFps(view: CameraView, minFps: Int) {
+    view.minFps = if (minFps > 0) minFps else null
+  }
+
+  // TODO: Change when TurboModules release.
+  // We're treating -1 as "null" here, because when I make the fps parameter
+  // of type "Int?" the react bridge throws an error.
+  @ReactProp(name = "maxFps", defaultInt = -1)
+  fun setMaxFps(view: CameraView, maxFps: Int) {
+    view.maxFps = if (maxFps > 0) maxFps else null
   }
 
   @ReactProp(name = "photoHdr")