mirror of
https://github.com/vodemn/m3_lightmeter.git
synced 2025-04-27 20:00:40 +00:00
notify camera bloc about equipment profile changes
This commit is contained in:
parent
2e3335e374
commit
cfb763b95e
6 changed files with 75 additions and 41 deletions
|
@ -8,6 +8,7 @@ class MeteringCommunicationBloc extends Bloc<MeteringCommunicationEvent, Meterin
|
||||||
// `MeasureState` is not const, so that `Bloc` treats each state as new and updates state stream
|
// `MeasureState` is not const, so that `Bloc` treats each state as new and updates state stream
|
||||||
// ignore: prefer_const_constructors
|
// ignore: prefer_const_constructors
|
||||||
on<MeasureEvent>((_, emit) => emit(MeasureState()));
|
on<MeasureEvent>((_, emit) => emit(MeasureState()));
|
||||||
|
on<EquipmentProfileChangedEvent>((event, emit) => emit(EquipmentProfileChangedState(event.profile)));
|
||||||
on<MeteringInProgressEvent>((event, emit) => emit(MeteringInProgressState(event.ev100)));
|
on<MeteringInProgressEvent>((event, emit) => emit(MeteringInProgressState(event.ev100)));
|
||||||
on<MeteringEndedEvent>((event, emit) => emit(MeteringEndedState(event.ev100)));
|
on<MeteringEndedEvent>((event, emit) => emit(MeteringEndedState(event.ev100)));
|
||||||
on<ScreenOnTopOpenedEvent>((_, emit) => emit(const SettingsOpenedState()));
|
on<ScreenOnTopOpenedEvent>((_, emit) => emit(const SettingsOpenedState()));
|
||||||
|
|
|
@ -1,19 +1,29 @@
|
||||||
|
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
|
||||||
|
|
||||||
abstract class MeteringCommunicationEvent {
|
abstract class MeteringCommunicationEvent {
|
||||||
const MeteringCommunicationEvent();
|
const MeteringCommunicationEvent();
|
||||||
}
|
}
|
||||||
|
|
||||||
abstract class SourceEvent extends MeteringCommunicationEvent {
|
/// Events sent by the screen to the current metering source.
|
||||||
const SourceEvent();
|
|
||||||
}
|
|
||||||
|
|
||||||
abstract class ScreenEvent extends MeteringCommunicationEvent {
|
abstract class ScreenEvent extends MeteringCommunicationEvent {
|
||||||
const ScreenEvent();
|
const ScreenEvent();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Event sent by the current metering source in response for the screen events.
|
||||||
|
abstract class SourceEvent extends MeteringCommunicationEvent {
|
||||||
|
const SourceEvent();
|
||||||
|
}
|
||||||
|
|
||||||
class MeasureEvent extends ScreenEvent {
|
class MeasureEvent extends ScreenEvent {
|
||||||
const MeasureEvent();
|
const MeasureEvent();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class EquipmentProfileChangedEvent extends ScreenEvent {
|
||||||
|
final EquipmentProfile profile;
|
||||||
|
|
||||||
|
const EquipmentProfileChangedEvent(this.profile);
|
||||||
|
}
|
||||||
|
|
||||||
abstract class MeasuredEvent extends SourceEvent {
|
abstract class MeasuredEvent extends SourceEvent {
|
||||||
final double? ev100;
|
final double? ev100;
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
|
||||||
|
|
||||||
sealed class MeteringCommunicationState {
|
sealed class MeteringCommunicationState {
|
||||||
const MeteringCommunicationState();
|
const MeteringCommunicationState();
|
||||||
}
|
}
|
||||||
|
@ -18,6 +20,12 @@ class MeasureState extends SourceState {
|
||||||
const MeasureState();
|
const MeasureState();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class EquipmentProfileChangedState extends SourceState {
|
||||||
|
final EquipmentProfile profile;
|
||||||
|
|
||||||
|
const EquipmentProfileChangedState(this.profile);
|
||||||
|
}
|
||||||
|
|
||||||
sealed class MeasuredState extends ScreenState {
|
sealed class MeasuredState extends ScreenState {
|
||||||
final double? ev100;
|
final double? ev100;
|
||||||
|
|
||||||
|
|
|
@ -86,6 +86,12 @@ class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraC
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
case final communication_states.EquipmentProfileChangedState communicationState:
|
||||||
|
if (state is CameraActiveState) {
|
||||||
|
add(ZoomChangedEvent(communicationState.profile.lensZoom));
|
||||||
|
} else {
|
||||||
|
_currentZoom = communicationState.profile.lensZoom;
|
||||||
|
}
|
||||||
case communication_states.SettingsOpenedState():
|
case communication_states.SettingsOpenedState():
|
||||||
_settingsOpened = true;
|
_settingsOpened = true;
|
||||||
add(const DeinitializeEvent());
|
add(const DeinitializeEvent());
|
||||||
|
@ -139,25 +145,6 @@ class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraC
|
||||||
await _cameraController!.setFlashMode(FlashMode.off);
|
await _cameraController!.setFlashMode(FlashMode.off);
|
||||||
await _cameraController!.lockCaptureOrientation(DeviceOrientation.portraitUp);
|
await _cameraController!.lockCaptureOrientation(DeviceOrientation.portraitUp);
|
||||||
|
|
||||||
/// For app startup initialization this effectively isn't executed.
|
|
||||||
await Future.wait<void>([
|
|
||||||
if (_currentZoom != 1.0) _cameraController!.setZoomLevel(_currentZoom),
|
|
||||||
if (_currentExposureOffset != 0.0) _cameraController!.setExposureOffset(_currentExposureOffset),
|
|
||||||
]);
|
|
||||||
|
|
||||||
if (_zoomRange == null) {
|
|
||||||
await Future.wait<double>([
|
|
||||||
_cameraController!.getMinZoomLevel(),
|
|
||||||
_cameraController!.getMaxZoomLevel(),
|
|
||||||
]).then((value) {
|
|
||||||
_zoomRange = RangeValues(
|
|
||||||
math.max(1.0, value[0]),
|
|
||||||
math.min(_maxZoom, value[1]),
|
|
||||||
);
|
|
||||||
_currentZoom = _zoomRange!.start;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (_exposureOffsetRange == null) {
|
if (_exposureOffsetRange == null) {
|
||||||
await Future.wait<double>([
|
await Future.wait<double>([
|
||||||
_cameraController!.getMinExposureOffset(),
|
_cameraController!.getMinExposureOffset(),
|
||||||
|
@ -173,6 +160,27 @@ class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraC
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_zoomRange == null) {
|
||||||
|
await Future.wait<double>([
|
||||||
|
_cameraController!.getMinZoomLevel(),
|
||||||
|
_cameraController!.getMaxZoomLevel(),
|
||||||
|
]).then((value) {
|
||||||
|
_zoomRange = RangeValues(
|
||||||
|
math.max(1.0, value[0]),
|
||||||
|
math.min(_maxZoom, value[1]),
|
||||||
|
);
|
||||||
|
if (_currentZoom < _zoomRange!.start || _currentZoom > _zoomRange!.end) {
|
||||||
|
_currentZoom = _zoomRange!.start;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// For app startup initialization this effectively isn't executed.
|
||||||
|
await Future.wait<void>([
|
||||||
|
if (_currentZoom != 1.0) _cameraController!.setZoomLevel(_currentZoom),
|
||||||
|
if (_currentExposureOffset != 0.0) _cameraController!.setExposureOffset(_currentExposureOffset),
|
||||||
|
]);
|
||||||
|
|
||||||
emit(CameraInitializedState(_cameraController!));
|
emit(CameraInitializedState(_cameraController!));
|
||||||
_emitActiveState(emit);
|
_emitActiveState(emit);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
@ -187,7 +195,7 @@ class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraC
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _onZoomChanged(ZoomChangedEvent event, Emitter emit) async {
|
Future<void> _onZoomChanged(ZoomChangedEvent event, Emitter emit) async {
|
||||||
if (_cameraController != null) {
|
if (_cameraController != null && _zoomRange != null) {
|
||||||
final double zoom = event.value.clamp(_zoomRange!.start, _zoomRange!.end);
|
final double zoom = event.value.clamp(_zoomRange!.start, _zoomRange!.end);
|
||||||
_cameraController!.setZoomLevel(zoom);
|
_cameraController!.setZoomLevel(zoom);
|
||||||
_currentZoom = zoom;
|
_currentZoom = zoom;
|
||||||
|
|
|
@ -3,7 +3,7 @@ import 'package:lightmeter/providers/equipment_profile_provider.dart';
|
||||||
import 'package:lightmeter/screens/shared/ruler_slider/widget_slider_ruler.dart';
|
import 'package:lightmeter/screens/shared/ruler_slider/widget_slider_ruler.dart';
|
||||||
import 'package:lightmeter/utils/double_to_zoom.dart';
|
import 'package:lightmeter/utils/double_to_zoom.dart';
|
||||||
|
|
||||||
class ZoomSlider extends StatefulWidget {
|
class ZoomSlider extends StatelessWidget {
|
||||||
final RangeValues range;
|
final RangeValues range;
|
||||||
final double value;
|
final double value;
|
||||||
final ValueChanged<double> onChanged;
|
final ValueChanged<double> onChanged;
|
||||||
|
@ -15,23 +15,12 @@ class ZoomSlider extends StatefulWidget {
|
||||||
super.key,
|
super.key,
|
||||||
});
|
});
|
||||||
|
|
||||||
@override
|
|
||||||
State<ZoomSlider> createState() => _ZoomSliderState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _ZoomSliderState extends State<ZoomSlider> {
|
|
||||||
@override
|
|
||||||
void didChangeDependencies() {
|
|
||||||
super.didChangeDependencies();
|
|
||||||
widget.onChanged(EquipmentProfiles.selectedOf(context).lensZoom);
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return RulerSlider(
|
return RulerSlider(
|
||||||
range: widget.range,
|
range: range,
|
||||||
value: widget.value,
|
value: value,
|
||||||
onChanged: widget.onChanged,
|
onChanged: onChanged,
|
||||||
icon: Icons.search_outlined,
|
icon: Icons.search_outlined,
|
||||||
defaultValue: EquipmentProfiles.selectedOf(context).lensZoom,
|
defaultValue: EquipmentProfiles.selectedOf(context).lensZoom,
|
||||||
rulerValueAdapter: (value) => value.toStringAsFixed(0),
|
rulerValueAdapter: (value) => value.toStringAsFixed(0),
|
||||||
|
|
|
@ -1,13 +1,28 @@
|
||||||
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 StatelessWidget {
|
class EquipmentProfilePicker extends StatefulWidget {
|
||||||
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>(
|
||||||
|
@ -16,7 +31,10 @@ class EquipmentProfilePicker extends StatelessWidget {
|
||||||
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: EquipmentProfilesProvider.of(context).selectProfile,
|
onChanged: (profile) {
|
||||||
|
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,
|
||||||
|
|
Loading…
Reference in a new issue