Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'

Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!82

lib/pages/BookAppointment/BookSuccess.dart

@@ -230,9 +230,10 @@ class _BookSuccessState extends State<BookSuccess> {
                   children: <Widget>[
                     _getBulletPoint("1"),
                     Container(
+                      width: MediaQuery.of(context).size.width * 0.8,
                       child: Text(
                           "Please confirm the appointment to avoid the cancellation",
-                          overflow: TextOverflow.fade,
+                          overflow: TextOverflow.clip,
                           style: TextStyle(fontSize: 13.0)),
                     ),
                   ],
@@ -314,7 +315,7 @@ class _BookSuccessState extends State<BookSuccess> {
                 minWidth: MediaQuery.of(context).size.width * 0.7,
                 height: 45.0,
                 child: RaisedButton(
-                  color: new Color(0xFFc5272d),
+                  color: new Color(0xFF40ACC9),
                   textColor: Colors.white,
                   disabledTextColor: Colors.white,
                   disabledColor: new Color(0xFFbcc2c4),
@@ -483,7 +484,7 @@ class _BookSuccessState extends State<BookSuccess> {
                 minWidth: MediaQuery.of(context).size.width * 0.7,
                 height: 45.0,
                 child: RaisedButton(
-                  color: new Color(0xFFc5272d),
+                  color: new Color(0xFF40ACC9),
                   textColor: Colors.white,
                   disabledTextColor: Colors.white,
                   disabledColor: new Color(0xFFbcc2c4),

lib/pages/BookAppointment/components/SearchByClinic.dart

@@ -47,7 +47,7 @@ class _SearchByClinicState extends State<SearchByClinic> {
           Row(
             children: <Widget>[
               Checkbox(
-                activeColor: new Color(0xFFc5272d),
+                activeColor: new Color(0xFF40ACC9),
                 value: nearestAppo,
                 onChanged: (bool value) {
                   setState(() {

lib/pages/BookAppointment/widgets/BranchView.dart

@@ -109,7 +109,7 @@ class _ExpandableListViewState extends State<ExpandableListView> {
                           height: 28.0,
                           width: 30.0,
                           decoration: new BoxDecoration(
-                            color: Colors.red,
+                            color: Color(0xFF40ACC9),
                             shape: BoxShape.circle,
                           ),
                           child: new Center(

lib/pages/MyAppointments/widgets/AppointmentActions.dart

@@ -94,7 +94,7 @@ class _AppointmentActionsState extends State<AppointmentActions> {
                                 child: Text(e.title,
                                     overflow: TextOverflow.clip,
                                     style: TextStyle(
-                                        color: new Color(0xFFc5272d),
+                                        color: new Color(0xFF40ACC9),
                                         letterSpacing: 1.0,
                                         fontSize: 20.0)),
                               ),

lib/pages/ToDoList/ToDo.dart

@@ -253,7 +253,7 @@ class _ToDoState extends State<ToDo> {
                                           textAlign: TextAlign.end,
                                           style: TextStyle(
                                               fontSize: 12.0,
-                                              color: Colors.red[600],
+                                              color: new Color(0xFF40ACC9),
                                               decoration:
                                                   TextDecoration.underline)),
                                     ),

lib/pages/ToDoList/widgets/upcomingCard.dart

@@ -191,7 +191,7 @@ class _TodoListCardState extends State<TodoListCard> {
                             textAlign: TextAlign.end,
                             style: TextStyle(
                                 fontSize: 12.0,
-                                color: Colors.red[600],
+                                color: new Color(0xFF40ACC9),
                                 decoration: TextDecoration.underline)),
                       ),
                     ),

lib/widgets/others/app_expandable_notifier.dart

@@ -71,7 +71,7 @@ class _AppExpandableNotifier extends State<AppExpandableNotifier> {
                               height: 28.0,
                               width: 30.0,
                               decoration: new BoxDecoration(
-                                color: Colors.red,
+                                color: Color(0xFF40ACC9),
                                 shape: BoxShape.circle,
                               ),
                               child: new Center(