Added theme, reworked UI

lib/domains/charts/chart_bloc.dart

@@ -5,6 +5,7 @@ import 'package:tunas/domains/charts/models/month_totals.dart';
 import 'package:tunas/domains/transaction/models/transaction_line.dart';
 import 'package:tunas/domains/charts/models/chart_item.dart';
 import 'package:tunas/repositories/account/account_repository.dart';
+import 'package:tunas/repositories/account/models/category.dart';
 import 'package:tunas/repositories/account/models/transaction.dart';
 
 part 'chart_event.dart';
@@ -16,20 +17,30 @@ class ChartBloc extends Bloc<ChartEvent, ChartState> {
   ChartBloc({required AccountRepository accountRepository}) : 
     _accountRepository = accountRepository, super(const ChartState()) {
 
-    on<ChartAccountLoad>(_onAccountLoad);
+    on<ChartTransactionsLoad>(_onChartTransactionsLoad);
+    on<ChartCategoriesLoad>(_onChartCategoriesLoad);
     on<ChartNextYear>(_onNextYear);
     on<ChartPreviousYear>(_onPreviousYear);
 
     _accountRepository
       .getTransactionsStream()
-      .listen((transactions) => add(ChartAccountLoad(transactions)));
+      .listen((transactions) => add(ChartTransactionsLoad(transactions)));
+
+    _accountRepository
+      .getCategoriesStream()
+      .listen((categories) => add(ChartCategoriesLoad(categories)));
   }
 
-  _onAccountLoad(ChartAccountLoad event, Emitter<ChartState> emit) {
+  _onChartTransactionsLoad(ChartTransactionsLoad event, Emitter<ChartState> emit) {
     ChartState localState = state.copyWith(transactions: event.transactions);
     emit(_computeStateStats(localState));
   }
 
+  _onChartCategoriesLoad(ChartCategoriesLoad event, Emitter<ChartState> emit) {
+    ChartState localState = state.copyWith(categories: Map.fromEntries(event.categories.map((category) => MapEntry(category.label, category))));
+    emit(_computeStateStats(localState));
+  }
+
   _onNextYear(ChartNextYear event, Emitter<ChartState> emit) {
     if (state.lastDate!.year >= state.currentYear + 1) {
       ChartState localState = state.copyWith(currentYear: state.currentYear + 1);
@@ -123,7 +134,8 @@ class ChartBloc extends Bloc<ChartEvent, ChartState> {
 
       scopedMonthlyTotals[transactionDateDay] = FlSpot(transactionDateDay.toDouble(), transactionLine.subTotal);
 
-      if (transaction.category.isEmpty) {
+      final category = state.categories[transaction.category];
+      if (category == null || category.saving) {
         continue;
       }
 
@@ -201,15 +213,20 @@ class ChartBloc extends Bloc<ChartEvent, ChartState> {
     List<ChartItem> scopedSimplifiedCategoriesPositiveTotals = [];
     List<ChartItem> scopedSimplifiedCategoriesNegativeTotals = [];
 
-    scopedCategoriesPositiveTotals.sort((a, b) => a.value.compareTo(b.value));
-    scopedCategoriesPositiveTotalsPercents.sort((a, b) => a.value.compareTo(b.value));
+    scopedCategoriesPositiveTotals.sort((a, b) => b.value.compareTo(a.value));
+    scopedCategoriesPositiveTotalsPercents.sort((a, b) => b.value.compareTo(a.value));
     scopedCategoriesNegativeTotals.sort((a, b) => a.value.compareTo(b.value));
     scopedCategoriesNegativeTotalsPercents.sort((a, b) => a.value.compareTo(b.value));
-    scopedSimplifiedCategoriesPositiveTotals.sort((a, b) => a.value.compareTo(b.value));
-    scopedSimplifiedCategoriesPositiveTotalsPercents.sort((a, b) => a.value.compareTo(b.value));
+    scopedSimplifiedCategoriesPositiveTotals.sort((a, b) => b.value.compareTo(a.value));
+    scopedSimplifiedCategoriesPositiveTotalsPercents.sort((a, b) => b.value.compareTo(a.value));
     scopedSimplifiedCategoriesNegativeTotals.sort((a, b) => a.value.compareTo(b.value));
     scopedSimplifiedCategoriesNegativeTotalsPercents.sort((a, b) => a.value.compareTo(b.value));
 
+    for (var monthTotals in scopedCategoriesMonthlyTotals.values) {
+      _sortMapByValues(monthTotals.positives);
+      _sortMapByValues(monthTotals.negatives);
+    }
+
     return state.copyWith(
       scoppedProfit: scoppedTotal,
       scopedCategoriesPositiveTotals: scopedCategoriesPositiveTotals,
@@ -226,4 +243,15 @@ class ChartBloc extends Bloc<ChartEvent, ChartState> {
       scopedMonthlyNegativeTotals: scopedMonthlyNegativeTotals,
     );
   }
+
+  Map<dynamic, dynamic> _sortMapByValues(Map<dynamic, dynamic> map) {
+    final sortedEntries = map.entries.toList()..sort((a, b) {
+      var diff = b.value.compareTo(a.value);
+      return diff;
+    });
+
+    return map
+      ..clear()
+      ..addEntries(sortedEntries);
+  }
 }

lib/domains/charts/chart_event.dart

@@ -7,13 +7,21 @@ sealed class ChartEvent extends Equatable {
   List<Object> get props => [];
 }
 
-final class ChartAccountLoad extends ChartEvent {
+final class ChartTransactionsLoad extends ChartEvent {
   final List<Transaction> transactions;
-  const ChartAccountLoad(this.transactions);
+  const ChartTransactionsLoad(this.transactions);
 
   @override
   List<Object> get props => [transactions];
 }
 
+final class ChartCategoriesLoad extends ChartEvent {
+  final List<Category> categories;
+  const ChartCategoriesLoad(this.categories);
+
+  @override
+  List<Object> get props => [categories];
+}
+
 final class ChartNextYear extends ChartEvent {}
 final class ChartPreviousYear extends ChartEvent {}

lib/domains/charts/chart_state.dart

@@ -1,6 +1,7 @@
 part of 'chart_bloc.dart';
 
 final class ChartState extends Equatable {
+  final Map<String, Category> categories;
   final List<Transaction> transactions;
   final List<TransactionLine> transactionsLines;
 
@@ -34,6 +35,7 @@ final class ChartState extends Equatable {
   final double scoppedProfit;
 
   const ChartState({
+    this.categories = const {},
     this.transactions = const [],
     this.transactionsLines = const [],
     this.globalTotal = 0,
@@ -60,6 +62,7 @@ final class ChartState extends Equatable {
   });
 
   ChartState copyWith({
+    Map<String, Category>? categories,
     List<Transaction>? transactions,
     List<TransactionLine>? transactionsLines,
     double? globalTotal,
@@ -85,6 +88,7 @@ final class ChartState extends Equatable {
     Map<int, double>? scopedMonthlyNegativeTotals,
   }) {
     return ChartState(
+      categories: categories ?? this.categories,
       transactions: transactions ?? this.transactions,
       transactionsLines: transactionsLines ?? this.transactionsLines,
       globalTotal: globalTotal ?? this.globalTotal,
@@ -113,6 +117,7 @@ final class ChartState extends Equatable {
   
   @override
   List<Object> get props => [
+    categories,
     transactions,
     transactionsLines,
     globalTotal,