Fixed Lifecycle updates with regards to hot restart, theme setup seperate file

faiyyazs · faiyyazs · commit 064345b2cdaf · 2022-10-20T19:02:02.000+05:30
diff --git a/app/lib/feature/splash/splash_page_model.dart b/app/lib/feature/splash/splash_page_model.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_errors/flutter_errors.dart';
 import 'package:injectable/injectable.dart';
@@ -6,12 +8,20 @@ import 'package:statemanagement_riverpod/statemanagement_riverpod.dart';
 @injectable
 class SplashViewModel extends BasePageViewModel {
   final String myBaseUrl;
+  final StreamController<bool> _navigateToDashboardController =
+      StreamController();
   final FlutterExceptionHandlerBinder exceptionHandlerBinder;
+  late Timer future;
 
   SplashViewModel(@factoryParam this.myBaseUrl, this.exceptionHandlerBinder) {
-    debugPrint("My First log in Splash $myBaseUrl");
+    future = Timer(const Duration(seconds: 2), () async {
+      _navigateToDashboardController.sink.add(true);
+      _navigateToDashboardController.close();
+    });
   }
 
+  Stream<bool> navigateToDashboard() => _navigateToDashboardController.stream;
+
   void test() {
     exceptionHandlerBinder.handle(block: () {
       debugPrint("exceptionHandlerBinder start");
@@ -37,12 +47,19 @@ class SplashViewModel extends BasePageViewModel {
     }).execute();
 */
 
-   /* exceptionHandlerBinder.handle(block: () {
+    /* exceptionHandlerBinder.handle(block: () {
       // serverRequest(); // Some dangerous code that can throw an exception
     }).catchIt<FormatException>((e) {
       // Optional finally block
       // Some code
       return false;
     }).execute();*/
   }
+
+  @override
+  void dispose() {
+    future.cancel();
+    _navigateToDashboardController.close();
+    super.dispose();
+  }
 }
diff --git a/app/lib/myapp.dart b/app/lib/myapp.dart
@@ -1,68 +1,67 @@
+import 'package:app/themes_setup.dart';
 import 'package:flutter/material.dart';
 import 'package:localisation/strings.dart';
 import 'package:responsive_framework/responsive_framework.dart';
 import 'package:services/services.dart';
+
 import 'package:themes/themes.dart';
 
 import 'navigation/app_router.dart';
 import 'navigation/route_paths.dart';
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {
     return ThemeBuilder(
-      themes: [
-        ThemeData(
-            backgroundColor: Colors.red,
-            colorScheme: ColorScheme.fromSwatch().copyWith(
-              secondary: Colors.blue,
-              brightness: Brightness.light,
-            )),
-      ],
+      defaultThemeMode: ThemeMode.system,
+      themes: getThemes(),
       darkTheme: ThemeData(
-        backgroundColor: Colors.blue[700],
         colorScheme: ColorScheme.fromSwatch().copyWith(
+          background: Colors.blue[700],
           secondary: Colors.yellow[700],
           brightness: Brightness.dark,
         ),
       ),
       lightTheme: ThemeData(
-        backgroundColor: Colors.blue[300],
         colorScheme: ColorScheme.fromSwatch().copyWith(
+          background: Colors.blue[300],
           secondary: Colors.yellow[300],
           brightness: Brightness.light,
         ),
       ),
-      builder: (context, regularTheme, darkTheme, themeMode) => MaterialApp(
-          navigatorKey: AppService.navigatorKey,
-          builder: (context, widget) => ResponsiveWrapper.builder(
-                ClampingScrollWrapper.builder(context, widget!),
-                maxWidth: 1400,
-                minWidth: 360,
-                defaultScale: true,
-                breakpoints: [
-                  const ResponsiveBreakpoint.resize(360, name: MOBILE),
-                  const ResponsiveBreakpoint.autoScale(800, name: TABLET),
-                  const ResponsiveBreakpoint.autoScale(1000, name: TABLET),
-                  const ResponsiveBreakpoint.resize(1200, name: DESKTOP),
-                  const ResponsiveBreakpoint.autoScale(2460, name: "4K"),
-                ],
-              ),
-          localizationsDelegates: const [
-            Strings.delegate,
-            GlobalMaterialLocalizations.delegate,
-            GlobalWidgetsLocalizations.delegate
-          ],
-          supportedLocales: Strings.delegate.supportedLocales,
-          onGenerateTitle: (context) => Strings.of(context).appName,
-          debugShowCheckedModeBanner: false,
-          initialRoute: RoutePaths.splash,
-          theme: regularTheme,
-          darkTheme: darkTheme,
-          themeMode: themeMode,
-          onGenerateRoute: AppRouter.generateRoute),
+      builder: (context, regularTheme, darkTheme, themeMode) {
+        return MaterialApp(
+            key: AppService.appKey,
+            navigatorKey: AppService.navigatorKey,
+            builder: (context, widget) => ResponsiveWrapper.builder(
+                  ClampingScrollWrapper.builder(context, widget!),
+                  maxWidth: 1400,
+                  minWidth: 360,
+                  defaultScale: true,
+                  breakpoints: [
+                    const ResponsiveBreakpoint.resize(360, name: MOBILE),
+                    const ResponsiveBreakpoint.autoScale(800, name: TABLET),
+                    const ResponsiveBreakpoint.autoScale(1000, name: TABLET),
+                    const ResponsiveBreakpoint.resize(1200, name: DESKTOP),
+                    const ResponsiveBreakpoint.autoScale(2460, name: "4K"),
+                  ],
+                ),
+            localizationsDelegates: const [
+              Strings.delegate,
+              GlobalMaterialLocalizations.delegate,
+              GlobalWidgetsLocalizations.delegate
+            ],
+            supportedLocales: Strings.delegate.supportedLocales,
+            onGenerateTitle: (context) => Strings.of(context).appName,
+            debugShowCheckedModeBanner: false,
+            initialRoute: RoutePaths.splash,
+            theme: regularTheme,
+            darkTheme: darkTheme,
+            themeMode: themeMode,
+            onGenerateRoute: AppRouter.generateRoute);
+      },
     );
   }
 }
