Skip to content

Commit 41b2687

Browse files
author
farfromrefug
committed
chore: frontMirrored reversed behavior
1 parent 4065b59 commit 41b2687

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

packages/ui-cameraview/platforms/android/java/com/nativescript/cameraview/CameraView.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,10 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
153153
}
154154
}
155155

156-
var frontMirrored: Boolean = false
156+
var frontMirrored: Boolean = true
157157
set(value) {
158158
field = value
159-
if (value && position == CameraSelector.LENS_FACING_FRONT) {
159+
if (!value && position == CameraSelector.LENS_FACING_FRONT) {
160160
previewView.setImplementationMode(PreviewView.ImplementationMode.COMPATIBLE)
161161
previewView.scaleX = -1f // Mirror horizontally
162162
} else {
@@ -1708,7 +1708,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
17081708
}
17091709
safeUnbindAll()
17101710
refreshCamera()
1711-
if (frontMirrored && position == CameraSelector.LENS_FACING_FRONT) {
1711+
if (!frontMirrored && position == CameraSelector.LENS_FACING_FRONT) {
17121712
previewView.setImplementationMode(PreviewView.ImplementationMode.COMPATIBLE)
17131713
previewView.scaleX = -1f // Mirror horizontally
17141714
} else {

packages/ui-cameraview/platforms/ios/src/NSCameraView.swift

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,13 @@ public class NSCameraView: UIView, NextLevelVideoDelegate, NextLevelPhotoDelegat
207207
}
208208
public func toggleCamera() {
209209
self.nextLevel?.flipCaptureDevicePosition()
210-
if self._frontMirrored && let previewLayer = nextLevel.previewLayer {
211-
previewLayer.connection?.automaticallyAdjustsVideoMirroring = false
212-
previewLayer.connection?.isVideoMirrored = false // or true if you want mirrored
213-
} else {
214-
previewLayer.connection?.automaticallyAdjustsVideoMirroring = true
210+
if let previewLayer = nextLevel.previewLayer {
211+
if self._frontMirrored {
212+
previewLayer.connection?.automaticallyAdjustsVideoMirroring = true
213+
} else {
214+
previewLayer.connection?.automaticallyAdjustsVideoMirroring = false
215+
previewLayer.connection?.isVideoMirrored = false // or true if you want mirrored
216+
}
215217
}
216218
}
217219
public func focusAtAdjustedPointOfInterest(_ adjustedPoint: CGPoint){
@@ -271,18 +273,20 @@ public class NSCameraView: UIView, NextLevelVideoDelegate, NextLevelPhotoDelegat
271273
}
272274
}
273275

274-
private var _frontMirrored: Bool
276+
private var _frontMirrored: Bool = true
275277
public var frontMirrored: Bool {
276278
get {
277279
return self.frontMirrored
278280
}
279281
set {
280282
self._frontMirrored = newValue
281-
if newValue && let previewLayer = nextLevel.previewLayer {
282-
previewLayer.connection?.automaticallyAdjustsVideoMirroring = false
283-
previewLayer.connection?.isVideoMirrored = false // or true if you want mirrored
284-
} else {
285-
previewLayer.connection?.automaticallyAdjustsVideoMirroring = true
283+
if let previewLayer = nextLevel.previewLayer {
284+
if self._frontMirrored {
285+
previewLayer.connection?.automaticallyAdjustsVideoMirroring = true
286+
} else {
287+
previewLayer.connection?.automaticallyAdjustsVideoMirroring = false
288+
previewLayer.connection?.isVideoMirrored = false // or true if you want mirrored
289+
}
286290
}
287291
}
288292
}

src/ui-cameraview/index.common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export const autoFocusProperty = new Property<CameraViewBase, boolean | number>(
5959
});
6060
export const frontMirroredProperty = new Property<CameraViewBase, boolean>({
6161
name: 'frontMirrored',
62-
defaultValue: false,
62+
defaultValue: true,
6363
valueConverter: booleanConverter
6464
});
6565
export const saveToGalleryProperty = new Property<CameraViewBase, boolean>({

0 commit comments

Comments
 (0)