Merge branch 'roaa_schedule_design' into 'development'

Roaa schedule design

See merge request Cloud_Solution/doctor_app_flutter!959

lib/config/config.dart

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

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

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,36 +35,45 @@ 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,
-                  fontFamily: 'Poppins',
-                  // fontSize: 18
+                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: AppGlobal.scheduleTextColor,
+                  ),
                 ),
-                AppText(
-                  ' ${workingHoursTable.date.day} ${(AppDateUtils.getMonth(workingHoursTable.date.month).toString().substring(0, 3))}',
-                  fontSize: MediaQuery.of(context).size.width*0.05,
-                  fontWeight: FontWeight.w700,
-                  fontFamily: 'Poppins',
-                  // fontSize: 18
+                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: AppGlobal.scheduleTextColor,
+                  ),
                 ),
               ],
             ),
           ),
           Container(
-            width: MediaQuery.of(context).size.width * 0.65,
-            // width: SizeConfig.getWidthMultiplier()*64,
-            // height: SizeConfig.getHeightMultiplier()*18,
+            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)
                   ? AppGlobal.appGreenColor
                   : Colors.transparent,
-              // hasBorder: false,
               widget: Container(
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
@@ -73,14 +81,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
                       ),
-                    SizedBox(
-                      height: 4,
-                    ),
                     Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: workingHours.map((work) {
@@ -101,25 +105,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: AppGlobal.scheduleTextColor,
+                                  ),
                                 ),
                                 // 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: AppGlobal.scheduleTextColor,
                                 ),
                             ],
                           ),