diff --git a/app/lib/navigation/route_paths.dart b/app/lib/navigation/route_paths.dart
@@ -1,5 +1,5 @@
 /// Define application navigation path constants to avoid duplication
 class RoutePaths {
-  static const String splash = '/';
+  static const String splash = '/splash';
   static const String registration = '/registration';
 }
diff --git a/app/lib/themes_setup.dart b/app/lib/themes_setup.dart
@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+
+List<ThemeData> getThemes() {
+  return [
+    ThemeData(
+        textTheme: const TextTheme(
+          bodyLarge: TextStyle(fontFamily: 'Poppins'),
+          bodyMedium: TextStyle(fontFamily: 'Poppins'),
+          bodySmall: TextStyle(fontFamily: 'Poppins'),
+          displayLarge: TextStyle(fontFamily: 'Poppins'),
+          displayMedium: TextStyle(fontFamily: 'Poppins'),
+          displaySmall: TextStyle(fontFamily: 'Poppins'),
+          titleLarge: TextStyle(fontFamily: 'Poppins'),
+          titleMedium: TextStyle(fontFamily: 'Poppins'),
+          titleSmall: TextStyle(fontFamily: 'Poppins'),
+          labelLarge: TextStyle(fontFamily: 'Poppins'),
+          labelMedium: TextStyle(fontFamily: 'Poppins'),
+          labelSmall: TextStyle(fontFamily: 'Poppins'),
+        ),
+        colorScheme: ColorScheme.fromSwatch().copyWith(
+          background: Colors.red,
+          secondary: Colors.blue,
+          brightness: Brightness.light,
+        )),
+  ];
+}
diff --git a/services/lib/src/app_service.dart b/services/lib/src/app_service.dart
@@ -7,4 +7,9 @@ class AppService {
   /// Returns the [Get.key] value to be set in the applications navigation
   static GlobalKey<NavigatorState>? get navigatorKey =>
       GlobalKey(debugLabel: 'my-app-key');
+
+  /// Returns the [Get.key] value to be set in the applications material app
+  static GlobalKey<State>? get appKey =>
+      GlobalKey(debugLabel: 'appKey-app-key');
+
 }
