theme refactor

tylersavery · Feb 9, 2022 · 4224530 · 4224530
1 parent 5c135c1
commit 4224530
Show file tree

Hide file tree

Showing 23 changed files with 1,032 additions and 227 deletions.
diff --git a/lib/src/app.dart b/lib/src/app.dart
@@ -2,6 +2,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_skeleton/src/core/app/loading_provider.dart';
 import 'package:flutter_skeleton/src/feature/locale/locale_provider.dart';
+import 'package:flutter_skeleton/src/feature/theme/app_theme.dart';
 import "../generated/l10n.dart";
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -44,8 +45,8 @@ class App extends ConsumerWidget {
         GlobalCupertinoLocalizations.delegate,
       ],
       supportedLocales: S.delegate.supportedLocales,
-      theme: ThemeData(),
-      darkTheme: ThemeData.dark(),
+      theme: AppTheme.light().themeData,
+      darkTheme: AppTheme.dark().themeData,
       themeMode: ref.watch(themeProvider),
       routeInformationParser:
           appRouter.defaultRouteParser(includePrefixMatches: true),
@@ -54,17 +55,6 @@ class App extends ConsumerWidget {
         navigatorObservers: () => [AutoRouteObserver()],
       ),
       builder: (context, widget) {
-        // ref.watch(sessionProvider);
-        // final isReady = ref.read(sessionProvider).ready;
-
-        // if (!isReady) {
-        //   return const Scaffold(
-        //     body: Center(
-        //       child: CircularProgressIndicator(),
-        //     ),
-        //   );
-        // }
-
         return Stack(
           children: [
             ResponsiveWrapper.builder(

diff --git a/lib/src/core/app_router.dart b/lib/src/core/app_router.dart
@@ -11,6 +11,7 @@ import 'package:flutter_skeleton/src/feature/category/screens/category_list_scre
 import 'package:flutter_skeleton/src/feature/home/home_screen.dart';
 import 'package:flutter_skeleton/src/feature/placeholder/placeholder_screen.dart';
 import 'package:flutter_skeleton/src/feature/settings/settings_screen.dart';
+import 'package:flutter_skeleton/src/feature/theme/styleguide_screen.dart';
 import 'package:flutter_skeleton/src/feature/user/screens/edit_profile_screen.dart';
 import 'package:flutter_skeleton/src/feature/user/screens/profile_screen.dart';
 import 'package:flutter_skeleton/src/feature/user/screens/user_list_screen.dart';
@@ -21,6 +22,7 @@ const List<AutoRoute> appRoutes = [
   AutoRoute(path: '/auth/register', page: RegisterScreen),
   AutoRoute(
       path: '/auth/confirm/phone-number', page: TwoFactorConfirmationScreen),
+  AutoRoute(path: '/style-guide', page: StyleguideScreen),
   AutoRoute(path: '/settings', page: SettingsScreen),
   AutoRoute(path: '/settings/profile', page: EditProfileScreen),
   AutoRoute(path: '/update-password/:token', page: UpdatePasswordScreen),