qzl/social-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(apps): consolidate FormzInput validators and fix login screen

Browse Source 
- Move FormzInput validators to core/form_inputs/form_inputs.dart
- Fix login_screen.dart syntax error (missing 'class' keyword)
- Remove unused _isLoading field
- Fix unnecessary const keywords
- Update login_cubit and register_cubit imports
- Remove duplicate FormzInput definitions from register_cubit
- Add Toast and Banner UI feedback system
- Remove legacy login/register screens (login_code, login_email, login_password, register_step2)
- Remove unused warning_banner widget
- Update tests for new error messages and DI setup
This commit is contained in:
qzl
2026-02-25 18:00:02 +08:00
parent d3bdb3ab4f
commit e20b1905cb
25 changed files with 542 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/lib/features/auth/data/auth_api.dart
+1 -1
View File
@@ -5,7 +5,7 @@ import 'models/auth_response.dart';
class AuthApi {
final ApiClient _client;
static const _prefix = '/v1/auth';
static const _prefix = '/api/v1/auth';
AuthApi(this._client);
apps/lib/features/auth/presentation/cubits/login_cubit.dart
+4 -2
View File
@@ -1,10 +1,11 @@
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:formz/formz.dart';
import 'package:equatable/equatable.dart';
import '../../../../core/api/api_exception.dart';
import '../../data/auth_repository.dart';
import '../../data/models/login_request.dart';
import '../../data/models/auth_response.dart';
import 'register_cubit.dart' show Email, Password;
import '../../../../core/form_inputs/form_inputs.dart';
class LoginState extends Equatable {
final Email email;
@@ -64,10 +65,11 @@ class LoginCubit extends Cubit<LoginState> {
emit(state.copyWith(status: FormzSubmissionStatus.success));
return response;
} catch (e) {
final message = e is ApiException ? e.message : e.toString();
emit(
state.copyWith(
status: FormzSubmissionStatus.failure,
errorMessage: e.toString(),
errorMessage: message,
),
);
return null;
apps/lib/features/auth/presentation/cubits/register_cubit.dart
+8 -54
View File
@@ -1,61 +1,12 @@
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:formz/formz.dart';
import 'package:equatable/equatable.dart';
import '../../../../core/api/api_exception.dart';
import '../../../../core/form_inputs/form_inputs.dart';
import '../../data/auth_repository.dart';
import '../../data/models/signup_request.dart';
import '../../data/models/auth_response.dart';
class Username extends FormzInput<String, String> {
const Username.pure() : super.pure('');
const Username.dirty([super.value = '']) : super.dirty();
@override
String? validator(String value) {
if (value.isEmpty) return 'Username is required';
if (value.length < 3) return 'Username must be at least 3 characters';
if (value.length > 30) return 'Username must be at most 30 characters';
return null;
}
}
class Email extends FormzInput<String, String> {
const Email.pure() : super.pure('');
const Email.dirty([super.value = '']) : super.dirty();
static final _regex = RegExp(r'^[\w.-]+@[\w.-]+\.\w+$');
@override
String? validator(String value) {
if (value.isEmpty) return 'Email is required';
if (!_regex.hasMatch(value)) return 'Invalid email format';
return null;
}
}
class Password extends FormzInput<String, String> {
const Password.pure() : super.pure('');
const Password.dirty([super.value = '']) : super.dirty();
@override
String? validator(String value) {
if (value.isEmpty) return 'Password is required';
if (value.length < 6) return 'Password must be at least 6 characters';
return null;
}
}
class VerificationCode extends FormzInput<String, String> {
const VerificationCode.pure() : super.pure('');
const VerificationCode.dirty([super.value = '']) : super.dirty();
@override
String? validator(String value) {
if (value.isEmpty) return 'Code is required';
if (!RegExp(r'^\d{6}$').hasMatch(value)) return 'Code must be 6 digits';
return null;
}
}
class RegisterState extends Equatable {
final Username username;
final Email email;
@@ -159,10 +110,11 @@ class RegisterCubit extends Cubit<RegisterState> {
);
return true;
} catch (e) {
final message = e is ApiException ? e.message : e.toString();
emit(
state.copyWith(
status: FormzSubmissionStatus.failure,
errorMessage: e.toString(),
errorMessage: message,
),
);
return false;
@@ -184,10 +136,11 @@ class RegisterCubit extends Cubit<RegisterState> {
emit(state.copyWith(status: FormzSubmissionStatus.success));
return response;
} catch (e) {
final message = e is ApiException ? e.message : e.toString();
emit(
state.copyWith(
status: FormzSubmissionStatus.failure,
errorMessage: e.toString(),
errorMessage: message,
),
);
return null;
@@ -203,7 +156,8 @@ class RegisterCubit extends Cubit<RegisterState> {
);
emit(state.copyWith(codeSent: true));
} catch (e) {
emit(state.copyWith(errorMessage: e.toString()));
final message = e is ApiException ? e.message : e.toString();
emit(state.copyWith(errorMessage: message));
}
}
}
apps/lib/features/auth/ui/screens/login_code_screen.dart
-182
View File
@@ -1,182 +0,0 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import '../../../../core/theme/design_tokens.dart';
import '../../../../shared/widgets/app_button.dart';
class LoginCodeScreen extends StatefulWidget {
const LoginCodeScreen({super.key});
@override
State<LoginCodeScreen> createState() => _LoginCodeScreenState();
}
class _LoginCodeScreenState extends State<LoginCodeScreen> {
final _codeController = TextEditingController();
@override
void dispose() {
_codeController.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColors.background,
body: SafeArea(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
child: Center(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
_buildAppIcon(),
const SizedBox(height: 24),
_buildAppTitle(),
const SizedBox(height: 32),
_buildFormContainer(),
],
),
),
),
_buildFooter(),
const SizedBox(height: 24),
],
),
),
),
);
}
Widget _buildAppIcon() {
return Container(
width: 104,
height: 104,
decoration: BoxDecoration(
color: AppColors.appIconRing,
borderRadius: BorderRadius.circular(52),
border: Border.all(color: AppColors.appIconBorder, width: 1),
),
child: Center(
child: ClipRRect(
borderRadius: BorderRadius.circular(38),
child: Image.asset(
'assets/images/logo.png',
width: 76,
height: 76,
fit: BoxFit.cover,
),
),
),
);
}
Widget _buildAppTitle() {
return const Text(
'linksy',
style: TextStyle(
fontFamily: 'Playfair Display',
fontSize: 34,
fontWeight: FontWeight.w700,
fontStyle: FontStyle.italic,
color: AppColors.appTitle,
letterSpacing: 0.5,
),
);
}
Widget _buildFormContainer() {
return SizedBox(
width: 327,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'邮箱验证码',
style: TextStyle(
fontSize: 13,
fontWeight: FontWeight.w500,
color: Color(0xFF475569),
),
),
const SizedBox(height: 6),
Row(
children: [
Expanded(
child: SizedBox(
height: 40,
child: TextField(
controller: _codeController,
keyboardType: TextInputType.number,
decoration: const InputDecoration(
hintText: '输入验证码',
contentPadding: EdgeInsets.symmetric(
horizontal: 12,
vertical: 10,
),
),
),
),
),
const SizedBox(width: 8),
SizedBox(
width: 112,
height: 40,
child: OutlinedButton(
onPressed: () {},
style: OutlinedButton.styleFrom(
backgroundColor: AppColors.background,
side: const BorderSide(color: AppColors.input),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(6),
),
),
child: const Text(
'发送验证码',
style: TextStyle(
fontSize: 13,
fontWeight: FontWeight.w500,
color: AppColors.slate500,
),
),
),
),
],
),
],
),
const SizedBox(height: 12),
AppButton(text: '登录', onPressed: () {}),
const SizedBox(height: 12),
AppButton(
text: '使用密码登录',
isOutlined: true,
onPressed: () => context.pop(),
),
],
),
);
}
Widget _buildFooter() {
return GestureDetector(
onTap: () => context.push('/register'),
child: const Text(
'还没有账号？去注册',
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w500,
color: AppColors.slate500,
),
),
);
}
}
apps/lib/features/auth/ui/screens/login_email_screen.dart
-170
View File
@@ -1,170 +0,0 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import '../../../../core/theme/design_tokens.dart';
import '../../../../shared/widgets/app_button.dart';
import '../../../../shared/widgets/warning_banner.dart';
import '../../../../shared/utils/validators.dart';
class LoginEmailScreen extends StatefulWidget {
const LoginEmailScreen({super.key});
@override
State<LoginEmailScreen> createState() => _LoginEmailScreenState();
}
class _LoginEmailScreenState extends State<LoginEmailScreen> {
final _emailController = TextEditingController();
bool _showWarning = false;
String _warningMessage = '';
@override
void dispose() {
_emailController.dispose();
super.dispose();
}
void _handleContinue() {
final error = Validators.email(_emailController.text);
if (error != null) {
setState(() {
_showWarning = true;
_warningMessage = error;
});
return;
}
setState(() {
_showWarning = false;
});
context.push('/login/password', extra: _emailController.text);
}
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColors.background,
body: SafeArea(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
child: Center(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
_buildAppIcon(),
const SizedBox(height: 24),
_buildAppTitle(),
const SizedBox(height: 32),
_buildFormContainer(),
],
),
),
),
_buildFooter(),
const SizedBox(height: 24),
],
),
),
),
);
}
Widget _buildAppIcon() {
return Container(
width: 104,
height: 104,
decoration: BoxDecoration(
color: AppColors.appIconRing,
borderRadius: BorderRadius.circular(52),
border: Border.all(color: AppColors.appIconBorder, width: 1),
),
child: Center(
child: ClipRRect(
borderRadius: BorderRadius.circular(38),
child: Image.asset(
'assets/images/logo.png',
width: 76,
height: 76,
fit: BoxFit.cover,
),
),
),
);
}
Widget _buildAppTitle() {
return const Text(
'linksy',
style: TextStyle(
fontFamily: 'Playfair Display',
fontSize: 34,
fontWeight: FontWeight.w700,
fontStyle: FontStyle.italic,
color: AppColors.appTitle,
letterSpacing: 0.5,
),
);
}
Widget _buildFormContainer() {
return SizedBox(
width: 327,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'邮箱',
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w500,
color: AppColors.foreground,
),
),
const SizedBox(height: 6),
TextField(
controller: _emailController,
keyboardType: TextInputType.emailAddress,
decoration: const InputDecoration(hintText: '请输入邮箱'),
),
],
),
const SizedBox(height: 12),
WarningBanner(message: _warningMessage, visible: _showWarning),
const SizedBox(height: 16),
AppButton(text: '继续', onPressed: _handleContinue),
],
),
);
}
Widget _buildFooter() {
return Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
GestureDetector(
onTap: () => context.push('/register'),
child: const Text(
'还没有账号？去注册',
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w500,
color: AppColors.slate500,
),
),
),
const SizedBox(height: 12),
const Text(
'隐私政策 | 服务条款',
style: TextStyle(fontSize: 12, color: AppColors.slate400),
),
],
);
}
}
apps/lib/features/auth/ui/screens/login_password_screen.dart → apps/lib/features/auth/ui/screens/login_screen.dart
+101 -69
View File
@@ -3,68 +3,52 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:formz/formz.dart';
import 'package:go_router/go_router.dart';
import '../../../../core/theme/design_tokens.dart';
import '../../../../core/di/injection.dart';
import '../../../../shared/widgets/app_button.dart';
import '../../../../shared/widgets/warning_banner.dart';
import '../../../../shared/widgets/banner/app_banner.dart';
import '../../../../shared/widgets/toast/toast_type.dart';
import '../../presentation/cubits/login_cubit.dart';
import '../../presentation/bloc/auth_bloc.dart';
import '../../presentation/bloc/auth_event.dart';
import '../../data/auth_repository.dart';
class LoginPasswordScreen extends StatelessWidget {
final String? email;
const LoginPasswordScreen({super.key, this.email});
class LoginScreen extends StatelessWidget {
const LoginScreen({super.key});
@override
Widget build(BuildContext context) {
final emailFromExtra = GoRouterState.of(context).extra as String?;
final initialEmail = email ?? emailFromExtra ?? '';
return BlocProvider(
create: (context) {
final cubit = LoginCubit(context.read<AuthRepository>());
if (initialEmail.isNotEmpty) {
cubit.emailChanged(initialEmail);
}
return cubit;
},
child: LoginPasswordView(initialEmail: initialEmail),
create: (context) => LoginCubit(sl<AuthRepository>()),
child: const LoginView(),
);
}
}
class LoginPasswordView extends StatefulWidget {
final String initialEmail;
const LoginPasswordView({super.key, required this.initialEmail});
class LoginView extends StatefulWidget {
const LoginView({super.key});
@override
State<LoginPasswordView> createState() => _LoginPasswordViewState();
State<LoginView> createState() => _LoginViewState();
}
class _LoginPasswordViewState extends State<LoginPasswordView> {
late final TextEditingController _passwordController;
bool _obscureText = true;
@override
void initState() {
super.initState();
_passwordController = TextEditingController();
}
class _LoginViewState extends State<LoginView> {
final _emailController = TextEditingController();
final _passwordController = TextEditingController();
bool _obscurePassword = true;
@override
void dispose() {
_emailController.dispose();
_passwordController.dispose();
super.dispose();
}
Future<void> _handleLogin() async {
final cubit = context.read<LoginCubit>();
cubit.emailChanged(_emailController.text);
cubit.passwordChanged(_passwordController.text);
if (!cubit.state.isValid) {
return;
}
if (!cubit.state.isValid) return;
final response = await cubit.submit();
if (response != null && mounted) {
@@ -84,6 +68,7 @@ class _LoginPasswordViewState extends State<LoginPasswordView> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
key: const Key('login_main_content'),
child: Center(
child: Column(
mainAxisSize: MainAxisSize.min,
@@ -98,7 +83,7 @@ class _LoginPasswordViewState extends State<LoginPasswordView> {
),
),
),
_buildFooter(),
Container(key: const Key('login_footer'), child: _buildFooter()),
const SizedBox(height: 24),
],
),
@@ -147,49 +132,29 @@ class _LoginPasswordViewState extends State<LoginPasswordView> {
Widget _buildFormContainer() {
return BlocBuilder<LoginCubit, LoginState>(
builder: (context, state) {
final fieldError = state.email.displayError != null
? state.email.error
: state.password.displayError != null
? state.password.error
: null;
return SizedBox(
width: 327,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'密码',
style: TextStyle(
fontSize: 13,
fontWeight: FontWeight.w500,
color: Color(0xFF475569),
),
),
const SizedBox(height: 6),
TextField(
controller: _passwordController,
obscureText: _obscureText,
decoration: InputDecoration(
hintText: '请输入密码',
suffixIcon: IconButton(
icon: Icon(
_obscureText
? Icons.visibility_off
: Icons.visibility,
size: 20,
color: AppColors.slate400,
),
onPressed: () {
setState(() {
_obscureText = !_obscureText;
});
},
),
),
),
],
_buildInput(
label: '邮箱',
hint: '请输入邮箱',
controller: _emailController,
hasError: state.email.displayError != null,
),
const SizedBox(height: 12),
_buildPasswordInput(state.password.displayError != null),
const SizedBox(height: 12),
if (state.errorMessage != null)
WarningBanner(message: state.errorMessage!, visible: true),
AppBanner(message: state.errorMessage!, type: ToastType.error)
else if (fieldError != null)
AppBanner(message: fieldError, type: ToastType.warning),
const SizedBox(height: 12),
AppButton(
text: '登录',
@@ -204,6 +169,73 @@ class _LoginPasswordViewState extends State<LoginPasswordView> {
);
}
Widget _buildInput({
required String label,
required String hint,
required TextEditingController controller,
bool hasError = false,
}) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
label,
style: const TextStyle(
fontSize: 13,
fontWeight: FontWeight.w500,
color: AppColors.slate600,
),
),
const SizedBox(height: 6),
TextField(
controller: controller,
keyboardType: TextInputType.emailAddress,
decoration: InputDecoration(
hintText: hint,
errorText: hasError ? ' ' : null,
),
),
],
);
}
Widget _buildPasswordInput(bool hasError) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'密码',
style: TextStyle(
fontSize: 13,
fontWeight: FontWeight.w500,
color: AppColors.slate600,
),
),
const SizedBox(height: 6),
TextField(
controller: _passwordController,
obscureText: _obscurePassword,
decoration: InputDecoration(
hintText: '请输入密码',
errorText: hasError ? ' ' : null,
suffixIcon: IconButton(
icon: Icon(
_obscurePassword ? Icons.visibility_off : Icons.visibility,
size: 20,
color: AppColors.slate400,
),
onPressed: () {
setState(() {
_obscurePassword = !_obscurePassword;
});
},
),
),
),
],
);
}
Widget _buildFooter() {
return GestureDetector(
onTap: () => context.push('/register'),
apps/lib/features/auth/ui/screens/register_screen.dart
+7 -5
View File
@@ -3,8 +3,10 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:formz/formz.dart';
import 'package:go_router/go_router.dart';
import '../../../../core/theme/design_tokens.dart';
import '../../../../core/di/injection.dart';
import '../../../../shared/widgets/app_button.dart';
import '../../../../shared/widgets/warning_banner.dart';
import '../../../../shared/widgets/banner/app_banner.dart';
import '../../../../shared/widgets/toast/toast_type.dart';
import '../../presentation/cubits/register_cubit.dart';
import '../../data/auth_repository.dart';
@@ -14,7 +16,7 @@ class RegisterScreen extends StatelessWidget {
@override
Widget build(BuildContext context) {
return BlocProvider(
create: (context) => RegisterCubit(context.read<AuthRepository>()),
create: (context) => RegisterCubit(sl<AuthRepository>()),
child: const RegisterView(),
);
}
@@ -53,7 +55,7 @@ class _RegisterViewState extends State<RegisterView> {
final success = await cubit.submitStep1();
if (success && mounted) {
context.push('/register/step2', extra: cubit);
context.push('/register/verification', extra: cubit);
}
}
@@ -146,9 +148,9 @@ class _RegisterViewState extends State<RegisterView> {
if (state.errorMessage != null)
Padding(
padding: const EdgeInsets.only(top: 8),
child: WarningBanner(
child: AppBanner(
message: state.errorMessage!,
visible: true,
type: ToastType.error,
),
),
const SizedBox(height: 12),
apps/lib/features/auth/ui/screens/register_step2_screen.dart → apps/lib/features/auth/ui/screens/register_verification_screen.dart
+12 -35
View File
@@ -4,15 +4,16 @@ import 'package:go_router/go_router.dart';
import 'package:formz/formz.dart';
import '../../../../core/theme/design_tokens.dart';
import '../../../../shared/widgets/app_button.dart';
import '../../../../shared/widgets/warning_banner.dart';
import '../../../../shared/widgets/banner/app_banner.dart';
import '../../../../shared/widgets/toast/toast_type.dart';
import '../../presentation/cubits/register_cubit.dart';
import '../../presentation/bloc/auth_bloc.dart';
import '../../presentation/bloc/auth_event.dart';
class RegisterStep2Screen extends StatelessWidget {
class RegisterVerificationScreen extends StatelessWidget {
final RegisterCubit? cubit;
const RegisterStep2Screen({super.key, this.cubit});
const RegisterVerificationScreen({super.key, this.cubit});
@override
Widget build(BuildContext context) {
@@ -27,26 +28,25 @@ class RegisterStep2Screen extends StatelessWidget {
return BlocProvider.value(
value: registerCubit,
child: const RegisterStep2View(),
child: const RegisterVerificationView(),
);
}
}
class RegisterStep2View extends StatefulWidget {
const RegisterStep2View({super.key});
class RegisterVerificationView extends StatefulWidget {
const RegisterVerificationView({super.key});
@override
State<RegisterStep2View> createState() => _RegisterStep2ViewState();
State<RegisterVerificationView> createState() =>
_RegisterVerificationViewState();
}
class _RegisterStep2ViewState extends State<RegisterStep2View> {
class _RegisterVerificationViewState extends State<RegisterVerificationView> {
final _codeController = TextEditingController();
final _inviteController = TextEditingController();
@override
void dispose() {
_codeController.dispose();
_inviteController.dispose();
super.dispose();
}
@@ -150,15 +150,13 @@ class _RegisterStep2ViewState extends State<RegisterStep2View> {
children: [
_buildCodeInput(state),
const SizedBox(height: 12),
_buildInviteInput(),
const SizedBox(height: 12),
_buildStepIndicator(),
if (state.errorMessage != null)
Padding(
padding: const EdgeInsets.only(top: 8),
child: WarningBanner(
child: AppBanner(
message: state.errorMessage!,
visible: true,
type: ToastType.error,
),
),
const SizedBox(height: 12),
@@ -237,27 +235,6 @@ class _RegisterStep2ViewState extends State<RegisterStep2View> {
);
}
Widget _buildInviteInput() {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'邀请码（可选）',
style: TextStyle(
fontSize: 13,
fontWeight: FontWeight.w500,
color: Color(0xFF475569),
),
),
const SizedBox(height: 6),
TextField(
controller: _inviteController,
decoration: const InputDecoration(hintText: '有邀请码可填写'),
),
],
);
}
Widget _buildStepIndicator() {
return Row(
children: [