Merge branch 'dev_sultan'

lib/extensions/string_extensions.dart

@@ -11,13 +11,16 @@ extension CapExtension on String {
 
   String get allInCaps => this.toUpperCase();
 
-  String get capitalizeFirstofEach => this.trim().length > 0 ? this.trim().toLowerCase().split(" ").map((str) => str.inCaps).join(" ") : "";
+  String get capitalizeFirstofEach =>
+      this.trim().length > 0 ? this.trim().toLowerCase().split(" ").map((str) => str.inCaps).join(" ") : "";
 }
 
 extension EmailValidator on String {
   Widget get toWidget => Text(this);
 
-  Widget toText8({Color? color, bool isBold = false, int? maxlines, FontStyle? fontStyle, TextOverflow? textOverflow}) => Text(
+  Widget toText8(
+          {Color? color, bool isBold = false, int? maxlines, FontStyle? fontStyle, TextOverflow? textOverflow}) =>
+      Text(
         this,
         maxLines: maxlines,
         overflow: textOverflow,
@@ -30,7 +33,14 @@ extension EmailValidator on String {
         ),
       );
 
-  Widget toText10({Color? color, bool isBold = false, bool isUnderLine = false, int? maxlines, FontStyle? fontStyle, TextOverflow? textOverflow}) => Text(
+  Widget toText10(
+          {Color? color,
+          bool isBold = false,
+          bool isUnderLine = false,
+          int? maxlines,
+          FontStyle? fontStyle,
+          TextOverflow? textOverflow}) =>
+      Text(
         this,
         maxLines: maxlines,
         overflow: textOverflow,
@@ -44,7 +54,15 @@ extension EmailValidator on String {
             decorationColor: color ?? AppColors.blackColor),
       );
 
-  Widget toText11({Color? color, FontWeight? weight, bool isUnderLine = false, bool isCenter = false, bool isBold = false, int maxLine = 0, double letterSpacing = 0.64}) => Text(
+  Widget toText11(
+          {Color? color,
+          FontWeight? weight,
+          bool isUnderLine = false,
+          bool isCenter = false,
+          bool isBold = false,
+          int maxLine = 0,
+          double letterSpacing = 0.64}) =>
+      Text(
         this,
         textAlign: isCenter ? TextAlign.center : null,
         maxLines: (maxLine > 0) ? maxLine : null,
@@ -58,21 +76,33 @@ extension EmailValidator on String {
         ),
       );
 
-  Widget toText12({Color? color, bool isUnderLine = false, bool isBold = false, bool isCenter = false, int maxLine = 0}) => Text(
+  Widget toText12(
+          {Color? color,
+          bool isUnderLine = false,
+          bool isBold = false,
+          FontWeight? fontWeight,
+          bool isCenter = false,
+            double? height,
+          int maxLine = 0}) =>
+      Text(
         this,
         textAlign: isCenter ? TextAlign.center : null,
         maxLines: (maxLine > 0) ? maxLine : null,
         style: TextStyle(
+
           fontSize: 12.fSize,
-          fontWeight: isBold ? FontWeight.bold : FontWeight.normal,
+          fontWeight: fontWeight ?? (isBold ? FontWeight.bold : FontWeight.normal),
           color: color ?? AppColors.blackColor,
           letterSpacing: -0.4,
+          height: height,
           decorationColor: isUnderLine ? AppColors.blackColor : null,
           decoration: isUnderLine ? TextDecoration.underline : null,
         ),
       );
 
-  Widget toText12Auto({Color? color, bool isUnderLine = false, bool isBold = false, bool isCenter = false, int maxLine = 0}) => AutoSizeText(
+  Widget toText12Auto(
+          {Color? color, bool isUnderLine = false, bool isBold = false, bool isCenter = false, int maxLine = 0}) =>
+      AutoSizeText(
         this,
         textAlign: isCenter ? TextAlign.center : null,
         maxLines: (maxLine > 0) ? maxLine : null,
@@ -133,7 +163,14 @@ extension EmailValidator on String {
             decoration: isUnderLine ? TextDecoration.underline : null),
       );
 
-  Widget toText14({Color? color, bool isUnderLine = false, bool isBold = false, bool isCenter = false, FontWeight? weight, int? maxlines}) => Text(
+  Widget toText14(
+          {Color? color,
+          bool isUnderLine = false,
+          bool isBold = false,
+          bool isCenter = false,
+          FontWeight? weight,
+          int? maxlines}) =>
+      Text(
         this,
         textAlign: isCenter ? TextAlign.center : null,
         maxLines: maxlines,
@@ -145,7 +182,14 @@ extension EmailValidator on String {
             decoration: isUnderLine ? TextDecoration.underline : null),
       );
 
-  Widget toText15({Color? color, bool isUnderLine = false, bool isBold = false, bool isCenter = false, FontWeight? weight, int? maxlines}) => Text(
+  Widget toText15(
+          {Color? color,
+          bool isUnderLine = false,
+          bool isBold = false,
+          bool isCenter = false,
+          FontWeight? weight,
+          int? maxlines}) =>
+      Text(
         this,
         textAlign: isCenter ? TextAlign.center : null,
         maxLines: maxlines,
@@ -181,53 +225,93 @@ extension EmailValidator on String {
   Widget toText17({Color? color, bool isBold = false, bool isCenter = false}) => Text(
         this,
         textAlign: isCenter ? TextAlign.center : null,
-        style: TextStyle(color: color ?? AppColors.blackColor, fontSize: 17.fSize, letterSpacing: -0.4, fontWeight: isBold ? FontWeight.bold : FontWeight.normal),
+        style: TextStyle(
+            color: color ?? AppColors.blackColor,
+            fontSize: 17.fSize,
+            letterSpacing: -0.4,
+            fontWeight: isBold ? FontWeight.bold : FontWeight.normal),
       );
 
   Widget toText18({Color? color, bool isBold = false, bool isCenter = false, int? maxlines}) => Text(
         maxLines: maxlines,
         textAlign: isCenter ? TextAlign.center : null,
         this,
-        style: TextStyle(fontSize: 18.fSize, fontWeight: isBold ? FontWeight.bold : FontWeight.normal, color: color ?? AppColors.blackColor, letterSpacing: -0.4),
+        style: TextStyle(
+            fontSize: 18.fSize,
+            fontWeight: isBold ? FontWeight.bold : FontWeight.normal,
+            color: color ?? AppColors.blackColor,
+            letterSpacing: -0.4),
       );
 
   Widget toText19({Color? color, bool isBold = false}) => Text(
         this,
-        style: TextStyle(fontSize: 19.fSize, fontWeight: isBold ? FontWeight.bold : FontWeight.normal, color: color ?? AppColors.blackColor, letterSpacing: -0.4),
+        style: TextStyle(
+            fontSize: 19.fSize,
+            fontWeight: isBold ? FontWeight.bold : FontWeight.normal,
+            color: color ?? AppColors.blackColor,
+            letterSpacing: -0.4),
       );
 
   Widget toText20({Color? color, bool isBold = false}) => Text(
         this,
-        style: TextStyle(fontSize: 20.fSize, fontWeight: isBold ? FontWeight.bold : FontWeight.normal, color: color ?? AppColors.blackColor, letterSpacing: -0.4),
+        style: TextStyle(
+            fontSize: 20.fSize,
+            fontWeight: isBold ? FontWeight.bold : FontWeight.normal,
+            color: color ?? AppColors.blackColor,
+            letterSpacing: -0.4),
       );
 
   Widget toText21({Color? color, bool isBold = false, FontWeight? weight, int? maxlines}) => Text(
         this,
         maxLines: maxlines,
-        style: TextStyle(color: color ?? AppColors.blackColor, fontSize: 21.fSize, letterSpacing: -0.4, fontWeight: weight ?? (isBold ? FontWeight.bold : FontWeight.normal)),
+        style: TextStyle(
+            color: color ?? AppColors.blackColor,
+            fontSize: 21.fSize,
+            letterSpacing: -0.4,
+            fontWeight: weight ?? (isBold ? FontWeight.bold : FontWeight.normal)),
       );
 
   Widget toText22({Color? color, bool isBold = false, bool isCenter = false}) => Text(
         this,
         textAlign: isCenter ? TextAlign.center : null,
-        style: TextStyle(height: 1, color: color ?? AppColors.blackColor, fontSize: 22.fSize, letterSpacing: -0.4, fontWeight: isBold ? FontWeight.bold : FontWeight.normal),
+        style: TextStyle(
+            height: 1,
+            color: color ?? AppColors.blackColor,
+            fontSize: 22.fSize,
+            letterSpacing: -0.4,
+            fontWeight: isBold ? FontWeight.bold : FontWeight.normal),
       );
 
   Widget toText24({Color? color, bool isBold = false, bool isCenter = false}) => Text(
         this,
         textAlign: isCenter ? TextAlign.center : null,
-        style: TextStyle(height: 23 / 24, color: color ?? AppColors.blackColor, fontSize: 24.fSize, letterSpacing: -0.4, fontWeight: isBold ? FontWeight.bold : FontWeight.normal),
+        style: TextStyle(
+            height: 23 / 24,
+            color: color ?? AppColors.blackColor,
+            fontSize: 24.fSize,
+            letterSpacing: -0.4,
+            fontWeight: isBold ? FontWeight.bold : FontWeight.normal),
       );
 
   Widget toText32({Color? color, bool isBold = false, bool isCenter = false}) => Text(
         this,
         textAlign: isCenter ? TextAlign.center : null,
-        style: TextStyle(height: 32 / 32, color: color ?? AppColors.blackColor, fontSize: 32.fSize, letterSpacing: -0.4, fontWeight: isBold ? FontWeight.bold : FontWeight.normal),
+        style: TextStyle(
+            height: 32 / 32,
+            color: color ?? AppColors.blackColor,
+            fontSize: 32.fSize,
+            letterSpacing: -0.4,
+            fontWeight: isBold ? FontWeight.bold : FontWeight.normal),
       );
 
   Widget toText44({Color? color, bool isBold = false}) => Text(
         this,
-        style: TextStyle(height: 32 / 32, color: color ?? AppColors.blackColor, fontSize: 44.fSize, letterSpacing: -0.4, fontWeight: isBold ? FontWeight.bold : FontWeight.normal),
+        style: TextStyle(
+            height: 32 / 32,
+            color: color ?? AppColors.blackColor,
+            fontSize: 44.fSize,
+            letterSpacing: -0.4,
+            fontWeight: isBold ? FontWeight.bold : FontWeight.normal),
       );
 
   Widget toSectionHeading({String upperHeading = "", String lowerHeading = ""}) {
@@ -263,7 +347,9 @@ extension EmailValidator on String {
   }
 
   bool isValidEmail() {
-    return RegExp(r'^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$').hasMatch(this);
+    return RegExp(
+            r'^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$')
+        .hasMatch(this);
   }
 
   String toFormattedDate() {

lib/presentation/home/landing_page.dart

@@ -17,7 +17,6 @@ import 'package:hmg_patient_app_new/presentation/home/widgets/large_service_card
 import 'package:hmg_patient_app_new/presentation/home/widgets/small_service_card.dart';
 import 'package:hmg_patient_app_new/presentation/medical_file/medical_file_page.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
-import 'package:hmg_patient_app_new/widgets/bottom_navigation/bottom_navigation.dart';
 import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
 import 'package:hmg_patient_app_new/widgets/transitions/fade_page.dart';
 import 'package:provider/provider.dart';
@@ -30,6 +29,7 @@ class LandingPage extends StatefulWidget {
 }
 
 class _LandingPageState extends State<LandingPage> {
+
   @override
   Widget build(BuildContext context) {
     AppState appState = getIt.get<AppState>();
@@ -273,7 +273,6 @@ class _LandingPageState extends State<LandingPage> {
           ),
         ),
       ),
-      bottomNavigationBar: BottomNavigation(),
     );
   }
 }

lib/presentation/home/navigation_screen.dart

@@ -0,0 +1,43 @@
+import 'package:flutter/material.dart';
+import 'package:hmg_patient_app_new/presentation/home/landing_page.dart';
+import 'package:hmg_patient_app_new/presentation/medical_file/medical_file_page.dart';
+import 'package:hmg_patient_app_new/widgets/bottom_navigation/bottom_navigation.dart';
+
+class LandingNavigation extends StatefulWidget {
+  const LandingNavigation({super.key});
+
+  @override
+  State<LandingNavigation> createState() => _LandingNavigationState();
+}
+
+class _LandingNavigationState extends State<LandingNavigation> {
+  int _currentIndex = 0;
+  final PageController _pageController = PageController();
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: PageView(
+        controller: _pageController,
+        physics: const NeverScrollableScrollPhysics(),
+        children: const [
+          LandingPage(),
+          MedicalFilePage(),
+          LandingPage(),
+          LandingPage(),
+          LandingPage(),
+        ],
+      ),
+      bottomNavigationBar: BottomNavigation(
+        currentIndex: _currentIndex,
+        onTap: (index) {
+          setState(() => _currentIndex = index);
+          _pageController.animateToPage(
+              index,
+              duration: const Duration(milliseconds: 300),
+          curve: Curves.easeInOut);
+        },
+      ),
+    );
+  }
+}

lib/splashPage.dart

@@ -11,6 +11,7 @@ import 'package:hmg_patient_app_new/core/app_assets.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
 // import 'package:hmg_patient_app_new/presentation/authantication/login.dart';
 import 'package:hmg_patient_app_new/presentation/home/landing_page.dart';
+import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/transitions/fade_page.dart';
 import 'package:provider/provider.dart';
@@ -37,7 +38,7 @@ class _SplashScreenState extends State<SplashPage> {
       LocalNotification.init(onNotificationClick: (payload) {});
       Navigator.of(context).pushReplacement(
         FadePage(
-          page: LandingPage(),
+          page: LandingNavigation(),
           // page: LoginScreen(),
         ),
       );

lib/widgets/bottom_navigation/bottom_navigation.dart

@@ -1,59 +1,103 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
+import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
+import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 
 class BottomNavigation extends StatelessWidget {
-  const BottomNavigation({super.key});
+  final int currentIndex;
+  final ValueChanged<int> onTap;
+
+  const BottomNavigation({
+    super.key,
+    required this.currentIndex,
+    required this.onTap,
+  });
 
   @override
   Widget build(BuildContext context) {
-    return Container(
+    final items = [
-      padding: const EdgeInsets.symmetric(vertical: 12),
+      BottomNavItem(icon: AppAssets.homeBottom, label: LocaleKeys.home.tr()),
-      decoration: const BoxDecoration(
+      BottomNavItem(icon: AppAssets.myFilesBottom, label: LocaleKeys.myFiles.tr()),
-        color: Colors.white,
+      BottomNavItem(
-        border: Border(
+        icon: AppAssets.bookAppoBottom,
-          top: BorderSide(color: AppColors.bottomNAVBorder, width: 0.5),
+        label: LocaleKeys.appointment.tr(),
-        ),
+        iconSize: 27,
-
+        isSpecial: true,
       ),
+      BottomNavItem(icon: AppAssets.toDoBottom, label: LocaleKeys.todoList.tr()),
+      BottomNavItem(icon: AppAssets.servicesBottom, label: LocaleKeys.services2.tr()),
+    ];
+
+    return Container(
+      decoration: _containerDecoration,
+      padding: _containerPadding,
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceAround,
-        children: [
+        children: List.generate(
-          _buildNavItem(AppAssets.homeBottom, LocaleKeys.home.tr()),
+          items.length,
-          _buildNavItem(AppAssets.myFilesBottom,  LocaleKeys.myFiles.tr()),
+              (index) => _buildNavItem(items[index], index),
-          _buildNavItem(AppAssets.bookAppoBottom,  LocaleKeys.appointment.tr(), iconSize: 32),
+        ),
-          _buildNavItem(AppAssets.toDoBottom,  LocaleKeys.todoList.tr()),
-          _buildNavItem(AppAssets.servicesBottom, LocaleKeys.services2.tr()),
-        ],
       ),
     );
   }
 
-  Widget _buildNavItem(String iconName, String label,{ double iconSize = 24}) {
+  Widget _buildNavItem(BottomNavItem item, int index) {
-    return Column(
+    final bool isSelected = currentIndex == index;
-      mainAxisSize: MainAxisSize.min,
+
-      children: [
+    return GestureDetector(
-        Container(
+      onTap: () => onTap(index),
-          padding: const EdgeInsets.all(10),
+      behavior: HitTestBehavior.opaque,
-          child: Utils.buildSvgWithAssets(
+      child: Column(
-            icon: iconName,
+        mainAxisSize: MainAxisSize.min,
-            height: iconSize,
+        children: [
-            width: iconSize
+         Center(
-          ),
+              child: Utils.buildSvgWithAssets(
-        ),
+                icon: item.icon,
-        // const SizedBox(height: 4),
+                height: item.iconSize.h,
-        Text(
+                width: item.iconSize.h,
-          label,
+                 // iconColor:  isSelected ? Colors.black87 : Colors.black87,
-          style: TextStyle(
+              ),
-            fontSize: 13,
+            ),
-            fontWeight: FontWeight.w500,
+          const SizedBox(height: 10),
-            color: Colors.black87,
+          item.label.toText12(
+            fontWeight:FontWeight.w500,
+            // color:  Colors.black87,
+            // textAlign: TextAlign.center,
           ),
-        ),
+        SizedBox(height:    item.isSpecial ? 5:0 )
-      ],
+        ],
+
+      ),
     );
   }
 }
+
+class BottomNavItem {
+  final String icon;
+  final String label;
+  final double iconSize;
+  final bool isSpecial;
+
+  const BottomNavItem({
+    required this.icon,
+    required this.label,
+    this.iconSize = 21,
+    this.isSpecial = false,
+  });
+}
+
+// Constants
+const EdgeInsets _containerPadding = EdgeInsets.all(15);
+const BoxDecoration _containerDecoration = BoxDecoration(
+  color: Colors.white,
+  border: Border(
+    top: BorderSide(
+      color: AppColors.bottomNAVBorder,
+      width: 0.5,
+    ),
+  ),
+);