Merge branch 'capacitor/v6'

Author: shiv19

README.md

@@ -126,6 +126,8 @@ The demo app can be found in the Example folder of this repo
 * [`destroy()`](#destroy)
 * [`flipCamera()`](#flipcamera)
 * [`toggleFlash()`](#toggleflash)
+* [`enableFlash()`](#enableflash)
+* [`disableFlash()`](#disableflash)
 * [`isFlashAvailable()`](#isflashavailable)
 * [`isFlashEnabled()`](#isflashenabled)
 * [`addPreviewFrameConfig(...)`](#addpreviewframeconfig)
@@ -185,6 +187,24 @@ toggleFlash() => Promise<void>
 --------------------
 
 
+### enableFlash()
+
+```typescript
+enableFlash() => Promise<void>
+```
+
+--------------------
+
+
+### disableFlash()
+
+```typescript
+disableFlash() => Promise<void>
+```
+
+--------------------
+
+
 ### isFlashAvailable()
 
 ```typescript

android/src/main/java/com/capacitorcommunity/videorecorder/VideoRecorderPlugin.java

@@ -44,6 +44,7 @@ public class VideoRecorderPlugin extends Plugin {
     private Timer audioFeedbackTimer;
     private boolean timerStarted;
     private Integer videoBitrate = 3000000;
+    private boolean _isFlashEnabled = false;
 
     PluginCall getCall() {
         return call;
@@ -124,6 +125,9 @@ public void initialize(final PluginCall call) {
 
         this.videoBitrate = call.getInt("videoBitrate", 3000000);
 
+        // flash is turned off by default when initializing camera
+        this._isFlashEnabled = false;
+
         fancyCamera = new FancyCamera(this.getContext());
         fancyCamera.setMaxVideoBitrate(this.videoBitrate);
         fancyCamera.setDisableHEVC(true);
@@ -274,13 +278,25 @@ public void togglePip(PluginCall call) {
     @PluginMethod()
     public void startRecording(PluginCall call) {
         fancyCamera.setAutoFocus(true);
+
+        // turn on flash if flash is enabled and camera is back camera
+        if (this._isFlashEnabled && fancyCamera.getCameraPosition() == 0) {
+            fancyCamera.enableFlash();
+        }
+
         fancyCamera.startRecording();
         call.resolve();
     }
 
     @PluginMethod()
     public void stopRecording(PluginCall call) {
         this.call = call;
+
+        // turn off flash if flash is enabled and camera is back camera
+        if (this._isFlashEnabled && fancyCamera.getCameraPosition() == 0) {
+            fancyCamera.disableFlash();
+        }
+
         fancyCamera.stopRecording();
     }
 
@@ -290,24 +306,36 @@ public void flipCamera(PluginCall call) {
         call.resolve();
     }
 
+    @PluginMethod()
+    public void enableFlash(PluginCall call) {
+        this._isFlashEnabled = true;
+        call.success();
+    }
+
+    @PluginMethod()
+    public void disableFlash(PluginCall call) {
+        this._isFlashEnabled = false;
+        call.success();
+    }
+
     @PluginMethod()
     public void toggleFlash(PluginCall call) {
-        fancyCamera.toggleFlash();
+        this._isFlashEnabled = !this._isFlashEnabled;
         call.resolve();
     }
 
     @PluginMethod()
     public void isFlashEnabled(PluginCall call) {
         JSObject object = new JSObject();
-        object.put("isEnabled", fancyCamera.flashEnabled());
+        object.put("isEnabled", this._isFlashEnabled);
         call.resolve(object);
     }
 
     @PluginMethod()
     public void isFlashAvailable(PluginCall call) {
         JSObject object = new JSObject();
         object.put("isAvailable", fancyCamera.hasFlash());
-        call.success(object);
+        call.resolve(object);
     }
 
     @PluginMethod()

ios/Plugin/Plugin.m

@@ -8,6 +8,8 @@
 	CAP_PLUGIN_METHOD(destroy, CAPPluginReturnPromise);
 	CAP_PLUGIN_METHOD(flipCamera, CAPPluginReturnPromise);
 	CAP_PLUGIN_METHOD(toggleFlash, CAPPluginReturnPromise);
+	CAP_PLUGIN_METHOD(enableFlash, CAPPluginReturnPromise);
+	CAP_PLUGIN_METHOD(disableFlash, CAPPluginReturnPromise);
 	CAP_PLUGIN_METHOD(isFlashAvailable, CAPPluginReturnPromise);
 	CAP_PLUGIN_METHOD(isFlashEnabled, CAPPluginReturnPromise);
 	CAP_PLUGIN_METHOD(addPreviewFrameConfig, CAPPluginReturnPromise);

ios/Plugin/Plugin.swift

@@ -218,7 +218,7 @@ public class VideoRecorder: CAPPlugin, AVCaptureFileOutputRecordingDelegate {
         // log to console for initializing
         print("Initializing camera")
 
-        // flash is turned off by default when initializing camera to match android behavior
+        // flash is turned off by default when initializing camera
         self._isFlashEnabled = false;
 
         if (self.captureSession?.isRunning != true) {
@@ -685,19 +685,21 @@ public class VideoRecorder: CAPPlugin, AVCaptureFileOutputRecordingDelegate {
     }
 
     @objc func isFlashEnabled(_ call: CAPPluginCall) {
-        if (self.currentCamera == 0) {
-            call.resolve(["isEnabled": false])
-        } else {
-            call.resolve(["isEnabled": self._isFlashEnabled])
-        }
+        call.resolve(["isEnabled": self._isFlashEnabled])
+    }
+
+    @objc func enableFlash(_ call: CAPPluginCall) {
+        self._isFlashEnabled = true
+        call.resolve()
+    }
+
+    @objc func disableFlash(_ call: CAPPluginCall) {
+        self._isFlashEnabled = false
+        call.resolve()
     }
 
     @objc func toggleFlash(_ call: CAPPluginCall) {
-        if (self.currentCamera == 0) {
-            call.reject("Flash not available on front camera")
-        } else {
-            self._isFlashEnabled = !self._isFlashEnabled
-            call.resolve()
-        }
+        self._isFlashEnabled = !self._isFlashEnabled
+        call.resolve()
     }
 }

src/definitions.ts

@@ -5,6 +5,8 @@ export interface VideoRecorderPlugin {
   destroy(): Promise<void>;
   flipCamera(): Promise<void>;
   toggleFlash(): Promise<void>;
+  enableFlash(): Promise<void>;
+  disableFlash(): Promise<void>;
   isFlashAvailable(): Promise<{ isAvailable: boolean }>;
   isFlashEnabled(): Promise<{ isEnabled: boolean }>;
   addPreviewFrameConfig(config: VideoRecorderPreviewFrame): Promise<void>;

src/web.ts

@@ -192,6 +192,16 @@ export class VideoRecorderWeb extends WebPlugin implements VideoRecorderPlugin {
 		return Promise.resolve();
 	}
 
+	enableFlash(): Promise<void> {
+		console.warn('VideoRecorder: No web mock available for enableFlash');
+		return Promise.resolve();
+	}
+
+	disableFlash(): Promise<void> {
+		console.warn('VideoRecorder: No web mock available for disableFlash');
+		return Promise.resolve();
+	}
+
 	isFlashEnabled(): Promise<{ isEnabled: boolean; }> {
 		console.warn('VideoRecorder: No web mock available for isFlashEnabled');
 		return Promise.resolve({ isEnabled: false });