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-24 17:10:50 +03:00
parent e0fa55c6f5
commit 29270edea9
3 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/data/repositories/account_repository.dart
+4 -4
View File
@@ -172,14 +172,14 @@ class AccountRepository {
)); ));
} }
Future<void> add(model.Account account) async { Future<int> add(model.Account account) async {
await _db.into(_db.accounts).insert( return await _db.into(_db.accounts).insert(
AccountsCompanion.insert( AccountsCompanion.insert(
id: Value(account.id),
name: account.name, name: account.name,
isMain: Value(account.isMain), isMain: Value(account.isMain),
currency: Value(account.currency),
sortOrder: Value(account.sortOrder), sortOrder: Value(account.sortOrder),
currency: Value(account.currency),
createdAt: Value(account.createdAt),
), ),
); );
} }
lib/features/dashboard/screen.dart
+10 -5
View File
@@ -162,7 +162,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
if (isAddingAccount) { if (isAddingAccount) {
// Create new account // Create new account
final newAccount = Account( final newAccount = Account(
id: DateTime.now().millisecondsSinceEpoch, id: DateTime.now().millisecondsSinceEpoch, // temporary
name: tempAccountName.trim(), name: tempAccountName.trim(),
isMain: false, isMain: false,
sortOrder: 99, sortOrder: 99,
@@ -170,14 +170,19 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
createdAt: DateTime.now(), createdAt: DateTime.now(),
); );
// Insert into database
await ref.read(accountRepositoryProvider).add(newAccount); await ref.read(accountRepositoryProvider).add(newAccount);
// FIX: Fetch the actual ID assigned by the database to save colors correctly // SECURE FIX: Fetch the actual ID assigned by SQLite, avoiding add() return issues
final accounts = await ref.read(accountRepositoryProvider).getAll(); final allAccounts = await ref.read(accountRepositoryProvider).getAll();
final actualNewAccount = accounts.lastWhere((a) => a.name == tempAccountName.trim()); final actualAccount = allAccounts.lastWhere(
(a) => a.name == tempAccountName.trim() && a.currency == tempAccountCurrency,
orElse: () => allAccounts.last,
);
// Save colors using the guaranteed correct database ID
await ref await ref
.read(accountCardColorsProvider(actualNewAccount.id).notifier) .read(accountCardColorsProvider(actualAccount.id).notifier)
.save(tempPrimary, tempSecondary, tempGradientType); .save(tempPrimary, tempSecondary, tempGradientType);
} else if (editingAccount != null) { } else if (editingAccount != null) {
// Existing edit logic // Existing edit logic
lib/features/dashboard/widgets/account_editor_overlay.dart
+36 -38
View File
@@ -263,40 +263,14 @@ class _AccountEditorOverlayState extends State<AccountEditorOverlay> {
), ),
// Top Right Buttons (Delete & Close) // Top Right Buttons (Delete & Close)
Positioned( Positioned(
top: mq.padding.top + 8, top: cardTop - 20, // Center buttons exactly on the top edge of the card
right: 20, right: 20,
child: SafeArea( child: Row( // REMOVED SafeArea to fix the vertical offset
child: Row( mainAxisSize: MainAxisSize.min,
mainAxisSize: MainAxisSize.min, children: [
children: [ if (!dash.isAddingAccount && (ref.watch(accountsProvider).valueOrNull?.length ?? 0) > 1) ...[
if (!dash.isAddingAccount && (ref.watch(accountsProvider).valueOrNull?.length ?? 0) > 1) ...[
GestureDetector(
onTap: () => setState(() => _showDeleteDialog = true),
child: Container(
width: 40,
height: 40,
decoration: BoxDecoration(
color: Theme.of(widget.context).colorScheme.surface,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Colors.red.withOpacity(0.2),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: const Icon(
Icons.delete_outline_rounded,
size: 22,
color: Colors.red,
),
),
),
const SizedBox(width: 12),
],
GestureDetector( GestureDetector(
onTap: () => dash.closeAccountOverlay(apply: false), onTap: () => setState(() => _showDeleteDialog = true),
child: Container( child: Container(
width: 40, width: 40,
height: 40, height: 40,
@@ -305,21 +279,45 @@ class _AccountEditorOverlayState extends State<AccountEditorOverlay> {
shape: BoxShape.circle, shape: BoxShape.circle,
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colors.black.withOpacity(0.3), color: Colors.red.withOpacity(0.2),
blurRadius: 8, blurRadius: 8,
offset: const Offset(0, 2), offset: const Offset(0, 2),
), ),
], ],
), ),
child: Icon( child: const Icon(
Icons.close_rounded, Icons.delete_outline_rounded,
size: 24, size: 22,
color: Theme.of(widget.context).colorScheme.onSurface, color: Colors.red,
), ),
), ),
), ),
const SizedBox(width: 12),
], ],
), GestureDetector(
onTap: () => dash.closeAccountOverlay(apply: false),
child: Container(
width: 40,
height: 40,
decoration: BoxDecoration(
color: Theme.of(widget.context).colorScheme.surface,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.3),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: Icon(
Icons.close_rounded,
size: 24,
color: Theme.of(widget.context).colorScheme.onSurface,
),
),
),
],
), ),
), ),
// Custom Dialog Overlay // Custom Dialog Overlay