Merge remote-tracking branch 'origin/ui_ux_rollout_merge_notification_settings' into ui_ux_rollout_merge_notification_settings

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)),
+                // drawerItem("drawer_notification", context.translation.notifications, context).onPress(() => Navigator.of(context).pushNamed(NotificationsPage.id)),
-                18.height,
+                // 18.height,
-                drawerItem("notification_setting", 'Notification Settings'.addTranslation, context).onPress(() => Navigator.of(context).pushNamed(NotificationSettingPage.id)),
+                // drawerItem("notification_setting", 'Notification Settings'.addTranslation, context).onPress(() => Navigator.of(context).pushNamed(NotificationSettingPage.id)),
-                18.height,
+                // 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),

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<SettingsPage> {
                   ],
                 );
               }),
+
+          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),
     );

lib/views/pages/user/notifications/notifications_page.dart

@@ -178,7 +178,7 @@ class _NotificationsPageState extends State<NotificationsPage> with TickerProvid
       ),
       body: SafeArea(
         child: Column(
-          spacing: 12.toScreenHeight,
+          spacing: 16.toScreenHeight,
           crossAxisAlignment: CrossAxisAlignment.end,
           children: [
             AppTextFormField(

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,