Haroon6138
/
HMG_Patient_App_New
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Update & fixes, App update to stores VersionID 21.2

Browse Source
pull/317/head
haroon amjad 2 months ago
parent 92213b03e4
commit 73066ba21a
6 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File

16
lib/core/utils/utils.dart
Unescape Escape View File

@ -876,25 +876,25 @@ class Utils {
); );
} }
static Widget getPaymentMethods() { static Widget getPaymentMethods({num spacing = 3, num width = 35, num height = 35}) {
return Row( return Row(
spacing: 6.w, spacing: spacing.w,
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: [ children: [
Image.asset(AppAssets.mada, width: 35.h, height: 35.h), Image.asset(AppAssets.mada, width: width.h, height: height.h),
Image.asset( Image.asset(
AppAssets.tamaraEng, AppAssets.tamaraEng,
width: 35.h, width: width.h,
height: 35.h, height: height.h,
fit: BoxFit.contain, fit: BoxFit.contain,
errorBuilder: (context, error, stackTrace) { errorBuilder: (context, error, stackTrace) {
debugPrint('Failed to load Tamara PNG in payment methods: $error'); 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); 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.visa, width: width.h, height: height.h),
Image.asset(AppAssets.mastercard, width: 35.h, height: 25.h), Image.asset(AppAssets.mastercard, width: width.h, height: height.h),
Image.asset(AppAssets.applePay, width: 35.h, height: 35.h), Platform.isIOS ? Image.asset(AppAssets.applePay, width: width.h, height: height.h) : SizedBox.shrink(),
], ],
); );
} }

4
lib/presentation/home/lakum_wallet_details.dart
Unescape Escape View File

@ -241,10 +241,10 @@ class LakumWalletDetails extends StatelessWidget {
return CustomButton( return CustomButton(
height: 46.h, height: 46.h,
icon: AppAssets.redeem_icon, icon: AppAssets.redeem_icon,
iconColor: AppColors.textColor, iconColor: AppColors.whiteColor,
iconSize: 24.h, iconSize: 24.h,
backgroundColor: AppColors.habibPharmacyColor, backgroundColor: AppColors.habibPharmacyColor,
textColor: AppColors.textColor, textColor: AppColors.whiteColor,
text: LocaleKeys.redeem.tr(context: context), text: LocaleKeys.redeem.tr(context: context),
borderWidth: 0.w, borderWidth: 0.w,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,

1
lib/presentation/home/landing_page.dart
Unescape Escape View File

@ -826,6 +826,7 @@ class _LandingPageState extends State<LandingPage> {
children: [ children: [
LocaleKeys.myBalanceSubtitle.tr(context: context).toText16(isBold: true).paddingSymmetrical(24.h, 0.h), LocaleKeys.myBalanceSubtitle.tr(context: context).toText16(isBold: true).paddingSymmetrical(24.h, 0.h),
SizedBox( SizedBox(
// height: 200.h,
height: 170.h, height: 170.h,
child: ListView.separated( child: ListView.separated(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,

4
lib/presentation/home/widgets/habib_wallet_card.dart
Unescape Escape View File

@ -105,8 +105,8 @@ class HabibWalletCard extends StatelessWidget {
.toShimmer2(isShow: habibWalletVM.isWalletAmountLoading, radius: 12.h, width: 80.h, height: 40.h), .toShimmer2(isShow: habibWalletVM.isWalletAmountLoading, radius: 12.h, width: 80.h, height: 40.h),
], ],
), ),
// Spacer(), Spacer(),
Utils.getPaymentMethods(), Utils.getPaymentMethods(spacing: 3, width: 30, height: 30),
], ],
); );
}), }),

34
lib/presentation/my_invoices/my_invoices_list.dart
Unescape Escape View File

@ -120,23 +120,23 @@ class _MyInvoicesListState extends State<MyInvoicesList> {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
// SizedBox(height: 16.h), SizedBox(height: 16.h),
// CustomTabBar( CustomTabBar(
// activeTextColor: Color(0xffED1C2B), activeTextColor: Color(0xffED1C2B),
// activeBackgroundColor: Color(0xffED1C2B).withValues(alpha: .1), activeBackgroundColor: Color(0xffED1C2B).withValues(alpha: .1),
// initialIndex: 0, initialIndex: 0,
// tabs: [ tabs: [
// CustomTabBarModel(null, LocaleKeys.visitsOrders.tr(context: context)), CustomTabBarModel(null, LocaleKeys.visitsOrders.tr(context: context)),
// CustomTabBarModel(null, LocaleKeys.pharmacy.tr(context: context)), CustomTabBarModel(null, LocaleKeys.pharmacy.tr(context: context)),
// ], ],
// onTabChange: (index) { onTabChange: (index) {
// myInvoicesVM.onTabChanged(index); myInvoicesVM.onTabChanged(index);
// if (index == 1 && myInvoicesVM.allPharmacyInvoicesList.isEmpty) { if (index == 1 && myInvoicesVM.allPharmacyInvoicesList.isEmpty) {
// // Load pharmacy invoices when pharmacy tab is selected and list is empty // Load pharmacy invoices when pharmacy tab is selected and list is empty
// myInvoicesVM.getAllPharmacyInvoices(); myInvoicesVM.getAllPharmacyInvoices();
// } }
// }, },
// ).paddingSymmetrical(24.h, 0.h), ).paddingSymmetrical(24.h, 0.h),
myInvoicesVM.selectedTabIndex == 0 ? Column( myInvoicesVM.selectedTabIndex == 0 ? Column(
children: [ children: [
SizedBox(height: 16.h), SizedBox(height: 16.h),

4
pubspec.yaml
Unescape Escape View File

@ -2,8 +2,8 @@ name: hmg_patient_app_new
description: "New HMG Patient App" description: "New HMG Patient App"
publish_to: 'none' # Remove this line if you wish to publish to pub.dev publish_to: 'none' # Remove this line if you wish to publish to pub.dev
#version: 0.0.30+29 #version: 0.0.32+31
version: 0.0.4+1 version: 0.0.5+2
environment: environment:
sdk: ">=3.6.0 <4.0.0" sdk: ">=3.6.0 <4.0.0"

Write Preview
Loading…
Cancel
Save