removed Provider from providers folder

lib/application.dart

@@ -19,6 +19,7 @@ import 'package:lightmeter/providers/supported_locale_provider.dart';
 import 'package:lightmeter/providers/theme_provider.dart';
 import 'package:lightmeter/screens/metering/flow_metering.dart';
 import 'package:lightmeter/screens/settings/flow_settings.dart';
+import 'package:lightmeter/utils/inherited_generics.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -53,26 +54,28 @@ class Application extends StatelessWidget {
                   child: EvSourceTypeProvider(
                     child: SupportedLocaleProvider(
                       child: ThemeProvider(
-                        builder: (context, _) => _AnnotatedRegionWrapper(
+                        child: Builder(
-                          child: MaterialApp(
+                          builder: (context) => _AnnotatedRegionWrapper(
-                            theme: context.watch<ThemeData>(),
+                            child: MaterialApp(
-                            locale: Locale(context.watch<SupportedLocale>().intlName),
+                              theme: context.listen<ThemeData>(),
-                            localizationsDelegates: const [
+                              locale: Locale(context.listen<SupportedLocale>().intlName),
-                              S.delegate,
+                              localizationsDelegates: const [
-                              GlobalMaterialLocalizations.delegate,
+                                S.delegate,
-                              GlobalWidgetsLocalizations.delegate,
+                                GlobalMaterialLocalizations.delegate,
-                              GlobalCupertinoLocalizations.delegate,
+                                GlobalWidgetsLocalizations.delegate,
-                            ],
+                                GlobalCupertinoLocalizations.delegate,
-                            supportedLocales: S.delegate.supportedLocales,
+                              ],
-                            builder: (context, child) => MediaQuery(
+                              supportedLocales: S.delegate.supportedLocales,
-                              data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
+                              builder: (context, child) => MediaQuery(
-                              child: child!,
+                                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(),
-                            },
                           ),
                         ),
                       ),
@@ -100,7 +103,7 @@ class _AnnotatedRegionWrapper extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final systemIconsBrightness = ThemeData.estimateBrightnessForColor(
-      context.watch<ThemeData>().colorScheme.onSurface,
+      context.listen<ThemeData>().colorScheme.onSurface,
     );
     return AnnotatedRegion(
       value: SystemUiOverlayStyle(

lib/providers/equipment_profile_provider.dart

@@ -1,9 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/data/shared_prefs_service.dart';
+import 'package:lightmeter/utils/inherited_generics.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 import 'package:provider/provider.dart';
 import 'package:uuid/uuid.dart';
 
+typedef EquipmentProfiles = List<EquipmentProfileData>;
+typedef EquipmentProfile = EquipmentProfileData;
+
 class EquipmentProfileProvider extends StatefulWidget {
   final Widget child;
 
@@ -47,9 +51,9 @@ class EquipmentProfileProviderState extends State<EquipmentProfileProvider> {
 
   @override
   Widget build(BuildContext context) {
-    return EquipmentProfiles(
+    return InheritedWidgetBase<List<EquipmentProfileData>>(
-      profiles: [_defaultProfile] + _customProfiles,
+      data: [_defaultProfile] + _customProfiles,
-      child: EquipmentProfile(
+      child: InheritedWidgetBase<EquipmentProfileData>(
         data: _selectedProfile,
         child: widget.child,
       ),
@@ -96,45 +100,3 @@ class EquipmentProfileProviderState extends State<EquipmentProfileProvider> {
     setState(() {});
   }
 }
-
-class EquipmentProfiles extends InheritedWidget {
-  final List<EquipmentProfileData> profiles;
-
-  const EquipmentProfiles({
-    required this.profiles,
-    required super.child,
-    super.key,
-  });
-
-  static List<EquipmentProfileData> of(BuildContext context, {bool listen = true}) {
-    if (listen) {
-      return context.dependOnInheritedWidgetOfExactType<EquipmentProfiles>()!.profiles;
-    } else {
-      return context.findAncestorWidgetOfExactType<EquipmentProfiles>()!.profiles;
-    }
-  }
-
-  @override
-  bool updateShouldNotify(EquipmentProfiles oldWidget) => true;
-}
-
-class EquipmentProfile extends InheritedWidget {
-  final EquipmentProfileData data;
-
-  const EquipmentProfile({
-    required this.data,
-    required super.child,
-    super.key,
-  });
-
-  static EquipmentProfileData of(BuildContext context, {bool listen = true}) {
-    if (listen) {
-      return context.dependOnInheritedWidgetOfExactType<EquipmentProfile>()!.data;
-    } else {
-      return context.findAncestorWidgetOfExactType<EquipmentProfile>()!.data;
-    }
-  }
-
-  @override
-  bool updateShouldNotify(EquipmentProfile oldWidget) => true;
-}

lib/providers/ev_source_type_provider.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:lightmeter/data/models/ev_source_type.dart';
 import 'package:lightmeter/data/shared_prefs_service.dart';
 import 'package:lightmeter/environment.dart';
+import 'package:lightmeter/utils/inherited_generics.dart';
 import 'package:provider/provider.dart';
 
 class EvSourceTypeProvider extends StatefulWidget {
@@ -41,9 +42,9 @@ class EvSourceTypeProviderState extends State<EvSourceTypeProvider> {
   Widget build(BuildContext context) {
     return ValueListenableBuilder(
       valueListenable: valueListenable,
-      builder: (_, value, child) => Provider.value(
+      builder: (_, value, child) => InheritedWidgetBase<EvSourceType>(
-        value: value,
+        data: value,
-        child: child,
+        child: child!,
       ),
       child: widget.child,
     );

lib/providers/supported_locale_provider.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:lightmeter/data/models/supported_locale.dart';
 import 'package:lightmeter/data/shared_prefs_service.dart';
 import 'package:lightmeter/generated/l10n.dart';
+import 'package:lightmeter/utils/inherited_generics.dart';
 import 'package:provider/provider.dart';
 
 class SupportedLocaleProvider extends StatefulWidget {
@@ -36,9 +37,9 @@ class SupportedLocaleProviderState extends State<SupportedLocaleProvider> {
   Widget build(BuildContext context) {
     return ValueListenableBuilder(
       valueListenable: valueListenable,
-      builder: (_, value, child) => Provider.value(
+      builder: (_, value, child) => InheritedWidgetBase<SupportedLocale>(
-        value: value,
+        data: value,
-        child: child,
+        child: child!,
       ),
       child: widget.child,
     );

lib/providers/theme_provider.dart

@@ -5,15 +5,16 @@ import 'package:lightmeter/data/models/dynamic_colors_state.dart';
 import 'package:lightmeter/data/models/theme_type.dart';
 import 'package:lightmeter/data/shared_prefs_service.dart';
 import 'package:lightmeter/res/dimens.dart';
+import 'package:lightmeter/utils/inherited_generics.dart';
 import 'package:material_color_utilities/material_color_utilities.dart';
 
 import 'package:provider/provider.dart';
 
 class ThemeProvider extends StatefulWidget {
-  final TransitionBuilder? builder;
+  final Widget child;
 
   const ThemeProvider({
-    this.builder,
+    required this.child,
     super.key,
   });
 
@@ -76,8 +77,8 @@ class ThemeProviderState extends State<ThemeProvider> with WidgetsBindingObserve
   Widget build(BuildContext context) {
     return ValueListenableBuilder(
       valueListenable: _themeTypeNotifier,
-      builder: (_, themeType, __) => Provider.value(
+      builder: (_, themeType, __) => InheritedWidgetBase<ThemeType>(
-        value: themeType,
+        data: themeType,
         child: ValueListenableBuilder(
           valueListenable: _dynamicColorNotifier,
           builder: (_, useDynamicColor, __) => _DynamicColorProvider(
@@ -88,7 +89,7 @@ class ThemeProviderState extends State<ThemeProvider> with WidgetsBindingObserve
               builder: (_, primaryColor, __) => _ThemeDataProvider(
                 primaryColor: dynamicPrimaryColor ?? primaryColor,
                 brightness: _themeBrightness,
-                builder: widget.builder,
+                child: widget.child,
               ),
             ),
           ),
@@ -154,8 +155,8 @@ class _DynamicColorProvider extends StatelessWidget {
           dynamicPrimaryColor = null;
           state = DynamicColorState.unavailable;
         }
-        return Provider.value(
+        return InheritedWidgetBase<DynamicColorState>(
-          value: state,
+          data: state,
           child: builder(context, dynamicPrimaryColor),
         );
       },
@@ -166,19 +167,19 @@ class _DynamicColorProvider extends StatelessWidget {
 class _ThemeDataProvider extends StatelessWidget {
   final Color primaryColor;
   final Brightness brightness;
-  final TransitionBuilder? builder;
+  final Widget child;
 
   const _ThemeDataProvider({
     required this.primaryColor,
     required this.brightness,
-    required this.builder,
+    required this.child,
   });
 
   @override
   Widget build(BuildContext context) {
-    return Provider.value(
+    return InheritedWidgetBase<ThemeData>(
-      value: _themeFromColorScheme(_colorSchemeFromColor()),
+      data: _themeFromColorScheme(_colorSchemeFromColor()),
-      builder: builder,
+      child: child,
     );
   }
 

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

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:lightmeter/data/models/ev_source_type.dart';
 import 'package:lightmeter/res/dimens.dart';
 import 'package:lightmeter/screens/metering/components/bottom_controls/components/measure_button/widget_button_measure.dart';
-import 'package:provider/provider.dart';
+import 'package:lightmeter/utils/inherited_generics.dart';
 
 class MeteringBottomControls extends StatelessWidget {
   final double? ev;
@@ -44,7 +44,7 @@ class MeteringBottomControls extends StatelessWidget {
                       child: IconButton(
                         onPressed: onSwitchEvSourceType,
                         icon: Icon(
-                          context.watch<EvSourceType>() != EvSourceType.camera
+                          context.listen<EvSourceType>() != EvSourceType.camera
                               ? Icons.camera_rear
                               : Icons.wb_incandescent,
                         ),

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

@@ -9,6 +9,7 @@ import 'package:lightmeter/providers/metering_screen_layout_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 {
@@ -76,7 +77,7 @@ class ReadingsContainer extends StatelessWidget {
             Expanded(
               child: _IsoValuePicker(
                 selectedValue: iso,
-                values: EquipmentProfile.of(context).isoValues,
+                values: context.listen<EquipmentProfile>().isoValues,
                 onChanged: onIsoChanged,
               ),
             ),
@@ -84,7 +85,7 @@ class ReadingsContainer extends StatelessWidget {
             Expanded(
               child: _NdValuePicker(
                 selectedValue: nd,
-                values: EquipmentProfile.of(context).ndValues,
+                values: context.listen<EquipmentProfile>().ndValues,
                 onChanged: onNdChanged,
               ),
             ),
@@ -107,16 +108,16 @@ class _EquipmentProfilePicker extends StatelessWidget {
     return AnimatedDialogPicker<EquipmentProfileData>(
       icon: Icons.camera,
       title: S.of(context).equipmentProfile,
-      selectedValue: EquipmentProfile.of(context),
+      selectedValue: context.listen<EquipmentProfile>(),
-      values: EquipmentProfiles.of(context),
+      values: context.listen<EquipmentProfiles>(),
       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: EquipmentProfile.of(context).id.isEmpty
+          value: context.listen<EquipmentProfile>().id.isEmpty
               ? S.of(context).none
-              : EquipmentProfile.of(context).name,
+              : context.listen<EquipmentProfile>().name,
         ),
       ),
     );

lib/screens/metering/flow_metering.dart

@@ -39,7 +39,7 @@ class _MeteringFlowState extends State<MeteringFlow> {
             create: (context) => MeteringBloc(
               context.read<MeteringCommunicationBloc>(),
               context.read<MeteringInteractor>(),
-              EquipmentProfile.of(context, listen: false),
+              context.get<EquipmentProfile>(),
               context.get<StopType>(),
             ),
           ),

lib/screens/metering/screen_metering.dart

@@ -16,22 +16,9 @@ import 'package:lightmeter/screens/metering/state_metering.dart';
 import 'package:lightmeter/utils/inherited_generics.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 
-class MeteringScreen extends StatefulWidget {
+class MeteringScreen extends StatelessWidget {
   const MeteringScreen({super.key});
 
-  @override
-  State<MeteringScreen> createState() => _MeteringScreenState();
-}
-
-class _MeteringScreenState extends State<MeteringScreen> {
-  MeteringBloc get _bloc => context.read<MeteringBloc>();
-
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    _bloc.add(EquipmentProfileChangedEvent(EquipmentProfile.of(context)));
-  }
-
   @override
   Widget build(BuildContext context) {
     return _InheritedListeners(
@@ -48,22 +35,23 @@ class _MeteringScreenState extends State<MeteringScreen> {
                   film: state.film,
                   iso: state.iso,
                   nd: state.nd,
-                  onFilmChanged: (value) => _bloc.add(FilmChangedEvent(value)),
+                  onFilmChanged: (value) =>
-                  onIsoChanged: (value) => _bloc.add(IsoChangedEvent(value)),
+                      context.read<MeteringBloc>().add(FilmChangedEvent(value)),
-                  onNdChanged: (value) => _bloc.add(NdChangedEvent(value)),
+                  onIsoChanged: (value) => context.read<MeteringBloc>().add(IsoChangedEvent(value)),
+                  onNdChanged: (value) => context.read<MeteringBloc>().add(NdChangedEvent(value)),
                 ),
               ),
             ),
             BlocBuilder<MeteringBloc, MeteringState>(
               builder: (context, state) => MeteringBottomControlsProvider(
                 ev: state is MeteringDataState ? state.ev : null,
-                isMetering: state is LoadingState ||
+                isMetering:
-                    state is MeteringDataState && state.continuousMetering,
+                    state is LoadingState || state is MeteringDataState && state.continuousMetering,
                 hasError: state is MeteringDataState && state.hasError,
                 onSwitchEvSourceType: context.read<Environment>().hasLightSensor
                     ? EvSourceTypeProvider.of(context).toggleType
                     : null,
-                onMeasure: () => _bloc.add(const MeasureEvent()),
+                onMeasure: () => context.read<MeteringBloc>().add(const MeasureEvent()),
                 onSettings: () => Navigator.pushNamed(context, 'settings'),
               ),
             ),
@@ -81,16 +69,21 @@ class _InheritedListeners extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return InheritedWidgetListener<StopType>(
+    return InheritedWidgetListener<EquipmentProfile>(
       onDidChangeDependencies: (value) {
-        context.read<MeteringBloc>().add(StopTypeChangedEvent(value));
+        context.read<MeteringBloc>().add(EquipmentProfileChangedEvent(value));
       },
-      child: InheritedModelAspectListener<MeteringScreenLayoutFeature, bool>(
+      child: InheritedWidgetListener<StopType>(
-        aspect: MeteringScreenLayoutFeature.filmPicker,
         onDidChangeDependencies: (value) {
-          if (!value) context.read<MeteringBloc>().add(const FilmChangedEvent(Film.other()));
+          context.read<MeteringBloc>().add(StopTypeChangedEvent(value));
         },
-        child: child,
+        child: InheritedModelAspectListener<MeteringScreenLayoutFeature, bool>(
+          aspect: MeteringScreenLayoutFeature.filmPicker,
+          onDidChangeDependencies: (value) {
+            if (!value) context.read<MeteringBloc>().add(const FilmChangedEvent(Film.other()));
+          },
+          child: child,
+        ),
       ),
     );
   }
@@ -121,7 +114,7 @@ class _MeteringContainerBuidler extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return context.watch<EvSourceType>() == EvSourceType.camera
+    return context.listen<EvSourceType>() == EvSourceType.camera
         ? CameraContainerProvider(
             fastest: fastest,
             slowest: slowest,

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

@@ -3,7 +3,7 @@ import 'package:lightmeter/data/models/supported_locale.dart';
 import 'package:lightmeter/generated/l10n.dart';
 import 'package:lightmeter/providers/supported_locale_provider.dart';
 import 'package:lightmeter/screens/settings/components/shared/dialog_picker.dart/widget_dialog_picker.dart';
-import 'package:provider/provider.dart';
+import 'package:lightmeter/utils/inherited_generics.dart';
 
 class LanguageListTile extends StatelessWidget {
   const LanguageListTile({super.key});
@@ -13,14 +13,14 @@ class LanguageListTile extends StatelessWidget {
     return ListTile(
       leading: const Icon(Icons.language),
       title: Text(S.of(context).language),
-      trailing: Text(context.watch<SupportedLocale>().localizedName),
+      trailing: Text(context.listen<SupportedLocale>().localizedName),
       onTap: () {
         showDialog<SupportedLocale>(
           context: context,
           builder: (_) => DialogPicker<SupportedLocale>(
             icon: Icons.language,
             title: S.of(context).chooseLanguage,
-            selectedValue: context.read<SupportedLocale>(),
+            selectedValue: context.get<SupportedLocale>(),
             values: SupportedLocale.values,
             titleAdapter: (context, value) => value.localizedName,
           ),

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

@@ -5,6 +5,7 @@ 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 {
@@ -18,12 +19,13 @@ class _EquipmentProfilesScreenState extends State<EquipmentProfilesScreen> {
   static const maxProfiles = 5 + 1; // replace with a constant from iap
 
   late List<GlobalKey<EquipmentProfileContainerState>> profileContainersKeys = [];
-  int get profilesCount => EquipmentProfiles.of(context).length;
+  int get profilesCount => context.listen<EquipmentProfiles>().length;
 
   @override
   void initState() {
     super.initState();
-    profileContainersKeys = EquipmentProfiles.of(context, listen: false)
+    profileContainersKeys = context
+        .get<EquipmentProfiles>()
         .map((e) => GlobalKey<EquipmentProfileContainerState>(debugLabel: e.id))
         .toList();
   }
@@ -56,7 +58,7 @@ class _EquipmentProfilesScreenState extends State<EquipmentProfilesScreen> {
                     ),
                     child: EquipmentProfileContainer(
                       key: profileContainersKeys[index],
-                      data: EquipmentProfiles.of(context)[index],
+                      data: context.listen<EquipmentProfiles>()[index],
                       onExpand: () => _keepExpandedAt(index),
                       onUpdate: (profileData) => _updateProfileAt(profileData, index),
                       onDelete: () => _removeProfileAt(index),
@@ -87,7 +89,7 @@ class _EquipmentProfilesScreenState extends State<EquipmentProfilesScreen> {
   }
 
   void _removeProfileAt(int index) {
-    EquipmentProfileProvider.of(context).deleteProfile(EquipmentProfiles.of(context)[index]);
+    EquipmentProfileProvider.of(context).deleteProfile(context.listen<EquipmentProfiles>()[index]);
     profileContainersKeys.removeAt(index);
   }
 

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

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.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/utils/inherited_generics.dart';
 
 class DynamicColorListTile extends StatelessWidget {
   const DynamicColorListTile({super.key});
@@ -12,7 +12,7 @@ class DynamicColorListTile extends StatelessWidget {
     return SwitchListTile(
       secondary: const Icon(Icons.colorize),
       title: Text(S.of(context).dynamicColor),
-      value: context.watch<DynamicColorState>() == DynamicColorState.enabled,
+      value: context.listen<DynamicColorState>() == DynamicColorState.enabled,
       onChanged: ThemeProvider.of(context).enableDynamicColor,
     );
   }

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

@@ -1,18 +1,17 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.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/screens/settings/components/theme/components/primary_color/components/primary_color_picker_dialog/widget_dialog_picker_primary_color.dart';
+import 'package:lightmeter/utils/inherited_generics.dart';
 
 class PrimaryColorListTile extends StatelessWidget {
   const PrimaryColorListTile({super.key});
 
   @override
   Widget build(BuildContext context) {
-    if (context.watch<DynamicColorState>() == DynamicColorState.enabled) {
+    if (context.listen<DynamicColorState>() == DynamicColorState.enabled) {
       return Opacity(
         opacity: Dimens.disabledOpacity,
         child: IgnorePointer(

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

@@ -3,7 +3,7 @@ import 'package:lightmeter/data/models/theme_type.dart';
 import 'package:lightmeter/generated/l10n.dart';
 import 'package:lightmeter/providers/theme_provider.dart';
 import 'package:lightmeter/screens/settings/components/shared/dialog_picker.dart/widget_dialog_picker.dart';
-import 'package:provider/provider.dart';
+import 'package:lightmeter/utils/inherited_generics.dart';
 
 class ThemeTypeListTile extends StatelessWidget {
   const ThemeTypeListTile({super.key});
@@ -13,14 +13,14 @@ class ThemeTypeListTile extends StatelessWidget {
     return ListTile(
       leading: const Icon(Icons.brightness_6),
       title: Text(S.of(context).theme),
-      trailing: Text(_typeToString(context, context.watch<ThemeType>())),
+      trailing: Text(_typeToString(context, context.listen<ThemeType>())),
       onTap: () {
         showDialog<ThemeType>(
           context: context,
           builder: (_) => DialogPicker<ThemeType>(
             icon: Icons.brightness_6,
             title: S.of(context).chooseTheme,
-            selectedValue: context.read<ThemeType>(),
+            selectedValue: context.get<ThemeType>(),
             values: ThemeType.values,
             titleAdapter: _typeToString,
           ),

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

@@ -1,12 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lightmeter/data/models/dynamic_colors_state.dart';
 import 'package:lightmeter/generated/l10n.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';
 import 'package:lightmeter/screens/settings/components/theme/components/theme_type/widget_list_tile_theme_type.dart';
+import 'package:lightmeter/utils/inherited_generics.dart';
 
 class ThemeSettingsSection extends StatelessWidget {
   const ThemeSettingsSection({super.key});
@@ -18,7 +17,7 @@ class ThemeSettingsSection extends StatelessWidget {
       children: [
         const ThemeTypeListTile(),
         const PrimaryColorListTile(),
-        if (context.read<DynamicColorState>() != DynamicColorState.unavailable)
+        if (context.get<DynamicColorState>() != DynamicColorState.unavailable)
           const DynamicColorListTile(),
       ],
     );