Merge cfb763b95e into d6cd537ffd

lib/screens/metering/components/camera_container/bloc_container_camera.dart

@@ -136,20 +136,20 @@ class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraC
         }
       }
 
-      final cameraController = CameraController(
+      _cameraController = CameraController(
         _camera!,
         ResolutionPreset.low,
         enableAudio: false,
       );
-      await cameraController.initialize();
+      await _cameraController!.initialize();
-      await cameraController.setFlashMode(FlashMode.off);
+      await _cameraController!.setFlashMode(FlashMode.off);
-      await cameraController.lockCaptureOrientation(DeviceOrientation.portraitUp);
+      await _cameraController!.lockCaptureOrientation(DeviceOrientation.portraitUp);
 
       if (_exposureOffsetRange == null) {
         await Future.wait<double>([
-          cameraController.getMinExposureOffset(),
+          _cameraController!.getMinExposureOffset(),
-          cameraController.getMaxExposureOffset(),
+          _cameraController!.getMaxExposureOffset(),
-          cameraController.getExposureOffsetStepSize(),
+          _cameraController!.getExposureOffsetStepSize(),
         ]).then((value) {
           _exposureOffsetRange = RangeValues(
             math.max(_exposureMaxRange.start, value[0]),
@@ -162,8 +162,8 @@ class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraC
 
       if (_zoomRange == null) {
         await Future.wait<double>([
-          cameraController.getMinZoomLevel(),
+          _cameraController!.getMinZoomLevel(),
-          cameraController.getMaxZoomLevel(),
+          _cameraController!.getMaxZoomLevel(),
         ]).then((value) {
           _zoomRange = RangeValues(
             math.max(1.0, value[0]),
@@ -177,12 +177,11 @@ class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraC
 
       /// For app startup initialization this effectively isn't executed.
       await Future.wait<void>([
-        if (_currentZoom != 1.0) cameraController.setZoomLevel(_currentZoom),
+        if (_currentZoom != 1.0) _cameraController!.setZoomLevel(_currentZoom),
-        if (_currentExposureOffset != 0.0) cameraController.setExposureOffset(_currentExposureOffset),
+        if (_currentExposureOffset != 0.0) _cameraController!.setExposureOffset(_currentExposureOffset),
       ]);
 
-      _cameraController = cameraController;
+      emit(CameraInitializedState(_cameraController!));
-      emit(CameraInitializedState(cameraController));
       _emitActiveState(emit);
     } catch (e) {
       emit(const CameraErrorState(CameraErrorType.other));

test/screens/metering/components/shared/readings_container/equipment_profile_picker_test.dart

@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lightmeter/generated/l10n.dart';
 import 'package:lightmeter/providers/equipment_profile_provider.dart';
-import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart';
 import 'package:lightmeter/screens/metering/components/shared/readings_container/components/equipment_profile_picker/widget_picker_equipment_profiles.dart';
 import 'package:m3_lightmeter_iap/m3_lightmeter_iap.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
@@ -35,11 +33,8 @@ void main() {
         ],
         child: EquipmentProfilesProvider(
           storageService: storageService,
-          child: WidgetTestApplicationMock(
+          child: const WidgetTestApplicationMock(
-            child: BlocProvider(
+            child: Row(children: [Expanded(child: EquipmentProfilePicker())]),
-              create: (_) => MeteringCommunicationBloc(),
-              child: const Row(children: [Expanded(child: EquipmentProfilePicker())]),
-            ),
           ),
         ),
       ),