Haroon6138
/
car_provider_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New UI Implemented Fix 1.0

Browse Source
mirza_dev
devmirza121 4 years ago
parent 3b6eb17adc
commit 3f6e3f1423
7 changed files with 64 additions and 140 deletions
Show Stats Download Patch File Download Diff File

12
lib/pages/dashboard/dashboard_page.dart
Unescape Escape View File

@ -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( Container(
width: double.infinity, width: double.infinity,
color: MyColors.darkPrimaryColor.withOpacity(0.1), color: MyColors.darkPrimaryColor.withOpacity(0.1),
@ -252,7 +242,7 @@ class _DashboardPageState extends State<DashboardPage> {
final pref = await SharedPreferences.getInstance(); final pref = await SharedPreferences.getInstance();
await pref.clear(); await pref.clear();
pop(context); pop(context);
pop(context); navigateReplaceWithName(context, AppRoutes.registerSelection);
}, },
), ),
], ],

62
lib/pages/settings/branch/branch_detail_page.dart
Unescape Escape View File

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

40
lib/pages/user/change_email_page.dart
Unescape Escape View File

@ -1,4 +1,3 @@
import 'package:car_provider_app/api/client/user_api_client.dart'; import 'package:car_provider_app/api/client/user_api_client.dart';
import 'package:car_provider_app/classes/utils.dart'; import 'package:car_provider_app/classes/utils.dart';
import 'package:car_provider_app/config/routes.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/message_dialog.dart';
import 'package:car_provider_app/widgets/dialog/otp_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/button/show_fill_button.dart';
import 'package:car_provider_app/widgets/txt_field.dart';
import 'package:easy_localization/src/public_ext.dart'; import 'package:easy_localization/src/public_ext.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -20,7 +20,6 @@ import 'dart:convert';
import 'package:http/http.dart'; import 'package:http/http.dart';
class ChangeEmailPage extends StatefulWidget { class ChangeEmailPage extends StatefulWidget {
@override @override
State<ChangeEmailPage> createState() => _ChangeEmailPageState(); State<ChangeEmailPage> createState() => _ChangeEmailPageState();
} }
@ -32,46 +31,22 @@ class _ChangeEmailPageState extends State<ChangeEmailPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: appBar(context,title: "Change Email"), appBar: appBar(context, title: LocaleKeys.changeEmail.tr()),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Container( child: Container(
// width: double.infinity, // width: double.infinity,
// height: double.infinity, // height: double.infinity,
padding: EdgeInsets.all(40), padding: EdgeInsets.all(20),
child: Column( child: Column(
children: [ children: [
"Enter Email".toText24(), LocaleKeys.enterEmail.tr().toText24(),
12.height, 12.height,
TextFormField( TxtField(hint: LocaleKeys.enterNewEmail.tr(), onChanged: (v) => email = v,),
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,
),
12.height, 12.height,
TextFormField( TxtField(hint: LocaleKeys.enterCurrentPassword.tr(), onChanged: (v) => password = v,),
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,
),
40.height, 40.height,
ShowFillButton( ShowFillButton(
title: "Confirm", title: LocaleKeys.confirm.tr(),
maxWidth: double.infinity, maxWidth: double.infinity,
onPressed: () { onPressed: () {
changeEmail(context); changeEmail(context);
@ -114,5 +89,4 @@ class _ChangeEmailPageState extends State<ChangeEmailPage> {
Utils.showToast(otpRequest.message ?? ""); Utils.showToast(otpRequest.message ?? "");
} }
} }
} }

43
lib/pages/user/change_mobile_page.dart
Unescape Escape View File

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

30
lib/pages/user/change_password_page.dart
Unescape Escape View File

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

15
lib/pages/user/forget_password_method_page.dart
Unescape Escape View File

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

2
lib/pages/user/login_with_password_page.dart
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save