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

Commit 2919660

Browse files
authored
[camera_platform_interface] Migrate to null safety (#3530)
* Migrate camera_platform_interface to null safety * Added camera to the NNBD plugin list * Correct version number * Convert optional parameters to required for CameraInitializationEvent * Convert CameraId in test to non-nullable * Test for null instead of enforcing non-null * Attempt to fix dependency problem building all plugins * Mark google_maps_flutter as NNBD * Depend on correct Dart SDK version * Attempt to fix dependency problem building all plugins * Attempt to fix dependency problem building all plugins * Attempt to fix dependency problem building all plugins * Attempt to fix dependency problem building all plugins * Add camera_platform_interface to exclude list * Exclude camera from nnbd and non-nnbd * Remove mockito dependency * Make sure enableAudio is default false * Include left-hand type definition * Removed unused import statement
1 parent ca25038 commit 2919660

File tree

5 files changed

+6
-19
lines changed

5 files changed

+6
-19
lines changed

packages/camera/camera_platform_interface/lib/src/method_channel/method_channel_camera.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class MethodChannelCamera extends CameraPlatform {
5959
@override
6060
Future<List<CameraDescription>> availableCameras() async {
6161
try {
62-
final cameras = await _channel
62+
final List<Map<dynamic, dynamic>>? cameras = await _channel
6363
.invokeListMethod<Map<dynamic, dynamic>>('availableCameras');
6464

6565
if (cameras == null) {
@@ -82,7 +82,7 @@ class MethodChannelCamera extends CameraPlatform {
8282
Future<int> createCamera(
8383
CameraDescription cameraDescription,
8484
ResolutionPreset? resolutionPreset, {
85-
bool enableAudio = true,
85+
bool enableAudio = false,
8686
}) async {
8787
try {
8888
final reply = await _channel

packages/camera/camera_platform_interface/lib/src/platform_interface/camera_platform.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ abstract class CameraPlatform extends PlatformInterface {
4444
}
4545

4646
/// Completes with a list of available cameras.
47+
///
48+
/// This method returns an empty list when no cameras are available.
4749
Future<List<CameraDescription>> availableCameras() {
4850
throw UnimplementedError('availableCameras() is not implemented.');
4951
}
@@ -52,7 +54,7 @@ abstract class CameraPlatform extends PlatformInterface {
5254
Future<int> createCamera(
5355
CameraDescription cameraDescription,
5456
ResolutionPreset? resolutionPreset, {
55-
bool enableAudio = true,
57+
bool enableAudio = false,
5658
}) {
5759
throw UnimplementedError('createCamera() is not implemented.');
5860
}

packages/camera/camera_platform_interface/pubspec.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ dev_dependencies:
1717
flutter_test:
1818
sdk: flutter
1919
async: ^2.5.0-nullsafety.3
20-
mockito: ^5.0.0-nullsafety.5
2120
pedantic: ^1.10.0-nullsafety.3
2221

2322
environment:

packages/camera/camera_platform_interface/test/camera_platform_interface_test.dart

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import 'package:camera_platform_interface/camera_platform_interface.dart';
66
import 'package:camera_platform_interface/src/method_channel/method_channel_camera.dart';
77
import 'package:flutter/services.dart';
88
import 'package:flutter_test/flutter_test.dart';
9-
import 'package:mockito/mockito.dart';
10-
import 'package:plugin_platform_interface/plugin_platform_interface.dart';
119

1210
void main() {
1311
TestWidgetsFlutterBinding.ensureInitialized();
@@ -27,11 +25,6 @@ void main() {
2725
CameraPlatform.instance = ExtendsCameraPlatform();
2826
});
2927

30-
test('Can be mocked with `implements`', () {
31-
final mock = MockCameraPlatform();
32-
CameraPlatform.instance = mock;
33-
});
34-
3528
test(
3629
'Default implementation of availableCameras() should throw unimplemented error',
3730
() {
@@ -423,11 +416,4 @@ class ImplementsCameraPlatform implements CameraPlatform {
423416
dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
424417
}
425418

426-
class MockCameraPlatform extends Mock
427-
with
428-
// ignore: prefer_mixin
429-
MockPlatformInterfaceMixin
430-
implements
431-
CameraPlatform {}
432-
433419
class ExtendsCameraPlatform extends CameraPlatform {}

packages/camera/camera_platform_interface/test/method_channel/method_channel_camera_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void main() {
5151
arguments: {
5252
'cameraName': 'Test',
5353
'resolutionPreset': 'high',
54-
'enableAudio': true
54+
'enableAudio': false
5555
},
5656
),
5757
]);

0 commit comments

Comments
 (0)