_inheritFrom -> _inheritFromEnumsModel

lib/application.dart

@@ -1,14 +1,23 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_localizations/flutter_localizations.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/supported_locale.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/generated/l10n.dart';
-import 'package:lightmeter/providers.dart';
-import 'package:lightmeter/providers/enum_providers.dart';
+import 'package:lightmeter/providers/equipment_profile_provider.dart';
+import 'package:lightmeter/providers/services_provider.dart';
+import 'package:lightmeter/providers/user_preferences_provider.dart';
 import 'package:lightmeter/res/theme.dart';
 import 'package:lightmeter/screens/metering/flow_metering.dart';
 import 'package:lightmeter/screens/settings/flow_settings.dart';
+import 'package:platform/platform.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 class Application extends StatelessWidget {
   final Environment env;
@@ -17,49 +26,73 @@ class Application extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return LightmeterProviders(
-      env: env,
-      builder: (context, ready) {
-        if (ready) {
-          final theme = themeFrom(
-            EnumProviders.primaryColorOf(context),
-            EnumProviders.brightnessOf(context),
-          );
-          final systemIconsBrightness =
-              ThemeData.estimateBrightnessForColor(theme.colorScheme.onSurface);
-          return AnnotatedRegion(
-            value: SystemUiOverlayStyle(
-              statusBarColor: Colors.transparent,
-              statusBarBrightness:
-                  systemIconsBrightness == Brightness.light ? Brightness.dark : Brightness.light,
-              statusBarIconBrightness: systemIconsBrightness,
-              systemNavigationBarColor: Colors.transparent,
-              systemNavigationBarIconBrightness: systemIconsBrightness,
-            ),
-            child: MaterialApp(
-              theme: theme,
-              locale: Locale(EnumProviders.localeOf(context).intlName),
-              localizationsDelegates: const [
-                S.delegate,
-                GlobalMaterialLocalizations.delegate,
-                GlobalWidgetsLocalizations.delegate,
-                GlobalCupertinoLocalizations.delegate,
-              ],
-              supportedLocales: S.delegate.supportedLocales,
-              builder: (context, child) => MediaQuery(
-                data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
-                child: child!,
+    return FutureBuilder(
+      future: Future.wait([
+        SharedPreferences.getInstance(),
+        const LightSensorService(LocalPlatform()).hasSensor(),
+      ]),
+      builder: (_, snapshot) {
+        if (snapshot.data != null) {
+          return ServicesProvider(
+            caffeineService: const CaffeineService(),
+            environment: env.copyWith(hasLightSensor: snapshot.data![1] as bool),
+            hapticsService: const HapticsService(),
+            lightSensorService: const LightSensorService(LocalPlatform()),
+            permissionsService: const PermissionsService(),
+            userPreferencesService: UserPreferencesService(snapshot.data![0] as SharedPreferences),
+            volumeEventsService: const VolumeEventsService(LocalPlatform()),
+            child: UserPreferencesProvider(
+              child: EquipmentProfileProvider(
+                child: Builder(
+                  builder: (context) {
+                    final theme = themeFrom(
+                      UserPreferencesProvider.primaryColorOf(context),
+                      UserPreferencesProvider.brightnessOf(context),
+                    );
+                    final systemIconsBrightness =
+                        ThemeData.estimateBrightnessForColor(theme.colorScheme.onSurface);
+                    return AnnotatedRegion(
+                      value: SystemUiOverlayStyle(
+                        statusBarColor: Colors.transparent,
+                        statusBarBrightness: systemIconsBrightness == Brightness.light
+                            ? Brightness.dark
+                            : Brightness.light,
+                        statusBarIconBrightness: systemIconsBrightness,
+                        systemNavigationBarColor: Colors.transparent,
+                        systemNavigationBarIconBrightness: systemIconsBrightness,
+                      ),
+                      child: MaterialApp(
+                        theme: theme,
+                        locale: Locale(UserPreferencesProvider.localeOf(context).intlName),
+                        localizationsDelegates: const [
+                          S.delegate,
+                          GlobalMaterialLocalizations.delegate,
+                          GlobalWidgetsLocalizations.delegate,
+                          GlobalCupertinoLocalizations.delegate,
+                        ],
+                        supportedLocales: S.delegate.supportedLocales,
+                        builder: (context, child) => MediaQuery(
+                          data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
+                          child: child!,
+                        ),
+                        initialRoute: "metering",
+                        routes: {
+                          "metering": (context) => const MeteringFlow(),
+                          "settings": (context) => const SettingsFlow(),
+                        },
+                      ),
+                    );
+                  },
+                ),
               ),
-              initialRoute: "metering",
-              routes: {
-                "metering": (context) => const MeteringFlow(),
-                "settings": (context) => const SettingsFlow(),
-              },
             ),
           );
-        } else {
-          return const SizedBox();
+        } else if (snapshot.error != null) {
+          return Center(child: Text(snapshot.error!.toString()));
         }
+
+        // TODO(@vodemn): maybe user splashscreen instead
+        return const SizedBox();
       },
     );
   }

lib/providers.dart

@@ -1,56 +0,0 @@
-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/enum_providers.dart';
-import 'package:lightmeter/providers/equipment_profile_provider.dart';
-import 'package:lightmeter/providers/metering_screen_layout_provider.dart';
-import 'package:lightmeter/providers/service_providers.dart';
-import 'package:platform/platform.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-class LightmeterProviders extends StatelessWidget {
-  final Environment env;
-  final Widget Function(BuildContext context, bool ready) builder;
-
-  const LightmeterProviders({required this.env, required this.builder, super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return FutureBuilder(
-      future: Future.wait([
-        SharedPreferences.getInstance(),
-        const LightSensorService(LocalPlatform()).hasSensor(),
-      ]),
-      builder: (_, snapshot) {
-        if (snapshot.data != null) {
-          return ServiceProviders(
-            caffeineService: const CaffeineService(),
-            environment: env.copyWith(hasLightSensor: snapshot.data![1] as bool),
-            hapticsService: const HapticsService(),
-            lightSensorService: const LightSensorService(LocalPlatform()),
-            permissionsService: const PermissionsService(),
-            userPreferencesService: UserPreferencesService(snapshot.data![0] as SharedPreferences),
-            volumeEventsService: const VolumeEventsService(LocalPlatform()),
-            child: EnumProviders(
-              child: MeteringScreenLayoutProvider(
-                child: EquipmentProfileProvider(
-                  child: Builder(
-                    builder: (context) => builder(context, true),
-                  ),
-                ),
-              ),
-            ),
-          );
-        } else if (snapshot.error != null) {
-          return Center(child: Text(snapshot.error!.toString()));
-        }
-        return builder(context, false);
-      },
-    );
-  }
-}

lib/providers/equipment_profile_provider.dart

@@ -1,11 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:lightmeter/providers/service_providers.dart';
-import 'package:lightmeter/utils/inherited_generics.dart';
+import 'package:lightmeter/providers/services_provider.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 import 'package:uuid/uuid.dart';
 
-typedef EquipmentProfiles = List<EquipmentProfile>;
-
+// TODO(@vodemn): This will be removed in #89
 class EquipmentProfileProvider extends StatefulWidget {
   final Widget child;
 
@@ -35,7 +33,7 @@ class EquipmentProfileProviderState extends State<EquipmentProfileProvider> {
   EquipmentProfile get _selectedProfile => _customProfiles.firstWhere(
         (e) => e.id == _selectedId,
         orElse: () {
-          ServiceProviders.userPreferencesServiceOf(context).selectedEquipmentProfileId =
+          ServicesProvider.of(context).userPreferencesService.selectedEquipmentProfileId =
               _defaultProfile.id;
           return _defaultProfile;
         },
@@ -44,18 +42,16 @@ class EquipmentProfileProviderState extends State<EquipmentProfileProvider> {
   @override
   void initState() {
     super.initState();
-    _selectedId = ServiceProviders.userPreferencesServiceOf(context).selectedEquipmentProfileId;
-    _customProfiles = ServiceProviders.userPreferencesServiceOf(context).equipmentProfiles;
+    _selectedId = ServicesProvider.of(context).userPreferencesService.selectedEquipmentProfileId;
+    _customProfiles = ServicesProvider.of(context).userPreferencesService.equipmentProfiles;
   }
 
   @override
   Widget build(BuildContext context) {
-    return InheritedWidgetBase<List<EquipmentProfile>>(
-      data: [_defaultProfile] + _customProfiles,
-      child: InheritedWidgetBase<EquipmentProfile>(
-        data: _selectedProfile,
-        child: widget.child,
-      ),
+    return EquipmentProfiles(
+      profiles: [_defaultProfile] + _customProfiles,
+      selected: _selectedProfile,
+      child: widget.child,
     );
   }
 
@@ -63,7 +59,7 @@ class EquipmentProfileProviderState extends State<EquipmentProfileProvider> {
     setState(() {
       _selectedId = data.id;
     });
-    ServiceProviders.userPreferencesServiceOf(context).selectedEquipmentProfileId =
+    ServicesProvider.of(context).userPreferencesService.selectedEquipmentProfileId =
         _selectedProfile.id;
   }
 
@@ -96,7 +92,48 @@ class EquipmentProfileProviderState extends State<EquipmentProfileProvider> {
   }
 
   void _refreshSavedProfiles() {
-    ServiceProviders.userPreferencesServiceOf(context).equipmentProfiles = _customProfiles;
+    ServicesProvider.of(context).userPreferencesService.equipmentProfiles = _customProfiles;
     setState(() {});
   }
 }
+
+// Copied from #89
+enum EquipmentProfilesAspect { list, selected }
+
+class EquipmentProfiles extends InheritedModel<EquipmentProfilesAspect> {
+  const EquipmentProfiles({
+    super.key,
+    required this.profiles,
+    required this.selected,
+    required super.child,
+  });
+
+  final List<EquipmentProfile> profiles;
+  final EquipmentProfile selected;
+
+  static List<EquipmentProfile> of(BuildContext context) {
+    return InheritedModel.inheritFrom<EquipmentProfiles>(
+      context,
+      aspect: EquipmentProfilesAspect.list,
+    )!
+        .profiles;
+  }
+
+  static EquipmentProfile selectedOf(BuildContext context) {
+    return InheritedModel.inheritFrom<EquipmentProfiles>(
+      context,
+      aspect: EquipmentProfilesAspect.selected,
+    )!
+        .selected;
+  }
+
+  @override
+  bool updateShouldNotify(EquipmentProfiles oldWidget) => false;
+
+  @override
+  bool updateShouldNotifyDependent(
+    EquipmentProfiles oldWidget,
+    Set<EquipmentProfilesAspect> dependencies,
+  ) =>
+      false;
+}

lib/providers/metering_screen_layout_provider.dart

@@ -1,60 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:lightmeter/data/models/metering_screen_layout_config.dart';
-import 'package:lightmeter/providers/service_providers.dart';
-import 'package:lightmeter/utils/inherited_generics.dart';
-
-class MeteringScreenLayoutProvider extends StatefulWidget {
-  final Widget child;
-
-  const MeteringScreenLayoutProvider({required this.child, super.key});
-
-  static MeteringScreenLayoutProviderState of(BuildContext context) {
-    return context.findAncestorStateOfType<MeteringScreenLayoutProviderState>()!;
-  }
-
-  @override
-  State<MeteringScreenLayoutProvider> createState() => MeteringScreenLayoutProviderState();
-}
-
-class MeteringScreenLayoutProviderState extends State<MeteringScreenLayoutProvider> {
-  late final MeteringScreenLayoutConfig _config =
-      ServiceProviders.userPreferencesServiceOf(context).meteringScreenLayout;
-
-  @override
-  Widget build(BuildContext context) {
-    return InheritedModelBase<MeteringScreenLayoutFeature, bool>(
-      data: MeteringScreenLayoutConfig.from(_config),
-      child: widget.child,
-    );
-  }
-
-  void updateFeatures(MeteringScreenLayoutConfig config) {
-    setState(() {
-      config.forEach((key, value) {
-        _config.update(
-          key,
-          (_) => value,
-          ifAbsent: () => value,
-        );
-      });
-    });
-    ServiceProviders.userPreferencesServiceOf(context).meteringScreenLayout = _config;
-  }
-}
-
-typedef _MeteringScreenLayoutModel = InheritedModelBase<MeteringScreenLayoutFeature, bool>;
-
-extension MeteringScreenLayout on InheritedModelBase<MeteringScreenLayoutFeature, bool> {
-  static MeteringScreenLayoutConfig of(BuildContext context, {bool listen = true}) {
-    if (listen) {
-      return context.dependOnInheritedWidgetOfExactType<_MeteringScreenLayoutModel>()!.data;
-    } else {
-      return context.findAncestorWidgetOfExactType<_MeteringScreenLayoutModel>()!.data;
-    }
-  }
-
-  static bool featureOf(BuildContext context, MeteringScreenLayoutFeature aspect) {
-    return InheritedModel.inheritFrom<_MeteringScreenLayoutModel>(context, aspect: aspect)!
-        .data[aspect]!;
-  }
-}

lib/providers/service_providers.dart

@@ -1,64 +0,0 @@
-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';
-
-class ServiceProviders extends InheritedWidget {
-  final CaffeineService caffeineService;
-  final Environment environment;
-  final HapticsService hapticsService;
-  final LightSensorService lightSensorService;
-  final PermissionsService permissionsService;
-  final UserPreferencesService userPreferencesService;
-  final VolumeEventsService volumeEventsService;
-
-  const ServiceProviders({
-    required this.caffeineService,
-    required this.environment,
-    required this.hapticsService,
-    required this.lightSensorService,
-    required this.permissionsService,
-    required this.userPreferencesService,
-    required this.volumeEventsService,
-    required super.child,
-  });
-
-  static CaffeineService caffeineServiceOf(BuildContext context) {
-    return ServiceProviders._of(context).caffeineService;
-  }
-
-  static Environment environmentOf(BuildContext context) {
-    return ServiceProviders._of(context).environment;
-  }
-
-  static HapticsService hapticsServiceOf(BuildContext context) {
-    return ServiceProviders._of(context).hapticsService;
-  }
-
-  static LightSensorService lightSensorServiceOf(BuildContext context) {
-    return ServiceProviders._of(context).lightSensorService;
-  }
-
-  static PermissionsService permissionsServiceOf(BuildContext context) {
-    return ServiceProviders._of(context).permissionsService;
-  }
-
-  static UserPreferencesService userPreferencesServiceOf(BuildContext context) {
-    return ServiceProviders._of(context).userPreferencesService;
-  }
-
-  static VolumeEventsService volumeEventsServiceOf(BuildContext context) {
-    return ServiceProviders._of(context).volumeEventsService;
-  }
-
-  static ServiceProviders _of(BuildContext context) {
-    return context.findAncestorWidgetOfExactType<ServiceProviders>()!;
-  }
-
-  @override
-  bool updateShouldNotify(ServiceProviders oldWidget) => false;
-}

lib/providers/services_provider.dart

@@ -0,0 +1,36 @@
+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';
+
+class ServicesProvider extends InheritedWidget {
+  final CaffeineService caffeineService;
+  final Environment environment;
+  final HapticsService hapticsService;
+  final LightSensorService lightSensorService;
+  final PermissionsService permissionsService;
+  final UserPreferencesService userPreferencesService;
+  final VolumeEventsService volumeEventsService;
+
+  const ServicesProvider({
+    required this.caffeineService,
+    required this.environment,
+    required this.hapticsService,
+    required this.lightSensorService,
+    required this.permissionsService,
+    required this.userPreferencesService,
+    required this.volumeEventsService,
+    required super.child,
+  });
+
+  static ServicesProvider of(BuildContext context) {
+    return context.findAncestorWidgetOfExactType<ServicesProvider>()!;
+  }
+
+  @override
+  bool updateShouldNotify(ServicesProvider oldWidget) => false;
+}

lib/providers/user_preferences_provider.dart

@@ -3,74 +3,80 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:lightmeter/data/models/dynamic_colors_state.dart';
 import 'package:lightmeter/data/models/ev_source_type.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/shared_prefs_service.dart';
 import 'package:lightmeter/generated/l10n.dart';
-import 'package:lightmeter/providers/service_providers.dart';
+import 'package:lightmeter/providers/services_provider.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 
-enum _ListenableAspect {
-  brightness,
-  dynamicColorState,
-  evSourceType,
-  locale,
-  primaryColor,
-  stopType,
-  themeType,
-}
-
-class EnumProviders extends StatefulWidget {
+class UserPreferencesProvider extends StatefulWidget {
   final Widget child;
 
-  const EnumProviders({required this.child, super.key});
+  const UserPreferencesProvider({required this.child, super.key});
 
-  static _EnumProvidersState of(BuildContext context) {
-    return context.findAncestorStateOfType<_EnumProvidersState>()!;
+  static _UserPreferencesProviderState of(BuildContext context) {
+    return context.findAncestorStateOfType<_UserPreferencesProviderState>()!;
   }
 
   static Brightness brightnessOf(BuildContext context) {
-    return _inheritFrom(context, _ListenableAspect.brightness).brightness;
+    return _inheritFromEnumsModel(context, _ListenableAspect.brightness).brightness;
   }
 
   static DynamicColorState dynamicColorStateOf(BuildContext context) {
-    return _inheritFrom(context, _ListenableAspect.dynamicColorState).dynamicColorState;
+    return _inheritFromEnumsModel(context, _ListenableAspect.dynamicColorState).dynamicColorState;
   }
 
   static EvSourceType evSourceTypeOf(BuildContext context) {
-    return _inheritFrom(context, _ListenableAspect.evSourceType).evSourceType;
+    return _inheritFromEnumsModel(context, _ListenableAspect.evSourceType).evSourceType;
   }
 
   static SupportedLocale localeOf(BuildContext context) {
-    return _inheritFrom(context, _ListenableAspect.locale).locale;
+    return _inheritFromEnumsModel(context, _ListenableAspect.locale).locale;
+  }
+
+  static MeteringScreenLayoutConfig meteringScreenConfigOf(BuildContext context) {
+    return context.findAncestorWidgetOfExactType<_MeteringScreenLayoutModel>()!.data;
+  }
+
+  static bool meteringScreenFeatureOf(BuildContext context, MeteringScreenLayoutFeature feature) {
+    return InheritedModel.inheritFrom<_MeteringScreenLayoutModel>(context, aspect: feature)!
+        .data[feature]!;
   }
 
   static Color primaryColorOf(BuildContext context) {
-    return _inheritFrom(context, _ListenableAspect.primaryColor).primaryColor;
+    return _inheritFromEnumsModel(context, _ListenableAspect.primaryColor).primaryColor;
   }
 
   static StopType stopTypeOf(BuildContext context) {
-    return _inheritFrom(context, _ListenableAspect.stopType).stopType;
+    return _inheritFromEnumsModel(context, _ListenableAspect.stopType).stopType;
   }
 
   static ThemeType themeTypeOf(BuildContext context) {
-    return _inheritFrom(context, _ListenableAspect.themeType).themeType;
+    return _inheritFromEnumsModel(context, _ListenableAspect.themeType).themeType;
   }
 
-  static _EnumProvidersModel _inheritFrom(BuildContext context, _ListenableAspect aspect) {
-    return InheritedModel.inheritFrom<_EnumProvidersModel>(context, aspect: aspect)!;
+  static _EnumsModel _inheritFromEnumsModel(
+    BuildContext context,
+    _ListenableAspect aspect,
+  ) {
+    return InheritedModel.inheritFrom<_EnumsModel>(context, aspect: aspect)!;
   }
 
   @override
-  State<EnumProviders> createState() => _EnumProvidersState();
+  State<UserPreferencesProvider> createState() => _UserPreferencesProviderState();
 }
 
-class _EnumProvidersState extends State<EnumProviders> with WidgetsBindingObserver {
+class _UserPreferencesProviderState extends State<UserPreferencesProvider>
+    with WidgetsBindingObserver {
   UserPreferencesService get userPreferencesService =>
-      ServiceProviders.userPreferencesServiceOf(context);
+      ServicesProvider.of(context).userPreferencesService;
 
   late bool dynamicColor = userPreferencesService.dynamicColor;
   late EvSourceType evSourceType;
+  late final MeteringScreenLayoutConfig meteringScreenLayout =
+      ServicesProvider.of(context).userPreferencesService.meteringScreenLayout;
   late Color primaryColor = userPreferencesService.primaryColor;
   late StopType stopType = userPreferencesService.stopType;
   late SupportedLocale locale = userPreferencesService.locale;
@@ -79,9 +85,9 @@ class _EnumProvidersState extends State<EnumProviders> with WidgetsBindingObserv
   @override
   void initState() {
     super.initState();
-    evSourceType = ServiceProviders.userPreferencesServiceOf(context).evSourceType;
+    evSourceType = ServicesProvider.of(context).userPreferencesService.evSourceType;
     evSourceType = evSourceType == EvSourceType.sensor &&
-            !ServiceProviders.environmentOf(context).hasLightSensor
+            !ServicesProvider.of(context).environment.hasLightSensor
         ? EvSourceType.camera
         : evSourceType;
     WidgetsBinding.instance.addObserver(this);
@@ -118,7 +124,7 @@ class _EnumProvidersState extends State<EnumProviders> with WidgetsBindingObserv
           dynamicPrimaryColor = null;
           state = DynamicColorState.unavailable;
         }
-        return _EnumProvidersModel(
+        return _EnumsModel(
           brightness: _themeBrightness,
           dynamicColorState: state,
           evSourceType: evSourceType,
@@ -126,7 +132,10 @@ class _EnumProvidersState extends State<EnumProviders> with WidgetsBindingObserv
           primaryColor: dynamicPrimaryColor ?? primaryColor,
           stopType: stopType,
           themeType: themeType,
-          child: widget.child,
+          child: _MeteringScreenLayoutModel(
+            data: meteringScreenLayout,
+            child: widget.child,
+          ),
         );
       },
     );
@@ -136,11 +145,11 @@ class _EnumProvidersState extends State<EnumProviders> with WidgetsBindingObserv
     setState(() {
       dynamicColor = enable;
     });
-    ServiceProviders.userPreferencesServiceOf(context).dynamicColor = enable;
+    ServicesProvider.of(context).userPreferencesService.dynamicColor = enable;
   }
 
   void toggleEvSourceType() {
-    if (!ServiceProviders.environmentOf(context).hasLightSensor) {
+    if (!ServicesProvider.of(context).environment.hasLightSensor) {
       return;
     }
     setState(() {
@@ -151,7 +160,7 @@ class _EnumProvidersState extends State<EnumProviders> with WidgetsBindingObserv
           evSourceType = EvSourceType.camera;
       }
     });
-    ServiceProviders.userPreferencesServiceOf(context).evSourceType = evSourceType;
+    ServicesProvider.of(context).userPreferencesService.evSourceType = evSourceType;
   }
 
   void setLocale(SupportedLocale locale) {
@@ -159,29 +168,42 @@ class _EnumProvidersState extends State<EnumProviders> with WidgetsBindingObserv
       setState(() {
         this.locale = locale;
       });
-      ServiceProviders.userPreferencesServiceOf(context).locale = locale;
+      ServicesProvider.of(context).userPreferencesService.locale = locale;
     });
   }
 
+  void setMeteringScreenLayout(MeteringScreenLayoutConfig config) {
+    setState(() {
+      config.forEach((key, value) {
+        meteringScreenLayout.update(
+          key,
+          (_) => value,
+          ifAbsent: () => value,
+        );
+      });
+    });
+    ServicesProvider.of(context).userPreferencesService.meteringScreenLayout = meteringScreenLayout;
+  }
+
   void setPrimaryColor(Color primaryColor) {
     setState(() {
       this.primaryColor = primaryColor;
     });
-    ServiceProviders.userPreferencesServiceOf(context).primaryColor = primaryColor;
+    ServicesProvider.of(context).userPreferencesService.primaryColor = primaryColor;
   }
 
   void setStopType(StopType stopType) {
     setState(() {
       this.stopType = stopType;
     });
-    ServiceProviders.userPreferencesServiceOf(context).stopType = stopType;
+    ServicesProvider.of(context).userPreferencesService.stopType = stopType;
   }
 
   void setThemeType(ThemeType themeType) {
     setState(() {
       this.themeType = themeType;
     });
-    ServiceProviders.userPreferencesServiceOf(context).themeType = themeType;
+    ServicesProvider.of(context).userPreferencesService.themeType = themeType;
   }
 
   Brightness get _themeBrightness {
@@ -196,7 +218,17 @@ class _EnumProvidersState extends State<EnumProviders> with WidgetsBindingObserv
   }
 }
 
-class _EnumProvidersModel extends InheritedModel<_ListenableAspect> {
+enum _ListenableAspect {
+  brightness,
+  dynamicColorState,
+  evSourceType,
+  locale,
+  primaryColor,
+  stopType,
+  themeType,
+}
+
+class _EnumsModel extends InheritedModel<_ListenableAspect> {
   final Brightness brightness;
   final DynamicColorState dynamicColorState;
   final EvSourceType evSourceType;
@@ -205,7 +237,7 @@ class _EnumProvidersModel extends InheritedModel<_ListenableAspect> {
   final StopType stopType;
   final ThemeType themeType;
 
-  const _EnumProvidersModel({
+  const _EnumsModel({
     required this.brightness,
     required this.dynamicColorState,
     required this.evSourceType,
@@ -217,7 +249,7 @@ class _EnumProvidersModel extends InheritedModel<_ListenableAspect> {
   });
 
   @override
-  bool updateShouldNotify(_EnumProvidersModel oldWidget) {
+  bool updateShouldNotify(_EnumsModel oldWidget) {
     return brightness != oldWidget.brightness ||
         dynamicColorState != oldWidget.dynamicColorState ||
         evSourceType != oldWidget.evSourceType ||
@@ -229,7 +261,7 @@ class _EnumProvidersModel extends InheritedModel<_ListenableAspect> {
 
   @override
   bool updateShouldNotifyDependent(
-    _EnumProvidersModel oldWidget,
+    _EnumsModel oldWidget,
     Set<_ListenableAspect> dependencies,
   ) {
     return (brightness != oldWidget.brightness &&
@@ -245,3 +277,28 @@ class _EnumProvidersModel extends InheritedModel<_ListenableAspect> {
         (themeType != oldWidget.themeType && dependencies.contains(_ListenableAspect.themeType));
   }
 }
+
+class _MeteringScreenLayoutModel extends InheritedModel<MeteringScreenLayoutFeature> {
+  final Map<MeteringScreenLayoutFeature, bool> data;
+
+  const _MeteringScreenLayoutModel({
+    required this.data,
+    required super.child,
+  });
+
+  @override
+  bool updateShouldNotify(_MeteringScreenLayoutModel oldWidget) => oldWidget.data != data;
+
+  @override
+  bool updateShouldNotifyDependent(
+    _MeteringScreenLayoutModel oldWidget,
+    Set<MeteringScreenLayoutFeature> dependencies,
+  ) {
+    for (final dependecy in dependencies) {
+      if (oldWidget.data[dependecy] != data[dependecy]) {
+        return true;
+      }
+    }
+    return false;
+  }
+}

lib/screens/metering/components/bottom_controls/widget_bottom_controls.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/data/models/ev_source_type.dart';
-import 'package:lightmeter/providers/enum_providers.dart';
+import 'package:lightmeter/providers/user_preferences_provider.dart';
 import 'package:lightmeter/res/dimens.dart';
 import 'package:lightmeter/screens/metering/components/bottom_controls/components/measure_button/widget_button_measure.dart';
 
@@ -42,7 +42,7 @@ class MeteringBottomControls extends StatelessWidget {
                       child: IconButton(
                         onPressed: onSwitchEvSourceType,
                         icon: Icon(
-                          EnumProviders.evSourceTypeOf(context) != EvSourceType.camera
+                          UserPreferencesProvider.evSourceTypeOf(context) != EvSourceType.camera
                               ? Icons.camera_rear
                               : Icons.wb_incandescent,
                         ),

lib/screens/metering/components/camera_container/components/camera_preview/widget_camera_preview.dart

@@ -2,7 +2,7 @@ import 'package:camera/camera.dart';
 import 'package:flutter/material.dart';
 import 'package:lightmeter/data/models/metering_screen_layout_config.dart';
 import 'package:lightmeter/platform_config.dart';
-import 'package:lightmeter/providers/metering_screen_layout_provider.dart';
+import 'package:lightmeter/providers/user_preferences_provider.dart';
 import 'package:lightmeter/res/dimens.dart';
 import 'package:lightmeter/screens/metering/components/camera_container/components/camera_preview/components/camera_view/widget_camera_view.dart';
 import 'package:lightmeter/screens/metering/components/camera_container/components/camera_preview/components/camera_view_placeholder/widget_placeholder_camera_view.dart';
@@ -38,7 +38,7 @@ class _CameraPreviewState extends State<CameraPreview> {
                               alignment: Alignment.bottomCenter,
                               children: [
                                 CameraView(controller: widget.controller!),
-                                if (MeteringScreenLayout.featureOf(
+                                if (UserPreferencesProvider.meteringScreenFeatureOf(
                                   context,
                                   MeteringScreenLayoutFeature.histogram,
                                 ))

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

@@ -2,12 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lightmeter/data/models/exposure_pair.dart';
 import 'package:lightmeter/data/models/film.dart';
-import 'package:lightmeter/interactors/metering_interactor.dart';
 import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart';
 import 'package:lightmeter/screens/metering/components/camera_container/bloc_container_camera.dart';
 import 'package:lightmeter/screens/metering/components/camera_container/event_container_camera.dart';
 import 'package:lightmeter/screens/metering/components/camera_container/widget_container_camera.dart';
-import 'package:lightmeter/utils/inherited_generics.dart';
+import 'package:lightmeter/screens/metering/flow_metering.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 
 class CameraContainerProvider extends StatelessWidget {
@@ -39,7 +38,7 @@ class CameraContainerProvider extends StatelessWidget {
     return BlocProvider(
       lazy: false,
       create: (context) => CameraContainerBloc(
-        context.get<MeteringInteractor>(),
+        MeteringInteractorProvider.of(context),
         context.read<MeteringCommunicationBloc>(),
       )..add(const RequestPermissionEvent()),
       child: CameraContainer(

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

@@ -7,7 +7,7 @@ import 'package:lightmeter/data/models/film.dart';
 import 'package:lightmeter/data/models/metering_screen_layout_config.dart';
 import 'package:lightmeter/features.dart';
 import 'package:lightmeter/platform_config.dart';
-import 'package:lightmeter/providers/metering_screen_layout_provider.dart';
+import 'package:lightmeter/providers/user_preferences_provider.dart';
 import 'package:lightmeter/res/dimens.dart';
 import 'package:lightmeter/screens/metering/components/camera_container/bloc_container_camera.dart';
 import 'package:lightmeter/screens/metering/components/camera_container/components/camera_controls/widget_camera_controls.dart';
@@ -114,14 +114,14 @@ class CameraContainer extends StatelessWidget {
       enabledFeaturesHeight += Dimens.readingContainerSingleValueHeight;
       enabledFeaturesHeight += Dimens.paddingS;
     }
-    if (MeteringScreenLayout.featureOf(
+    if (UserPreferencesProvider.meteringScreenFeatureOf(
       context,
       MeteringScreenLayoutFeature.extremeExposurePairs,
     )) {
       enabledFeaturesHeight += Dimens.readingContainerDoubleValueHeight;
       enabledFeaturesHeight += Dimens.paddingS;
     }
-    if (MeteringScreenLayout.featureOf(
+    if (UserPreferencesProvider.meteringScreenFeatureOf(
       context,
       MeteringScreenLayoutFeature.filmPicker,
     )) {

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

@@ -2,11 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lightmeter/data/models/exposure_pair.dart';
 import 'package:lightmeter/data/models/film.dart';
-import 'package:lightmeter/interactors/metering_interactor.dart';
 import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart';
 import 'package:lightmeter/screens/metering/components/light_sensor_container/bloc_container_light_sensor.dart';
 import 'package:lightmeter/screens/metering/components/light_sensor_container/widget_container_light_sensor.dart';
-import 'package:lightmeter/utils/inherited_generics.dart';
+import 'package:lightmeter/screens/metering/flow_metering.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 
 class LightSensorContainerProvider extends StatelessWidget {
@@ -38,7 +37,7 @@ class LightSensorContainerProvider extends StatelessWidget {
     return BlocProvider(
       lazy: false,
       create: (context) => LightSensorContainerBloc(
-        context.get<MeteringInteractor>(),
+        MeteringInteractorProvider.of(context),
         context.read<MeteringCommunicationBloc>(),
       ),
       child: LightSensorContainer(

lib/screens/metering/components/shared/readings_container/widget_container_readings.dart

@@ -5,11 +5,10 @@ import 'package:lightmeter/data/models/metering_screen_layout_config.dart';
 import 'package:lightmeter/features.dart';
 import 'package:lightmeter/generated/l10n.dart';
 import 'package:lightmeter/providers/equipment_profile_provider.dart';
-import 'package:lightmeter/providers/metering_screen_layout_provider.dart';
+import 'package:lightmeter/providers/user_preferences_provider.dart';
 import 'package:lightmeter/res/dimens.dart';
 import 'package:lightmeter/screens/metering/components/shared/readings_container/components/animated_dialog_picker/widget_picker_dialog_animated.dart';
 import 'package:lightmeter/screens/metering/components/shared/readings_container/components/reading_value_container/widget_container_reading_value.dart';
-import 'package:lightmeter/utils/inherited_generics.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 
 class ReadingsContainer extends StatelessWidget {
@@ -43,7 +42,7 @@ class ReadingsContainer extends StatelessWidget {
           const _EquipmentProfilePicker(),
           const _InnerPadding(),
         ],
-        if (MeteringScreenLayout.featureOf(
+        if (UserPreferencesProvider.meteringScreenFeatureOf(
           context,
           MeteringScreenLayoutFeature.extremeExposurePairs,
         )) ...[
@@ -61,7 +60,7 @@ class ReadingsContainer extends StatelessWidget {
           ),
           const _InnerPadding(),
         ],
-        if (MeteringScreenLayout.featureOf(
+        if (UserPreferencesProvider.meteringScreenFeatureOf(
           context,
           MeteringScreenLayoutFeature.filmPicker,
         )) ...[
@@ -77,7 +76,7 @@ class ReadingsContainer extends StatelessWidget {
             Expanded(
               child: _IsoValuePicker(
                 selectedValue: iso,
-                values: context.listen<EquipmentProfile>().isoValues,
+                values: EquipmentProfiles.selectedOf(context).isoValues,
                 onChanged: onIsoChanged,
               ),
             ),
@@ -85,7 +84,7 @@ class ReadingsContainer extends StatelessWidget {
             Expanded(
               child: _NdValuePicker(
                 selectedValue: nd,
-                values: context.listen<EquipmentProfile>().ndValues,
+                values: EquipmentProfiles.selectedOf(context).ndValues,
                 onChanged: onNdChanged,
               ),
             ),
@@ -108,16 +107,16 @@ class _EquipmentProfilePicker extends StatelessWidget {
     return AnimatedDialogPicker<EquipmentProfile>(
       icon: Icons.camera,
       title: S.of(context).equipmentProfile,
-      selectedValue: context.listen<EquipmentProfile>(),
-      values: context.listen<EquipmentProfiles>(),
+      selectedValue: EquipmentProfiles.selectedOf(context),
+      values: EquipmentProfiles.of(context),
       itemTitleBuilder: (_, value) => Text(value.id.isEmpty ? S.of(context).none : value.name),
       onChanged: EquipmentProfileProvider.of(context).setProfile,
       closedChild: ReadingValueContainer.singleValue(
         value: ReadingValue(
           label: S.of(context).equipmentProfile,
-          value: context.listen<EquipmentProfile>().id.isEmpty
+          value: EquipmentProfiles.selectedOf(context).id.isEmpty
               ? S.of(context).none
-              : context.listen<EquipmentProfile>().name,
+              : EquipmentProfiles.selectedOf(context).name,
         ),
       ),
     );

lib/screens/metering/flow_metering.dart

@@ -1,12 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lightmeter/interactors/metering_interactor.dart';
-import 'package:lightmeter/providers/service_providers.dart';
+import 'package:lightmeter/providers/services_provider.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';
 
 class MeteringFlow extends StatefulWidget {
   const MeteringFlow({super.key});
@@ -18,31 +17,45 @@ class MeteringFlow extends StatefulWidget {
 class _MeteringFlowState extends State<MeteringFlow> {
   @override
   Widget build(BuildContext context) {
-    return InheritedWidgetBase<MeteringInteractor>(
+    return MeteringInteractorProvider(
       data: MeteringInteractor(
-        ServiceProviders.userPreferencesServiceOf(context),
-        ServiceProviders.caffeineServiceOf(context),
-        ServiceProviders.hapticsServiceOf(context),
-        ServiceProviders.permissionsServiceOf(context),
-        ServiceProviders.lightSensorServiceOf(context),
-        ServiceProviders.volumeEventsServiceOf(context),
+        ServicesProvider.of(context).userPreferencesService,
+        ServicesProvider.of(context).caffeineService,
+        ServicesProvider.of(context).hapticsService,
+        ServicesProvider.of(context).permissionsService,
+        ServicesProvider.of(context).lightSensorService,
+        ServicesProvider.of(context).volumeEventsService,
       )..initialize(),
-      child: InheritedWidgetBase<VolumeKeysNotifier>(
-        data: VolumeKeysNotifier(ServiceProviders.volumeEventsServiceOf(context)),
-        child: MultiBlocProvider(
-          providers: [
-            BlocProvider(create: (_) => MeteringCommunicationBloc()),
-            BlocProvider(
-              create: (context) => MeteringBloc(
-                context.get<MeteringInteractor>(),
-                context.get<VolumeKeysNotifier>(),
-                context.read<MeteringCommunicationBloc>(),
-              ),
+      child: MultiBlocProvider(
+        providers: [
+          BlocProvider(create: (_) => MeteringCommunicationBloc()),
+          BlocProvider(
+            create: (context) => MeteringBloc(
+              MeteringInteractorProvider.of(context),
+              VolumeKeysNotifier(ServicesProvider.of(context).volumeEventsService),
+              context.read<MeteringCommunicationBloc>(),
             ),
-          ],
-          child: const MeteringScreen(),
-        ),
+          ),
+        ],
+        child: const MeteringScreen(),
       ),
     );
   }
 }
+
+class MeteringInteractorProvider extends InheritedWidget {
+  final MeteringInteractor data;
+
+  const MeteringInteractorProvider({
+    required this.data,
+    required super.child,
+    super.key,
+  });
+
+  static MeteringInteractor of(BuildContext context) {
+    return context.findAncestorWidgetOfExactType<MeteringInteractorProvider>()!.data;
+  }
+
+  @override
+  bool updateShouldNotify(MeteringInteractorProvider oldWidget) => false;
+}

lib/screens/metering/screen_metering.dart

@@ -6,15 +6,17 @@ import 'package:lightmeter/data/models/ev_source_type.dart';
 import 'package:lightmeter/data/models/exposure_pair.dart';
 import 'package:lightmeter/data/models/film.dart';
 import 'package:lightmeter/data/models/metering_screen_layout_config.dart';
-import 'package:lightmeter/providers/enum_providers.dart';
-import 'package:lightmeter/providers/service_providers.dart';
+import 'package:lightmeter/providers/equipment_profile_provider.dart';
+import 'package:lightmeter/providers/services_provider.dart';
+import 'package:lightmeter/providers/user_preferences_provider.dart';
 import 'package:lightmeter/screens/metering/bloc_metering.dart';
 import 'package:lightmeter/screens/metering/components/bottom_controls/provider_bottom_controls.dart';
 import 'package:lightmeter/screens/metering/components/camera_container/provider_container_camera.dart';
 import 'package:lightmeter/screens/metering/components/light_sensor_container/provider_container_light_sensor.dart';
 import 'package:lightmeter/screens/metering/event_metering.dart';
 import 'package:lightmeter/screens/metering/state_metering.dart';
-import 'package:lightmeter/utils/inherited_generics.dart';
+import 'package:lightmeter/screens/metering/utils/listener_metering_layout_feature.dart';
+import 'package:lightmeter/screens/metering/utils/listsner_equipment_profiles.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 
 class MeteringScreen extends StatelessWidget {
@@ -45,8 +47,8 @@ class MeteringScreen extends StatelessWidget {
               builder: (context, state) => MeteringBottomControlsProvider(
                 ev: state is MeteringDataState ? state.ev : null,
                 isMetering: state.isMetering,
-                onSwitchEvSourceType: ServiceProviders.environmentOf(context).hasLightSensor
-                    ? EnumProviders.of(context).toggleEvSourceType
+                onSwitchEvSourceType: ServicesProvider.of(context).environment.hasLightSensor
+                    ? UserPreferencesProvider.of(context).toggleEvSourceType
                     : null,
                 onMeasure: () => context.read<MeteringBloc>().add(const MeasureEvent()),
                 onSettings: () {
@@ -71,12 +73,12 @@ class _InheritedListeners extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return InheritedWidgetListener<EquipmentProfile>(
+    return EquipmentProfileListener(
       onDidChangeDependencies: (value) {
         context.read<MeteringBloc>().add(EquipmentProfileChangedEvent(value));
       },
-      child: InheritedModelAspectListener<MeteringScreenLayoutFeature, bool>(
-        aspect: MeteringScreenLayoutFeature.filmPicker,
+      child: MeteringScreenLayoutFeatureListener(
+        feature: MeteringScreenLayoutFeature.filmPicker,
         onDidChangeDependencies: (value) {
           if (!value) context.read<MeteringBloc>().add(const FilmChangedEvent(Film.other()));
         },
@@ -111,7 +113,7 @@ class _MeteringContainerBuidler extends StatelessWidget {
     final fastest = exposurePairs.isNotEmpty ? exposurePairs.first : null;
     final slowest = exposurePairs.isNotEmpty ? exposurePairs.last : null;
     // Doubled build here when switching evSourceType. As new source bloc fires a new state on init
-    return EnumProviders.evSourceTypeOf(context) == EvSourceType.camera
+    return UserPreferencesProvider.evSourceTypeOf(context) == EvSourceType.camera
         ? CameraContainerProvider(
             fastest: fastest,
             slowest: slowest,
@@ -142,10 +144,10 @@ class _MeteringContainerBuidler extends StatelessWidget {
     }
 
     /// Depending on the `stopType` the exposure pairs list length is multiplied by 1,2 or 3
-    final StopType stopType = EnumProviders.stopTypeOf(context);
+    final StopType stopType = UserPreferencesProvider.stopTypeOf(context);
     final int evSteps = (ev * (stopType.index + 1)).round();
 
-    final EquipmentProfile equipmentProfile = context.listen<EquipmentProfile>();
+    final EquipmentProfile equipmentProfile = EquipmentProfiles.selectedOf(context);
     final List<ApertureValue> apertureValues =
         equipmentProfile.apertureValues.whereStopType(stopType);
     final List<ShutterSpeedValue> shutterSpeedValues =

lib/screens/metering/utils/listener_metering_layout_feature.dart

@@ -0,0 +1,52 @@
+import 'package:flutter/material.dart';
+import 'package:lightmeter/data/models/metering_screen_layout_config.dart';
+import 'package:lightmeter/providers/user_preferences_provider.dart';
+
+/// Listening to multiple dependencies at the same time causes firing an event for all dependencies
+/// even though some of them didn't change:
+/// ```dart
+/// @override
+/// void didChangeDependencies() {
+///   super.didChangeDependencies();
+///   _bloc.add(EquipmentProfileChangedEvent(EquipmentProfile.of(context)));
+///   if (!MeteringScreenLayout.featureStatusOf(context, MeteringScreenLayoutFeature.filmPicker)) {
+///     _bloc.add(const FilmChangedEvent(Film.other()));
+///   }
+/// }
+/// ```
+/// To overcome this issue I've decided to create a generic listener,
+/// that will listen to each dependency separately.
+class MeteringScreenLayoutFeatureListener extends StatefulWidget {
+  final MeteringScreenLayoutFeature feature;
+  final ValueChanged<bool> onDidChangeDependencies;
+  final Widget child;
+
+  const MeteringScreenLayoutFeatureListener({
+    required this.feature,
+    required this.onDidChangeDependencies,
+    required this.child,
+    super.key,
+  });
+
+  @override
+  State<MeteringScreenLayoutFeatureListener> createState() =>
+      _MeteringScreenLayoutFeatureListenerState();
+}
+
+class _MeteringScreenLayoutFeatureListenerState extends State<MeteringScreenLayoutFeatureListener> {
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    widget.onDidChangeDependencies(
+      UserPreferencesProvider.meteringScreenFeatureOf(
+        context,
+        widget.feature,
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return widget.child;
+  }
+}

lib/screens/metering/utils/listsner_equipment_profiles.dart

@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+import 'package:lightmeter/providers/equipment_profile_provider.dart';
+import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
+
+class EquipmentProfileListener extends StatefulWidget {
+  final ValueChanged<EquipmentProfile> onDidChangeDependencies;
+  final Widget child;
+
+  const EquipmentProfileListener({
+    required this.onDidChangeDependencies,
+    required this.child,
+    super.key,
+  });
+
+  @override
+  State<EquipmentProfileListener> createState() => _EquipmentProfileListenerState();
+}
+
+class _EquipmentProfileListenerState extends State<EquipmentProfileListener> {
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    widget.onDidChangeDependencies(EquipmentProfiles.selectedOf(context));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return widget.child;
+  }
+}

lib/screens/settings/components/about/components/report_issue/widget_list_tile_report_issue.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/generated/l10n.dart';
-import 'package:lightmeter/providers/service_providers.dart';
+import 'package:lightmeter/providers/services_provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class ReportIssueListTile extends StatelessWidget {
@@ -13,7 +13,7 @@ class ReportIssueListTile extends StatelessWidget {
       title: Text(S.of(context).reportIssue),
       onTap: () {
         launchUrl(
-          Uri.parse(ServiceProviders.environmentOf(context).issuesReportUrl),
+          Uri.parse(ServicesProvider.of(context).environment.issuesReportUrl),
           mode: LaunchMode.externalApplication,
         );
       },

lib/screens/settings/components/about/components/source_code/widget_list_tile_source_code.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/generated/l10n.dart';
-import 'package:lightmeter/providers/service_providers.dart';
+import 'package:lightmeter/providers/services_provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class SourceCodeListTile extends StatelessWidget {
@@ -13,7 +13,7 @@ class SourceCodeListTile extends StatelessWidget {
       title: Text(S.of(context).sourceCode),
       onTap: () {
         launchUrl(
-          Uri.parse(ServiceProviders.environmentOf(context).sourceCodeUrl),
+          Uri.parse(ServicesProvider.of(context).environment.sourceCodeUrl),
           mode: LaunchMode.externalApplication,
         );
       },

lib/screens/settings/components/about/components/write_email/widget_list_tile_write_email.dart

@@ -1,7 +1,7 @@
 import 'package:clipboard/clipboard.dart';
 import 'package:flutter/material.dart';
 import 'package:lightmeter/generated/l10n.dart';
-import 'package:lightmeter/providers/service_providers.dart';
+import 'package:lightmeter/providers/services_provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class WriteEmailListTile extends StatelessWidget {
@@ -13,7 +13,7 @@ class WriteEmailListTile extends StatelessWidget {
       leading: const Icon(Icons.email),
       title: Text(S.of(context).writeEmail),
       onTap: () {
-        final email = ServiceProviders.environmentOf(context).contactEmail;
+        final email = ServicesProvider.of(context).environment.contactEmail;
         final mailToUrl = Uri.parse('mailto:$email?subject=M3 Lightmeter');
         canLaunchUrl(mailToUrl).then((canLaunch) {
           if (canLaunch) {

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

@@ -1,10 +1,9 @@
 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/caffeine/bloc_list_tile_caffeine.dart';
 import 'package:lightmeter/screens/settings/components/general/components/caffeine/widget_list_tile_caffeine.dart';
-import 'package:lightmeter/utils/inherited_generics.dart';
+import 'package:lightmeter/screens/settings/flow_settings.dart';
 
 class CaffeineListTileProvider extends StatelessWidget {
   const CaffeineListTileProvider({super.key});
@@ -12,7 +11,7 @@ class CaffeineListTileProvider extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => CaffeineListTileBloc(context.get<SettingsInteractor>()),
+      create: (context) => CaffeineListTileBloc(SettingsInteractorProvider.of(context)),
       child: const CaffeineListTile(),
     );
   }

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

@@ -1,10 +1,9 @@
 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/haptics/bloc_list_tile_haptics.dart';
 import 'package:lightmeter/screens/settings/components/general/components/haptics/widget_list_tile_haptics.dart';
-import 'package:lightmeter/utils/inherited_generics.dart';
+import 'package:lightmeter/screens/settings/flow_settings.dart';
 
 class HapticsListTileProvider extends StatelessWidget {
   const HapticsListTileProvider({super.key});
@@ -12,7 +11,7 @@ class HapticsListTileProvider extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => HapticsListTileBloc(context.get<SettingsInteractor>()),
+      create: (context) => HapticsListTileBloc(SettingsInteractorProvider.of(context)),
       child: const HapticsListTile(),
     );
   }

lib/screens/settings/components/general/components/language/widget_list_tile_language.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/data/models/supported_locale.dart';
 import 'package:lightmeter/generated/l10n.dart';
-import 'package:lightmeter/providers/enum_providers.dart';
+import 'package:lightmeter/providers/user_preferences_provider.dart';
 import 'package:lightmeter/screens/settings/components/shared/dialog_picker.dart/widget_dialog_picker.dart';
 
 class LanguageListTile extends StatelessWidget {
@@ -12,20 +12,20 @@ class LanguageListTile extends StatelessWidget {
     return ListTile(
       leading: const Icon(Icons.language),
       title: Text(S.of(context).language),
-      trailing: Text(EnumProviders.localeOf(context).localizedName),
+      trailing: Text(UserPreferencesProvider.localeOf(context).localizedName),
       onTap: () {
         showDialog<SupportedLocale>(
           context: context,
           builder: (_) => DialogPicker<SupportedLocale>(
             icon: Icons.language,
             title: S.of(context).chooseLanguage,
-            selectedValue: EnumProviders.localeOf(context),
+            selectedValue: UserPreferencesProvider.localeOf(context),
             values: SupportedLocale.values,
             titleAdapter: (context, value) => value.localizedName,
           ),
         ).then((value) {
           if (value != null) {
-            EnumProviders.of(context).setLocale(value);
+            UserPreferencesProvider.of(context).setLocale(value);
           }
         });
       },

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

@@ -1,10 +1,9 @@
 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';
+import 'package:lightmeter/screens/settings/flow_settings.dart';
 
 class VolumeActionsListTileProvider extends StatelessWidget {
   const VolumeActionsListTileProvider({super.key});
@@ -12,7 +11,7 @@ class VolumeActionsListTileProvider extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => VolumeActionsListTileBloc(context.get<SettingsInteractor>()),
+      create: (context) => VolumeActionsListTileBloc(SettingsInteractorProvider.of(context)),
       child: const VolumeActionsListTile(),
     );
   }

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

@@ -1,10 +1,9 @@
 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/metering/components/calibration/components/calibration_dialog/bloc_dialog_calibration.dart';
 import 'package:lightmeter/screens/settings/components/metering/components/calibration/components/calibration_dialog/widget_dialog_calibration.dart';
-import 'package:lightmeter/utils/inherited_generics.dart';
+import 'package:lightmeter/screens/settings/flow_settings.dart';
 
 class CalibrationDialogProvider extends StatelessWidget {
   const CalibrationDialogProvider({super.key});
@@ -12,7 +11,7 @@ class CalibrationDialogProvider extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => CalibrationDialogBloc(context.get<SettingsInteractor>()),
+      create: (context) => CalibrationDialogBloc(SettingsInteractorProvider.of(context)),
       child: const CalibrationDialog(),
     );
   }

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

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lightmeter/generated/l10n.dart';
-import 'package:lightmeter/providers/service_providers.dart';
+import 'package:lightmeter/providers/services_provider.dart';
 import 'package:lightmeter/res/dimens.dart';
 import 'package:lightmeter/screens/settings/components/metering/components/calibration/components/calibration_dialog/bloc_dialog_calibration.dart';
 import 'package:lightmeter/screens/settings/components/metering/components/calibration/components/calibration_dialog/event_dialog_calibration.dart';
@@ -14,7 +14,7 @@ class CalibrationDialog extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final bool hasLightSensor = ServiceProviders.environmentOf(context).hasLightSensor;
+    final bool hasLightSensor = ServicesProvider.of(context).environment.hasLightSensor;
     return AlertDialog(
       icon: const Icon(Icons.settings_brightness),
       titlePadding: Dimens.dialogIconTitlePadding,

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

@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/generated/l10n.dart';
-import 'package:lightmeter/interactors/settings_interactor.dart';
 import 'package:lightmeter/screens/settings/components/metering/components/calibration/components/calibration_dialog/provider_dialog_calibration.dart';
-import 'package:lightmeter/utils/inherited_generics.dart';
+import 'package:lightmeter/screens/settings/flow_settings.dart';
 
 class CalibrationListTile extends StatelessWidget {
   const CalibrationListTile({super.key});
@@ -15,8 +14,8 @@ class CalibrationListTile extends StatelessWidget {
       onTap: () {
         showDialog<double>(
           context: context,
-          builder: (_) => InheritedWidgetBase(
-            data: context.get<SettingsInteractor>(),
+          builder: (_) => SettingsInteractorProvider(
+            data: SettingsInteractorProvider.of(context),
             child: const CalibrationDialogProvider(),
           ),
         );

lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/generated/l10n.dart';
 import 'package:lightmeter/providers/equipment_profile_provider.dart';
+
 import 'package:lightmeter/res/dimens.dart';
 import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart';
 import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_name_dialog/widget_dialog_equipment_profile_name.dart';
 import 'package:lightmeter/screens/shared/sliver_screen/screen_sliver.dart';
-import 'package:lightmeter/utils/inherited_generics.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 
 class EquipmentProfilesScreen extends StatefulWidget {
@@ -19,13 +19,12 @@ class _EquipmentProfilesScreenState extends State<EquipmentProfilesScreen> {
   static const maxProfiles = 5 + 1; // replace with a constant from iap
 
   late List<GlobalKey<EquipmentProfileContainerState>> profileContainersKeys = [];
-  int get profilesCount => context.listen<EquipmentProfiles>().length;
+  int get profilesCount => EquipmentProfiles.of(context).length;
 
   @override
-  void initState() {
-    super.initState();
-    profileContainersKeys = context
-        .get<EquipmentProfiles>()
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    profileContainersKeys = EquipmentProfiles.of(context)
         .map((e) => GlobalKey<EquipmentProfileContainerState>(debugLabel: e.id))
         .toList();
   }
@@ -58,14 +57,14 @@ class _EquipmentProfilesScreenState extends State<EquipmentProfilesScreen> {
                     ),
                     child: EquipmentProfileContainer(
                       key: profileContainersKeys[index],
-                      data: context.listen<EquipmentProfiles>()[index],
+                      data: EquipmentProfiles.of(context)[index],
                       onExpand: () => _keepExpandedAt(index),
                       onUpdate: (profileData) => _updateProfileAt(profileData, index),
                       onDelete: () => _removeProfileAt(index),
                     ),
                   )
                 : const SizedBox.shrink(),
-            childCount: profileContainersKeys.length,
+            childCount: profilesCount,
           ),
         ),
       ],
@@ -79,7 +78,6 @@ class _EquipmentProfilesScreenState extends State<EquipmentProfilesScreen> {
     ).then((value) {
       if (value != null) {
         EquipmentProfileProvider.of(context).addProfile(value);
-        profileContainersKeys.add(GlobalKey<EquipmentProfileContainerState>());
       }
     });
   }
@@ -89,8 +87,7 @@ class _EquipmentProfilesScreenState extends State<EquipmentProfilesScreen> {
   }
 
   void _removeProfileAt(int index) {
-    EquipmentProfileProvider.of(context).deleteProfile(context.listen<EquipmentProfiles>()[index]);
-    profileContainersKeys.removeAt(index);
+    EquipmentProfileProvider.of(context).deleteProfile(EquipmentProfiles.of(context)[index]);
   }
 
   void _keepExpandedAt(int index) {

lib/screens/settings/components/metering/components/fractional_stops/widget_list_tile_fractional_stops.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/generated/l10n.dart';
-import 'package:lightmeter/providers/enum_providers.dart';
+import 'package:lightmeter/providers/user_preferences_provider.dart';
 import 'package:lightmeter/screens/settings/components/shared/dialog_picker.dart/widget_dialog_picker.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 
@@ -12,20 +12,20 @@ class StopTypeListTile extends StatelessWidget {
     return ListTile(
       leading: const Icon(Icons.straighten),
       title: Text(S.of(context).fractionalStops),
-      trailing: Text(_typeToString(context, EnumProviders.stopTypeOf(context))),
+      trailing: Text(_typeToString(context, UserPreferencesProvider.stopTypeOf(context))),
       onTap: () {
         showDialog<StopType>(
           context: context,
           builder: (_) => DialogPicker<StopType>(
             icon: Icons.straighten,
             title: S.of(context).showFractionalStops,
-            selectedValue: EnumProviders.stopTypeOf(context),
+            selectedValue: UserPreferencesProvider.stopTypeOf(context),
             values: StopType.values,
             titleAdapter: _typeToString,
           ),
         ).then((value) {
           if (value != null) {
-            EnumProviders.of(context).setStopType(value);
+            UserPreferencesProvider.of(context).setStopType(value);
           }
         });
       },

lib/screens/settings/components/metering/components/metering_screen_layout/components/meterins_screen_layout_features_dialog/widget_dialog_metering_screen_layout_features.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/data/models/metering_screen_layout_config.dart';
 import 'package:lightmeter/generated/l10n.dart';
-import 'package:lightmeter/providers/metering_screen_layout_provider.dart';
+import 'package:lightmeter/providers/user_preferences_provider.dart';
 import 'package:lightmeter/res/dimens.dart';
 
 class MeteringScreenLayoutFeaturesDialog extends StatefulWidget {
@@ -14,7 +14,7 @@ class MeteringScreenLayoutFeaturesDialog extends StatefulWidget {
 
 class _MeteringScreenLayoutFeaturesDialogState extends State<MeteringScreenLayoutFeaturesDialog> {
   late final _features =
-      MeteringScreenLayoutConfig.from(MeteringScreenLayout.of(context, listen: false));
+      MeteringScreenLayoutConfig.from(UserPreferencesProvider.meteringScreenConfigOf(context));
 
   @override
   Widget build(BuildContext context) {
@@ -56,7 +56,7 @@ class _MeteringScreenLayoutFeaturesDialogState extends State<MeteringScreenLayou
         ),
         TextButton(
           onPressed: () {
-            MeteringScreenLayoutProvider.of(context).updateFeatures(_features);
+            UserPreferencesProvider.of(context).setMeteringScreenLayout(_features);
             Navigator.of(context).pop();
           },
           child: Text(S.of(context).save),

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

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/data/models/dynamic_colors_state.dart';
 import 'package:lightmeter/generated/l10n.dart';
-import 'package:lightmeter/providers/enum_providers.dart';
+import 'package:lightmeter/providers/user_preferences_provider.dart';
 import 'package:lightmeter/res/dimens.dart';
 
 class DynamicColorListTile extends StatelessWidget {
@@ -12,8 +12,8 @@ class DynamicColorListTile extends StatelessWidget {
     return SwitchListTile(
       secondary: const Icon(Icons.colorize),
       title: Text(S.of(context).dynamicColor),
-      value: EnumProviders.dynamicColorStateOf(context) == DynamicColorState.enabled,
-      onChanged: EnumProviders.of(context).enableDynamicColor,
+      value: UserPreferencesProvider.dynamicColorStateOf(context) == DynamicColorState.enabled,
+      onChanged: UserPreferencesProvider.of(context).enableDynamicColor,
       contentPadding: const EdgeInsets.symmetric(horizontal: Dimens.paddingM),
     );
   }

lib/screens/settings/components/theme/components/primary_color/widget_list_tile_primary_color.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/data/models/dynamic_colors_state.dart';
 import 'package:lightmeter/generated/l10n.dart';
-import 'package:lightmeter/providers/enum_providers.dart';
+import 'package:lightmeter/providers/user_preferences_provider.dart';
 import 'package:lightmeter/res/dimens.dart';
 import 'package:lightmeter/screens/settings/components/theme/components/primary_color/components/primary_color_picker_dialog/widget_dialog_picker_primary_color.dart';
 
@@ -10,7 +10,7 @@ class PrimaryColorListTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    if (EnumProviders.dynamicColorStateOf(context) == DynamicColorState.enabled) {
+    if (UserPreferencesProvider.dynamicColorStateOf(context) == DynamicColorState.enabled) {
       return Opacity(
         opacity: Dimens.disabledOpacity,
         child: IgnorePointer(
@@ -30,7 +30,7 @@ class PrimaryColorListTile extends StatelessWidget {
           builder: (_) => const PrimaryColorDialogPicker(),
         ).then((value) {
           if (value != null) {
-            EnumProviders.of(context).setPrimaryColor(value);
+            UserPreferencesProvider.of(context).setPrimaryColor(value);
           }
         });
       },

lib/screens/settings/components/theme/components/theme_type/widget_list_tile_theme_type.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/data/models/theme_type.dart';
 import 'package:lightmeter/generated/l10n.dart';
-import 'package:lightmeter/providers/enum_providers.dart';
+import 'package:lightmeter/providers/user_preferences_provider.dart';
 import 'package:lightmeter/screens/settings/components/shared/dialog_picker.dart/widget_dialog_picker.dart';
 
 class ThemeTypeListTile extends StatelessWidget {
@@ -12,20 +12,20 @@ class ThemeTypeListTile extends StatelessWidget {
     return ListTile(
       leading: const Icon(Icons.brightness_6),
       title: Text(S.of(context).theme),
-      trailing: Text(_typeToString(context, EnumProviders.themeTypeOf(context))),
+      trailing: Text(_typeToString(context, UserPreferencesProvider.themeTypeOf(context))),
       onTap: () {
         showDialog<ThemeType>(
           context: context,
           builder: (_) => DialogPicker<ThemeType>(
             icon: Icons.brightness_6,
             title: S.of(context).chooseTheme,
-            selectedValue: EnumProviders.themeTypeOf(context),
+            selectedValue: UserPreferencesProvider.themeTypeOf(context),
             values: ThemeType.values,
             titleAdapter: _typeToString,
           ),
         ).then((value) {
           if (value != null) {
-            EnumProviders.of(context).setThemeType(value);
+            UserPreferencesProvider.of(context).setThemeType(value);
           }
         });
       },

lib/screens/settings/components/theme/widget_settings_section_theme.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/data/models/dynamic_colors_state.dart';
 import 'package:lightmeter/generated/l10n.dart';
-import 'package:lightmeter/providers/enum_providers.dart';
+import 'package:lightmeter/providers/user_preferences_provider.dart';
 import 'package:lightmeter/screens/settings/components/shared/settings_section/widget_settings_section.dart';
 import 'package:lightmeter/screens/settings/components/theme/components/dynamic_color/widget_list_tile_dynamic_color.dart';
 import 'package:lightmeter/screens/settings/components/theme/components/primary_color/widget_list_tile_primary_color.dart';
@@ -17,7 +17,7 @@ class ThemeSettingsSection extends StatelessWidget {
       children: [
         const ThemeTypeListTile(),
         const PrimaryColorListTile(),
-        if (EnumProviders.dynamicColorStateOf(context) != DynamicColorState.unavailable)
+        if (UserPreferencesProvider.dynamicColorStateOf(context) != DynamicColorState.unavailable)
           const DynamicColorListTile(),
       ],
     );

lib/screens/settings/flow_settings.dart

@@ -1,22 +1,38 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/interactors/settings_interactor.dart';
-import 'package:lightmeter/providers/service_providers.dart';
+import 'package:lightmeter/providers/services_provider.dart';
 import 'package:lightmeter/screens/settings/screen_settings.dart';
-import 'package:lightmeter/utils/inherited_generics.dart';
 
 class SettingsFlow extends StatelessWidget {
   const SettingsFlow({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return InheritedWidgetBase<SettingsInteractor>(
+    return SettingsInteractorProvider(
       data: SettingsInteractor(
-        ServiceProviders.userPreferencesServiceOf(context),
-        ServiceProviders.caffeineServiceOf(context),
-        ServiceProviders.hapticsServiceOf(context),
-        ServiceProviders.volumeEventsServiceOf(context),
+        ServicesProvider.of(context).userPreferencesService,
+        ServicesProvider.of(context).caffeineService,
+        ServicesProvider.of(context).hapticsService,
+        ServicesProvider.of(context).volumeEventsService,
       ),
       child: const SettingsScreen(),
     );
   }
 }
+
+class SettingsInteractorProvider extends InheritedWidget {
+  final SettingsInteractor data;
+
+  const SettingsInteractorProvider({
+    required this.data,
+    required super.child,
+    super.key,
+  });
+
+  static SettingsInteractor of(BuildContext context) {
+    return context.findAncestorWidgetOfExactType<SettingsInteractorProvider>()!.data;
+  }
+
+  @override
+  bool updateShouldNotify(SettingsInteractorProvider oldWidget) => false;
+}

lib/screens/settings/screen_settings.dart

@@ -1,12 +1,11 @@
 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/settings/flow_settings.dart';
 import 'package:lightmeter/screens/shared/sliver_screen/screen_sliver.dart';
-import 'package:lightmeter/utils/inherited_generics.dart';
 
 class SettingsScreen extends StatefulWidget {
   const SettingsScreen({super.key});
@@ -19,12 +18,12 @@ class _SettingsScreenState extends State<SettingsScreen> {
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    context.get<SettingsInteractor>().disableVolumeHandling();
+    SettingsInteractorProvider.of(context).disableVolumeHandling();
   }
 
   @override
   void deactivate() {
-    context.get<SettingsInteractor>().restoreVolumeHandling();
+    SettingsInteractorProvider.of(context).restoreVolumeHandling();
     super.deactivate();
   }
 

lib/utils/inherited_generics.dart

@@ -1,171 +0,0 @@
-import 'package:flutter/widgets.dart';
-
-/// Listening to multiple dependencies at the same time causes firing an event for all dependencies
-/// even though some of them didn't change:
-/// ```dart
-/// @override
-/// void didChangeDependencies() {
-///   super.didChangeDependencies();
-///   _bloc.add(EquipmentProfileChangedEvent(EquipmentProfile.of(context)));
-///   if (!MeteringScreenLayout.featureStatusOf(context, MeteringScreenLayoutFeature.filmPicker)) {
-///     _bloc.add(const FilmChangedEvent(Film.other()));
-///   }
-/// }
-/// ```
-/// To overcome this issue I've decided to create a generic listener,
-/// that will listen to each dependency separately.
-class InheritedWidgetListener<T> extends StatefulWidget {
-  final ValueChanged<T> onDidChangeDependencies;
-  final Widget child;
-
-  const InheritedWidgetListener({
-    required this.onDidChangeDependencies,
-    required this.child,
-    super.key,
-  });
-
-  @override
-  State<InheritedWidgetListener<T>> createState() => _InheritedWidgetListenerState<T>();
-}
-
-class _InheritedWidgetListenerState<T> extends State<InheritedWidgetListener<T>> {
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    widget.onDidChangeDependencies(context.listen<T>());
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return widget.child;
-  }
-}
-
-class InheritedWidgetBase<T> extends InheritedWidget {
-  final T data;
-
-  const InheritedWidgetBase({
-    required this.data,
-    required super.child,
-    super.key,
-  });
-
-  static T of<T>(BuildContext context, {bool listen = true}) {
-    if (listen) {
-      return context.dependOnInheritedWidgetOfExactType<InheritedWidgetBase<T>>()!.data;
-    } else {
-      return context.findAncestorWidgetOfExactType<InheritedWidgetBase<T>>()!.data;
-    }
-  }
-
-  @override
-  bool updateShouldNotify(InheritedWidgetBase<T> oldWidget) => true;
-}
-
-extension InheritedWidgetBaseContext on BuildContext {
-  T get<T>() {
-    return InheritedWidgetBase.of<T>(this, listen: false);
-  }
-
-  T listen<T>() {
-    return InheritedWidgetBase.of<T>(this);
-  }
-}
-
-/// Listening to multiple dependencies at the same time causes firing an event for all dependencies
-/// even though some of them didn't change:
-/// ```dart
-/// @override
-/// void didChangeDependencies() {
-///   super.didChangeDependencies();
-///   _bloc.add(EquipmentProfileChangedEvent(EquipmentProfile.of(context)));
-///   if (!MeteringScreenLayout.featureStatusOf(context, MeteringScreenLayoutFeature.filmPicker)) {
-///     _bloc.add(const FilmChangedEvent(Film.other()));
-///   }
-/// }
-/// ```
-/// To overcome this issue I've decided to create a generic listener,
-/// that will listen to each dependency separately.
-class InheritedModelAspectListener<A extends Object, T> extends StatefulWidget {
-  final A aspect;
-  final ValueChanged<T> onDidChangeDependencies;
-  final Widget child;
-
-  const InheritedModelAspectListener({
-    required this.aspect,
-    required this.onDidChangeDependencies,
-    required this.child,
-    super.key,
-  });
-
-  @override
-  State<InheritedModelAspectListener<A, T>> createState() =>
-      _InheritedModelAspectListenerState<A, T>();
-}
-
-class _InheritedModelAspectListenerState<A extends Object, T>
-    extends State<InheritedModelAspectListener<A, T>> {
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    widget.onDidChangeDependencies(context.listenModelFeature<A, T>(widget.aspect));
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return widget.child;
-  }
-}
-
-class InheritedModelBase<A, T> extends InheritedModel<A> {
-  final Map<A, T> data;
-
-  const InheritedModelBase({
-    required this.data,
-    required super.child,
-    super.key,
-  });
-
-  static Map<A, T> of<A, T>(BuildContext context, {bool listen = true}) {
-    if (listen) {
-      return context.dependOnInheritedWidgetOfExactType<InheritedModelBase<A, T>>()!.data;
-    } else {
-      return context.findAncestorWidgetOfExactType<InheritedModelBase<A, T>>()!.data;
-    }
-  }
-
-  static T featureOf<A extends Object, T>(BuildContext context, A aspect) {
-    return InheritedModel.inheritFrom<InheritedModelBase<A, T>>(context, aspect: aspect)!
-        .data[aspect]!;
-  }
-
-  @override
-  bool updateShouldNotify(InheritedModelBase oldWidget) => true;
-
-  @override
-  bool updateShouldNotifyDependent(
-    InheritedModelBase<A, T> oldWidget,
-    Set<A> dependencies,
-  ) {
-    for (final dependecy in dependencies) {
-      if (oldWidget.data[dependecy] != data[dependecy]) {
-        return true;
-      }
-    }
-    return false;
-  }
-}
-
-extension InheritedModelBaseContext on BuildContext {
-  Map<A, T> getModel<A, T>() {
-    return InheritedModelBase.of<A, T>(this, listen: false);
-  }
-
-  Map<A, T> listenModel<A, T>() {
-    return InheritedModelBase.of<A, T>(this);
-  }
-
-  T listenModelFeature<A extends Object, T>(A aspect) {
-    return InheritedModelBase.featureOf<A, T>(this, aspect);
-  }
-}