Prefer Material over Platform Widgets for root widgets

AhmedLSayed9 · Jul 28, 2023 · 9493b39 · 9493b39
1 parent 74cba9c
commit 9493b39
Show file tree

Hide file tree

Showing 66 changed files with 717 additions and 745 deletions.
diff --git a/.metadata b/.metadata
@@ -15,7 +15,7 @@ migration:
     - platform: root
       create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
       base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
-    - platform: macos
+    - platform: web
       create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
       base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
 

diff --git a/lib/app.dart b/lib/app.dart
@@ -8,7 +8,6 @@ import 'core/presentation/routing/app_router.dart';
 import 'core/presentation/routing/navigation_service.dart';
 import 'core/presentation/utils/riverpod_framework.dart';
 import 'core/presentation/utils/scroll_behaviors.dart';
-import 'core/presentation/widgets/platform_widgets/platform_app.dart';
 
 class MyApp extends HookConsumerWidget {
   const MyApp({super.key});
@@ -23,26 +22,24 @@ class MyApp extends HookConsumerWidget {
     final theme = ref.watch(currentAppThemeProvider);
     final locale = ref.watch(currentAppLocaleProvider);
 
-    return Theme(
-      data: theme.getThemeData(),
-      child: PlatformApp(
-        routerConfig: router,
-        builder: (_, child) {
-          return ScrollConfiguration(
-            behavior: MainScrollBehavior(),
-            child: GestureDetector(
-              onTap: NavigationService.removeFocus,
-              child: child,
-            ),
-          );
-        },
-        title: 'Deliverzler',
-        color: Theme.of(context).colorScheme.primary,
-        locale: Locale(locale.code),
-        localizationsDelegates: AppLocalizations.localizationsDelegates,
-        supportedLocales: AppLocalizations.supportedLocales,
-        debugShowCheckedModeBanner: false,
-      ),
+    return MaterialApp.router(
+      routerConfig: router,
+      builder: (_, child) {
+        return ScrollConfiguration(
+          behavior: MainScrollBehavior(),
+          child: GestureDetector(
+            onTap: NavigationService.removeFocus,
+            child: child,
+          ),
+        );
+      },
+      title: 'Deliverzler',
+      debugShowCheckedModeBanner: false,
+      color: Theme.of(context).colorScheme.primary,
+      theme: theme.getThemeData(locale.fontFamily),
+      locale: Locale(locale.code),
+      localizationsDelegates: AppLocalizations.localizationsDelegates,
+      supportedLocales: AppLocalizations.supportedLocales,
     );
   }
 }
diff --git a/lib/auth/presentation/components/login_form_component.dart b/lib/auth/presentation/components/login_form_component.dart
@@ -6,9 +6,9 @@ import '../../../core/presentation/utils/event.dart';
 import '../../../core/presentation/utils/fp_framework.dart';
 import '../../../core/presentation/utils/riverpod_framework.dart';
 import '../../../core/presentation/widgets/custom_button.dart';
+import '../../../core/presentation/widgets/platform_widgets/platform_icons.dart';
 import '../../domain/sign_in_with_email.dart';
 import '../providers/sign_in_provider.dart';
-import 'login_text_fields_section.dart';
 
 class LoginFormComponent extends HookConsumerWidget {
   const LoginFormComponent({super.key});
@@ -33,9 +33,42 @@ class LoginFormComponent extends HookConsumerWidget {
       key: loginFormKey,
       child: Column(
         children: [
-          LoginTextFieldsSection(
-            emailController: emailController,
-            passwordController: passwordController,
+          TextFormField(
+            key: const ValueKey('login_email'),
+            controller: emailController,
+            decoration: InputDecoration(
+              hintText: tr(context).email,
+              suffixIcon: Padding(
+                padding: EdgeInsetsDirectional.only(
+                  end: Theme.of(context).inputDecorationTheme.contentPadding!.horizontal / 2,
+                ),
+                child: Icon(PlatformIcons.mail),
+              ),
+              suffixIconConstraints: const BoxConstraints(),
+            ),
+            validator: SignInWithEmail.validateEmail(context),
+            textInputAction: TextInputAction.next,
+            keyboardType: TextInputType.emailAddress,
+          ),
+          const SizedBox(
+            height: Sizes.textFieldMarginV24,
+          ),
+          TextFormField(
+            key: const ValueKey('login_password'),
+            controller: passwordController,
+            decoration: InputDecoration(
+              hintText: tr(context).password,
+              suffixIcon: Padding(
+                padding: EdgeInsetsDirectional.only(
+                  end: Theme.of(context).inputDecorationTheme.contentPadding!.horizontal / 2,
+                ),
+                child: Icon(PlatformIcons.password),
+              ),
+              suffixIconConstraints: const BoxConstraints(),
+            ),
+            validator: SignInWithEmail.validatePassword(context),
+            textInputAction: TextInputAction.go,
+            obscureText: true,
             onFieldSubmitted: ref.isLoading(signInStateProvider) ? null : (_) => signIn(),
           ),
           const SizedBox(

diff --git a/lib/auth/presentation/components/login_text_fields_section.dart b/lib/auth/presentation/components/login_text_fields_section.dart
diff --git a/lib/auth/presentation/screens/sign_in_screen/sign_in_screen.dart b/lib/auth/presentation/screens/sign_in_screen/sign_in_screen.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 import '../../../../core/presentation/utils/riverpod_framework.dart';
-import '../../../../core/presentation/widgets/responsive_widgets/widget_builders.dart';
+import '../../../../core/presentation/widgets/responsive_widgets/responsive_layouts.dart';
 import '../../providers/sign_in_provider.dart';
 import 'sign_in_screen_compact.dart';
 import 'sign_in_screen_medium.dart';

diff --git a/lib/auth/presentation/screens/sign_in_screen/sign_in_screen_compact.dart b/lib/auth/presentation/screens/sign_in_screen/sign_in_screen_compact.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import '../../../../core/presentation/screens/full_screen_platform_scaffold.dart';
+import '../../../../core/presentation/screens/full_screen_scaffold.dart';
 import '../../../../core/presentation/styles/sizes.dart';
 import '../../../../gen/my_assets.dart';
 import '../../components/login_content_component.dart';
@@ -11,7 +11,7 @@ class SignInScreenCompact extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return FullScreenPlatformScaffold(
+    return FullScreenScaffold(
       body: CustomScrollView(
         slivers: [
           SliverFillRemaining(

diff --git a/lib/auth/presentation/screens/sign_in_screen/sign_in_screen_medium.dart b/lib/auth/presentation/screens/sign_in_screen/sign_in_screen_medium.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import '../../../../core/presentation/screens/full_screen_platform_scaffold.dart';
+import '../../../../core/presentation/screens/full_screen_scaffold.dart';
 import '../../../../core/presentation/styles/sizes.dart';
 import '../../../../gen/my_assets.dart';
 import '../../components/login_content_component.dart';
@@ -11,7 +11,7 @@ class SignInScreenMedium extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return FullScreenPlatformScaffold(
+    return FullScreenScaffold(
       body: CustomScrollView(
         slivers: [
           SliverFillRemaining(

diff --git a/lib/core/core_features/locale/presentation/utils/app_locale.dart b/lib/core/core_features/locale/presentation/utils/app_locale.dart
@@ -2,15 +2,17 @@ import 'package:flutter/material.dart';
 
 import '../../../../../gen/my_assets.dart';
 import '../../../../presentation/helpers/localization_helper.dart';
+import '../../../../presentation/styles/font_styles.dart';
 
 enum AppLocale {
-  english('en', MyAssets.ASSETS_ICONS_LANGUAGES_ICONS_ENGLISH_PNG),
-  arabic('ar', MyAssets.ASSETS_ICONS_LANGUAGES_ICONS_ARABIC_PNG);
+  english('en', MyAssets.ASSETS_ICONS_LANGUAGES_ICONS_ENGLISH_PNG, FontStyles.familyPoppins),
+  arabic('ar', MyAssets.ASSETS_ICONS_LANGUAGES_ICONS_ARABIC_PNG, FontStyles.familyTajawal);
 
-  const AppLocale(this.code, this.flag);
+  const AppLocale(this.code, this.flag, this.fontFamily);
 
   final String code;
   final String flag;
+  final String fontFamily;
 }
 
 extension LanguageExtension on AppLocale {

diff --git a/lib/core/core_features/theme/presentation/utils/app_theme.dart b/lib/core/core_features/theme/presentation/utils/app_theme.dart
@@ -10,10 +10,10 @@ enum AppTheme {
 }
 
 extension ThemeExtension on AppTheme {
-  ThemeData getThemeData() {
+  ThemeData getThemeData(String fontFamily) {
     return switch (this) {
-      AppTheme.light => ThemeLight().getThemeData(),
-      AppTheme.dark => ThemeDark().getThemeData(),
+      AppTheme.light => ThemeLight().getThemeData(fontFamily),
+      AppTheme.dark => ThemeDark().getThemeData(fontFamily),
     };
   }
 

diff --git a/lib/core/core_features/theme/presentation/utils/themes/i_theme.dart b/lib/core/core_features/theme/presentation/utils/themes/i_theme.dart
@@ -16,10 +16,14 @@ abstract class ITheme {
 
   abstract final Color scaffoldBackgroundColor;
 
-  abstract final Color bottomAppBarColor;
+  abstract final NavigationBarThemeData navigationBarTheme;
+
+  abstract final NavigationRailThemeData navigationRailTheme;
 
   abstract final TextTheme textTheme;
 
+  abstract final TextTheme primaryTextTheme;
+
   abstract final Color hintColor;
 
   abstract final TextSelectionThemeData textSelectionTheme;
@@ -38,23 +42,27 @@ abstract class ITheme {
 }
 
 extension ThemeExtension on ITheme {
-  ThemeData getThemeData() {
+  //TODO(AHMED): useMaterial3
+  ThemeData getThemeData(String fontFamily) {
     return baseTheme.copyWith(
       appBarTheme: appBarTheme,
       scaffoldBackgroundColor: scaffoldBackgroundColor,
+      navigationBarTheme: navigationBarTheme,
+      navigationRailTheme: navigationRailTheme,
       primaryColor: primaryColor,
       colorScheme: colorScheme,
+      textTheme: textTheme.apply(fontFamily: fontFamily),
+      primaryTextTheme: primaryTextTheme.apply(fontFamily: fontFamily),
       iconTheme: iconTheme,
       buttonTheme: buttonTheme,
       toggleButtonsTheme: toggleButtonsTheme,
-      textTheme: textTheme,
       hintColor: hintColor,
       textSelectionTheme: textSelectionTheme,
       inputDecorationTheme: inputDecorationTheme,
       cardTheme: cardTheme,
       extensions: [
         this.customColors,
-      ], bottomAppBarTheme: BottomAppBarTheme(color: bottomAppBarColor),
+      ],
     );
   }
 }
diff --git a/lib/core/core_features/theme/presentation/utils/themes/theme_dark.dart b/lib/core/core_features/theme/presentation/utils/themes/theme_dark.dart
@@ -39,15 +39,37 @@ class ThemeDark implements ITheme {
   late final Color scaffoldBackgroundColor = appColors.scaffoldBGColor;
 
   @override
-  late final Color bottomAppBarColor = appColors.bottomNavBarColor;
+  late final NavigationBarThemeData navigationBarTheme = NavigationBarThemeData(
+    backgroundColor: appColors.bottomNavBarColor,
+    surfaceTintColor: Colors.transparent,
+    shadowColor: appColors.bottomNavBarColor,
+    indicatorColor: Colors.blue.shade100,
+    labelTextStyle: MaterialStateProperty.resolveWith((states) {
+      return TextStyle(
+        color: appColors.customColors.font14Color,
+        fontSize: Sizes.font12,
+      );
+    }),
+    elevation: 4,
+  );
+
+  @override
+  late final NavigationRailThemeData navigationRailTheme = NavigationRailThemeData(
+    backgroundColor: appColors.bottomNavBarColor,
+    elevation: 4,
+  );
 
   @override
   late final TextTheme textTheme = TextTheme(
     titleMedium: TextStyle(
       color: appColors.textFieldSubtitle1Color,
+      fontSize: Sizes.font14,
     ),
   );
 
+  @override
+  late final TextTheme primaryTextTheme = baseTheme.primaryTextTheme;
+
   @override
   late final Color hintColor = appColors.textFieldHintColor;
 
@@ -58,7 +80,17 @@ class ThemeDark implements ITheme {
 
   @override
   late final InputDecorationTheme inputDecorationTheme = InputDecorationTheme(
+    contentPadding: const EdgeInsets.symmetric(
+      vertical: Sizes.textFieldPaddingV14,
+      horizontal: Sizes.textFieldPaddingH14,
+    ),
+    isDense: true,
+    filled: true,
     fillColor: appColors.textFieldFillColor,
+    hintStyle: TextStyle(
+      fontSize: Sizes.font12,
+      color: appColors.textFieldHintColor,
+    ),
     prefixIconColor: appColors.textFieldPrefixIconColor,
     suffixIconColor: appColors.textFieldSuffixIconColor,
     border: OutlineInputBorder(
@@ -97,8 +129,18 @@ class ThemeDark implements ITheme {
         width: 0.8,
       ),
     ),
+    focusedErrorBorder: OutlineInputBorder(
+      borderRadius: const BorderRadius.all(
+        Radius.circular(Sizes.textFieldR12),
+      ),
+      borderSide: BorderSide(
+        color: appColors.textFieldErrorBorderColor,
+        width: 0.8,
+      ),
+    ),
     errorStyle: TextStyle(
       color: appColors.textFieldErrorStyleColor,
+      fontSize: Sizes.font12,
     ),
   );