Merge branch 'new_design_sikander' into development_new_design_2.0

# Conflicts:
#	lib/pages/medical/prescriptions/prescriptions_history_details_page.dart

lib/pages/medical/prescriptions/prescriptions_history_details_page.dart

@@ -52,7 +52,7 @@ class PrescriptionsHistoryDetailsPage extends StatelessWidget {
               Expanded(
                 child: ListView(
                   physics: BouncingScrollPhysics(),
-                  padding: EdgeInsets.all(25),
+                  padding: EdgeInsets.all(21),
                   children: <Widget>[
                     Container(
                       decoration: BoxDecoration(
@@ -69,16 +69,16 @@ class PrescriptionsHistoryDetailsPage extends StatelessWidget {
                         ],
                       ),
                       child: Container(
-                        margin: EdgeInsets.only(left: 6),
+                        margin: EdgeInsets.only(left: projectViewModel.isArabic ? 0 : 6, right: projectViewModel.isArabic ? 6 : 0),
                         padding: EdgeInsets.symmetric(vertical: 14, horizontal: 12),
                         decoration: BoxDecoration(
                           color: Colors.white,
                           border: Border.all(color: Colors.white, width: 1),
                           borderRadius: BorderRadius.only(
-                            topLeft:projectViewModel.isArabic? Radius.circular(0.0):Radius.circular(10.0),
-                            bottomLeft:projectViewModel.isArabic? Radius.circular(0.0):Radius.circular(10.0),
-                            topRight:projectViewModel.isArabic? Radius.circular(10.0):Radius.circular(0.0),
-                            bottomRight:projectViewModel.isArabic? Radius.circular(10.0):Radius.circular(0.0),
+                            bottomRight: projectViewModel.isArabic ? Radius.circular(0) : Radius.circular(10.0),
+                            topRight: projectViewModel.isArabic ? Radius.circular(0) : Radius.circular(10.0),
+                            bottomLeft: projectViewModel.isArabic ? Radius.circular(10.0) : Radius.circular(0),
+                            topLeft: projectViewModel.isArabic ? Radius.circular(10.0) : Radius.circular(0),
                           ),
                         ),
                         child: Column(
@@ -164,7 +164,7 @@ class PrescriptionsHistoryDetailsPage extends StatelessWidget {
                 ),
               ),
               Container(
-                color: Theme.of(context).scaffoldBackgroundColor,
+                color: Colors.white,
                 padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21),
                 child: DefaultButton(
                   TranslationBase.of(context).cancelOrder,