New UI Implemented Fix 1.0

mirza_dev
devmirza121 4 years ago
parent 3b6eb17adc
commit 3f6e3f1423

@ -149,16 +149,6 @@ class _DashboardPageState extends State<DashboardPage> {
),
)
]),
// Container(
// width: double.infinity,
// height: 200,
// color: accentColor.withOpacity(0.3),
// child: Icon(
// Icons.person,
// size: 80,
// color: accentColor.withOpacity(0.3),
// ),
// ),
Container(
width: double.infinity,
color: MyColors.darkPrimaryColor.withOpacity(0.1),
@ -252,7 +242,7 @@ class _DashboardPageState extends State<DashboardPage> {
final pref = await SharedPreferences.getInstance();
await pref.clear();
pop(context);
pop(context);
navigateReplaceWithName(context, AppRoutes.registerSelection);
},
),
],

@ -102,37 +102,39 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
color: Colors.grey,
margin: EdgeInsets.symmetric(vertical: 12),
),
ListView.builder(
itemBuilder: (context, pIndex) {
return Container(
width: double.infinity,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
categories[pIndex].categoryName.toString().toText16(isBold: true),
ListView.builder(
itemBuilder: (context, index) {
return Container(
child: ("- " +
(EasyLocalization.of(context)?.currentLocale?.countryCode == "SA"
? categories[pIndex].services![index].serviceNameN.toString()
: categories[pIndex].services![index].serviceName.toString()))
.toText14(),
);
},
itemCount: categories[pIndex].services?.length,
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
)
],
categories.length == 0
? LocaleKeys.no_branch.tr().toText12()
: ListView.builder(
itemBuilder: (context, pIndex) {
return Container(
width: double.infinity,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
categories[pIndex].categoryName.toString().toText16(isBold: true),
ListView.builder(
itemBuilder: (context, index) {
return Container(
child: ("- " +
(EasyLocalization.of(context)?.currentLocale?.countryCode == "SA"
? categories[pIndex].services![index].serviceNameN.toString()
: categories[pIndex].services![index].serviceName.toString()))
.toText14(),
);
},
itemCount: categories[pIndex].services?.length,
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
)
],
),
);
},
itemCount: categories.length,
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
),
);
},
itemCount: categories.length,
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
),
],
),
),

