diff --git a/assets/images/new-design/vidamobile.png b/assets/images/new-design/vidamobile.png new file mode 100644 index 00000000..f096e8a7 Binary files /dev/null and b/assets/images/new-design/vidamobile.png differ diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index fbdf2ab5..b034b29a 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -109,7 +109,8 @@ const Map> localizedValues = { 'set-reminder': {'en': 'Set Reminder', 'ar': 'تعيين تذكير'}, 'login': {'en': 'Login', 'ar': 'تسجيل الدخول'}, - 'loginregister': {'en': 'Login / Register', 'ar': 'دخولتسجيل'}, + 'loginregister': {'en': 'Login / Register', 'ar': 'تسجيل الدخول'}, + 'poweredBy': {'en': 'Powered By', 'ar': 'مشغل بواسطة'}, 'welcome': {'en': 'Welcome', 'ar': 'أهلا بك'}, 'welcome_text': { 'en': 'Dr. Sulaiman Al Habib Mobile Application ', @@ -117,7 +118,7 @@ const Map> localizedValues = { }, 'welcome_text2': { 'en': 'Have you visited AlHabib Medical Group before? ', - 'ar': 'الدكتور سليمان الحبيب لتطبيقات الهاتف المتحرك' + 'ar': 'هل قمت بزيارة مجموعة الحبيب الطبية من قبل؟' }, 'yes': {'en': 'Yes', 'ar': 'نعم'}, 'no': {'en': 'No', 'ar': 'لا'}, @@ -129,7 +130,9 @@ const Map> localizedValues = { "nationalID": {"en": "National ID", "ar": "رقم الهوية"}, "fileNo": {"en": "File Number", "ar": "رقم الملف"}, "forgotFileNo": {"en": "Forgot file Number?", "ar": "نسيت رقم الملف الطبي؟"}, - "enter-national-id": { + "forgotFileNoTitle": {"en": "Forgot medical file Number", "ar": "نسيت رقم الملف"}, + +"enter-national-id": { "en": "Please enter mobile number and national ID / Iqama", "ar": "الرجاء إدخال رقم الجوال والهوية الوطنية / الاقامة" }, diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart index 46828428..c49cbc25 100644 --- a/lib/pages/BookAppointment/components/SearchByClinic.dart +++ b/lib/pages/BookAppointment/components/SearchByClinic.dart @@ -8,7 +8,6 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/DentalComplaints.dart import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart'; import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart'; -import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/card/rounded_container.dart'; @@ -17,7 +16,9 @@ import 'package:smart_progress_bar/smart_progress_bar.dart'; class SearchByClinic extends StatefulWidget { final List clnicIds; + SearchByClinic({this.clnicIds}); + @override _SearchByClinicState createState() => _SearchByClinicState(); } @@ -26,11 +27,13 @@ class _SearchByClinicState extends State { bool nearestAppo = false; String dropdownValue; String projectDropdownValue; + // var event = RobotProvider(); List clinicsList = []; List projectsList = []; bool isMobileAppDentalAllow = false; bool isLoaded = false; + @override void initState() { WidgetsBinding.instance.addPostFrameCallback((_) => getClinicsList()); @@ -77,12 +80,6 @@ class _SearchByClinicState extends State { } }); }, - // trailing: Icon(TranslationBase.of(AppGlobal.context) - // .locale - // .languageCode == - // 'en' - // ? Icons.keyboard_arrow_right - // : Icons.keyboard_arrow_left), title: Text(result.clinicDescription, style: TextStyle( fontSize: 14.0, diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index 85c1b232..f36d2d20 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/models/Authentication/check_activation_code import 'package:diplomaticquarterapp/models/Authentication/check_paitent_authentication_req.dart'; import 'package:diplomaticquarterapp/models/Authentication/select_device_imei_res.dart'; import 'package:diplomaticquarterapp/models/Authentication/send_activation_request.dart'; +import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; @@ -13,11 +14,9 @@ import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/card/rounded_container.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/otp/sms-popup.dart'; -import 'package:diplomaticquarterapp/widgets/progress_indicator/app_circular_progress_Indeicator.dart'; import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:diplomaticquarterapp/routes.dart'; import 'package:flutter/services.dart'; import 'package:intl/intl.dart'; import 'package:local_auth/local_auth.dart'; @@ -92,9 +91,9 @@ class _ConfirmLogin 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, ), AppText( TranslationBase.of(context).welcomeBack + @@ -146,9 +145,9 @@ class _ConfirmLogin 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, ), this.onlySMSBox == false ? AppText( @@ -163,7 +162,7 @@ class _ConfirmLogin extends State { .verifyFingerprint2, fontSize: SizeConfig.textMultiplier * 2.5, - textAlign: TextAlign.left, + textAlign: TextAlign.start, ), ])), user != null && isMoreOption == false @@ -330,11 +329,10 @@ class _ConfirmLogin extends State { var request = this.getCommonRequest(); // loading(true); - await this.authService.sendActivationCode(request).then((result) => { - if (result != null && result['isSMSSent'] == true) - {this.startSMSService(type)} - }); - + await this.authService.sendActivationCode(request).then((result) => { + if (result != null && result['isSMSSent'] == true) + {this.startSMSService(type)} + }); // SMSOTP.showLoadingDialog(context, false), } diff --git a/lib/pages/login/forgot-password.dart b/lib/pages/login/forgot-password.dart index bbdbb1ae..7e2f19fa 100644 --- a/lib/pages/login/forgot-password.dart +++ b/lib/pages/login/forgot-password.dart @@ -1,6 +1,6 @@ import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; -import 'package:diplomaticquarterapp/widgets/input/text_field.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/mobile-no/mobile_no.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; @@ -16,10 +16,11 @@ class _ForgotPassword extends State { String selectedType = 'Saudi Arabia'; final TextEditingController nationalIDorFile = null; final TextEditingController mobileNo = null; + @override Widget build(BuildContext context) { return AppScaffold( - appBarTitle: TranslationBase.of(context).forgotPassword, + appBarTitle: TranslationBase.of(context).forgotFileNoTitle, isShowAppBar: true, isShowDecPage: false, body: SingleChildScrollView( @@ -32,8 +33,9 @@ class _ForgotPassword extends State { flex: 1, child: AppText( TranslationBase.of(context).forgotDesc, - fontSize: SizeConfig.textMultiplier * 3.5, - textAlign: TextAlign.left, + fontSize: SizeConfig.textMultiplier * 3, + textAlign: TextAlign.start, + marginTop: 10.0, )), Expanded( flex: 2, @@ -43,29 +45,29 @@ class _ForgotPassword extends State { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Expanded( - // add Expanded to have your dropdown button fill remaining space - child: DropdownButtonHideUnderline( - child: DropdownButton( - isExpanded: true, - value: selectedType, - iconSize: 40, - elevation: 16, - onChanged: (String newValue) => { - setState(() { - selectedType = newValue; - }) - }, - items: [ - 'Saudi Arabia', - 'Dubai', - ].map>( - (String value) { - return DropdownMenuItem( - value: value, - child: Text(value), - ); - }).toList()))), +// Expanded( +// // add Expanded to have your dropdown button fill remaining space +// child: DropdownButtonHideUnderline( +// child: DropdownButton( +// isExpanded: true, +// value: selectedType, +// iconSize: 40, +// elevation: 16, +// onChanged: (String newValue) => { +// setState(() { +// selectedType = newValue; +// }) +// }, +// items: [ +// 'Saudi Arabia', +// 'Dubai', +// ].map>( +// (String value) { +// return DropdownMenuItem( +// value: value, +// child: Text(value), +// ); +// }).toList()))), ], ), MobileNo(controller: mobileNo), @@ -80,12 +82,10 @@ class _ForgotPassword extends State { Row( children: [ Expanded( - child: RaisedButton( - color: Colors.grey, - textColor: Colors.white, - child: Text(TranslationBase.of(context).submit), - onPressed: () => {}, - )) + child: DefaultButton( + TranslationBase.of(context).submit, + () => {}, + )), ], ), ], diff --git a/lib/pages/login/login-type.dart b/lib/pages/login/login-type.dart index dd2291ef..edd1bf3d 100644 --- a/lib/pages/login/login-type.dart +++ b/lib/pages/login/login-type.dart @@ -1,4 +1,5 @@ import 'package:diplomaticquarterapp/config/size_config.dart'; +import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/card/rounded_container.dart'; @@ -6,7 +7,6 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:diplomaticquarterapp/routes.dart'; class LoginType extends StatelessWidget { static int loginType = 0; @@ -35,7 +35,7 @@ class LoginType extends StatelessWidget { AppText( TranslationBase.of(context).logintypeRadio, fontSize: SizeConfig.textMultiplier * 3.5, - textAlign: TextAlign.left, + textAlign: TextAlign.start, marginBottom: 20.0, marginTop: 20.0, ), @@ -77,6 +77,7 @@ class LoginType extends StatelessWidget { fontSize: SizeConfig.textMultiplier * 2, + fontWeight: FontWeight.bold, ) ], ), @@ -114,6 +115,7 @@ class LoginType extends StatelessWidget { fontSize: SizeConfig.textMultiplier * 2, + fontWeight: FontWeight.bold, ) ], ), @@ -133,7 +135,7 @@ class LoginType extends StatelessWidget { child: AppText( TranslationBase.of(context).forgotPassword, fontSize: SizeConfig.textMultiplier * 2.5, - margin: 10, + marginTop: 20.0, underline: true))) ]), ), @@ -152,7 +154,7 @@ class LoginType extends StatelessWidget { REGISTER, ) }, - )) + )), ], ), ], diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index 038e43bd..bda6e78e 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -74,7 +74,7 @@ class _Login extends State { child: AppText( TranslationBase.of(context).enterNationalId, fontSize: SizeConfig.textMultiplier * 3.5, - textAlign: TextAlign.left, + textAlign: TextAlign.start, )), Expanded( flex: 3, diff --git a/lib/pages/login/welcome.dart b/lib/pages/login/welcome.dart index 3a39c0f7..419df302 100644 --- a/lib/pages/login/welcome.dart +++ b/lib/pages/login/welcome.dart @@ -1,15 +1,10 @@ -import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/size_config.dart'; -import 'package:diplomaticquarterapp/core/service/client/base_app_client.dart'; -import 'package:diplomaticquarterapp/models/Authentication/select_device_imei_res.dart'; +import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; -import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; -import 'package:diplomaticquarterapp/widgets/progress_indicator/app_circular_progress_Indeicator.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:diplomaticquarterapp/routes.dart'; class WelcomeLogin extends StatefulWidget { @override @@ -18,6 +13,7 @@ class WelcomeLogin extends StatefulWidget { class _WelcomeLogin extends State { bool isLoading = true; + @override void initState() { isLoading = true; @@ -40,25 +36,23 @@ class _WelcomeLogin extends State { mainAxisAlignment: MainAxisAlignment.spaceEvenly, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Image.asset( - 'assets/images/DQ/dq_logo_icon.png', - height: 90, - width: 90 - ), + Image.asset('assets/images/DQ/dq_logo_icon.png', + height: 90, width: 90), Text( TranslationBase.of(context).welcome, - style: TextStyle(fontSize: 30), - textAlign: TextAlign.left, + style: TextStyle( + fontSize: 30, fontWeight: FontWeight.bold), + textAlign: TextAlign.start, ), Text( TranslationBase.of(context).welcomeText, style: TextStyle(fontSize: 24), - textAlign: TextAlign.left, + textAlign: TextAlign.start, ), Text( TranslationBase.of(context).welcomeText2, style: TextStyle(fontSize: 24), - textAlign: TextAlign.left, + textAlign: TextAlign.start, ), SizedBox( height: SizeConfig.realScreenHeight * .15, diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index 3e0e67e0..d89a8b1b 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -122,6 +122,9 @@ class TranslationBase { String get loginregister => localizedValues['loginregister'][locale.languageCode]; + String get poweredBy => + localizedValues['poweredBy'][locale.languageCode]; + String get welcome => localizedValues['welcome'][locale.languageCode]; String get welcomeText => @@ -148,6 +151,9 @@ class TranslationBase { String get forgotPassword => localizedValues['forgotFileNo'][locale.languageCode]; + String get forgotFileNoTitle => + localizedValues['forgotFileNoTitle'][locale.languageCode]; + String get enterNationalId => localizedValues['enter-national-id'][locale.languageCode]; diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index 59d9bfa0..8e856ed2 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -1,6 +1,5 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; -import 'package:diplomaticquarterapp/core/service/client/base_app_client.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart'; @@ -15,6 +14,7 @@ import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:smart_progress_bar/smart_progress_bar.dart'; + import '../../config/size_config.dart'; import '../../locator.dart'; import 'drawer_item_widget.dart'; @@ -35,7 +35,8 @@ class _AppDrawerState extends State { var sharedPref = new AppSharedPreferences(); var familyFileProvider = FamilyFilesProvider(); AuthenticatedUser user; - AuthenticatedUserObject authenticatedUserObject = locator(); + AuthenticatedUserObject authenticatedUserObject = + locator(); @override Widget build(BuildContext context) { @@ -59,7 +60,8 @@ class _AppDrawerState extends State { child: Column( children: [ Container( - child: Image.asset('assets/images/logo.png'), + child: + Image.asset('assets/images/DQ/DQ_logo.png'), margin: EdgeInsets.all( SizeConfig.imageSizeMultiplier * 4), ), @@ -289,17 +291,29 @@ class _AppDrawerState extends State { child: Column( children: [ Container( - // This align moves the children to the bottom child: Align( alignment: FractionalOffset.bottomCenter, child: Container( - child: Column( - children: [ - Text("Powered by"), - Image.asset( - 'assets/images/cs_logo_container.png', - width: SizeConfig.imageSizeMultiplier * 30, - ) + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Column( + children: [ + Text(TranslationBase.of(context).poweredBy), + Image.asset( + 'assets/images/cs_logo_container.png', + width: SizeConfig.imageSizeMultiplier * 30, + ) + ], + ), + Column( + children: [ + Image.asset( + 'assets/images/new-design/vidamobile.png', + width: SizeConfig.imageSizeMultiplier * 25, + ) + ], + ), ], ), ), diff --git a/lib/widgets/mobile-no/mobile_no.dart b/lib/widgets/mobile-no/mobile_no.dart index 802c2ef6..d3e62153 100644 --- a/lib/widgets/mobile-no/mobile_no.dart +++ b/lib/widgets/mobile-no/mobile_no.dart @@ -7,6 +7,7 @@ import 'package:flutter/material.dart'; class MobileNo extends StatefulWidget { final bool disabled; + // final String data; final List countries = [ new Countries(name: 'Saudi Arabia', code: '966'), @@ -20,6 +21,7 @@ class MobileNo extends StatefulWidget { final TextEditingController controller; final Function onNumberChange; final Function onCountryChange; + MobileNo( {this.disabled = false, this.marginTop = 0, @@ -38,6 +40,7 @@ class MobileNo extends StatefulWidget { class _MobileNo extends State { var _selectedType = '966'; String countryCode = '966'; + @override Widget build(BuildContext context) { return Visibility( @@ -45,8 +48,18 @@ class _MobileNo extends State { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Expanded( - // add Expanded to have your dropdown button fill remaining space + Container( + margin: EdgeInsets.only(bottom: 10.0), + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + border: Border.all( + color: Colors.grey[400], + width: 1.0, + ), + borderRadius: BorderRadius.circular(10), + ), + width: MediaQuery.of(context).size.width * 0.89, child: Padding( padding: EdgeInsets.all(10), child: DropdownButtonHideUnderline( @@ -89,7 +102,6 @@ class _MobileNo extends State { child: Text( countryCode, overflow: TextOverflow.clip, - )), Expanded( flex: 4, @@ -122,5 +134,6 @@ class _MobileNo extends State { class Countries { final String name; final String code; + Countries({this.name, this.code}); } diff --git a/lib/widgets/text/app_texts_widget.dart b/lib/widgets/text/app_texts_widget.dart index e3989719..bba514be 100644 --- a/lib/widgets/text/app_texts_widget.dart +++ b/lib/widgets/text/app_texts_widget.dart @@ -25,7 +25,8 @@ class AppText extends StatefulWidget { {this.color = Colors.black, this.fontWeight = FontWeight.normal, this.fontSize, - this.fontFamily = 'WorkSans', +// this.fontFamily = 'WorkSans', + this.fontFamily, this.margin, this.marginTop = 0, this.marginRight = 0,