README.md

@@ -1,48 +1,58 @@
-<img src="resources/social_preview.png" width="100%" />
+<p align="center">
+  <img src="assets/launcher_icon_circle.png" width="100" height="100">
+</p>
+<p align="center", style="font-size:60px;">
+  <b>Material Lightmeter</b>
+</p>
 
 # Table of contents
 
 - [Table of contents](#table-of-contents)
 - [Backstory](#backstory)
-- [Screenshots](#screenshots)
+- [Legacy features](#legacy-features)
 - [Build](#build)
 - [Contribution](#contribution)
-- [iOS Limitations](#ios-limitations)
 
 # Backstory
 
 Some time ago I've started developing the [Material Lightmeter](https://play.google.com/store/apps/details?id=com.vodemn.lightmeter&hl=en&gl=US) app. Unfortunately, the last update of this app was almost a year prior to creation of this repo. So after reading some positive review on Google Play saying that "this is an excellent app, too bad it is no longer updated", I've decided to make an update and also make this app open source. Maybe someone sometime will decide to contribute to this project.
 
-But as the existing repo contained some sensitive data, that I've pushed due to lack of experience, I had to make a new one. And if creating a new repo, why not rewrite the app from scratch?
+But as the existing repo contained some sensitive data, that I've pushed due to lack of experience, I had to make a new one. And if creating a new repo, why not rewrite the app from scratch?)
 
 Without further delay behold my new Lightmeter app inspired by Material You (a.k.a. M3)
 
-# Screenshots
+# Legacy features
 
-<p float="center">
+The list of features that the old lightmeter app has and that have to be implemeneted in the M3 lightmeter.
-  <img src="https://lh3.googleusercontent.com/8Sd-pmNcQ0xAr5opuTeJKWr2OXeQvCoFSdVDSoKQSHHKeNmqF71hqeAdm3yjunY12zY" width="18.8%" />
-  <img src="https://lh3.googleusercontent.com/rqBv8pT0AdcBy0xEgQY2unV-YEQ5KfUkandAxJ62yYCiSF72HClA_tkb4JT_3UPaIfFP" width="18.8%" />
-  <img src="https://lh3.googleusercontent.com/-SnYbYSugVfdwYi6m_rd9CzpCZMCIfudhnq0zRIlzEtLSXhrwziWVd2hotygfqiSofI" width="18.8%" />
-  <img src="https://lh3.googleusercontent.com/UXxptL_dAIJDtrmpEZuSz39Iq4HuPb3ZPeuANfE9XH0De0uZQT83LNdu1AObBPobpg" width="18.8%" />
-  <img src="https://lh3.googleusercontent.com/15g_SPV8knDLFbz1_-wGNJFsJeyVWZ_y--TGHpk75MaaIdMDyTXY2_TL-Aw8bpOhpw" width="18.8%" />
-</p>
 
-# Build
+### Metering
+- [x] ISO selecting
+- [x] Reciprocity for different films
+- [x] Reflected light metering
+- [x] Incident light metering
+
+### Adjust
+- [x] Light sources EV calibration
+- [ ] Customizable aperture range
+- [ ] Customizable shutter speed range
+- [x] ND filter select
+
+### General
+- [x] Caffeine
+- [x] Vibration
+- [ ] Volume button actions
+
+### Theme
+- [x] Dark theme
+- [x] Picking primary color
+- [x] Russian language
+
+## Build
 
 As part of this project is private, you will be able to run this app from the _main_dev.dart_ file (i.e. --flavor dev). Also to avoid fatal errors the _main_prod.dart_ file is excluded from analysis.
 
-# Contribution
+## Contribution
 
 To report a bug or suggest a new feature open a new [issue](https://github.com/vodemn/m3_lightmeter/issues).
 
 In case you want to help develop this project you need to follow this [style guide](doc/style_guide.md).
-
-# iOS Limitations
-
-A list of features, that Android version of the app has and that iOS does not.
-
-## Incident light metering
-Apple does not provide API for reading Lux stream form the ambient light sensor. Lux can be calculated based on front camera image stream, but this would be a reflected light. So there is no way incident light metering can be implemented on iOS.
-
-## Volume buttons action
-This can be [implemented](https://stackoverflow.com/questions/70161271/ios-override-hardware-volume-buttons-same-as-zello) but the app will be rejected due to [2.5.9](https://developer.apple.com/app-store/review/guidelines/#software-requirements)

android/app/src/main/kotlin/com/vodemn/lightmeter/MainActivity.kt

@@ -1,22 +1,13 @@
 package com.vodemn.lightmeter
 
 import android.os.Bundle
-import android.view.KeyEvent
 import android.view.WindowManager
 import androidx.core.view.WindowCompat
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.plugin.common.EventChannel
-import io.flutter.plugin.common.EventChannel.EventSink
 import io.flutter.plugin.common.MethodChannel
 
 class MainActivity : FlutterActivity() {
-    private lateinit var keepScreenOnChannel: MethodChannel
-    private lateinit var volumeHandlingChannel: MethodChannel
-    private lateinit var volumeEventChannel: EventChannel
-    private var volumeEventsEmitter: EventSink? = null
-    private var handleVolume = false
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         WindowCompat.setDecorFitsSystemWindows(window, false)
@@ -24,11 +15,10 @@ class MainActivity : FlutterActivity() {
 
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
-        keepScreenOnChannel = MethodChannel(
+        MethodChannel(
             flutterEngine.dartExecutor.binaryMessenger,
             "com.vodemn.lightmeter/keepScreenOn"
-        )
+        ).setMethodCallHandler { call, result ->
-        keepScreenOnChannel.setMethodCallHandler { call, result ->
             when (call.method) {
                 "isKeepScreenOn" -> result.success((window.attributes.flags and WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) != 0)
                 "setKeepScreenOn" -> {
@@ -43,53 +33,5 @@ class MainActivity : FlutterActivity() {
                 else -> result.notImplemented()
             }
         }
-
-        volumeHandlingChannel = MethodChannel(
-            flutterEngine.dartExecutor.binaryMessenger,
-            "com.vodemn.lightmeter/volumeHandling"
-        )
-        volumeHandlingChannel.setMethodCallHandler { call, result ->
-            when (call.method) {
-                "setVolumeHandling" -> {
-                    handleVolume = call.arguments as Boolean
-                    result.success(handleVolume)
-                }
-                else -> result.notImplemented()
-            }
-        }
-
-        volumeEventChannel = EventChannel(
-            flutterEngine.dartExecutor.binaryMessenger,
-            "com.vodemn.lightmeter/volumeEvents"
-        )
-        volumeEventChannel.setStreamHandler(object : EventChannel.StreamHandler {
-            override fun onListen(listener: Any?, eventSink: EventSink) {
-                volumeEventsEmitter = eventSink
-            }
-            override fun onCancel(listener: Any?) {
-                volumeEventsEmitter = null
-            }
-        })
-    }
-
-    override fun onDestroy() {
-        keepScreenOnChannel.setMethodCallHandler(null)
-        volumeHandlingChannel.setMethodCallHandler(null)
-        volumeEventChannel.setStreamHandler(null)
-        super.onDestroy()
-    }
-
-    override fun onKeyDown(code: Int, event: KeyEvent): Boolean {
-        return when (val keyCode: Int = event.keyCode) {
-            KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN -> {
-                if (handleVolume) {
-                    volumeEventsEmitter?.success(keyCode)
-                    true
-                } else {
-                    super.onKeyDown(code, event)
-                }
-            }
-            else -> super.onKeyDown(code, event)
-        }
     }
 }

lib/data/light_sensor_service.dart

@@ -1,15 +1,9 @@
 import 'package:light_sensor/light_sensor.dart';
-import 'package:platform/platform.dart';
 
 class LightSensorService {
-  final LocalPlatform localPlatform;
+  const LightSensorService();
-
-  const LightSensorService(this.localPlatform);
 
   Future<bool> hasSensor() async {
-    if (!localPlatform.isAndroid) {
-      return false;
-    }
     try {
       return await LightSensor.hasSensor ?? false;
     } catch (_) {
@@ -17,10 +11,5 @@ class LightSensorService {
     }
   }
 
-  Stream<int> luxStream() {
+  Stream<int> luxStream() => LightSensor.lightSensorStream;
-    if (!localPlatform.isAndroid) {
-      return const Stream<int>.empty();
-    }
-    return LightSensor.lightSensorStream;
-  }
 }

lib/data/models/volume_action.dart

@@ -1,3 +0,0 @@
-enum VolumeAction { shutter, none }
-
-enum VolumeKey { up, down }

lib/data/shared_prefs_service.dart

@@ -6,7 +6,6 @@ import 'package:lightmeter/data/models/film.dart';
 import 'package:lightmeter/data/models/metering_screen_layout_config.dart';
 import 'package:lightmeter/data/models/supported_locale.dart';
 import 'package:lightmeter/data/models/theme_type.dart';
-import 'package:lightmeter/data/models/volume_action.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -23,7 +22,6 @@ class UserPreferencesService {
 
   static const caffeineKey = "caffeine";
   static const hapticsKey = "haptics";
-  static const volumeActionKey = "volumeAction";
   static const localeKey = "locale";
 
   static const themeTypeKey = "themeType";
@@ -84,6 +82,9 @@ class UserPreferencesService {
       EvSourceType.values[_sharedPreferences.getInt(evSourceTypeKey) ?? 0];
   set evSourceType(EvSourceType value) => _sharedPreferences.setInt(evSourceTypeKey, value.index);
 
+  bool get caffeine => _sharedPreferences.getBool(caffeineKey) ?? false;
+  set caffeine(bool value) => _sharedPreferences.setBool(caffeineKey, value);
+
   StopType get stopType => StopType.values[_sharedPreferences.getInt(stopTypeKey) ?? 2];
   set stopType(StopType value) => _sharedPreferences.setInt(stopTypeKey, value.index);
 
@@ -104,19 +105,9 @@ class UserPreferencesService {
   set meteringScreenLayout(MeteringScreenLayoutConfig value) =>
       _sharedPreferences.setString(meteringScreenLayoutKey, json.encode(value.toJson()));
 
-  bool get caffeine => _sharedPreferences.getBool(caffeineKey) ?? false;
-  set caffeine(bool value) => _sharedPreferences.setBool(caffeineKey, value);
-
   bool get haptics => _sharedPreferences.getBool(hapticsKey) ?? true;
   set haptics(bool value) => _sharedPreferences.setBool(hapticsKey, value);
 
-  VolumeAction get volumeAction => VolumeAction.values.firstWhere(
-        (e) => e.toString() == _sharedPreferences.getString(volumeActionKey),
-        orElse: () => VolumeAction.shutter,
-      );
-  set volumeAction(VolumeAction value) =>
-      _sharedPreferences.setString(volumeActionKey, value.toString());
-
   SupportedLocale get locale => SupportedLocale.values.firstWhere(
         (e) => e.toString() == _sharedPreferences.getString(localeKey),
         orElse: () => SupportedLocale.en,

lib/data/volume_events_service.dart

@@ -1,40 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:flutter/services.dart';
-import 'package:platform/platform.dart';
-
-class VolumeEventsService {
-  final LocalPlatform localPlatform;
-
-  @visibleForTesting
-  static const volumeHandlingChannel = MethodChannel("com.vodemn.lightmeter/volumeHandling");
-
-  @visibleForTesting
-  static const volumeEventsChannel = EventChannel("com.vodemn.lightmeter/volumeEvents");
-
-  const VolumeEventsService(this.localPlatform);
-
-  /// If set to `false` we allow system to handle key events.
-  /// Returns current status of volume handling.
-  Future<bool> setVolumeHandling(bool enableHandling) async {
-    if (!localPlatform.isAndroid) {
-      return false;
-    }
-    return volumeHandlingChannel
-        .invokeMethod<bool>("setVolumeHandling", enableHandling)
-        .then((value) => value!);
-  }
-
-  /// Emits new events on
-  /// KEYCODE_VOLUME_UP = 24;
-  /// KEYCODE_VOLUME_DOWN = 25;
-  /// pressed
-  Stream<int> volumeButtonsEventStream() {
-    if (!localPlatform.isAndroid) {
-      return const Stream.empty();
-    }
-    return volumeEventsChannel
-        .receiveBroadcastStream()
-        .cast<int>()
-        .where((event) => event == 24 || event == 25);
-  }
-}

lib/interactors/metering_interactor.dart

@@ -1,12 +1,12 @@
+import 'dart:io';
+
 import 'package:app_settings/app_settings.dart';
 import 'package:lightmeter/data/caffeine_service.dart';
 import 'package:lightmeter/data/haptics_service.dart';
 import 'package:lightmeter/data/light_sensor_service.dart';
 import 'package:lightmeter/data/models/film.dart';
-import 'package:lightmeter/data/models/volume_action.dart';
 import 'package:lightmeter/data/permissions_service.dart';
 import 'package:lightmeter/data/shared_prefs_service.dart';
-import 'package:lightmeter/data/volume_events_service.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 import 'package:permission_handler/permission_handler.dart';
 
@@ -16,7 +16,6 @@ class MeteringInteractor {
   final HapticsService _hapticsService;
   final PermissionsService _permissionsService;
   final LightSensorService _lightSensorService;
-  final VolumeEventsService _volumeEventsService;
 
   MeteringInteractor(
     this._userPreferencesService,
@@ -24,13 +23,10 @@ class MeteringInteractor {
     this._hapticsService,
     this._permissionsService,
     this._lightSensorService,
-    this._volumeEventsService,
   ) {
     if (_userPreferencesService.caffeine) {
       _caffeineService.keepScreenOn(true);
     }
-    _volumeEventsService
-        .setVolumeHandling(_userPreferencesService.volumeAction != VolumeAction.none);
   }
 
   double get cameraEvCalibration => _userPreferencesService.cameraEvCalibration;
@@ -46,8 +42,6 @@ class MeteringInteractor {
   Film get film => _userPreferencesService.film;
   set film(Film value) => _userPreferencesService.film = value;
 
-  VolumeAction get volumeAction => _userPreferencesService.volumeAction;
-
   /// Executes vibration if haptics are enabled in settings
   Future<void> quickVibration() async {
     if (_userPreferencesService.haptics) await _hapticsService.quickVibration();
@@ -79,7 +73,13 @@ class MeteringInteractor {
     AppSettings.openAppSettings();
   }
 
-  Future<bool> hasAmbientLightSensor() async => _lightSensorService.hasSensor();
+  Future<bool> hasAmbientLightSensor() async {
+    if (Platform.isAndroid) {
+      return _lightSensorService.hasSensor();
+    } else {
+      return false;
+    }
+  }
 
   Stream<int> luxStream() => _lightSensorService.luxStream();
 }

lib/interactors/settings_interactor.dart

@@ -1,20 +1,16 @@
 import 'package:lightmeter/data/caffeine_service.dart';
 import 'package:lightmeter/data/haptics_service.dart';
-import 'package:lightmeter/data/models/volume_action.dart';
 import 'package:lightmeter/data/shared_prefs_service.dart';
-import 'package:lightmeter/data/volume_events_service.dart';
 
 class SettingsInteractor {
   final UserPreferencesService _userPreferencesService;
   final CaffeineService _caffeineService;
   final HapticsService _hapticsService;
-  final VolumeEventsService _volumeEventsService;
 
   const SettingsInteractor(
     this._userPreferencesService,
     this._caffeineService,
     this._hapticsService,
-    this._volumeEventsService,
   );
 
   double get cameraEvCalibration => _userPreferencesService.cameraEvCalibration;
@@ -31,20 +27,6 @@ class SettingsInteractor {
     });
   }
 
-  Future<void> disableVolumeHandling() async {
-    await _volumeEventsService.setVolumeHandling(false);
-  }
-  Future<void> restoreVolumeHandling() async {
-    await _volumeEventsService
-        .setVolumeHandling(_userPreferencesService.volumeAction != VolumeAction.none);
-  }
-
-  VolumeAction get volumeAction => _userPreferencesService.volumeAction;
-  Future<void> setVolumeAction(VolumeAction value) async {
-    await _volumeEventsService.setVolumeHandling(value != VolumeAction.none);
-    _userPreferencesService.volumeAction = value;
-  }
-
   bool get isHapticsEnabled => _userPreferencesService.haptics;
   void enableHaptics(bool enable) {
     _userPreferencesService.haptics = enable;

lib/l10n/intl_en.arb

@@ -56,7 +56,6 @@
     "general": "General",
     "keepScreenOn": "Keep screen on",
     "haptics": "Haptics",
-    "volumeKeysAction": "Shutter by volume keys",
     "language": "Language",
     "chooseLanguage": "Choose language",
     "theme": "Theme",

lib/l10n/intl_fr.arb

@@ -56,7 +56,6 @@
     "general": "Général",
     "keepScreenOn": "Garder l'écran allumé",
     "haptics": "Haptiques",
-    "volumeKeysAction": "Obturateur par boutons de volume",
     "language": "Langue",
     "chooseLanguage": "Choisissez la langue",
     "theme": "Thème",

lib/l10n/intl_ru.arb

@@ -56,7 +56,6 @@
     "general": "Общие",
     "keepScreenOn": "Запрет блокировки",
     "haptics": "Вибрация",
-    "volumeKeysAction": "Затвор по кнопкам громкости",
     "language": "Язык",
     "chooseLanguage": "Выберите язык",
     "theme": "Тема",

lib/main_prod.dart

@@ -6,5 +6,6 @@ import 'package:lightmeter/firebase.dart';
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await initializeFirebase();
+
   runApp(const Application(Environment.prod()));
 }

lib/providers.dart

@@ -1,10 +1,11 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:lightmeter/data/caffeine_service.dart';
 import 'package:lightmeter/data/haptics_service.dart';
 import 'package:lightmeter/data/light_sensor_service.dart';
 import 'package:lightmeter/data/permissions_service.dart';
 import 'package:lightmeter/data/shared_prefs_service.dart';
-import 'package:lightmeter/data/volume_events_service.dart';
 import 'package:lightmeter/environment.dart';
 import 'package:lightmeter/providers/equipment_profile_provider.dart';
 import 'package:lightmeter/providers/ev_source_type_provider.dart';
@@ -13,7 +14,6 @@ import 'package:lightmeter/providers/stop_type_provider.dart';
 import 'package:lightmeter/providers/supported_locale_provider.dart';
 import 'package:lightmeter/providers/theme_provider.dart';
 import 'package:lightmeter/utils/inherited_generics.dart';
-import 'package:platform/platform.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class LightmeterProviders extends StatelessWidget {
@@ -27,7 +27,7 @@ class LightmeterProviders extends StatelessWidget {
     return FutureBuilder(
       future: Future.wait([
         SharedPreferences.getInstance(),
-        const LightSensorService(LocalPlatform()).hasSensor(),
+        if (Platform.isAndroid) const LightSensorService().hasSensor() else Future.value(false),
       ]),
       builder: (_, snapshot) {
         if (snapshot.data != null) {
@@ -36,24 +36,21 @@ class LightmeterProviders extends StatelessWidget {
             child: InheritedWidgetBase<UserPreferencesService>(
               data: UserPreferencesService(snapshot.data![0] as SharedPreferences),
               child: InheritedWidgetBase<LightSensorService>(
-                data: const LightSensorService(LocalPlatform()),
+                data: const LightSensorService(),
                 child: InheritedWidgetBase<CaffeineService>(
                   data: const CaffeineService(),
                   child: InheritedWidgetBase<HapticsService>(
                     data: const HapticsService(),
-                    child: InheritedWidgetBase<VolumeEventsService>(
+                    child: InheritedWidgetBase<PermissionsService>(
-                      data: const VolumeEventsService(LocalPlatform()),
+                      data: const PermissionsService(),
-                      child: InheritedWidgetBase<PermissionsService>(
+                      child: MeteringScreenLayoutProvider(
-                        data: const PermissionsService(),
+                        child: StopTypeProvider(
-                        child: MeteringScreenLayoutProvider(
+                          child: EquipmentProfileProvider(
-                          child: StopTypeProvider(
+                            child: EvSourceTypeProvider(
-                            child: EquipmentProfileProvider(
+                              child: SupportedLocaleProvider(
-                              child: EvSourceTypeProvider(
+                                child: ThemeProvider(
-                                child: SupportedLocaleProvider(
+                                  child: Builder(
-                                  child: ThemeProvider(
+                                    builder: (context) => builder(context, true),
-                                    child: Builder(
-                                      builder: (context) => builder(context, true),
-                                    ),
                                   ),
                                 ),
                               ),

lib/screens/metering/bloc_metering.dart

@@ -4,27 +4,23 @@ import 'package:bloc_concurrency/bloc_concurrency.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lightmeter/data/models/film.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/components/shared/volume_keys_notifier/notifier_volume_keys.dart';
 import 'package:lightmeter/screens/metering/event_metering.dart';
 import 'package:lightmeter/screens/metering/state_metering.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(
@@ -35,7 +31,6 @@ class MeteringBloc extends Bloc<MeteringEvent, MeteringState> {
             isMetering: false,
           ),
         ) {
-    _volumeKeysNotifier.addListener(onVolumeKey);
     _communicationSubscription = _communicationBloc.stream
         .where((state) => state is communication_states.ScreenState)
         .map((state) => state as communication_states.ScreenState)
@@ -48,8 +43,6 @@ class MeteringBloc extends Bloc<MeteringEvent, MeteringState> {
     on<MeasureEvent>(_onMeasure, transformer: droppable());
     on<MeasuredEvent>(_onMeasured);
     on<MeasureErrorEvent>(_onMeasureError);
-    on<SettingsOpenedEvent>(_onSettingsOpened);
-    on<SettingsClosedEvent>(_onSettingsClosed);
   }
 
   @override
@@ -71,7 +64,6 @@ class MeteringBloc extends Bloc<MeteringEvent, MeteringState> {
 
   @override
   Future<void> close() async {
-    _volumeKeysNotifier.removeListener(onVolumeKey);
     await _communicationSubscription.cancel();
     return super.close();
   }
@@ -228,19 +220,4 @@ class MeteringBloc extends Bloc<MeteringEvent, MeteringState> {
       ),
     );
   }
-
-  @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());
-  }
 }

lib/screens/metering/communication/bloc_communication_metering.dart

@@ -11,7 +11,5 @@ class MeteringCommunicationBloc
     on<MeasureEvent>((_, emit) => emit(MeasureState()));
     on<MeteringInProgressEvent>((event, emit) => emit(MeteringInProgressState(event.ev100)));
     on<MeteringEndedEvent>((event, emit) => emit(MeteringEndedState(event.ev100)));
-    on<SettingsOpenedEvent>((_, emit) => emit(const SettingsOpenedState()));
-    on<SettingsClosedEvent>((_, emit) => emit(const SettingsClosedState()));
   }
 }

lib/screens/metering/communication/event_communication_metering.dart

@@ -47,11 +47,3 @@ class MeteringEndedEvent extends MeasuredEvent {
   @override
   int get hashCode => Object.hash(ev100, runtimeType);
 }
-
-class SettingsOpenedEvent extends ScreenEvent {
-  const SettingsOpenedEvent();
-}
-
-class SettingsClosedEvent extends ScreenEvent {
-  const SettingsClosedEvent();
-}

lib/screens/metering/communication/state_communication_metering.dart

@@ -51,11 +51,3 @@ class MeteringEndedState extends MeasuredState {
   @override
   int get hashCode => Object.hash(ev100, runtimeType);
 }
-
-class SettingsOpenedState extends SourceState {
-  const SettingsOpenedState();
-}
-
-class SettingsClosedState extends SourceState {
-  const SettingsClosedState();
-}

lib/screens/metering/components/camera_container/bloc_container_camera.dart

@@ -23,7 +23,6 @@ import 'package:lightmeter/utils/log_2.dart';
 class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraContainerState> {
   final MeteringInteractor _meteringInteractor;
   late final _WidgetsBindingObserver _observer;
-
   CameraController? _cameraController;
 
   static const _maxZoom = 7.0;
@@ -37,8 +36,6 @@ class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraC
 
   double? _ev100 = 0.0;
 
-  bool _settingsOpened = false;
-
   CameraContainerBloc(
     this._meteringInteractor,
     MeteringCommunicationBloc communicationBloc,
@@ -68,26 +65,18 @@ class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraC
 
   @override
   void onCommunicationState(communication_states.SourceState communicationState) {
-    switch (communicationState) {
+    if (communicationState is communication_states.MeasureState) {
-      case communication_states.MeasureState():
+      if (_canTakePhoto) {
-        if (_canTakePhoto) {
+        _takePhoto().then((ev100Raw) {
-          _takePhoto().then((ev100Raw) {
+          if (ev100Raw != null) {
-            if (ev100Raw != null) {
+            _ev100 = ev100Raw + _meteringInteractor.cameraEvCalibration;
-              _ev100 = ev100Raw + _meteringInteractor.cameraEvCalibration;
+            communicationBloc.add(communication_event.MeteringEndedEvent(_ev100));
-              communicationBloc.add(communication_event.MeteringEndedEvent(_ev100));
+          } else {
-            } else {
+            _ev100 = null;
-              _ev100 = null;
+            communicationBloc.add(const communication_event.MeteringEndedEvent(null));
-              communicationBloc.add(const communication_event.MeteringEndedEvent(null));
+          }
-            }
+        });
-          });
+      }
-        }
-      case communication_states.SettingsOpenedState():
-        _settingsOpened = true;
-        add(const DeinitializeEvent());
-      case communication_states.SettingsClosedState():
-        _settingsOpened = false;
-        add(const InitializeEvent());
-      default:
     }
   }
 
@@ -159,15 +148,12 @@ class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraC
   }
 
   Future<void> _onDeinitialize(DeinitializeEvent _, Emitter emit) async {
-    emit(const CameraInitState());
+    emit(const CameraLoadingState());
-    communicationBloc.add(communication_event.MeteringEndedEvent(_ev100));
+    unawaited(_cameraController?.dispose().then((_) => _cameraController = null));
-    await _cameraController?.dispose().then((_) => _cameraController = null);
   }
 
   Future<void> _onZoomChanged(ZoomChangedEvent event, Emitter emit) async {
-    if (_cameraController != null &&
+    if (_cameraController != null) {
-        event.value >= _zoomRange!.start &&
-        event.value <= _zoomRange!.end) {
       _cameraController!.setZoomLevel(event.value);
       _currentZoom = event.value;
       _emitActiveState(emit);
@@ -229,15 +215,13 @@ class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraC
   }
 
   Future<void> _appLifecycleStateObserver(AppLifecycleState state) async {
-    if (!_settingsOpened) {
+    switch (state) {
-      switch (state) {
+      case AppLifecycleState.resumed:
-        case AppLifecycleState.resumed:
+        add(const InitializeEvent());
-          add(const InitializeEvent());
+      case AppLifecycleState.paused:
-        case AppLifecycleState.paused:
+      case AppLifecycleState.detached:
-        case AppLifecycleState.detached:
+        add(const DeinitializeEvent());
-          add(const DeinitializeEvent());
+      default:
-        default:
-      }
     }
   }
 }

lib/screens/metering/components/light_sensor_container/bloc_container_light_sensor.dart

@@ -25,44 +25,37 @@ class LightSensorContainerBloc
           communicationBloc,
           const LightSensorContainerState(null),
         ) {
-    on<StartLuxMeteringEvent>(_onStartLuxMeteringEvent);
     on<LuxMeteringEvent>(_onLuxMeteringEvent);
-    on<CancelLuxMeteringEvent>(_onCancelLuxMeteringEvent);
   }
 
   @override
   void onCommunicationState(communication_states.SourceState communicationState) {
-    switch (communicationState) {
+    if (communicationState is communication_states.MeasureState) {
-      case communication_states.MeasureState():
+      if (_luxSubscriptions == null) {
-        if (_luxSubscriptions == null) {
+        _startMetering();
-          add(const StartLuxMeteringEvent());
+      } else {
-        } else {
+        _cancelMetering();
-          add(const CancelLuxMeteringEvent());
+      }
-        }
-      case communication_states.SettingsOpenedState():
-        add(const CancelLuxMeteringEvent());
-      default:
     }
   }
 
   @override
   Future<void> close() async {
-    communicationBloc.add(communication_event.MeteringEndedEvent(state.ev100));
+    _cancelMetering();
-    _luxSubscriptions?.cancel().then((_) => _luxSubscriptions = null);
     return super.close();
   }
 
-  void _onStartLuxMeteringEvent(StartLuxMeteringEvent event, _) {
-    _luxSubscriptions = _meteringInteractor.luxStream().listen((lux) => add(LuxMeteringEvent(lux)));
-  }
-
   void _onLuxMeteringEvent(LuxMeteringEvent event, Emitter<LightSensorContainerState> emit) {
     final ev100 = log2(event.lux.toDouble() / 2.5) + _meteringInteractor.lightSensorEvCalibration;
     emit(LightSensorContainerState(ev100));
     communicationBloc.add(communication_event.MeteringInProgressEvent(ev100));
   }
 
-  void _onCancelLuxMeteringEvent(CancelLuxMeteringEvent event, _) {
+  void _startMetering() {
+    _luxSubscriptions = _meteringInteractor.luxStream().listen((lux) => add(LuxMeteringEvent(lux)));
+  }
+
+  void _cancelMetering() {
     communicationBloc.add(communication_event.MeteringEndedEvent(state.ev100));
     _luxSubscriptions?.cancel().then((_) => _luxSubscriptions = null);
   }

lib/screens/metering/components/light_sensor_container/event_container_light_sensor.dart

@@ -2,16 +2,8 @@ abstract class LightSensorContainerEvent {
   const LightSensorContainerEvent();
 }
 
-class StartLuxMeteringEvent extends LightSensorContainerEvent {
-  const StartLuxMeteringEvent();
-}
-
 class LuxMeteringEvent extends LightSensorContainerEvent {
   final int lux;
 
   const LuxMeteringEvent(this.lux);
 }
-
-class CancelLuxMeteringEvent extends LightSensorContainerEvent {
-  const CancelLuxMeteringEvent();
-}

lib/screens/metering/components/shared/volume_keys_notifier/notifier_volume_keys.dart

@@ -1,32 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:lightmeter/data/models/volume_action.dart';
-import 'package:lightmeter/data/volume_events_service.dart';
-
-class VolumeKeysNotifier extends ChangeNotifier with RouteAware {
-  final VolumeEventsService volumeEventsService;
-  late final StreamSubscription<VolumeKey> _volumeKeysSubscription;
-  VolumeKey _value = VolumeKey.up;
-
-  VolumeKeysNotifier(this.volumeEventsService) {
-    _volumeKeysSubscription = volumeEventsService
-        .volumeButtonsEventStream()
-        .map((event) => event == 24 ? VolumeKey.up : VolumeKey.down)
-        .listen((event) {
-      value = event;
-    });
-  }
-
-  VolumeKey get value => _value;
-  set value(VolumeKey newValue) {
-    _value = newValue;
-    notifyListeners();
-  }
-
-  @override
-  Future<void> dispose() async {
-    await _volumeKeysSubscription.cancel();
-    super.dispose();
-  }
-}

lib/screens/metering/event_metering.dart

@@ -45,11 +45,3 @@ class MeasureErrorEvent extends MeteringEvent {
 
   const MeasureErrorEvent({required this.isMetering});
 }
-
-class SettingsOpenedEvent extends MeteringEvent {
-  const SettingsOpenedEvent();
-}
-
-class SettingsClosedEvent extends MeteringEvent {
-  const SettingsClosedEvent();
-}

lib/screens/metering/flow_metering.dart

@@ -5,11 +5,9 @@ import 'package:lightmeter/data/haptics_service.dart';
 import 'package:lightmeter/data/light_sensor_service.dart';
 import 'package:lightmeter/data/permissions_service.dart';
 import 'package:lightmeter/data/shared_prefs_service.dart';
-import 'package:lightmeter/data/volume_events_service.dart';
 import 'package:lightmeter/interactors/metering_interactor.dart';
 import 'package:lightmeter/screens/metering/bloc_metering.dart';
 import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart';
-import 'package:lightmeter/screens/metering/components/shared/volume_keys_notifier/notifier_volume_keys.dart';
 import 'package:lightmeter/screens/metering/screen_metering.dart';
 import 'package:lightmeter/utils/inherited_generics.dart';
 
@@ -30,23 +28,18 @@ class _MeteringFlowState extends State<MeteringFlow> {
         context.get<HapticsService>(),
         context.get<PermissionsService>(),
         context.get<LightSensorService>(),
-        context.get<VolumeEventsService>(),
       ),
-      child: InheritedWidgetBase<VolumeKeysNotifier>(
+      child: MultiBlocProvider(
-        data: VolumeKeysNotifier(context.get<VolumeEventsService>()),
+        providers: [
-        child: MultiBlocProvider(
+          BlocProvider(create: (_) => MeteringCommunicationBloc()),
-          providers: [
+          BlocProvider(
-            BlocProvider(create: (_) => MeteringCommunicationBloc()),
+            create: (context) => MeteringBloc(
-            BlocProvider(
+              context.get<MeteringInteractor>(),
-              create: (context) => MeteringBloc(
+              context.read<MeteringCommunicationBloc>(),
-                context.get<MeteringInteractor>(),
-                context.get<VolumeKeysNotifier>(),
-                context.read<MeteringCommunicationBloc>(),
-              ),
             ),
-          ],
+          ),
-          child: const MeteringScreen(),
+        ],
-        ),
+        child: const MeteringScreen(),
       ),
     );
   }

lib/screens/metering/screen_metering.dart

@@ -50,12 +50,7 @@ class MeteringScreen extends StatelessWidget {
                     ? EvSourceTypeProvider.of(context).toggleType
                     : null,
                 onMeasure: () => context.read<MeteringBloc>().add(const MeasureEvent()),
-                onSettings: () {
+                onSettings: () => Navigator.pushNamed(context, 'settings'),
-                  context.read<MeteringBloc>().add(const SettingsOpenedEvent());
-                  Navigator.pushNamed(context, 'settings').then((value) {
-                    context.read<MeteringBloc>().add(const SettingsClosedEvent());
-                  });
-                },
               ),
             ),
           ],

lib/screens/settings/components/general/components/caffeine/widget_list_tile_caffeine.dart

@@ -1,7 +1,6 @@
 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/general/components/caffeine/bloc_list_tile_caffeine.dart';
 
@@ -16,7 +15,6 @@ class CaffeineListTile extends StatelessWidget {
         title: Text(S.of(context).keepScreenOn),
         value: state,
         onChanged: context.read<CaffeineListTileBloc>().onCaffeineChanged,
-        contentPadding: const EdgeInsets.symmetric(horizontal: Dimens.paddingM),
       ),
     );
   }

lib/screens/settings/components/general/components/haptics/widget_list_tile_haptics.dart

@@ -1,7 +1,6 @@
 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/general/components/haptics/bloc_list_tile_haptics.dart';
 
@@ -16,7 +15,6 @@ class HapticsListTile extends StatelessWidget {
         title: Text(S.of(context).haptics),
         value: state,
         onChanged: context.read<HapticsListTileBloc>().onHapticsChanged,
-        contentPadding: const EdgeInsets.symmetric(horizontal: Dimens.paddingM),
       ),
     );
   }

lib/screens/settings/components/general/components/volume_actions/bloc_list_tile_volume_actions.dart

@@ -1,20 +0,0 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:lightmeter/data/models/volume_action.dart';
-import 'package:lightmeter/interactors/settings_interactor.dart';
-
-class VolumeActionsListTileBloc extends Cubit<bool> {
-  final SettingsInteractor _settingsInteractor;
-
-  VolumeActionsListTileBloc(
-    this._settingsInteractor,
-  ) : super(_settingsInteractor.volumeAction == VolumeAction.shutter);
-
-  void onVolumeActionChanged(bool value) {
-    _settingsInteractor.setVolumeAction(value ? VolumeAction.shutter : VolumeAction.none);
-
-    // while in settings we allow system to handle volume
-    // so that volume keys action works only when necessary - on the metering screen
-    _settingsInteractor.disableVolumeHandling();
-    emit(value);
-  }
-}

lib/screens/settings/components/general/components/volume_actions/provider_list_tile_volume_actions.dart

@@ -1,19 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:lightmeter/interactors/settings_interactor.dart';
-
-import 'package:lightmeter/screens/settings/components/general/components/volume_actions/bloc_list_tile_volume_actions.dart';
-import 'package:lightmeter/screens/settings/components/general/components/volume_actions/widget_list_tile_volume_actions.dart';
-import 'package:lightmeter/utils/inherited_generics.dart';
-
-class VolumeActionsListTileProvider extends StatelessWidget {
-  const VolumeActionsListTileProvider({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) => VolumeActionsListTileBloc(context.get<SettingsInteractor>()),
-      child: const VolumeActionsListTile(),
-    );
-  }
-}

lib/screens/settings/components/general/components/volume_actions/widget_list_tile_volume_actions.dart

@@ -1,22 +0,0 @@
-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/general/components/volume_actions/bloc_list_tile_volume_actions.dart';
-
-class VolumeActionsListTile extends StatelessWidget {
-  const VolumeActionsListTile({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<VolumeActionsListTileBloc, bool>(
-      builder: (context, state) => SwitchListTile(
-        secondary: const Icon(Icons.volume_up),
-        title: Text(S.of(context).volumeKeysAction),
-        value: state,
-        onChanged: context.read<VolumeActionsListTileBloc>().onVolumeActionChanged,
-        contentPadding: const EdgeInsets.symmetric(horizontal: Dimens.paddingM),
-      ),
-    );
-  }
-}

lib/screens/settings/components/general/widget_settings_section_general.dart

@@ -1,11 +1,8 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:lightmeter/generated/l10n.dart';
 import 'package:lightmeter/screens/settings/components/general/components/caffeine/provider_list_tile_caffeine.dart';
 import 'package:lightmeter/screens/settings/components/general/components/haptics/provider_list_tile_haptics.dart';
 import 'package:lightmeter/screens/settings/components/general/components/language/widget_list_tile_language.dart';
-import 'package:lightmeter/screens/settings/components/general/components/volume_actions/provider_list_tile_volume_actions.dart';
 import 'package:lightmeter/screens/settings/components/shared/settings_section/widget_settings_section.dart';
 
 class GeneralSettingsSection extends StatelessWidget {
@@ -15,11 +12,10 @@ class GeneralSettingsSection extends StatelessWidget {
   Widget build(BuildContext context) {
     return SettingsSection(
       title: S.of(context).general,
-      children: [
+      children: const [
-        const CaffeineListTileProvider(),
+        CaffeineListTileProvider(),
-        const HapticsListTileProvider(),
+        HapticsListTileProvider(),
-        if (Platform.isAndroid) const VolumeActionsListTileProvider(),
+        LanguageListTile(),
-        const LanguageListTile(),
       ],
     );
   }

lib/screens/settings/components/theme/components/dynamic_color/widget_list_tile_dynamic_color.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:lightmeter/data/models/dynamic_colors_state.dart';
 import 'package:lightmeter/generated/l10n.dart';
 import 'package:lightmeter/providers/theme_provider.dart';
-import 'package:lightmeter/res/dimens.dart';
 import 'package:lightmeter/utils/inherited_generics.dart';
 
 class DynamicColorListTile extends StatelessWidget {
@@ -15,7 +14,6 @@ class DynamicColorListTile extends StatelessWidget {
       title: Text(S.of(context).dynamicColor),
       value: context.listen<DynamicColorState>() == DynamicColorState.enabled,
       onChanged: ThemeProvider.of(context).enableDynamicColor,
-      contentPadding: const EdgeInsets.symmetric(horizontal: Dimens.paddingM),
     );
   }
 }

lib/screens/settings/flow_settings.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:lightmeter/data/caffeine_service.dart';
 import 'package:lightmeter/data/haptics_service.dart';
 import 'package:lightmeter/data/shared_prefs_service.dart';
-import 'package:lightmeter/data/volume_events_service.dart';
 import 'package:lightmeter/interactors/settings_interactor.dart';
 import 'package:lightmeter/screens/settings/screen_settings.dart';
 import 'package:lightmeter/utils/inherited_generics.dart';
@@ -17,7 +16,6 @@ class SettingsFlow extends StatelessWidget {
         context.get<UserPreferencesService>(),
         context.get<CaffeineService>(),
         context.get<HapticsService>(),
-        context.get<VolumeEventsService>(),
       ),
       child: const SettingsScreen(),
     );

lib/screens/settings/screen_settings.dart

@@ -1,33 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/generated/l10n.dart';
-import 'package:lightmeter/interactors/settings_interactor.dart';
 import 'package:lightmeter/screens/settings/components/about/widget_settings_section_about.dart';
 import 'package:lightmeter/screens/settings/components/general/widget_settings_section_general.dart';
 import 'package:lightmeter/screens/settings/components/metering/widget_settings_section_metering.dart';
 import 'package:lightmeter/screens/settings/components/theme/widget_settings_section_theme.dart';
 import 'package:lightmeter/screens/shared/sliver_screen/screen_sliver.dart';
-import 'package:lightmeter/utils/inherited_generics.dart';
 
-class SettingsScreen extends StatefulWidget {
+class SettingsScreen extends StatelessWidget {
   const SettingsScreen({super.key});
 
-  @override
-  State<SettingsScreen> createState() => _SettingsScreenState();
-}
-
-class _SettingsScreenState extends State<SettingsScreen> {
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    context.get<SettingsInteractor>().disableVolumeHandling();
-  }
-
-  @override
-  void deactivate() {
-    context.get<SettingsInteractor>().restoreVolumeHandling();
-    super.deactivate();
-  }
-
   @override
   Widget build(BuildContext context) {
     return ScaffoldMessenger(

pubspec.yaml

@@ -1,7 +1,7 @@
 name: lightmeter
 description: A new Flutter project.
 publish_to: "none"
-version: 0.12.0+31
+version: 0.11.8+30
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
@@ -30,7 +30,6 @@ dependencies:
   material_color_utilities: 0.2.0
   package_info_plus: 4.0.1
   permission_handler: 10.2.0
-  platform: 3.1.0
   shared_preferences: 2.1.1
   url_launcher: 6.1.11
   uuid: 3.0.7

test/data/light_sensor_service_test.dart

@@ -1,15 +1,10 @@
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lightmeter/data/light_sensor_service.dart';
-import 'package:mocktail/mocktail.dart';
-import 'package:platform/platform.dart';
-
-class _MockLocalPlatform extends Mock implements LocalPlatform {}
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
-  late _MockLocalPlatform localPlatform;
   late LightSensorService service;
 
   const methodChannel = MethodChannel('system_feature');
@@ -17,8 +12,7 @@ void main() {
   //const eventChannel = EventChannel('light.eventChannel');
 
   setUp(() {
-    localPlatform = _MockLocalPlatform();
+    service = const LightSensorService();
-    service = LightSensorService(localPlatform);
   });
 
   tearDown(() {
@@ -29,8 +23,7 @@ void main() {
   group(
     'hasSensor()',
     () {
-      test('true - Android', () async {
+      test('true', () async {
-        when(() => localPlatform.isAndroid).thenReturn(true);
         TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .setMockMethodCallHandler(methodChannel, null);
         TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
@@ -45,8 +38,7 @@ void main() {
         expectLater(service.hasSensor(), completion(true));
       });
 
-      test('false - Android', () async {
+      test('false', () async {
-        when(() => localPlatform.isAndroid).thenReturn(true);
         TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .setMockMethodCallHandler(methodChannel, null);
         TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
@@ -60,9 +52,7 @@ void main() {
         });
         expectLater(service.hasSensor(), completion(false));
       });
-
+      test('null', () async {
-      test('null - Android', () async {
-        when(() => localPlatform.isAndroid).thenReturn(true);
         TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .setMockMethodCallHandler(methodChannel, null);
         TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
@@ -76,23 +66,6 @@ void main() {
         });
         expectLater(service.hasSensor(), completion(false));
       });
-
-      test('false - iOS', () async {
-        when(() => localPlatform.isAndroid).thenReturn(false);
-        expectLater(service.hasSensor(), completion(false));
-      });
     },
   );
-
-  group('luxStream', () {
-    // test('Android', () async {
-    //   when(() => localPlatform.isAndroid).thenReturn(true);
-    //   expect(service.luxStream(), const Stream.empty());
-    // });
-
-    test('iOS', () async {
-      when(() => localPlatform.isAndroid).thenReturn(false);
-      expect(service.luxStream(), const Stream<int>.empty());
-    });
-  });
 }

test/data/volume_events_service_test.dart

@@ -1,73 +0,0 @@
-import 'package:flutter/services.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:lightmeter/data/volume_events_service.dart';
-import 'package:mocktail/mocktail.dart';
-import 'package:platform/platform.dart';
-
-class _MockLocalPlatform extends Mock implements LocalPlatform {}
-
-void main() {
-  TestWidgetsFlutterBinding.ensureInitialized();
-
-  late _MockLocalPlatform localPlatform;
-  late VolumeEventsService service;
-
-  Future<Object?>? methodCallSuccessHandler(MethodCall methodCall) async {
-    switch (methodCall.method) {
-      case "setVolumeHandling":
-        return methodCall.arguments as bool;
-      default:
-        throw UnimplementedError();
-    }
-  }
-
-  setUp(() {
-    localPlatform = _MockLocalPlatform();
-    service = VolumeEventsService(localPlatform);
-    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(
-      VolumeEventsService.volumeHandlingChannel,
-      methodCallSuccessHandler,
-    );
-  });
-
-  tearDown(() {
-    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(
-      VolumeEventsService.volumeHandlingChannel,
-      null,
-    );
-  });
-
-  group('setVolumeHandling', () {
-    test('true - Android', () async {
-      when(() => localPlatform.isAndroid).thenReturn(true);
-      expectLater(service.setVolumeHandling(true), completion(true));
-    });
-
-    test('true - iOS', () async {
-      when(() => localPlatform.isAndroid).thenReturn(false);
-      expectLater(service.setVolumeHandling(true), completion(false));
-    });
-
-    test('false - Android', () async {
-      when(() => localPlatform.isAndroid).thenReturn(true);
-      expectLater(service.setVolumeHandling(false), completion(false));
-    });
-
-    test('false - iOS', () async {
-      when(() => localPlatform.isAndroid).thenReturn(false);
-      expectLater(service.setVolumeHandling(false), completion(false));
-    });
-  });
-
-  group('volumeButtonsEventStream', () {
-    // test('Android', () async {
-    //   when(() => localPlatform.isAndroid).thenReturn(true);
-    //   expect(service.volumeButtonsEventStream(), const Stream.empty());
-    // });
-
-    test('iOS', () async {
-      when(() => localPlatform.isAndroid).thenReturn(false);
-      expect(service.volumeButtonsEventStream(), const Stream<int>.empty());
-    });
-  });
-}

test/screens/metering/bloc_metering_test.dart

@@ -1,6 +1,5 @@
 import 'package:bloc_test/bloc_test.dart';
 import 'package:lightmeter/data/models/film.dart';
-import 'package:lightmeter/data/models/volume_action.dart';
 import 'package:lightmeter/interactors/metering_interactor.dart';
 import 'package:lightmeter/screens/metering/bloc_metering.dart';
 import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart';
@@ -8,24 +7,20 @@ import 'package:lightmeter/screens/metering/communication/event_communication_me
     as communication_events;
 import 'package:lightmeter/screens/metering/communication/state_communication_metering.dart'
     as communication_states;
-import 'package:lightmeter/screens/metering/components/shared/volume_keys_notifier/notifier_volume_keys.dart';
 import 'package:lightmeter/screens/metering/event_metering.dart';
 import 'package:lightmeter/screens/metering/state_metering.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:test/test.dart';
 
-class _MockMeteringInteractor extends Mock implements MeteringInteractor {}
-
-class _MockVolumeKeysNotifier extends Mock implements VolumeKeysNotifier {}
-
 class _MockMeteringCommunicationBloc extends MockBloc<
     communication_events.MeteringCommunicationEvent,
     communication_states.MeteringCommunicationState> implements MeteringCommunicationBloc {}
 
+class _MockMeteringInteractor extends Mock implements MeteringInteractor {}
+
 void main() {
   late _MockMeteringInteractor meteringInteractor;
-  late _MockVolumeKeysNotifier volumeKeysNotifier;
   late _MockMeteringCommunicationBloc communicationBloc;
   late MeteringBloc bloc;
   const iso100 = IsoValue(100, StopType.full);
@@ -39,19 +34,16 @@ void main() {
     when(meteringInteractor.responseVibration).thenAnswer((_) async {});
     when(meteringInteractor.errorVibration).thenAnswer((_) async {});
 
-    volumeKeysNotifier = _MockVolumeKeysNotifier();
     communicationBloc = _MockMeteringCommunicationBloc();
-
+    
     bloc = MeteringBloc(
       meteringInteractor,
-      volumeKeysNotifier,
       communicationBloc,
     );
   });
 
   tearDown(() {
     bloc.close();
-    //volumeKeysNotifier.dispose();
     communicationBloc.close();
   });
 
@@ -614,66 +606,4 @@ void main() {
       );
     },
   );
-
-  group(
-    '`Volume keys shutter action`',
-    () {
-      blocTest<MeteringBloc, MeteringState>(
-        'Add/remove listener',
-        build: () => bloc,
-        verify: (_) {
-          verify(() => volumeKeysNotifier.addListener(bloc.onVolumeKey)).called(1);
-          verify(() => volumeKeysNotifier.removeListener(bloc.onVolumeKey)).called(1);
-        },
-        expect: () => [],
-      );
-
-      blocTest<MeteringBloc, MeteringState>(
-        'onVolumeKey & VolumeAction.shutter',
-        build: () => bloc,
-        act: (bloc) async {
-          bloc.onVolumeKey();
-        },
-        setUp: () {
-          when(() => meteringInteractor.volumeAction).thenReturn(VolumeAction.shutter);
-        },
-        verify: (_) {},
-        expect: () => [isA<LoadingState>()],
-      );
-
-      blocTest<MeteringBloc, MeteringState>(
-        'onVolumeKey & VolumeAction.none',
-        build: () => bloc,
-        act: (bloc) async {
-          bloc.onVolumeKey();
-        },
-        setUp: () {
-          when(() => meteringInteractor.volumeAction).thenReturn(VolumeAction.none);
-        },
-        verify: (_) {},
-        expect: () => [],
-      );
-    },
-  );
-
-  group(
-    '`SettingOpenedEvent`/`SettingsClosedEvent`',
-    () {
-      blocTest<MeteringBloc, MeteringState>(
-        'Settings opened & closed',
-        build: () => bloc,
-        act: (bloc) async {
-          bloc.add(const SettingsOpenedEvent());
-          bloc.add(const SettingsClosedEvent());
-        },
-        verify: (_) {
-          verify(() => communicationBloc.add(const communication_events.SettingsOpenedEvent()))
-              .called(1);
-          verify(() => communicationBloc.add(const communication_events.SettingsClosedEvent()))
-              .called(1);
-        },
-        expect: () => [],
-      );
-    },
-  );
 }

test/screens/metering/communication/bloc_communication_metering_test.dart

@@ -98,30 +98,4 @@ void main() {
       );
     },
   );
-
-  group(
-    '`SettingsOpenedEvent`/`SettingsClosedEvent`',
-    () {
-      blocTest<MeteringCommunicationBloc, MeteringCommunicationState>(
-        'Multiple consequtive settings events',
-        build: () => bloc,
-        act: (bloc) async {
-          bloc.add(const SettingsOpenedEvent());
-          bloc.add(const SettingsOpenedEvent());
-          bloc.add(const SettingsOpenedEvent());
-          bloc.add(const SettingsClosedEvent());
-          bloc.add(const SettingsClosedEvent());
-          bloc.add(const SettingsClosedEvent());
-          bloc.add(const SettingsOpenedEvent());
-          bloc.add(const SettingsClosedEvent());
-        },
-        expect: () => [
-          isA<SettingsOpenedState>(),
-          isA<SettingsClosedState>(),
-          isA<SettingsOpenedState>(),
-          isA<SettingsClosedState>(),
-        ],
-      );
-    },
-  );
 }

test/screens/metering/components/camera/bloc_container_camera_test.dart

@@ -14,12 +14,12 @@ import 'package:lightmeter/screens/metering/components/camera_container/models/c
 import 'package:lightmeter/screens/metering/components/camera_container/state_container_camera.dart';
 import 'package:mocktail/mocktail.dart';
 
-class _MockMeteringInteractor extends Mock implements MeteringInteractor {}
-
 class _MockMeteringCommunicationBloc extends MockBloc<
     communication_events.MeteringCommunicationEvent,
     communication_states.MeteringCommunicationState> implements MeteringCommunicationBloc {}
 
+class _MockMeteringInteractor extends Mock implements MeteringInteractor {}
+
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
@@ -310,30 +310,6 @@ void main() {
         },
         expect: () => [
           ...initializedStateSequence,
-          const CameraInitState(),
-          ...initializedStateSequence,
-        ],
-      );
-
-      blocTest<CameraContainerBloc, CameraContainerState>(
-        'onCommunicationState',
-        setUp: () {
-          when(() => meteringInteractor.checkCameraPermission()).thenAnswer((_) async => true);
-        },
-        build: () => bloc,
-        act: (bloc) async {
-          bloc.add(const InitializeEvent());
-          await Future.delayed(Duration.zero);
-          bloc.onCommunicationState(const communication_states.SettingsOpenedState());
-          await Future.delayed(Duration.zero);
-          bloc.onCommunicationState(const communication_states.SettingsClosedState());
-        },
-        verify: (_) {
-          verify(() => meteringInteractor.checkCameraPermission()).called(2);
-        },
-        expect: () => [
-          ...initializedStateSequence,
-          const CameraInitState(),
           ...initializedStateSequence,
         ],
       );

test/screens/metering/components/light_sensor/bloc_container_light_sensor_test.dart

@@ -78,67 +78,4 @@ void main() {
       );
     },
   );
-
-  group(
-    '`communication_states.SettingsOpenedState()`',
-    () {
-      const List<int> luxIterable = [1, 2, 2, 2, 3];
-      final List<double> resultList = luxIterable.map((lux) => log2(lux / 2.5)).toList();
-      blocTest<LightSensorContainerBloc, LightSensorContainerState>(
-        'Metering is already canceled',
-        build: () => bloc,
-        setUp: () {
-          when(() => meteringInteractor.luxStream())
-              .thenAnswer((_) => Stream.fromIterable(luxIterable));
-          when(() => meteringInteractor.lightSensorEvCalibration).thenReturn(0.0);
-        },
-        act: (bloc) async {
-          bloc.onCommunicationState(const communication_states.SettingsOpenedState());
-        },
-        verify: (_) {
-          verifyNever(() => meteringInteractor.luxStream().listen((_) {}));
-          verifyNever(() => meteringInteractor.lightSensorEvCalibration);
-          verify(() {
-            communicationBloc.add(const communication_events.MeteringEndedEvent(null));
-          }).called(2); // +1 from dispose
-        },
-        expect: () => [],
-      );
-
-      blocTest<LightSensorContainerBloc, LightSensorContainerState>(
-        'Metering is in progress',
-        build: () => bloc,
-        setUp: () {
-          when(() => meteringInteractor.luxStream())
-              .thenAnswer((_) => Stream.fromIterable(luxIterable));
-          when(() => meteringInteractor.lightSensorEvCalibration).thenReturn(0.0);
-        },
-        act: (bloc) async {
-          bloc.onCommunicationState(const communication_states.MeasureState());
-          await Future.delayed(Duration.zero);
-          bloc.onCommunicationState(const communication_states.SettingsOpenedState());
-          bloc.onCommunicationState(const communication_states.SettingsClosedState());
-        },
-        verify: (_) {
-          verify(() => meteringInteractor.luxStream().listen((_) {})).called(1);
-          verify(() => meteringInteractor.lightSensorEvCalibration).called(5);
-          verify(() {
-            communicationBloc.add(communication_events.MeteringInProgressEvent(resultList.first));
-          }).called(1);
-          verify(() {
-            communicationBloc.add(communication_events.MeteringInProgressEvent(resultList[1]));
-          }).called(3);
-          verify(() {
-            communicationBloc.add(communication_events.MeteringInProgressEvent(resultList.last));
-          }).called(1);
-          verify(() {
-            communicationBloc.add(communication_events.MeteringEndedEvent(resultList.last));
-          }).called(3); // +1 from settings closed, +1 from dispose
-        },
-        expect: () => resultList.map(
-          (e) => isA<LightSensorContainerState>().having((state) => state.ev100, 'ev100', e),
-        ),
-      );
-    },
-  );
 }