@ -1,4 +1,3 @@
import 'package:car_provider_app/api/client/user_api_client.dart';
import 'package:car_provider_app/classes/utils.dart';
import 'package:car_provider_app/config/routes.dart';
@ -13,6 +12,7 @@ import 'package:car_provider_app/widgets/dialog/dialogs.dart';
import 'package:car_provider_app/widgets/dialog/message_dialog.dart';
import 'package:car_provider_app/widgets/dialog/otp_dialog.dart';
import 'package:car_provider_app/widgets/button/show_fill_button.dart';
import 'package:car_provider_app/widgets/txt_field.dart';
import 'package:easy_localization/src/public_ext.dart';
import 'package:flutter/material.dart';
@ -20,7 +20,6 @@ import 'dart:convert';
import 'package:http/http.dart';
class ChangeEmailPage extends StatefulWidget {
@override
State<ChangeEmailPage> createState() => _ChangeEmailPageState();
}
@ -32,46 +31,22 @@ class _ChangeEmailPageState extends State<ChangeEmailPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: appBar(context,title: "Change Email"),
appBar: appBar(context, title: LocaleKeys.changeEmail.tr()),
body: SingleChildScrollView(
child: Container(
// width: double.infinity,
// height: double.infinity,
padding: EdgeInsets.all(40),
padding: EdgeInsets.all(20),
child: Column(
children: [
"Enter Email".toText24(),
LocaleKeys.enterEmail.tr().toText24(),
12.height,
TextFormField(
decoration: InputDecoration(
hintText: "Enter New Email",
hintStyle: TextStyle(color: Colors.grey),
border: OutlineInputBorder(
borderRadius: const BorderRadius.all(
const Radius.circular(5.0),
),
),
),
obscureText: false,
onChanged: (v) => email = v,
),
TxtField(hint: LocaleKeys.enterNewEmail.tr(), onChanged: (v) => email = v,),
12.height,
TextFormField(
decoration: InputDecoration(
hintText: "Enter Current Password",
hintStyle: TextStyle(color: Colors.grey),
border: OutlineInputBorder(
borderRadius: const BorderRadius.all(
const Radius.circular(5.0),
),
),
),
obscureText: true,
onChanged: (v) => password = v,
),
TxtField(hint: LocaleKeys.enterCurrentPassword.tr(), onChanged: (v) => password = v,),
40.height,
ShowFillButton(
title: "Confirm",
title: LocaleKeys.confirm.tr(),
maxWidth: double.infinity,
onPressed: () {
changeEmail(context);
@ -114,5 +89,4 @@ class _ChangeEmailPageState extends State<ChangeEmailPage> {
Utils.showToast(otpRequest.message ?? "");
}
}
}

@ -1,4 +1,3 @@
import 'package:car_provider_app/api/client/user_api_client.dart';
import 'package:car_provider_app/classes/utils.dart';
import 'package:car_provider_app/config/routes.dart';
@ -13,6 +12,7 @@ import 'package:car_provider_app/widgets/dialog/dialogs.dart';
import 'package:car_provider_app/widgets/dialog/message_dialog.dart';
import 'package:car_provider_app/widgets/dialog/otp_dialog.dart';
import 'package:car_provider_app/widgets/button/show_fill_button.dart';
import 'package:car_provider_app/widgets/txt_field.dart';
import 'package:easy_localization/src/public_ext.dart';
import 'package:flutter/material.dart';
@ -20,57 +20,39 @@ import 'dart:convert';
import 'package:http/http.dart';
class ChangeMobilePage extends StatefulWidget {
@override
State<ChangeMobilePage> createState() => _ChangeMobilePageState();
}
class _ChangeMobilePageState extends State<ChangeMobilePage> {
int countryID=1 ;
int countryID = 1;
String mobileNo = '';
String password = '';
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: appBar(context,title: LocaleKeys.changeMobile.tr()),
appBar: appBar(context, title: LocaleKeys.changeMobile.tr()),
body: SingleChildScrollView(
child: Container(
// width: double.infinity,
// height: double.infinity,
padding: EdgeInsets.all(40),
padding: EdgeInsets.all(20),
child: Column(
children: [
LocaleKeys.enterNewPhoneNumber.tr().toText24(),
12.height,
TextFormField(
decoration: InputDecoration(
hintText: LocaleKeys.enterNewPhoneNumber.tr(),
hintStyle: TextStyle(color: Colors.grey),
border: OutlineInputBorder(
borderRadius: const BorderRadius.all(
const Radius.circular(5.0),
),
),
),
obscureText: false,
TxtField(
hint: LocaleKeys.enterNewPhoneNumber.tr(),
onChanged: (v) => mobileNo = v,
),
12.height,
TextFormField(
decoration: InputDecoration(
hintText: LocaleKeys.enterCurrentPassword.tr(),
hintStyle: TextStyle(color: Colors.grey),
border: OutlineInputBorder(
borderRadius: const BorderRadius.all(
const Radius.circular(5.0),
),
),
),
obscureText: true,
TxtField(
hint: LocaleKeys.enterCurrentPassword.tr(),
onChanged: (v) => password = v,
),
40.height,
20.height,
ShowFillButton(
title: LocaleKeys.confirm.tr(),
maxWidth: double.infinity,
@ -100,7 +82,7 @@ class _ChangeMobilePageState extends State<ChangeMobilePage> {
showMDialog(
context,
child: MessageDialog(
title:LocaleKeys.phoneNumberVerified.tr(),
title: LocaleKeys.phoneNumberVerified.tr(),
onClick: () {
Navigator.of(context).pushNamedAndRemoveUntil(AppRoutes.loginWithPassword, (Route<dynamic> route) => false);
},
@ -115,7 +97,4 @@ class _ChangeMobilePageState extends State<ChangeMobilePage> {
Utils.showToast(otpRequest.message ?? "");
}
}
}

@ -36,7 +36,7 @@ class _ChangePasswordPageState extends State<ChangePasswordPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: appBar(context,title: LocaleKeys.changePassword.tr()),
appBar: appBar(context, title: LocaleKeys.changePassword.tr()),
body: SingleChildScrollView(
child: Container(
// width: double.infinity,
@ -46,34 +46,16 @@ class _ChangePasswordPageState extends State<ChangePasswordPage> {
children: [
LocaleKeys.enterNewPassword.tr().toText24(),
12.height,
TextFormField(
decoration: InputDecoration(
hintText: LocaleKeys.enterOldPassword.tr(),
hintStyle: TextStyle(color: Colors.grey),
border: OutlineInputBorder(
borderRadius: const BorderRadius.all(
const Radius.circular(5.0),
),
),
),
obscureText: true,
TxtField(
hint: LocaleKeys.enterOldPassword.tr(),
onChanged: (v) => currentPasswor = v,
),
12.height,
TextFormField(
decoration: InputDecoration(
hintText: LocaleKeys.enterNewPassword.tr(),
hintStyle: TextStyle(color: Colors.grey),
border: OutlineInputBorder(
borderRadius: const BorderRadius.all(
const Radius.circular(5.0),
),
),
),
obscureText: true,
TxtField(
hint: LocaleKeys.enterNewPassword.tr(),
onChanged: (v) => newPassword = v,
),
40.height,
20.height,
ShowFillButton(
title: LocaleKeys.confirm.tr(),
maxWidth: double.infinity,

@ -1,6 +1,3 @@
import 'dart:convert';
import 'package:car_provider_app/api/client/user_api_client.dart';
import 'package:car_provider_app/classes/utils.dart';
@ -36,7 +33,7 @@ class _ForgetPasswordMethodPageState extends State<ForgetPasswordMethodPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: appBar(context,title: LocaleKeys.forgetPassword.tr()),
appBar: appBar(context, title: LocaleKeys.forgetPassword.tr()),
body: Container(
width: double.infinity,
height: double.infinity,
@ -53,8 +50,8 @@ class _ForgetPasswordMethodPageState extends State<ForgetPasswordMethodPage> {
otpType = 1;
forgetPasswordOTPMethod(context);
},
title: 'With SMS',
icon: icons + "ic_sms.png",
title: LocaleKeys.SMS.tr(),
icon: icons + "ic_sms.svg",
),
),
20.width,
@ -64,8 +61,8 @@ class _ForgetPasswordMethodPageState extends State<ForgetPasswordMethodPage> {
otpType = 1;
forgetPasswordOTPMethod(context);
},
title: 'With Whatsapp',
icon: icons + "ic_whatsapp.png",
title: LocaleKeys.whatsapp.tr(),
icon: icons + "ic_whatsapp.svg",
),
),
],
@ -82,7 +79,7 @@ class _ForgetPasswordMethodPageState extends State<ForgetPasswordMethodPage> {
onClick: (String code) async {
pop(context);
Utils.showLoading(context);
Response res = await UserApiClent().ForgetPasswordOTPCompare(widget.userToken?? "", code);
Response res = await UserApiClent().ForgetPasswordOTPCompare(widget.userToken ?? "", code);
Utils.hideLoading(context);
PasswordOTPCompare otpCompare = PasswordOTPCompare.fromJson(jsonDecode(res.body));
if (otpCompare.messageStatus == 1) {

@ -114,7 +114,7 @@ class _LoginWithPasswordState extends State<LoginWithPassword> {
isFlatButton: true,
isBold: false,
fontSize: 14,
txtColor: Colors.blue,
txtColor: MyColors.darkPrimaryColor,
onPressed: () {
navigateWithName(context, AppRoutes.forgetPassword);
},

Loading…
Cancel
Save