From 50520d4eb6ec70f35eb66ad7ae1d356a87aad469 Mon Sep 17 00:00:00 2001 From: WaseemAbbasi22 <50428976+WaseemAbbasi22@users.noreply.github.com> Date: Mon, 6 Jul 2026 14:40:33 +0300 Subject: [PATCH] improvements --- lib/controllers/api_routes/urls.dart | 8 ++++---- lib/new_views/common_widgets/app_drawer.dart | 8 ++++---- lib/new_views/pages/settings_page.dart | 15 +++++++++++++++ .../user/notifications/notifications_page.dart | 2 +- .../widgets/notification_card_redesigned.dart | 2 +- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart index b7e7e519..efd747ca 100644 --- a/lib/controllers/api_routes/urls.dart +++ b/lib/controllers/api_routes/urls.dart @@ -4,12 +4,12 @@ class URLs { static const String appReleaseBuildNumber = "42"; // static const host1 = "https://atomsm.hmg.com"; // production url - static const host1 = "https://atomsmdev.hmg.com"; // local DEV url - // static const host1 = "https://atomsmuat.hmg.com"; // local UAT url + // static const host1 = "https://atomsmdev.hmg.com"; // local DEV url + static const host1 = "https://atomsmuat.hmg.com"; // local UAT url // static final String _baseUrl = "$_host/mobile"; // host local UAT - // static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis - static final String _baseUrl = "$_host/v3/mobile"; // v3 for production CM,PM,TM + static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis + // static final String _baseUrl = "$_host/v3/mobile"; // v3 for production CM,PM,TM // static final String _baseUrl = "$_host/v4/mobile"; // v4 for Demo module // static final String _baseUrl = "$_host/v5/mobile"; // v5 for data segregation // static final String _baseUrl = "$_host/v6/mobile"; // for asset delivery module diff --git a/lib/new_views/common_widgets/app_drawer.dart b/lib/new_views/common_widgets/app_drawer.dart index bee95876..9634e097 100644 --- a/lib/new_views/common_widgets/app_drawer.dart +++ b/lib/new_views/common_widgets/app_drawer.dart @@ -65,10 +65,10 @@ class AppDrawer extends StatelessWidget { ListView( padding: const EdgeInsets.only(top: 24), children: [ - drawerItem("drawer_notification", context.translation.notifications, context).onPress(() => Navigator.of(context).pushNamed(NotificationsPage.id)), - 18.height, - drawerItem("notification_setting", 'Notification Settings'.addTranslation, context).onPress(() => Navigator.of(context).pushNamed(NotificationSettingPage.id)), - 18.height, + // drawerItem("drawer_notification", context.translation.notifications, context).onPress(() => Navigator.of(context).pushNamed(NotificationsPage.id)), + // 18.height, + // drawerItem("notification_setting", 'Notification Settings'.addTranslation, context).onPress(() => Navigator.of(context).pushNamed(NotificationSettingPage.id)), + // 18.height, // drawerItem("help_center", context.translation.helpCenter, context) /*.onPress(() => Navigator.of(context).pushNamed(HelpCenterPage.id))*/, // 18.height, // drawerItem("rate_us", context.translation.rateUs, context), diff --git a/lib/new_views/pages/settings_page.dart b/lib/new_views/pages/settings_page.dart index 0222afe6..fcca8712 100644 --- a/lib/new_views/pages/settings_page.dart +++ b/lib/new_views/pages/settings_page.dart @@ -9,8 +9,10 @@ import 'package:provider/provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; +import 'package:test_sa/extensions/string_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; +import 'package:test_sa/modules/notification_setting/view/notification_setting_page.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/views/widgets/item_views/info_header_widget.dart'; @@ -168,6 +170,19 @@ class _SettingsPageState extends State { ], ); }), + + const Divider().defaultStyle(context), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + InfoHeader16Widget("Notification Settings".addTranslation), + //added this SizedBox to make it in center with the above switches. + SizedBox( + width: 42.toScreenWidth, + child: "arrow_right".toSvgAsset(width: 20, color: AppColor.primary10), + ) + ], + ).onPress(() => Navigator.of(context).pushNamed(NotificationSettingPage.id)), ], ).toShadowContainer(context, borderRadius: 16, padding: 16).paddingAll(16), ); diff --git a/lib/views/pages/user/notifications/notifications_page.dart b/lib/views/pages/user/notifications/notifications_page.dart index 3d146705..8025d0f0 100644 --- a/lib/views/pages/user/notifications/notifications_page.dart +++ b/lib/views/pages/user/notifications/notifications_page.dart @@ -178,7 +178,7 @@ class _NotificationsPageState extends State with TickerProvid ), body: SafeArea( child: Column( - spacing: 12.toScreenHeight, + spacing: 16.toScreenHeight, crossAxisAlignment: CrossAxisAlignment.end, children: [ AppTextFormField( diff --git a/lib/views/pages/user/notifications/widgets/notification_card_redesigned.dart b/lib/views/pages/user/notifications/widgets/notification_card_redesigned.dart index 36184dc9..b8d96c0e 100644 --- a/lib/views/pages/user/notifications/widgets/notification_card_redesigned.dart +++ b/lib/views/pages/user/notifications/widgets/notification_card_redesigned.dart @@ -25,7 +25,7 @@ class NotificationCardRedesigned extends StatelessWidget { final isUnread = !(notification.readed ?? false); return Column( crossAxisAlignment: CrossAxisAlignment.start, - spacing: 4.toScreenHeight, + spacing: 6.toScreenHeight, children: [ Row( mainAxisAlignment: MainAxisAlignment.spaceBetween,