ui improvements

pull/174/head
Sikander Saleem 2 months ago
parent 9c7cfde5f4
commit b9350afead

@ -148,20 +148,18 @@ class FeedbackPage extends StatelessWidget {
), ),
child: Padding( child: Padding(
padding: EdgeInsets.all(16.h), padding: EdgeInsets.all(16.h),
child: Column( child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
crossAxisAlignment: CrossAxisAlignment.start, Row(
children: [ mainAxisAlignment: MainAxisAlignment.spaceBetween,
Row( children: [
mainAxisAlignment: MainAxisAlignment.spaceBetween, Row(
children: [ children: [
Row( Utils.buildSvgWithAssets(icon: AppAssets.ask_doctor_icon, width: 24.w, height: 24.h, iconColor: AppColors.greyTextColor),
children: [ SizedBox(width: 12.w),
Utils.buildSvgWithAssets(icon: AppAssets.ask_doctor_icon, width: 24.w, height: 24.h, iconColor: AppColors.greyTextColor), Column(
SizedBox(width: 12.w), crossAxisAlignment: CrossAxisAlignment.start,
Column( children: [
crossAxisAlignment: CrossAxisAlignment.start, LocaleKeys.feedbackType.tr().toText16(color: AppColors.textColor, weight: FontWeight.w500),
children: [
LocaleKeys.feedbackType.tr().toText16(color: AppColors.textColor, weight: FontWeight.w500),
(getIt.get<AppState>().isArabic() ? contactUsViewModel.selectedFeedbackType.nameAR : contactUsViewModel.selectedFeedbackType.nameEN) (getIt.get<AppState>().isArabic() ? contactUsViewModel.selectedFeedbackType.nameAR : contactUsViewModel.selectedFeedbackType.nameEN)
.toText14(color: AppColors.greyTextColor, weight: FontWeight.w500), .toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
], ],

@ -555,6 +555,7 @@ class _LandingPageState extends State<LandingPage> {
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
itemCount: LandingPageData.getLoggedInServiceCardsList.length, itemCount: LandingPageData.getLoggedInServiceCardsList.length,
shrinkWrap: true, shrinkWrap: true,
controller: _horizontalScrollController,
padding: EdgeInsets.only(left: 16.h, right: 16.h, top: 16.h, bottom: 12.h), padding: EdgeInsets.only(left: 16.h, right: 16.h, top: 16.h, bottom: 12.h),
itemBuilder: (context, index) { itemBuilder: (context, index) {
return AnimationConfiguration.staggeredList( return AnimationConfiguration.staggeredList(
@ -608,6 +609,7 @@ class _LandingPageState extends State<LandingPage> {
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
itemCount: LandingPageData.getNotLoggedInServiceCardsList.length, itemCount: LandingPageData.getNotLoggedInServiceCardsList.length,
shrinkWrap: true, shrinkWrap: true,
controller: _horizontalScrollController,
padding: EdgeInsets.only(left: 16.h, right: 16.h, top: 16.h, bottom: 12.h), padding: EdgeInsets.only(left: 16.h, right: 16.h, top: 16.h, bottom: 12.h),
// padding: EdgeInsets.zero, // padding: EdgeInsets.zero,
itemBuilder: (context, index) { itemBuilder: (context, index) {

@ -55,6 +55,7 @@ class LargeServiceCard extends StatelessWidget {
right: 0.0, right: 0.0,
child: Container( child: Container(
height: 180.h, height: 180.h,
padding: EdgeInsets.only(bottom: 16.h, top: 16.h),
decoration: RoundedRectangleBorder().toSmoothCornerDecoration( decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: AppColors.whiteColor, color: AppColors.whiteColor,
customBorder: BorderRadius.only( customBorder: BorderRadius.only(
@ -69,7 +70,7 @@ class LargeServiceCard extends StatelessWidget {
children: [ children: [
Container( Container(
height: 48.h, height: 48.h,
width: 48.w, width: 48.h,
decoration: RoundedRectangleBorder().toSmoothCornerDecoration( decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: serviceCardData.backgroundColor, color: serviceCardData.backgroundColor,
borderRadius: 12.r, borderRadius: 12.r,
@ -95,7 +96,7 @@ class LargeServiceCard extends StatelessWidget {
), ),
), ),
], ],
).paddingSymmetrical(12.w, 24.h), ).paddingSymmetrical(16.w, 0.h).expanded,
CustomButton( CustomButton(
text: serviceCardData.isBold ? LocaleKeys.visitPharmacyOnline.tr(context: context) : LocaleKeys.bookNow.tr(context: context), text: serviceCardData.isBold ? LocaleKeys.visitPharmacyOnline.tr(context: context) : LocaleKeys.bookNow.tr(context: context),
onPressed: () { onPressed: () {
@ -206,7 +207,7 @@ class FadedLargeServiceCard extends StatelessWidget {
children: [ children: [
Container( Container(
height: 32.h, height: 32.h,
width: 32.w, width: 32.h,
decoration: RoundedRectangleBorder().toSmoothCornerDecoration( decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: serviceCardData.backgroundColor, color: serviceCardData.backgroundColor,
borderRadius: 30.r, borderRadius: 30.r,

@ -53,8 +53,8 @@ class SmallServiceCard extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
height: 92.h, height: 92.h,
width: 92.w, width: 92.h,
padding: EdgeInsets.all(6.0), padding: EdgeInsets.all(4.0),
decoration: RoundedRectangleBorder().toSmoothCornerDecoration( decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: backgroundColor, color: backgroundColor,
borderRadius: 16, borderRadius: 16,
@ -64,8 +64,13 @@ class SmallServiceCard extends StatelessWidget {
children: [ children: [
Utils.buildSvgWithAssets(icon: icon, iconColor: iconColor, width: 32.h, height: 32.h), Utils.buildSvgWithAssets(icon: icon, iconColor: iconColor, width: 32.h, height: 32.h),
SizedBox(height: 6.h), SizedBox(height: 6.h),
title.tr(context: context).toText12(color: textColor, fontWeight: FontWeight.w500, isCenter: true), if (isFoldable || isTablet) ...[
subtitle.tr(context: context).toText12(color: textColor, fontWeight: FontWeight.w500, isCenter: true), title.tr(context: context).toText11(color: textColor, weight: FontWeight.w500, isCenter: true, letterSpacing: -0.2),
subtitle.tr(context: context).toText11(color: textColor, weight: FontWeight.w500, isCenter: true, letterSpacing: -0.2),
] else ...[
title.tr(context: context).toText12(color: textColor, fontWeight: FontWeight.w500, isCenter: true, letterSpacing: -0.2),
subtitle.tr(context: context).toText12(color: textColor, fontWeight: FontWeight.w500, isCenter: true, letterSpacing: -0.2),
]
], ],
), ),
).onPress(() { ).onPress(() {

@ -125,7 +125,7 @@ class TextInputWidget extends StatelessWidget {
children: [ children: [
Container( Container(
padding: padding, padding: padding,
height: isMultiline ? null : 64.h, // height: isMultiline ? null : 64.h,
alignment: Alignment.center, alignment: Alignment.center,
decoration: RoundedRectangleBorder().toSmoothCornerDecoration( decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: Colors.white, color: Colors.white,

Loading…
Cancel
Save