lib/screens/metering/bloc_metering.dart

@@ -15,13 +15,13 @@ import 'package:lightmeter/screens/metering/state_metering.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 
 class MeteringBloc extends Bloc<MeteringEvent, MeteringState> {
-  final MeteringInteractor _meteringInteractor;
   final MeteringCommunicationBloc _communicationBloc;
+  final MeteringInteractor _meteringInteractor;
   late final StreamSubscription<communication_states.ScreenState> _communicationSubscription;
 
   MeteringBloc(
-    this._meteringInteractor,
     this._communicationBloc,
+    this._meteringInteractor,
   ) : super(
           MeteringDataState(
             ev100: null,

lib/screens/metering/communication/event_communication_metering.dart

@@ -22,28 +22,8 @@ abstract class MeasuredEvent extends SourceEvent {
 
 class MeteringInProgressEvent extends MeasuredEvent {
   const MeteringInProgressEvent(super.ev100);
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-    if (other.runtimeType != runtimeType) return false;
-    return other is MeteringInProgressEvent && other.ev100 == ev100;
-  }
-
-  @override
-  int get hashCode => Object.hash(ev100, runtimeType);
 }
 
 class MeteringEndedEvent extends MeasuredEvent {
   const MeteringEndedEvent(super.ev100);
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-    if (other.runtimeType != runtimeType) return false;
-    return other is MeteringEndedEvent && other.ev100 == ev100;
-  }
-
-  @override
-  int get hashCode => Object.hash(ev100, runtimeType);
 }

lib/screens/metering/components/light_sensor_container/bloc_container_light_sensor.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lightmeter/interactors/metering_interactor.dart';
 import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart';
 import 'package:lightmeter/screens/metering/communication/event_communication_metering.dart'
@@ -17,46 +16,35 @@ class LightSensorContainerBloc
   final MeteringInteractor _meteringInteractor;
 
   StreamSubscription<int>? _luxSubscriptions;
+  double _ev100 = 0.0;
 
   LightSensorContainerBloc(
     this._meteringInteractor,
     MeteringCommunicationBloc communicationBloc,
   ) : super(
           communicationBloc,
-          const LightSensorContainerState(null),
-        ) {
-    on<LuxMeteringEvent>(_onLuxMeteringEvent);
-  }
+          const LightSensorInitState(),
+        );
 
   @override
   void onCommunicationState(communication_states.SourceState communicationState) {
     if (communicationState is communication_states.MeasureState) {
       if (_luxSubscriptions == null) {
-        _startMetering();
+        _luxSubscriptions = _meteringInteractor.luxStream().listen((event) {
+          _ev100 = log2(event.toDouble() / 2.5) + _meteringInteractor.lightSensorEvCalibration;
+          communicationBloc.add(communication_event.MeteringInProgressEvent(_ev100));
+        });
       } else {
-        _cancelMetering();
+        communicationBloc.add(communication_event.MeteringEndedEvent(_ev100));
+        _luxSubscriptions?.cancel().then((_) => _luxSubscriptions = null);
       }
     }
   }
 
   @override
   Future<void> close() async {
-    _cancelMetering();
+    communicationBloc.add(communication_event.MeteringEndedEvent(_ev100));
+    _luxSubscriptions?.cancel().then((_) => _luxSubscriptions = null);
     return super.close();
   }
-
-  void _onLuxMeteringEvent(LuxMeteringEvent event, Emitter<LightSensorContainerState> emit) {
-    final ev100 = log2(event.lux.toDouble() / 2.5) + _meteringInteractor.lightSensorEvCalibration;
-    emit(LightSensorContainerState(ev100));
-    communicationBloc.add(communication_event.MeteringInProgressEvent(ev100));
-  }
-
-  void _startMetering() {
-    _luxSubscriptions = _meteringInteractor.luxStream().listen((lux) => add(LuxMeteringEvent(lux)));
-  }
-
-  void _cancelMetering() {
-    communicationBloc.add(communication_event.MeteringEndedEvent(state.ev100));
-    _luxSubscriptions?.cancel().then((_) => _luxSubscriptions = null);
-  }
 }

lib/screens/metering/components/light_sensor_container/event_container_light_sensor.dart

@@ -1,9 +1,3 @@
 abstract class LightSensorContainerEvent {
   const LightSensorContainerEvent();
 }
-
-class LuxMeteringEvent extends LightSensorContainerEvent {
-  final int lux;
-
-  const LuxMeteringEvent(this.lux);
-}

lib/screens/metering/components/light_sensor_container/state_container_light_sensor.dart

@@ -1,5 +1,7 @@
-class LightSensorContainerState {
-  final double? ev100;
-
-  const LightSensorContainerState(this.ev100);
+abstract class LightSensorContainerState {
+  const LightSensorContainerState();
+}
+
+class LightSensorInitState extends LightSensorContainerState {
+  const LightSensorInitState();
 }

lib/screens/metering/components/shared/ev_source_base/bloc_base_ev_source.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart';
 import 'package:lightmeter/screens/metering/communication/state_communication_metering.dart'
@@ -22,6 +21,5 @@ abstract class EvSourceBlocBase<E, S> extends Bloc<E, S> {
     return super.close();
   }
 
-  @visibleForTesting
   void onCommunicationState(communication_states.SourceState communicationState);
 }

