Haroon6138
/
diplomatic-quarter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

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

Browse Source 
Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!83
fix_login
Mohammad Aljammal 4 years ago
parent 514b483edc d5118bda11
commit 611c5a46d6
12 changed files with 120 additions and 92 deletions
Show Stats Download Patch File Download Diff File

BIN
assets/images/new-design/vidamobile.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

9
lib/config/localized_values.dart
Unescape Escape View File

@ -109,7 +109,8 @@ const Map<String, Map<String, String>> localizedValues = {
'set-reminder': {'en': 'Set Reminder', 'ar': 'تعيين تذكير'}, 'set-reminder': {'en': 'Set Reminder', 'ar': 'تعيين تذكير'},
'login': {'en': 'Login', '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': {'en': 'Welcome', 'ar': 'أهلا بك'},
'welcome_text': { 'welcome_text': {
'en': 'Dr. Sulaiman Al Habib Mobile Application ', 'en': 'Dr. Sulaiman Al Habib Mobile Application ',
@ -117,7 +118,7 @@ const Map<String, Map<String, String>> localizedValues = {
}, },
'welcome_text2': { 'welcome_text2': {
'en': 'Have you visited AlHabib Medical Group before? ', 'en': 'Have you visited AlHabib Medical Group before? ',
'ar': 'الدكتور سليمان الحبيب لتطبيقات الهاتف المتحرك' 'ar': 'هل قمت بزيارة مجموعة الحبيب الطبية من قبل؟'
}, },
'yes': {'en': 'Yes', 'ar': 'نعم'}, 'yes': {'en': 'Yes', 'ar': 'نعم'},
'no': {'en': 'No', 'ar': 'لا'}, 'no': {'en': 'No', 'ar': 'لا'},
@ -129,7 +130,9 @@ const Map<String, Map<String, String>> localizedValues = {
"nationalID": {"en": "National ID", "ar": "رقم الهوية"}, "nationalID": {"en": "National ID", "ar": "رقم الهوية"},
"fileNo": {"en": "File Number", "ar": "رقم الملف"}, "fileNo": {"en": "File Number", "ar": "رقم الملف"},
"forgotFileNo": {"en": "Forgot 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", "en": "Please enter mobile number and national ID / Iqama",
"ar": "الرجاء إدخال رقم الجوال والهوية الوطنية / الاقامة" "ar": "الرجاء إدخال رقم الجوال والهوية الوطنية / الاقامة"
}, },

11
lib/pages/BookAppointment/components/SearchByClinic.dart
Unescape Escape View File

@ -8,7 +8,6 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/DentalComplaints.dart
import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart';
import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.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/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/card/rounded_container.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 { class SearchByClinic extends StatefulWidget {
final List clnicIds; final List clnicIds;
SearchByClinic({this.clnicIds}); SearchByClinic({this.clnicIds});
@override @override
_SearchByClinicState createState() => _SearchByClinicState(); _SearchByClinicState createState() => _SearchByClinicState();
} }
@ -26,11 +27,13 @@ class _SearchByClinicState extends State<SearchByClinic> {
bool nearestAppo = false; bool nearestAppo = false;
String dropdownValue; String dropdownValue;
String projectDropdownValue; String projectDropdownValue;
// var event = RobotProvider(); // var event = RobotProvider();
List<ListClinicCentralized> clinicsList = []; List<ListClinicCentralized> clinicsList = [];
List<HospitalsModel> projectsList = []; List<HospitalsModel> projectsList = [];
bool isMobileAppDentalAllow = false; bool isMobileAppDentalAllow = false;
bool isLoaded = false; bool isLoaded = false;
@override @override
void initState() { void initState() {
WidgetsBinding.instance.addPostFrameCallback((_) => getClinicsList()); 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, title: Text(result.clinicDescription,
style: TextStyle( style: TextStyle(
fontSize: 14.0, fontSize: 14.0,

18
lib/pages/login/confirm-login.dart
Unescape Escape View File

@ -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/check_paitent_authentication_req.dart';
import 'package:diplomaticquarterapp/models/Authentication/select_device_imei_res.dart'; import 'package:diplomaticquarterapp/models/Authentication/select_device_imei_res.dart';
import 'package:diplomaticquarterapp/models/Authentication/send_activation_request.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/services/authentication/auth_provider.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.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/card/rounded_container.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/otp/sms-popup.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:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/routes.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:local_auth/local_auth.dart'; import 'package:local_auth/local_auth.dart';
@ -92,9 +91,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/habib-logo.png', 'assets/images/DQ/dq_logo_icon.png',
height: 80, height: 90,
width: 80, width: 90,
), ),
AppText( AppText(
TranslationBase.of(context).welcomeBack + TranslationBase.of(context).welcomeBack +
@ -146,9 +145,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/habib-logo.png', 'assets/images/DQ/dq_logo_icon.png',
height: 80, height: 90,
width: 80, width: 90,
), ),
this.onlySMSBox == false this.onlySMSBox == false
? AppText( ? AppText(
@ -163,7 +162,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
.verifyFingerprint2, .verifyFingerprint2,
fontSize: fontSize:
SizeConfig.textMultiplier * 2.5, SizeConfig.textMultiplier * 2.5,
textAlign: TextAlign.left, textAlign: TextAlign.start,
), ),
])), ])),
user != null && isMoreOption == false user != null && isMoreOption == false
@ -335,7 +334,6 @@ class _ConfirmLogin extends State<ConfirmLogin> {
{this.startSMSService(type)} {this.startSMSService(type)}
}); });
// SMSOTP.showLoadingDialog(context, false), // SMSOTP.showLoadingDialog(context, false),
} }

