mazyar/tm_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add forgot password, reset password, and verify OTP providers and view models

Browse Source 
- Implemented `ForgotPasswordViewModel`, `ResetPasswordViewModel`, and `VerifyOtpViewModel` for handling respective functionalities.
- Created provider functions for lazy loading of these view models in the app.
- Updated routing to utilize the new providers for managing state in the forgot password flow.
- Refactored UI components to integrate with the new view models, ensuring proper state management and user feedback during operations.
This commit is contained in:
amirrezaghabeli
2025-10-06 15:39:08 +03:30
parent b522bc77a9
commit cee5e6c6d6
23 changed files with 490 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/views/forget_password_create/pages/d_forget_password_create_page.dart
+14 -12
View File
@@ -9,12 +9,13 @@ import '../../../core/constants/assets.dart';
import '../../../core/routes/app_routes.dart';
import '../../../core/theme/colors.dart';
import '../../../core/utils/app_toast.dart';
import '../../../view_models/auth_view_model.dart';
import '../../../view_models/reset_password_view_model.dart';
import '../../login/widgets/login_textfield.dart';
import '../../shared/base_button.dart';
class DesktopForgotPasswordCreatePage extends StatefulWidget {
const DesktopForgotPasswordCreatePage({super.key});
const DesktopForgotPasswordCreatePage({required this.resetToken, super.key});
final String resetToken;
@override
State<DesktopForgotPasswordCreatePage> createState() =>
@@ -23,11 +24,11 @@ class DesktopForgotPasswordCreatePage extends StatefulWidget {
class _DesktopForgotPasswordCreatePageState
extends State<DesktopForgotPasswordCreatePage> {
late final AuthViewModel viewModel;
late final ResetPasswordViewModel viewModel;
@override
void initState() {
viewModel = context.read<AuthViewModel>();
viewModel = context.read<ResetPasswordViewModel>();
viewModel.addListener(_viewModelListener);
super.initState();
}
@@ -39,10 +40,9 @@ class _DesktopForgotPasswordCreatePageState
}
void _viewModelListener() {
if (viewModel.resetPasswordErrorMessage != null) {
AppToast.error(context, viewModel.resetPasswordErrorMessage!);
} else if (viewModel.isResetPasswordLoading == false &&
viewModel.resetPasswordSuccess) {
if (viewModel.errorMessage != null) {
AppToast.error(context, viewModel.errorMessage!);
} else if (viewModel.isLoading == false && viewModel.successMessage) {
AppToast.success(
context,
ForgotPasswordCreateStrings.passwordResetSuccess,
@@ -60,7 +60,7 @@ class _DesktopForgotPasswordCreatePageState
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Consumer<AuthViewModel>(
Consumer<ResetPasswordViewModel>(
builder: (context, viewModel, _) {
return Expanded(
child: Center(
@@ -103,7 +103,7 @@ class _DesktopForgotPasswordCreatePageState
label: ForgotPasswordCreateStrings.createNewPassword,
iconPath: AssetsManager.passwordIcon,
isPassword: true,
obscureText: viewModel.obscureForgotPassword,
obscureText: viewModel.obscureNewPassword,
onToggleVisibility:
viewModel.toggleForgotPasswordVisibility,
),
@@ -156,7 +156,7 @@ class _DesktopForgotPasswordCreatePageState
),
),
SizedBox(height: 80.0.h()),
viewModel.isResetPasswordLoading
viewModel.isLoading
? BaseButton(
isEnabled: viewModel.isNewPasswordValid,
text: ForgotPasswordCreateStrings.resetLink,
@@ -169,7 +169,9 @@ class _DesktopForgotPasswordCreatePageState
onPressed:
viewModel.isNewPasswordValid
? () async {
viewModel.resetPassword();
viewModel.resetPassword(
resetToken: widget.resetToken,
);
}
: null,
),
lib/views/forget_password_create/pages/forgot_password_create_screen.dart
+6 -5
View File
@@ -6,14 +6,15 @@ import 'package:tm_app/views/forget_password_create/pages/t_forget_password_crea
import '../../shared/responsive_builder.dart';
class ForgotPasswordCreateScreen extends StatelessWidget {
const ForgotPasswordCreateScreen({super.key});
const ForgotPasswordCreateScreen({required this.resetToken, super.key});
final String resetToken;
@override
Widget build(BuildContext context) {
return const ResponsiveBuilder(
mobile: MobileForgotPasswordCreatePage(),
tablet: TabletForgotPasswordCreatePage(),
desktop: DesktopForgotPasswordCreatePage(),
return ResponsiveBuilder(
mobile: MobileForgotPasswordCreatePage(resetToken: resetToken),
tablet: TabletForgotPasswordCreatePage(resetToken: resetToken),
desktop: DesktopForgotPasswordCreatePage(resetToken: resetToken),
);
}
}
lib/views/forget_password_create/pages/m_forget_password_create_page.dart
+14 -12
View File
@@ -9,12 +9,13 @@ import 'package:tm_app/views/forget_password_create/strings/forgot_password_crea
import '../../../core/constants/assets.dart';
import '../../../core/theme/colors.dart';
import '../../../core/utils/app_toast.dart';
import '../../../view_models/auth_view_model.dart';
import '../../../view_models/reset_password_view_model.dart';
import '../../login/widgets/login_textfield.dart';
import '../../shared/base_button.dart';
class MobileForgotPasswordCreatePage extends StatefulWidget {
const MobileForgotPasswordCreatePage({super.key});
const MobileForgotPasswordCreatePage({required this.resetToken, super.key});
final String resetToken;
@override
State<MobileForgotPasswordCreatePage> createState() =>
@@ -23,11 +24,11 @@ class MobileForgotPasswordCreatePage extends StatefulWidget {
class _MobileForgotPasswordCreatePageState
extends State<MobileForgotPasswordCreatePage> {
late final AuthViewModel viewModel;
late final ResetPasswordViewModel viewModel;
@override
void initState() {
viewModel = context.read<AuthViewModel>();
viewModel = context.read<ResetPasswordViewModel>();
viewModel.addListener(_viewModelListener);
super.initState();
}
@@ -39,10 +40,9 @@ class _MobileForgotPasswordCreatePageState
}
void _viewModelListener() {
if (viewModel.resetPasswordErrorMessage != null) {
AppToast.error(context, viewModel.resetPasswordErrorMessage!);
} else if (viewModel.isResetPasswordLoading == false &&
viewModel.resetPasswordSuccess) {
if (viewModel.errorMessage != null) {
AppToast.error(context, viewModel.errorMessage!);
} else if (viewModel.isLoading == false && viewModel.successMessage) {
AppToast.success(
context,
ForgotPasswordCreateStrings.passwordResetSuccess,
@@ -61,7 +61,7 @@ class _MobileForgotPasswordCreatePageState
child: Center(
child: SingleChildScrollView(
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
child: Consumer<AuthViewModel>(
child: Consumer<ResetPasswordViewModel>(
builder: (context, viewModel, _) {
return Column(
mainAxisSize: MainAxisSize.min,
@@ -100,7 +100,7 @@ class _MobileForgotPasswordCreatePageState
label: ForgotPasswordCreateStrings.createNewPassword,
iconPath: AssetsManager.passwordIcon,
isPassword: true,
obscureText: viewModel.obscureForgotPassword,
obscureText: viewModel.obscureNewPassword,
onToggleVisibility:
viewModel.toggleForgotPasswordVisibility,
),
@@ -153,7 +153,7 @@ class _MobileForgotPasswordCreatePageState
),
),
SizedBox(height: 80.0.h()),
viewModel.isResetPasswordLoading
viewModel.isLoading
? BaseButton(
isEnabled: viewModel.isNewPasswordValid,
text: ForgotPasswordCreateStrings.resetLink,
@@ -166,7 +166,9 @@ class _MobileForgotPasswordCreatePageState
onPressed:
viewModel.isNewPasswordValid
? () async {
viewModel.resetPassword();
viewModel.resetPassword(
resetToken: widget.resetToken,
);
}
: null,
),
lib/views/forget_password_create/pages/t_forget_password_create_page.dart
+14 -12
View File
@@ -9,12 +9,13 @@ import '../../../core/constants/assets.dart';
import '../../../core/routes/app_routes.dart';
import '../../../core/theme/colors.dart';
import '../../../core/utils/app_toast.dart';
import '../../../view_models/auth_view_model.dart';
import '../../../view_models/reset_password_view_model.dart';
import '../../login/widgets/login_textfield.dart';
import '../../shared/base_button.dart';
class TabletForgotPasswordCreatePage extends StatefulWidget {
const TabletForgotPasswordCreatePage({super.key});
const TabletForgotPasswordCreatePage({required this.resetToken, super.key});
final String resetToken;
@override
State<TabletForgotPasswordCreatePage> createState() =>
@@ -23,11 +24,11 @@ class TabletForgotPasswordCreatePage extends StatefulWidget {
class _TabletForgotPasswordCreatePageState
extends State<TabletForgotPasswordCreatePage> {
late final AuthViewModel viewModel;
late final ResetPasswordViewModel viewModel;
@override
void initState() {
viewModel = context.read<AuthViewModel>();
viewModel = context.read<ResetPasswordViewModel>();
viewModel.addListener(_viewModelListener);
super.initState();
}
@@ -39,10 +40,9 @@ class _TabletForgotPasswordCreatePageState
}
void _viewModelListener() {
if (viewModel.resetPasswordErrorMessage != null) {
AppToast.error(context, viewModel.resetPasswordErrorMessage!);
} else if (viewModel.isResetPasswordLoading == false &&
viewModel.resetPasswordSuccess) {
if (viewModel.errorMessage != null) {
AppToast.error(context, viewModel.errorMessage!);
} else if (viewModel.isLoading == false && viewModel.successMessage) {
AppToast.success(
context,
ForgotPasswordCreateStrings.passwordResetSuccess,
@@ -59,7 +59,7 @@ class _TabletForgotPasswordCreatePageState
body: Center(
child: SingleChildScrollView(
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
child: Consumer<AuthViewModel>(
child: Consumer<ResetPasswordViewModel>(
builder: (context, viewModel, _) {
return Center(
child: SizedBox(
@@ -101,7 +101,7 @@ class _TabletForgotPasswordCreatePageState
label: ForgotPasswordCreateStrings.createNewPassword,
iconPath: AssetsManager.passwordIcon,
isPassword: true,
obscureText: viewModel.obscureForgotPassword,
obscureText: viewModel.obscureNewPassword,
onToggleVisibility:
viewModel.toggleForgotPasswordVisibility,
),
@@ -154,7 +154,7 @@ class _TabletForgotPasswordCreatePageState
),
),
SizedBox(height: 70.0.h()),
viewModel.isResetPasswordLoading
viewModel.isLoading
? BaseButton(
isEnabled: viewModel.isNewPasswordValid,
text: ForgotPasswordCreateStrings.resetLink,
@@ -168,7 +168,9 @@ class _TabletForgotPasswordCreatePageState
onPressed:
viewModel.isNewPasswordValid
? () async {
viewModel.resetPassword();
viewModel.resetPassword(
resetToken: widget.resetToken,
);
}
: null,
),
lib/views/forget_password_otp/pages/d_forget_password_otp_page.dart
+16 -11
View File
@@ -9,12 +9,13 @@ import '../../../core/constants/assets.dart';
import '../../../core/routes/app_routes.dart';
import '../../../core/theme/colors.dart';
import '../../../core/utils/app_toast.dart';
import '../../../view_models/auth_view_model.dart';
import '../../../view_models/verify_otp_view_model.dart';
import '../../shared/base_button.dart';
import '../strings/forgot_password_otp_strings.dart';
class DesktopForgotPasswordOtpPage extends StatefulWidget {
const DesktopForgotPasswordOtpPage({super.key});
const DesktopForgotPasswordOtpPage({required this.email, super.key});
final String email;
@override
State<DesktopForgotPasswordOtpPage> createState() =>
@@ -23,24 +24,26 @@ class DesktopForgotPasswordOtpPage extends StatefulWidget {
class _DesktopForgotPasswordOtpPageState
extends State<DesktopForgotPasswordOtpPage> {
late final AuthViewModel viewModel;
late final VerifyOtpViewModel viewModel;
@override
void initState() {
super.initState();
viewModel = context.read<AuthViewModel>();
viewModel = context.read<VerifyOtpViewModel>();
viewModel.addListener(_viewModelListener);
}
void _viewModelListener() {
if (viewModel.errorMessageOtp != null) {
AppToast.error(context, viewModel.errorMessageOtp!);
} else if (!viewModel.isLoadingOtp &&
if (viewModel.errorMessage != null) {
AppToast.error(context, viewModel.errorMessage!);
} else if (!viewModel.isLoading &&
viewModel.verifyOtpSuccess &&
viewModel.resetToken != null) {
Router.neglect(
context,
() => const ForgotPasswordCreateRouteData().pushReplacement(context),
() => ForgotPasswordCreateRouteData(
resetToken: viewModel.resetToken!,
).pushReplacement(context),
);
viewModel.clearOtpFlow();
}
@@ -56,7 +59,7 @@ class _DesktopForgotPasswordOtpPageState
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColors.backgroundColor,
body: Consumer<AuthViewModel>(
body: Consumer<VerifyOtpViewModel>(
builder: (context, viewModel, _) {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -115,7 +118,7 @@ class _DesktopForgotPasswordOtpPageState
),
),
SizedBox(height: 24.0.h()),
viewModel.isLoadingOtp
viewModel.isLoading
? BaseButton(
isEnabled: viewModel.isOtpValid,
text: ForgotPasswordOtpStrings.resetLink,
@@ -128,7 +131,9 @@ class _DesktopForgotPasswordOtpPageState
onPressed:
viewModel.canSubmitOtpPage
? () async {
await viewModel.verifyOtp();
await viewModel.verifyOtp(
email: widget.email,
);
}
: null,
),
lib/views/forget_password_otp/pages/forgot_password_otp_screen.dart
+6 -5
View File
@@ -7,15 +7,16 @@ import 'package:tm_app/views/forget_password_otp/pages/t_forget_password_otp_pag
import '../../shared/responsive_builder.dart';
class ForgotPasswordOtpScreen extends StatelessWidget {
const ForgotPasswordOtpScreen({super.key});
const ForgotPasswordOtpScreen({required this.email, super.key});
final String email;
@override
Widget build(BuildContext context) {
SizeConfig.init(context);
return const ResponsiveBuilder(
mobile: MobileForgotPasswordOtpPage(),
tablet: TabletForgotPasswordOtpPage(),
desktop: DesktopForgotPasswordOtpPage(),
return ResponsiveBuilder(
mobile: MobileForgotPasswordOtpPage(email: email),
tablet: TabletForgotPasswordOtpPage(email: email),
desktop: DesktopForgotPasswordOtpPage(email: email),
);
}
}
lib/views/forget_password_otp/pages/m_forget_password_otp_page.dart
+16 -11
View File
@@ -9,12 +9,13 @@ import 'package:tm_app/core/utils/size_config.dart';
import '../../../core/constants/assets.dart';
import '../../../core/theme/colors.dart';
import '../../../core/utils/app_toast.dart';
import '../../../view_models/auth_view_model.dart';
import '../../../view_models/verify_otp_view_model.dart';
import '../../shared/base_button.dart';
import '../strings/forgot_password_otp_strings.dart';
class MobileForgotPasswordOtpPage extends StatefulWidget {
const MobileForgotPasswordOtpPage({super.key});
const MobileForgotPasswordOtpPage({required this.email, super.key});
final String email;
@override
State<MobileForgotPasswordOtpPage> createState() =>
@@ -23,22 +24,24 @@ class MobileForgotPasswordOtpPage extends StatefulWidget {
class _MobileForgotPasswordOtpPageState
extends State<MobileForgotPasswordOtpPage> {
late final AuthViewModel viewModel;
late final VerifyOtpViewModel viewModel;
@override
void initState() {
super.initState();
viewModel = context.read<AuthViewModel>();
viewModel = context.read<VerifyOtpViewModel>();
viewModel.addListener(_viewModelListener);
}
void _viewModelListener() {
if (viewModel.errorMessageOtp != null) {
AppToast.error(context, viewModel.errorMessageOtp!);
} else if (!viewModel.isLoadingOtp &&
if (viewModel.errorMessage != null) {
AppToast.error(context, viewModel.errorMessage!);
} else if (!viewModel.isLoading &&
viewModel.verifyOtpSuccess &&
viewModel.resetToken != null) {
const ForgotPasswordCreateRouteData().pushReplacement(context);
ForgotPasswordCreateRouteData(
resetToken: viewModel.resetToken!,
).pushReplacement(context);
viewModel.clearOtpFlow();
}
}
@@ -57,7 +60,7 @@ class _MobileForgotPasswordOtpPageState
child: Center(
child: SingleChildScrollView(
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
child: Consumer<AuthViewModel>(
child: Consumer<VerifyOtpViewModel>(
builder: (context, viewModel, _) {
return Column(
mainAxisSize: MainAxisSize.min,
@@ -109,7 +112,7 @@ class _MobileForgotPasswordOtpPageState
),
),
SizedBox(height: 24.0.h()),
viewModel.isLoadingOtp
viewModel.isLoading
? BaseButton(
isEnabled: viewModel.isOtpValid,
text: ForgotPasswordOtpStrings.resetLink,
@@ -122,7 +125,9 @@ class _MobileForgotPasswordOtpPageState
onPressed:
viewModel.canSubmitOtpPage
? () async {
await viewModel.verifyOtp();
await viewModel.verifyOtp(
email: widget.email,
);
}
: null,
),
lib/views/forget_password_otp/pages/t_forget_password_otp_page.dart
+16 -11
View File
@@ -9,12 +9,13 @@ import '../../../core/constants/assets.dart';
import '../../../core/routes/app_routes.dart';
import '../../../core/theme/colors.dart';
import '../../../core/utils/app_toast.dart';
import '../../../view_models/auth_view_model.dart';
import '../../../view_models/verify_otp_view_model.dart';
import '../../shared/base_button.dart';
import '../strings/forgot_password_otp_strings.dart';
class TabletForgotPasswordOtpPage extends StatefulWidget {
const TabletForgotPasswordOtpPage({super.key});
const TabletForgotPasswordOtpPage({required this.email, super.key});
final String email;
@override
State<TabletForgotPasswordOtpPage> createState() =>
@@ -23,24 +24,26 @@ class TabletForgotPasswordOtpPage extends StatefulWidget {
class _TabletForgotPasswordOtpPageState
extends State<TabletForgotPasswordOtpPage> {
late final AuthViewModel viewModel;
late final VerifyOtpViewModel viewModel;
@override
void initState() {
super.initState();
viewModel = context.read<AuthViewModel>();
viewModel = context.read<VerifyOtpViewModel>();
viewModel.addListener(_viewModelListener);
}
void _viewModelListener() {
if (viewModel.errorMessageOtp != null) {
AppToast.error(context, viewModel.errorMessageOtp!);
} else if (!viewModel.isLoadingOtp &&
if (viewModel.errorMessage != null) {
AppToast.error(context, viewModel.errorMessage!);
} else if (!viewModel.isLoading &&
viewModel.verifyOtpSuccess &&
viewModel.resetToken != null) {
Router.neglect(
context,
() => const ForgotPasswordCreateRouteData().pushReplacement(context),
() => ForgotPasswordCreateRouteData(
resetToken: viewModel.resetToken!,
).pushReplacement(context),
);
viewModel.clearOtpFlow();
}
@@ -59,7 +62,7 @@ class _TabletForgotPasswordOtpPageState
body: Center(
child: SingleChildScrollView(
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
child: Consumer<AuthViewModel>(
child: Consumer<VerifyOtpViewModel>(
builder: (context, viewModel, _) {
return Center(
child: SizedBox(
@@ -114,7 +117,7 @@ class _TabletForgotPasswordOtpPageState
),
),
SizedBox(height: 70.0.h()),
viewModel.isLoadingOtp
viewModel.isLoading
? BaseButton(
isEnabled: viewModel.isOtpValid,
text: ForgotPasswordOtpStrings.resetLink,
@@ -127,7 +130,9 @@ class _TabletForgotPasswordOtpPageState
onPressed:
viewModel.canSubmitOtpPage
? () async {
await viewModel.verifyOtp();
await viewModel.verifyOtp(
email: widget.email,
);
}
: null,
),
lib/views/forgot_password/pages/d_forgot_apssword_page.dart
+10 -8
View File
@@ -7,7 +7,7 @@ import 'package:tm_app/core/utils/size_config.dart';
import '../../../core/constants/assets.dart';
import '../../../core/theme/colors.dart';
import '../../../core/utils/app_toast.dart';
import '../../../view_models/auth_view_model.dart';
import '../../../view_models/Forgot_password_view_model.dart';
import '../../login/widgets/login_textfield.dart';
import '../../shared/base_button.dart';
import '../strings/forgot_password_strings.dart';
@@ -21,12 +21,12 @@ class DesktopForgotPasswordPage extends StatefulWidget {
}
class _DesktopForgotPasswordPageState extends State<DesktopForgotPasswordPage> {
late final AuthViewModel viewModel;
late final ForgotPasswordViewModel viewModel;
@override
void initState() {
super.initState();
viewModel = context.read<AuthViewModel>();
viewModel = context.read<ForgotPasswordViewModel>();
viewModel.addListener(_viewModelListener);
}
@@ -35,13 +35,15 @@ class _DesktopForgotPasswordPageState extends State<DesktopForgotPasswordPage> {
AppToast.success(context, viewModel.successMessage!);
Router.neglect(
context,
() => const ForgotPasswordOtpRouteData().pushReplacement(context),
() => ForgotPasswordOtpRouteData(
email: viewModel.emailController.text.trim(),
).pushReplacement(context),
);
viewModel.clearMessages();
}
if (viewModel.errorMessageForget != null) {
AppToast.error(context, viewModel.errorMessageForget!);
if (viewModel.errorMessage != null) {
AppToast.error(context, viewModel.errorMessage!);
viewModel.clearMessages();
}
}
@@ -57,7 +59,7 @@ class _DesktopForgotPasswordPageState extends State<DesktopForgotPasswordPage> {
return Scaffold(
backgroundColor: AppColors.backgroundColor,
body: Center(
child: Consumer<AuthViewModel>(
child: Consumer<ForgotPasswordViewModel>(
builder: (context, viewModel, _) {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -104,7 +106,7 @@ class _DesktopForgotPasswordPageState extends State<DesktopForgotPasswordPage> {
isPassword: false,
),
SizedBox(height: 70.0.h()),
viewModel.isLoadingForgot
viewModel.isLoading
? const BaseButton(
isEnabled: false,
text: ForgotPasswordStrings.resetLink,
lib/views/forgot_password/pages/m_forgot_password_page.dart
+10 -8
View File
@@ -6,8 +6,8 @@ import 'package:tm_app/core/routes/app_routes.dart';
import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/app_toast.dart';
import 'package:tm_app/core/utils/size_config.dart';
import 'package:tm_app/view_models/auth_view_model.dart';
import '../../../view_models/forgot_password_view_model.dart';
import '../../login/widgets/login_textfield.dart';
import '../../shared/base_button.dart';
import '../strings/forgot_password_strings.dart';
@@ -21,24 +21,26 @@ class MobileForgotPasswordPage extends StatefulWidget {
}
class _MobileForgotPasswordPageState extends State<MobileForgotPasswordPage> {
late final AuthViewModel viewModel;
late final ForgotPasswordViewModel viewModel;
@override
void initState() {
super.initState();
viewModel = context.read<AuthViewModel>();
viewModel = context.read<ForgotPasswordViewModel>();
viewModel.addListener(_viewModelListener);
}
void _viewModelListener() {
if (viewModel.successMessage != null) {
AppToast.success(context, viewModel.successMessage!);
const ForgotPasswordOtpRouteData().pushReplacement(context);
ForgotPasswordOtpRouteData(
email: viewModel.emailController.text.trim(),
).pushReplacement(context);
viewModel.clearMessages();
}
if (viewModel.errorMessageForget != null) {
AppToast.error(context, viewModel.errorMessageForget!);
if (viewModel.errorMessage != null) {
AppToast.error(context, viewModel.errorMessage!);
viewModel.clearMessages();
}
}
@@ -57,7 +59,7 @@ class _MobileForgotPasswordPageState extends State<MobileForgotPasswordPage> {
child: Center(
child: SingleChildScrollView(
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
child: Consumer<AuthViewModel>(
child: Consumer<ForgotPasswordViewModel>(
builder: (context, viewModel, _) {
return Column(
mainAxisSize: MainAxisSize.min,
@@ -97,7 +99,7 @@ class _MobileForgotPasswordPageState extends State<MobileForgotPasswordPage> {
isPassword: false,
),
SizedBox(height: 24.0.h()),
viewModel.isLoadingForgot
viewModel.isLoading
? const BaseButton(
isEnabled: false,
text: ForgotPasswordStrings.resetLink,
lib/views/forgot_password/pages/t_forgot_password_page.dart
+10 -8
View File
@@ -7,7 +7,7 @@ import 'package:tm_app/core/utils/size_config.dart';
import '../../../core/constants/assets.dart';
import '../../../core/theme/colors.dart';
import '../../../core/utils/app_toast.dart';
import '../../../view_models/auth_view_model.dart';
import '../../../view_models/forgot_password_view_model.dart';
import '../../login/widgets/login_textfield.dart';
import '../../shared/base_button.dart';
import '../strings/forgot_password_strings.dart';
@@ -21,12 +21,12 @@ class TabletForgotPasswordPage extends StatefulWidget {
}
class _TabletForgotPasswordPageState extends State<TabletForgotPasswordPage> {
late final AuthViewModel viewModel;
late final ForgotPasswordViewModel viewModel;
@override
void initState() {
super.initState();
viewModel = context.read<AuthViewModel>();
viewModel = context.read<ForgotPasswordViewModel>();
viewModel.addListener(_viewModelListener);
}
@@ -35,13 +35,15 @@ class _TabletForgotPasswordPageState extends State<TabletForgotPasswordPage> {
AppToast.success(context, viewModel.successMessage!);
Router.neglect(
context,
() => const ForgotPasswordOtpRouteData().pushReplacement(context),
() => ForgotPasswordOtpRouteData(
email: viewModel.emailController.text.trim(),
).pushReplacement(context),
);
viewModel.clearMessages();
}
if (viewModel.errorMessageForget != null) {
AppToast.error(context, viewModel.errorMessageForget!);
if (viewModel.errorMessage != null) {
AppToast.error(context, viewModel.errorMessage!);
viewModel.clearMessages();
}
}
@@ -55,7 +57,7 @@ class _TabletForgotPasswordPageState extends State<TabletForgotPasswordPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
body: Consumer<AuthViewModel>(
body: Consumer<ForgotPasswordViewModel>(
builder: (context, viewModel, _) {
return Center(
child: SizedBox(
@@ -98,7 +100,7 @@ class _TabletForgotPasswordPageState extends State<TabletForgotPasswordPage> {
isPassword: false,
),
SizedBox(height: 70.0.h()),
viewModel.isLoadingForgot
viewModel.isLoading
? const BaseButton(
isEnabled: false,
text: ForgotPasswordStrings.resetLink,
lib/views/profile/pages/d_profile_page.dart
+2
View File
@@ -9,6 +9,7 @@ import '../../../core/constants/common_strings.dart';
import '../../../core/theme/colors.dart';
import '../../../core/utils/app_toast.dart';
import '../../../core/utils/size_config.dart';
import '../../../view_models/auth_view_model.dart';
import '../../shared/desktop_navigation_widget.dart';
import '../strings/profile_strings.dart';
import '../widgets/theme_toggle.dart';
@@ -35,6 +36,7 @@ class _DesktopProfilePageState extends State<DesktopProfilePage> {
AppToast.error(context, viewModel.errorMessage!);
}
if (viewModel.loggedOut) {
context.read<AuthViewModel>().clearAuthFlow();
Router.neglect(context, () => const LoginScreenRoute().go(context));
}
}
lib/views/profile/pages/m_profile_page.dart
+2
View File
@@ -10,6 +10,7 @@ import '../../../core/constants/common_strings.dart';
import '../../../core/theme/colors.dart';
import '../../../core/utils/app_toast.dart';
import '../../../core/utils/size_config.dart';
import '../../../view_models/auth_view_model.dart';
import '../../shared/tender_app_bar.dart';
import '../strings/profile_strings.dart';
import '../widgets/title_description.dart';
@@ -36,6 +37,7 @@ class _MobileProfilePageState extends State<MobileProfilePage> {
AppToast.error(context, viewModel.errorMessage!);
}
if (viewModel.loggedOut) {
context.read<AuthViewModel>().clearAuthFlow();
Router.neglect(context, () => const LoginScreenRoute().go(context));
}
}
lib/views/profile/pages/t_profile_page.dart
+2
View File
@@ -9,6 +9,7 @@ import 'package:tm_app/view_models/profile_view_model.dart';
import '../../../core/theme/colors.dart';
import '../../../core/utils/app_toast.dart';
import '../../../core/utils/size_config.dart';
import '../../../view_models/auth_view_model.dart';
import '../../shared/tablet_navigation_widget.dart';
import '../../shared/tender_app_bar.dart';
import '../strings/profile_strings.dart';
@@ -36,6 +37,7 @@ class _TabletProfilePageState extends State<TabletProfilePage> {
AppToast.error(context, viewModel.errorMessage!);
}
if (viewModel.loggedOut) {
context.read<AuthViewModel>().clearAuthFlow();
Router.neglect(context, () => const LoginScreenRoute().go(context));
}
}