diff --git a/lib/contact_us/contact_us_view.dart b/lib/contact_us/contact_us_view.dart index ef83351..3620f0a 100644 --- a/lib/contact_us/contact_us_view.dart +++ b/lib/contact_us/contact_us_view.dart @@ -1,4 +1,5 @@ import 'package:citycards_customer/common_packages/app_bar.dart'; +import 'package:citycards_customer/common_packages/back_widget.dart'; import 'package:flutter/material.dart'; import 'package:citycards_customer/common_packages/custom_text.dart'; import 'package:citycards_customer/common_packages/custom_textfield.dart'; @@ -25,29 +26,8 @@ class ContactUsPage extends StatelessWidget { children: [ // Header bar CommonAppBar(isWhiteLogo: false, isProfilePage: true), - SizedBox(height: 12.h), - Divider(height: 1.h, color: Color(0xFFD9D9D9)), - SizedBox(height: 22.h), - // Back + Title - Row( - children: [ - GestureDetector( - onTap: () { - Navigator.pop(context); - }, - child: Icon(Icons.arrow_back, size: 24.sp), - ), - SizedBox(width: 8.w), - Text( - "Contact Us", - style: TextStyle( - fontSize: 12.sp, - fontWeight: FontWeight.w500, - ), - ), - ], - ), + backWidget(context,"Contact Us", Colors.black), SizedBox(height: 22.h), CustomText( diff --git a/lib/edit_profile/edit_profile_view.dart b/lib/edit_profile/edit_profile_view.dart index 0c692cc..b6a2721 100644 --- a/lib/edit_profile/edit_profile_view.dart +++ b/lib/edit_profile/edit_profile_view.dart @@ -1,4 +1,5 @@ import 'package:citycards_customer/common_packages/app_bar.dart'; +import 'package:citycards_customer/common_packages/back_widget.dart'; import 'package:citycards_customer/common_packages/custom_textfield.dart'; import 'package:flutter/material.dart'; import 'package:citycards_customer/common_packages/custom_text.dart'; @@ -25,29 +26,9 @@ class EditProfilePage extends StatelessWidget { children: [ // Header CommonAppBar(isWhiteLogo: false, isProfilePage: true), - SizedBox(height: 12.h), - Divider(height: 1.h, color: Color(0xFFD9D9D9)), - SizedBox(height: 22.h), // Back + title - Row( - children: [ - GestureDetector( - onTap: () { - Navigator.pop(context); - }, - child: Icon(Icons.arrow_back, size: 24.sp), - ), - SizedBox(width: 8.w), - Text( - "Edit Profile", - style: TextStyle( - fontSize: 12.sp, - fontWeight: FontWeight.w500, - ), - ), - ], - ), + backWidget(context,"Edit Profile", Colors.black), SizedBox(height: 33.h), // Profile Image diff --git a/lib/faq/faq_view.dart b/lib/faq/faq_view.dart index d8174e0..d0e9ac8 100644 --- a/lib/faq/faq_view.dart +++ b/lib/faq/faq_view.dart @@ -1,4 +1,5 @@ import 'package:citycards_customer/common_packages/app_bar.dart'; +import 'package:citycards_customer/common_packages/back_widget.dart'; import 'package:citycards_customer/common_packages/custom_expansion_tile.dart'; import 'package:citycards_customer/common_packages/custom_text.dart'; import 'package:flutter/material.dart'; @@ -19,33 +20,7 @@ class FaqPage extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ CommonAppBar(isWhiteLogo: false, isProfilePage: true), - SizedBox( - height: 12.h, - ), - Divider( - height: 1.h, - color: Color(0xFFD9D9D9), - ), - SizedBox(height: 22.h), - - // Back + Title - Row( - children: [ - GestureDetector( - onTap: (){ - Navigator.pop(context); - }, - child: Icon(Icons.arrow_back, size: 24.sp)), - SizedBox(width: 8.w), - Text( - "FAQ", - style: TextStyle( - fontSize: 12.sp, - fontWeight: FontWeight.w500, - ), - ), - ], - ), + backWidget(context,"FAQ", Colors.black), SizedBox(height: 34.h), FAQSection(title: "🧭 General FAQs", faqs: generalFAQs), diff --git a/lib/privacy/privacy_view.dart b/lib/privacy/privacy_view.dart index b3b4dfb..97afcee 100644 --- a/lib/privacy/privacy_view.dart +++ b/lib/privacy/privacy_view.dart @@ -1,4 +1,5 @@ import 'package:citycards_customer/common_packages/app_bar.dart'; +import 'package:citycards_customer/common_packages/back_widget.dart'; import 'package:citycards_customer/common_packages/custom_text.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -16,29 +17,7 @@ class PrivacyPolicyPage extends StatelessWidget { child: Column( children: [ CommonAppBar(isWhiteLogo: false, isProfilePage: true), - SizedBox(height: 12.h), - Divider(height: 1.h, color: Color(0xFFD9D9D9)), - SizedBox(height: 22.h), - - // Back + Title - Row( - children: [ - GestureDetector( - onTap: () { - Navigator.pop(context); - }, - child: Icon(Icons.arrow_back, size: 24.sp), - ), - SizedBox(width: 8.w), - Text( - "Privacy Policy", - style: TextStyle( - fontSize: 12.sp, - fontWeight: FontWeight.w500, - ), - ), - ], - ), + backWidget(context,"Privacy Policy", Colors.black), SizedBox(height: 32.h), CustomText( text: diff --git a/lib/profile/profile_page_view.dart b/lib/profile/profile_page_view.dart index 7dee061..a0c5567 100644 --- a/lib/profile/profile_page_view.dart +++ b/lib/profile/profile_page_view.dart @@ -1,5 +1,6 @@ import 'package:citycards_customer/common_bloc/language_selection_bloc.dart'; import 'package:citycards_customer/common_packages/app_bar.dart'; +import 'package:citycards_customer/common_packages/back_widget.dart'; import 'package:citycards_customer/common_packages/custom_text.dart'; import 'package:citycards_customer/common_packages/language_selection_bottomsheet.dart'; import 'package:citycards_customer/core/route_constants.dart'; @@ -21,21 +22,8 @@ class ProfilePage extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.center, children: [ CommonAppBar(isWhiteLogo: false, isProfilePage: true), - SizedBox(height: 12.h), - Divider(height: 1.h, color: Color(0xFFD9D9D9)), - SizedBox(height: 22.h), - Row( - children: [ - GestureDetector( - onTap: () { - Navigator.pop(context); - }, - child: Icon(Icons.arrow_back, size: 24.sp), - ), - SizedBox(width: 8.w), - Text("My profile", style: TextStyle(fontSize: 12.sp)), - ], - ), + backWidget(context,"My Profile", Colors.black), + SizedBox(height: 29.h), // Profile Image and Name Row( diff --git a/lib/terms_and_condition/terms_and_condition_view.dart b/lib/terms_and_condition/terms_and_condition_view.dart index c4af61c..34ade3b 100644 --- a/lib/terms_and_condition/terms_and_condition_view.dart +++ b/lib/terms_and_condition/terms_and_condition_view.dart @@ -1,4 +1,5 @@ import 'package:citycards_customer/common_packages/app_bar.dart'; +import 'package:citycards_customer/common_packages/back_widget.dart'; import 'package:citycards_customer/common_packages/custom_text.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -16,29 +17,10 @@ class TermsAndCondition extends StatelessWidget { child: Column( children: [ CommonAppBar(isWhiteLogo: false, isProfilePage: true), - SizedBox(height: 12.h), - Divider(height: 1.h, color: Color(0xFFD9D9D9)), - SizedBox(height: 22.h), + // Back + Title - Row( - children: [ - GestureDetector( - onTap: () { - Navigator.pop(context); - }, - child: Icon(Icons.arrow_back, size: 24.sp), - ), - SizedBox(width: 8.w), - Text( - "Terms and Conditons", - style: TextStyle( - fontSize: 12.sp, - fontWeight: FontWeight.w500, - ), - ), - ], - ), + backWidget(context,"Terms and Conditions", Colors.black), SizedBox(height: 32.h), CustomText( text: