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

fixed logout at refresh failed

Browse Source
This commit is contained in:
amirrezaghabeli
2026-04-16 16:36:55 +03:30
parent 41bba5d32c
commit cc0032b21d
12 changed files with 475 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/views/login/pages/login_desktop_page.dart
+74 -61
View File
@@ -56,76 +56,89 @@ class _LoginDesktopPageState extends State<LoginDesktopPage> {
child: Center(
child: SizedBox(
width: 364,
child: Consumer<AuthViewModel>(
builder: (context, viewModel, _) {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
SvgPicture.asset(
AssetsManager.logoBig,
width: 320,
height: 50,
fit: BoxFit.cover,
),
SizedBox(height: 72.0.h()),
const LoginTitle(),
SizedBox(height: 32.0.h()),
LoginTextField(
controller: viewModel.usernameController,
focusNode: viewModel.usernameFocus,
label: LoginStrings.usernameLabel,
iconPath: AssetsManager.userIcon,
fieldHeight: 60.0.h(),
borderRedus: 12,
prefixIconPadding: 7.0.w(),
),
SizedBox(height: 16.0.h()),
LoginTextField(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
SvgPicture.asset(
AssetsManager.logoBig,
width: 320,
height: 50,
fit: BoxFit.cover,
),
SizedBox(height: 72.0.h()),
const LoginTitle(),
SizedBox(height: 32.0.h()),
LoginTextField(
controller: viewModel.usernameController,
focusNode: viewModel.usernameFocus,
label: LoginStrings.usernameLabel,
iconPath: AssetsManager.userIcon,
fieldHeight: 60.0.h(),
borderRedus: 12,
prefixIconPadding: 7.0.w(),
),
SizedBox(height: 16.0.h()),
Selector<AuthViewModel, bool>(
selector: (_, vm) => vm.obscurePassword,
builder: (_, obscurePassword, __) {
return LoginTextField(
controller: viewModel.passwordController,
focusNode: viewModel.passwordFocus,
label: LoginStrings.passwordLabel,
iconPath: AssetsManager.passwordIcon,
prefixIconPadding: 7.0.w(),
isPassword: true,
obscureText: viewModel.obscurePassword,
fieldHeight: 60.0.h(),
obscureText: obscurePassword,
onToggleVisibility:
viewModel.togglePasswordVisibility,
borderRedus: 12,
),
SizedBox(height: 32.0.h()),
if (viewModel.isLoading)
const BaseButton(
isEnabled: false,
onPressed: null,
isLoading: true,
)
else
BaseButton(
isEnabled: viewModel.isLoginEnabled,
onPressed: () async {
if (viewModel.isLoginEnabled) {
await viewModel.login();
}
},
),
const SizedBox(height: 32.0),
TextButton(
onPressed: () {
const ForgotPasswordRouteData().push(context);
);
},
),
SizedBox(height: 32.0.h()),
/// ✅ Only this part rebuilds now
Selector<AuthViewModel, bool>(
selector: (_, vm) => vm.isLoading,
builder: (_, isLoading, __) {
return Selector<AuthViewModel, bool>(
selector: (_, vm) => vm.isLoginEnabled,
builder: (_, isEnabled, __) {
if (isLoading) {
return BaseButton(
isEnabled: false,
onPressed: null,
isLoading: true,
textColor: AppColors.white,
);
}
return BaseButton(
isEnabled: isEnabled,
onPressed:
isEnabled
? () async {
await viewModel.login();
}
: null,
);
},
child: Text(
LoginStrings.forgotPassword,
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.mainBlue,
),
),
);
},
),
const SizedBox(height: 32.0),
TextButton(
onPressed: () {
const ForgotPasswordRouteData().push(context);
},
child: Text(
LoginStrings.forgotPassword,
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.mainBlue,
),
],
);
},
),
),
],
),
),
),
lib/views/login/pages/login_mobile_page.dart
+73 -59
View File
@@ -50,76 +50,90 @@ class _LoginMobilePageState extends State<LoginMobilePage> {
child: Center(
child: SingleChildScrollView(
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
child: Consumer<AuthViewModel>(
builder: (context, viewModel, _) {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
// LoginLogo(width: 190.0.w(), height: 88.0.h()),
Padding(
padding: EdgeInsets.symmetric(horizontal: 22.0.w()),
child: SvgPicture.asset(
AssetsManager.logoBig,
width: double.infinity,
height: 50.0.h(),
),
),
SizedBox(height: 32.0.h()),
const LoginTitle(),
SizedBox(height: 32.0.h()),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
// LoginLogo(width: 190.0.w(), height: 88.0.h()),
Padding(
padding: EdgeInsets.symmetric(horizontal: 22.0.w()),
child: SvgPicture.asset(
AssetsManager.logoBig,
width: double.infinity,
height: 50.0.h(),
),
),
SizedBox(height: 32.0.h()),
const LoginTitle(),
SizedBox(height: 32.0.h()),
LoginTextField(
controller: viewModel.usernameController,
focusNode: viewModel.usernameFocus,
label: LoginStrings.usernameLabel,
iconPath: AssetsManager.userIcon,
),
SizedBox(height: 16.0.h()),
LoginTextField(
controller: viewModel.usernameController,
focusNode: viewModel.usernameFocus,
label: LoginStrings.usernameLabel,
iconPath: AssetsManager.userIcon,
),
SizedBox(height: 16.0.h()),
LoginTextField(
Selector<AuthViewModel, bool>(
selector: (_, vm) => vm.obscurePassword,
builder: (_, obscurePassword, __) {
return LoginTextField(
controller: viewModel.passwordController,
focusNode: viewModel.passwordFocus,
label: LoginStrings.passwordLabel,
iconPath: AssetsManager.passwordIcon,
isPassword: true,
obscureText: viewModel.obscurePassword,
obscureText: obscurePassword,
onToggleVisibility: viewModel.togglePasswordVisibility,
),
SizedBox(height: 32.0.h()),
);
},
),
SizedBox(height: 32.0.h()),
if (viewModel.isLoading)
BaseButton(
isEnabled: false,
onPressed: null,
isLoading: true,
textColor: AppColors.white,
)
else
BaseButton(
isEnabled: viewModel.isLoginEnabled,
onPressed: () async {
if (viewModel.isLoginEnabled) {
await viewModel.login();
}
},
),
SizedBox(height: 32.0.h()),
TextButton(
onPressed: () {
const ForgotPasswordRouteData().push(context);
/// ✅ Only this part rebuilds now
Selector<AuthViewModel, bool>(
selector: (_, vm) => vm.isLoading,
builder: (_, isLoading, __) {
return Selector<AuthViewModel, bool>(
selector: (_, vm) => vm.isLoginEnabled,
builder: (_, isEnabled, __) {
if (isLoading) {
return BaseButton(
isEnabled: false,
onPressed: null,
isLoading: true,
textColor: AppColors.white,
);
}
return BaseButton(
isEnabled: isEnabled,
onPressed:
isEnabled
? () async {
await viewModel.login();
}
: null,
);
},
child: Text(
LoginStrings.forgotPassword,
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.mainBlue,
),
),
);
},
),
SizedBox(height: 32.0.h()),
TextButton(
onPressed: () {
const ForgotPasswordRouteData().push(context);
},
child: Text(
LoginStrings.forgotPassword,
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.mainBlue,
),
],
);
},
),
),
],
),
),
),
lib/views/login/pages/login_tablet_page.dart
+76 -64
View File
@@ -52,78 +52,90 @@ class _LoginTabletPageState extends State<LoginTabletPage> {
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
child: SizedBox(
width: 364.0.w(),
child: Consumer<AuthViewModel>(
builder: (context, viewModel, _) {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 22.0.w()),
child: SvgPicture.asset(
AssetsManager.logoBig,
width: double.infinity,
height: 50.0.h(),
),
),
SizedBox(height: 72.0.h()),
const LoginTitle(),
SizedBox(height: 40.0.h()),
LoginTextField(
controller: viewModel.usernameController,
focusNode: viewModel.usernameFocus,
label: LoginStrings.usernameLabel,
iconPath: AssetsManager.userIcon,
fieldHeight: 60.0.h(),
borderRedus: 12,
prefixIconPadding: 4.0.w(),
),
SizedBox(height: 24.0.h()),
LoginTextField(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 22.0.w()),
child: SvgPicture.asset(
AssetsManager.logoBig,
width: double.infinity,
height: 50.0.h(),
),
),
SizedBox(height: 72.0.h()),
const LoginTitle(),
SizedBox(height: 40.0.h()),
LoginTextField(
controller: viewModel.usernameController,
focusNode: viewModel.usernameFocus,
label: LoginStrings.usernameLabel,
iconPath: AssetsManager.userIcon,
fieldHeight: 60.0.h(),
borderRedus: 12,
prefixIconPadding: 4.0.w(),
),
SizedBox(height: 24.0.h()),
Selector<AuthViewModel, bool>(
selector: (_, vm) => vm.obscurePassword,
builder: (_, obscurePassword, __) {
return LoginTextField(
controller: viewModel.passwordController,
focusNode: viewModel.passwordFocus,
label: LoginStrings.passwordLabel,
iconPath: AssetsManager.passwordIcon,
prefixIconPadding: 4.0.w(),
isPassword: true,
obscureText: viewModel.obscurePassword,
fieldHeight: 60.0.h(),
obscureText: obscurePassword,
onToggleVisibility: viewModel.togglePasswordVisibility,
borderRedus: 12,
),
SizedBox(height: 70.0.h()),
if (viewModel.isLoading)
const BaseButton(
isEnabled: false,
onPressed: null,
isLoading: true,
)
else
BaseButton(
isEnabled: viewModel.isLoginEnabled,
onPressed:
viewModel.isLoginEnabled
? () async {
await viewModel.login();
}
: null,
),
SizedBox(height: 30.0.h()),
TextButton(
onPressed: () {
const ForgotPasswordRouteData().push(context);
);
},
),
SizedBox(height: 70.0.h()),
/// ✅ Only this part rebuilds now
Selector<AuthViewModel, bool>(
selector: (_, vm) => vm.isLoading,
builder: (_, isLoading, __) {
return Selector<AuthViewModel, bool>(
selector: (_, vm) => vm.isLoginEnabled,
builder: (_, isEnabled, __) {
if (isLoading) {
return BaseButton(
isEnabled: false,
onPressed: null,
isLoading: true,
textColor: AppColors.white,
);
}
return BaseButton(
isEnabled: isEnabled,
onPressed:
isEnabled
? () async {
await viewModel.login();
}
: null,
);
},
child: Text(
LoginStrings.forgotPassword,
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.mainBlue,
),
),
);
},
),
SizedBox(height: 30.0.h()),
TextButton(
onPressed: () {
const ForgotPasswordRouteData().push(context);
},
child: Text(
LoginStrings.forgotPassword,
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.mainBlue,
),
],
);
},
),
),
],
),
),
),