66
lib/pages/login/forgot-password.dart
Unescape Escape View File

@ -1,6 +1,6 @@
import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.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/mobile-no/mobile_no.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
@ -16,10 +16,11 @@ class _ForgotPassword extends State<ForgotPassword> {
String selectedType = 'Saudi Arabia'; String selectedType = 'Saudi Arabia';
final TextEditingController nationalIDorFile = null; final TextEditingController nationalIDorFile = null;
final TextEditingController mobileNo = null; final TextEditingController mobileNo = null;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
appBarTitle: TranslationBase.of(context).forgotPassword, appBarTitle: TranslationBase.of(context).forgotFileNoTitle,
isShowAppBar: true, isShowAppBar: true,
isShowDecPage: false, isShowDecPage: false,
body: SingleChildScrollView( body: SingleChildScrollView(
@ -32,8 +33,9 @@ class _ForgotPassword extends State<ForgotPassword> {
flex: 1, flex: 1,
child: AppText( child: AppText(
TranslationBase.of(context).forgotDesc, TranslationBase.of(context).forgotDesc,
fontSize: SizeConfig.textMultiplier * 3.5, fontSize: SizeConfig.textMultiplier * 3,
textAlign: TextAlign.left, textAlign: TextAlign.start,
marginTop: 10.0,
)), )),
Expanded( Expanded(
flex: 2, flex: 2,
@ -43,29 +45,29 @@ class _ForgotPassword extends State<ForgotPassword> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Expanded( // Expanded(
// add Expanded to have your dropdown button fill remaining space // // add Expanded to have your dropdown button fill remaining space
child: DropdownButtonHideUnderline( // child: DropdownButtonHideUnderline(
child: DropdownButton( // child: DropdownButton(
isExpanded: true, // isExpanded: true,
value: selectedType, // value: selectedType,
iconSize: 40, // iconSize: 40,
elevation: 16, // elevation: 16,
onChanged: (String newValue) => { // onChanged: (String newValue) => {
setState(() { // setState(() {
selectedType = newValue; // selectedType = newValue;
}) // })
}, // },
items: <String>[ // items: <String>[
'Saudi Arabia', // 'Saudi Arabia',
'Dubai', // 'Dubai',
].map<DropdownMenuItem<String>>( // ].map<DropdownMenuItem<String>>(
(String value) { // (String value) {
return DropdownMenuItem<String>( // return DropdownMenuItem<String>(
value: value, // value: value,
child: Text(value), // child: Text(value),
); // );
}).toList()))), // }).toList()))),
], ],
), ),
MobileNo(controller: mobileNo), MobileNo(controller: mobileNo),
@ -80,12 +82,10 @@ class _ForgotPassword extends State<ForgotPassword> {
Row( Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: RaisedButton( child: DefaultButton(
color: Colors.grey, TranslationBase.of(context).submit,
textColor: Colors.white, () => {},
child: Text(TranslationBase.of(context).submit), )),
onPressed: () => {},
))
], ],
), ),
], ],

