Split CameraEvents into separate streams

Author: mvanbeusekom

packages/camera/camera_platform_interface/lib/camera_platform_interface.dart

@@ -2,5 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+export 'src/events/camera_event.dart';
 export 'src/platform_interface/camera_platform.dart';
 export 'src/types/types.dart';

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

@@ -4,6 +4,7 @@
 
 import 'dart:async';
 
+import 'package:flutter/widgets.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 import 'package:camera_platform_interface/src/method_channel/method_channel_camera.dart';
 
@@ -41,7 +42,7 @@ abstract class CameraPlatform extends PlatformInterface {
     throw UnimplementedError('availableCameras() is not implemented.');
   }
 
-  /// Initializes the camera on the device and returns its textureId.
+  /// Initializes the camera on the device and returns its cameraId.
   Future<int> initializeCamera(
     CameraDescription cameraDescription, {
     ResolutionPreset resolutionPreset,
@@ -50,13 +51,23 @@ abstract class CameraPlatform extends PlatformInterface {
     throw UnimplementedError('initializeCamera() is not implemented.');
   }
 
-  /// Returns a Stream of [CameraEvent]s.
-  Stream<CameraEvent> cameraEventsFor(int textureId) {
-    throw UnimplementedError('videoEventsFor() has not been implemented.');
+  /// The camera's resolution has changed
+  Stream<ResolutionChangedEvent> onResolutionChanged(int cameraId) {
+    throw UnimplementedError('onResolutionChanged() is not implemented.');
+  }
+
+  /// The camera started to close.
+  Stream<CameraClosingEvent> onCameraClosing(int cameraId) {
+    throw UnimplementedError('onCameraClosing() is not implemented.');
+  }
+
+  /// The camera experienced an error.
+  Stream<CameraErrorEvent> onCameraError(int cameraId) {
+    throw UnimplementedError('onCameraError() is not implemented.');
   }
 
   /// Captures an image and saves it to [path].
-  Future<void> takePicture(int textureId, String path) {
+  Future<void> takePicture(int cameraId, String path) {
     throw UnimplementedError('takePicture() is not implemented.');
   }
 
@@ -73,43 +84,32 @@ abstract class CameraPlatform extends PlatformInterface {
   /// The file is written on the flight as the video is being recorded.
   /// If a file already exists at the provided path an error will be thrown.
   /// The file can be read as soon as [stopVideoRecording] returns.
-  Future<void> startVideoRecording(int textureId, String path) {
+  Future<void> startVideoRecording(int cameraId, String path) {
     throw UnimplementedError('startVideoRecording() is not implemented.');
   }
 
   /// Stop the video recording.
-  Future<void> stopVideoRecording(int textureId) {
+  Future<void> stopVideoRecording(int cameraId) {
     throw UnimplementedError('stopVideoRecording() is not implemented.');
   }
 
   /// Pause video recording.
-  Future<void> pauseVideoRecording(int textureId) {
+  Future<void> pauseVideoRecording(int cameraId) {
     throw UnimplementedError('pauseVideoRecording() is not implemented.');
   }
 
   /// Resume video recording after pausing.
-  Future<void> resumeVideoRecording(int textureId) {
+  Future<void> resumeVideoRecording(int cameraId) {
     throw UnimplementedError('resumeVideoRecording() is not implemented.');
   }
 
-  /// Start streaming images from platform camera.
-  ///
-  /// When running continuously with [CameraPreview] widget, this function runs
-  /// best with [ResolutionPreset.low]. Running on [ResolutionPreset.high] can
-  /// have significant frame rate drops for [CameraPreview] on lower end
-  /// devices.
-  // TODO(bmparr): Add settings for resolution and fps.
-  Future<void> startImageStream(ImageAvailableHandler onAvailable) {
-    throw UnimplementedError('startImageStream() is not implemented.');
-  }
-
-  /// Stop streaming images from platform camera.
-  Future<void> stopImageStream() {
-    throw UnimplementedError('stopImageStream() is not implemented.');
+  /// Returns a widget showing a live camera preview.
+  Widget buildView(int cameraId) {
+    throw UnimplementedError('buildView() has not been implemented.');
   }
 
   /// Releases the resources of this camera.
-  Future<void> dispose(int textureId) {
+  Future<void> dispose(int cameraId) {
     throw UnimplementedError('dispose() is not implemented.');
   }
 }

packages/camera/camera_platform_interface/lib/src/types/callbacks.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-export 'callbacks.dart';
 export 'camera_description.dart';
-export 'camera_event.dart';
 export 'camera_image.dart';
 export 'resolution_preset.dart';

packages/camera/camera_platform_interface/lib/src/types/camera_event.dart

@@ -45,117 +45,118 @@ void main() {
     });
 
     test(
-        'Default implementation of cameraEventsFor() should throw unimplemented error',
+        'Default implementation of onResolutionChanged() should throw unimplemented error',
         () {
       // Arrange
       final cameraPlatform = ExtendsCameraPlatform();
 
       // Act & Assert
       expect(
-        () => cameraPlatform.cameraEventsFor(1),
+        () => cameraPlatform.onResolutionChanged(1),
         throwsUnimplementedError,
       );
     });
 
-    test('Default implementation of dispose() should throw unimplemented error',
+
+    test(
+        'Default implementation of onCameraClosing() should throw unimplemented error',
         () {
       // Arrange
       final cameraPlatform = ExtendsCameraPlatform();
 
       // Act & Assert
       expect(
-        () => cameraPlatform.dispose(1),
+        () => cameraPlatform.onCameraClosing(1),
         throwsUnimplementedError,
       );
     });
 
     test(
-        'Default implementation of initialize() should throw unimplemented error',
+        'Default implementation of onCameraError() should throw unimplemented error',
         () {
       // Arrange
       final cameraPlatform = ExtendsCameraPlatform();
 
       // Act & Assert
       expect(
-        () => cameraPlatform.initializeCamera(null),
+        () => cameraPlatform.onCameraError(1),
         throwsUnimplementedError,
       );
     });
 
-    test(
-        'Default implementation of pauseVideoRecording() should throw unimplemented error',
+    test('Default implementation of dispose() should throw unimplemented error',
         () {
       // Arrange
       final cameraPlatform = ExtendsCameraPlatform();
 
       // Act & Assert
       expect(
-        () => cameraPlatform.pauseVideoRecording(1),
+        () => cameraPlatform.dispose(1),
         throwsUnimplementedError,
       );
     });
 
     test(
-        'Default implementation of prepareForVideoRecording() should throw unimplemented error',
+        'Default implementation of initialize() should throw unimplemented error',
         () {
       // Arrange
       final cameraPlatform = ExtendsCameraPlatform();
 
       // Act & Assert
       expect(
-        () => cameraPlatform.prepareForVideoRecording(),
+        () => cameraPlatform.initializeCamera(null),
         throwsUnimplementedError,
       );
     });
 
     test(
-        'Default implementation of resumeVideoRecording() should throw unimplemented error',
+        'Default implementation of pauseVideoRecording() should throw unimplemented error',
         () {
       // Arrange
       final cameraPlatform = ExtendsCameraPlatform();
 
       // Act & Assert
       expect(
-        () => cameraPlatform.resumeVideoRecording(1),
+        () => cameraPlatform.pauseVideoRecording(1),
         throwsUnimplementedError,
       );
     });
 
     test(
-        'Default implementation of startImageStream() should throw unimplemented error',
+        'Default implementation of prepareForVideoRecording() should throw unimplemented error',
         () {
       // Arrange
       final cameraPlatform = ExtendsCameraPlatform();
 
       // Act & Assert
       expect(
-        () => cameraPlatform.startImageStream(null),
+        () => cameraPlatform.prepareForVideoRecording(),
         throwsUnimplementedError,
       );
     });
 
     test(
-        'Default implementation of startVideoRecording() should throw unimplemented error',
+        'Default implementation of resumeVideoRecording() should throw unimplemented error',
         () {
       // Arrange
       final cameraPlatform = ExtendsCameraPlatform();
 
       // Act & Assert
       expect(
-        () => cameraPlatform.startVideoRecording(1, null),
+        () => cameraPlatform.resumeVideoRecording(1),
         throwsUnimplementedError,
       );
     });
 
     test(
-        'Default implementation of stopImageStream() should throw unimplemented error',
+        'Default implementation of startVideoRecording() should throw unimplemented error',
         () {
       // Arrange
       final cameraPlatform = ExtendsCameraPlatform();
 
       // Act & Assert
       expect(
-        () => cameraPlatform.stopImageStream(),
+        () => cameraPlatform.startVideoRecording(1, null),
         throwsUnimplementedError,
       );
     });