From 9f77d080c06c9abb75e8b98e3745be415a5206a0 Mon Sep 17 00:00:00 2001 From: RoaaGhali98 Date: Tue, 18 Jan 2022 13:06:41 +0200 Subject: [PATCH 1/3] Editing the schedule page --- lib/widgets/doctor/my_schedule_widget.dart | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/widgets/doctor/my_schedule_widget.dart b/lib/widgets/doctor/my_schedule_widget.dart index 7b9100a6..2842cff5 100644 --- a/lib/widgets/doctor/my_schedule_widget.dart +++ b/lib/widgets/doctor/my_schedule_widget.dart @@ -41,24 +41,28 @@ class MyScheduleWidget extends StatelessWidget { ? AppDateUtils.getWeekDayArabic( workingHoursTable.date.weekday) : AppDateUtils.getWeekDay(workingHoursTable.date.weekday), - fontSize: MediaQuery.of(context).size.width*0.032, + //fontSize: MediaQuery.of(context).size.width*0.032, + fontSize: 13, fontFamily: 'Poppins', - // fontSize: 18 + fontWeight: FontWeight.w700, + letterSpacing: -0.52, ), AppText( ' ${workingHoursTable.date.day} ${(AppDateUtils.getMonth(workingHoursTable.date.month).toString().substring(0, 3))}', - fontSize: MediaQuery.of(context).size.width*0.05, + //fontSize: MediaQuery.of(context).size.width*0.05, + fontSize: 18, fontWeight: FontWeight.w700, fontFamily: 'Poppins', - // fontSize: 18 + letterSpacing: -0.72, ), ], ), ), Container( - width: MediaQuery.of(context).size.width * 0.65, - // width: SizeConfig.getWidthMultiplier()*64, - // height: SizeConfig.getHeightMultiplier()*18, + //width: MediaQuery.of(context).size.width * 0.65, + width: 257, + height: 108, + //height: MediaQuery.of(context).size.height * 0.20, child: CardWithBgWidget( marginSymmetric: 7, hasBorder: false, @@ -77,10 +81,7 @@ class MyScheduleWidget extends StatelessWidget { fontFamily: 'Poppins', color: AppGlobal.appGreenColor, // fontSize: 18 - ), - SizedBox( - height: 4, - ), + ), Column( crossAxisAlignment: CrossAxisAlignment.start, children: workingHours.map((work) { From b1a65425c53ba4e742fb98b6683140b286f16633 Mon Sep 17 00:00:00 2001 From: RoaaGhali98 Date: Wed, 19 Jan 2022 16:38:36 +0200 Subject: [PATCH 2/3] Edit the my_schedule_screen design --- lib/screens/doctor/my_schedule_screen.dart | 2 +- lib/widgets/doctor/my_schedule_widget.dart | 68 +++++++++++---------- lib/widgets/shared/card_with_bg_widget.dart | 4 +- 3 files changed, 40 insertions(+), 34 deletions(-) diff --git a/lib/screens/doctor/my_schedule_screen.dart b/lib/screens/doctor/my_schedule_screen.dart index 02c95a2b..de61ec98 100644 --- a/lib/screens/doctor/my_schedule_screen.dart +++ b/lib/screens/doctor/my_schedule_screen.dart @@ -22,7 +22,7 @@ class MyScheduleScreen extends StatelessWidget { ) : Container( color: HexColor("#EFEFEF"), - padding: EdgeInsetsDirectional.fromSTEB(21, 0, 21, 0), + padding: EdgeInsetsDirectional.fromSTEB(0, 0, 21, 0), child: ListView( children: [ Column( diff --git a/lib/widgets/doctor/my_schedule_widget.dart b/lib/widgets/doctor/my_schedule_widget.dart index 2842cff5..9cd22e94 100644 --- a/lib/widgets/doctor/my_schedule_widget.dart +++ b/lib/widgets/doctor/my_schedule_widget.dart @@ -25,7 +25,6 @@ class MyScheduleWidget extends StatelessWidget { return Container( color: HexColor("#EFEFEF"), child: Row( - //mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start, children: [ Expanded( @@ -36,40 +35,43 @@ class MyScheduleWidget extends StatelessWidget { SizedBox( height: 10, ), - AppText( - projectViewModel.isArabic - ? AppDateUtils.getWeekDayArabic( - workingHoursTable.date.weekday) - : AppDateUtils.getWeekDay(workingHoursTable.date.weekday), - //fontSize: MediaQuery.of(context).size.width*0.032, - fontSize: 13, - fontFamily: 'Poppins', - fontWeight: FontWeight.w700, - letterSpacing: -0.52, + Padding( + padding: const EdgeInsets.only(left: 21), + child: AppText( + projectViewModel.isArabic + ? AppDateUtils.getWeekDayArabic( + workingHoursTable.date.weekday) + : AppDateUtils.getWeekDay(workingHoursTable.date.weekday), + fontSize: MediaQuery.of(context).size.width*0.032, + fontFamily: 'Poppins', + fontWeight: FontWeight.w700, + letterSpacing: -0.52, + color: HexColor('#2E303A'), + ), ), - AppText( - ' ${workingHoursTable.date.day} ${(AppDateUtils.getMonth(workingHoursTable.date.month).toString().substring(0, 3))}', - //fontSize: MediaQuery.of(context).size.width*0.05, - fontSize: 18, - fontWeight: FontWeight.w700, - fontFamily: 'Poppins', - letterSpacing: -0.72, + Padding( + padding: const EdgeInsets.only(left: 19), + child: AppText( + ' ${workingHoursTable.date.day} ${(AppDateUtils.getMonth(workingHoursTable.date.month).toString().substring(0, 3))}', + fontSize: MediaQuery.of(context).size.width*0.051, + fontWeight: FontWeight.w700, + fontFamily: 'Poppins', + letterSpacing: -0.72, + color: HexColor('#2E303A'), + ), ), ], ), ), Container( - //width: MediaQuery.of(context).size.width * 0.65, - width: 257, - height: 108, - //height: MediaQuery.of(context).size.height * 0.20, + width: MediaQuery.of(context).size.width * 0.70, + height: MediaQuery.of(context).size.height * 0.18, child: CardWithBgWidget( marginSymmetric: 7, hasBorder: false, bgColor: AppDateUtils.isToday(workingHoursTable.date) ? AppGlobal.appGreenColor : Colors.transparent, - // hasBorder: false, widget: Container( child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -77,11 +79,10 @@ class MyScheduleWidget extends StatelessWidget { if (AppDateUtils.isToday(workingHoursTable.date)) AppText( "Today", - fontSize: 1.8 * SizeConfig.textMultiplier, + fontSize: 1.5 * SizeConfig.textMultiplier, fontFamily: 'Poppins', color: AppGlobal.appGreenColor, - // fontSize: 18 - ), + ), Column( crossAxisAlignment: CrossAxisAlignment.start, children: workingHours.map((work) { @@ -102,25 +103,30 @@ class MyScheduleWidget extends StatelessWidget { .convertToTitleCase( workingHoursTable.clinicName ?? ""), fontSize: MediaQuery.of(context).size.width*0.04, - fontWeight: FontWeight.w700,), + fontWeight: FontWeight.w700, + letterSpacing: -0.64, + color: HexColor('#2E303A'), + ), ), // AppText( - // workingHoursTable.clinicName ?? "", - // fontSize: 15, - // fontWeight: FontWeight.w700, - // ), Container( child: AppText( '${work.from} - ${work.to}', fontSize: MediaQuery.of(context).size.width*0.03, fontWeight: FontWeight.w300, + letterSpacing: -0.4, ), ), + SizedBox( + height: 12, + ), if (workingHoursTable.projectName != null) AppText( workingHoursTable.projectName ?? "", fontSize: MediaQuery.of(context).size.width*0.04, fontWeight: FontWeight.w700, + letterSpacing: -0.64, + color: HexColor('#2E303A'), ), ], ), diff --git a/lib/widgets/shared/card_with_bg_widget.dart b/lib/widgets/shared/card_with_bg_widget.dart index 9f45c187..a7547ff5 100644 --- a/lib/widgets/shared/card_with_bg_widget.dart +++ b/lib/widgets/shared/card_with_bg_widget.dart @@ -15,8 +15,8 @@ class CardWithBgWidget extends StatelessWidget { {@required this.widget, this.bgColor, this.hasBorder = true, - this.padding = 15.0, - this.marginLeft = 10.0, + this.padding = 10.0, + this.marginLeft = 12.0, this.marginSymmetric = 10.0}); @override From 47a077bd520532020fbdf06883be71b49623132c Mon Sep 17 00:00:00 2001 From: RoaaGhali98 Date: Thu, 20 Jan 2022 11:47:57 +0200 Subject: [PATCH 3/3] Edit some issues in the my_schedule_screen --- lib/config/config.dart | 2 ++ lib/widgets/doctor/my_schedule_widget.dart | 10 ++++++---- lib/widgets/shared/card_with_bg_widget.dart | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 2301eab0..9490ceb2 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -458,4 +458,6 @@ class AppGlobal { static Color appRedColor = Color(0xFFD02127); static Color appGreenColor = Color(0xFF359846); static Color appTextColor = Color(0xFF2B353E); + static Color scheduleTextColor = Color(0xFF2E303A); + } diff --git a/lib/widgets/doctor/my_schedule_widget.dart b/lib/widgets/doctor/my_schedule_widget.dart index 9cd22e94..fe129c31 100644 --- a/lib/widgets/doctor/my_schedule_widget.dart +++ b/lib/widgets/doctor/my_schedule_widget.dart @@ -46,7 +46,7 @@ class MyScheduleWidget extends StatelessWidget { fontFamily: 'Poppins', fontWeight: FontWeight.w700, letterSpacing: -0.52, - color: HexColor('#2E303A'), + color: AppGlobal.scheduleTextColor, ), ), Padding( @@ -57,7 +57,7 @@ class MyScheduleWidget extends StatelessWidget { fontWeight: FontWeight.w700, fontFamily: 'Poppins', letterSpacing: -0.72, - color: HexColor('#2E303A'), + color: AppGlobal.scheduleTextColor, ), ), ], @@ -67,6 +67,8 @@ class MyScheduleWidget extends StatelessWidget { width: MediaQuery.of(context).size.width * 0.70, height: MediaQuery.of(context).size.height * 0.18, child: CardWithBgWidget( + padding: 12, + marginLeft: 8, marginSymmetric: 7, hasBorder: false, bgColor: AppDateUtils.isToday(workingHoursTable.date) @@ -105,7 +107,7 @@ class MyScheduleWidget extends StatelessWidget { fontSize: MediaQuery.of(context).size.width*0.04, fontWeight: FontWeight.w700, letterSpacing: -0.64, - color: HexColor('#2E303A'), + color: AppGlobal.scheduleTextColor, ), ), // AppText( @@ -126,7 +128,7 @@ class MyScheduleWidget extends StatelessWidget { fontSize: MediaQuery.of(context).size.width*0.04, fontWeight: FontWeight.w700, letterSpacing: -0.64, - color: HexColor('#2E303A'), + color: AppGlobal.scheduleTextColor, ), ], ), diff --git a/lib/widgets/shared/card_with_bg_widget.dart b/lib/widgets/shared/card_with_bg_widget.dart index a7547ff5..9f45c187 100644 --- a/lib/widgets/shared/card_with_bg_widget.dart +++ b/lib/widgets/shared/card_with_bg_widget.dart @@ -15,8 +15,8 @@ class CardWithBgWidget extends StatelessWidget { {@required this.widget, this.bgColor, this.hasBorder = true, - this.padding = 10.0, - this.marginLeft = 12.0, + this.padding = 15.0, + this.marginLeft = 10.0, this.marginSymmetric = 10.0}); @override