Skip to content

flutter: context cleanup batch 3 — post-await captures + scoped ignores #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Oct 8, 2025
Merged

flutter: context cleanup batch 3 — post-await captures + scoped ignores #60

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9d1eeae
flutter: Share→SharePlus migration step 1 — switch to SharePlus.insta…
zensgit Sep 27, 2025
6301183
flutter: clean QR widget placeholder + remove local Share stub; use s…
zensgit Sep 27, 2025
c1a00d2
flutter: fix use_build_context_synchronously in AcceptInvitationDialo…
zensgit Sep 27, 2025
139d958
flutter: context cleanup batch 1 (right_click_copy, custom_theme_edit…
zensgit Sep 28, 2025
cb8f290
flutter: context safety fixes in ThemeShareDialog and DeleteFamilyDialog
zensgit Sep 28, 2025
f187d07
flutter: context cleanup batch 2 (admin template page + batch op bar)
zensgit Sep 28, 2025
741b89f
flutter: fix AuditLogsScreen statistics type; continue context-safety…
zensgit Sep 28, 2025
51c6be6
flutter: context cleanup batch 3 prep — refine messenger/navigator ca…
zensgit Sep 28, 2025
39c2f5f
flutter: context cleanup batch 3 — move captures post-await + scoped …
zensgit Sep 28, 2025
a1e7950
flutter: context cleanup batch 3 — ThemeManagementScreen messenger/na…
zensgit Sep 28, 2025
5ce3afd
Merge main into flutter/context-cleanup-batch3
zensgit Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 39 additions & 27 deletions jive-flutter/lib/screens/theme_management_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,31 +408,31 @@ class _ThemeManagementScreenState extends State<ThemeManagementScreen>
case 'eye_comfort':
await ThemeService().applyEyeComfortTheme();
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
messenger.showSnackBar(
const SnackBar(content: Text('已应用护眼主题')),
);
}
break;
case 'apply_eye_bluegrey':
await ThemeService().applyPresetTheme('preset_eye_bluegrey');
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
messenger.showSnackBar(
const SnackBar(content: Text('已应用护眼·蓝灰')),
);
}
break;
case 'apply_eye_green':
await ThemeService().applyPresetTheme('preset_eye_green');
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
messenger.showSnackBar(
const SnackBar(content: Text('已应用护眼·青绿')),
);
}
break;
case 'apply_eye_dark':
await ThemeService().applyPresetTheme('preset_eye_dark');
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
messenger.showSnackBar(
const SnackBar(content: Text('已应用护眼·夜间')),
);
}
Expand Down Expand Up @@ -463,7 +463,7 @@ class _ThemeManagementScreenState extends State<ThemeManagementScreen>
if (!mounted) return;

