Compare commits
2 Commits
1a7f28703a
...
44279796c4
| Author | SHA1 | Date | |
|---|---|---|---|
| 44279796c4 | |||
| b2da8436e4 |
21
lib/app.dart
21
lib/app.dart
@@ -3,7 +3,9 @@ import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:flutter_localizations/flutter_localizations.dart';
|
||||
import 'package:tunas/clients/storage/storage_client.dart';
|
||||
import 'package:tunas/pages/home/home_page.dart';
|
||||
import 'package:tunas/repositories/account/account_repository.dart';
|
||||
import 'package:tunas/repositories/json/json_repository.dart';
|
||||
import 'package:tunas/repositories/metadata/metadata_repository.dart';
|
||||
import 'package:tunas/repositories/transactions/transactions_repository.dart';
|
||||
import 'package:tunas/theme.dart';
|
||||
|
||||
class App extends StatefulWidget {
|
||||
@@ -29,20 +31,31 @@ class AppView extends StatefulWidget {
|
||||
|
||||
class _AppViewState extends State<AppView> {
|
||||
late final StorageClient _storageClient;
|
||||
late final AccountRepository _accountRepository;
|
||||
late final JsonRepository _jsonRepository;
|
||||
late final TransactionsRepository _transactionsRepository;
|
||||
late final MetadataRepository _metadataRepository;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
|
||||
_storageClient = StorageClient();
|
||||
_accountRepository = AccountRepository(storageClient: _storageClient);
|
||||
_jsonRepository = JsonRepository(storageClient: _storageClient);
|
||||
_transactionsRepository = TransactionsRepository(jsonRepository: _jsonRepository);
|
||||
_metadataRepository = MetadataRepository(jsonRepository: _jsonRepository);
|
||||
|
||||
_transactionsRepository.loadTransactions();
|
||||
_metadataRepository.loadMetadata();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return MultiRepositoryProvider(
|
||||
providers: [RepositoryProvider.value(value: _accountRepository)],
|
||||
providers: [
|
||||
RepositoryProvider.value(value: _jsonRepository),
|
||||
RepositoryProvider.value(value: _transactionsRepository),
|
||||
RepositoryProvider.value(value: _metadataRepository),
|
||||
],
|
||||
child: MaterialApp(
|
||||
title: 'Tunas',
|
||||
theme: ThemeData(useMaterial3: true, colorScheme: lightColorScheme),
|
||||
|
||||
@@ -3,27 +3,27 @@ import 'dart:io';
|
||||
import 'package:path_provider/path_provider.dart';
|
||||
|
||||
class StorageClient {
|
||||
save(String filename, String data) async {
|
||||
File file = await _getJson(filename);
|
||||
await file.writeAsString(data);
|
||||
}
|
||||
save(String filename, String data) async {
|
||||
File file = await _getJson(filename);
|
||||
await file.writeAsString(data);
|
||||
}
|
||||
|
||||
Future<String> load(String filename) async {
|
||||
File file = await _getJson(filename);
|
||||
return file.readAsString();
|
||||
}
|
||||
Future<String> load(String filename) async {
|
||||
File file = await _getJson(filename);
|
||||
return file.readAsString();
|
||||
}
|
||||
|
||||
delete(String filename) async {
|
||||
File file = await _getJson(filename);
|
||||
await file.delete();
|
||||
}
|
||||
delete(String filename) async {
|
||||
File file = await _getJson(filename);
|
||||
await file.delete();
|
||||
}
|
||||
|
||||
Future<File> _getJson(String filename) async {
|
||||
final dir = await getApplicationDocumentsDirectory();
|
||||
final file = File('${dir.path}/$filename');
|
||||
if (!file.existsSync()) {
|
||||
file.createSync();
|
||||
}
|
||||
return file;
|
||||
Future<File> _getJson(String filename) async {
|
||||
final dir = await getApplicationDocumentsDirectory();
|
||||
final file = File('${dir.path}/$filename');
|
||||
if (!file.existsSync()) {
|
||||
file.createSync();
|
||||
}
|
||||
return file;
|
||||
}
|
||||
}
|
||||
@@ -1,14 +1,15 @@
|
||||
import 'dart:convert';
|
||||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:csv/csv.dart';
|
||||
import 'package:equatable/equatable.dart';
|
||||
import 'package:file_picker/file_picker.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:tunas/repositories/account/account_repository.dart';
|
||||
import 'package:tunas/repositories/account/models/account.dart';
|
||||
import 'package:tunas/repositories/account/models/category.dart';
|
||||
import 'package:tunas/repositories/account/models/transaction.dart';
|
||||
import 'package:tunas/repositories/metadata/models/category.dart';
|
||||
import 'package:tunas/repositories/metadata/metadata_repository.dart';
|
||||
import 'package:tunas/repositories/metadata/models/account.dart';
|
||||
import 'package:tunas/repositories/transactions/models/transaction.dart';
|
||||
import 'package:tunas/repositories/transactions/transactions_repository.dart';
|
||||
import 'package:uuid/uuid.dart';
|
||||
|
||||
part 'account_event.dart';
|
||||
@@ -34,20 +35,30 @@ final colors = [
|
||||
];
|
||||
|
||||
class AccountBloc extends Bloc<AccountEvent, AccountState> {
|
||||
final AccountRepository _accountRepository;
|
||||
final TransactionsRepository _transactionsRepository;
|
||||
final MetadataRepository _metadataRepository;
|
||||
|
||||
AccountBloc({required AccountRepository accountRepository})
|
||||
: _accountRepository = accountRepository,
|
||||
super(const AccountState()) {
|
||||
on<AccountImportJSON>(_onAccountImportJSON);
|
||||
AccountBloc({
|
||||
required MetadataRepository metadataRepository,
|
||||
required TransactionsRepository transactionsRepository,
|
||||
})
|
||||
: _metadataRepository = metadataRepository,
|
||||
_transactionsRepository = transactionsRepository,
|
||||
super(const AccountState()
|
||||
) {
|
||||
on<AccountImportCSV>(_onAccountImportCSV);
|
||||
on<SubAccountLoad>(_onSubAccountLoad);
|
||||
on<AccountLoad>(_onAccountLoad);
|
||||
// on<AccountExportJSON>(_onAccountImportJSON);
|
||||
// on<AccountExportCSV>(_onAccountImportJSON);
|
||||
on<AccountAdd>(_onAccountAdd);
|
||||
on<AccountRemove>(_onAcountRemove);
|
||||
on<AccountEditLabel>(_onAccountEditLabel);
|
||||
on<AccountEditSaving>(_onAccountEditSaving);
|
||||
on<AccountEditColor>(_onAccountEditColor);
|
||||
|
||||
_accountRepository
|
||||
.getSubAccountsStream()
|
||||
.listen((subAccounts) => add(SubAccountLoad(subAccounts)));
|
||||
_metadataRepository
|
||||
.getAccountsStream()
|
||||
.listen((subAccounts) => add(AccountLoad(subAccounts)));
|
||||
}
|
||||
|
||||
double _universalConvertToDouble(dynamic value) {
|
||||
@@ -62,8 +73,7 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
|
||||
}
|
||||
}
|
||||
|
||||
_onAccountImportCSV(
|
||||
AccountImportCSV event, Emitter<AccountState> emit) async {
|
||||
_onAccountImportCSV(AccountImportCSV event, Emitter<AccountState> emit) async {
|
||||
int colorIndex = 0;
|
||||
FilePickerResult? result = await FilePicker.platform.pickFiles();
|
||||
|
||||
@@ -74,27 +84,33 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
|
||||
final List<List<dynamic>> csvList = const CsvToListConverter(fieldDelimiter: '|', eol: '\n').convert(csvFileContent);
|
||||
|
||||
final Map<String, Category> categoriesMap = {};
|
||||
final Set<String> subAccounts = {};
|
||||
final Map<String, Account> accounts = {};
|
||||
|
||||
final transactions = csvList
|
||||
.map((line) {
|
||||
|
||||
double value = _universalConvertToDouble(line[4]);
|
||||
String? categoryLabel = line[1];
|
||||
if (categoryLabel == null || categoryLabel == '') {
|
||||
categoryLabel = 'N/A';
|
||||
}
|
||||
|
||||
if (categoriesMap[categoryLabel] == null) {
|
||||
if (categoryLabel == 'N/A') {
|
||||
categoriesMap[categoryLabel] = Category(label: 'N/A', color: 'FFFF0000' );
|
||||
} else {
|
||||
String color = colorIndex >= colors.length ? 'FF0000FF' : colors[colorIndex];
|
||||
colorIndex++;
|
||||
categoriesMap[categoryLabel] = Category(label: categoryLabel, color: color );
|
||||
}
|
||||
// if (categoryLabel == 'N/A') {
|
||||
// categoriesMap[categoryLabel] = Category(label: 'N/A', color: 'FFFF0000' );
|
||||
// } else {
|
||||
// String color = colorIndex >= colors.length ? 'FF0000FF' : colors[colorIndex];
|
||||
// colorIndex++;
|
||||
// categoriesMap[categoryLabel] = Category(label: categoryLabel, color: color );
|
||||
// }
|
||||
|
||||
categoriesMap[categoryLabel] = Category(label: categoryLabel, color: value > 0 ? 'FF21E297' : 'FFFFB4AB' );
|
||||
}
|
||||
|
||||
subAccounts.add(line[3]);
|
||||
String accountLabel = line[3];
|
||||
if (accounts[accountLabel] == null) {
|
||||
accounts[accountLabel] = Account(label: accountLabel, color: 'FF74feff');
|
||||
}
|
||||
|
||||
return Transaction(
|
||||
uuid: const Uuid().v8(),
|
||||
@@ -102,37 +118,94 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
|
||||
category: categoryLabel,
|
||||
description: line[2],
|
||||
account: line[3],
|
||||
value: _universalConvertToDouble(line[4]));
|
||||
})
|
||||
value: value
|
||||
);
|
||||
})
|
||||
.toList();
|
||||
|
||||
await _accountRepository.deleteAccount();
|
||||
final account = Account(transactions: transactions, categories: categoriesMap.values.toList(), subAccounts: subAccounts);
|
||||
await _accountRepository.saveAccount(account);
|
||||
await _metadataRepository.deleteMetadata();
|
||||
await _transactionsRepository.deleteTransactions();
|
||||
|
||||
await _metadataRepository.saveAccounts(accounts.values.toList());
|
||||
await _metadataRepository.saveBudgets([]);
|
||||
await _metadataRepository.saveCategories(categoriesMap.values.toList());
|
||||
await _transactionsRepository.saveTransactions(transactions);
|
||||
}
|
||||
}
|
||||
|
||||
_onAccountImportJSON(
|
||||
AccountImportJSON event, Emitter<AccountState> emit) async {
|
||||
FilePickerResult? result = await FilePicker.platform.pickFiles();
|
||||
|
||||
final jsonPath = result?.files.first.path;
|
||||
if (jsonPath != null) {
|
||||
final File json = File(jsonPath);
|
||||
final String jsonString = await json.readAsString();
|
||||
final List<dynamic> jsonList = jsonDecode(jsonString);
|
||||
final List<Transaction> transactions = jsonList.map((transaction) => Transaction.fromJson(transaction)).toList();
|
||||
|
||||
await _accountRepository.deleteAccount();
|
||||
await _accountRepository.saveTransactions(transactions);
|
||||
}
|
||||
}
|
||||
|
||||
_onSubAccountLoad(
|
||||
SubAccountLoad event, Emitter<AccountState> emit
|
||||
_onAccountLoad(
|
||||
AccountLoad event, Emitter<AccountState> emit
|
||||
) {
|
||||
emit(
|
||||
state.copyWith(event.subAccounts)
|
||||
);
|
||||
}
|
||||
|
||||
_onAccountAdd(AccountAdd event, Emitter<AccountState> emit) async {
|
||||
String uuid = const Uuid().v8();
|
||||
Account account = Account(
|
||||
label: 'Account $uuid',
|
||||
color: 'FF74feff',
|
||||
saving: false
|
||||
);
|
||||
emit(
|
||||
state.copyWith(await _saveAccount(account))
|
||||
);
|
||||
}
|
||||
|
||||
_onAcountRemove(AccountRemove event, Emitter<AccountState> emit) async {
|
||||
Account accountToRemove = event.account;
|
||||
List<Account> accounts = state.accounts;
|
||||
List<Transaction> transactions = _transactionsRepository.getTransactions();
|
||||
|
||||
if (transactions.any((transaction) => transaction.account == accountToRemove.label)) {
|
||||
emit(AccountRemoveFail());
|
||||
emit(AccountState(accounts: accounts));
|
||||
} else {
|
||||
accounts.removeWhere((account) => account.label == accountToRemove.label);
|
||||
emit(AccountRemoveSucess());
|
||||
emit(
|
||||
state.copyWith(await _metadataRepository.saveAccounts(accounts))
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
_onAccountEditLabel(AccountEditLabel event, Emitter<AccountState> emit) async {
|
||||
Account account = event.account;
|
||||
account.label = event.label;
|
||||
emit(
|
||||
state.copyWith(await _saveAccount(account))
|
||||
);
|
||||
}
|
||||
|
||||
_onAccountEditSaving(AccountEditSaving event, Emitter<AccountState> emit) async {
|
||||
Account account = event.account;
|
||||
account.saving = event.saving;
|
||||
emit(
|
||||
state.copyWith(await _saveAccount(account))
|
||||
);
|
||||
}
|
||||
|
||||
_onAccountEditColor(AccountEditColor event, Emitter<AccountState> emit) async {
|
||||
Account account = event.account;
|
||||
account.color = event.color;
|
||||
emit(
|
||||
state.copyWith(await _saveAccount(account))
|
||||
);
|
||||
}
|
||||
|
||||
Future<List<Account>> _saveAccount(Account accountToSave) async {
|
||||
List<Account> accounts = _metadataRepository.getAccounts();
|
||||
|
||||
try {
|
||||
Account accountFound = accounts.firstWhere((account) => account.label == accountToSave.label);
|
||||
accountFound.color = accountToSave.color;
|
||||
accountFound.saving = accountToSave.saving;
|
||||
} catch (e) {
|
||||
accounts.add(accountToSave);
|
||||
}
|
||||
|
||||
await _metadataRepository.saveAccounts(accounts);
|
||||
return accounts;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,10 +23,51 @@ final class AccountExportCSV extends AccountEvent {
|
||||
const AccountExportCSV();
|
||||
}
|
||||
|
||||
final class SubAccountLoad extends AccountEvent {
|
||||
final Set<String> subAccounts;
|
||||
const SubAccountLoad(this.subAccounts);
|
||||
final class AccountLoad extends AccountEvent {
|
||||
final List<Account> subAccounts;
|
||||
const AccountLoad(this.subAccounts);
|
||||
|
||||
@override
|
||||
List<Object> get props => [subAccounts];
|
||||
}
|
||||
|
||||
final class AccountEditColor extends AccountEvent {
|
||||
final Account account;
|
||||
final String color;
|
||||
|
||||
const AccountEditColor(this.account, this.color);
|
||||
|
||||
@override
|
||||
List<Object> get props => [account, color];
|
||||
}
|
||||
|
||||
final class AccountEditSaving extends AccountEvent {
|
||||
final Account account;
|
||||
final bool saving;
|
||||
|
||||
const AccountEditSaving(this.account, this.saving);
|
||||
|
||||
@override
|
||||
List<Object> get props => [account, saving];
|
||||
}
|
||||
|
||||
final class AccountEditLabel extends AccountEvent {
|
||||
final Account account;
|
||||
final String label;
|
||||
|
||||
const AccountEditLabel(this.account, this.label);
|
||||
|
||||
@override
|
||||
List<Object> get props => [account, label];
|
||||
}
|
||||
|
||||
final class AccountRemove extends AccountEvent {
|
||||
final Account account;
|
||||
|
||||
const AccountRemove(this.account);
|
||||
|
||||
@override
|
||||
List<Object> get props => [account];
|
||||
}
|
||||
|
||||
final class AccountAdd extends AccountEvent {}
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
part of 'account_bloc.dart';
|
||||
|
||||
final class AccountState extends Equatable {
|
||||
final Set<String> subAccounts;
|
||||
final class AccountState {
|
||||
final List<Account> accounts;
|
||||
|
||||
const AccountState({
|
||||
this.subAccounts = const {},
|
||||
this.accounts = const [],
|
||||
});
|
||||
|
||||
AccountState copyWith(Set<String>? subAccounts) {
|
||||
AccountState copyWith(List<Account>? accounts) {
|
||||
return AccountState(
|
||||
subAccounts: subAccounts ?? this.subAccounts,
|
||||
accounts: accounts ?? this.accounts,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
List<Object?> get props => [subAccounts];
|
||||
}
|
||||
|
||||
final class AccountRemoveFail extends AccountState {}
|
||||
final class AccountRemoveSucess extends AccountState {}
|
||||
@@ -1,18 +1,18 @@
|
||||
import 'package:equatable/equatable.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:tunas/repositories/account/account_repository.dart';
|
||||
import 'package:tunas/repositories/account/models/budget.dart';
|
||||
import 'package:tunas/repositories/metadata/models/budget.dart';
|
||||
import 'package:tunas/repositories/metadata/metadata_repository.dart';
|
||||
|
||||
part 'budget_event.dart';
|
||||
part 'budget_state.dart';
|
||||
|
||||
class BudgetBloc extends Bloc<BudgetEvent, BudgetState> {
|
||||
final AccountRepository _accountRepository;
|
||||
final MetadataRepository _metadataRepository;
|
||||
|
||||
BudgetBloc({required AccountRepository accountRepository}) : _accountRepository = accountRepository, super(const BudgetState()) {
|
||||
BudgetBloc({required MetadataRepository metadataRepository}) : _metadataRepository = metadataRepository, super(const BudgetState()) {
|
||||
on<BudgetsLoad>(_onBudgetsLoad);
|
||||
|
||||
_accountRepository
|
||||
_metadataRepository
|
||||
.getBudgetsStream()
|
||||
.listen((budgets) => add(BudgetsLoad(budgets)));
|
||||
}
|
||||
|
||||
@@ -2,19 +2,19 @@ import 'dart:ui';
|
||||
|
||||
import 'package:equatable/equatable.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:tunas/repositories/account/account_repository.dart';
|
||||
import 'package:tunas/repositories/account/models/category.dart';
|
||||
import 'package:tunas/repositories/metadata/metadata_repository.dart';
|
||||
import 'package:tunas/repositories/metadata/models/category.dart';
|
||||
|
||||
part 'category_event.dart';
|
||||
part 'category_state.dart';
|
||||
|
||||
class CategoryBloc extends Bloc<CategoryEvent, CategoryState> {
|
||||
final AccountRepository _accountRepository;
|
||||
final MetadataRepository _metadataRepository;
|
||||
|
||||
CategoryBloc({required AccountRepository accountRepository}) : _accountRepository = accountRepository, super(const CategoryState()) {
|
||||
CategoryBloc({required MetadataRepository metadataRepository}) : _metadataRepository = metadataRepository, super(const CategoryState()) {
|
||||
on<CategoriesLoad>(_onCategoriesLoad);
|
||||
|
||||
_accountRepository
|
||||
_metadataRepository
|
||||
.getCategoriesStream()
|
||||
.listen((categories) => add(CategoriesLoad(categories)));
|
||||
}
|
||||
|
||||
@@ -4,29 +4,31 @@ import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
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';
|
||||
import 'package:tunas/repositories/metadata/metadata_repository.dart';
|
||||
import 'package:tunas/repositories/metadata/models/category.dart';
|
||||
import 'package:tunas/repositories/transactions/models/transaction.dart';
|
||||
import 'package:tunas/repositories/transactions/transactions_repository.dart';
|
||||
|
||||
part 'chart_event.dart';
|
||||
part 'chart_state.dart';
|
||||
|
||||
class ChartBloc extends Bloc<ChartEvent, ChartState> {
|
||||
final AccountRepository _accountRepository;
|
||||
final MetadataRepository _metadataRepository;
|
||||
final TransactionsRepository _transactionsRepository;
|
||||
|
||||
ChartBloc({required AccountRepository accountRepository}) :
|
||||
_accountRepository = accountRepository, super(const ChartState()) {
|
||||
ChartBloc({required MetadataRepository metadataRepository, required TransactionsRepository transactionsRepository}) :
|
||||
_metadataRepository = metadataRepository, _transactionsRepository = transactionsRepository, super(const ChartState()) {
|
||||
|
||||
on<ChartTransactionsLoad>(_onChartTransactionsLoad);
|
||||
on<ChartCategoriesLoad>(_onChartCategoriesLoad);
|
||||
on<ChartNextYear>(_onNextYear);
|
||||
on<ChartPreviousYear>(_onPreviousYear);
|
||||
|
||||
_accountRepository
|
||||
_transactionsRepository
|
||||
.getTransactionsStream()
|
||||
.listen((transactions) => add(ChartTransactionsLoad(transactions)));
|
||||
|
||||
_accountRepository
|
||||
_metadataRepository
|
||||
.getCategoriesStream()
|
||||
.listen((categories) => add(ChartCategoriesLoad(categories)));
|
||||
}
|
||||
@@ -135,7 +137,7 @@ class ChartBloc extends Bloc<ChartEvent, ChartState> {
|
||||
scopedMonthlyTotals[transactionDateDay] = FlSpot(transactionDateDay.toDouble(), transactionLine.subTotal);
|
||||
|
||||
final category = state.categories[transaction.category];
|
||||
if (category == null || category.saving) {
|
||||
if (category == null || category.transfert) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import 'package:tunas/repositories/account/models/transaction.dart';
|
||||
import 'package:tunas/repositories/transactions/models/transaction.dart';
|
||||
|
||||
class TransactionLine {
|
||||
Transaction transaction;
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
import 'package:equatable/equatable.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:formz/formz.dart';
|
||||
@@ -8,18 +7,19 @@ import 'package:tunas/domains/transaction/models/transaction_date.dart';
|
||||
import 'package:tunas/domains/transaction/models/transaction_description.dart';
|
||||
import 'package:tunas/domains/transaction/models/transaction_line.dart';
|
||||
import 'package:tunas/domains/transaction/models/transaction_value.dart';
|
||||
import 'package:tunas/repositories/account/account_repository.dart';
|
||||
import 'package:tunas/repositories/account/models/transaction.dart';
|
||||
import 'package:tunas/repositories/metadata/models/category.dart';
|
||||
import 'package:tunas/repositories/transactions/models/transaction.dart';
|
||||
import 'package:tunas/repositories/transactions/transactions_repository.dart';
|
||||
import 'package:uuid/uuid.dart';
|
||||
|
||||
part 'transaction_event.dart';
|
||||
part 'transaction_state.dart';
|
||||
|
||||
class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
|
||||
final AccountRepository _accountRepository;
|
||||
final TransactionsRepository _transactionsRepository;
|
||||
|
||||
TransactionBloc({required AccountRepository accountRepository})
|
||||
: _accountRepository = accountRepository,
|
||||
TransactionBloc({required TransactionsRepository transactionsRepository})
|
||||
: _transactionsRepository = transactionsRepository,
|
||||
super(const TransactionState()) {
|
||||
on<TransactionsLoad>(_onAccountLoad);
|
||||
on<TransactionDateChange>(_onTransactionDateChange);
|
||||
@@ -32,8 +32,9 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
|
||||
on<TransactionAdd>(_onTransactionAddDialog);
|
||||
on<TransactionSetCurrent>(_onTransactionSetCurrent);
|
||||
on<TransactionDeleteCurrent>(_onTransactionDeleteCurrent);
|
||||
on<TransactionFilterCategory>(_onTransactionFilterCategory);
|
||||
|
||||
_accountRepository
|
||||
_transactionsRepository
|
||||
.getTransactionsStream()
|
||||
.listen((transactions) => add(TransactionsLoad(transactions)));
|
||||
}
|
||||
@@ -43,6 +44,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
|
||||
emit(state.copyWith(
|
||||
transactions: event.transactions,
|
||||
transactionsLines: computeResult.list,
|
||||
transactionsLinesFiltered: _applyCategoryFilter(computeResult.list),
|
||||
globalTotal: computeResult.globalTotal,
|
||||
accountsTotals: computeResult.accountsTotals,
|
||||
));
|
||||
@@ -161,7 +163,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
|
||||
));
|
||||
final computeResult = _computeTransactionLine(transactions);
|
||||
|
||||
await _accountRepository.saveTransactions(transactions);
|
||||
await _transactionsRepository.saveTransactions(transactions);
|
||||
|
||||
emit(state.copyWith(
|
||||
currentTransaction: null,
|
||||
@@ -172,6 +174,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
|
||||
transactionValue: const TransactionValue.pure(),
|
||||
transactions: transactions,
|
||||
transactionsLines: computeResult.list,
|
||||
transactionsLinesFiltered: _applyCategoryFilter(computeResult.list),
|
||||
globalTotal: computeResult.globalTotal,
|
||||
accountsTotals: computeResult.accountsTotals,
|
||||
));
|
||||
@@ -211,7 +214,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
|
||||
List<Transaction> transactions = state.transactions;
|
||||
transactions.removeWhere((transaction) => transaction.uuid == currentTransaction.uuid);
|
||||
final computeResult = _computeTransactionLine(transactions);
|
||||
await _accountRepository.saveTransactions(transactions);
|
||||
await _transactionsRepository.saveTransactions(transactions);
|
||||
emit(state.copyWith(
|
||||
currentTransaction: null,
|
||||
transactionDate: const TransactionDate.pure(),
|
||||
@@ -221,10 +224,33 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
|
||||
transactionValue: const TransactionValue.pure(),
|
||||
transactions: transactions,
|
||||
transactionsLines: computeResult.list,
|
||||
transactionsLinesFiltered: _applyCategoryFilter(computeResult.list),
|
||||
globalTotal: computeResult.globalTotal,
|
||||
accountsTotals: computeResult.accountsTotals,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
_onTransactionFilterCategory(TransactionFilterCategory event, Emitter<TransactionState> emit) {
|
||||
List<TransactionLine> transactionsLinesFiltered = state.transactionsLines;
|
||||
String? categoryLabel = event.category?.label;
|
||||
if (categoryLabel != null) {
|
||||
transactionsLinesFiltered = state.transactionsLines.where((transaction) => transaction.transaction.category == categoryLabel).toList();
|
||||
}
|
||||
|
||||
emit(state.copyWith(
|
||||
transactionsLinesFiltered: transactionsLinesFiltered,
|
||||
categoryFilter: event.category,
|
||||
));
|
||||
}
|
||||
|
||||
List<TransactionLine> _applyCategoryFilter(List<TransactionLine> transactionsLines) {
|
||||
List<TransactionLine> transactionsLinesFiltered = transactionsLines;
|
||||
String? categoryLabel = state.categoryFilter?.label;
|
||||
if (categoryLabel != null) {
|
||||
transactionsLinesFiltered = state.transactionsLines.where((transaction) => transaction.transaction.category == categoryLabel).toList();
|
||||
}
|
||||
return transactionsLinesFiltered;
|
||||
}
|
||||
}
|
||||
@@ -72,3 +72,9 @@ final class TransactionSetCurrent extends TransactionEvent {
|
||||
final class TransactionDeleteCurrent extends TransactionEvent {
|
||||
const TransactionDeleteCurrent();
|
||||
}
|
||||
|
||||
final class TransactionFilterCategory extends TransactionEvent {
|
||||
final Category? category;
|
||||
|
||||
const TransactionFilterCategory(this.category);
|
||||
}
|
||||
@@ -6,6 +6,8 @@ final class TransactionState extends Equatable {
|
||||
|
||||
final List<Transaction> transactions;
|
||||
final List<TransactionLine> transactionsLines;
|
||||
final List<TransactionLine> transactionsLinesFiltered;
|
||||
final Category? categoryFilter;
|
||||
|
||||
final TransactionDate transactionDate;
|
||||
final TransactionCategory transactionCategory;
|
||||
@@ -22,6 +24,7 @@ final class TransactionState extends Equatable {
|
||||
this.accountsTotals = const <String, double>{},
|
||||
this.transactions = const [],
|
||||
this.transactionsLines = const [],
|
||||
this.transactionsLinesFiltered = const [],
|
||||
this.transactionDate = const TransactionDate.pure(),
|
||||
this.transactionCategory = const TransactionCategory.pure(),
|
||||
this.transactionDescription = const TransactionDescription.pure(),
|
||||
@@ -29,7 +32,8 @@ final class TransactionState extends Equatable {
|
||||
this.transactionValue = const TransactionValue.pure(),
|
||||
this.isValid = false,
|
||||
this.showAddDialog = false,
|
||||
this.currentTransaction
|
||||
this.currentTransaction,
|
||||
this.categoryFilter,
|
||||
});
|
||||
|
||||
TransactionState copyWith({
|
||||
@@ -37,6 +41,7 @@ final class TransactionState extends Equatable {
|
||||
Map<String, double>? accountsTotals,
|
||||
List<Transaction>? transactions,
|
||||
List<TransactionLine>? transactionsLines,
|
||||
List<TransactionLine>? transactionsLinesFiltered,
|
||||
TransactionDate? transactionDate,
|
||||
TransactionCategory? transactionCategory,
|
||||
TransactionDescription? transactionDescription,
|
||||
@@ -45,12 +50,14 @@ final class TransactionState extends Equatable {
|
||||
bool? isValid,
|
||||
bool? showAddDialog,
|
||||
Transaction? currentTransaction,
|
||||
Category? categoryFilter,
|
||||
}) {
|
||||
return TransactionState(
|
||||
globalTotal: globalTotal ?? this.globalTotal,
|
||||
accountsTotals: accountsTotals ?? this.accountsTotals,
|
||||
transactions: transactions ?? this.transactions,
|
||||
transactionsLines: transactionsLines ?? this.transactionsLines,
|
||||
transactionsLinesFiltered: transactionsLinesFiltered ?? this.transactionsLinesFiltered,
|
||||
transactionDate: transactionDate ?? this.transactionDate,
|
||||
transactionCategory: transactionCategory ?? this.transactionCategory,
|
||||
transactionDescription: transactionDescription ?? this.transactionDescription,
|
||||
@@ -59,6 +66,7 @@ final class TransactionState extends Equatable {
|
||||
isValid: isValid ?? this.isValid,
|
||||
showAddDialog: showAddDialog ?? this.showAddDialog,
|
||||
currentTransaction: currentTransaction ?? this.currentTransaction,
|
||||
categoryFilter: categoryFilter,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -72,6 +80,7 @@ final class TransactionState extends Equatable {
|
||||
isValid,
|
||||
showAddDialog,
|
||||
currentTransaction,
|
||||
categoryFilter,
|
||||
];
|
||||
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:tunas/pages/budgets/widgets/budgets_actions.dart';
|
||||
import 'package:tunas/pages/budgets/widgets/month_distribution.dart';
|
||||
|
||||
class BudgetsPage extends StatelessWidget {
|
||||
const BudgetsPage({super.key});
|
||||
@@ -14,6 +15,7 @@ class BudgetsPage extends StatelessWidget {
|
||||
child: const Column(
|
||||
children: [
|
||||
BudgetsActions(),
|
||||
MonthDistribution()
|
||||
],
|
||||
)
|
||||
)
|
||||
|
||||
73
lib/pages/budgets/widgets/month_distribution.dart
Normal file
73
lib/pages/budgets/widgets/month_distribution.dart
Normal file
@@ -0,0 +1,73 @@
|
||||
import 'package:fl_chart/fl_chart.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:tunas/pages/common/titled_container.dart';
|
||||
|
||||
class MonthDistribution extends StatelessWidget {
|
||||
const MonthDistribution({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
children: [
|
||||
TitledContainer(
|
||||
title: 'Prepare',
|
||||
child: Column(
|
||||
children: [
|
||||
Text('Money to spare: 2300 €'),
|
||||
Text('Loyer'),
|
||||
Slider(
|
||||
min: 0,
|
||||
max: 2300,
|
||||
value: 200,
|
||||
onChanged: (value) => {},
|
||||
),
|
||||
Text('Loyer'),
|
||||
Slider(
|
||||
min: 0,
|
||||
max: 2300,
|
||||
value: 200,
|
||||
onChanged: (value) => {},
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
TitledContainer(
|
||||
title: 'Compare',
|
||||
height: 500,
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text('Budget'),
|
||||
],
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: Column(
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
IconButton(
|
||||
onPressed: () => {},
|
||||
icon: const Icon(Icons.skip_previous)
|
||||
),
|
||||
Text('Fev 2024'),
|
||||
IconButton(
|
||||
onPressed: () => {},
|
||||
icon: const Icon(Icons.skip_next)
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
)
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -3,12 +3,35 @@ import 'package:flutter/material.dart';
|
||||
class TitledContainer extends StatelessWidget {
|
||||
final String title;
|
||||
final Widget child;
|
||||
final Widget? action;
|
||||
final double? height;
|
||||
final double? width;
|
||||
|
||||
const TitledContainer({super.key, required this.title, required this.child});
|
||||
const TitledContainer({super.key, required this.title, required this.child, this.action, this.height, this.width});
|
||||
|
||||
Widget _computeTitleRow() {
|
||||
List<Widget> children = [];
|
||||
children.add(Text(
|
||||
title,
|
||||
style: const TextStyle(
|
||||
fontWeight: FontWeight.w300,
|
||||
fontSize: 20,
|
||||
),
|
||||
));
|
||||
Widget? actionWidget = action;
|
||||
if (actionWidget != null) {
|
||||
children.add(actionWidget);
|
||||
}
|
||||
return Row(
|
||||
children: children
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
height: height,
|
||||
width: width,
|
||||
decoration: BoxDecoration(
|
||||
color: Theme.of(context).colorScheme.primaryContainer,
|
||||
borderRadius: BorderRadius.circular(15),
|
||||
@@ -36,13 +59,7 @@ class TitledContainer extends StatelessWidget {
|
||||
borderRadius: const BorderRadius.only(topLeft: Radius.circular(15), topRight: Radius.circular(15)),
|
||||
),
|
||||
padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 15),
|
||||
child: Text(
|
||||
title,
|
||||
style: const TextStyle(
|
||||
fontWeight: FontWeight.w300,
|
||||
fontSize: 20,
|
||||
),
|
||||
),
|
||||
child: _computeTitleRow()
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
@@ -2,28 +2,71 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:tunas/domains/account/account_bloc.dart';
|
||||
import 'package:tunas/pages/common/titled_container.dart';
|
||||
import 'package:tunas/repositories/metadata/models/account.dart';
|
||||
|
||||
class AccountSettings extends StatelessWidget {
|
||||
const AccountSettings({super.key});
|
||||
|
||||
List<Widget> _computeCategoryList(Set<String> subAccounts) {
|
||||
return subAccounts.map((subAccount) => Row(
|
||||
List<Widget> _computeCategoryList(BuildContext context, List<Account> accounts) {
|
||||
return accounts.map((account) => Row(
|
||||
children: [
|
||||
Text(subAccount),
|
||||
IconButton(
|
||||
onPressed: () {},
|
||||
icon: const Icon(Icons.palette),
|
||||
color: account.rgbToColor(),
|
||||
),
|
||||
IconButton(
|
||||
onPressed: () => context.read<AccountBloc>().add(AccountEditSaving(account, !account.saving)),
|
||||
icon: const Icon(Icons.savings),
|
||||
color: account.saving ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.error,
|
||||
),
|
||||
Container(width: 5),
|
||||
Expanded(
|
||||
child: Text(account.label)
|
||||
),
|
||||
IconButton(
|
||||
onPressed: () {},
|
||||
icon: const Icon(Icons.edit),
|
||||
),
|
||||
IconButton(
|
||||
onPressed: () => context.read<AccountBloc>().add(AccountRemove(account)),
|
||||
icon: const Icon(Icons.delete),
|
||||
),
|
||||
],
|
||||
)).toList();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return BlocBuilder<AccountBloc, AccountState>(
|
||||
return BlocConsumer<AccountBloc, AccountState>(
|
||||
listener: (context, state) {
|
||||
if (state is AccountRemoveSucess) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(
|
||||
backgroundColor: Colors.green,
|
||||
content: Text('Account succesfuly removed !'),
|
||||
)
|
||||
);
|
||||
} else if (state is AccountRemoveFail) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(
|
||||
backgroundColor: Colors.red,
|
||||
content: Text('Cannot remove account. Still present on some transactions.'),
|
||||
)
|
||||
);
|
||||
}
|
||||
},
|
||||
builder: (context, state) => TitledContainer(
|
||||
title: "Accounts",
|
||||
action: IconButton(
|
||||
onPressed: () => context.read<AccountBloc>().add(AccountAdd()),
|
||||
icon: const Icon(Icons.add),
|
||||
),
|
||||
child: SingleChildScrollView(
|
||||
scrollDirection: Axis.vertical,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: _computeCategoryList(state.subAccounts),
|
||||
children: _computeCategoryList(context, state.accounts),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:tunas/domains/category/category_bloc.dart';
|
||||
import 'package:tunas/pages/common/titled_container.dart';
|
||||
import 'package:tunas/repositories/account/models/category.dart';
|
||||
import 'package:tunas/repositories/metadata/models/category.dart';
|
||||
|
||||
class CategoriesSettings extends StatelessWidget {
|
||||
const CategoriesSettings({super.key});
|
||||
@@ -17,8 +17,8 @@ class CategoriesSettings extends StatelessWidget {
|
||||
),
|
||||
IconButton(
|
||||
onPressed: () {},
|
||||
icon: const Icon(Icons.savings),
|
||||
color: category.saving ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.error,
|
||||
icon: const Icon(Icons.swap_horiz),
|
||||
color: category.transfert ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.error,
|
||||
),
|
||||
IconButton(
|
||||
onPressed: () {},
|
||||
|
||||
@@ -8,7 +8,8 @@ import 'package:tunas/pages/budgets/budgets_page.dart';
|
||||
import 'package:tunas/pages/data/data_page.dart';
|
||||
import 'package:tunas/pages/stats/stats_page.dart';
|
||||
import 'package:tunas/pages/transactions/transactions_page.dart';
|
||||
import 'package:tunas/repositories/account/account_repository.dart';
|
||||
import 'package:tunas/repositories/metadata/metadata_repository.dart';
|
||||
import 'package:tunas/repositories/transactions/transactions_repository.dart';
|
||||
|
||||
class HomePage extends StatelessWidget {
|
||||
const HomePage({super.key});
|
||||
@@ -17,10 +18,10 @@ class HomePage extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
return MultiBlocProvider(
|
||||
providers: [
|
||||
BlocProvider(create: (context) => AccountBloc(accountRepository: RepositoryProvider.of<AccountRepository>(context))),
|
||||
BlocProvider(create: (context) => TransactionBloc(accountRepository: RepositoryProvider.of<AccountRepository>(context))),
|
||||
BlocProvider(create: (context) => CategoryBloc(accountRepository: RepositoryProvider.of<AccountRepository>(context))),
|
||||
BlocProvider(create: (context) => BudgetBloc(accountRepository: RepositoryProvider.of<AccountRepository>(context))),
|
||||
BlocProvider(create: (context) => AccountBloc(transactionsRepository: RepositoryProvider.of<TransactionsRepository>(context), metadataRepository: RepositoryProvider.of<MetadataRepository>(context))),
|
||||
BlocProvider(create: (context) => TransactionBloc(transactionsRepository: RepositoryProvider.of<TransactionsRepository>(context))),
|
||||
BlocProvider(create: (context) => CategoryBloc(metadataRepository: RepositoryProvider.of<MetadataRepository>(context))),
|
||||
BlocProvider(create: (context) => BudgetBloc(metadataRepository: RepositoryProvider.of<MetadataRepository>(context))),
|
||||
],
|
||||
child: DefaultTabController(
|
||||
length: 4,
|
||||
|
||||
@@ -8,7 +8,8 @@ import 'package:tunas/pages/stats/widgets/monthly_categories_total_chart.dart';
|
||||
import 'package:tunas/pages/stats/widgets/global_total_chart.dart';
|
||||
import 'package:tunas/pages/stats/widgets/profit_indicator.dart';
|
||||
import 'package:tunas/pages/stats/widgets/year_selector.dart';
|
||||
import 'package:tunas/repositories/account/account_repository.dart';
|
||||
import 'package:tunas/repositories/metadata/metadata_repository.dart';
|
||||
import 'package:tunas/repositories/transactions/transactions_repository.dart';
|
||||
|
||||
class StatsPage extends StatelessWidget {
|
||||
const StatsPage({super.key});
|
||||
@@ -16,7 +17,10 @@ class StatsPage extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return BlocProvider(
|
||||
create: (context) => ChartBloc(accountRepository: RepositoryProvider.of<AccountRepository>(context)),
|
||||
create: (context) => ChartBloc(
|
||||
metadataRepository: RepositoryProvider.of<MetadataRepository>(context),
|
||||
transactionsRepository: RepositoryProvider.of<TransactionsRepository>(context),
|
||||
),
|
||||
child: BlocBuilder<ChartBloc, ChartState>(
|
||||
builder: (context, state) => ListView(
|
||||
children: [
|
||||
|
||||
35
lib/pages/transactions/widgets/category_filter.dart
Normal file
35
lib/pages/transactions/widgets/category_filter.dart
Normal file
@@ -0,0 +1,35 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:tunas/domains/category/category_bloc.dart';
|
||||
import 'package:tunas/domains/transaction/transaction_bloc.dart';
|
||||
import 'package:tunas/repositories/metadata/models/category.dart' as tunas_category;
|
||||
|
||||
class CategoryFilter extends StatelessWidget {
|
||||
const CategoryFilter({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final categoryState = context.watch<CategoryBloc>().state;
|
||||
return BlocBuilder<TransactionBloc, TransactionState>(
|
||||
buildWhen: (previous, current) => previous.categoryFilter != current.categoryFilter,
|
||||
builder: (context, state) => SizedBox(
|
||||
width: 500,
|
||||
child: DropdownButtonFormField<tunas_category.Category>(
|
||||
value: state.categoryFilter,
|
||||
onChanged: (value) => context.read<TransactionBloc>().add(TransactionFilterCategory(value!)),
|
||||
items: categoryState.categories.map((e) => DropdownMenuItem(value: e, child: Text(e.label))).toList(),
|
||||
decoration: InputDecoration(
|
||||
suffixIcon: IconButton(
|
||||
icon: const Icon(Icons.filter_alt_off),
|
||||
onPressed: () => context.read<TransactionBloc>().add(const TransactionFilterCategory(null)),
|
||||
),
|
||||
hintText: 'Category',
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(5),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,7 @@ import 'package:tunas/domains/account/account_bloc.dart';
|
||||
import 'package:tunas/domains/category/category_bloc.dart';
|
||||
import 'package:tunas/domains/transaction/transaction_bloc.dart';
|
||||
import 'package:tunas/pages/transactions/widgets/transaction_form.dart';
|
||||
import 'package:tunas/repositories/account/models/transaction.dart';
|
||||
import 'package:tunas/repositories/transactions/models/transaction.dart';
|
||||
|
||||
class TransactionAddDialog extends StatelessWidget {
|
||||
const TransactionAddDialog({super.key});
|
||||
|
||||
@@ -126,7 +126,7 @@ class _TransactionAccountInput extends StatelessWidget {
|
||||
child: DropdownButtonFormField<String>(
|
||||
value: state.transactionAccount.value.toString() == '' ? null : state.transactionAccount.value.toString(),
|
||||
onChanged: (value) => context.read<TransactionBloc>().add(TransactionAccountChange(value!)),
|
||||
items: accountState.subAccounts.map((e) => DropdownMenuItem(value: e, child: Text(e))).toList(),
|
||||
items: accountState.accounts.map((e) => DropdownMenuItem(value: e.label, child: Text(e.label))).toList(),
|
||||
decoration: InputDecoration(
|
||||
icon: const Icon(Icons.account_box),
|
||||
hintText: 'Account',
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:tunas/pages/transactions/widgets/transaction_add_dialog.dart';
|
||||
import 'package:tunas/repositories/account/models/transaction.dart';
|
||||
import 'package:tunas/repositories/transactions/models/transaction.dart';
|
||||
|
||||
class TransactionLine extends StatelessWidget {
|
||||
final Transaction transaction;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:tunas/domains/transaction/transaction_bloc.dart';
|
||||
import 'package:tunas/pages/transactions/widgets/category_filter.dart';
|
||||
import 'package:tunas/pages/transactions/widgets/transaction_add_dialog.dart';
|
||||
|
||||
class TransactionsActions extends StatelessWidget {
|
||||
@@ -22,6 +23,7 @@ class TransactionsActions extends StatelessWidget {
|
||||
fontSize: 35,
|
||||
),
|
||||
),
|
||||
CategoryFilter(),
|
||||
IconButton(
|
||||
onPressed: () => TransactionAddDialog.show(context, null),
|
||||
icon: const Icon(
|
||||
|
||||
@@ -9,13 +9,13 @@ class TransactionsList extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return BlocBuilder<TransactionBloc, TransactionState>(
|
||||
buildWhen: (previous, current) => previous.transactionsLines != current.transactionsLines,
|
||||
buildWhen: (previous, current) => previous.transactionsLinesFiltered != current.transactionsLinesFiltered,
|
||||
builder: (context, state) => Expanded(
|
||||
child: ListView.builder(
|
||||
itemCount: state.transactionsLines.length,
|
||||
itemCount: state.transactionsLinesFiltered.length,
|
||||
itemBuilder: (context, index) => TransactionLine(
|
||||
transaction: state.transactionsLines[index].transaction,
|
||||
subTotal: state.transactionsLines[index].subTotal
|
||||
transaction: state.transactionsLinesFiltered[index].transaction,
|
||||
subTotal: state.transactionsLinesFiltered[index].subTotal
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
@@ -1,80 +0,0 @@
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:rxdart/subjects.dart';
|
||||
import 'package:tunas/clients/storage/storage_client.dart';
|
||||
import 'package:tunas/repositories/account/models/account.dart';
|
||||
import 'package:tunas/repositories/account/models/budget.dart';
|
||||
import 'package:tunas/repositories/account/models/category.dart';
|
||||
import 'package:tunas/repositories/account/models/transaction.dart';
|
||||
|
||||
class AccountRepository {
|
||||
String accountFile = 'tunas_main_account.json';
|
||||
Account? currentAccount;
|
||||
|
||||
final StorageClient _storageClient;
|
||||
|
||||
final _transactionsController = BehaviorSubject<List<Transaction>>.seeded(const []);
|
||||
final _categoriesController = BehaviorSubject<List<Category>>.seeded(const []);
|
||||
final _budgetController = BehaviorSubject<List<Budget>>.seeded(const []);
|
||||
final _subAccountController = BehaviorSubject<Set<String>>.seeded(const {});
|
||||
|
||||
AccountRepository({
|
||||
required storageClient,
|
||||
}) : _storageClient = storageClient {
|
||||
init();
|
||||
}
|
||||
|
||||
init() async {
|
||||
final account = await getAccount();
|
||||
_broadcastAccountData(account);
|
||||
}
|
||||
|
||||
Stream<List<Transaction>> getTransactionsStream() {
|
||||
return _transactionsController.asBroadcastStream();
|
||||
}
|
||||
|
||||
Stream<List<Category>> getCategoriesStream() {
|
||||
return _categoriesController.asBroadcastStream();
|
||||
}
|
||||
|
||||
Stream<List<Budget>> getBudgetsStream() {
|
||||
return _budgetController.asBroadcastStream();
|
||||
}
|
||||
|
||||
Stream<Set<String>> getSubAccountsStream() {
|
||||
return _subAccountController.asBroadcastStream();
|
||||
}
|
||||
|
||||
Future<Account> getAccount() async {
|
||||
String json = await _storageClient.load(accountFile);
|
||||
Map<String, dynamic> accountJson = jsonDecode(json);
|
||||
return Account.fromJson(accountJson);
|
||||
}
|
||||
|
||||
saveAccount(Account account) async {
|
||||
await _storageClient.save(accountFile, jsonEncode(account.toJson()));
|
||||
_broadcastAccountData(account);
|
||||
}
|
||||
|
||||
saveTransactions(List<Transaction> transactions) async {
|
||||
Account? account = currentAccount;
|
||||
if (account == null) {
|
||||
throw Error();
|
||||
} else {account.transactions = transactions;
|
||||
await saveAccount(account);
|
||||
}
|
||||
}
|
||||
|
||||
deleteAccount() async {
|
||||
await _storageClient.delete(accountFile);
|
||||
_broadcastAccountData(Account());
|
||||
}
|
||||
|
||||
_broadcastAccountData(Account account) {
|
||||
currentAccount = account;
|
||||
_transactionsController.add(account.transactions);
|
||||
_categoriesController.add(account.categories);
|
||||
_budgetController.add(account.budgets);
|
||||
_subAccountController.add(account.subAccounts);
|
||||
}
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:tunas/repositories/account/models/budget.dart';
|
||||
import 'package:tunas/repositories/account/models/category.dart';
|
||||
|
||||
import 'transaction.dart';
|
||||
|
||||
class Account {
|
||||
List<Transaction> transactions;
|
||||
List<Budget> budgets;
|
||||
List<Category> categories;
|
||||
Set<String> subAccounts;
|
||||
|
||||
Account({
|
||||
this.transactions = const [],
|
||||
this.budgets = const [],
|
||||
this.categories = const [],
|
||||
this.subAccounts = const {},
|
||||
});
|
||||
|
||||
factory Account.fromJson(Map<String, dynamic> json) {
|
||||
return Account(
|
||||
transactions: (jsonDecode(json['transactions']) as List<dynamic>).map((transaction) => Transaction.fromJson(transaction)).toList(),
|
||||
budgets: (jsonDecode(json['budgets']) as List<dynamic>).map((budget) => Budget.fromJson(budget)).toList(),
|
||||
categories: (jsonDecode(json['categories']) as List<dynamic>).map((category) => Category.fromJson(category)).toList(),
|
||||
subAccounts: Set.from(jsonDecode(json['subAccounts'])),
|
||||
);
|
||||
}
|
||||
|
||||
Map<String, String> toJson() => {
|
||||
'transactions': jsonEncode(transactions.map((transaction) => transaction.toJson()).toList()),
|
||||
'budgets': jsonEncode(budgets.map((budget) => budget.toJson()).toList()),
|
||||
'categories': jsonEncode(categories.map((category) => category.toJson()).toList()),
|
||||
'subAccounts': jsonEncode(subAccounts.toList()),
|
||||
};
|
||||
}
|
||||
32
lib/repositories/json/json_repository.dart
Normal file
32
lib/repositories/json/json_repository.dart
Normal file
@@ -0,0 +1,32 @@
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:tunas/clients/storage/storage_client.dart';
|
||||
import 'package:tunas/repositories/json/models/json.dart';
|
||||
|
||||
class JsonRepository {
|
||||
String accountFile = 'tunas_main_account.json';
|
||||
|
||||
final StorageClient _storageClient;
|
||||
|
||||
JsonRepository({
|
||||
required storageClient,
|
||||
}) : _storageClient = storageClient;
|
||||
|
||||
saveJson(Json json) async {
|
||||
await _storageClient.save(json.getJsonFileName(), jsonEncode(json.toJson()));
|
||||
}
|
||||
|
||||
Future<T> loadJson<T extends Json>(Json json, JsonFactory<T> jsonFactory) async {
|
||||
String jsonString = await _storageClient.load(json.getJsonFileName());
|
||||
|
||||
if (jsonString.isEmpty) {
|
||||
return jsonFactory.fromJson({});
|
||||
} else {
|
||||
return jsonFactory.fromJson(jsonDecode(jsonString));
|
||||
}
|
||||
}
|
||||
|
||||
deleteJson(Json json) async {
|
||||
await _storageClient.delete(json.getJsonFileName());
|
||||
}
|
||||
}
|
||||
8
lib/repositories/json/models/json.dart
Normal file
8
lib/repositories/json/models/json.dart
Normal file
@@ -0,0 +1,8 @@
|
||||
abstract class Json {
|
||||
Map<String, dynamic> toJson();
|
||||
String getJsonFileName();
|
||||
}
|
||||
|
||||
abstract class JsonFactory<T extends Json> {
|
||||
T fromJson(Map<String, dynamic> json);
|
||||
}
|
||||
80
lib/repositories/metadata/metadata_repository.dart
Normal file
80
lib/repositories/metadata/metadata_repository.dart
Normal file
@@ -0,0 +1,80 @@
|
||||
import 'package:rxdart/subjects.dart';
|
||||
import 'package:tunas/repositories/json/json_repository.dart';
|
||||
import 'package:tunas/repositories/metadata/models/budget.dart';
|
||||
import 'package:tunas/repositories/metadata/models/category.dart';
|
||||
import 'package:tunas/repositories/metadata/models/account.dart';
|
||||
import 'package:tunas/repositories/metadata/models/metadata.dart';
|
||||
|
||||
class MetadataRepository {
|
||||
|
||||
final JsonRepository _jsonRepository;
|
||||
final _categoriesController = BehaviorSubject<List<Category>>.seeded(const []);
|
||||
final _budgetController = BehaviorSubject<List<Budget>>.seeded(const []);
|
||||
final _accountController = BehaviorSubject<List<Account>>.seeded(const []);
|
||||
|
||||
MetadataRepository({
|
||||
required jsonRepository,
|
||||
}) : _jsonRepository = jsonRepository;
|
||||
|
||||
Stream<List<Category>> getCategoriesStream() {
|
||||
return _categoriesController.asBroadcastStream();
|
||||
}
|
||||
|
||||
Stream<List<Budget>> getBudgetsStream() {
|
||||
return _budgetController.asBroadcastStream();
|
||||
}
|
||||
|
||||
List<Account> getAccounts() {
|
||||
return _accountController.value;
|
||||
}
|
||||
|
||||
Stream<List<Account>> getAccountsStream() {
|
||||
return _accountController.asBroadcastStream();
|
||||
}
|
||||
|
||||
loadMetadata() async {
|
||||
Metadata metadata = await _jsonRepository.loadJson(Metadata(), MetadataFactory());
|
||||
_broadcastMetadata(metadata);
|
||||
}
|
||||
|
||||
saveCategories(List<Category> categories) async {
|
||||
Metadata metadata = _constructMetadataFromControllers();
|
||||
metadata.categories = categories;
|
||||
await _jsonRepository.saveJson(metadata);
|
||||
_categoriesController.add(categories);
|
||||
}
|
||||
|
||||
saveBudgets(List<Budget> budgets) async {
|
||||
Metadata metadata = _constructMetadataFromControllers();
|
||||
metadata.budgets = budgets;
|
||||
await _jsonRepository.saveJson(metadata);
|
||||
_budgetController.add(budgets);
|
||||
}
|
||||
|
||||
saveAccounts(List<Account> accounts) async {
|
||||
Metadata metadata = _constructMetadataFromControllers();
|
||||
metadata.accounts = accounts;
|
||||
await _jsonRepository.saveJson(metadata);
|
||||
_accountController.add(accounts);
|
||||
}
|
||||
|
||||
deleteMetadata() async {
|
||||
Metadata metadata = Metadata();
|
||||
await _jsonRepository.saveJson(metadata);
|
||||
_broadcastMetadata(metadata);
|
||||
}
|
||||
|
||||
_broadcastMetadata(Metadata metadata) {
|
||||
_categoriesController.add(metadata.categories);
|
||||
_budgetController.add(metadata.budgets);
|
||||
_accountController.add(metadata.accounts);
|
||||
}
|
||||
|
||||
Metadata _constructMetadataFromControllers() {
|
||||
return Metadata(
|
||||
categories: _categoriesController.value,
|
||||
budgets: _budgetController.value,
|
||||
accounts: _accountController.value,
|
||||
);
|
||||
}
|
||||
}
|
||||
31
lib/repositories/metadata/models/account.dart
Normal file
31
lib/repositories/metadata/models/account.dart
Normal file
@@ -0,0 +1,31 @@
|
||||
import 'dart:ui';
|
||||
|
||||
class Account {
|
||||
String label;
|
||||
String color;
|
||||
bool saving;
|
||||
|
||||
Account({
|
||||
this.label = '',
|
||||
this.color = '',
|
||||
this.saving = false,
|
||||
});
|
||||
|
||||
factory Account.fromJson(Map<String, dynamic> json) {
|
||||
return Account(
|
||||
label: json['label'],
|
||||
color: json['color'],
|
||||
saving: bool.parse(json['saving']),
|
||||
);
|
||||
}
|
||||
|
||||
Map<String, String> toJson() => {
|
||||
'label': label,
|
||||
'color': color,
|
||||
'saving': saving.toString(),
|
||||
};
|
||||
|
||||
Color rgbToColor() {
|
||||
return Color(int.parse(color.toUpperCase().replaceAll("#", ""), radix: 16));
|
||||
}
|
||||
}
|
||||
@@ -4,13 +4,13 @@ class Category {
|
||||
String label;
|
||||
String color;
|
||||
bool essential;
|
||||
bool saving;
|
||||
bool transfert;
|
||||
|
||||
Category({
|
||||
this.label = '',
|
||||
this.color = '',
|
||||
this.essential = false,
|
||||
this.saving = false,
|
||||
this.transfert = false,
|
||||
});
|
||||
|
||||
factory Category.fromJson(Map<String, dynamic> json) {
|
||||
@@ -18,7 +18,7 @@ class Category {
|
||||
label: json['label'],
|
||||
color: json['color'],
|
||||
essential: bool.parse(json['essential']),
|
||||
saving: bool.parse(json['saving']),
|
||||
transfert: bool.parse(json['transfert']),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ class Category {
|
||||
'label': label,
|
||||
'color': color,
|
||||
'essential': essential.toString(),
|
||||
'saving': saving.toString(),
|
||||
'transfert': transfert.toString(),
|
||||
};
|
||||
|
||||
Color rgbToColor() {
|
||||
39
lib/repositories/metadata/models/metadata.dart
Normal file
39
lib/repositories/metadata/models/metadata.dart
Normal file
@@ -0,0 +1,39 @@
|
||||
import 'package:tunas/repositories/metadata/models/budget.dart';
|
||||
import 'package:tunas/repositories/metadata/models/category.dart';
|
||||
import 'package:tunas/repositories/json/models/json.dart';
|
||||
import 'package:tunas/repositories/metadata/models/account.dart';
|
||||
|
||||
class Metadata implements Json {
|
||||
List<Budget> budgets;
|
||||
List<Category> categories;
|
||||
List<Account> accounts;
|
||||
|
||||
Metadata({
|
||||
this.budgets = const [],
|
||||
this.categories = const [],
|
||||
this.accounts = const [],
|
||||
});
|
||||
|
||||
@override
|
||||
Map<String, dynamic> toJson() => {
|
||||
'budgets': budgets.map((budget) => budget.toJson()).toList(),
|
||||
'categories': categories.map((category) => category.toJson()).toList(),
|
||||
'accounts': accounts.map((account) => account.toJson()).toList(),
|
||||
};
|
||||
|
||||
@override
|
||||
String getJsonFileName() {
|
||||
return 'metadata.json';
|
||||
}
|
||||
}
|
||||
|
||||
class MetadataFactory implements JsonFactory<Metadata> {
|
||||
@override
|
||||
Metadata fromJson(Map<String, dynamic> json) {
|
||||
return Metadata(
|
||||
budgets: List<Budget>.from(json['budgets']?.map((budget) => Budget.fromJson(budget))),
|
||||
categories: List<Category>.from(json['categories']?.map((category) => Category.fromJson(category))),
|
||||
accounts: List<Account>.from(json['accounts']?.map((account) => Account.fromJson(account))),
|
||||
);
|
||||
}
|
||||
}
|
||||
29
lib/repositories/transactions/models/transactions.dart
Normal file
29
lib/repositories/transactions/models/transactions.dart
Normal file
@@ -0,0 +1,29 @@
|
||||
import 'package:tunas/repositories/json/models/json.dart';
|
||||
import 'package:tunas/repositories/transactions/models/transaction.dart';
|
||||
|
||||
class Transactions implements Json {
|
||||
List<Transaction> transactions;
|
||||
|
||||
Transactions({
|
||||
this.transactions = const [],
|
||||
});
|
||||
|
||||
@override
|
||||
Map<String, dynamic> toJson() => {
|
||||
'transactions': transactions.map((transaction) => transaction.toJson()).toList(),
|
||||
};
|
||||
|
||||
@override
|
||||
String getJsonFileName() {
|
||||
return 'transactions.json';
|
||||
}
|
||||
}
|
||||
|
||||
class TransactionsFactory implements JsonFactory<Transactions> {
|
||||
@override
|
||||
Transactions fromJson(Map<String, dynamic> json) {
|
||||
return Transactions(
|
||||
transactions: List<Transaction>.from(json['transactions']?.map((transaction) => Transaction.fromJson(transaction))),
|
||||
);
|
||||
}
|
||||
}
|
||||
39
lib/repositories/transactions/transactions_repository.dart
Normal file
39
lib/repositories/transactions/transactions_repository.dart
Normal file
@@ -0,0 +1,39 @@
|
||||
import 'package:rxdart/subjects.dart';
|
||||
import 'package:tunas/repositories/json/json_repository.dart';
|
||||
import 'package:tunas/repositories/transactions/models/transaction.dart';
|
||||
import 'package:tunas/repositories/transactions/models/transactions.dart';
|
||||
|
||||
class TransactionsRepository {
|
||||
|
||||
final JsonRepository _jsonRepository;
|
||||
final _transactionsController = BehaviorSubject<List<Transaction>>.seeded(const []);
|
||||
|
||||
TransactionsRepository({
|
||||
required jsonRepository,
|
||||
}) : _jsonRepository = jsonRepository;
|
||||
|
||||
List<Transaction> getTransactions() {
|
||||
return _transactionsController.value;
|
||||
}
|
||||
|
||||
Stream<List<Transaction>> getTransactionsStream() {
|
||||
return _transactionsController.asBroadcastStream();
|
||||
}
|
||||
|
||||
loadTransactions() async {
|
||||
Transactions transactions = await _jsonRepository.loadJson(Transactions(), TransactionsFactory());
|
||||
_transactionsController.add(transactions.transactions);
|
||||
}
|
||||
|
||||
saveTransactions(List<Transaction> transactionsList) async {
|
||||
Transactions transactions = Transactions(transactions: transactionsList);
|
||||
await _jsonRepository.saveJson(transactions);
|
||||
_transactionsController.add(transactionsList);
|
||||
}
|
||||
|
||||
deleteTransactions() async {
|
||||
Transactions transactions = Transactions();
|
||||
await _jsonRepository.saveJson(transactions);
|
||||
_transactionsController.add([]);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user