flutter: FamilySettings — fix analyzer (unawaited + toJson) #84
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -83,17 +83,19 @@ Jive Money - 您的智能家庭财务管家 | |
| '''; | ||
|
|
||
| try { | ||
| // 预先捕获 messenger，避免上下文跨 await 警告 | ||
| final messenger = ScaffoldMessenger.of(context); | ||
| if (chartWidget != null) { | ||
| // 生成图表截图 | ||
| // Note: screenshot functionality is stubbed during analyzer cleanup | ||
| final image = null; // ignore: prefer_const_declarations, unused_local_variable | ||
|
|
||
|
|
||
| // 保存图片 | ||
| final directory = await getTemporaryDirectory(); | ||
| final imagePath = | ||
| '${directory.path}/statistics_${DateTime.now().millisecondsSinceEpoch}.png'; | ||
| final imageFile = File(imagePath); // ignore: unused_local_variable | ||
| // await imageFile.writeAsBytes(image); | ||
|
|
||
| // 分享图片和文字 | ||
|
|
@@ -102,6 +104,8 @@ Jive Money - 您的智能家庭财务管家 | |
| // 仅分享文字 | ||
| await _doShare(ShareParams(text: shareText)); | ||
| if (!context.mounted) return; | ||
| // ignore: use_build_context_synchronously | ||
| messenger.hideCurrentSnackBar(); | ||
| } | ||
| } catch (e) { | ||
| _showError(context, '分享失败: $e'); | ||
|
|
@@ -154,7 +158,9 @@ ${transaction.note?.isNotEmpty == true ? '📝 备注：${transaction.note}' : ' | |
| try { | ||
| await Clipboard.setData(ClipboardData(text: text)); | ||
| if (context.mounted) { | ||
| final messenger = ScaffoldMessenger.of(context); | ||
| // ignore: use_build_context_synchronously | ||
| messenger.showSnackBar( | ||
| SnackBar( | ||
| content: Text(message ?? '已复制到剪贴板'), | ||
| duration: const Duration(seconds: 2), | ||
|
|
@@ -251,12 +257,7 @@ $data | |
| } | ||
|
|
||
| /// 分享到微信（需要集成微信SDK） | ||
|
|
||
| static String _getRoleDisplayName(family_model.FamilyRole role) { | ||
| switch (role) { | ||
| case family_model.FamilyRole.owner: | ||
|
|
@@ -461,7 +462,7 @@ class ShareDialog extends StatelessWidget { | |
| color: theme.colorScheme.primary, | ||
| onPressed: onShareMore ?? | ||
| () async { | ||
| await SharePlus.instance.share(ShareParams(text: '$content\n\n${url ?? ''}')); | ||
| if (context.mounted) { | ||
| Navigator.pop(context); | ||
| } | ||
|
|
@@ -544,7 +545,3 @@ class _StubScreenshotController { | |
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,10 +3,10 @@ import 'package:flutter/material.dart'; | |
| import 'package:jive_money/core/constants/app_constants.dart'; | ||
| import 'package:jive_money/ui/components/cards/account_card.dart'; | ||
| import 'package:jive_money/ui/components/loading/loading_widget.dart'; | ||
| import 'package:jive_money/models/account.dart' as model; | ||
|
|
||
| // 类型别名以兼容现有代码 | ||
| typedef AccountData = model.Account; | ||
|
|
||
| class AccountList extends StatelessWidget { | ||
| final List<AccountData> accounts; | ||
|
|
@@ -102,7 +102,7 @@ class AccountList extends StatelessWidget { | |
| itemCount: accounts.length, | ||
| itemBuilder: (context, index) { | ||
| final account = accounts[index]; | ||
| return AccountCard.fromAccount( | ||
| account: account, | ||
| onTap: () => onAccountTap?.call(account), | ||
| onLongPress: () => onAccountLongPress?.call(account), | ||
|
|
@@ -138,7 +138,7 @@ class AccountList extends StatelessWidget { | |
|
|
||
| // 该类型的账户 | ||
| ...typeAccounts.map( | ||
| (account) => AccountCard.fromAccount( | ||
| account: account, | ||
| onTap: () => onAccountTap?.call(account), | ||
| onLongPress: () => onAccountLongPress?.call(account), | ||
|
|
@@ -284,10 +284,11 @@ class AccountList extends StatelessWidget { | |
| final Map<AccountType, List<AccountData>> grouped = {}; | ||
|
|
||
| for (final account in accounts) { | ||
| final key = _toUiAccountType(account.type); | ||
| if (!grouped.containsKey(key)) { | ||
| grouped[key] = []; | ||
| } | ||
| grouped[key]!.add(account); | ||
| } | ||
|
|
||
| // 按类型排序：资产、负债 | ||
|
|
@@ -299,7 +300,7 @@ class AccountList extends StatelessWidget { | |
|
|
||
| double _calculateTotal(AccountType type) { | ||
| return accounts | ||
| .where((account) => _matchesLocalType(type, account.type)) | ||
| .fold(0.0, (sum, account) => sum + account.balance); | ||
| } | ||
|
|
||
|
|
@@ -360,6 +361,26 @@ enum AccountSubType { | |
| mortgage, // 房贷 | ||
| } | ||
|
|
||
|
|
||
| // Model<->UI AccountType adapter | ||
| // Map model.AccountType (checking/savings/creditCard/loan/...) to local grouping (asset/liability) | ||
| AccountType _toUiAccountType(model.AccountType t) { | ||
| switch (t) { | ||
| case model.AccountType.creditCard: | ||
| case model.AccountType.loan: | ||
| return AccountType.liability; | ||
| default: | ||
| return AccountType.asset; | ||
| } | ||
| } | ||
|
|
||
| bool _matchesLocalType(AccountType localType, model.AccountType modelType) { | ||
| final isLiability = modelType == model.AccountType.creditCard || modelType == model.AccountType.loan; | ||
| if (localType == AccountType.liability) return isLiability; | ||
| return !isLiability; | ||
| } | ||
|
|
||
|
|
||
| /// 账户分组列表 | ||
| class GroupedAccountList extends StatelessWidget { | ||
| final Map<String, List<AccountData>> groupedAccounts; | ||
|
|
@@ -421,11 +442,9 @@ class GroupedAccountList extends StatelessWidget { | |
| : null, | ||
| children: accounts | ||
| .map( | ||
| (account) => AccountCard.fromAccount( | ||
| account: account, | ||
| onTap: () => onAccountTap?.call(account), | ||
| ), | ||
| ) | ||
| .toList(), | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,10 @@ | ||
| // 预算进度组件 | ||
| import 'package:flutter/material.dart'; | ||
| import 'package:jive_money/core/constants/app_constants.dart'; | ||
| import 'package:flutter_riverpod/flutter_riverpod.dart'; | ||
| import 'package:jive_money/providers/currency_provider.dart'; | ||
|
|
||
| class BudgetProgress extends ConsumerWidget { | ||
| final String category; | ||
| final double budgeted; | ||
| final double spent; | ||
|
|
@@ -31,7 +33,7 @@ class BudgetProgress extends StatelessWidget { | |
| bool get isOverBudget => spent > budgeted; | ||
|
|
||
| @override | ||
| Widget build(BuildContext context, WidgetRef ref) { | ||
| final theme = Theme.of(context); | ||
| final progressColor = _getProgressColor(); | ||
|
|
||
|
|
@@ -230,7 +232,7 @@ class CompactBudgetProgress extends StatelessWidget { | |
| ), | ||
| ), | ||
| ), | ||
| SizedBox( | ||
| width: 45, | ||
| child: Text( | ||
| '${percentage.toStringAsFixed(0)}%', | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,7 +40,7 @@ class SecondaryButton extends StatelessWidget { | |
| onPressed: isEnabled ? onPressed : null, | ||
| style: OutlinedButton.styleFrom( | ||
| foregroundColor: textColor ?? theme.primaryColor, | ||
| padding: padding ?? const EdgeInsets.symmetric(horizontal: 24), | ||
| shape: RoundedRectangleBorder( | ||
| borderRadius: BorderRadius.circular(AppConstants.borderRadius), | ||
| ), | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| // 账户卡片组件 | ||
| import 'package:flutter/material.dart'; | ||
| import 'package:flutter_riverpod/flutter_riverpod.dart'; | ||
| import 'package:intl/intl.dart'; | ||
| import 'package:jive_money/providers/currency_provider.dart'; | ||
| import 'package:jive_money/core/constants/app_constants.dart'; | ||
|
|
||
|
|
@@ -64,9 +64,6 @@ class AccountCard extends ConsumerWidget { | |
| @override | ||
| Widget build(BuildContext context, WidgetRef ref) { | ||
| final theme = Theme.of(context); | ||
| return Card( | ||
| margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 6), | ||
| elevation: 2, | ||
|
|
@@ -284,23 +281,7 @@ class AccountCard extends ConsumerWidget { | |
| } | ||
| } | ||
|
|
||
| // _getCurrencySymbol no longer used; currency formatting is centralized. | ||
| String _formatLastSync() { | ||
| if (lastSyncAt == null) return '从未'; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,7 +38,7 @@ class AccountOverview extends ConsumerWidget { | |
| } | ||
|
|
||
| // 按类型分组账户 | ||
| // final Map<AccountType, List<Account>> groupedAccounts = {}; | ||
| double totalAssets = accountState.totalAssets; | ||
| double totalLiabilities = accountState.totalLiabilities; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,11 +1,10 @@ | ||||||
| import 'package:flutter/material.dart'; | ||||||
| import 'package:jive_money/core/constants/app_constants.dart'; | ||||||
| import 'package:jive_money/ui/components/charts/balance_chart.dart'; | ||||||
| import 'package:jive_money/ui/components/dashboard/summary_card.dart'; | ||||||
| import 'package:jive_money/ui/components/dashboard/quick_actions.dart'; | ||||||
| import 'package:jive_money/ui/components/dashboard/recent_transactions.dart'; | ||||||
| import 'package:jive_money/models/transaction.dart'; | ||||||
|
|
||||||
| class DashboardOverview extends StatelessWidget { | ||||||
| final DashboardData data; | ||||||
|
|
@@ -309,9 +308,9 @@ class DashboardOverview extends StatelessWidget { | |||||
| /// 仪表板数据模型 | ||||||
| class DashboardData { | ||||||
| final List<SummaryCardData> summaryCards; | ||||||
| final List<BalancePoint> balanceData; | ||||||
| final List<dynamic> quickActions; | ||||||
|
There was a problem hiding this comment. The type of
Suggested change
|
||||||
| final List<Transaction> recentTransactions; | ||||||
| final List<AccountOverviewData> accounts; | ||||||
| final List<BudgetOverviewData> budgets; | ||||||
| final VoidCallback? onViewAllTransactions; | ||||||
|
|
@@ -363,4 +362,4 @@ class BudgetOverviewData { | |||||
| required this.spent, | ||||||
| required this.progress, | ||||||
| }); | ||||||
| } | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -117,7 +117,6 @@ class CardLoading extends StatelessWidget { | |
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
|
|
||
| return Card( | ||
| margin: margin ?? const EdgeInsets.all(8), | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,6 @@ import 'package:jive_money/ui/components/loading/loading_widget.dart'; | |
| import 'package:jive_money/models/transaction.dart'; | ||
|
|
||
| import 'package:flutter_riverpod/flutter_riverpod.dart'; | ||
|
|
||
| // 类型别名以兼容现有代码 | ||
| typedef TransactionData = Transaction; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -147,18 +147,7 @@ class ImageUtils { | |||||||
| return false; | ||||||||
| } | ||||||||
|
|
||||||||
| // Check for common image extensions// Allow URLs without extensions (many CDNs don't use them) | ||||||||
|
There was a problem hiding this comment. Missing space between comments. Should be '// Check for common image extensions // Allow URLs without extensions (many CDNs don't use them)'
Suggested change
|
||||||||
| // but validate the URL structure | ||||||||
| return uri.host.isNotEmpty; | ||||||||
| } catch (e) { | ||||||||
|
|
||||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The forceSync() method should await the sync operation rather than making it unawaited, as users calling forceSync() likely expect synchronous completion.