mirror of
https://github.com/we-promise/sure.git
synced 2026-04-21 13:04:18 +00:00
This commit adds two new features to the More tab in the mobile app: (#612)
Calendar View: Monthly calendar displaying daily balance changes for selected account Account selection dropdown to switch between different accounts Month navigation with previous/next buttons Visual indicators (green for income, red for expenses) Monthly profit/loss summary at the top Auto-calculation of daily transaction totals Recent Transactions: View recent N transactions across all accounts Configurable display limit (10/20/50/100 transactions) Pull-to-refresh functionality Transaction details including account name, date, amount, and notes Visual distinction between income and expenses Sorted by date (most recent first) Implementation details: Created MoreScreen as menu hub for new features Replaced PlaceholderScreen with functional MoreScreen Leverages existing Provider pattern for state management Uses offline-first approach with existing data providers Full Chinese localization Material Design 3 compliant UI Files added: mobile/lib/screens/more_screen.dart mobile/lib/screens/calendar_screen.dart mobile/lib/screens/recent_transactions_screen.dart Files modified: mobile/lib/screens/main_navigation_screen.dart Signed-off-by: Lazy Bone <89256478+dwvwdv@users.noreply.github.com> Co-authored-by: dwvwdv <dwvwdv@protonmail.com>
This commit is contained in:
Lazy Bone
292
mobile/lib/screens/recent_transactions_screen.dart
Normal file
292
mobile/lib/screens/recent_transactions_screen.dart
Normal file
@@ -0,0 +1,292 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import '../models/transaction.dart';
|
||||
import '../models/account.dart';
|
||||
import '../providers/transactions_provider.dart';
|
||||
import '../providers/accounts_provider.dart';
|
||||
import '../providers/auth_provider.dart';
|
||||
|
||||
class RecentTransactionsScreen extends StatefulWidget {
|
||||
const RecentTransactionsScreen({super.key});
|
||||
|
||||
@override
|
||||
State<RecentTransactionsScreen> createState() => _RecentTransactionsScreenState();
|
||||
}
|
||||
|
||||
class _RecentTransactionsScreenState extends State<RecentTransactionsScreen> {
|
||||
int _transactionLimit = 20;
|
||||
final List<int> _limitOptions = [10, 20, 50, 100];
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
_loadAllTransactions();
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> _loadAllTransactions() async {
|
||||
final authProvider = context.read<AuthProvider>();
|
||||
final transactionsProvider = context.read<TransactionsProvider>();
|
||||
|
||||
final accessToken = await authProvider.getValidAccessToken();
|
||||
|
||||
if (accessToken != null) {
|
||||
// Load transactions for all accounts
|
||||
await transactionsProvider.fetchTransactions(
|
||||
accessToken: accessToken,
|
||||
forceSync: false,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _refreshTransactions() async {
|
||||
final authProvider = context.read<AuthProvider>();
|
||||
final transactionsProvider = context.read<TransactionsProvider>();
|
||||
|
||||
final accessToken = await authProvider.getValidAccessToken();
|
||||
|
||||
if (accessToken != null) {
|
||||
await transactionsProvider.fetchTransactions(
|
||||
accessToken: accessToken,
|
||||
forceSync: true,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Account? _getAccount(String accountId) {
|
||||
final accountsProvider = context.read<AccountsProvider>();
|
||||
try {
|
||||
return accountsProvider.accounts.firstWhere(
|
||||
(a) => a.id == accountId,
|
||||
);
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
List<Transaction> _getSortedTransactions(List<Transaction> transactions) {
|
||||
final sorted = List<Transaction>.from(transactions);
|
||||
sorted.sort((a, b) {
|
||||
try {
|
||||
final dateA = DateTime.parse(a.date);
|
||||
final dateB = DateTime.parse(b.date);
|
||||
return dateB.compareTo(dateA); // Most recent first
|
||||
} catch (e) {
|
||||
return 0;
|
||||
}
|
||||
});
|
||||
return sorted.take(_transactionLimit).toList();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
final transactionsProvider = context.watch<TransactionsProvider>();
|
||||
|
||||
final recentTransactions = _getSortedTransactions(
|
||||
transactionsProvider.transactions,
|
||||
);
|
||||
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: const Text('Recent Transactions'),
|
||||
actions: [
|
||||
PopupMenuButton<int>(
|
||||
initialValue: _transactionLimit,
|
||||
icon: const Icon(Icons.filter_list),
|
||||
tooltip: 'Display Limit',
|
||||
onSelected: (int value) {
|
||||
setState(() {
|
||||
_transactionLimit = value;
|
||||
});
|
||||
},
|
||||
itemBuilder: (context) => _limitOptions.map((limit) {
|
||||
return PopupMenuItem<int>(
|
||||
value: limit,
|
||||
child: Row(
|
||||
children: [
|
||||
if (limit == _transactionLimit)
|
||||
Icon(Icons.check, color: colorScheme.primary, size: 20)
|
||||
else
|
||||
const SizedBox(width: 20),
|
||||
const SizedBox(width: 8),
|
||||
Text('Show $limit'),
|
||||
],
|
||||
),
|
||||
);
|
||||
}).toList(),
|
||||
),
|
||||
],
|
||||
),
|
||||
body: RefreshIndicator(
|
||||
onRefresh: _refreshTransactions,
|
||||
child: transactionsProvider.isLoading
|
||||
? const Center(child: CircularProgressIndicator())
|
||||
: recentTransactions.isEmpty
|
||||
? _buildEmptyState(colorScheme)
|
||||
: ListView.separated(
|
||||
itemCount: recentTransactions.length,
|
||||
separatorBuilder: (context, index) => Divider(
|
||||
height: 1,
|
||||
color: colorScheme.outlineVariant,
|
||||
),
|
||||
itemBuilder: (context, index) {
|
||||
final transaction = recentTransactions[index];
|
||||
return _buildTransactionItem(
|
||||
transaction,
|
||||
colorScheme,
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildEmptyState(ColorScheme colorScheme) {
|
||||
return Center(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Icon(
|
||||
Icons.receipt_long_outlined,
|
||||
size: 64,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Text(
|
||||
'No Transactions',
|
||||
style: Theme.of(context).textTheme.titleLarge,
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
'Pull to refresh',
|
||||
style: TextStyle(color: colorScheme.onSurfaceVariant),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildTransactionItem(Transaction transaction, ColorScheme colorScheme) {
|
||||
final account = _getAccount(transaction.accountId);
|
||||
final accountName = account?.name ?? 'Unknown Account';
|
||||
|
||||
// Parse amount with proper sign handling (same logic as transactions_list_screen.dart)
|
||||
String trimmedAmount = transaction.amount.trim();
|
||||
trimmedAmount = trimmedAmount.replaceAll('\u2212', '-'); // Normalize minus sign
|
||||
|
||||
// Detect if the amount has a negative sign
|
||||
bool hasNegativeSign = trimmedAmount.startsWith('-') || trimmedAmount.endsWith('-');
|
||||
|
||||
// Remove all non-numeric characters except decimal point and minus sign
|
||||
String numericString = trimmedAmount.replaceAll(RegExp(r'[^\d.\-]'), '');
|
||||
|
||||
// Parse the numeric value
|
||||
double amount = double.tryParse(numericString.replaceAll('-', '')) ?? 0.0;
|
||||
|
||||
// Apply the sign from the string
|
||||
if (hasNegativeSign) {
|
||||
amount = -amount;
|
||||
}
|
||||
|
||||
// For asset accounts and liability accounts, flip the sign to match accounting conventions
|
||||
if (account?.isAsset == true || account?.isLiability == true) {
|
||||
amount = -amount;
|
||||
}
|
||||
|
||||
// Determine display properties based on final amount
|
||||
final isPositive = amount >= 0;
|
||||
Color amountColor;
|
||||
String sign;
|
||||
|
||||
if (isPositive) {
|
||||
amountColor = Colors.green.shade700;
|
||||
sign = '+';
|
||||
} else {
|
||||
amountColor = Colors.red.shade700;
|
||||
sign = '-';
|
||||
}
|
||||
|
||||
String formattedDate;
|
||||
try {
|
||||
final date = DateTime.parse(transaction.date);
|
||||
formattedDate = DateFormat('yyyy-MM-dd HH:mm').format(date);
|
||||
} catch (e) {
|
||||
formattedDate = transaction.date;
|
||||
}
|
||||
|
||||
return ListTile(
|
||||
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||
leading: Container(
|
||||
padding: const EdgeInsets.all(8),
|
||||
decoration: BoxDecoration(
|
||||
color: isPositive
|
||||
? Colors.green.withValues(alpha: 0.1)
|
||||
: Colors.red.withValues(alpha: 0.1),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
child: Icon(
|
||||
isPositive ? Icons.arrow_upward : Icons.arrow_downward,
|
||||
color: amountColor,
|
||||
),
|
||||
),
|
||||
title: Text(
|
||||
transaction.name,
|
||||
style: const TextStyle(fontWeight: FontWeight.w500),
|
||||
),
|
||||
subtitle: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
accountName,
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 2),
|
||||
Text(
|
||||
formattedDate,
|
||||
style: TextStyle(
|
||||
fontSize: 11,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
if (transaction.notes != null && transaction.notes!.isNotEmpty) ...[
|
||||
const SizedBox(height: 2),
|
||||
Text(
|
||||
transaction.notes!,
|
||||
style: TextStyle(
|
||||
fontSize: 11,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
fontStyle: FontStyle.italic,
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
trailing: Text(
|
||||
'$sign${transaction.currency} ${_formatAmount(amount.abs())}',
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
fontSize: 16,
|
||||
color: amountColor,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
String _formatAmount(double amount) {
|
||||
// Support up to 8 decimal places, but omit unnecessary trailing zeros
|
||||
final formatter = NumberFormat('#,##0.########');
|
||||
return formatter.format(amount);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user