kolo/Casha
1
0
Fork 0
mirror of https://github.com/koloideal/Casha.git synced 2026-06-10 10:25:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
kolo
2026-03-23 12:02:59 +03:00
parent b19b7fac4f
commit 598254556c
1 changed files with 172 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/add_transaction/screen.dart
+172 -51
View File
@@ -153,36 +153,51 @@ class _AddTransactionScreenState extends ConsumerState<AddTransactionScreen>
? null ? null
: _noteController.text.trim(); : _noteController.text.trim();
// Get account ID: use active account or fallback to main try {
final activeAccount = ref.read(activeAccountProvider); // Get account ID: use active account or fallback to main
final accountId = activeAccount?.id ?? final activeAccount = ref.read(activeAccountProvider);
(await ref.read(accountRepositoryProvider).getMain()).id; int accountId;
if (activeAccount != null) {
accountId = activeAccount.id;
} else {
final mainAccount = await ref.read(accountRepositoryProvider).getMain();
accountId = mainAccount.id;
}
final tx = Transaction( final tx = Transaction(
id: state.editingId ?? _uuid.v4(), id: state.editingId ?? _uuid.v4(),
amount: amount, amount: amount,
category: state.category, category: state.category,
type: state.type, type: state.type,
date: finalDateTime, date: finalDateTime,
note: note, note: note,
currency: state.overrideCurrency, currency: state.overrideCurrency,
currencyCode: state.overrideCurrencyCode, currencyCode: state.overrideCurrencyCode,
accountId: accountId, accountId: accountId,
); );
if (state.isEditing) { if (state.isEditing) {
await ref.read(transactionsProvider.notifier).update(tx); await ref.read(transactionsProvider.notifier).update(tx);
} else { } else {
await ref.read(transactionsProvider.notifier).add(tx); await ref.read(transactionsProvider.notifier).add(tx);
}
HapticService.medium();
if (mounted) context.pop();
} catch (e) {
// Handle error silently or show a snackbar
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('Error saving transaction: $e')),
);
}
} finally {
ref
.read(addTransactionProvider(widget.initial).notifier)
.setSubmitting(false);
} }
ref
.read(addTransactionProvider(widget.initial).notifier)
.setSubmitting(false);
HapticService.medium();
if (mounted) context.pop();
} }
Future<void> _pickDate() async { Future<void> _pickDate() async {
@@ -242,7 +257,7 @@ class _AddTransactionScreenState extends ConsumerState<AddTransactionScreen>
// Get active account or fallback to main // Get active account or fallback to main
final activeAccount = ref.watch(activeAccountProvider); final activeAccount = ref.watch(activeAccountProvider);
final accountRepository = ref.watch(accountRepositoryProvider); final accountsAsync = ref.watch(accountsProvider);
return Scaffold( return Scaffold(
backgroundColor: Theme.of(context).scaffoldBackgroundColor, backgroundColor: Theme.of(context).scaffoldBackgroundColor,
@@ -294,31 +309,137 @@ class _AddTransactionScreenState extends ConsumerState<AddTransactionScreen>
child: ListView( child: ListView(
padding: const EdgeInsets.all(20), padding: const EdgeInsets.all(20),
children: [ children: [
FutureBuilder<String>( // Symmetrical Account + Type Toggle Row
future: activeAccount != null Row(
? Future.value(activeAccount.name) children: [
: accountRepository.getMain().then((acc) => acc.name), // Left: Account Indicator (50% width)
builder: (context, snapshot) { Expanded(
if (snapshot.hasData) { child: accountsAsync.when(
return Padding( data: (accounts) {
padding: const EdgeInsets.only(bottom: 16), final displayAccount = activeAccount ??
child: Text( accounts.firstWhere((a) => a.isMain, orElse: () => accounts.first);
'Account: ${snapshot.data}',
style: Theme.of(context).textTheme.bodySmall?.copyWith( return Container(
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.5), height: 56,
padding: const EdgeInsets.symmetric(horizontal: 14),
decoration: BoxDecoration(
color: const Color(0xFF7C6DED).withOpacity(0.1),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: const Color(0xFF7C6DED).withOpacity(0.3),
width: 1.5,
),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.account_balance_wallet_rounded,
size: 18,
color: const Color(0xFF7C6DED),
),
const SizedBox(width: 10),
Flexible(
child: Text(
displayAccount.name,
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: const Color(0xFF7C6DED),
fontWeight: FontWeight.w600,
fontSize: 14,
),
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center,
),
),
],
),
);
},
loading: () => Container(
height: 56,
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.surface,
borderRadius: BorderRadius.circular(12),
), ),
), ),
); error: (_, __) => Container(
} height: 56,
return const SizedBox.shrink(); decoration: BoxDecoration(
}, color: Theme.of(context).colorScheme.surface,
), borderRadius: BorderRadius.circular(12),
_TypeToggle( ),
selected: state.type, ),
strings: s, ),
onChanged: (t) => ref ),
.read(addTransactionProvider(widget.initial).notifier) const SizedBox(width: 12),
.setType(t), // Right: Type Toggle (50% width)
Expanded(
child: Container(
height: 56,
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.surface,
borderRadius: BorderRadius.circular(12),
border: isDark
? null
: Border.all(color: const Color(0xFFDDDDEE), width: 1),
),
child: Row(
children: [
Expanded(
child: GestureDetector(
onTap: () => ref
.read(addTransactionProvider(widget.initial).notifier)
.setType(TransactionType.income),
child: AnimatedContainer(
duration: const Duration(milliseconds: 200),
decoration: BoxDecoration(
color: state.type == TransactionType.income
? AppColors.income.withOpacity(0.15)
: Colors.transparent,
borderRadius: BorderRadius.circular(11),
),
child: Center(
child: Icon(
Icons.arrow_downward_rounded,
color: state.type == TransactionType.income
? AppColors.income
: Theme.of(context).colorScheme.onSurface.withOpacity(0.4),
size: 20,
),
),
),
),
),
Expanded(
child: GestureDetector(
onTap: () => ref
.read(addTransactionProvider(widget.initial).notifier)
.setType(TransactionType.expense),
child: AnimatedContainer(
duration: const Duration(milliseconds: 200),
decoration: BoxDecoration(
color: state.type == TransactionType.expense
? AppColors.expense.withOpacity(0.15)
: Colors.transparent,
borderRadius: BorderRadius.circular(11),
),
child: Center(
child: Icon(
Icons.arrow_upward_rounded,
color: state.type == TransactionType.expense
? AppColors.expense
: Theme.of(context).colorScheme.onSurface.withOpacity(0.4),
size: 20,
),
),
),
),
),
],
),
),
),
],
), ),
const SizedBox(height: 24), const SizedBox(height: 24),