diff --git a/statemanagement-core/lib/statemanagement_core.dart b/statemanagement-core/lib/statemanagement_core.dart
@@ -4,5 +4,6 @@
 library statemanagement_core;
 
 export 'src/base_page_state.dart';
+export 'src/builders_helpers.dart';
+
 
-// TODO: Export any libraries intended for clients of this package.
diff --git a/statemanagement-riverpod/lib/src/base_page.dart b/statemanagement-riverpod/lib/src/base_page.dart
@@ -17,7 +17,7 @@ abstract class BasePageState<VM extends BasePageViewModel,
 }
 
 abstract class BaseStatefulPage<VM extends BasePageViewModel,
-    B extends BasePage<VM>> extends BasePageState<VM, B>  {
+    B extends BasePage<VM>> extends BasePageState<VM, B> {
   @override
   Widget build(BuildContext context) {
     return BaseWidget<VM>(
@@ -32,22 +32,28 @@ abstract class BaseStatefulPage<VM extends BasePageViewModel,
 abstract class BasePageViewWidget<T extends BasePageViewModel> extends Widget {
   final ProviderBase<T> providerBase;
 
-  BasePageViewWidget(this.providerBase);
+  BasePageViewWidget(
+    this.providerBase,
+  );
 
   @protected
   Widget build(BuildContext context, T model);
 
   @override
-  DataProviderElement<T> createElement() =>
-      DataProviderElement<T>(this, providerBase);
+  DataProviderElement<T> createElement() => DataProviderElement<T>(
+        this,
+        providerBase,
+      );
 }
 
 class DataProviderElement<T extends BasePageViewModel>
     extends ComponentElement {
   final ProviderBase<T> providerBase;
 
-  DataProviderElement(BasePageViewWidget<T> widget, this.providerBase)
-      : super(widget);
+  DataProviderElement(
+    BasePageViewWidget<T> widget,
+    this.providerBase,
+  ) : super(widget);
 
   @override
   BasePageViewWidget<T> get widget => super.widget as BasePageViewWidget<T>;
diff --git a/statemanagement-riverpod/lib/src/base_widget.dart b/statemanagement-riverpod/lib/src/base_widget.dart
@@ -1,8 +1,9 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:statemanagement_riverpod/src/base_view_model.dart';
 
 /// StatefulWidget for T type of ViewModel / ChangeNotifier
-class BaseWidget<T extends ChangeNotifier> extends StatefulWidget {
+class BaseWidget<T extends BaseViewModel> extends StatefulWidget {
   final Widget Function(BuildContext context, T? model, Widget? child) builder;
   final ProviderBase<T> providerBase;
   final Function(T)? onModelReady;
@@ -21,7 +22,7 @@ class BaseWidget<T extends ChangeNotifier> extends StatefulWidget {
 }
 
 /// State of StatefulWidget of T type of Viewmodel / ChangeNotifier
-class _BaseWidget<T extends ChangeNotifier> extends State<BaseWidget<T>> {
+class _BaseWidget<T extends BaseViewModel> extends State<BaseWidget<T>> {
   T? _model;
 
   @override
diff --git a/themes/lib/src/theme_builder.dart b/themes/lib/src/theme_builder.dart
@@ -93,7 +93,8 @@ class _ThemeBuilderState extends State<ThemeBuilder>
       case AppLifecycleState.inactive:
         break;
       case AppLifecycleState.resumed:
-        adjustSystemThemeIfNecessary();
+        //Commented until the re-apply bug is solved to avoid restart from start.
+        //adjustSystemThemeIfNecessary();
         break;
       case AppLifecycleState.paused:
         break;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/// Define application navigation path constants to avoid duplication`
`2`	`2`	`class RoutePaths {`
`3`		`- static const String splash = '/';`
	`3`	`+ static const String splash = '/splash';`
`4`	`4`	`static const String registration = '/registration';`
`5`	`5`	`}`