ML-14 Implement EV calibration legacy feature (#15)

* wip

* implemented `CalibrationDialog`

* integrated calibration to the metering bloc

* checked legacy feature

README.md

@@ -7,8 +7,13 @@
 
 # Table of contents
 
+- [Table of contents](#table-of-contents)
 - [Backstory](#backstory)
 - [Legacy features](#legacy-features)
+    - [Metering](#metering)
+    - [Adjust](#adjust)
+    - [General](#general)
+    - [Theme](#theme)
   - [Build](#build)
   - [Contribution](#contribution)
 
@@ -31,7 +36,7 @@ The list of features that the old lightmeter app has and that have to be impleme
 - [ ] Incident light metering
 
 ### Adjust
-- [ ] Light sources EV calibration
+- [x] Light sources EV calibration
 - [ ] Customizable aperture range
 - [ ] Customizable shutter speed range
 - [x] ND filter select

lib/application.dart

@@ -12,7 +12,7 @@ import 'environment.dart';
 import 'generated/l10n.dart';
 import 'res/theme.dart';
 import 'screens/metering/flow_metering.dart';
-import 'screens/settings/screen_settings.dart';
+import 'screens/settings/flow_settings.dart';
 import 'utils/stop_type_provider.dart';
 
 final RouteObserver<PageRoute> routeObserver = RouteObserver<PageRoute>();
@@ -66,7 +66,7 @@ class Application extends StatelessWidget {
                       initialRoute: "metering",
                       routes: {
                         "metering": (context) => const MeteringFlow(),
-                        "settings": (context) => const SettingsScreen(),
+                        "settings": (context) => const SettingsFlow(),
                       },
                     ),
                   );

lib/data/shared_prefs_service.dart

@@ -8,6 +8,8 @@ class UserPreferencesService {
   static const _isoKey = "iso";
   static const _ndFilterKey = "nd";
 
+  static const _cameraEvCalibrationKey = "cameraEvCalibration";
+
   static const _hapticsKey = "haptics";
   static const _themeTypeKey = "themeType";
   static const _dynamicColorKey = "dynamicColor";
@@ -25,6 +27,9 @@ class UserPreferencesService {
   bool get haptics => _sharedPreferences.getBool(_hapticsKey) ?? false;
   set haptics(bool value) => _sharedPreferences.setBool(_hapticsKey, value);
 
+  double get cameraEvCalibration => _sharedPreferences.getDouble(_cameraEvCalibrationKey) ?? 0.0;
+  set cameraEvCalibration(double value) => _sharedPreferences.setDouble(_cameraEvCalibrationKey, value);
+
   ThemeType get themeType => ThemeType.values[_sharedPreferences.getInt(_themeTypeKey) ?? 0];
   set themeType(ThemeType value) => _sharedPreferences.setInt(_themeTypeKey, value.index);
 

lib/interactors/metering_interactor.dart

@@ -1,16 +1,18 @@
 import 'package:lightmeter/data/haptics_service.dart';
 import 'package:lightmeter/data/shared_prefs_service.dart';
 
-class HapticsInteractor {
+class MeteringInteractor {
   final UserPreferencesService _userPreferencesService;
   final HapticsService _hapticsService;
 
-  const HapticsInteractor(
+  const MeteringInteractor(
     this._userPreferencesService,
     this._hapticsService,
   );
 
-  bool get isEnabled => _userPreferencesService.haptics;
+  double get cameraEvCalibration => _userPreferencesService.cameraEvCalibration;
+
+  bool get isHapticsEnabled => _userPreferencesService.haptics;
 
   /// Executes vibration if haptics are enabled in settings
   void quickVibration() {

lib/interactors/settings_interactor.dart

@@ -0,0 +1,29 @@
+import 'package:lightmeter/data/haptics_service.dart';
+import 'package:lightmeter/data/shared_prefs_service.dart';
+
+class SettingsInteractor {
+  final UserPreferencesService _userPreferencesService;
+  final HapticsService _hapticsService;
+
+  const SettingsInteractor(
+    this._userPreferencesService,
+    this._hapticsService,
+  );
+
+  double get cameraEvCalibration => _userPreferencesService.cameraEvCalibration;
+  void setCameraEvCalibration(double value) => _userPreferencesService.cameraEvCalibration = value;
+
+  bool get isHapticsEnabled => _userPreferencesService.haptics;
+
+  /// Executes vibration if haptics are enabled in settings
+  void quickVibration() {
+    if (_userPreferencesService.haptics) _hapticsService.quickVibration();
+  }
+
+  /// Executes vibration if haptics are enabled in settings
+  void responseVibration() {
+    if (_userPreferencesService.haptics) _hapticsService.responseVibration();
+  }
+
+  void enableHaptics(bool enable) => _userPreferencesService.haptics = enable;
+}

lib/l10n/intl_en.arb

@@ -5,6 +5,14 @@
     "openSettings": "Open settings",
     "fastestExposurePair": "Fastest",
     "slowestExposurePair": "Slowest",
+    "ev": "{value} EV",
+    "@ev": {
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
     "iso": "ISO",
     "filmSpeed": "Film speed",
     "nd": "ND",
@@ -12,12 +20,16 @@
     "none": "None",
     "cancel": "Cancel",
     "select": "Select",
+    "save": "Save",
     "settings": "Settings",
     "metering": "Metering",
     "fractionalStops": "Fractional stops",
     "showFractionalStops": "Show fractional stops",
     "halfStops": "1/2",
     "thirdStops": "1/3",
+    "calibration": "Calibration",
+    "calibrationMessage": "The accuracy of the readings measured by this application depends entirely on the hardware of the device. Therefore, consider testing this application and setting up an EV calibration value that will give you the desired measurement results.",
+    "camera": "Camera",
     "general": "General",
     "haptics": "Haptics",
     "theme": "Theme",

lib/res/dimens.dart

@@ -21,7 +21,7 @@ class Dimens {
   static const Duration durationML = Duration(milliseconds: 250);
   static const Duration durationL = Duration(milliseconds: 300);
 
-  // `CameraSlider`
+  // `CenteredSlider`
   static const double cameraSliderTrackHeight = grid4;
   static const double cameraSliderTrackRadius = cameraSliderTrackHeight / 2;
   static const double cameraSliderHandleSize = 32;

lib/screens/metering/bloc_metering.dart

@@ -7,7 +7,7 @@ import 'package:lightmeter/data/models/exposure_pair.dart';
 import 'package:lightmeter/data/models/photography_values/photography_value.dart';
 import 'package:lightmeter/data/models/photography_values/shutter_speed_value.dart';
 import 'package:lightmeter/data/shared_prefs_service.dart';
-import 'package:lightmeter/interactors/haptics_interactor.dart';
+import 'package:lightmeter/interactors/metering_interactor.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/utils/log_2.dart';
@@ -19,7 +19,7 @@ import 'state_metering.dart';
 class MeteringBloc extends Bloc<MeteringEvent, MeteringState> {
   final MeteringCommunicationBloc _communicationBloc;
   final UserPreferencesService _userPreferencesService;
-  final HapticsInteractor _hapticsInteractor;
+  final MeteringInteractor _meteringInteractor;
   late final StreamSubscription<communication_states.ScreenState> _communicationSubscription;
 
   List<ApertureValue> get _apertureValues => apertureValues.whereStopType(stopType);
@@ -30,7 +30,7 @@ class MeteringBloc extends Bloc<MeteringEvent, MeteringState> {
   MeteringBloc(
     this._communicationBloc,
     this._userPreferencesService,
-    this._hapticsInteractor,
+    this._meteringInteractor,
     this.stopType,
   ) : super(
           MeteringState(
@@ -103,12 +103,12 @@ class MeteringBloc extends Bloc<MeteringEvent, MeteringState> {
   }
 
   void _onMeasure(_, __) {
-    _hapticsInteractor.quickVibration();
+    _meteringInteractor.quickVibration();
     _communicationBloc.add(const communication_events.MeasureEvent());
   }
 
   void _onMeasured(MeasuredEvent event, Emitter emit) {
-    _hapticsInteractor.responseVibration();
+    _meteringInteractor.responseVibration();
     final ev = event.ev100 + log2(state.iso.value / 100);
     emit(MeteringState(
       iso: state.iso,

lib/screens/metering/components/camera/widget_exposure_slider.dart

@@ -4,10 +4,9 @@ import 'package:lightmeter/res/dimens.dart';
 import 'package:lightmeter/screens/metering/ev_source/camera/bloc_camera.dart';
 import 'package:lightmeter/screens/metering/ev_source/camera/event_camera.dart';
 import 'package:lightmeter/screens/metering/ev_source/camera/state_camera.dart';
+import 'package:lightmeter/screens/shared/centered_slider/widget_slider_centered.dart';
 import 'package:lightmeter/utils/to_string_signed.dart';
 
-import 'shared/widget_slider_camera.dart';
-
 class CameraExposureSlider extends StatelessWidget {
   const CameraExposureSlider({super.key});
 
@@ -21,7 +20,7 @@ class CameraExposureSlider extends StatelessWidget {
               IconButton(
                 icon: const Icon(Icons.sync),
                 onPressed: state.currentExposureOffset != 0.0
-                    ? () => context.read<CameraBloc>().add(const ExposureOffsetResetEvent())
+                    ? () => context.read<CameraBloc>().add(const ExposureOffsetChangedEvent(0.0))
                     : null,
               ),
               Expanded(
@@ -32,7 +31,7 @@ class CameraExposureSlider extends StatelessWidget {
                       padding: const EdgeInsets.symmetric(vertical: Dimens.grid8),
                       child: _Ruler(state.minExposureOffset, state.maxExposureOffset),
                     ),
-                    CameraSlider(
+                    CenteredSlider(
                       isVertical: true,
                       icon: const Icon(Icons.light_mode),
                       value: state.currentExposureOffset,

lib/screens/metering/components/camera/widget_zoom_camera.dart

@@ -4,7 +4,7 @@ import 'package:lightmeter/screens/metering/ev_source/camera/bloc_camera.dart';
 import 'package:lightmeter/screens/metering/ev_source/camera/event_camera.dart';
 import 'package:lightmeter/screens/metering/ev_source/camera/state_camera.dart';
 
-import 'shared/widget_slider_camera.dart';
+import '../../../shared/centered_slider/widget_slider_centered.dart';
 
 class CameraZoomSlider extends StatelessWidget {
   const CameraZoomSlider({super.key});
@@ -14,7 +14,7 @@ class CameraZoomSlider extends StatelessWidget {
     return BlocBuilder<CameraBloc, CameraState>(
       builder: (context, state) {
         if (state is CameraActiveState) {
-          return CameraSlider(
+          return CenteredSlider(
             icon: const Icon(Icons.search),
             value: state.currentZoom,
             min: state.minZoom,

lib/screens/metering/components/topbar/components/widget_dialog_picker.dart

@@ -101,7 +101,7 @@ class _MeteringScreenDialogPickerState<T extends PhotographyValue> extends State
                 child: widget.itemTitleBuilder(context, widget.values[index]),
               ),
               secondary: widget.values[index].value != _selectedValue.value
-                  ? Text('${widget.evDifferenceBuilder.call(_selectedValue, widget.values[index])} EV')
+                  ? Text(S.of(context).ev(widget.evDifferenceBuilder.call(_selectedValue, widget.values[index])))
                   : null,
               onChanged: (value) {
                 if (value != null) {

lib/screens/metering/ev_source/camera/bloc_camera.dart

@@ -6,7 +6,7 @@ import 'package:camera/camera.dart';
 import 'package:exif/exif.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:lightmeter/interactors/haptics_interactor.dart';
+import 'package:lightmeter/interactors/metering_interactor.dart';
 import 'package:lightmeter/screens/metering/ev_source/ev_source_bloc.dart';
 import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart';
 import 'package:lightmeter/screens/metering/communication/event_communication_metering.dart' as communication_event;
@@ -17,7 +17,7 @@ import 'event_camera.dart';
 import 'state_camera.dart';
 
 class CameraBloc extends EvSourceBloc<CameraEvent, CameraState> {
-  final HapticsInteractor _hapticsInteractor;
+  final MeteringInteractor _meteringInteractor;
   late final _WidgetsBindingObserver _observer;
   CameraController? _cameraController;
   CameraController? get cameraController => _cameraController;
@@ -33,7 +33,7 @@ class CameraBloc extends EvSourceBloc<CameraEvent, CameraState> {
 
   CameraBloc(
     MeteringCommunicationBloc communicationBloc,
-    this._hapticsInteractor,
+    this._meteringInteractor,
   ) : super(
           communicationBloc,
           const CameraInitState(),
@@ -61,7 +61,7 @@ class CameraBloc extends EvSourceBloc<CameraEvent, CameraState> {
     if (communicationState is communication_states.MeasureState) {
       _takePhoto().then((ev100) {
         if (ev100 != null) {
-          communicationBloc.add(communication_event.MeasuredEvent(ev100));
+          communicationBloc.add(communication_event.MeasuredEvent(ev100 + _meteringInteractor.cameraEvCalibration));
         }
       });
     }
@@ -124,7 +124,7 @@ class CameraBloc extends EvSourceBloc<CameraEvent, CameraState> {
   }
 
   Future<void> _onExposureOffsetResetEvent(ExposureOffsetResetEvent event, Emitter emit) async {
-    _hapticsInteractor.quickVibration();
+    _meteringInteractor.quickVibration();
     add(const ExposureOffsetChangedEvent(0));
   }
 

lib/screens/metering/flow_metering.dart

@@ -4,7 +4,7 @@ import 'package:lightmeter/data/haptics_service.dart';
 import 'package:lightmeter/data/models/ev_source_type.dart';
 import 'package:lightmeter/data/models/photography_values/photography_value.dart';
 import 'package:lightmeter/data/shared_prefs_service.dart';
-import 'package:lightmeter/interactors/haptics_interactor.dart';
+import 'package:lightmeter/interactors/metering_interactor.dart';
 import 'package:provider/provider.dart';
 
 import 'ev_source/camera/bloc_camera.dart';
@@ -19,7 +19,7 @@ class MeteringFlow extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Provider(
-      create: (context) => HapticsInteractor(
+      create: (context) => MeteringInteractor(
         context.read<UserPreferencesService>(),
         context.read<HapticsService>(),
       ),
@@ -30,14 +30,14 @@ class MeteringFlow extends StatelessWidget {
             create: (context) => MeteringBloc(
               context.read<MeteringCommunicationBloc>(),
               context.read<UserPreferencesService>(),
-              context.read<HapticsInteractor>(),
+              context.read<MeteringInteractor>(),
               context.read<StopType>(),
             ),
           ),
           BlocProvider(
             create: (context) => CameraBloc(
               context.read<MeteringCommunicationBloc>(),
-              context.read<HapticsInteractor>(),
+              context.read<MeteringInteractor>(),
             ),
           ),
           if (context.read<EvSourceType>() == EvSourceType.sensor)

lib/screens/metering/screen_metering.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lightmeter/data/models/photography_values/photography_value.dart';
 import 'package:lightmeter/res/dimens.dart';
-import 'package:lightmeter/screens/settings/screen_settings.dart';
 
 import 'components/bottom_controls/widget_bottom_controls.dart';
 import 'components/camera/widget_exposure_slider.dart';
@@ -87,9 +86,7 @@ class _MeteringScreenState extends State<MeteringScreen> {
                   ),
                   MeteringBottomControls(
                     onMeasure: () => context.read<MeteringBloc>().add(const MeasureEvent()),
-                    onSettings: () {
+                    onSettings: () => Navigator.pushNamed(context, 'settings'),
-                      Navigator.push(context, MaterialPageRoute(builder: (context) => const SettingsScreen()));
-                    },
                   ),
                 ],
               ),

lib/screens/settings/components/calibration/components/calibration_dialog/bloc_dialog_calibration.dart

@@ -0,0 +1,33 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:lightmeter/interactors/settings_interactor.dart';
+
+import 'event_dialog_calibration.dart';
+import 'state_dialog_calibration.dart';
+
+class CalibrationDialogBloc extends Bloc<CalibrationDialogEvent, CalibrationDialogState> {
+  final SettingsInteractor _settingsInteractor;
+
+  late double _cameraEvCalibration = _settingsInteractor.cameraEvCalibration;
+
+  CalibrationDialogBloc(this._settingsInteractor)
+      : super(CalibrationDialogState(_settingsInteractor.cameraEvCalibration)) {
+    on<CameraEvCalibrationChangedEvent>(_onCameraEvCalibrationChanged);
+    on<CameraEvCalibrationResetEvent>(_onCameraEvCalibrationReset);
+    on<SaveCalibrationDialogEvent>(_onSaveCalibration);
+  }
+
+  void _onCameraEvCalibrationChanged(CameraEvCalibrationChangedEvent event, Emitter emit) {
+    _cameraEvCalibration = event.value;
+    emit(CalibrationDialogState(event.value));
+  }
+
+  void _onCameraEvCalibrationReset(CameraEvCalibrationResetEvent event, Emitter emit) {
+    _settingsInteractor.quickVibration();
+    _cameraEvCalibration = 0;
+    emit(CalibrationDialogState(_cameraEvCalibration));
+  }
+
+  void _onSaveCalibration(SaveCalibrationDialogEvent event, __) {
+    _settingsInteractor.setCameraEvCalibration(_cameraEvCalibration);
+  }
+}

lib/screens/settings/components/calibration/components/calibration_dialog/event_dialog_calibration.dart

@@ -0,0 +1,17 @@
+abstract class CalibrationDialogEvent {
+  const CalibrationDialogEvent();
+}
+
+class CameraEvCalibrationChangedEvent extends CalibrationDialogEvent {
+  final double value;
+
+  const CameraEvCalibrationChangedEvent(this.value);
+}
+
+class CameraEvCalibrationResetEvent extends CalibrationDialogEvent {
+  const CameraEvCalibrationResetEvent();
+}
+
+class SaveCalibrationDialogEvent extends CalibrationDialogEvent {
+  const SaveCalibrationDialogEvent();
+}

lib/screens/settings/components/calibration/components/calibration_dialog/provider_dialog_calibration.dart

@@ -0,0 +1,18 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:lightmeter/interactors/settings_interactor.dart';
+
+import 'bloc_dialog_calibration.dart';
+import 'widget_dialog_calibration.dart';
+
+class CalibrationDialogProvider extends StatelessWidget {
+  const CalibrationDialogProvider({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (context) => CalibrationDialogBloc(context.read<SettingsInteractor>()),
+      child: const CalibrationDialog(),
+    );
+  }
+}

lib/screens/settings/components/calibration/components/calibration_dialog/state_dialog_calibration.dart

@@ -0,0 +1,5 @@
+class CalibrationDialogState {
+  final double cameraEvCalibration;
+
+  const CalibrationDialogState(this.cameraEvCalibration);
+}

lib/screens/settings/components/calibration/components/calibration_dialog/widget_dialog_calibration.dart

@@ -0,0 +1,112 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:lightmeter/generated/l10n.dart';
+import 'package:lightmeter/res/dimens.dart';
+import 'package:lightmeter/screens/settings/components/calibration/components/calibration_dialog/event_dialog_calibration.dart';
+import 'package:lightmeter/screens/shared/centered_slider/widget_slider_centered.dart';
+import 'package:lightmeter/utils/to_string_signed.dart';
+
+import 'bloc_dialog_calibration.dart';
+import 'state_dialog_calibration.dart';
+
+class CalibrationDialog extends StatefulWidget {
+  const CalibrationDialog({super.key});
+
+  @override
+  State<CalibrationDialog> createState() => _CalibrationDialogState();
+}
+
+class _CalibrationDialogState extends State<CalibrationDialog> {
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      titlePadding: const EdgeInsets.fromLTRB(
+        Dimens.paddingL,
+        Dimens.paddingL,
+        Dimens.paddingL,
+        Dimens.paddingM,
+      ),
+      title: Text(S.of(context).calibration),
+      contentPadding: const EdgeInsets.symmetric(horizontal: Dimens.paddingL),
+      content: BlocBuilder<CalibrationDialogBloc, CalibrationDialogState>(
+        builder: (context, state) => Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Text(S.of(context).calibrationMessage),
+            const SizedBox(height: Dimens.grid16),
+            _CalibrationUnit(
+              title: S.of(context).camera,
+              value: state.cameraEvCalibration,
+              onChanged: (value) => context.read<CalibrationDialogBloc>().add(CameraEvCalibrationChangedEvent(value)),
+              onReset: () => context.read<CalibrationDialogBloc>().add(const CameraEvCalibrationResetEvent()),
+            ),
+          ],
+        ),
+      ),
+      actionsPadding: const EdgeInsets.fromLTRB(
+        Dimens.paddingL,
+        Dimens.paddingM,
+        Dimens.paddingL,
+        Dimens.paddingL,
+      ),
+      actions: [
+        TextButton(
+          onPressed: Navigator.of(context).pop,
+          child: Text(S.of(context).cancel),
+        ),
+        TextButton(
+          onPressed: () {
+            context.read<CalibrationDialogBloc>().add(const SaveCalibrationDialogEvent());
+            Navigator.of(context).pop();
+          },
+          child: Text(S.of(context).save),
+        ),
+      ],
+    );
+  }
+}
+
+class _CalibrationUnit extends StatelessWidget {
+  final String title;
+  final double value;
+  final ValueChanged<double> onChanged;
+  final VoidCallback onReset;
+
+  const _CalibrationUnit({
+    required this.title,
+    required this.value,
+    required this.onChanged,
+    required this.onReset,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        ListTile(
+          contentPadding: EdgeInsets.zero,
+          title: Text(title),
+          trailing: Text(S.of(context).ev(value.toStringSignedAsFixed(1))),
+        ),
+        Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Expanded(
+              child: CenteredSlider(
+                value: value,
+                min: -4,
+                max: 4,
+                onChanged: onChanged,
+              ),
+            ),
+            IconButton(
+              onPressed: onReset,
+              icon: const Icon(Icons.sync),
+            ),
+          ],
+        )
+      ],
+    );
+  }
+}

lib/screens/settings/components/calibration/widget_list_tile_calibration.dart

@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+import 'package:lightmeter/generated/l10n.dart';
+import 'package:lightmeter/interactors/settings_interactor.dart';
+import 'package:provider/provider.dart';
+
+import 'components/calibration_dialog/provider_dialog_calibration.dart';
+
+class CalibrationListTile extends StatelessWidget {
+  const CalibrationListTile({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      leading: const Icon(Icons.settings_brightness),
+      title: Text(S.of(context).calibration),
+      onTap: () {
+        showDialog<double>(
+          context: context,
+          builder: (_) => Provider.value(
+            value: context.read<SettingsInteractor>(),
+            child: const CalibrationDialogProvider(),
+          ),
+        );
+      },
+    );
+  }
+}

lib/screens/settings/components/haptics/bloc_list_tile_haptics.dart

@@ -1,17 +1,17 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:lightmeter/interactors/haptics_interactor.dart';
+import 'package:lightmeter/interactors/settings_interactor.dart';
 
 class HapticsListTileBloc extends Cubit<bool> {
-  final HapticsInteractor _hapticsInteractor;
+  final SettingsInteractor _settingsInteractor;
 
   HapticsListTileBloc(
-    this._hapticsInteractor,
+    this._settingsInteractor,
-  ) : super(_hapticsInteractor.isEnabled);
+  ) : super(_settingsInteractor.isHapticsEnabled);
 
   void onHapticsChange(bool value) {
-    _hapticsInteractor.enableHaptics(value);
+    _settingsInteractor.enableHaptics(value);
     if (value) {
-      _hapticsInteractor.quickVibration();
+      _settingsInteractor.quickVibration();
     }
     emit(value);
   }

lib/screens/settings/components/haptics/provider_list_tile_haptics.dart

@@ -1,9 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:lightmeter/data/haptics_service.dart';
+import 'package:lightmeter/interactors/settings_interactor.dart';
-import 'package:lightmeter/data/shared_prefs_service.dart';
-import 'package:lightmeter/interactors/haptics_interactor.dart';
-import 'package:provider/provider.dart';
 
 import 'bloc_list_tile_haptics.dart';
 import 'widget_list_tile_haptics.dart';
@@ -13,17 +10,9 @@ class HapticsListTileProvider extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Provider(
+    return BlocProvider(
-      create: (context) => HapticsInteractor(
+      create: (context) => HapticsListTileBloc(context.read<SettingsInteractor>()),
-        context.read<UserPreferencesService>(),
-        context.read<HapticsService>(),
-      ),
-      child: BlocProvider(
-        create: (context) => HapticsListTileBloc(
-          context.read<HapticsInteractor>()
-        ),
       child: const HapticsListTile(),
-      ),
     );
   }
 }

lib/screens/settings/flow_settings.dart

@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+import 'package:lightmeter/data/haptics_service.dart';
+import 'package:lightmeter/data/shared_prefs_service.dart';
+import 'package:lightmeter/interactors/settings_interactor.dart';
+import 'package:lightmeter/screens/settings/screen_settings.dart';
+import 'package:provider/provider.dart';
+
+class SettingsFlow extends StatelessWidget {
+  const SettingsFlow({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Provider(
+      create: (context) => SettingsInteractor(
+        context.read<UserPreferencesService>(),
+        context.read<HapticsService>(),
+      ),
+      child: const SettingsScreen(),
+    );
+  }
+}

lib/screens/settings/screen_settings.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:lightmeter/generated/l10n.dart';
 import 'package:lightmeter/res/dimens.dart';
 
+import 'components/calibration/widget_list_tile_calibration.dart';
 import 'components/haptics/provider_list_tile_haptics.dart';
 import 'components/report_issue/widget_list_tile_report_issue.dart';
 import 'components/shared/settings_section/widget_settings_section.dart';
@@ -48,6 +49,7 @@ class SettingsScreen extends StatelessWidget {
                     title: S.of(context).metering,
                     children: const [
                       StopTypeListTile(),
+                      CalibrationListTile(),
                     ],
                   ),
                   SettingsSection(

lib/screens/shared/centered_slider/widget_slider_centered.dart

@@ -1,16 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/res/dimens.dart';
 
-class CameraSlider extends StatefulWidget {
+class CenteredSlider extends StatefulWidget {
-  final Icon icon;
+  final Icon? icon;
   final double value;
   final double min;
   final double max;
   final ValueChanged<double> onChanged;
   final bool isVertical;
 
-  const CameraSlider({
+  const CenteredSlider({
-    required this.icon,
+    this.icon,
     required this.value,
     required this.min,
     required this.max,
@@ -20,10 +20,10 @@ class CameraSlider extends StatefulWidget {
   });
 
   @override
-  State<CameraSlider> createState() => _CameraSliderState();
+  State<CenteredSlider> createState() => _CenteredSliderState();
 }
 
-class _CameraSliderState extends State<CameraSlider> {
+class _CenteredSliderState extends State<CenteredSlider> {
   double relativeValue = 0.0;
 
   @override
@@ -33,14 +33,17 @@ class _CameraSliderState extends State<CameraSlider> {
   }
 
   @override
-  void didUpdateWidget(CameraSlider oldWidget) {
+  void didUpdateWidget(CenteredSlider oldWidget) {
     super.didUpdateWidget(oldWidget);
     relativeValue = (widget.value - widget.min) / (widget.max - widget.min);
   }
 
   @override
   Widget build(BuildContext context) {
-    return LayoutBuilder(
+    return SizedBox(
+      height: widget.isVertical ? double.maxFinite : Dimens.cameraSliderHandleSize,
+      width: !widget.isVertical ? double.maxFinite : Dimens.cameraSliderHandleSize,
+      child: LayoutBuilder(
         builder: (context, constraints) {
           final biggestSize = widget.isVertical ? constraints.maxHeight : constraints.maxWidth;
           final handleDistance = biggestSize - Dimens.cameraSliderHandleSize;
@@ -67,6 +70,7 @@ class _CameraSliderState extends State<CameraSlider> {
             ),
           );
         },
+      ),
     );
   }
 

lib/utils/to_string_signed.dart

@@ -7,3 +7,13 @@ extension SignedString on num {
     }
   }
 }
+
+extension SignedStringDouble on double {
+  String toStringSignedAsFixed(fractionDigits) {
+    if (this > 0) {
+      return "+${toStringAsFixed(fractionDigits)}";
+    } else {
+      return toStringAsFixed(fractionDigits);
+    }
+  }
+}