mirror of
https://github.com/vodemn/m3_lightmeter.git
synced 2024-10-19 06:40:59 +00:00
![Vadim](/assets/img/avatar_default.png)
* removed redundant `UserPreferencesService` from `MeteringBloc` * wip * post-merge fixes * `MeasureEvent` tests * `MeasureEvent` tests revision * `MeasureEvent` tests added timeout * added stubs for other `MeteringBloc` events * rewritten `MeteringBloc` logic * wip * `IsoChangedEvent` tests * refined `IsoChangedEvent` tests * `NdChangedEvent` tests * `FilmChangedEvent` tests * `MeteringCommunicationBloc` tests * added test run to ci * overriden `==` for `MeasuredState` * `LuxMeteringEvent` tests * refined `LuxMeteringEvent` tests * rename * wip * wip * `InitializeEvent`/`DeinitializeEvent` tests * clamp minZoomLevel * fixed `MeteringCommunicationBloc` tests * wip * `ZoomChangedEvent` tests * `ExposureOffsetChangedEvent`/`ExposureOffsetResetEvent` tests * renamed test groups * added test coverage script * improved `CameraContainerBloc` test coverage * `EquipmentProfileChangedEvent` tests * verify response vibration * fixed running all tests * `MeteringCommunicationBloc` equality tests * `CameraContainerBloc` equality tests * removed generated code from coverage * `MeteringScreenLayoutFeature` tests * `SupportedLocale` tests * `Film` tests * `CaffeineService` tests * `UserPreferencesService` tests (wip) * `LightSensorService` tests (wip) * `migrateOldKeys()` tests * ignore currently unused getters & setters * gradle upgrade * `reset(sharedPreferences);` calls count * typo * `MeteringInteractor` tests * `SettingsInteractor` tests (wip) * `MeteringInteractor` tests (wip) * `SettingsInteractor` tests * AnimatedDialog picker standalone tests * Moved Animated dialog picker to widget tests * `ExtremeExposurePairsContainer` widget test * dialog picker test * Match extreme exposure pairs & pairs list edge values * `FilmPicker` widget tests * fixed animated dialog picker tests * add not hit files to coverage percentage * Moved `EquipmentProfileProvider` & `FilmsProvider` to the main repo * Synced _iap_ stub with repo * `FilmsProvider` tests * `EquipmentProfileProvider` tests * Pass `availableFilms` to `FilmsProvider` * `FilmPicker` tests * removed unnecessary imports * Metering layout features tests * split integration tests by screens * Films in use test * mock light meter lux stream * removed mockito mocks for integration tests From no on these are the only mocks in use: - Mock shared prefs initial values - Mock platform responses (camera/light sensor) * set sharedprefs mock without redundant group * unified granting camera permission on Android * fixed metering screen tests * extracted common values * `FilmPicker` integration tests * fixed light sensor platform mocks * wip * removed integration tests for now * moved screenshots generator to screenshots folder * typo * removed `MockIAPProductsProvider` * implemented platform mocks for unit tests * data/models/ 100% coverage * `IsoValuePicker` tests * `EquipmentProfileProvider` tests * extended PR check timeout * typo * added storage action verification for `FilmsProvider` tests * `UserPreferencesProvider` tests * Update README.md * added //coverage:ignore to `ServicesProvider` * typo * typo * `toStringSignedAsFixed` tests * `SelectableInheritedModel` tests * removed unused `TextLineHeight` util * `VolumeKeysNotifier` tests * import * `EquipmentProfileListener` tests * typo * split `EquipmentProfileListener` tests * `showBuyProDialog` tests * added `maybeOf` getter for iap stub
201 lines
6.4 KiB
Dart
201 lines
6.4 KiB
Dart
import 'dart:async';
|
|
|
|
import 'package:bloc_concurrency/bloc_concurrency.dart';
|
|
import 'package:flutter/foundation.dart';
|
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
|
import 'package:lightmeter/data/models/volume_action.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/event_metering.dart';
|
|
import 'package:lightmeter/screens/metering/state_metering.dart';
|
|
import 'package:lightmeter/screens/metering/utils/notifier_volume_keys.dart';
|
|
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
|
|
|
|
class MeteringBloc extends Bloc<MeteringEvent, MeteringState> {
|
|
final MeteringInteractor _meteringInteractor;
|
|
final VolumeKeysNotifier _volumeKeysNotifier;
|
|
final MeteringCommunicationBloc _communicationBloc;
|
|
late final StreamSubscription<communication_states.ScreenState> _communicationSubscription;
|
|
|
|
MeteringBloc(
|
|
this._meteringInteractor,
|
|
this._volumeKeysNotifier,
|
|
this._communicationBloc,
|
|
) : super(
|
|
MeteringDataState(
|
|
ev100: null,
|
|
iso: _meteringInteractor.iso,
|
|
nd: _meteringInteractor.ndFilter,
|
|
isMetering: false,
|
|
),
|
|
) {
|
|
_volumeKeysNotifier.addListener(onVolumeKey);
|
|
_communicationSubscription = _communicationBloc.stream
|
|
.where((state) => state is communication_states.ScreenState)
|
|
.map((state) => state as communication_states.ScreenState)
|
|
.listen(onCommunicationState);
|
|
|
|
on<EquipmentProfileChangedEvent>(_onEquipmentProfileChanged);
|
|
on<IsoChangedEvent>(_onIsoChanged);
|
|
on<NdChangedEvent>(_onNdChanged);
|
|
on<MeasureEvent>(_onMeasure, transformer: droppable());
|
|
on<MeasuredEvent>(_onMeasured);
|
|
on<MeasureErrorEvent>(_onMeasureError);
|
|
on<SettingsOpenedEvent>(_onSettingsOpened);
|
|
on<SettingsClosedEvent>(_onSettingsClosed);
|
|
}
|
|
|
|
@override
|
|
void onTransition(Transition<MeteringEvent, MeteringState> transition) {
|
|
super.onTransition(transition);
|
|
if (transition.nextState is MeteringDataState) {
|
|
final nextState = transition.nextState as MeteringDataState;
|
|
if (transition.currentState is LoadingState ||
|
|
transition.currentState is MeteringDataState &&
|
|
(transition.currentState as MeteringDataState).ev != nextState.ev) {
|
|
if (nextState.hasError) {
|
|
_meteringInteractor.errorVibration();
|
|
} else {
|
|
_meteringInteractor.responseVibration();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
@override
|
|
Future<void> close() async {
|
|
_volumeKeysNotifier.removeListener(onVolumeKey);
|
|
await _communicationSubscription.cancel();
|
|
return super.close();
|
|
}
|
|
|
|
@visibleForTesting
|
|
void onCommunicationState(communication_states.ScreenState communicationState) {
|
|
if (communicationState is communication_states.MeasuredState) {
|
|
_handleEv100(
|
|
communicationState.ev100,
|
|
isMetering: communicationState is communication_states.MeteringInProgressState,
|
|
);
|
|
}
|
|
}
|
|
|
|
void _onEquipmentProfileChanged(EquipmentProfileChangedEvent event, Emitter emit) {
|
|
bool willUpdateMeasurements = false;
|
|
|
|
/// Update selected ISO value and discard selected film, if selected equipment profile
|
|
/// doesn't contain currently selected value
|
|
IsoValue iso = state.iso;
|
|
if (!event.equipmentProfileData.isoValues.any((v) => state.iso.value == v.value)) {
|
|
_meteringInteractor.iso = event.equipmentProfileData.isoValues.first;
|
|
iso = event.equipmentProfileData.isoValues.first;
|
|
willUpdateMeasurements = true;
|
|
}
|
|
|
|
/// The same for ND filter
|
|
NdValue nd = state.nd;
|
|
if (!event.equipmentProfileData.ndValues.any((v) => state.nd.value == v.value)) {
|
|
_meteringInteractor.ndFilter = event.equipmentProfileData.ndValues.first;
|
|
nd = event.equipmentProfileData.ndValues.first;
|
|
willUpdateMeasurements = true;
|
|
}
|
|
|
|
if (willUpdateMeasurements) {
|
|
emit(
|
|
MeteringDataState(
|
|
ev100: state.ev100,
|
|
iso: iso,
|
|
nd: nd,
|
|
isMetering: state.isMetering,
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
void _onIsoChanged(IsoChangedEvent event, Emitter emit) {
|
|
if (state.iso != event.isoValue) {
|
|
_meteringInteractor.iso = event.isoValue;
|
|
emit(
|
|
MeteringDataState(
|
|
ev100: state.ev100,
|
|
iso: event.isoValue,
|
|
nd: state.nd,
|
|
isMetering: state.isMetering,
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
void _onNdChanged(NdChangedEvent event, Emitter emit) {
|
|
if (state.nd != event.ndValue) {
|
|
_meteringInteractor.ndFilter = event.ndValue;
|
|
emit(
|
|
MeteringDataState(
|
|
ev100: state.ev100,
|
|
iso: state.iso,
|
|
nd: event.ndValue,
|
|
isMetering: state.isMetering,
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
void _onMeasure(MeasureEvent _, Emitter emit) {
|
|
_meteringInteractor.quickVibration();
|
|
_communicationBloc.add(const communication_events.MeasureEvent());
|
|
emit(
|
|
LoadingState(
|
|
iso: state.iso,
|
|
nd: state.nd,
|
|
),
|
|
);
|
|
}
|
|
|
|
void _handleEv100(double? ev100, {required bool isMetering}) {
|
|
if (ev100 == null || ev100.isNaN || ev100.isInfinite) {
|
|
add(MeasureErrorEvent(isMetering: isMetering));
|
|
} else {
|
|
add(MeasuredEvent(ev100, isMetering: isMetering));
|
|
}
|
|
}
|
|
|
|
void _onMeasured(MeasuredEvent event, Emitter emit) {
|
|
emit(
|
|
MeteringDataState(
|
|
ev100: event.ev100,
|
|
iso: state.iso,
|
|
nd: state.nd,
|
|
isMetering: event.isMetering,
|
|
),
|
|
);
|
|
}
|
|
|
|
void _onMeasureError(MeasureErrorEvent event, Emitter emit) {
|
|
emit(
|
|
MeteringDataState(
|
|
ev100: null,
|
|
iso: state.iso,
|
|
nd: state.nd,
|
|
isMetering: event.isMetering,
|
|
),
|
|
);
|
|
}
|
|
|
|
@visibleForTesting
|
|
void onVolumeKey() {
|
|
if (_meteringInteractor.volumeAction == VolumeAction.shutter) {
|
|
add(const MeasureEvent());
|
|
}
|
|
}
|
|
|
|
void _onSettingsOpened(SettingsOpenedEvent _, Emitter __) {
|
|
_communicationBloc.add(const communication_events.SettingsOpenedEvent());
|
|
}
|
|
|
|
void _onSettingsClosed(SettingsClosedEvent _, Emitter __) {
|
|
_communicationBloc.add(const communication_events.SettingsClosedEvent());
|
|
}
|
|
}
|