[camera] Add implementations for the torch flash mode. (flutter#3338)

* Added torch mode functionality for Android and iOS.

* Format objective c code

Author: BeMacized

packages/camera/camera/CHANGELOG.md

@@ -1,4 +1,6 @@
 
+## 0.6.2+1
+
 
 
 

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java

@@ -537,9 +537,9 @@ public void setFlashMode(@NonNull final Result result, FlashMode mode)
       throws CameraAccessException {
     // Get the flash availability
     Boolean flashAvailable =
-        cameraManager
-            .getCameraCharacteristics(cameraDevice.getId())
-            .get(CameraCharacteristics.FLASH_INFO_AVAILABLE);
+          cameraManager
+              .getCameraCharacteristics(cameraDevice.getId())
+              .get(CameraCharacteristics.FLASH_INFO_AVAILABLE);
 
     // Check if flash is available.
     if (flashAvailable == null || !flashAvailable) {
@@ -771,7 +771,7 @@ private void initPreviewCaptureBuilder() {
     if (aeMeteringRectangle != null) {
       captureRequestBuilder.set(
           CaptureRequest.CONTROL_AE_REGIONS, new MeteringRectangle[] {aeMeteringRectangle});
-    }
+  }
     switch (exposureMode) {
       case locked:
         captureRequestBuilder.set(CaptureRequest.CONTROL_AE_LOCK, true);

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/types/FlashMode.java

@@ -2,6 +2,7 @@
 
 // Mirrors flash_mode.dart
 public enum FlashMode {
+ 
   off("off"),
   auto("auto"),
   always("always"),
@@ -17,8 +18,8 @@ public static FlashMode getValueForString(String modeStr) {
     for (FlashMode value : values()) {
       if (value.strValue.equals(modeStr)) return value;
     }
-    return null;
-  }
+      return null;
+    }
 
   @Override
   public String toString() {

packages/camera/camera/example/lib/main.dart

@@ -245,6 +245,15 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
               ? () => onFlashModeButtonPressed(FlashMode.always)
               : null,
         ),
+        IconButton(
+          icon: const Icon(Icons.highlight),
+          color: controller?.value?.flashMode == FlashMode.torch
+              ? Colors.orange
+              : Colors.blue,
+          onPressed: controller != null
+              ? () => onFlashModeButtonPressed(FlashMode.torch)
+              : null,
+        ),
       ],
     );
   }

packages/camera/camera/ios/Classes/CameraPlugin.m

@@ -163,17 +163,17 @@ static FlashMode getFlashModeForString(NSString *mode) {
 }
 
 static AVCaptureFlashMode getAVCaptureFlashModeForFlashMode(FlashMode mode) {
-    switch (mode) {
-        case FlashModeOff:
-            return AVCaptureFlashModeOff;
-        case FlashModeAuto:
-            return AVCaptureFlashModeAuto;
-        case FlashModeAlways:
-            return AVCaptureFlashModeOn;
-        case FlashModeTorch:
-        default:
-            return -1;
-    }
+  switch (mode) {
+    case FlashModeOff:
+      return AVCaptureFlashModeOff;
+    case FlashModeAuto:
+      return AVCaptureFlashModeAuto;
+    case FlashModeAlways:
+      return AVCaptureFlashModeOn;
+    case FlashModeTorch:
+    default:
+      return -1;
+  }
 }
 
 // Mirrors ExposureMode in camera.dart
@@ -372,6 +372,7 @@ - (void)captureToFile:(FlutterResult)result API_AVAILABLE(ios(10)) {
     [settings setHighResolutionPhotoEnabled:YES];
   }
 
+
     AVCaptureFlashMode avFlashMode = getAVCaptureFlashModeForFlashMode(_flashMode);
     if (avFlashMode != -1) {
       [settings setFlashMode:avFlashMode];
@@ -773,6 +774,7 @@ - (void)setFlashModeWithResult:(FlutterResult)result mode:(NSString *)modeStr {
     result(getFlutterError(e));
     return;
   }
+  
     if (mode == FlashModeTorch) {
         if (!_captureDevice.hasTorch) {
             result([FlutterError errorWithCode:@"setFlashModeFailed"
@@ -793,26 +795,26 @@ - (void)setFlashModeWithResult:(FlutterResult)result mode:(NSString *)modeStr {
         }
     }
     else {
-        if (!_captureDevice.hasFlash) {
-          result([FlutterError errorWithCode:@"setFlashModeFailed"
-                                     message:@"Device does not have flash capabilities"
-                                     details:nil]);
-          return;
-        }
-        AVCaptureFlashMode avFlashMode = getAVCaptureFlashModeForFlashMode(mode);
-        if (![_capturePhotoOutput.supportedFlashModes
-                containsObject:[NSNumber numberWithInt:((int)avFlashMode)]]) {
-          result([FlutterError errorWithCode:@"setFlashModeFailed"
-                                     message:@"Device does not support this specific flash mode"
-                                     details:nil]);
-          return;
-        }
-        if (_captureDevice.torchMode != AVCaptureTorchModeOff) {
-            [_captureDevice lockForConfiguration:nil];
-            [_captureDevice setTorchMode:AVCaptureTorchModeOff];
-            [_captureDevice unlockForConfiguration];
-        }
+  if (!_captureDevice.hasFlash) {
+    result([FlutterError errorWithCode:@"setFlashModeFailed"
+                               message:@"Device does not have flash capabilities"
+                               details:nil]);
+    return;
+  }
+    AVCaptureFlashMode avFlashMode = getAVCaptureFlashModeForFlashMode(mode);
+  if (![_capturePhotoOutput.supportedFlashModes
+            containsObject:[NSNumber numberWithInt:((int)avFlashMode)]]) {
+    result([FlutterError errorWithCode:@"setFlashModeFailed"
+                               message:@"Device does not support this specific flash mode"
+                               details:nil]);
+    return;
+  }
+    if (_captureDevice.torchMode != AVCaptureTorchModeOff) {
+      [_captureDevice lockForConfiguration:nil];
+      [_captureDevice setTorchMode:AVCaptureTorchModeOff];
+      [_captureDevice unlockForConfiguration];
     }
+  }
   _flashMode = mode;
   result(nil);
 }
@@ -1003,11 +1005,11 @@ - (BOOL)setupWriterForPath:(NSString *)path {
     [_audioOutput setSampleBufferDelegate:self queue:_dispatchQueue];
   }
 
-    if (_flashMode == FlashModeTorch) {
-        [self.captureDevice lockForConfiguration:nil];
-        [self.captureDevice setTorchMode:AVCaptureTorchModeOn];
-        [self.captureDevice unlockForConfiguration];
-    }
+  if (_flashMode == FlashModeTorch) {
+    [self.captureDevice lockForConfiguration:nil];
+    [self.captureDevice setTorchMode:AVCaptureTorchModeOn];
+    [self.captureDevice unlockForConfiguration];
+  }
 
   [_videoWriter addInput:_videoWriterInput];
   [_captureVideoOutput setSampleBufferDelegate:self queue:_dispatchQueue];

packages/camera/camera/pubspec.yaml

@@ -5,6 +5,7 @@ description: A Flutter plugin for getting information about and controlling the
 
 
 
+
 version: 0.6.3
 homepage: https://github.com/flutter/plugins/tree/master/packages/camera/camera
 dependencies: