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

Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!81

lib/main.dart

@@ -81,8 +81,8 @@ class MyApp extends StatelessWidget {
                     iconTheme: IconThemeData(),
                     appBarTheme: AppBarTheme(
                       color: Colors.grey[700],
-                      brightness: Brightness.light,
+                      brightness: Brightness.dark,
-                      elevation: 0.0,
+                      elevation: 10.0,
                       actionsIconTheme: IconThemeData(
                         color: Colors.grey[800],
                       ),

lib/pages/BookAppointment/components/DocAvailableAppointments.dart

@@ -235,7 +235,7 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
           return children;
         },
       ),
-      onDaySelected: (date, events,format) {
+      onDaySelected: (date, events) {
         _onDaySelected(date, events);
         _animationController.forward(from: 0.0);
       },

lib/pages/Covid-DriveThru/Covid-TimeSlots.dart

@@ -348,7 +348,7 @@ class _CovidTimeSlotsState extends State<CovidTimeSlots>
           return children;
         },
       ),
-      onDaySelected: (date, event,formats) {
+      onDaySelected: (date, event) {
         _onDaySelected(date, event,);
         _animationController.forward(from: 0.0);
       },

lib/pages/login/login-type.dart

@@ -28,14 +28,16 @@ class LoginType extends StatelessWidget {
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: <Widget>[
                         Image.asset(
-                          'assets/images/habib-logo.png',
+                          'assets/images/DQ/dq_logo_icon.png',
-                          height: 80,
+                          height: 90,
-                          width: 80,
+                          width: 90,
                         ),
                         AppText(
                           TranslationBase.of(context).logintypeRadio,
                           fontSize: SizeConfig.textMultiplier * 3.5,
                           textAlign: TextAlign.left,
+                          marginBottom: 20.0,
+                          marginTop: 20.0,
                         ),
                         Row(
                           mainAxisAlignment: MainAxisAlignment.center,

lib/pages/login/login.dart

@@ -94,7 +94,7 @@ class _Login extends State<Login> {
                               loginType == 1
                                   ? Icons.chrome_reader_mode
                                   : Icons.receipt,
-                              color: Colors.red),
+                              color: Color(0xFF40ACC9)),
                           padding: EdgeInsets.only(
                               top: 20, bottom: 20, left: 10, right: 10),
                           hintText: loginType == 1

lib/pages/login/register.dart

@@ -76,7 +76,7 @@ class _Register extends State<Register> {
                           controller: nationalIDorFile,
                           onChanged: (value) => validateForm(),
                           prefixIcon:
-                              Icon(Icons.chrome_reader_mode, color: Colors.red),
+                              Icon(Icons.chrome_reader_mode, color: Color(0xFF40ACC9)),
                           padding: EdgeInsets.only(
                               top: 20, bottom: 20, left: 10, right: 10),
                           hintText: TranslationBase.of(context).nationalID,

lib/pages/login/welcome.dart

@@ -41,9 +41,9 @@ class _WelcomeLogin extends State<WelcomeLogin> {
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: <Widget>[
                         Image.asset(
-                          'assets/images/habib-logo.png',
+                          'assets/images/DQ/dq_logo_icon.png',
-                          height: 80,
+                          height: 90,
-                          width: 80,
+                          width: 90
                         ),
                         Text(
                           TranslationBase.of(context).welcome,
@@ -81,7 +81,7 @@ class _WelcomeLogin extends State<WelcomeLogin> {
                                   LOGIN_TYPE,
                                 ),
                               },
-                              color: Colors.red[900],
+                              color: Color(0xFF40ACC9),
                               textColor: Colors.white,
                             ))
                           ],

lib/widgets/mobile-no/mobile_no.dart

@@ -82,7 +82,7 @@ class _MobileNo extends State<MobileNo> {
               flex: 1,
               child: Icon(
                 Icons.phone,
-                color: Colors.red,
+                color: Color(0xFF40ACC9),
               )),
           Expanded(
               flex: 1,

pubspec.yaml

@@ -127,7 +127,6 @@ dependencies:
   # Carousel
   carousel_pro: ^1.0.0
 
-
   #local_notifications
   flutter_local_notifications: ^1.5.0
 
@@ -172,6 +171,8 @@ flutter:
     - assets/images/medical/
     - assets/images/new-design/
     - assets/images/login/
+    - assets/images/SmartWatches/
+    - assets/images/DQ/
     - assets/json/
     - assets/sounds/
     - assets/images/svg/