Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit cdb311e

Browse files
[camera] Switch to internal method channels (#5943)
1 parent 07891d3 commit cdb311e

28 files changed

+3898
-76
lines changed

CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ packages/webview_flutter/** @bparrishMines
2626
packages/**/*_web/** @ditman
2727

2828
# - Android
29-
packages/camera/camera/android/** @camsim99
29+
packages/camera/camera_android/** @camsim99
3030
packages/espresso/** @blasten
3131
packages/flutter_plugin_android_lifecycle/** @blasten
3232
packages/google_maps_flutter/google_maps_flutter/android/** @GaryQian
@@ -40,7 +40,7 @@ packages/url_launcher/url_launcher_android/** @GaryQian
4040
packages/video_player/video_player_android/** @blasten
4141

4242
# - iOS
43-
packages/camera/camera/ios/** @hellohuanlin
43+
packages/camera/camera_avfoundation/** @hellohuanlin
4444
packages/google_maps_flutter/google_maps_flutter/ios/** @cyanglaz
4545
packages/google_sign_in/google_sign_in_ios/** @jmagman
4646
packages/image_picker/image_picker_ios/** @cyanglaz
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.9.8
2+
3+
* Switches to internal method channel implementation.
4+
15
## 0.9.7+1
26

37
* Splits from `camera` as a federated implementation.

packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/DartMessenger.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ enum CameraEventType {
6464
* the main thread. The handler is mainly supplied so it will be easier test this class.
6565
*/
6666
DartMessenger(BinaryMessenger messenger, long cameraId, @NonNull Handler handler) {
67-
cameraChannel = new MethodChannel(messenger, "flutter.io/cameraPlugin/camera" + cameraId);
68-
deviceChannel = new MethodChannel(messenger, "flutter.io/cameraPlugin/device");
67+
cameraChannel =
68+
new MethodChannel(messenger, "plugins.flutter.io/camera_android/camera" + cameraId);
69+
deviceChannel = new MethodChannel(messenger, "plugins.flutter.io/camera_android/fromPlatform");
6970
this.handler = handler;
7071
}
7172

packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/MethodCallHandlerImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ final class MethodCallHandlerImpl implements MethodChannel.MethodCallHandler {
4949
this.permissionsRegistry = permissionsAdder;
5050
this.textureRegistry = textureRegistry;
5151

52-
methodChannel = new MethodChannel(messenger, "plugins.flutter.io/camera");
53-
imageStreamChannel = new EventChannel(messenger, "plugins.flutter.io/camera/imageStream");
52+
methodChannel = new MethodChannel(messenger, "plugins.flutter.io/camera_android");
53+
imageStreamChannel =
54+
new EventChannel(messenger, "plugins.flutter.io/camera_android/imageStream");
5455
methodChannel.setMethodCallHandler(this);
5556
}
5657

packages/camera/camera_android/example/integration_test/camera_test.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import 'dart:io';
66
import 'dart:ui';
77

8+
import 'package:camera_android/camera_android.dart';
89
import 'package:camera_example/camera_controller.dart';
910
import 'package:camera_platform_interface/camera_platform_interface.dart';
1011
import 'package:flutter/painting.dart';
@@ -19,6 +20,7 @@ void main() {
1920
IntegrationTestWidgetsFlutterBinding.ensureInitialized();
2021

2122
setUpAll(() async {
23+
CameraPlatform.instance = AndroidCamera();
2224
final Directory extDir = await getTemporaryDirectory();
2325
testDir = await Directory('${extDir.path}/test').create(recursive: true);
2426
});
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// Copyright 2013 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
export 'src/android_camera.dart';

0 commit comments

Comments
 (0)