Rename the plugin to remain compatible with other libraries which use the official Camera plugin.

CHANGELOG.md

@@ -86,7 +86,7 @@ Add flash, auto exposure, zoom and auto focus support for IOS and Android
 ## 0.5.1
 
 * Can now be compiled with earlier Android sdks below 21 when
-`<uses-sdk tools:overrideLibrary="io.flutter.plugins.camera"/>` has been added to the project
+`<uses-sdk tools:overrideLibrary="com.tudutu.plugins.flutterBetterCamera"/>` has been added to the project
 `AndroidManifest.xml`. For sdks below 21, the plugin won't be registered and calls to it will throw
 a `MissingPluginException.`
 

android/build.gradle

@@ -1,4 +1,4 @@
-group 'io.flutter.plugins.camera'
+group 'com.tudutu.plugins.flutterbettercamera'
 version '1.0-SNAPSHOT'
 
 buildscript {

android/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="io.flutter.plugins.camera">
+  package="com.tudutu.plugins.flutterbettercamera">
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
 </manifest>

android/src/main/java/io/flutter/plugins/camera/Camera.java → android/src/main/java/com/tudutu/plugins/flutterBetterCamera/Camera.java

@@ -1,7 +1,7 @@
-package io.flutter.plugins.camera;
+package com.tudutu.plugins.flutterbettercamera;
 
 import static android.view.OrientationEventListener.ORIENTATION_UNKNOWN;
-import static io.flutter.plugins.camera.CameraUtils.computeBestPreviewSize;
+import static com.tudutu.plugins.flutterbettercamera.CameraUtils.computeBestPreviewSize;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -564,6 +564,8 @@ public void captureStillPicture(String filePath, @NonNull final Result result) {
 
       captureBuilder.set(CaptureRequest.JPEG_ORIENTATION, getMediaOrientation());
 
+      // Set zoom level
+      captureBuilder.set(CaptureRequest.SCALER_CROP_REGION, mPreviewRequestBuilder.get(CaptureRequest.SCALER_CROP_REGION));
 
       mCaptureSession.capture(
           captureBuilder.build(),

android/src/main/java/io/flutter/plugins/camera/CameraPermissions.java → android/src/main/java/com/tudutu/plugins/flutterBetterCamera/CameraPermissions.java

@@ -1,4 +1,4 @@
-package io.flutter.plugins.camera;
+package com.tudutu.plugins.flutterbettercamera;
 
 import android.Manifest;
 import android.Manifest.permission;

android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java → android/src/main/java/com/tudutu/plugins/flutterBetterCamera/CameraPlugin.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package io.flutter.plugins.camera;
+package com.tudutu.plugins.flutterbettercamera;
 
 import android.app.Activity;
 import android.os.Build;
@@ -13,14 +13,14 @@
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
-import io.flutter.plugins.camera.CameraPermissions.PermissionsRegistry;
+import com.tudutu.plugins.flutterbettercamera.CameraPermissions.PermissionsRegistry;
 import io.flutter.view.TextureRegistry;
 
 /**
  * Platform implementation of the camera_plugin.
  *
  * <p>Instantiate this in an add to app scenario to gracefully handle activity and context changes.
- * See {@code io.flutter.plugins.camera.MainActivity} for an example.
+ * See {@code com.tudutu.plugins.flutterbettercamera.MainActivity} for an example.
  *
  * <p>Call {@link #registerWith(Registrar)} to register an implementation of this that uses the
  * stable {@code io.flutter.plugin.common} package.
@@ -34,7 +34,7 @@ public final class CameraPlugin implements FlutterPlugin, ActivityAware {
   /**
    * Initialize this within the {@code #configureFlutterEngine} of a Flutter activity or fragment.
    *
-   * <p>See {@code io.flutter.plugins.camera.MainActivity} for an example.
+   * <p>See {@code com.tudutu.plugins.flutterbettercamera.MainActivity} for an example.
    */
   public CameraPlugin() {}
 

android/src/main/java/io/flutter/plugins/camera/CameraUtils.java → android/src/main/java/com/tudutu/plugins/flutterBetterCamera/CameraUtils.java

@@ -1,4 +1,4 @@
-package io.flutter.plugins.camera;
+package com.tudutu.plugins.flutterbettercamera;
 
 import android.app.Activity;
 import android.content.Context;
@@ -10,7 +10,7 @@
 import android.hardware.camera2.params.StreamConfigurationMap;
 import android.media.CamcorderProfile;
 import android.util.Size;
-import io.flutter.plugins.camera.Camera.ResolutionPreset;
+import com.tudutu.plugins.flutterbettercamera.Camera.ResolutionPreset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;

android/src/main/java/io/flutter/plugins/camera/Constants.java → android/src/main/java/com/tudutu/plugins/flutterBetterCamera/Constants.java

@@ -1,4 +1,4 @@
-package io.flutter.plugins.camera;
+package com.tudutu.plugins.flutterbettercamera;
 
 public interface Constants {
 

android/src/main/java/io/flutter/plugins/camera/DartMessenger.java → android/src/main/java/com/tudutu/plugins/flutterBetterCamera/DartMessenger.java

@@ -1,4 +1,4 @@
-package io.flutter.plugins.camera;
+package com.tudutu.plugins.flutterbettercamera;
 
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
@@ -16,7 +16,7 @@ enum EventType {
   }
 
   DartMessenger(BinaryMessenger messenger, long eventChannelId) {
-    new EventChannel(messenger, "flutter.io/cameraPlugin/cameraEvents" + eventChannelId)
+    new EventChannel(messenger, "tudutu.com/flutterBetterCameraPlugin/cameraEvents" + eventChannelId)
         .setStreamHandler(
             new EventChannel.StreamHandler() {
               @Override

android/src/main/java/io/flutter/plugins/camera/MethodCallHandlerImpl.java → android/src/main/java/com/tudutu/plugins/flutterBetterCamera/MethodCallHandlerImpl.java

@@ -1,4 +1,4 @@
-package io.flutter.plugins.camera;
+package com.tudutu.plugins.flutterbettercamera;
 
 import android.app.Activity;
 import android.content.pm.PackageManager;
@@ -12,7 +12,7 @@
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugins.camera.CameraPermissions.PermissionsRegistry;
+import com.tudutu.plugins.flutterbettercamera.CameraPermissions.PermissionsRegistry;
 import io.flutter.view.TextureRegistry;
 
 final class MethodCallHandlerImpl implements MethodChannel.MethodCallHandler {
@@ -37,8 +37,8 @@ final class MethodCallHandlerImpl implements MethodChannel.MethodCallHandler {
     this.permissionsRegistry = permissionsAdder;
     this.textureRegistry = textureRegistry;
 
-    methodChannel = new MethodChannel(messenger, "plugins.flutter.io/camera");
-    imageStreamChannel = new EventChannel(messenger, "plugins.flutter.io/camera/imageStream");
+    methodChannel = new MethodChannel(messenger, "plugins.tudutu.com/flutterBetterCamera");
+    imageStreamChannel = new EventChannel(messenger, "plugins.tudutu.com/flutterBetterCamera/imageStream");
     methodChannel.setMethodCallHandler(this);
   }
 

android/src/test/java/io/flutter/plugins/camera/DartMessengerTest.java

@@ -1,4 +1,4 @@
-package io.flutter.plugins.camera;
+package com.tudutu.plugins.flutterbettercamera;
 
 import static junit.framework.TestCase.assertNull;
 import static org.junit.Assert.assertEquals;

example/android/app/build.gradle

@@ -32,7 +32,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "io.flutter.plugins.cameraexample"
+        applicationId "com.tudutu.plugins.flutterBetterCameraexample"
         minSdkVersion 21
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()

example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/EmbeddingV1ActivityTest.java

@@ -1,4 +1,4 @@
-package io.flutter.plugins.cameraexample;
+package com.tudutu.plugins.flutterBetterCameraexample;
 
 import androidx.test.rule.ActivityTestRule;
 import dev.flutter.plugins.e2e.FlutterRunner;

example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/MainActivityTest.java

@@ -1,4 +1,4 @@
-package io.flutter.plugins.cameraexample;
+package com.tudutu.plugins.flutterBetterCameraexample;
 
 import androidx.test.rule.ActivityTestRule;
 import dev.flutter.plugins.e2e.FlutterRunner;

example/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="io.flutter.plugins.cameraexample">
+  package="com.tudutu.plugins.flutterBetterCameraexample">
 
   <application
     android:icon="@mipmap/ic_launcher"

example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java

@@ -1,4 +1,4 @@
-package io.flutter.plugins.cameraexample;
+package com.tudutu.plugins.flutterBetterCameraexample;
 
 import android.os.Bundle;
 import io.flutter.app.FlutterActivity;

example/android/app/src/main/java/io/flutter/plugins/cameraexample/MainActivity.java

@@ -1,10 +1,10 @@
-package io.flutter.plugins.cameraexample;
+package com.tudutu.plugins.flutterBetterCameraexample;
 
 import androidx.annotation.NonNull;
 import io.flutter.embedding.android.FlutterActivity;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.plugins.shim.ShimPluginRegistry;
-import io.flutter.plugins.camera.CameraPlugin;
+import com.tudutu.plugins.flutterbettercamera.CameraPlugin;
 import io.flutter.plugins.pathprovider.PathProviderPlugin;
 import io.flutter.plugins.videoplayer.VideoPlayerPlugin;
 

example/ios/Runner.xcodeproj/project.pbxproj

@@ -439,7 +439,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.cameraExampleTest;
+				PRODUCT_BUNDLE_IDENTIFIER = com.tudutu.plugins.flutterBetterCameraExampleTest;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -461,7 +461,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.cameraExampleTest;
+				PRODUCT_BUNDLE_IDENTIFIER = com.tudutu.plugins.flutterBetterCameraExampleTest;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;

example/test_driver/camera_e2e_test.dart

@@ -3,7 +3,7 @@ import 'dart:io';
 
 import 'package:flutter_driver/flutter_driver.dart';
 
-const String _examplePackage = 'io.flutter.plugins.cameraexample';
+const String _examplePackage = 'com.tudutu.plugins.flutterBetterCameraexample';
 
 Future<void> main() async {
   if (!(Platform.isLinux || Platform.isMacOS)) {

ios/Classes/CameraPlugin.h → ios/Classes/FlutterBetterCameraPlugin.h

@@ -4,5 +4,5 @@
 
 #import <Flutter/Flutter.h>
 
-@interface CameraPlugin : NSObject <FlutterPlugin>
+@interface FlutterBetterCameraPlugin : NSObject <FlutterPlugin>
 @end

ios/Classes/CameraPlugin.m → ios/Classes/FlutterBetterCameraPlugin.m

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "CameraPlugin.h"
+#import "FlutterBetterCameraPlugin.h"
 #import <AVFoundation/AVFoundation.h>
 #import <Accelerate/Accelerate.h>
 #import <CoreMotion/CoreMotion.h>
@@ -675,7 +675,7 @@ - (void)resumeVideoRecording {
 - (void)startImageStreamWithMessenger:(NSObject<FlutterBinaryMessenger> *)messenger {
   if (!_isStreamingImages) {
     FlutterEventChannel *eventChannel =
-        [FlutterEventChannel eventChannelWithName:@"plugins.flutter.io/camera/imageStream"
+        [FlutterEventChannel eventChannelWithName:@"plugins.tudutu.com/flutterBetterCamera/imageStream"
                                   binaryMessenger:messenger];
 
     _imageStreamHandler = [[FLTImageStreamHandler alloc] init];
@@ -863,20 +863,20 @@ - (void)setUpCaptureSessionForAudio {
 }
 @end
 
-@interface CameraPlugin ()
+@interface FlutterBetterCameraPlugin ()
 @property(readonly, nonatomic) NSObject<FlutterTextureRegistry> *registry;
 @property(readonly, nonatomic) NSObject<FlutterBinaryMessenger> *messenger;
 @property(readonly, nonatomic) FLTCam *camera;
 @end
 
-@implementation CameraPlugin {
+@implementation FlutterBetterCameraPlugin {
   dispatch_queue_t _dispatchQueue;
 }
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   FlutterMethodChannel *channel =
-      [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/camera"
+      [FlutterMethodChannel methodChannelWithName:@"plugins.tudutu.com/flutterBetterCamera"
                                   binaryMessenger:[registrar messenger]];
-  CameraPlugin *instance = [[CameraPlugin alloc] initWithRegistry:[registrar textures]
+  FlutterBetterCameraPlugin *instance = [[FlutterBetterCameraPlugin alloc] initWithRegistry:[registrar textures]
                                                         messenger:[registrar messenger]];
   [registrar addMethodCallDelegate:instance channel:channel];
 }
@@ -892,7 +892,7 @@ - (instancetype)initWithRegistry:(NSObject<FlutterTextureRegistry> *)registry
 
 - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
   if (_dispatchQueue == nil) {
-    _dispatchQueue = dispatch_queue_create("io.flutter.camera.dispatchqueue", NULL);
+    _dispatchQueue = dispatch_queue_create("com.tudutu.flutterBetterCamera.dispatchqueue", NULL);
   }
 
   // Invoke the plugin on another dispatch queue to avoid blocking the UI.
@@ -960,7 +960,7 @@ - (void)handleMethodCallAsync:(FlutterMethodCall *)call result:(FlutterResult)re
       };
       FlutterEventChannel *eventChannel = [FlutterEventChannel
           eventChannelWithName:[NSString
-                                   stringWithFormat:@"flutter.io/cameraPlugin/cameraEvents%lld",
+                                   stringWithFormat:@"tudutu.com/flutterBetterCameraPlugin/cameraEvents%lld",
                                                     textureId]
                binaryMessenger:_messenger];
       [eventChannel setStreamHandler:cam];

ios/Tests/CameraPluginTests.m → ios/Tests/FlutterBetterCameraPluginTests.m

@@ -1,10 +1,10 @@
-@import camera;
+@import flutterBetterCamera;
 @import XCTest;
 
-@interface CameraPluginTests : XCTestCase
+@interface FlutterBetterCameraPluginTests : XCTestCase
 @end
 
-@implementation CameraPluginTests
+@implementation FlutterBetterCameraPluginTests
 
 - (void)testModuleImport {
   // This test will fail to compile if the module cannot be imported.