update navigation padding

lib/features/voucher/detail/voucher_detail_screen.dart

@@ -7,6 +7,7 @@ import 'package:mypoint_flutter_app/features/voucher/detail/store_list_section.d
 import 'package:mypoint_flutter_app/features/voucher/models/product_type.dart';
 import 'package:mypoint_flutter_app/features/voucher/voucher_code_card_screen.dart';
 import 'package:url_launcher/url_launcher.dart';
+import '../../../app/config/constants.dart';
 import '../../../shared/widgets/base_view/base_screen.dart';
 import '../../../shared/widgets/base_view/basic_state.dart';
 import '../../../shared/preferences/point/point_manager.dart';
@@ -75,7 +76,12 @@ class _VoucherDetailScreenState extends BaseState<VoucherDetailScreen> with Basi
           return Stack(
             children: [
               Center(child: EmptyWidget(isLoading: _viewModel.isLoading.value)),
-              SafeArea(child: Padding(padding: const EdgeInsets.all(8), child: CustomBackButton())),
+              SafeArea(
+                child: Padding(
+                  padding: EdgeInsets.only(left: 8, right: 8, bottom: 8, top: 8 + Constants.extendTopPaddingNavigation),
+                  child: CustomBackButton(),
+                ),
+              ),
             ],
           );
         }
@@ -98,7 +104,7 @@ class _VoucherDetailScreenState extends BaseState<VoucherDetailScreen> with Basi
             ),
             SafeArea(
               child: Padding(
-                padding: const EdgeInsets.all(8),
+                padding: EdgeInsets.only(left: 8, right: 8, top: 8 + Constants.extendTopPaddingNavigation, bottom: 8),
                 child: Row(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -211,16 +217,11 @@ class _VoucherDetailScreenState extends BaseState<VoucherDetailScreen> with Basi
               if (product.price?.value != null && product.previewFlashSale?.isFlashSalePrice == true)
                 Text(
                   '${product.price?.value?.money(CurrencyUnit.noneSpace)}đ',
-                  style: const TextStyle(
-                    fontSize: 14,
-                    color: Colors.grey,
-                    decoration: TextDecoration.lineThrough,
-                  ),
+                  style: const TextStyle(fontSize: 14, color: Colors.grey, decoration: TextDecoration.lineThrough),
                 ),
             ],
           ),
-          if (product.isShowProsessSoldItem)
-          const SizedBox(height: 16),
+          if (product.isShowProsessSoldItem) const SizedBox(height: 16),
           if (product.isShowProsessSoldItem)
             Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -234,17 +235,13 @@ class _VoucherDetailScreenState extends BaseState<VoucherDetailScreen> with Basi
                       value: product.progress,
                       minHeight: 10,
                       backgroundColor: Colors.grey.shade300,
-                      valueColor: AlwaysStoppedAnimation<Color>(
-                        product.inStock ? Colors.orange : Colors.red,
-                      ),
+                      valueColor: AlwaysStoppedAnimation<Color>(product.inStock ? Colors.orange : Colors.red),
                     ),
                   ),
                 ),
                 const SizedBox(width: 2),
                 Text(
-                  product.inStock
-                      ? 'Đã bán ${product.previewFlashSale?.fsQuantitySold ?? 0}'
-                      : 'Đã bán hết',
+                  product.inStock ? 'Đã bán ${product.previewFlashSale?.fsQuantitySold ?? 0}' : 'Đã bán hết',
                   style: TextStyle(fontSize: 12, color: product.inStock ? Colors.black : Colors.grey),
                 ),
               ],

lib/features/voucher/voucher_code_card_screen.dart

 import 'package:barcode_widget/barcode_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:mypoint_flutter_app/shared/widgets/back_button.dart';
+import 'package:mypoint_flutter_app/shared/widgets/custom_navigation_bar.dart';
 import 'package:mypoint_flutter_app/shared/widgets/custom_toast_message.dart';
 import 'package:mypoint_flutter_app/shared/widgets/dashed_line.dart';
 import 'package:qr_flutter/qr_flutter.dart';
+import '../../app/config/constants.dart';
 import '../../core/theme/base_color.dart';
+import '../../shared/widgets/back_button.dart';
 import '../../shared/widgets/custom_point_text_tag.dart';
 import '../../shared/widgets/image_loader.dart';
 import 'models/product_model.dart';
