minor refactor

Author: RomanBase

lib/src/navigator/route_navigator_extension.dart

@@ -131,4 +131,24 @@ extension RouteNavigatorExtension on BuildContext {
 
     return route != null && route.isFirst;
   }
+
+  /// Restores a single route from stored settings.
+  Route? restoreRoute() => Control.get<RouteStore>()?.routing.restore(this);
+
+  /// Restores a route and its sub-routes from stored settings and navigates to them.
+  Future<dynamic> restoreNavigation([
+    List<dynamic> subRoutes = const [],
+  ]) async =>
+      Control.get<RouteStore>()
+          ?.routing
+          .restoreRouteNavigation(this, navigator, subRoutes);
+}
+
+/// Extension on [RootContext] for routing.
+extension RootContextRouterExt on RootContext {
+  /// Generates a route, with a special case for the root ('/') route.
+  Route? generateRoute(RouteSettings settings, {Route Function()? root}) =>
+      (settings.name == '/' && root != null)
+          ? root.call()
+          : Control.get<RouteStore>()?.routing.generate(this, settings);
 }

lib/src/navigator/route_store.dart

@@ -341,7 +341,7 @@ class RouteMask {
 }
 
 class _PathSegment {
-  static RegExp _mask = RegExp('{.*}');
+  static final RegExp _mask = RegExp('{.*}');
 
   final String name;
   final bool mask;
@@ -527,25 +527,3 @@ class RoutingProvider {
     return null;
   }
 }
-
-/// Extension on [RootContext] for routing.
-extension RootContextRouterExt on RootContext {
-  /// Generates a route, with a special case for the root ('/') route.
-  Route? generateRoute(RouteSettings settings, {Route Function()? root}) =>
-      (settings.name == '/' && root != null)
-          ? root.call()
-          : Control.get<RouteStore>()?.routing.generate(this, settings);
-}
-
-/// Extension on [CoreContext] for routing.
-extension BuildContextRouterExt on CoreContext {
-  /// Restores a single route from stored settings.
-  Route? restoreRoute() => Control.get<RouteStore>()?.routing.restore(this);
-
-  /// Restores a route and its sub-routes from stored settings and navigates to them.
-  Future<dynamic> restoreNavigation(
-          [List<dynamic> subRoutes = const []]) async =>
-      Control.get<RouteStore>()
-          ?.routing
-          .restoreRouteNavigation(this, navigator, subRoutes);
-}

modules/control_config/lib/src/pref_model.dart

@@ -26,7 +26,7 @@ class PrefModelBase<T, U> extends ControlModel with NotifierComponent {
 
   /// Sets a new value for the preference.
   /// This updates the stored preference and notifies all listeners via [notify()].
-  set value(T? value) {
+  set value(dynamic value) {
     _set(value as U);
     notify();
   }

modules/control_config/pubspec.yaml

@@ -1,7 +1,7 @@
 name: control_config
 description: Wrapper around shared_preferences
 repository: https://github.com/romanbase/flutter_control
-version: 1.4.0-beta.2
+version: 1.4.0-beta.3
 
 environment:
   sdk: '>=3.0.0 <4.0.0'

pubspec.yaml

@@ -1,7 +1,7 @@
 name: flutter_control
 description: Flutter Control is complex library to maintain App and State management, Dependency Injection, Navigation with Routing, Localization and more..
 repository: https://github.com/romanbase/flutter_control
-version: 4.2.1-beta.2
+version: 4.2.1-beta.3
 
 environment:
   sdk: '>=3.0.0 <4.0.0'
@@ -15,7 +15,7 @@ dependencies:
   control_core: ">=2.0.0-beta.2 <3.0.0"
 
   # https://pub.dev/packages/control_config
-  control_config: ">=1.4.0-beta.2 <2.0.0"
+  control_config: ">=1.4.0-beta.3 <2.0.0"
 
 dev_dependencies:
   flutter_test: