diff --git a/assets/images/DQ/DQ_logo.png b/assets/images/DQ/DQ_logo.png new file mode 100644 index 00000000..993a1bd3 Binary files /dev/null and b/assets/images/DQ/DQ_logo.png differ diff --git a/assets/images/DQ/dq_logo_icon.png b/assets/images/DQ/dq_logo_icon.png new file mode 100644 index 00000000..71626bd8 Binary files /dev/null and b/assets/images/DQ/dq_logo_icon.png differ diff --git a/lib/main.dart b/lib/main.dart index 9cb5cb78..948d1db9 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -81,8 +81,8 @@ class MyApp extends StatelessWidget { iconTheme: IconThemeData(), appBarTheme: AppBarTheme( color: Colors.grey[700], - brightness: Brightness.light, - elevation: 0.0, + brightness: Brightness.dark, + elevation: 10.0, actionsIconTheme: IconThemeData( color: Colors.grey[800], ), diff --git a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart index 3e9ae0cd..aca0884f 100644 --- a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart +++ b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart @@ -235,7 +235,7 @@ class _DocAvailableAppointmentsState extends State return children; }, ), - onDaySelected: (date, events,format) { + onDaySelected: (date, events) { _onDaySelected(date, events); _animationController.forward(from: 0.0); }, diff --git a/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart index 9f2418fd..6e1a0182 100644 --- a/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart +++ b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart @@ -348,7 +348,7 @@ class _CovidTimeSlotsState extends State return children; }, ), - onDaySelected: (date, event,formats) { + onDaySelected: (date, event) { _onDaySelected(date, event,); _animationController.forward(from: 0.0); }, diff --git a/lib/pages/login/login-type.dart b/lib/pages/login/login-type.dart index 8a5087a5..dd2291ef 100644 --- a/lib/pages/login/login-type.dart +++ b/lib/pages/login/login-type.dart @@ -28,14 +28,16 @@ class LoginType extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Image.asset( - 'assets/images/habib-logo.png', - height: 80, - width: 80, + 'assets/images/DQ/dq_logo_icon.png', + height: 90, + 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, diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index f2ece252..038e43bd 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -94,7 +94,7 @@ class _Login extends State { 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 diff --git a/lib/pages/login/register.dart b/lib/pages/login/register.dart index 3ee13a4c..03e7e1ca 100644 --- a/lib/pages/login/register.dart +++ b/lib/pages/login/register.dart @@ -76,7 +76,7 @@ class _Register extends State { 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, diff --git a/lib/pages/login/welcome.dart b/lib/pages/login/welcome.dart index be406a55..3a39c0f7 100644 --- a/lib/pages/login/welcome.dart +++ b/lib/pages/login/welcome.dart @@ -41,9 +41,9 @@ class _WelcomeLogin extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Image.asset( - 'assets/images/habib-logo.png', - height: 80, - width: 80, + 'assets/images/DQ/dq_logo_icon.png', + height: 90, + width: 90 ), Text( TranslationBase.of(context).welcome, @@ -81,7 +81,7 @@ class _WelcomeLogin extends State { LOGIN_TYPE, ), }, - color: Colors.red[900], + color: Color(0xFF40ACC9), textColor: Colors.white, )) ], diff --git a/lib/widgets/mobile-no/mobile_no.dart b/lib/widgets/mobile-no/mobile_no.dart index 399e346d..802c2ef6 100644 --- a/lib/widgets/mobile-no/mobile_no.dart +++ b/lib/widgets/mobile-no/mobile_no.dart @@ -82,7 +82,7 @@ class _MobileNo extends State { flex: 1, child: Icon( Icons.phone, - color: Colors.red, + color: Color(0xFF40ACC9), )), Expanded( flex: 1, diff --git a/pubspec.yaml b/pubspec.yaml index 2cf4bf4a..aa35864c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -126,7 +126,6 @@ dependencies: # Carousel carousel_pro: ^1.0.0 - #local_notifications flutter_local_notifications: ^1.5.0 @@ -171,6 +170,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/