Login / Register UI fixes

lib/config/localized_values.dart

@@ -109,7 +109,8 @@ const Map<String, Map<String, String>> 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<String, Map<String, String>> localizedValues = {
   },
   'welcome_text2': {
     'en': 'Have you visited AlHabib Medical Group before? ',
-    'ar': 'الدكتور سليمان الحبيب لتطبيقات الهاتف المتحرك'
+    'ar': 'هل قمت بزيارة مجموعة الحبيب الطبية من قبل؟'
   },
   'yes': {'en': 'Yes', 'ar': 'نعم'},
   'no': {'en': 'No', 'ar': 'لا'},
@@ -129,6 +130,8 @@ const Map<String, Map<String, String>> localizedValues = {
   "nationalID": {"en": "National ID", "ar": "رقم الهوية"},
   "fileNo": {"en": "File Number", "ar": "رقم الملف"},
   "forgotFileNo": {"en": "Forgot file Number?", "ar": "نسيت رقم الملف الطبي؟"},
+  "forgotFileNoTitle": {"en": "Forgot medical file Number", "ar": "نسيت رقم الملف"},
+
 "enter-national-id": {
     "en": "Please enter mobile number and national ID / Iqama",
     "ar": "الرجاء إدخال رقم الجوال والهوية الوطنية / الاقامة"

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<SearchByClinic> {
   bool nearestAppo = false;
   String dropdownValue;
   String projectDropdownValue;
+
   // var event = RobotProvider();
   List<ListClinicCentralized> clinicsList = [];
   List<HospitalsModel> projectsList = [];
   bool isMobileAppDentalAllow = false;
   bool isLoaded = false;
+
   @override
   void initState() {
     WidgetsBinding.instance.addPostFrameCallback((_) => getClinicsList());
@@ -77,12 +80,6 @@ class _SearchByClinicState extends State<SearchByClinic> {
                                 }
                               });
                             },
-                            // 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,

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<ConfirmLogin> {
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 children: <Widget>[
                                   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<ConfirmLogin> {
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 children: <Widget>[
                                     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<ConfirmLogin> {
                                                 .verifyFingerprint2,
                                             fontSize:
                                                 SizeConfig.textMultiplier * 2.5,
-                                            textAlign: TextAlign.left,
+                                            textAlign: TextAlign.start,
                                           ),
                                   ])),
                     user != null && isMoreOption == false
@@ -335,7 +334,6 @@ class _ConfirmLogin extends State<ConfirmLogin> {
             {this.startSMSService(type)}
         });
 
-
     // SMSOTP.showLoadingDialog(context, false),
   }
 

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<ForgotPassword> {
   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<ForgotPassword> {
                 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<ForgotPassword> {
                   Row(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: <Widget>[
-                      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: <String>[
-                                    'Saudi Arabia',
-                                    'Dubai',
-                                  ].map<DropdownMenuItem<String>>(
-                                      (String value) {
-                                    return DropdownMenuItem<String>(
-                                      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: <String>[
+//                                    'Saudi Arabia',
+//                                    'Dubai',
+//                                  ].map<DropdownMenuItem<String>>(
+//                                      (String value) {
+//                                    return DropdownMenuItem<String>(
+//                                      value: value,
+//                                      child: Text(value),
+//                                    );
+//                                  }).toList()))),
                     ],
                   ),
                   MobileNo(controller: mobileNo),
@@ -80,12 +82,10 @@ class _ForgotPassword extends State<ForgotPassword> {
                     Row(
                       children: <Widget>[
                         Expanded(
-                            child: RaisedButton(
-                          color: Colors.grey,
-                          textColor: Colors.white,
-                          child: Text(TranslationBase.of(context).submit),
-                          onPressed: () => {},
-                        ))
+                            child: DefaultButton(
+                          TranslationBase.of(context).submit,
+                          () => {},
+                        )),
                       ],
                     ),
                   ],

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,
                                 )
                               },
-                            ))
+                            )),
                           ],
                         ),
                       ],

lib/pages/login/login.dart

@@ -74,7 +74,7 @@ class _Login extends State<Login> {
                       child: AppText(
                         TranslationBase.of(context).enterNationalId,
                         fontSize: SizeConfig.textMultiplier * 3.5,
-                        textAlign: TextAlign.left,
+                        textAlign: TextAlign.start,
                       )),
                   Expanded(
                     flex: 3,

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<WelcomeLogin> {
   bool isLoading = true;
+
   @override
   void initState() {
     isLoading = true;
@@ -40,25 +36,23 @@ class _WelcomeLogin extends State<WelcomeLogin> {
                       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: <Widget>[
-                        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,

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];
 

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<AppDrawer> {
   var sharedPref = new AppSharedPreferences();
   var familyFileProvider = FamilyFilesProvider();
   AuthenticatedUser user;
-  AuthenticatedUserObject authenticatedUserObject = locator<AuthenticatedUserObject>();
+  AuthenticatedUserObject authenticatedUserObject =
+      locator<AuthenticatedUserObject>();
 
   @override
   Widget build(BuildContext context) {
@@ -59,7 +60,8 @@ class _AppDrawerState extends State<AppDrawer> {
                           child: Column(
                             children: <Widget>[
                               Container(
-                                child: Image.asset('assets/images/logo.png'),
+                                child:
+                                    Image.asset('assets/images/DQ/DQ_logo.png'),
                                 margin: EdgeInsets.all(
                                     SizeConfig.imageSizeMultiplier * 4),
                               ),
@@ -289,19 +291,31 @@ class _AppDrawerState extends State<AppDrawer> {
                 child: Column(
                   children: <Widget>[
                     Container(
-                      // This align moves the children to the bottom
                       child: Align(
                         alignment: FractionalOffset.bottomCenter,
                         child: Container(
-                          child: Column(
+                          child: Row(
+                            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                            children: [
+                              Column(
                                 children: <Widget>[
-                              Text("Powered by"),
+                                  Text(TranslationBase.of(context).poweredBy),
                                   Image.asset(
                                     'assets/images/cs_logo_container.png',
                                     width: SizeConfig.imageSizeMultiplier * 30,
                                   )
                                 ],
                               ),
+                              Column(
+                                children: <Widget>[
+                                  Image.asset(
+                                    'assets/images/new-design/vidamobile.png',
+                                    width: SizeConfig.imageSizeMultiplier * 25,
+                                  )
+                                ],
+                              ),
+                            ],
+                          ),
                         ),
                       ),
                     )

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> 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<MobileNo> {
   var _selectedType = '966';
   String countryCode = '966';
+
   @override
   Widget build(BuildContext context) {
     return Visibility(
@@ -45,8 +48,18 @@ class _MobileNo extends State<MobileNo> {
       Row(
         mainAxisAlignment: MainAxisAlignment.center,
         children: <Widget>[
-          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<MobileNo> {
               child: Text(
                 countryCode,
                 overflow: TextOverflow.clip,
-
               )),
           Expanded(
             flex: 4,
@@ -122,5 +134,6 @@ class _MobileNo extends State<MobileNo> {
 class Countries {
   final String name;
   final String code;
+
   Countries({this.name, this.code});
 }

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,