diff --git a/lib/core/utils/utils.dart b/lib/core/utils/utils.dart index 210970b1..ef83cb9f 100644 --- a/lib/core/utils/utils.dart +++ b/lib/core/utils/utils.dart @@ -876,25 +876,25 @@ class Utils { ); } - static Widget getPaymentMethods() { + static Widget getPaymentMethods({num spacing = 3, num width = 35, num height = 35}) { return Row( - spacing: 6.w, + spacing: spacing.w, mainAxisSize: MainAxisSize.max, children: [ - Image.asset(AppAssets.mada, width: 35.h, height: 35.h), + Image.asset(AppAssets.mada, width: width.h, height: height.h), Image.asset( AppAssets.tamaraEng, - width: 35.h, - height: 35.h, + width: width.h, + height: height.h, fit: BoxFit.contain, errorBuilder: (context, error, stackTrace) { debugPrint('Failed to load Tamara PNG in payment methods: $error'); return Utils.buildSvgWithAssets(icon: AppAssets.tamara, width: 35.h, height: 35.h, fit: BoxFit.contain); }, ), - Image.asset(AppAssets.visa, width: 35.h, height: 35.h), - Image.asset(AppAssets.mastercard, width: 35.h, height: 25.h), - Image.asset(AppAssets.applePay, width: 35.h, height: 35.h), + Image.asset(AppAssets.visa, width: width.h, height: height.h), + Image.asset(AppAssets.mastercard, width: width.h, height: height.h), + Platform.isIOS ? Image.asset(AppAssets.applePay, width: width.h, height: height.h) : SizedBox.shrink(), ], ); } diff --git a/lib/presentation/home/lakum_wallet_details.dart b/lib/presentation/home/lakum_wallet_details.dart index 96cd2122..5b044952 100644 --- a/lib/presentation/home/lakum_wallet_details.dart +++ b/lib/presentation/home/lakum_wallet_details.dart @@ -241,10 +241,10 @@ class LakumWalletDetails extends StatelessWidget { return CustomButton( height: 46.h, icon: AppAssets.redeem_icon, - iconColor: AppColors.textColor, + iconColor: AppColors.whiteColor, iconSize: 24.h, backgroundColor: AppColors.habibPharmacyColor, - textColor: AppColors.textColor, + textColor: AppColors.whiteColor, text: LocaleKeys.redeem.tr(context: context), borderWidth: 0.w, fontWeight: FontWeight.w600, diff --git a/lib/presentation/home/landing_page.dart b/lib/presentation/home/landing_page.dart index 35b7c992..51e34d7e 100644 --- a/lib/presentation/home/landing_page.dart +++ b/lib/presentation/home/landing_page.dart @@ -826,6 +826,7 @@ class _LandingPageState extends State { children: [ LocaleKeys.myBalanceSubtitle.tr(context: context).toText16(isBold: true).paddingSymmetrical(24.h, 0.h), SizedBox( + // height: 200.h, height: 170.h, child: ListView.separated( scrollDirection: Axis.horizontal, diff --git a/lib/presentation/home/widgets/habib_wallet_card.dart b/lib/presentation/home/widgets/habib_wallet_card.dart index 5ee07f15..1d9bd656 100644 --- a/lib/presentation/home/widgets/habib_wallet_card.dart +++ b/lib/presentation/home/widgets/habib_wallet_card.dart @@ -105,8 +105,8 @@ class HabibWalletCard extends StatelessWidget { .toShimmer2(isShow: habibWalletVM.isWalletAmountLoading, radius: 12.h, width: 80.h, height: 40.h), ], ), - // Spacer(), - Utils.getPaymentMethods(), + Spacer(), + Utils.getPaymentMethods(spacing: 3, width: 30, height: 30), ], ); }), diff --git a/lib/presentation/my_invoices/my_invoices_list.dart b/lib/presentation/my_invoices/my_invoices_list.dart index b71d6344..26f0d1c9 100644 --- a/lib/presentation/my_invoices/my_invoices_list.dart +++ b/lib/presentation/my_invoices/my_invoices_list.dart @@ -120,23 +120,23 @@ class _MyInvoicesListState extends State { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - // SizedBox(height: 16.h), - // CustomTabBar( - // activeTextColor: Color(0xffED1C2B), - // activeBackgroundColor: Color(0xffED1C2B).withValues(alpha: .1), - // initialIndex: 0, - // tabs: [ - // CustomTabBarModel(null, LocaleKeys.visitsOrders.tr(context: context)), - // CustomTabBarModel(null, LocaleKeys.pharmacy.tr(context: context)), - // ], - // onTabChange: (index) { - // myInvoicesVM.onTabChanged(index); - // if (index == 1 && myInvoicesVM.allPharmacyInvoicesList.isEmpty) { - // // Load pharmacy invoices when pharmacy tab is selected and list is empty - // myInvoicesVM.getAllPharmacyInvoices(); - // } - // }, - // ).paddingSymmetrical(24.h, 0.h), + SizedBox(height: 16.h), + CustomTabBar( + activeTextColor: Color(0xffED1C2B), + activeBackgroundColor: Color(0xffED1C2B).withValues(alpha: .1), + initialIndex: 0, + tabs: [ + CustomTabBarModel(null, LocaleKeys.visitsOrders.tr(context: context)), + CustomTabBarModel(null, LocaleKeys.pharmacy.tr(context: context)), + ], + onTabChange: (index) { + myInvoicesVM.onTabChanged(index); + if (index == 1 && myInvoicesVM.allPharmacyInvoicesList.isEmpty) { + // Load pharmacy invoices when pharmacy tab is selected and list is empty + myInvoicesVM.getAllPharmacyInvoices(); + } + }, + ).paddingSymmetrical(24.h, 0.h), myInvoicesVM.selectedTabIndex == 0 ? Column( children: [ SizedBox(height: 16.h), diff --git a/pubspec.yaml b/pubspec.yaml index 99310e51..c17249b1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,8 +2,8 @@ name: hmg_patient_app_new description: "New HMG Patient App" publish_to: 'none' # Remove this line if you wish to publish to pub.dev -#version: 0.0.30+29 -version: 0.0.4+1 +#version: 0.0.32+31 +version: 0.0.5+2 environment: sdk: ">=3.6.0 <4.0.0"