mirror of
https://github.com/vodemn/m3_lightmeter.git
synced 2025-09-05 11:56:41 +00:00
ML-260 Set ISO when selecting a film (#267)
* set ISO according to film * remove unnecessary equipment profile listeners * Update e2e_test.dart
This commit is contained in:
parent
9cece036d1
commit
78f4bf96ce
4 changed files with 50 additions and 22 deletions
|
@ -136,8 +136,8 @@ void testE2E(String description) {
|
||||||
);
|
);
|
||||||
|
|
||||||
/// Set another film and another ISO
|
/// Set another film and another ISO
|
||||||
await tester.openPickerAndSelect<IsoValuePicker, IsoValue>('200');
|
|
||||||
await tester.openPickerAndSelect<FilmPicker, Film>(mockFilms[1].name);
|
await tester.openPickerAndSelect<FilmPicker, Film>(mockFilms[1].name);
|
||||||
|
await tester.openPickerAndSelect<IsoValuePicker, IsoValue>('200');
|
||||||
await _expectMeteringStateAndMeasure(
|
await _expectMeteringStateAndMeasure(
|
||||||
tester,
|
tester,
|
||||||
equipmentProfile: mockEquipmentProfiles[1],
|
equipmentProfile: mockEquipmentProfiles[1],
|
||||||
|
|
|
@ -1,28 +1,13 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
|
||||||
import 'package:lightmeter/generated/l10n.dart';
|
import 'package:lightmeter/generated/l10n.dart';
|
||||||
import 'package:lightmeter/providers/equipment_profile_provider.dart';
|
import 'package:lightmeter/providers/equipment_profile_provider.dart';
|
||||||
import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart';
|
|
||||||
import 'package:lightmeter/screens/metering/communication/event_communication_metering.dart';
|
|
||||||
import 'package:lightmeter/screens/metering/components/shared/readings_container/components/shared/animated_dialog_picker/widget_picker_dialog_animated.dart';
|
import 'package:lightmeter/screens/metering/components/shared/readings_container/components/shared/animated_dialog_picker/widget_picker_dialog_animated.dart';
|
||||||
import 'package:lightmeter/screens/metering/components/shared/readings_container/components/shared/reading_value_container/widget_container_reading_value.dart';
|
import 'package:lightmeter/screens/metering/components/shared/readings_container/components/shared/reading_value_container/widget_container_reading_value.dart';
|
||||||
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
|
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
|
||||||
|
|
||||||
class EquipmentProfilePicker extends StatefulWidget {
|
class EquipmentProfilePicker extends StatelessWidget {
|
||||||
const EquipmentProfilePicker();
|
const EquipmentProfilePicker();
|
||||||
|
|
||||||
@override
|
|
||||||
State<EquipmentProfilePicker> createState() => _EquipmentProfilePickerState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _EquipmentProfilePickerState extends State<EquipmentProfilePicker> {
|
|
||||||
@override
|
|
||||||
void didChangeDependencies() {
|
|
||||||
super.didChangeDependencies();
|
|
||||||
final profile = EquipmentProfiles.selectedOf(context);
|
|
||||||
context.read<MeteringCommunicationBloc>().add(EquipmentProfileChangedEvent(profile));
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return AnimatedDialogPicker<EquipmentProfile>(
|
return AnimatedDialogPicker<EquipmentProfile>(
|
||||||
|
@ -31,10 +16,7 @@ class _EquipmentProfilePickerState extends State<EquipmentProfilePicker> {
|
||||||
selectedValue: EquipmentProfiles.selectedOf(context),
|
selectedValue: EquipmentProfiles.selectedOf(context),
|
||||||
values: EquipmentProfiles.inUseOf(context),
|
values: EquipmentProfiles.inUseOf(context),
|
||||||
itemTitleBuilder: (_, value) => Text(value.id.isEmpty ? S.of(context).none : value.name),
|
itemTitleBuilder: (_, value) => Text(value.id.isEmpty ? S.of(context).none : value.name),
|
||||||
onChanged: (profile) {
|
onChanged: EquipmentProfilesProvider.of(context).selectProfile,
|
||||||
EquipmentProfilesProvider.of(context).selectProfile(profile);
|
|
||||||
context.read<MeteringCommunicationBloc>().add(EquipmentProfileChangedEvent(profile));
|
|
||||||
},
|
|
||||||
closedChild: ReadingValueContainer.singleValue(
|
closedChild: ReadingValueContainer.singleValue(
|
||||||
value: ReadingValue(
|
value: ReadingValue(
|
||||||
label: S.of(context).equipmentProfile,
|
label: S.of(context).equipmentProfile,
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import 'dart:math';
|
import 'dart:math';
|
||||||
|
|
||||||
|
import 'package:collection/collection.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:lightmeter/data/models/ev_source_type.dart';
|
import 'package:lightmeter/data/models/ev_source_type.dart';
|
||||||
|
@ -9,12 +10,15 @@ import 'package:lightmeter/providers/equipment_profile_provider.dart';
|
||||||
import 'package:lightmeter/providers/services_provider.dart';
|
import 'package:lightmeter/providers/services_provider.dart';
|
||||||
import 'package:lightmeter/providers/user_preferences_provider.dart';
|
import 'package:lightmeter/providers/user_preferences_provider.dart';
|
||||||
import 'package:lightmeter/screens/metering/bloc_metering.dart';
|
import 'package:lightmeter/screens/metering/bloc_metering.dart';
|
||||||
|
import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart';
|
||||||
|
import 'package:lightmeter/screens/metering/communication/event_communication_metering.dart' as communication_event;
|
||||||
import 'package:lightmeter/screens/metering/components/bottom_controls/widget_bottom_controls.dart';
|
import 'package:lightmeter/screens/metering/components/bottom_controls/widget_bottom_controls.dart';
|
||||||
import 'package:lightmeter/screens/metering/components/camera_container/provider_container_camera.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/components/light_sensor_container/provider_container_light_sensor.dart';
|
||||||
import 'package:lightmeter/screens/metering/event_metering.dart';
|
import 'package:lightmeter/screens/metering/event_metering.dart';
|
||||||
import 'package:lightmeter/screens/metering/state_metering.dart';
|
import 'package:lightmeter/screens/metering/state_metering.dart';
|
||||||
import 'package:lightmeter/screens/metering/utils/listener_equipment_profiles.dart';
|
import 'package:lightmeter/screens/metering/utils/listener_equipment_profiles.dart';
|
||||||
|
import 'package:lightmeter/screens/metering/utils/listener_films.dart';
|
||||||
import 'package:lightmeter/screens/timer/flow_timer.dart';
|
import 'package:lightmeter/screens/timer/flow_timer.dart';
|
||||||
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
|
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
|
||||||
|
|
||||||
|
@ -91,8 +95,20 @@ class _InheritedListeners extends StatelessWidget {
|
||||||
return EquipmentProfileListener(
|
return EquipmentProfileListener(
|
||||||
onDidChangeDependencies: (value) {
|
onDidChangeDependencies: (value) {
|
||||||
context.read<MeteringBloc>().add(EquipmentProfileChangedEvent(value));
|
context.read<MeteringBloc>().add(EquipmentProfileChangedEvent(value));
|
||||||
|
context.read<MeteringCommunicationBloc>().add(communication_event.EquipmentProfileChangedEvent(value));
|
||||||
},
|
},
|
||||||
child: child,
|
child: FilmListener(
|
||||||
|
onDidChangeDependencies: (value) {
|
||||||
|
/// Do nothing if no film selected
|
||||||
|
if (value != const FilmStub()) {
|
||||||
|
final isoValue = IsoValue.values.firstWhereOrNull((e) => e.rawValue == value.iso);
|
||||||
|
if (isoValue case final isoValue?) {
|
||||||
|
context.read<MeteringBloc>().add(IsoChangedEvent(isoValue));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
child: child,
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
30
lib/screens/metering/utils/listener_films.dart
Normal file
30
lib/screens/metering/utils/listener_films.dart
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:lightmeter/providers/films_provider.dart';
|
||||||
|
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
|
||||||
|
|
||||||
|
class FilmListener extends StatefulWidget {
|
||||||
|
final ValueChanged<Film> onDidChangeDependencies;
|
||||||
|
final Widget child;
|
||||||
|
|
||||||
|
const FilmListener({
|
||||||
|
required this.onDidChangeDependencies,
|
||||||
|
required this.child,
|
||||||
|
super.key,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<FilmListener> createState() => _FilmListenerState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _FilmListenerState extends State<FilmListener> {
|
||||||
|
@override
|
||||||
|
void didChangeDependencies() {
|
||||||
|
super.didChangeDependencies();
|
||||||
|
widget.onDidChangeDependencies(Films.selectedOf(context));
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return widget.child;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue