diff --git a/lib/new_views/pages/login_page.dart b/lib/new_views/pages/login_page.dart index 9c7c08fe..31dabd13 100644 --- a/lib/new_views/pages/login_page.dart +++ b/lib/new_views/pages/login_page.dart @@ -8,12 +8,12 @@ import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/enums/translation_keys.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/common_widgets/app_lazy_loading.dart'; -import 'package:test_sa/new_views/pages/land_page/land_page.dart'; import '../../controllers/providers/api/user_provider.dart'; import '../../controllers/providers/settings/setting_provider.dart'; import '../../controllers/validator/validator.dart'; import '../../models/user.dart'; +import '../../views/pages/user/land_page.dart' as old; import '../common_widgets/app_filled_button.dart'; import '../common_widgets/app_text_form_field.dart'; @@ -103,7 +103,10 @@ class _LoginPageState extends State { Navigator.pop(context); if (status >= 200 && status < 300 && _userProvider.user.isAuthenticated ?? false) { _settingProvider.setUser(_userProvider.user); - Navigator.pushNamed(context, LandPage.routeName); + + /// The below line for the new design + // Navigator.pushNamed(context, LandPage.routeName); + Navigator.pushNamed(context, old.LandPage.id); } else { Fluttertoast.showToast(msg: _userProvider.user.message); } diff --git a/lib/new_views/pages/splash_page.dart b/lib/new_views/pages/splash_page.dart index 139eb2fd..192e4db1 100644 --- a/lib/new_views/pages/splash_page.dart +++ b/lib/new_views/pages/splash_page.dart @@ -7,11 +7,12 @@ import 'package:provider/provider.dart'; import 'package:test_sa/controllers/notification/notification_manger.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; +import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/app_notification.dart'; import 'package:test_sa/new_views/pages/login_page.dart'; import '../../models/size_config.dart'; -import 'land_page/land_page.dart'; +import '../../views/pages/user/land_page.dart' as old; class SplashPage extends StatefulWidget { static const String routeName = '/splash_page'; @@ -42,23 +43,24 @@ class _SplashPageState extends State { _settingProvider = Provider.of(context, listen: false); _userProvider = Provider.of(context, listen: false); return Scaffold( - body: Center( - child: SizedBox( - width: MediaQuery.of(context).size.width / 1.1, - child: FlareActor( - "assets/rives/atoms_splash.flr", - fit: BoxFit.contain, - animation: "splash", - callback: (animation) async { - Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.routeName, (routes) => true); - if (_settingProvider.isLoaded && (_settingProvider.user?.isLiveToken ?? false)) { - _userProvider.user = _settingProvider.user; - Navigator.of(context).pushNamedAndRemoveUntil(LandPage.routeName, (routes) => true); - } - }, - ), + body: SizedBox( + width: MediaQuery.of(context).size.width / 1.1, + child: FlareActor( + "assets/rives/atoms_splash.flr", + fit: BoxFit.contain, + animation: "splash", + callback: (animation) async { + Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.routeName, (routes) => true); + if (_settingProvider.isLoaded && (_settingProvider.user?.isLiveToken ?? false)) { + _userProvider.user = _settingProvider.user; + Navigator.of(context).pushNamedAndRemoveUntil(old.LandPage.id, (routes) => true); + + /// The below line for the new design + // Navigator.of(context).pushNamedAndRemoveUntil(LandPage.routeName, (routes) => true); + } + }, ), - ), + ).center, ); } } diff --git a/lib/views/pages/user/land_page.dart b/lib/views/pages/user/land_page.dart index 03d46aa6..d8b80e39 100644 --- a/lib/views/pages/user/land_page.dart +++ b/lib/views/pages/user/land_page.dart @@ -19,14 +19,13 @@ import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/enums/user_types.dart'; import 'package:test_sa/models/subtitle.dart'; +import 'package:test_sa/new_views/pages/new_gas_refill_request_page.dart'; +import 'package:test_sa/new_views/pages/new_transfer_request_page.dart'; import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/app_style/sizing.dart'; -import 'package:test_sa/views/pages/device_transfer/request_device_transfer.dart'; import 'package:test_sa/views/pages/device_transfer/track_device_transfer.dart'; import 'package:test_sa/views/pages/sub_workorder/search_sub_workorder_page.dart'; -import 'package:test_sa/views/pages/user/gas_refill/request_gas_refill.dart'; import 'package:test_sa/views/pages/user/gas_refill/track_gas_refill.dart'; -import 'package:test_sa/views/pages/user/requests/create_request.dart'; import 'package:test_sa/views/pages/user/visits/regular_visits_page.dart'; import 'package:test_sa/views/widgets/buttons/app_back_button.dart'; import 'package:test_sa/views/widgets/buttons/app_icon_button.dart'; @@ -34,10 +33,11 @@ import 'package:test_sa/views/widgets/dialogs/dialog.dart'; import 'package:test_sa/views/widgets/drawer/drawer_item.dart'; import 'package:url_launcher/url_launcher.dart'; +import '../../../new_views/pages/new_service_request_page.dart'; import '../../widgets/land_page/land_page_item.dart'; import 'requests/requests_page.dart'; -@Deprecated("Use the widget inside the [new_views/pages/land_page] folder") +@Deprecated("Use the page which is inside the [new_views/pages/land_page] folder") class LandPage extends StatefulWidget { static const String id = "/land-page"; @@ -156,14 +156,15 @@ class _LandPageState extends State { if (_userProvider.user != null && _userProvider.user.type == UsersTypes.normal_user) LandPageItem( text: _subtitle.newServiceRequest, - icon: FontAwesomeIcons.tools, + icon: FontAwesomeIcons.screwdriverWrench, onPressed: () { - Navigator.of(context).pushNamed(CreateRequestPage.id); + // Navigator.of(context).pushNamed(CreateRequestPage.id); + Navigator.of(context).pushNamed(NewServiceRequestPage.routeName); }, ), LandPageItem( text: _subtitle.trackServiceRequest, - icon: FontAwesomeIcons.tasks, + icon: FontAwesomeIcons.listCheck, onPressed: () { Navigator.of(context).pushNamed(ServiceRequestsPage.id); }, @@ -189,7 +190,8 @@ class _LandPageState extends State { text: "Request Gas Refill", icon: FontAwesomeIcons.truckFast, onPressed: () { - Navigator.of(context).pushNamed(RequestGasRefill.id); + // Navigator.of(context).pushNamed(RequestGasRefill.id); + Navigator.of(context).pushNamed(NewGasRefillRequestPage.routeName); }, ), LandPageItem( @@ -203,7 +205,8 @@ class _LandPageState extends State { text: "Transfer Asset", icon: FontAwesomeIcons.rightLeft, onPressed: () { - Navigator.of(context).pushNamed(RequestDeviceTransfer.id); + // Navigator.of(context).pushNamed(RequestDeviceTransfer.id); + Navigator.of(context).pushNamed(NewTransferRequestPage.routeName); }, ), LandPageItem(