lib/screens/metering/flow_metering.dart

@@ -34,8 +34,8 @@ class _MeteringFlowState extends State<MeteringFlow> {
           BlocProvider(create: (_) => MeteringCommunicationBloc()),
           BlocProvider(
             create: (context) => MeteringBloc(
-              context.get<MeteringInteractor>(),
               context.read<MeteringCommunicationBloc>(),
+              context.get<MeteringInteractor>(),
             ),
           ),
         ],

test/screens/metering/bloc_metering_test.dart

@@ -20,14 +20,14 @@ class _MockMeteringCommunicationBloc extends MockBloc<
 class _MockMeteringInteractor extends Mock implements MeteringInteractor {}
 
 void main() {
-  late _MockMeteringInteractor meteringInteractor;
   late _MockMeteringCommunicationBloc communicationBloc;
+  late _MockMeteringInteractor meteringInteractor;
   late MeteringBloc bloc;
   const iso100 = IsoValue(100, StopType.full);
 
   setUpAll(() {
-    meteringInteractor = _MockMeteringInteractor();
     communicationBloc = _MockMeteringCommunicationBloc();
+    meteringInteractor = _MockMeteringInteractor();
 
     when<IsoValue>(() => meteringInteractor.iso).thenReturn(iso100);
     when<NdValue>(() => meteringInteractor.ndFilter).thenReturn(NdValue.values.first);
@@ -40,8 +40,8 @@ void main() {
 
   setUp(() {
     bloc = MeteringBloc(
-      meteringInteractor,
       communicationBloc,
+      meteringInteractor,
     );
   });
 

test/screens/metering/components/light_sensor/bloc_container_light_sensor_test.dart

@@ -1,81 +0,0 @@
-import 'package:bloc_test/bloc_test.dart';
-import 'package:lightmeter/interactors/metering_interactor.dart';
-import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart';
-import 'package:lightmeter/screens/metering/communication/event_communication_metering.dart'
-    as communication_events;
-import 'package:lightmeter/screens/metering/communication/state_communication_metering.dart'
-    as communication_states;
-import 'package:lightmeter/screens/metering/components/light_sensor_container/bloc_container_light_sensor.dart';
-import 'package:lightmeter/screens/metering/components/light_sensor_container/state_container_light_sensor.dart';
-import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
-import 'package:mocktail/mocktail.dart';
-import 'package:test/test.dart';
-
-class _MockMeteringCommunicationBloc extends MockBloc<
-    communication_events.MeteringCommunicationEvent,
-    communication_states.MeteringCommunicationState> implements MeteringCommunicationBloc {}
-
-class _MockMeteringInteractor extends Mock implements MeteringInteractor {}
-
-void main() {
-  late _MockMeteringCommunicationBloc communicationBloc;
-  late _MockMeteringInteractor meteringInteractor;
-  late LightSensorContainerBloc bloc;
-
-  setUpAll(() {
-    communicationBloc = _MockMeteringCommunicationBloc();
-    meteringInteractor = _MockMeteringInteractor();
-  });
-
-  setUp(() {
-    bloc = LightSensorContainerBloc(
-      meteringInteractor,
-      communicationBloc,
-    );
-  });
-
-  tearDown(() {
-    bloc.close();
-  });
-
-  group(
-    '`LuxMeteringEvent` tests',
-    () {
-      const List<int> luxIterable = [1, 2, 2, 2, 3];
-      final List<double> resultList = luxIterable.map((lux) => log2(lux / 2.5)).toList();
-      blocTest<LightSensorContainerBloc, LightSensorContainerState>(
-        'Turn measuring on/off',
-        build: () => bloc,
-        setUp: () {
-          when(() => meteringInteractor.luxStream())
-              .thenAnswer((_) => Stream.fromIterable(luxIterable));
-          when(() => meteringInteractor.lightSensorEvCalibration).thenReturn(0.0);
-        },
-        act: (bloc) async {
-          bloc.onCommunicationState(const communication_states.MeasureState());
-          await Future.delayed(Duration.zero);
-          bloc.onCommunicationState(const communication_states.MeasureState());
-        },
-        verify: (_) {
-          verify(() => meteringInteractor.luxStream().listen((_) {})).called(1);
-          verify(() => meteringInteractor.lightSensorEvCalibration).called(5);
-          verify(() {
-            communicationBloc.add(communication_events.MeteringInProgressEvent(resultList.first));
-          }).called(1);
-          verify(() {
-            communicationBloc.add(communication_events.MeteringInProgressEvent(resultList[1]));
-          }).called(3);
-          verify(() {
-            communicationBloc.add(communication_events.MeteringInProgressEvent(resultList.last));
-          }).called(1);
-          verify(() {
-            communicationBloc.add(communication_events.MeteringEndedEvent(resultList.last));
-          }).called(2); // +1 from dispose
-        },
-        expect: () => resultList.map(
-          (e) => isA<LightSensorContainerState>().having((state) => state.ev100, 'ev100', e),
-        ),
-      );
-    },
-  );
-}