Skip to content

fix(dashboard): fix budget section category colors and spending calcu… #531

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
lucaantonelli merged 1 commit into from
Jul 26, 2026
Merged

fix(dashboard): fix budget section category colors and spending calcu… #531

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
80 changes: 54 additions & 26 deletions lib/pages/dashboard/widgets/budgets_section.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
import 'dart:math';

import 'package:collection/collection.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../constants/constants.dart';

import '../../../ui/widgets/budget_circular_indicator.dart';
import '../../../providers/budgets_provider.dart';
import '../../../providers/categories_provider.dart';
import '../../../providers/transactions_provider.dart';
import '../../../ui/device.dart';

class BudgetsSection extends ConsumerWidget {
const BudgetsSection({super.key});

@override
Widget build(BuildContext context, WidgetRef ref) {
final budgetsAsync = ref.watch(monthlyBudgetsStatsProvider);
final budgetsAsync = ref.watch(budgetsProvider);
final transactionsAsync = ref.watch(monthlyTransactionsProvider);
final categoriesAsync = ref.watch(allParentCategoriesProvider);

return Column(
crossAxisAlignment: CrossAxisAlignment.start,
spacing: Sizes.lg,
Expand Down Expand Up @@ -52,32 +60,52 @@ class BudgetsSection extends ConsumerWidget {
],
),
);
} else {
return SizedBox(
height: 150,
width: MediaQuery.of(context).size.width,
child: ListView.builder(
scrollDirection: Axis.horizontal,
itemCount: budgets.length,
itemBuilder: (context, index) => Padding(
padding: const EdgeInsets.symmetric(horizontal: Sizes.md),
child: BudgetCircularIndicator(
title: budgets[index].name!,
amount:
budgets[index].amountLimit - budgets[index].spent > 0
? budgets[index].amountLimit - budgets[index].spent
: 0,
perc:
budgets[index].spent / budgets[index].amountLimit > 1
? 1
: budgets[index].spent / budgets[index].amountLimit,
color:
categoryColorList[index % categoryColorList.length],
),
),
),
);
}
return transactionsAsync.when(
data: (transactions) => categoriesAsync.when(
data: (categories) {
return SizedBox(
height: 150,
width: MediaQuery.of(context).size.width,
child: ListView.builder(
scrollDirection: Axis.horizontal,
itemCount: budgets.length,
itemBuilder: (context, index) {
final budget = budgets[index];
final category = categories.firstWhereOrNull(
(cat) => cat.id == budget.idCategory,
);
if (category == null) return const SizedBox();
final double spent = transactions
.where(
(t) =>
t.idCategory == budget.idCategory ||
t.categoryParent == budget.idCategory,
)
.fold(0.0, (sum, t) => sum + t.amount);
return Padding(
padding: const EdgeInsets.symmetric(
horizontal: Sizes.md,
),
child: BudgetCircularIndicator(
title: budget.name!,
amount: max(0, budget.amountLimit - spent),
perc: budget.amountLimit > 0
? min(1, spent / budget.amountLimit)
: 0,
color: categoryColorList[category.color],
),
);
},
),
);
},
error: (err, stack) => Text('Error: $err'),
loading: () => const Center(child: CircularProgressIndicator()),
),
error: (err, stack) => Text('Error: $err'),
loading: () => const Center(child: CircularProgressIndicator()),
);
},
error: (err, stack) => Text('Error: $err'),
loading: () => const Center(child: CircularProgressIndicator()),
Expand Down
Loading