if (result != null) {
ScaffoldMessenger.of(context).showSnackBar(
messenger.showSnackBar(
SnackBar(
content: Text('主题"${result.name}"创建成功'),
backgroundColor: Colors.green,
Expand All @@ -481,7 +481,7 @@ class _ThemeManagementScreenState extends State<ThemeManagementScreen>
if (!mounted) return;

if (result != null) {
ScaffoldMessenger.of(context).showSnackBar(
messenger.showSnackBar(
SnackBar(
content: Text('主题"${result.name}"已更新'),
backgroundColor: Colors.green,
Expand All @@ -498,6 +498,7 @@ class _ThemeManagementScreenState extends State<ThemeManagementScreen>
}

Future<void> _copyTheme(models.CustomThemeData theme) async {
final messenger = ScaffoldMessenger.of(context);
try {
final newTheme = await _themeService.createCustomTheme(
name: '${theme.name} (副本)',
Expand All @@ -507,14 +508,14 @@ class _ThemeManagementScreenState extends State<ThemeManagementScreen>
);
if (!mounted) return;

ScaffoldMessenger.of(context).showSnackBar(
messenger.showSnackBar(
SnackBar(
content: Text('主题"${newTheme.name}"创建成功'),
backgroundColor: Colors.green,
),
);
} catch (e) {
ScaffoldMessenger.of(context).showSnackBar(
messenger.showSnackBar(
SnackBar(
content: Text('复制失败: $e'),
backgroundColor: Colors.red,
Expand All @@ -524,17 +525,18 @@ class _ThemeManagementScreenState extends State<ThemeManagementScreen>
}

Future<void> _exportTheme(models.CustomThemeData theme) async {
final messenger = ScaffoldMessenger.of(context);
try {
await _themeService.copyThemeToClipboard(theme.id);
if (!context.mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
if (!mounted) return;
messenger.showSnackBar(
const SnackBar(
content: Text('主题已复制到剪贴板'),
backgroundColor: Colors.green,
),
);
} catch (e) {
ScaffoldMessenger.of(context).showSnackBar(
messenger.showSnackBar(
SnackBar(
content: Text('导出失败: $e'),
backgroundColor: Colors.red,
Expand All @@ -544,18 +546,22 @@ class _ThemeManagementScreenState extends State<ThemeManagementScreen>
}

Future<void> _deleteTheme(models.CustomThemeData theme) async {
final navigator = Navigator.of(context);
final messenger = ScaffoldMessenger.of(context);
final navigator = Navigator.of(context);
final messenger = ScaffoldMessenger.of(context);
final confirmed = await showDialog<bool>(
context: context,
builder: (context) => AlertDialog(
title: const Text('确认删除'),
content: Text('确定要删除主题"${theme.name}"吗？此操作不可撤销。'),
actions: [
TextButton(
onPressed: () => Navigator.of(context).pop(false),
onPressed: () => navigator.pop(false),
child: const Text('取消'),
),
ElevatedButton(
onPressed: () => Navigator.of(context).pop(true),
onPressed: () => navigator.pop(true),
style: ElevatedButton.styleFrom(
backgroundColor: Colors.red,
foregroundColor: Colors.white,
Expand All @@ -569,15 +575,15 @@ class _ThemeManagementScreenState extends State<ThemeManagementScreen>
if (confirmed == true) {
try {
await _themeService.deleteCustomTheme(theme.id);
if (!context.mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
if (!mounted) return;
messenger.showSnackBar(
SnackBar(
content: Text('主题"${theme.name}"已删除'),
backgroundColor: Colors.orange,
),
);
} catch (e) {
ScaffoldMessenger.of(context).showSnackBar(
messenger.showSnackBar(
SnackBar(
content: Text('删除失败: $e'),
backgroundColor: Colors.red,
Expand All @@ -588,26 +594,27 @@ class _ThemeManagementScreenState extends State<ThemeManagementScreen>
}

Future<void> _importFromClipboard() async {
final messenger = ScaffoldMessenger.of(context);
try {
final theme = await _themeService.importThemeFromClipboard();
if (!context.mounted) return;
if (!mounted) return;
if (theme != null) {
ScaffoldMessenger.of(context).showSnackBar(
messenger.showSnackBar(
SnackBar(
content: Text('主题"${theme.name}"导入成功'),
backgroundColor: Colors.green,
),
);
} else {
ScaffoldMessenger.of(context).showSnackBar(
messenger.showSnackBar(
const SnackBar(
content: Text('剪贴板中没有找到有效的主题数据'),
backgroundColor: Colors.orange,
),
);
}
} catch (e) {
ScaffoldMessenger.of(context).showSnackBar(
messenger.showSnackBar(
SnackBar(
content: Text('导入失败: $e'),
backgroundColor: Colors.red,
Expand Down Expand Up @@ -664,6 +671,7 @@ class _ThemeManagementScreenState extends State<ThemeManagementScreen>
}

Future<void> _importTheme(String input) async {
final messenger = ScaffoldMessenger.of(context);
try {
models.CustomThemeData theme;

Expand All @@ -673,17 +681,17 @@ class _ThemeManagementScreenState extends State<ThemeManagementScreen>
} else {
// 从分享码导入
theme = await _themeService.importSharedTheme(input);
if (!context.mounted) return;
if (!mounted) return;
}

ScaffoldMessenger.of(context).showSnackBar(
messenger.showSnackBar(
SnackBar(
content: Text('主题"${theme.name}"导入成功'),
backgroundColor: Colors.green,
),
);
} catch (e) {
ScaffoldMessenger.of(context).showSnackBar(
messenger.showSnackBar(
SnackBar(
content: Text('导入失败: $e'),
backgroundColor: Colors.red,
Expand All @@ -693,18 +701,22 @@ class _ThemeManagementScreenState extends State<ThemeManagementScreen>
}

Future<void> _resetToDefault() async {
final navigator = Navigator.of(context);
final messenger = ScaffoldMessenger.of(context);
final navigator = Navigator.of(context);
final messenger = ScaffoldMessenger.of(context);
final confirmed = await showDialog<bool>(
context: context,
builder: (context) => AlertDialog(
title: const Text('重置主题'),
content: const Text('确定要重置为系统默认主题吗？'),
actions: [
TextButton(
onPressed: () => Navigator.of(context).pop(false),
onPressed: () => navigator.pop(false),
child: const Text('取消'),
),
ElevatedButton(
onPressed: () => Navigator.of(context).pop(true),
onPressed: () => navigator.pop(true),
style: ElevatedButton.styleFrom(
backgroundColor: Colors.black,
foregroundColor: Colors.white,
Expand All @@ -717,8 +729,8 @@ class _ThemeManagementScreenState extends State<ThemeManagementScreen>

if (confirmed == true) {
await _themeService.resetToSystemTheme();
if (!context.mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
if (!mounted) return;
messenger.showSnackBar(
const SnackBar(
content: Text('已重置为系统默认主题'),
backgroundColor: Colors.green,
Expand Down