@@ -20,16 +22,15 @@ class VoucherCodeCardScreen extends StatelessWidget {
     final code = product.item?.codeSecret ?? '';
     final password = product.item?.password ?? "";
     final screenWidth = MediaQuery.of(context).size.width;
-
+    final topExpand = MediaQuery.of(context).padding.top + 8 + Constants.extendTopPaddingNavigation;
     return Scaffold(
       backgroundColor: BaseColor.primary500,
-      appBar: AppBar(leading: CustomBackButton(), backgroundColor: Colors.transparent),
       body: Stack(
         children: [
           Column(
             children: [
               Container(
-                margin: const EdgeInsets.all(16),
+                margin: EdgeInsets.only(left: 16, right: 16, top: 16 + topExpand + 36), //all(16),
                 padding: const EdgeInsets.all(16),
                 decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(16)),
                 child: Column(
@@ -160,6 +161,7 @@ class VoucherCodeCardScreen extends StatelessWidget {
               child: Image.asset('assets/images/ic_scan_tutorial.png', fit: BoxFit.cover),
             ),
           ),
+          Positioned(top: topExpand, left: 8, child: CustomBackButton()),
         ],
       ),
     );

lib/shared/navigation/directional_screen.dart

@@ -265,7 +265,8 @@ class DirectionalScreen {
         Get.toNamed(healthBookScreen);
         return true;
       case DirectionalScreenName.campaignSevenDayScreen:
-        Get.toNamed(campaignSevenDayScreen);
+        if ((clickActionParam ?? '').isEmpty) return false;
+        Get.toNamed(campaignSevenDayScreen, arguments: {"id": clickActionParam});
         return true;
       case DirectionalScreenName.workerProfile:
         Get.toNamed(personalEditScreen);

lib/shared/widgets/custom_navigation_bar.dart

@@ -28,15 +28,16 @@ class CustomNavigationBar extends StatelessWidget implements PreferredSizeWidget
     final view = dispatcher.implicitView ?? (dispatcher.views.isNotEmpty ? dispatcher.views.first : null);
     double paddingTop = view != null ? MediaQueryData.fromView(view).padding.top : 0.0;
     if (paddingTop == 0 && kIsWeb) {
-      paddingTop = Constants.webTopPadding;
+      paddingTop = Constants.extendTopPaddingNavigation;
     }
     return Size.fromHeight(kToolbarHeight + paddingTop);
   }
 
   @override
   Widget build(BuildContext context) {
-    if (backgroundImage != null && backgroundImage!.isNotEmpty) {
-      return _buildAppBar(backgroundImage!, context);
+    final customBg = backgroundImage;
+    if (customBg != null) {
+      return _buildAppBar(customBg, context);
     }
 
     final theme = Get.find<HeaderThemeController>();
@@ -50,7 +51,7 @@ class CustomNavigationBar extends StatelessWidget implements PreferredSizeWidget
     double statusBarHeight = MediaQuery.of(context).padding.top;
     double extraWebPadding = 0;
     if (statusBarHeight == 0 && kIsWeb) {
-      extraWebPadding = Constants.webTopPadding;
+      extraWebPadding = Constants.extendTopPaddingNavigation;
     }
     final double totalTopPadding = statusBarHeight + extraWebPadding;
     final bool isHttp = bgImage.startsWith('http://') || bgImage.startsWith('https://');
@@ -92,7 +93,7 @@ class CustomNavigationBar extends StatelessWidget implements PreferredSizeWidget
                   if (leftButtons.isNotEmpty)
                     Positioned(left: 12, child: Row(mainAxisSize: MainAxisSize.min, children: leftButtons)),
                   if (rightButtons.isNotEmpty)
-                    Positioned(right: 12, child: Row(mainAxisSize: MainAxisSize.min, children: rightButtons)),
+                    Positioned(right: 8, child: Row(mainAxisSize: MainAxisSize.min, children: rightButtons)),
                 ],
               ),
             ),

lib/shared/widgets/custom_search_navigation_bar.dart

@@ -28,7 +28,7 @@ class CustomSearchNavigationBar extends StatefulWidget implements PreferredSizeW
     final view = dispatcher.implicitView ?? (dispatcher.views.isNotEmpty ? dispatcher.views.first : null);
     double paddingTop = view != null ? MediaQueryData.fromView(view).padding.top : 0.0;
     if (paddingTop == 0 && kIsWeb) {
-      paddingTop = Constants.webTopPadding;
+      paddingTop = Constants.extendTopPaddingNavigation;
     }
     return Size.fromHeight(kToolbarHeight + paddingTop);
   }
@@ -64,7 +64,7 @@ class _CustomSearchNavigationBarState extends State<CustomSearchNavigationBar> {
     double statusBarHeight = MediaQuery.of(context).padding.top;
     double extraWebPadding = 0;
     if (statusBarHeight == 0 && kIsWeb) {
-      extraWebPadding = Constants.webTopPadding;
+      extraWebPadding = Constants.extendTopPaddingNavigation;
     }
     final double totalTopPadding = statusBarHeight + extraWebPadding;
     return SizedBox(