From d5118bda1102c872e0b3d923503b14ecd48919fb Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 27 Oct 2020 11:02:36 +0300 Subject: [PATCH] Login / Register UI fixes --- assets/images/new-design/vidamobile.png | Bin 0 -> 18449 bytes lib/config/localized_values.dart | 9 ++- .../components/SearchByClinic.dart | 11 ++- lib/pages/login/confirm-login.dart | 26 ++++--- lib/pages/login/forgot-password.dart | 66 +++++++++--------- lib/pages/login/login-type.dart | 10 +-- lib/pages/login/login.dart | 2 +- lib/pages/login/welcome.dart | 24 +++---- lib/uitl/translations_delegate_base.dart | 6 ++ lib/widgets/drawer/app_drawer_widget.dart | 36 +++++++--- lib/widgets/mobile-no/mobile_no.dart | 19 ++++- lib/widgets/text/app_texts_widget.dart | 3 +- 12 files changed, 120 insertions(+), 92 deletions(-) create mode 100644 assets/images/new-design/vidamobile.png diff --git a/assets/images/new-design/vidamobile.png b/assets/images/new-design/vidamobile.png new file mode 100644 index 0000000000000000000000000000000000000000..f096e8a7a83e508040e02fea6d217902e7e6cb38 GIT binary patch literal 18449 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 xJ-Y_C2C^>G5pV?VjsVEbC*0q?8&> 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,