diff --git a/assets/translations/ar.json b/assets/translations/ar.json index 97832923..df339ae6 100644 --- a/assets/translations/ar.json +++ b/assets/translations/ar.json @@ -1,7 +1,7 @@ { "login" : "تسجيل الدخول", "enterCredsToLogin" : "أدخل بياناتك الخاصة لتسجيل الدخول", - "forgotPassword" : "نسيت كلمة السر", + "forgotPassword" : "نسيت كلمة السر؟", "password": "كلمة السر", "username" : "اسم المستخدم", "requiredField" : "الحقل مطلوب", @@ -16,5 +16,6 @@ "liveChat" : "محادثة حية", "gasRefillRequest" : "طلب إعادة تعبئة غاز", "transferRequest" : "طلب نقل", - "serviceRequest" : "طلب خدمة" + "serviceRequest" : "طلب خدمة", + "newServiceRequest" : "طلب خدمة جديدة" } \ No newline at end of file diff --git a/assets/translations/en.json b/assets/translations/en.json index fb5b913b..6b0b85ca 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -1,7 +1,7 @@ { "login" : "Login", "enterCredsToLogin" : "Enter you credential to login", - "forgotPassword" : "Forgot Password", + "forgotPassword" : "Forgot Password?", "password" : "Password", "username" : "Username", "requiredField" : "Required Field", @@ -16,5 +16,6 @@ "liveChat" : "Live Chat", "gasRefillRequest" : "Gas Refill Request", "transferRequest" : "Transfer Request", - "serviceRequest" : "Service Request" + "serviceRequest" : "Service Request", + "newServiceRequest" : "New Service Request" } \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index d1ed1654..d39cdd5e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -9,6 +9,7 @@ import 'package:provider/provider.dart'; import 'package:test_sa/new_views/app_style/app_themes.dart'; import 'package:test_sa/new_views/pages/land_page/land_page.dart'; import 'package:test_sa/new_views/pages/login_page.dart'; +import 'package:test_sa/new_views/pages/new_service_request_page.dart'; import 'package:test_sa/new_views/pages/splash_page.dart'; import 'controllers/providers/api/user_provider.dart'; @@ -74,6 +75,7 @@ class MyApp extends StatelessWidget { SplashPage.routeName: (_) => const SplashPage(), LoginPage.routeName: (_) => const LoginPage(), LandPage.routeName: (_) => const LandPage(), + NewServiceRequestPage.routeName: (_) => const NewServiceRequestPage(), }, ), ), diff --git a/lib/models/enums/translation_keys.dart b/lib/models/enums/translation_keys.dart index d41e0cd2..32475215 100644 --- a/lib/models/enums/translation_keys.dart +++ b/lib/models/enums/translation_keys.dart @@ -16,5 +16,6 @@ enum TranslationKeys { callUs, gasRefillRequest, transferRequest, - serviceRequest + serviceRequest, + newServiceRequest, } diff --git a/lib/new_views/app_style/app_themes.dart b/lib/new_views/app_style/app_themes.dart index 0341d07d..3b66e06c 100644 --- a/lib/new_views/app_style/app_themes.dart +++ b/lib/new_views/app_style/app_themes.dart @@ -17,13 +17,13 @@ class AppThemes { ), bottomNavigationBarTheme: BottomNavigationBarThemeData( type: BottomNavigationBarType.fixed, - unselectedLabelStyle: ThemeData.light().textTheme.bodySmall?.copyWith(fontWeight: FontWeight.w500), - selectedLabelStyle: ThemeData.light().textTheme.bodySmall?.copyWith(fontWeight: FontWeight.w500), + unselectedLabelStyle: ThemeData.light().textTheme.bodySmall.copyWith(fontWeight: FontWeight.w500), + selectedLabelStyle: ThemeData.light().textTheme.bodySmall.copyWith(fontWeight: FontWeight.w500), selectedItemColor: AppColor.primary70, unselectedItemColor: AppColor.neutral20, backgroundColor: Colors.white, ), - appBarTheme: const AppBarTheme(backgroundColor: AppColor.backgroundLight, titleTextStyle: TextStyle(color: AppColor.neutral50)), + appBarTheme: AppBarTheme(elevation: 0, backgroundColor: Colors.white, titleTextStyle: ThemeData.light().textTheme.displayLarge.copyWith(color: AppColor.neutral50)), cardTheme: ThemeData.light().cardTheme.copyWith( elevation: 3, shadowColor: Colors.white.withOpacity(0.05), @@ -45,13 +45,13 @@ class AppThemes { ), bottomNavigationBarTheme: BottomNavigationBarThemeData( type: BottomNavigationBarType.fixed, - unselectedLabelStyle: ThemeData.dark().textTheme.bodySmall?.copyWith(fontWeight: FontWeight.w500), - selectedLabelStyle: ThemeData.dark().textTheme.bodySmall?.copyWith(fontWeight: FontWeight.w500), + unselectedLabelStyle: ThemeData.dark().textTheme.bodySmall.copyWith(fontWeight: FontWeight.w500), + selectedLabelStyle: ThemeData.dark().textTheme.bodySmall.copyWith(fontWeight: FontWeight.w500), selectedItemColor: AppColor.primary40, unselectedItemColor: AppColor.neutral10, backgroundColor: AppColor.neutral60, ), - appBarTheme: const AppBarTheme(backgroundColor: AppColor.backgroundDark, titleTextStyle: TextStyle(color: AppColor.neutral30)), + appBarTheme: AppBarTheme(elevation: 0, backgroundColor: AppColor.neutral60, titleTextStyle: ThemeData.dark().textTheme.headlineMedium.copyWith(color: AppColor.neutral30)), cardTheme: ThemeData.dark().cardTheme.copyWith( elevation: 3, shadowColor: Colors.white.withOpacity(0.05), diff --git a/lib/new_views/common_widgets/app_bar/custom_app_bar.dart b/lib/new_views/common_widgets/app_bar/custom_app_bar.dart deleted file mode 100644 index dbf1e5b0..00000000 --- a/lib/new_views/common_widgets/app_bar/custom_app_bar.dart +++ /dev/null @@ -1,27 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:test_sa/extensions/int_extensions.dart'; - -import '../../app_style/app_color.dart'; - -class CustomAppBar extends StatelessWidget implements PreferredSizeWidget { - String title; - CustomAppBar({Key key, this.title}) : super(key: key); - - @override - Widget build(BuildContext context) { - return AppBar( - title: Text(title, style: Theme.of(context).textTheme.displaySmall?.copyWith(fontWeight: FontWeight.w600, color: AppColor.neutral50)), - leading: IconButton( - icon: Icon(Icons.arrow_back_ios, size: 24,), - onPressed: - () { - Navigator.of(context).pop(); - }, - ), - ); - } - - @override - Size get preferredSize => Size.fromHeight(60); - -} \ No newline at end of file diff --git a/lib/new_views/common_widgets/app_floating_action_button.dart b/lib/new_views/common_widgets/app_floating_action_button.dart index 416c66a5..204b7999 100644 --- a/lib/new_views/common_widgets/app_floating_action_button.dart +++ b/lib/new_views/common_widgets/app_floating_action_button.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; +import 'package:test_sa/new_views/pages/new_service_request_page.dart'; import '../../models/enums/translation_keys.dart'; import '../app_style/app_color.dart'; @@ -44,7 +45,7 @@ class _AppFloatingActionButtonState extends State { child: Column( mainAxisSize: MainAxisSize.min, children: [ - const _FloatingButtonListTile(iconName: "gas_refill_request", label: TranslationKeys.gasRefillRequest, routeName: ""), + const _FloatingButtonListTile(iconName: "gas_refill_request", label: TranslationKeys.gasRefillRequest, routeName: NewServiceRequestPage.routeName), Padding(padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth), child: const Divider()), const _FloatingButtonListTile(iconName: "transfer_request", label: TranslationKeys.transferRequest, routeName: ""), Padding(padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth), child: const Divider()), diff --git a/lib/new_views/common_widgets/app_bar/home_app_bar.dart b/lib/new_views/pages/land_page/home_app_bar.dart similarity index 95% rename from lib/new_views/common_widgets/app_bar/home_app_bar.dart rename to lib/new_views/pages/land_page/home_app_bar.dart index d90f2dea..e79864b2 100644 --- a/lib/new_views/common_widgets/app_bar/home_app_bar.dart +++ b/lib/new_views/pages/land_page/home_app_bar.dart @@ -16,6 +16,7 @@ class HomeAppBar extends StatelessWidget implements PreferredSizeWidget { return Padding( padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth), child: AppBar( + backgroundColor: context.isDark ? AppColor.backgroundDark : AppColor.backgroundLight, automaticallyImplyLeading: false, elevation: 0, leadingWidth: 48.toScreenWidth, diff --git a/lib/new_views/pages/land_page/land_page.dart b/lib/new_views/pages/land_page/land_page.dart index daa4f093..ebd460fa 100644 --- a/lib/new_views/pages/land_page/land_page.dart +++ b/lib/new_views/pages/land_page/land_page.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:test_sa/extensions/int_extensions.dart'; -import 'package:test_sa/new_views/common_widgets/app_bar/home_app_bar.dart'; +import 'package:test_sa/new_views/pages/land_page/home_app_bar.dart'; import 'package:test_sa/new_views/pages/land_page/my_assets_page.dart'; import 'package:test_sa/new_views/pages/land_page/my_requests_page.dart'; diff --git a/lib/new_views/pages/login_page.dart b/lib/new_views/pages/login_page.dart index 133d296e..2b7a6309 100644 --- a/lib/new_views/pages/login_page.dart +++ b/lib/new_views/pages/login_page.dart @@ -96,7 +96,7 @@ class _LoginPageState extends State { /// TODO [zaid] : push to another screen }, child: Text( - "${context.translate(TranslationKeys.forgotPassword)}?", + context.translate(TranslationKeys.forgotPassword), style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: AppColor.primary50, fontWeight: FontWeight.w500), ), ), diff --git a/lib/new_views/pages/new_service_request_page.dart b/lib/new_views/pages/new_service_request_page.dart new file mode 100644 index 00000000..b2b3ab7f --- /dev/null +++ b/lib/new_views/pages/new_service_request_page.dart @@ -0,0 +1,15 @@ +import 'package:flutter/material.dart'; +import 'package:test_sa/extensions/context_extension.dart'; +import 'package:test_sa/models/enums/translation_keys.dart'; + +class NewServiceRequestPage extends StatelessWidget { + static const String routeName = "/new_service_request_page"; + const NewServiceRequestPage({Key key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar(title: Text(context.translate(TranslationKeys.serviceRequest))), + ); + } +}