mirror of
https://github.com/vodemn/m3_lightmeter.git
synced 2024-11-23 07:50:42 +00:00
3bb3f12641
* 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
204 lines
7.4 KiB
Dart
204 lines
7.4 KiB
Dart
import 'dart:math';
|
|
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
|
import 'package:lightmeter/data/models/ev_source_type.dart';
|
|
import 'package:lightmeter/data/models/exposure_pair.dart';
|
|
import 'package:lightmeter/providers/equipment_profile_provider.dart';
|
|
import 'package:lightmeter/providers/services_provider.dart';
|
|
import 'package:lightmeter/providers/user_preferences_provider.dart';
|
|
import 'package:lightmeter/screens/metering/bloc_metering.dart';
|
|
import 'package:lightmeter/screens/metering/components/bottom_controls/provider_bottom_controls.dart';
|
|
import 'package:lightmeter/screens/metering/components/camera_container/provider_container_camera.dart';
|
|
import 'package:lightmeter/screens/metering/components/light_sensor_container/provider_container_light_sensor.dart';
|
|
import 'package:lightmeter/screens/metering/event_metering.dart';
|
|
import 'package:lightmeter/screens/metering/state_metering.dart';
|
|
import 'package:lightmeter/screens/metering/utils/listener_equipment_profiles.dart';
|
|
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
|
|
|
|
class MeteringScreen extends StatelessWidget {
|
|
const MeteringScreen({super.key});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return _InheritedListeners(
|
|
child: Scaffold(
|
|
backgroundColor: Theme.of(context).colorScheme.background,
|
|
body: Column(
|
|
children: [
|
|
Expanded(
|
|
child: BlocBuilder<MeteringBloc, MeteringState>(
|
|
builder: (_, state) => MeteringContainerBuidler(
|
|
ev: state is MeteringDataState ? state.ev : null,
|
|
iso: state.iso,
|
|
nd: state.nd,
|
|
onIsoChanged: (value) => context.read<MeteringBloc>().add(IsoChangedEvent(value)),
|
|
onNdChanged: (value) => context.read<MeteringBloc>().add(NdChangedEvent(value)),
|
|
),
|
|
),
|
|
),
|
|
BlocBuilder<MeteringBloc, MeteringState>(
|
|
builder: (context, state) => MeteringBottomControlsProvider(
|
|
ev: state is MeteringDataState ? state.ev : null,
|
|
isMetering: state.isMetering,
|
|
onSwitchEvSourceType: ServicesProvider.of(context).environment.hasLightSensor
|
|
? UserPreferencesProvider.of(context).toggleEvSourceType
|
|
: null,
|
|
onMeasure: () => context.read<MeteringBloc>().add(const MeasureEvent()),
|
|
onSettings: () {
|
|
context.read<MeteringBloc>().add(const SettingsOpenedEvent());
|
|
Navigator.pushNamed(context, 'settings').then((value) {
|
|
context.read<MeteringBloc>().add(const SettingsClosedEvent());
|
|
});
|
|
},
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
class _InheritedListeners extends StatelessWidget {
|
|
final Widget child;
|
|
|
|
const _InheritedListeners({required this.child});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return EquipmentProfileListener(
|
|
onDidChangeDependencies: (value) {
|
|
context.read<MeteringBloc>().add(EquipmentProfileChangedEvent(value));
|
|
},
|
|
child: child,
|
|
);
|
|
}
|
|
}
|
|
|
|
class MeteringContainerBuidler extends StatelessWidget {
|
|
final double? ev;
|
|
final IsoValue iso;
|
|
final NdValue nd;
|
|
final ValueChanged<IsoValue> onIsoChanged;
|
|
final ValueChanged<NdValue> onNdChanged;
|
|
|
|
const MeteringContainerBuidler({
|
|
required this.ev,
|
|
required this.iso,
|
|
required this.nd,
|
|
required this.onIsoChanged,
|
|
required this.onNdChanged,
|
|
});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final exposurePairs = ev != null
|
|
? buildExposureValues(
|
|
ev!,
|
|
UserPreferencesProvider.stopTypeOf(context),
|
|
EquipmentProfiles.selectedOf(context),
|
|
)
|
|
: <ExposurePair>[];
|
|
final fastest = exposurePairs.isNotEmpty ? exposurePairs.first : null;
|
|
final slowest = exposurePairs.isNotEmpty ? exposurePairs.last : null;
|
|
// Doubled build here when switching evSourceType. As new source bloc fires a new state on init
|
|
return UserPreferencesProvider.evSourceTypeOf(context) == EvSourceType.camera
|
|
? CameraContainerProvider(
|
|
fastest: fastest,
|
|
slowest: slowest,
|
|
iso: iso,
|
|
nd: nd,
|
|
onIsoChanged: onIsoChanged,
|
|
onNdChanged: onNdChanged,
|
|
exposurePairs: exposurePairs,
|
|
)
|
|
: LightSensorContainerProvider(
|
|
fastest: fastest,
|
|
slowest: slowest,
|
|
iso: iso,
|
|
nd: nd,
|
|
onIsoChanged: onIsoChanged,
|
|
onNdChanged: onNdChanged,
|
|
exposurePairs: exposurePairs,
|
|
);
|
|
}
|
|
|
|
@visibleForTesting
|
|
static List<ExposurePair> buildExposureValues(
|
|
double ev,
|
|
StopType stopType,
|
|
EquipmentProfile equipmentProfile,
|
|
) {
|
|
if (ev.isNaN || ev.isInfinite) {
|
|
return List.empty();
|
|
}
|
|
|
|
/// Depending on the `stopType` the exposure pairs list length is multiplied by 1,2 or 3
|
|
final int evSteps = (ev * (stopType.index + 1)).round();
|
|
|
|
final apertureValues = ApertureValue.values.whereStopType(stopType);
|
|
final shutterSpeedValues = ShutterSpeedValue.values.whereStopType(stopType);
|
|
|
|
/// Basically we use 1" shutter speed as an anchor point for building the exposure pairs list.
|
|
/// But user can exclude this value from the list using custom equipment profile.
|
|
/// So we have to restore the index of the anchor value.
|
|
const anchorShutterSpeed = ShutterSpeedValue(1, false, StopType.full);
|
|
final int anchorIndex = shutterSpeedValues.indexOf(anchorShutterSpeed);
|
|
final int evOffset = anchorIndex - evSteps;
|
|
|
|
late final int apertureOffset;
|
|
late final int shutterSpeedOffset;
|
|
if (evOffset >= 0) {
|
|
apertureOffset = 0;
|
|
shutterSpeedOffset = evOffset;
|
|
} else {
|
|
apertureOffset = -evOffset;
|
|
shutterSpeedOffset = 0;
|
|
}
|
|
|
|
final int itemsCount = min(
|
|
apertureValues.length + shutterSpeedOffset,
|
|
shutterSpeedValues.length + apertureOffset,
|
|
) -
|
|
max(apertureOffset, shutterSpeedOffset);
|
|
|
|
if (itemsCount <= 0) {
|
|
return List.empty();
|
|
}
|
|
|
|
final exposurePairs = List.generate(
|
|
itemsCount,
|
|
(index) => ExposurePair(
|
|
apertureValues[index + apertureOffset],
|
|
shutterSpeedValues[index + shutterSpeedOffset],
|
|
),
|
|
growable: false,
|
|
);
|
|
|
|
/// Full equipment profile, nothing to cut
|
|
if (equipmentProfile.id == "") {
|
|
return exposurePairs;
|
|
}
|
|
|
|
final equipmentApertureValues = equipmentProfile.apertureValues.whereStopType(stopType);
|
|
final equipmentShutterSpeedValues = equipmentProfile.shutterSpeedValues.whereStopType(stopType);
|
|
|
|
final startCutEV = max(
|
|
exposurePairs.first.aperture.difference(equipmentApertureValues.first),
|
|
exposurePairs.first.shutterSpeed.difference(equipmentShutterSpeedValues.first),
|
|
);
|
|
final endCutEV = max(
|
|
equipmentApertureValues.last.difference(exposurePairs.last.aperture),
|
|
equipmentShutterSpeedValues.last.difference(exposurePairs.last.shutterSpeed),
|
|
);
|
|
|
|
final startCut = (startCutEV * (stopType.index + 1)).round().clamp(0, itemsCount);
|
|
final endCut = (endCutEV * (stopType.index + 1)).round().clamp(0, itemsCount);
|
|
|
|
if (startCut > itemsCount - endCut) {
|
|
return const [];
|
|
}
|
|
return exposurePairs.sublist(startCut, itemsCount - endCut);
|
|
}
|
|
}
|