10
lib/pages/login/login-type.dart
Unescape Escape View File

@ -1,4 +1,5 @@
import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/routes.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/card/rounded_container.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:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/routes.dart';
class LoginType extends StatelessWidget { class LoginType extends StatelessWidget {
static int loginType = 0; static int loginType = 0;
@ -35,7 +35,7 @@ class LoginType extends StatelessWidget {
AppText( AppText(
TranslationBase.of(context).logintypeRadio, TranslationBase.of(context).logintypeRadio,
fontSize: SizeConfig.textMultiplier * 3.5, fontSize: SizeConfig.textMultiplier * 3.5,
textAlign: TextAlign.left, textAlign: TextAlign.start,
marginBottom: 20.0, marginBottom: 20.0,
marginTop: 20.0, marginTop: 20.0,
), ),
@ -77,6 +77,7 @@ class LoginType extends StatelessWidget {
fontSize: fontSize:
SizeConfig.textMultiplier * SizeConfig.textMultiplier *
2, 2,
fontWeight: FontWeight.bold,
) )
], ],
), ),
@ -114,6 +115,7 @@ class LoginType extends StatelessWidget {
fontSize: fontSize:
SizeConfig.textMultiplier * SizeConfig.textMultiplier *
2, 2,
fontWeight: FontWeight.bold,
) )
], ],
), ),
@ -133,7 +135,7 @@ class LoginType extends StatelessWidget {
child: AppText( child: AppText(
TranslationBase.of(context).forgotPassword, TranslationBase.of(context).forgotPassword,
fontSize: SizeConfig.textMultiplier * 2.5, fontSize: SizeConfig.textMultiplier * 2.5,
margin: 10, marginTop: 20.0,
underline: true))) underline: true)))
]), ]),
), ),
@ -152,7 +154,7 @@ class LoginType extends StatelessWidget {
REGISTER, REGISTER,
) )
}, },
)) )),
], ],
), ),
], ],

2
lib/pages/login/login.dart
Unescape Escape View File

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

24
lib/pages/login/welcome.dart
Unescape Escape View File

