railbird/react-native-vision-camera
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: BREAKING CHANGE: Express zoom factor always in actual factor value (1, 2, 128, ...) instead of 0.0-1.0 scale (#306)

Browse Source 
* Make `zoom` go on "factor" scale

* Clean up `zoom` code

* fix float conversion

* fix zoom interpretation

* Update docs for new zoom scale

* fix float conversion
This commit is contained in:
Marc Rousavy
2021-07-29 11:44:22 +02:00
committed by GitHub
parent 6e2dc4e73b
commit 445af943c3
10 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/src/main/java/com/mrousavy/camera/CameraView.kt
View File

@@ -82,7 +82,7 @@ class CameraView(context: Context) : FrameLayout(context), LifecycleOwner {
// other props
var isActive = false
var torch = "off"
var zoom = 0.0 // in percent
var zoom: Float = 1f // in "factor"
var enableZoomGesture = false
var frameProcessorFps = 1.0
@@ -162,7 +162,7 @@ class CameraView(context: Context) : FrameLayout(context), LifecycleOwner {
scaleGestureListener = object : ScaleGestureDetector.SimpleOnScaleGestureListener() {
override fun onScale(detector: ScaleGestureDetector): Boolean {
zoom = min(max(((zoom + 1) * detector.scaleFactor) - 1, 0.0), 1.0)
zoom = max(min((zoom * detector.scaleFactor), maxZoom), minZoom)
update(arrayListOfZoom)
return true
}
@@ -275,8 +275,8 @@ class CameraView(context: Context) : FrameLayout(context), LifecycleOwner {
configureSession()
}
if (shouldReconfigureZoom) {
val scaled = (zoom.toFloat() * (maxZoom - minZoom)) + minZoom
camera!!.cameraControl.setZoomRatio(scaled)
val zoomClamped = max(min(zoom.toFloat(), maxZoom), minZoom)
camera!!.cameraControl.setZoomRatio(zoomClamped)
}
if (shouldReconfigureTorch) {
camera!!.cameraControl.enableTorch(torch == "on")

5
android/src/main/java/com/mrousavy/camera/CameraViewManager.kt
View File

@@ -131,9 +131,10 @@ class CameraViewManager : SimpleViewManager<CameraView>() {
@ReactProp(name = "zoom")
fun setZoom(view: CameraView, zoom: Double) {
if (view.zoom != zoom)
val zoomFloat = zoom.toFloat()
if (view.zoom != zoomFloat)
addChangedPropToTransaction(view, "zoom")
view.zoom = zoom
view.zoom = zoomFloat
}
@ReactProp(name = "enableZoomGesture")