Merge branch 'roaa_schedule_design' into 'development'

Roaa schedule design

See merge request Cloud_Solution/doctor_app_flutter!959
merge-requests/960/merge
Elham Ali 4 years ago
commit 8f1d4f80bd

@ -470,4 +470,6 @@ class AppGlobal {
static Color appRedColor = Color(0xFFD02127); static Color appRedColor = Color(0xFFD02127);
static Color appGreenColor = Color(0xFF359846); static Color appGreenColor = Color(0xFF359846);
static Color appTextColor = Color(0xFF2B353E); static Color appTextColor = Color(0xFF2B353E);
static Color scheduleTextColor = Color(0xFF2E303A);
} }

@ -22,7 +22,7 @@ class MyScheduleScreen extends StatelessWidget {
) )
: Container( : Container(
color: HexColor("#EFEFEF"), color: HexColor("#EFEFEF"),
padding: EdgeInsetsDirectional.fromSTEB(21, 0, 21, 0), padding: EdgeInsetsDirectional.fromSTEB(0, 0, 21, 0),
child: ListView( child: ListView(
children: <Widget>[ children: <Widget>[
Column( Column(

@ -25,7 +25,6 @@ class MyScheduleWidget extends StatelessWidget {
return Container( return Container(
color: HexColor("#EFEFEF"), color: HexColor("#EFEFEF"),
child: Row( child: Row(
//mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Expanded( Expanded(
@ -36,36 +35,45 @@ class MyScheduleWidget extends StatelessWidget {
SizedBox( SizedBox(
height: 10, height: 10,
), ),
AppText( Padding(
padding: const EdgeInsets.only(left: 21),
child: AppText(
projectViewModel.isArabic projectViewModel.isArabic
? AppDateUtils.getWeekDayArabic( ? AppDateUtils.getWeekDayArabic(
workingHoursTable.date.weekday) workingHoursTable.date.weekday)
: AppDateUtils.getWeekDay(workingHoursTable.date.weekday), : AppDateUtils.getWeekDay(workingHoursTable.date.weekday),
fontSize: MediaQuery.of(context).size.width*0.032, fontSize: MediaQuery.of(context).size.width*0.032,
fontFamily: 'Poppins', fontFamily: 'Poppins',
// fontSize: 18 fontWeight: FontWeight.w700,
letterSpacing: -0.52,
color: AppGlobal.scheduleTextColor,
), ),
AppText( ),
Padding(
padding: const EdgeInsets.only(left: 19),
child: AppText(
' ${workingHoursTable.date.day} ${(AppDateUtils.getMonth(workingHoursTable.date.month).toString().substring(0, 3))}', ' ${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.051,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontFamily: 'Poppins', fontFamily: 'Poppins',
// fontSize: 18 letterSpacing: -0.72,
color: AppGlobal.scheduleTextColor,
),
), ),
], ],
), ),
), ),
Container( Container(
width: MediaQuery.of(context).size.width * 0.65, width: MediaQuery.of(context).size.width * 0.70,
// width: SizeConfig.getWidthMultiplier()*64, height: MediaQuery.of(context).size.height * 0.18,
// height: SizeConfig.getHeightMultiplier()*18,
child: CardWithBgWidget( child: CardWithBgWidget(
padding: 12,
marginLeft: 8,
marginSymmetric: 7, marginSymmetric: 7,
hasBorder: false, hasBorder: false,
bgColor: AppDateUtils.isToday(workingHoursTable.date) bgColor: AppDateUtils.isToday(workingHoursTable.date)
? AppGlobal.appGreenColor ? AppGlobal.appGreenColor
: Colors.transparent, : Colors.transparent,
// hasBorder: false,
widget: Container( widget: Container(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -73,13 +81,9 @@ class MyScheduleWidget extends StatelessWidget {
if (AppDateUtils.isToday(workingHoursTable.date)) if (AppDateUtils.isToday(workingHoursTable.date))
AppText( AppText(
"Today", "Today",
fontSize: 1.8 * SizeConfig.textMultiplier, fontSize: 1.5 * SizeConfig.textMultiplier,
fontFamily: 'Poppins', fontFamily: 'Poppins',
color: AppGlobal.appGreenColor, color: AppGlobal.appGreenColor,
// fontSize: 18
),
SizedBox(
height: 4,
), ),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -101,25 +105,30 @@ class MyScheduleWidget extends StatelessWidget {
.convertToTitleCase( .convertToTitleCase(
workingHoursTable.clinicName ?? ""), workingHoursTable.clinicName ?? ""),
fontSize: MediaQuery.of(context).size.width*0.04, fontSize: MediaQuery.of(context).size.width*0.04,
fontWeight: FontWeight.w700,), fontWeight: FontWeight.w700,
letterSpacing: -0.64,
color: AppGlobal.scheduleTextColor,
),
), ),
// AppText( // AppText(
// workingHoursTable.clinicName ?? "",
// fontSize: 15,
// fontWeight: FontWeight.w700,
// ),
Container( Container(
child: AppText( child: AppText(
'${work.from} - ${work.to}', '${work.from} - ${work.to}',
fontSize: MediaQuery.of(context).size.width*0.03, fontSize: MediaQuery.of(context).size.width*0.03,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
letterSpacing: -0.4,
),
), ),
SizedBox(
height: 12,
), ),
if (workingHoursTable.projectName != null) if (workingHoursTable.projectName != null)
AppText( AppText(
workingHoursTable.projectName ?? "", workingHoursTable.projectName ?? "",
fontSize: MediaQuery.of(context).size.width*0.04, fontSize: MediaQuery.of(context).size.width*0.04,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
letterSpacing: -0.64,
color: AppGlobal.scheduleTextColor,
), ),
], ],
), ),

Loading…
Cancel
Save