@ -1,15 +1,10 @@
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/core/service/client/base_app_client.dart'; import 'package:diplomaticquarterapp/routes.dart';
import 'package:diplomaticquarterapp/models/Authentication/select_device_imei_res.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.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/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.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/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/routes.dart';
class WelcomeLogin extends StatefulWidget { class WelcomeLogin extends StatefulWidget {
@override @override
@ -18,6 +13,7 @@ class WelcomeLogin extends StatefulWidget {
class _WelcomeLogin extends State<WelcomeLogin> { class _WelcomeLogin extends State<WelcomeLogin> {
bool isLoading = true; bool isLoading = true;
@override @override
void initState() { void initState() {
isLoading = true; isLoading = true;
@ -40,25 +36,23 @@ class _WelcomeLogin extends State<WelcomeLogin> {
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset('assets/images/DQ/dq_logo_icon.png',
'assets/images/DQ/dq_logo_icon.png', height: 90, width: 90),
height: 90,
width: 90
),
Text( Text(
TranslationBase.of(context).welcome, TranslationBase.of(context).welcome,
style: TextStyle(fontSize: 30), style: TextStyle(
textAlign: TextAlign.left, fontSize: 30, fontWeight: FontWeight.bold),
textAlign: TextAlign.start,
), ),
Text( Text(
TranslationBase.of(context).welcomeText, TranslationBase.of(context).welcomeText,
style: TextStyle(fontSize: 24), style: TextStyle(fontSize: 24),
textAlign: TextAlign.left, textAlign: TextAlign.start,
), ),
Text( Text(
TranslationBase.of(context).welcomeText2, TranslationBase.of(context).welcomeText2,
style: TextStyle(fontSize: 24), style: TextStyle(fontSize: 24),
textAlign: TextAlign.left, textAlign: TextAlign.start,
), ),
SizedBox( SizedBox(
height: SizeConfig.realScreenHeight * .15, height: SizeConfig.realScreenHeight * .15,

6
lib/uitl/translations_delegate_base.dart
Unescape Escape View File

@ -122,6 +122,9 @@ class TranslationBase {
String get loginregister => String get loginregister =>
localizedValues['loginregister'][locale.languageCode]; localizedValues['loginregister'][locale.languageCode];
String get poweredBy =>
localizedValues['poweredBy'][locale.languageCode];
String get welcome => localizedValues['welcome'][locale.languageCode]; String get welcome => localizedValues['welcome'][locale.languageCode];
String get welcomeText => String get welcomeText =>
@ -148,6 +151,9 @@ class TranslationBase {
String get forgotPassword => String get forgotPassword =>
localizedValues['forgotFileNo'][locale.languageCode]; localizedValues['forgotFileNo'][locale.languageCode];
String get forgotFileNoTitle =>
localizedValues['forgotFileNoTitle'][locale.languageCode];
String get enterNationalId => String get enterNationalId =>
localizedValues['enter-national-id'][locale.languageCode]; localizedValues['enter-national-id'][locale.languageCode];

26
lib/widgets/drawer/app_drawer_widget.dart
Unescape Escape View File

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

19
lib/widgets/mobile-no/mobile_no.dart
Unescape Escape View File

@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
class MobileNo extends StatefulWidget { class MobileNo extends StatefulWidget {
final bool disabled; final bool disabled;
// final String data; // final String data;
final List<Countries> countries = [ final List<Countries> countries = [
new Countries(name: 'Saudi Arabia', code: '966'), new Countries(name: 'Saudi Arabia', code: '966'),
@ -20,6 +21,7 @@ class MobileNo extends StatefulWidget {
final TextEditingController controller; final TextEditingController controller;
final Function onNumberChange; final Function onNumberChange;
final Function onCountryChange; final Function onCountryChange;
MobileNo( MobileNo(
{this.disabled = false, {this.disabled = false,
this.marginTop = 0, this.marginTop = 0,
@ -38,6 +40,7 @@ class MobileNo extends StatefulWidget {
class _MobileNo extends State<MobileNo> { class _MobileNo extends State<MobileNo> {
var _selectedType = '966'; var _selectedType = '966';
String countryCode = '966'; String countryCode = '966';
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Visibility( return Visibility(
@ -45,8 +48,18 @@ class _MobileNo extends State<MobileNo> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Expanded( Container(
// add Expanded to have your dropdown button fill remaining space 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( child: Padding(
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: DropdownButtonHideUnderline( child: DropdownButtonHideUnderline(
@ -89,7 +102,6 @@ class _MobileNo extends State<MobileNo> {
child: Text( child: Text(
countryCode, countryCode,
overflow: TextOverflow.clip, overflow: TextOverflow.clip,
)), )),
Expanded( Expanded(
flex: 4, flex: 4,
@ -122,5 +134,6 @@ class _MobileNo extends State<MobileNo> {
class Countries { class Countries {
final String name; final String name;
final String code; final String code;
Countries({this.name, this.code}); Countries({this.name, this.code});
} }

3
lib/widgets/text/app_texts_widget.dart
Unescape Escape View File

@ -25,7 +25,8 @@ class AppText extends StatefulWidget {
{this.color = Colors.black, {this.color = Colors.black,
this.fontWeight = FontWeight.normal, this.fontWeight = FontWeight.normal,
this.fontSize, this.fontSize,
this.fontFamily = 'WorkSans', // this.fontFamily = 'WorkSans',
this.fontFamily,
this.margin, this.margin,
this.marginTop = 0, this.marginTop = 0,
this.marginRight = 0, this.marginRight = 0,

Write Preview
Loading…
Cancel
Save