fix theme changing crash, fix button style

Author: feruzm

lib/core/common/widgets/drawer/drawer_menu.dart

@@ -100,20 +100,20 @@ class DrawerMenu extends StatelessWidget {
                             },
                           ),
                         ],
-                        DrawerTile(
-                            onTap: () {
-                              Navigator.pop(context);
-                              context.platformPushNamed(Routes.exploreView);
-                            },
-                            text: LocaleText.explore,
-                            icon: Icons.explore),
                         DrawerTile(
                             onTap: () {
                               context.popAndPlatformPushNamed(
                                   Routes.bookmarksView);
                             },
                             text: LocaleText.bookmarks,
                             icon: Icons.bookmarks),
+                        DrawerTile(
+                            onTap: () {
+                              Navigator.pop(context);
+                              context.platformPushNamed(Routes.exploreView);
+                            },
+                            text: LocaleText.explore,
+                            icon: Icons.explore),
                         DrawerTile(
                             onTap: () {
                               context

lib/core/providers/global_providers.dart

@@ -1,6 +1,8 @@
-import 'package:provider/single_child_widget.dart';
+import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';
+import 'package:provider/single_child_widget.dart';
 import 'package:waves/core/dependency_injection/dependency_injection.dart';
+import 'package:waves/core/routes/app_router.dart';
 import 'package:waves/core/utilities/theme/theme_mode.dart';
 import 'package:waves/features/notifications/presentation/controller/notifications_controller.dart';
 import 'package:waves/features/notifications/repository/notifications_repository.dart';
@@ -19,6 +21,11 @@ class GlobalProviders {
       lazy: false,
       create: (context) => UserController(),
     ),
+    ProxyProvider<UserController, GoRouter>(
+      lazy: false,
+      update: (context, userController, previousRouter) =>
+          previousRouter ?? AppRouter.createRouter(userController),
+    ),
     ChangeNotifierProxyProvider<UserController, UserProfileController>(
       create: (context) => UserProfileController(accountName: null),
       update: (context, userController, previousProfileController) {

lib/core/routes/app_router.dart

@@ -35,15 +35,18 @@ class AppRouter {
   static final _shellNavigatorKey = GlobalKey<NavigatorState>();
 
   static GoRouter router(BuildContext context) {
-    bool isTermsAccepted = context.select<UserController, bool>(
-        (settingsController) => settingsController.getTermsAcceptedFlag());
+    return Provider.of<GoRouter>(context, listen: false);
+  }
 
-    String initialPath = isTermsAccepted ? '/' : '/${Routes.welcomeView}';
+  static GoRouter createRouter(UserController userController) {
+    final isTermsAccepted = userController.getTermsAcceptedFlag();
+    final initialPath = isTermsAccepted ? '/' : '/${Routes.welcomeView}';
 
     return GoRouter(
-        navigatorKey: _rootNavigatorKey,
-        initialLocation: initialPath,
-        routes: routes());
+      navigatorKey: _rootNavigatorKey,
+      initialLocation: initialPath,
+      routes: routes(),
+    );
   }
 
   static List<RouteBase> routes() {

lib/features/threads/presentation/thread_feed/view/thread_feed_view.dart

@@ -223,6 +223,10 @@ class _LoginPrompt extends StatelessWidget {
             ),
             const SizedBox(height: 16),
             FilledButton(
+              style: FilledButton.styleFrom(
+                backgroundColor: theme.primaryColor,
+                foregroundColor: theme.colorScheme.onPrimary,
+              ),
               onPressed: () {
                 context.platformPushNamed(Routes.authView);
               },

lib/main.dart

@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:get_storage/get_storage.dart';
 import 'package:package_info_plus/package_info_plus.dart';
+import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';
 import 'package:waves/core/locales/app_locales.dart';
 import 'package:waves/core/providers/global_providers.dart';
@@ -106,8 +107,10 @@ class MyApp extends StatelessWidget {
           final double textScaleFactor = isLargeScreen ? 1.15 : 1.0;
           final double iconScaleFactor = isLargeScreen ? 1.2 : 1.0;
 
+          final router = context.read<GoRouter>();
+
           return MaterialApp.router(
-            routerConfig: AppRouter.router(context),
+            routerConfig: router,
             localizationsDelegates: context.localizationDelegates,
             supportedLocales: context.supportedLocales,
             locale: context.locale,