Feat/light_dark_theme

ios/Podfile.lock

@@ -2,6 +2,8 @@ PODS:
   - Flutter (1.0.0)
   - flutter_secure_storage (6.0.0):
     - Flutter
+  - flutter_statusbarcolor_ns (0.0.1):
+    - Flutter
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
@@ -18,6 +20,7 @@ PODS:
 DEPENDENCIES:
   - Flutter (from `Flutter`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
+  - flutter_statusbarcolor_ns (from `.symlinks/plugins/flutter_statusbarcolor_ns/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
@@ -31,6 +34,8 @@ EXTERNAL SOURCES:
     :path: Flutter
   flutter_secure_storage:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
+  flutter_statusbarcolor_ns:
+    :path: ".symlinks/plugins/flutter_statusbarcolor_ns/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   shared_preferences_foundation:
@@ -41,6 +46,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
+  flutter_statusbarcolor_ns: 68a360889d88d7915ae524e422aeab62e4063804
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126

lib/app/app.dart

@@ -4,6 +4,7 @@ import 'package:receipe_app/ui/views/edit_dish/edit_dish_view.dart';
 import 'package:sqflite_migration_service/sqflite_migration_service.dart';
 import 'package:stacked/stacked_annotations.dart';
 import 'package:stacked_services/stacked_services.dart';
+import 'package:stacked_themes/stacked_themes.dart';
 import '../services/event_service.dart';
 import '../ui/bottom_sheets/notice/notice_sheet.dart';
 import '../ui/dialogs/info_alert/info_alert_dialog.dart';
@@ -49,6 +50,7 @@ import 'package:receipe_app/ui/views/single_user/single_user_view.dart';
     LazySingleton(classType: DatabaseMigrationService),
     InitializableSingleton(classType: DatabaseService),
     LazySingleton(classType: UserService),
+    Singleton(classType: ThemeService, resolveUsing: ThemeService.getInstance)
 // @stacked-service
   ],
   bottomsheets: [

lib/main.dart

@@ -9,11 +9,13 @@ import 'app/app.locator.dart';
 import 'app/app.router.dart';
 import 'generated/l10n.dart';
 import 'ui/common/app_themes.dart';
+import 'package:stacked_themes/stacked_themes.dart';
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
   SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
   await setupLocator();
+  await ThemeManager.initialise();
   setupDialogUi();
   setupBottomSheetUi();
   runApp(const MainApp());
@@ -30,20 +32,30 @@ class MainApp extends StatelessWidget {
       splitScreenMode: true,
       ensureScreenSize: true,
       builder: (context, child) {
-        return MaterialApp(
-          onGenerateRoute: StackedRouter().onGenerateRoute,
-          navigatorKey: StackedService.navigatorKey,
-          theme: AppThemes.lightTheme,
-          navigatorObservers: [
-            StackedService.routeObserver,
-          ],
-          localizationsDelegates: const [
-            S.delegate,
-            GlobalMaterialLocalizations.delegate,
-            GlobalWidgetsLocalizations.delegate,
-            GlobalCupertinoLocalizations.delegate,
-          ],
-          supportedLocales: S.delegate.supportedLocales,
+        return ThemeBuilder(
+          lightTheme: AppThemes.lightTheme,
+          darkTheme: AppThemes.darkTheme,
+          builder: (context, lightTheme, darkTheme, themeMode) {
+            return MaterialApp(
+              //theme: AppThemes.lightTheme,
+              theme: lightTheme,
+              darkTheme: darkTheme,
+              themeMode: themeMode,
+              onGenerateRoute: StackedRouter().onGenerateRoute,
+              navigatorKey: StackedService.navigatorKey,
+
+              navigatorObservers: [
+                StackedService.routeObserver,
+              ],
+              localizationsDelegates: const [
+                S.delegate,
+                GlobalMaterialLocalizations.delegate,
+                GlobalWidgetsLocalizations.delegate,
+                GlobalCupertinoLocalizations.delegate,
+              ],
+              supportedLocales: S.delegate.supportedLocales,
+            );
+          },
         );
       },
     );

lib/ui/common/app_themes.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:receipe_app/ui/common/color_schemes.g.dart';
 import '../extension/app_typography.dart';
 import '../extension/palette.dart';
 import 'app_colors.dart';
@@ -11,9 +12,7 @@ class AppThemes {
     return ThemeData(
       useMaterial3: true,
       primaryColor: AppColors.primary6,
-      colorScheme: ColorScheme.fromSeed(
-          seedColor: AppColors.primary6, brightness: Brightness.light),
-      brightness: Brightness.light,
+      colorScheme: lightColorScheme,
       scaffoldBackgroundColor: AppColors.white,
       appBarTheme: const AppBarTheme(
         backgroundColor: Colors.white,
@@ -84,4 +83,81 @@ class AppThemes {
       ],
     );
   }
+
+  //Dark Theme
+  static ThemeData get darkTheme {
+    return ThemeData(
+      useMaterial3: true,
+      primaryColor: AppColors.primary6,
+      //brightness: Brightness.dark,
+      colorScheme: darkColorScheme,
+      appBarTheme: const AppBarTheme(
+        backgroundColor: AppColors.primary11,
+        elevation: 0,
+        centerTitle: true,
+        iconTheme: IconThemeData(color: Colors.black),
+      ),
+      textSelectionTheme:
+          const TextSelectionThemeData(cursorColor: AppColors.primary6),
+      inputDecorationTheme: InputDecorationTheme(
+        hintStyle: AppTextStyles.titleRegular16.copyWith(
+          color: AppColors.gray9,
+        ),
+        labelStyle: AppTextStyles.labelRegular12.copyWith(
+          color: AppColors.gray9,
+        ),
+        border: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(4.r),
+          borderSide: const BorderSide(
+            color: AppColors.gray6,
+          ),
+        ),
+        focusedBorder: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(4.r),
+          borderSide: const BorderSide(
+            color: AppColors.primary6,
+          ),
+        ),
+        errorBorder: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(4.r),
+          borderSide: const BorderSide(
+            color: AppColors.primary6,
+          ),
+        ),
+      ),
+      extensions: <ThemeExtension<dynamic>>[
+        AppTypography(
+          headlineBold28: AppTextStyles.headlineBold28,
+          headlineBold24: AppTextStyles.headlineBold24,
+          headlineBold22: AppTextStyles.headlineBold22,
+          titleRegular16: AppTextStyles.titleRegular16,
+          titleBold16: AppTextStyles.titleBold16,
+          labelRegular12: AppTextStyles.labelRegular12,
+          labelMedium16: AppTextStyles.labelMedium16,
+          labelRegular14: AppTextStyles.labelRegular14,
+          labelRegular16: AppTextStyles.labelRegular16,
+        ),
+        const Palette(
+          gray1: AppColors.gray1,
+          gray6: AppColors.gray6,
+          gray7: AppColors.gray7,
+          gray8: AppColors.gray8,
+          gray9: AppColors.gray9,
+          gray11: AppColors.gray11,
+          primary6: AppColors.primary6,
+          primary11: AppColors.primary11,
+          gray12: AppColors.gray12,
+          gray13: AppColors.grey13,
+          redShade: AppColors.redShade,
+          popUpBg: AppColors.popUpBg,
+          barrierColor: AppColors.barrierColor,
+          iconBackground2: AppColors.iconBackground2,
+          iconBackground3: AppColors.iconBackground3,
+          orangeShade: AppColors.orangeShade,
+          iconBackground: AppColors.iconBackground,
+          white: AppColors.white,
+        ),
+      ],
+    );
+  }
 }

lib/ui/common/color_schemes.g.dart

@@ -0,0 +1,69 @@
+import 'package:flutter/material.dart';
+
+const lightColorScheme = ColorScheme(
+  brightness: Brightness.light,
+  primary: Color(0xFFA04100),
+  onPrimary: Color(0xFFFFFFFF),
+  primaryContainer: Color(0xFFFFDBCB),
+  onPrimaryContainer: Color(0xFF341000),
+  secondary: Color(0xFF765849),
+  onSecondary: Color(0xFFFFFFFF),
+  secondaryContainer: Color(0xFFFFDBCB),
+  onSecondaryContainer: Color(0xFF2C160B),
+  tertiary: Color(0xFF97480F),
+  onTertiary: Color(0xFFFFFFFF),
+  tertiaryContainer: Color(0xFFFFDBC9),
+  onTertiaryContainer: Color(0xFF331200),
+  error: Color(0xFFBA1A1A),
+  errorContainer: Color(0xFFFFDAD6),
+  onError: Color(0xFFFFFFFF),
+  onErrorContainer: Color(0xFF410002),
+  background: Color(0xFFFFFBFF),
+  onBackground: Color(0xFF201A18),
+  surface: Color(0xFFFFFBFF),
+  onSurface: Color(0xFF201A18),
+  surfaceVariant: Color(0xFFF4DED5),
+  onSurfaceVariant: Color(0xFF52443D),
+  outline: Color(0xFF85736C),
+  onInverseSurface: Color(0xFFFBEEE9),
+  inverseSurface: Color(0xFF362F2C),
+  inversePrimary: Color(0xFFFFB692),
+  shadow: Color(0xFF000000),
+  surfaceTint: Color(0xFFA04100),
+  outlineVariant: Color(0xFFD7C2B9),
+  scrim: Color(0xFF000000),
+);
+
+const darkColorScheme = ColorScheme(
+  brightness: Brightness.dark,
+  primary: Color(0xFFFFB692),
+  onPrimary: Color(0xFF562000),
+  primaryContainer: Color(0xFF7A3000),
+  onPrimaryContainer: Color(0xFFFFDBCB),
+  secondary: Color(0xFFE6BEAC),
+  onSecondary: Color(0xFF432A1E),
+  secondaryContainer: Color(0xFF5C4033),
+  onSecondaryContainer: Color(0xFFFFDBCB),
+  tertiary: Color(0xFFFFB68D),
+  onTertiary: Color(0xFF532200),
+  tertiaryContainer: Color(0xFF763300),
+  onTertiaryContainer: Color(0xFFFFDBC9),
+  error: Color(0xFFFFB4AB),
+  errorContainer: Color(0xFF93000A),
+  onError: Color(0xFF690005),
+  onErrorContainer: Color(0xFFFFDAD6),
+  background: Color(0xFF201A18),
+  onBackground: Color(0xFFEDE0DB),
+  surface: Color(0xFF201A18),
+  onSurface: Color(0xFFEDE0DB),
+  surfaceVariant: Color(0xFF52443D),
+  onSurfaceVariant: Color(0xFFD7C2B9),
+  outline: Color(0xFFA08D85),
+  onInverseSurface: Color(0xFF201A18),
+  inverseSurface: Color(0xFFEDE0DB),
+  inversePrimary: Color(0xFFA04100),
+  shadow: Color(0xFF000000),
+  surfaceTint: Color(0xFFFFB692),
+  outlineVariant: Color(0xFF52443D),
+  scrim: Color(0xFF000000),
+);

lib/ui/views/edit_dish/edit_dish_view.dart

@@ -26,7 +26,7 @@ class EditDishView extends StackedView<EditDishViewModel> with $EditDishView {
         centerTitle: true,
         elevation: 0,
         foregroundColor: context.palette?.gray12,
-        backgroundColor: Colors.white,
+        //backgroundColor: Colors.white,
         title: Text(
           S.current.edit_dish,
           style: context.typography?.titleBold16?.copyWith(

lib/ui/views/home/home_view.dart

@@ -27,7 +27,7 @@ class HomeView extends StackedView<HomeViewModel> {
       key: homeScaffoldKey,
       drawer: AppDrawer(),
       appBar: AppBar(
-        backgroundColor: kcBackground,
+        //backgroundColor: kcBackground,
         elevation: 0,
         leading: InkWell(
           onTap: () {
@@ -48,11 +48,7 @@ class HomeView extends StackedView<HomeViewModel> {
             ),
           ),
         ),
-        title: Text(
-          S.current.home,
-          style: context.typography?.titleBold16
-              ?.copyWith(color: context.palette?.gray11),
-        ),
+        title: Text(S.current.home, style: context.typography?.titleBold16),
       ),
       body: SafeArea(
         child: OverlayLoader(

lib/ui/views/home/widgets/product_item.dart

@@ -50,7 +50,7 @@ class ProductItem extends StatelessWidget {
             ),
             RichTextWidget(
               color1: context.palette?.gray8,
-              color2: context.palette?.gray11,
+              color2: context.palette?.gray9,
               text1: S.current.date_created,
               text2: recipe?.datePosted ?? '--',
             ),

lib/ui/views/new_dish/new_dish_view.dart

@@ -35,7 +35,6 @@ class NewDishView extends StackedView<NewDishViewModel> with $NewDishView {
       key: newDishScaffoldKey,
       drawer: AppDrawer(),
       appBar: AppBar(
-        elevation: 0,
         leading: InkWell(
           onTap: () {
             newDishScaffoldKey.currentState!.openDrawer();
@@ -57,8 +56,7 @@ class NewDishView extends StackedView<NewDishViewModel> with $NewDishView {
         ),
         title: Text(
           S.current.create_a_dish,
-          style: context.typography?.titleBold16
-              ?.copyWith(color: context.palette?.gray11),
+          style: context.typography?.titleBold16,
         ),
       ),
       body: Builder(builder: (context) {

lib/ui/views/single_user/single_user_view.dart

@@ -27,8 +27,6 @@ class SingleUserView extends StackedView<SingleUserViewModel> {
       key: homeScaffoldKey,
       drawer: AppDrawer(),
       appBar: AppBar(
-        backgroundColor: kcBackground,
-        elevation: 0,
         leading: InkWell(
           onTap: () {
             homeScaffoldKey.currentState!.openDrawer();
@@ -48,20 +46,14 @@ class SingleUserView extends StackedView<SingleUserViewModel> {
             ),
           ),
         ),
-        title: Text(
-          S.current.mydish,
-          style: context.typography?.titleBold16
-              ?.copyWith(color: context.palette?.gray11),
-        ),
+        title: Text(S.current.mydish, style: context.typography?.titleBold16),
       ),
       body: SafeArea(
         child: OverlayLoader(
           isBusy: viewModel.isBusy,
           content: Column(
             children: [
-              SizedBox(
-                height: 18.h,
-              ),
+              SizedBox(height: 18.h),
               Builder(
                 builder: (context) {
                   //Error