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

feat: 实现 Auth 全局状态机与 401 统一处理机制

Browse Source 
- 新增 AuthSessionInvalidated 事件处理 token 失效场景
- ApiInterceptor 新增 authFailureCallback 单飞机制
- AuthBloc 区分 manual logout 与 auto expiry 语义
- 新增 startup recovery fallback 防止启动卡死

feat: 重构 Calendar DayWeek 视图事件布局引擎

- 新增 DayEventLayoutEngine 解耦事件计算与渲染
- 新增 DayTimelineMetrics 统一时间轴常量
- 新增 DayViewScale 支持捏合缩放

feat: 新增 Settings 页面共享 UI 组件

- 新增 BackTitlePageHeader 统一页面 header
- 新增 DetailHeaderActionMenu 统一操作菜单
- 新增 DestructiveActionSheet 统一删除确认
- 新增 AppToggleSwitch 统一开关组件

feat: Chat UI Schema 支持导航操作

- 支持 navigation 类型 action 触发内部路由跳转
- 新增路径验证与参数处理

chore: 更新相关测试覆盖 auth 失效路径
This commit is contained in:
qzl
2026-03-18 13:35:25 +08:00
parent 19981964fb
commit b34697660d
56 changed files with 2602 additions and 784 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/lib/features/settings/ui/screens/account_screen.dart
+2 -4
View File
@@ -10,7 +10,7 @@ import '../../../auth/presentation/bloc/auth_event.dart';
import '../../../auth/presentation/bloc/auth_state.dart';
import '../../../../shared/widgets/app_button.dart';
import '../widgets/account_section_card.dart';
import '../widgets/account_surface_scaffold.dart';
import '../widgets/settings_page_scaffold.dart';
class AccountScreen extends StatelessWidget {
const AccountScreen({super.key});
@@ -22,10 +22,8 @@ class AccountScreen extends StatelessWidget {
@override
Widget build(BuildContext context) {
return AccountSurfaceScaffold(
return SettingsPageScaffold(
title: '账户',
subtitle: null,
compactHeaderTitle: true,
onBack: () => context.pop(),
body: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
apps/lib/features/settings/ui/screens/change_password_screen.dart
+2 -3
View File
@@ -13,7 +13,7 @@ import '../../../auth/presentation/bloc/auth_state.dart';
import '../../../../features/auth/presentation/cubits/reset_password_cubit.dart';
import '../../../../features/auth/data/auth_repository.dart';
import '../widgets/account_section_card.dart';
import '../widgets/account_surface_scaffold.dart';
import '../widgets/settings_page_scaffold.dart';
class ChangePasswordScreen extends StatelessWidget {
const ChangePasswordScreen({super.key});
@@ -95,9 +95,8 @@ class __ChangePasswordViewState extends State<_ChangePasswordView> {
Toast.show(context, state.errorMessage!, type: ToastType.error);
}
},
child: AccountSurfaceScaffold(
child: SettingsPageScaffold(
title: '修改密码',
subtitle: '通过邮箱验证码修改密码',
onBack: () => context.pop(),
body: _buildForm(),
footer: BlocBuilder<ResetPasswordCubit, ResetPasswordState>(
apps/lib/features/settings/ui/screens/edit_profile_screen.dart
+2 -3
View File
@@ -9,7 +9,7 @@ import '../../../../shared/widgets/toast/toast_type.dart';
import '../../../users/data/models/user_response.dart';
import '../../../users/data/users_api.dart';
import '../widgets/account_section_card.dart';
import '../widgets/account_surface_scaffold.dart';
import '../widgets/settings_page_scaffold.dart';
class EditProfileScreen extends StatefulWidget {
const EditProfileScreen({super.key});
@@ -119,9 +119,8 @@ class _EditProfileScreenState extends State<EditProfileScreen> {
@override
Widget build(BuildContext context) {
return AccountSurfaceScaffold(
return SettingsPageScaffold(
title: '编辑资料',
subtitle: '编辑账户资料',
onBack: () => context.pop(),
body: _isLoading
? const Center(
apps/lib/features/settings/ui/screens/features_screen.dart
+22 -59
View File
@@ -1,6 +1,8 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import '../../../../core/theme/design_tokens.dart';
import '../../../../shared/widgets/page_header.dart' as widgets;
import '../../../../shared/widgets/app_toggle_switch.dart';
import '../widgets/settings_page_scaffold.dart';
class FeaturesScreen extends StatefulWidget {
const FeaturesScreen({super.key});
@@ -17,31 +19,20 @@ class _FeaturesScreenState extends State<FeaturesScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColors.surfaceSecondary,
body: SafeArea(
child: Column(
children: [
const widgets.PageHeader(leading: widgets.BackButton()),
Expanded(
child: SingleChildScrollView(
padding: const EdgeInsets.fromLTRB(20, 8, 20, 20),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_buildSectionTitle('每日'),
const SizedBox(height: 8),
_buildDailyList(),
const SizedBox(height: 16),
_buildSectionTitle('每周'),
const SizedBox(height: 8),
_buildWeeklyList(),
],
),
),
),
],
),
return SettingsPageScaffold(
title: '周期计划',
onBack: () => context.pop(),
body: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_buildSectionTitle('每日'),
const SizedBox(height: 8),
_buildDailyList(),
const SizedBox(height: 16),
_buildSectionTitle('每周'),
const SizedBox(height: 8),
_buildWeeklyList(),
],
),
);
}
@@ -59,6 +50,7 @@ class _FeaturesScreenState extends State<FeaturesScreen> {
Widget _buildDailyList() {
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_buildFeatureCard(
icon: Icons.alarm,
@@ -87,6 +79,7 @@ class _FeaturesScreenState extends State<FeaturesScreen> {
Widget _buildWeeklyList() {
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_buildFeatureCard(
icon: Icons.calendar_view_week,
@@ -128,9 +121,10 @@ class _FeaturesScreenState extends State<FeaturesScreen> {
decoration: BoxDecoration(
color: AppColors.white,
borderRadius: BorderRadius.circular(16),
border: Border.all(color: const Color(0xFFE4ECF6)),
border: Border.all(color: AppColors.borderSecondary),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
width: 40,
@@ -167,40 +161,9 @@ class _FeaturesScreenState extends State<FeaturesScreen> {
],
),
),
_buildToggle(value, onChanged),
AppToggleSwitch(value: value, onChanged: onChanged),
],
),
);
}
Widget _buildToggle(bool value, ValueChanged<bool> onChanged) {
return GestureDetector(
onTap: () => onChanged(!value),
child: Container(
width: 44,
height: 24,
padding: const EdgeInsets.all(2),
decoration: BoxDecoration(
color: value ? const Color(0xFFBFDBFE) : const Color(0xFFF1F5FC),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: value ? const Color(0xFF93C5FD) : const Color(0xFFD5DFEE),
),
),
child: AnimatedAlign(
duration: const Duration(milliseconds: 150),
alignment: value ? Alignment.centerRight : Alignment.centerLeft,
child: Container(
width: 20,
height: 20,
decoration: BoxDecoration(
color: AppColors.white,
borderRadius: BorderRadius.circular(10),
border: Border.all(color: const Color(0xFFCCDDF8)),
),
),
),
),
);
}
}
apps/lib/features/settings/ui/screens/memory_screen.dart
+31 -59
View File
@@ -1,7 +1,9 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import '../../../../core/theme/design_tokens.dart';
import '../../../../shared/widgets/page_header.dart' as widgets;
import '../../../../shared/widgets/app_toggle_switch.dart';
import '../../data/services/memory_service.dart';
import '../widgets/settings_page_scaffold.dart';
class MemoryScreen extends StatefulWidget {
const MemoryScreen({super.key});
@@ -23,33 +25,22 @@ class _MemoryScreenState extends State<MemoryScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColors.surfaceSecondary,
body: SafeArea(
child: Column(
children: [
widgets.PageHeader(leading: widgets.BackButton(), height: 56),
Expanded(
child: SingleChildScrollView(
padding: const EdgeInsets.fromLTRB(20, 12, 20, 20),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_buildToggleCard(),
if (_memoryItems.isNotEmpty) ...[
const SizedBox(height: 14),
_buildListTitle(),
const SizedBox(height: 8),
_buildMemoryList(),
],
const SizedBox(height: 20),
_buildManageButton(),
],
),
),
),
return SettingsPageScaffold(
title: '我的记忆',
onBack: () => context.pop(),
body: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_buildToggleCard(),
if (_memoryItems.isNotEmpty) ...[
const SizedBox(height: 14),
_buildListTitle(),
const SizedBox(height: 8),
_buildMemoryList(),
],
),
const SizedBox(height: 20),
_buildManageButton(),
],
),
);
}
@@ -63,8 +54,10 @@ class _MemoryScreenState extends State<MemoryScreen> {
border: Border.all(color: AppColors.borderSecondary),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const Text(
@@ -114,9 +107,10 @@ class _MemoryScreenState extends State<MemoryScreen> {
decoration: BoxDecoration(
color: AppColors.white,
borderRadius: BorderRadius.circular(16),
border: Border.all(color: const Color(0xFFE1E8F3)),
border: Border.all(color: AppColors.borderSecondary),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
for (int i = 0; i < _memoryItems.length; i++) ...[
_buildMemoryItem(_memoryItems[i]),
@@ -136,9 +130,10 @@ class _MemoryScreenState extends State<MemoryScreen> {
decoration: BoxDecoration(
color: AppColors.surfaceTertiary,
borderRadius: BorderRadius.circular(12),
border: Border.all(color: const Color(0xFFE8EDF7)),
border: Border.all(color: AppColors.borderSecondary),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
width: 32,
@@ -175,7 +170,11 @@ class _MemoryScreenState extends State<MemoryScreen> {
],
),
),
const Icon(Icons.chevron_right, size: 16, color: Color(0xFF9AAAC1)),
const Icon(
Icons.chevron_right,
size: 16,
color: AppColors.slate400,
),
],
),
),
@@ -190,7 +189,7 @@ class _MemoryScreenState extends State<MemoryScreen> {
decoration: BoxDecoration(
color: AppColors.white,
borderRadius: BorderRadius.circular(12),
border: Border.all(color: const Color(0xFFDCE6F4)),
border: Border.all(color: AppColors.borderSecondary),
),
child: const Center(
child: Text(
@@ -207,33 +206,6 @@ class _MemoryScreenState extends State<MemoryScreen> {
}
Widget _buildToggle(bool value, ValueChanged<bool> onChanged) {
return GestureDetector(
onTap: () => onChanged(!value),
child: Container(
width: 44,
height: 24,
padding: const EdgeInsets.all(2),
decoration: BoxDecoration(
color: value ? const Color(0xFFBFDBFE) : const Color(0xFFF1F5FC),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: value ? const Color(0xFF93C5FD) : const Color(0xFFD5DFEE),
),
),
child: AnimatedAlign(
duration: const Duration(milliseconds: 150),
alignment: value ? Alignment.centerRight : Alignment.centerLeft,
child: Container(
width: 20,
height: 20,
decoration: BoxDecoration(
color: AppColors.white,
borderRadius: BorderRadius.circular(10),
border: Border.all(color: const Color(0xFFCCDDF8)),
),
),
),
),
);
return AppToggleSwitch(value: value, onChanged: onChanged);
}
}
apps/lib/features/settings/ui/screens/settings_screen.dart
+18 -34
View File
@@ -4,13 +4,13 @@ import 'package:social_app/core/constants/app_constants.dart';
import 'package:social_app/core/di/injection.dart';
import 'package:social_app/core/theme/design_tokens.dart';
import 'package:social_app/shared/widgets/app_loading_indicator.dart';
import 'package:social_app/shared/widgets/page_header.dart' as widgets;
import 'package:social_app/shared/widgets/toast/toast.dart';
import 'package:social_app/shared/widgets/toast/toast_type.dart';
import 'package:social_app/features/friends/data/friends_api.dart';
import 'package:social_app/features/settings/data/settings_api.dart';
import 'package:social_app/features/users/data/models/user_response.dart';
import 'package:social_app/features/users/data/users_api.dart';
import '../widgets/settings_page_scaffold.dart';
class SettingsScreen extends StatefulWidget {
const SettingsScreen({super.key});
@@ -65,36 +65,20 @@ class _SettingsScreenState extends State<SettingsScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColors.surfaceSecondary,
body: SafeArea(
child: Column(
children: [
const widgets.PageHeader(leading: widgets.BackButton()),
Expanded(
child: SingleChildScrollView(
padding: const EdgeInsets.fromLTRB(
AppSpacing.xl,
AppSpacing.sm,
AppSpacing.xl,
AppSpacing.xl,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_buildProfileHero(),
const SizedBox(height: 16),
_buildQuickActions(context),
const SizedBox(height: 16),
_buildSubscriptionCard(),
const SizedBox(height: 16),
_buildMenuCard(context),
],
),
),
),
],
),
return SettingsPageScaffold(
title: '设置',
onBack: () => context.pop(),
body: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_buildProfileHero(),
const SizedBox(height: 16),
_buildQuickActions(context),
const SizedBox(height: 16),
_buildSubscriptionCard(),
const SizedBox(height: 16),
_buildMenuCard(context),
],
),
);
}
@@ -253,7 +237,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
child: _buildActionCard(
icon: Icons.auto_awesome,
iconColor: const Color(0xFF8B5CF6),
title: '常用功能',
title: '周期计划',
subtitle: '已启用：会议提醒',
onTap: () => context.push('/settings/features'),
),
@@ -459,7 +443,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
icon: Icons.system_update,
title: '检查更新',
trailing: 'v${AppConstants.version}',
onTap: () => _checkForUpdates(context),
onTap: _checkForUpdates,
),
],
),
@@ -528,7 +512,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
);
}
Future<void> _checkForUpdates(BuildContext context) async {
Future<void> _checkForUpdates() async {
try {
final settingsApi = sl<SettingsApi>();
final result = await settingsApi.checkUpdates(
apps/lib/features/settings/ui/widgets/account_surface_scaffold.dart
-140
View File
@@ -1,140 +0,0 @@
import 'package:flutter/material.dart';
import '../../../../core/theme/design_tokens.dart';
import '../../../../shared/widgets/page_header.dart' as widgets;
class AccountSurfaceScaffold extends StatelessWidget {
const AccountSurfaceScaffold({
super.key,
required this.title,
this.subtitle,
required this.body,
this.footer,
this.onBack,
this.compactHeaderTitle = false,
});
final String title;
final String? subtitle;
final Widget body;
final Widget? footer;
final VoidCallback? onBack;
final bool compactHeaderTitle;
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColors.surfaceSecondary,
body: SafeArea(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
if (compactHeaderTitle)
SizedBox(
height: 64,
child: Stack(
alignment: Alignment.center,
children: [
widgets.PageHeader(
leading: widgets.BackButton(onPressed: onBack),
trailing: const SizedBox(
width: AppSpacing.xl * 2,
height: AppSpacing.xl * 2,
),
),
IgnorePointer(
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: AppSpacing.xxl * 2,
),
child: Text(
title,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.w700,
color: AppColors.slate900,
),
),
),
),
],
),
)
else
Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
widgets.PageHeader(
leading: widgets.BackButton(onPressed: onBack),
),
Padding(
padding: const EdgeInsets.fromLTRB(
AppSpacing.xl,
AppSpacing.none,
AppSpacing.xl,
AppSpacing.sm,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
title,
style: const TextStyle(
fontSize: 22,
fontWeight: FontWeight.w700,
color: AppColors.slate900,
),
),
if (subtitle != null && subtitle!.isNotEmpty) ...[
const SizedBox(height: AppSpacing.xs),
Text(
subtitle!,
style: const TextStyle(
fontSize: 13,
fontWeight: FontWeight.w500,
color: AppColors.slate500,
),
),
],
],
),
),
],
),
Expanded(
child: SingleChildScrollView(
padding: const EdgeInsets.fromLTRB(
AppSpacing.xl,
AppSpacing.sm,
AppSpacing.xl,
AppSpacing.xl,
),
child: body,
),
),
if (footer != null)
Padding(
padding: const EdgeInsets.fromLTRB(
AppSpacing.xl,
AppSpacing.none,
AppSpacing.xl,
AppSpacing.xl,
),
child: Container(
padding: const EdgeInsets.all(AppSpacing.md),
decoration: BoxDecoration(
color: AppColors.surfaceInfoLight,
borderRadius: BorderRadius.circular(AppRadius.xl),
border: Border.all(color: AppColors.borderTertiary),
),
child: footer,
),
),
],
),
),
);
}
}
apps/lib/features/settings/ui/widgets/settings_page_scaffold.dart
+63
View File
@@ -0,0 +1,63 @@
import 'package:flutter/material.dart';
import '../../../../core/theme/design_tokens.dart';
import '../../../../shared/widgets/back_title_page_header.dart';
class SettingsPageScaffold extends StatelessWidget {
const SettingsPageScaffold({
super.key,
required this.title,
required this.body,
this.footer,
this.onBack,
});
final String title;
final Widget body;
final Widget? footer;
final VoidCallback? onBack;
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColors.surfaceSecondary,
body: SafeArea(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
BackTitlePageHeader(title: title, onBack: onBack),
Expanded(
child: SingleChildScrollView(
padding: const EdgeInsets.fromLTRB(
AppSpacing.xl,
AppSpacing.sm,
AppSpacing.xl,
AppSpacing.xl,
),
child: body,
),
),
if (footer != null)
Padding(
padding: const EdgeInsets.fromLTRB(
AppSpacing.xl,
AppSpacing.none,
AppSpacing.xl,
AppSpacing.xl,
),
child: Container(
padding: const EdgeInsets.all(AppSpacing.md),
decoration: BoxDecoration(
color: AppColors.surfaceInfoLight,
borderRadius: BorderRadius.circular(AppRadius.xl),
border: Border.all(color: AppColors.borderTertiary),
),
child: footer,
),
),
],
),
),
);
}
}