App Version added and dart format
This commit is contained in:
@@ -14,12 +14,13 @@ class ChangePasswordOTPScreen extends StatefulWidget {
|
||||
const ChangePasswordOTPScreen({
|
||||
required this.currentPassword,
|
||||
required this.newPassword,
|
||||
required this.confirmPassword,
|
||||
required this.confirmPassword,
|
||||
required this.mobileNumber,
|
||||
});
|
||||
|
||||
@override
|
||||
State<ChangePasswordOTPScreen> createState() => _ChangePasswordOTPScreenState();
|
||||
State<ChangePasswordOTPScreen> createState() =>
|
||||
_ChangePasswordOTPScreenState();
|
||||
}
|
||||
|
||||
class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
|
||||
@@ -36,33 +37,33 @@ class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
final changePasswordService = getIt<ChangePasswordService>();
|
||||
Future<void> _validateOTP() async {
|
||||
try {
|
||||
await changePasswordService.validateOtp(
|
||||
otp: otpController.text,
|
||||
mobileNumber: widget.mobileNumber,
|
||||
);
|
||||
try {
|
||||
await changePasswordService.validateOtp(
|
||||
otp: otpController.text,
|
||||
mobileNumber: widget.mobileNumber,
|
||||
);
|
||||
|
||||
// If OTP is valid, then change the password
|
||||
await changePasswordService.validateChangePwd(
|
||||
OldLPsw: widget.currentPassword,
|
||||
newLPsw: widget.newPassword,
|
||||
confirmLPsw: widget.confirmPassword,
|
||||
);
|
||||
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text(AppLocalizations.of(context).pwdchangeSuccess)),
|
||||
);
|
||||
// If OTP is valid, then change the password
|
||||
await changePasswordService.validateChangePwd(
|
||||
OldLPsw: widget.currentPassword,
|
||||
newLPsw: widget.newPassword,
|
||||
confirmLPsw: widget.confirmPassword,
|
||||
);
|
||||
|
||||
// Navigate back to profile or login
|
||||
Navigator.of(context).popUntil((route) => route.isFirst);
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text(AppLocalizations.of(context).pwdchangeSuccess)),
|
||||
);
|
||||
|
||||
} catch (e) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
|
||||
);
|
||||
}
|
||||
// Navigate back to profile or login
|
||||
Navigator.of(context).popUntil((route) => route.isFirst);
|
||||
} catch (e) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -106,4 +107,4 @@ class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,38 +56,40 @@ class _ChangePasswordScreenState extends State<ChangePasswordScreen> {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
final ChangePasswordService _changePasswordService = getIt<ChangePasswordService>();
|
||||
void _proceed() async {
|
||||
if (_formKey.currentState!.validate()) {
|
||||
|
||||
final ChangePasswordService _changePasswordService =
|
||||
getIt<ChangePasswordService>();
|
||||
void _proceed() async {
|
||||
if (_formKey.currentState!.validate()) {
|
||||
try {
|
||||
await _changePasswordService.getOtp(mobileNumber: widget.mobileNumber);
|
||||
|
||||
try {
|
||||
await _changePasswordService.getOtp(mobileNumber: widget.mobileNumber);
|
||||
|
||||
|
||||
Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
builder: (context) => ChangePasswordOTPScreen(
|
||||
currentPassword: currentPasswordController.text,
|
||||
newPassword: newPasswordController.text,
|
||||
confirmPassword: confirmPasswordController.text,
|
||||
mobileNumber: widget.mobileNumber,
|
||||
Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
builder: (context) => ChangePasswordOTPScreen(
|
||||
currentPassword: currentPasswordController.text,
|
||||
newPassword: newPasswordController.text,
|
||||
confirmPassword: confirmPasswordController.text,
|
||||
mobileNumber: widget.mobileNumber,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
} catch (e) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text('${AppLocalizations.of(context).failedtosentOTP}: $e')),
|
||||
);
|
||||
);
|
||||
} catch (e) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content:
|
||||
Text('${AppLocalizations.of(context).failedtosentOTP}: $e')),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(title: Text(AppLocalizations.of(context).changeLoginPassword)),
|
||||
appBar:
|
||||
AppBar(title: Text(AppLocalizations.of(context).changeLoginPassword)),
|
||||
body: Padding(
|
||||
padding: const EdgeInsets.all(16),
|
||||
child: Form(
|
||||
@@ -103,8 +105,8 @@ void _proceed() async {
|
||||
icon: Icon(_showCurrentPassword
|
||||
? Icons.visibility
|
||||
: Icons.visibility_off),
|
||||
onPressed: () =>
|
||||
setState(() => _showCurrentPassword = !_showCurrentPassword),
|
||||
onPressed: () => setState(
|
||||
() => _showCurrentPassword = !_showCurrentPassword),
|
||||
),
|
||||
),
|
||||
validator: validateCurrentPassword,
|
||||
@@ -135,8 +137,8 @@ void _proceed() async {
|
||||
icon: Icon(_showConfirmPassword
|
||||
? Icons.visibility
|
||||
: Icons.visibility_off),
|
||||
onPressed: () =>
|
||||
setState(() => _showConfirmPassword = !_showConfirmPassword),
|
||||
onPressed: () => setState(
|
||||
() => _showConfirmPassword = !_showConfirmPassword),
|
||||
),
|
||||
),
|
||||
validator: validateConfirmPassword,
|
||||
@@ -152,4 +154,4 @@ void _proceed() async {
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user