Edit the my_schedule_screen design

merge-requests/959/head
RoaaGhali98 4 years ago
parent 9f77d080c0
commit b1a65425c5

@ -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: <Widget>[
Column(

@ -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'),
),
],
),

@ -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

Loading…
Cancel
Save