diff --git a/lib/features/MainScreens/Academy/presentation/widgets/academy_card.dart b/lib/features/MainScreens/Academy/presentation/widgets/academy_card.dart index a348bcf..0fc68c3 100644 --- a/lib/features/MainScreens/Academy/presentation/widgets/academy_card.dart +++ b/lib/features/MainScreens/Academy/presentation/widgets/academy_card.dart @@ -88,36 +88,39 @@ Widget academyCard(dynamic data) { ], ), ), - Padding( - padding: - const EdgeInsets.symmetric(vertical: 20.0, horizontal: 16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - TextWidget().text13W500( - data['date'], - clr: AppColor.academyCardTextColor, - ), - Gap( - 4.h, - ), - TextWidget().text17W600( - data['title'], - clr: AppColor.plainBlack, - ), - Gap( - 12.h, - ), - SizedBox( - width: 158.w, - child: TextWidget().text14W400( - data['desc'], - maxLine: 2, - txtAlign: TextAlign.start, + Expanded( + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 20.0, horizontal: 16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + TextWidget().text13W500( + data['date'], clr: AppColor.academyCardTextColor, ), - ), - ], + Gap( + 4.h, + ), + TextWidget().text17W600( + data['title'], + clr: AppColor.plainBlack, + ), + Gap( + 12.h, + ), + Expanded( + // width: 158.w, + child: TextWidget().text14W400( + data['desc'], + maxLine: 2, + txtOverflow: TextOverflow.fade, + txtAlign: TextAlign.start, + clr: AppColor.academyCardTextColor, + ), + ), + ], + ), ), ) ], diff --git a/lib/features/MainScreens/Invest/presentation/widgets/invest_image_carousel.dart b/lib/features/MainScreens/Invest/presentation/widgets/invest_image_carousel.dart index 9dc9373..5d42bda 100644 --- a/lib/features/MainScreens/Invest/presentation/widgets/invest_image_carousel.dart +++ b/lib/features/MainScreens/Invest/presentation/widgets/invest_image_carousel.dart @@ -25,7 +25,7 @@ class InvestCarouselView extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - height: 214.h, + height: 220.h, padding: const EdgeInsets.symmetric( horizontal: 15, vertical: 15, diff --git a/lib/features/MainScreens/Invest/presentation/widgets/invest_included_documents_section.dart b/lib/features/MainScreens/Invest/presentation/widgets/invest_included_documents_section.dart index 32b8578..2866166 100644 --- a/lib/features/MainScreens/Invest/presentation/widgets/invest_included_documents_section.dart +++ b/lib/features/MainScreens/Invest/presentation/widgets/invest_included_documents_section.dart @@ -71,22 +71,24 @@ class InvestIncludedDocumentsSection extends StatelessWidget { ], ), Gap( - 26.h, + 20.h, ), - Row( - crossAxisAlignment: CrossAxisAlignment.end, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - TextWidget().text12W700("512 Mb", - clr: AppColor.portoflioCardTextColor), - Gap( - 7.w, - ), - Image.asset( - AppImages.donwloadIcon, - height: 20.sp, - ), - ], + Expanded( + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + TextWidget().text12W700("512 Mb", + clr: AppColor.portoflioCardTextColor), + Gap( + 7.w, + ), + Image.asset( + AppImages.donwloadIcon, + height: 20.sp, + ), + ], + ), ), ], ), diff --git a/lib/features/MainScreens/Portfolio/presentation/widgets/included_documents_section.dart b/lib/features/MainScreens/Portfolio/presentation/widgets/included_documents_section.dart index 9d4c999..5f5de8f 100644 --- a/lib/features/MainScreens/Portfolio/presentation/widgets/included_documents_section.dart +++ b/lib/features/MainScreens/Portfolio/presentation/widgets/included_documents_section.dart @@ -54,7 +54,7 @@ class IncludedDocumentsSection extends StatelessWidget { color: AppColor.documentCardBgColor, borderRadius: BorderRadius.all(Radius.circular(10.0)), ), - padding: const EdgeInsets.all(20.0), + padding: const EdgeInsets.all(15.0), child: Column( children: [ Row( @@ -71,22 +71,24 @@ class IncludedDocumentsSection extends StatelessWidget { ], ), Gap( - 12.h, + 20.h, ), - Row( - crossAxisAlignment: CrossAxisAlignment.end, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - TextWidget().text12W700("512 Mb", - clr: AppColor.portoflioCardTextColor), - Gap( - 7.w, - ), - Image.asset( - AppImages.donwloadIcon, - height: 20.sp, - ), - ], + Expanded( + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + TextWidget().text12W700("512 Mb", + clr: AppColor.portoflioCardTextColor), + Gap( + 7.w, + ), + Image.asset( + AppImages.donwloadIcon, + height: 20.sp, + ), + ], + ), ), ], ), diff --git a/lib/features/MainScreens/Wallet/presentation/pages/wallet_details_screen.dart b/lib/features/MainScreens/Wallet/presentation/pages/wallet_details_screen.dart index 830c673..cd15586 100644 --- a/lib/features/MainScreens/Wallet/presentation/pages/wallet_details_screen.dart +++ b/lib/features/MainScreens/Wallet/presentation/pages/wallet_details_screen.dart @@ -112,7 +112,7 @@ class WalletDetailsScreen extends StatelessWidget { ], ), child: TicketWidget( - height: 360.sh, + height: 335.h, isCornerRounded: true, width: double.infinity, color: AppColor.plainWhite, @@ -122,6 +122,7 @@ class WalletDetailsScreen extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ Column( + mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.center, children: [ getIcon(type), diff --git a/lib/features/deleteAccount/presentation/widgets/form_section.dart b/lib/features/deleteAccount/presentation/widgets/form_section.dart index 6f0cf41..6e4d666 100644 --- a/lib/features/deleteAccount/presentation/widgets/form_section.dart +++ b/lib/features/deleteAccount/presentation/widgets/form_section.dart @@ -73,7 +73,7 @@ class FormSection extends StatelessWidget { children: [ SizedBox( width: 1.sw, - height: 70.h, + height: 85.h, ), const CheckBoxWidget(), Positioned(