register screen, phone number is optional. and remove pdf navigation for temporary purpose.

development
Sikander Saleem 3 years ago
parent 6e4916bf9a
commit 8d39f98a3d

@ -1,5 +1,5 @@
sdk.dir=C:\\Users\\sikander.saleem\\Documents\\Sdks\\android sdk.dir=C:\\Users\\sikander.saleem\\Documents\\Sdks\\android
flutter.sdk=C:\\Users\\sikander.saleem\\Documents\\Sdks\\flutter flutter.sdk=C:\\Users\\sikander.saleem\\Documents\\Sdks\\flutter
flutter.buildMode=release flutter.buildMode=debug
flutter.versionName=1.0.0 flutter.versionName=1.0.0
flutter.versionCode=1 flutter.versionCode=1

@ -68,6 +68,7 @@ class _CommonAppbarState extends State<CommonAppbar> {
try { try {
var model = await TangheemUserApiClient().getNavigation(); var model = await TangheemUserApiClient().getNavigation();
navigationList = model?.data ?? []; navigationList = model?.data ?? [];
navigationList.removeWhere((element) => element.navigationId == 9); // this is for temporary, to release app on app store as file size are about 100 mbs
navigationList.sort((a, b) => a.orderNo.compareTo(b.orderNo)); navigationList.sort((a, b) => a.orderNo.compareTo(b.orderNo));
AppState().setNavigationModel(model); AppState().setNavigationModel(model);
} catch (ex) {} } catch (ex) {}

@ -52,7 +52,7 @@ class _ContactUsScreenState extends State<ContactUsScreen> {
return Scaffold( return Scaffold(
backgroundColor: ColorConsts.secondaryWhite, backgroundColor: ColorConsts.secondaryWhite,
body: SingleChildScrollView( body: SingleChildScrollView(
padding: EdgeInsets.all(32.0), padding: EdgeInsets.all(21.0),
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
child: Container( child: Container(
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,

@ -81,7 +81,7 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
return Scaffold( return Scaffold(
backgroundColor: ColorConsts.secondaryWhite, backgroundColor: ColorConsts.secondaryWhite,
body: SingleChildScrollView( body: SingleChildScrollView(
padding: EdgeInsets.all(32.0), padding: EdgeInsets.all(21.0),
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
child: Container( child: Container(
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,

@ -87,7 +87,7 @@ class _LoginScreenState extends State<LoginScreen> {
child: Directionality( child: Directionality(
textDirection: TextDirection.rtl, textDirection: TextDirection.rtl,
child: SingleChildScrollView( child: SingleChildScrollView(
padding: EdgeInsets.all(32.0), padding: EdgeInsets.all(21.0),
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
child: Container( child: Container(
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,

@ -88,7 +88,7 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
return Scaffold( return Scaffold(
backgroundColor: ColorConsts.secondaryWhite, backgroundColor: ColorConsts.secondaryWhite,
body: SingleChildScrollView( body: SingleChildScrollView(
padding: EdgeInsets.all(32.0), padding: EdgeInsets.all(21.0),
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
child: Container( child: Container(
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
@ -143,7 +143,7 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
), ),
SizedBox(height: 8), SizedBox(height: 8),
CommonTextFieldWidget( CommonTextFieldWidget(
hint: " رقم الجوال${" (" + (_selectedCountry?.countryCode ?? "+9xx") + " xxxxxxxxx)"}", hint: " رقم الجوال (اختياري)${" (" + (_selectedCountry?.countryCode ?? "+9xx") + " xxxxxxxxx)"}",
controller: _mobileNumberController, controller: _mobileNumberController,
suffixWidget: Text(_selectedCountry?.countryCode ?? "", textDirection: TextDirection.ltr), suffixWidget: Text(_selectedCountry?.countryCode ?? "", textDirection: TextDirection.ltr),
), ),
@ -195,10 +195,12 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
Utils.showToast("يرجى اختيار الدولة"); Utils.showToast("يرجى اختيار الدولة");
return; return;
} }
if (_mobileNumberController.text.length < 1) { // if (_mobileNumberController.text.length < 1) {
Utils.showToast("يرجى إدخال رقم الجوال"); // Utils.showToast("يرجى إدخال رقم الجوال");
return; // return;
} else if (_mobileNumberController.text.length < 8 || _mobileNumberController.text.length > 12) { // } else
if (_mobileNumberController.text.isNotEmpty && (_mobileNumberController.text.length < 8 || _mobileNumberController.text.length > 12)) {
Utils.showToast("رقم الهاتف غير صحيح"); Utils.showToast("رقم الهاتف غير صحيح");
return; return;
} }

Loading…
Cancel
Save