Added theme, reworked UI
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user