Refactored json storage

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),

lib/domains/account/account_bloc.dart

@@ -1,14 +1,14 @@
-import 'dart:convert';
 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/metadata/models/category.dart';
-import 'package:tunas/repositories/account/models/account.dart';
+import 'package:tunas/repositories/metadata/metadata_repository.dart';
-import 'package:tunas/repositories/account/models/category.dart';
+import 'package:tunas/repositories/metadata/models/account.dart';
-import 'package:tunas/repositories/account/models/transaction.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 +34,25 @@ final colors = [
 ];
 
 class AccountBloc extends Bloc<AccountEvent, AccountState> {
-  final AccountRepository _accountRepository;
+  final TransactionsRepository _transactionsRepository;
+  final MetadataRepository _metadataRepository;
 
-  AccountBloc({required AccountRepository accountRepository})
+  AccountBloc({
-      : _accountRepository = accountRepository,
+    required MetadataRepository metadataRepository,
-        super(const AccountState()) {
+    required TransactionsRepository transactionsRepository,
-    on<AccountImportJSON>(_onAccountImportJSON);
+  })
+  : _metadataRepository = metadataRepository,
+    _transactionsRepository = transactionsRepository,
+    super(const AccountState()
+  ) {
     on<AccountImportCSV>(_onAccountImportCSV);
-    on<SubAccountLoad>(_onSubAccountLoad);
+    on<AccountLoad>(_onAccountLoad);
     // on<AccountExportJSON>(_onAccountImportJSON);
     // on<AccountExportCSV>(_onAccountImportJSON);
 
-    _accountRepository
+    _metadataRepository
-      .getSubAccountsStream()
+      .getAccountsStream()
-      .listen((subAccounts) => add(SubAccountLoad(subAccounts)));
+      .listen((subAccounts) => add(AccountLoad(subAccounts)));
   }
 
   double _universalConvertToDouble(dynamic value) {
@@ -62,8 +67,7 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
     }
   }
 
-  _onAccountImportCSV(
+  _onAccountImportCSV(AccountImportCSV event, Emitter<AccountState> emit) async {
-      AccountImportCSV event, Emitter<AccountState> emit) async {
     int colorIndex = 0;
     FilePickerResult? result = await FilePicker.platform.pickFiles();
 
@@ -74,27 +78,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') {
+            // if (categoryLabel == 'N/A') {
-              categoriesMap[categoryLabel] = Category(label: 'N/A', color: 'FFFF0000' );
+            //   categoriesMap[categoryLabel] = Category(label: 'N/A', color: 'FFFF0000' );
-            } else {
+            // } else {
-              String color = colorIndex >= colors.length ? 'FF0000FF' : colors[colorIndex];
+            //   String color = colorIndex >= colors.length ? 'FF0000FF' : colors[colorIndex];
-              colorIndex++;
+            //   colorIndex++;
-              categoriesMap[categoryLabel] = Category(label: categoryLabel, color: color );
+            //   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);
+          }
 
           return Transaction(
             uuid: const Uuid().v8(),
@@ -102,34 +112,23 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
             category: categoryLabel,
             description: line[2],
             account: line[3],
-            value: _universalConvertToDouble(line[4]));
+            value: value
+          );
         })
         .toList();
 
-      await _accountRepository.deleteAccount();
+      await _metadataRepository.deleteMetadata();
-      final account = Account(transactions: transactions, categories: categoriesMap.values.toList(), subAccounts: subAccounts);
+      await _transactionsRepository.deleteTransactions();
-      await _accountRepository.saveAccount(account);
+
+      await _metadataRepository.saveAccounts(accounts.values.toList());
+      await _metadataRepository.saveBudgets([]);
+      await _metadataRepository.saveCategories(categoriesMap.values.toList());
+      await _transactionsRepository.saveTransactions(transactions);
     }
   }
 
-  _onAccountImportJSON(
+  _onAccountLoad(
-      AccountImportJSON event, Emitter<AccountState> emit) async {
+    AccountLoad event, Emitter<AccountState> emit
-    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
   ) {
     emit(
       state.copyWith(event.subAccounts)

lib/domains/account/account_event.dart

@@ -23,9 +23,9 @@ final class AccountExportCSV extends AccountEvent {
   const AccountExportCSV();
 }
 
-final class SubAccountLoad extends AccountEvent {
+final class AccountLoad extends AccountEvent {
-  final Set<String> subAccounts;
+  final List<Account> subAccounts;
-  const SubAccountLoad(this.subAccounts);
+  const AccountLoad(this.subAccounts);
 
   @override
   List<Object> get props => [subAccounts]; 

lib/domains/account/account_state.dart

@@ -1,18 +1,18 @@
 part of 'account_bloc.dart';
 
 final class AccountState extends Equatable {
-  final Set<String> subAccounts;
+  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];
+  List<Object?> get props => [accounts];
 }

lib/domains/budget/budget_bloc.dart

@@ -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/metadata/models/budget.dart';
-import 'package:tunas/repositories/account/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)));
   }

lib/domains/category/category_bloc.dart

@@ -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/metadata/metadata_repository.dart';
-import 'package:tunas/repositories/account/models/category.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)));
   }

lib/domains/charts/chart_bloc.dart

@@ -4,29 +4,32 @@ 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/metadata/metadata_repository.dart';
-import 'package:tunas/repositories/account/models/category.dart';
+import 'package:tunas/repositories/metadata/models/category.dart';
-import 'package:tunas/repositories/account/models/transaction.dart';
+import 'package:tunas/repositories/transactions/models/transaction.dart';
+import 'package:tunas/repositories/transactions/models/transactions.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}) : 
+  ChartBloc({required MetadataRepository metadataRepository, required TransactionsRepository transactionsRepository}) : 
-    _accountRepository = accountRepository, super(const ChartState()) {
+    _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)));
   }

lib/domains/transaction/models/transaction_line.dart

@@ -1,4 +1,4 @@
-import 'package:tunas/repositories/account/models/transaction.dart';
+import 'package:tunas/repositories/transactions/models/transaction.dart';
 
 class TransactionLine {
   Transaction transaction;

lib/domains/transaction/transaction_bloc.dart

@@ -8,18 +8,18 @@ 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/transactions/models/transaction.dart';
-import 'package:tunas/repositories/account/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})
+  TransactionBloc({required TransactionsRepository transactionsRepository})
-      : _accountRepository = accountRepository,
+      : _transactionsRepository = transactionsRepository,
         super(const TransactionState())  {
     on<TransactionsLoad>(_onAccountLoad);
     on<TransactionDateChange>(_onTransactionDateChange);
@@ -33,7 +33,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     on<TransactionSetCurrent>(_onTransactionSetCurrent);
     on<TransactionDeleteCurrent>(_onTransactionDeleteCurrent);
 
-    _accountRepository
+    _transactionsRepository
       .getTransactionsStream()
       .listen((transactions) => add(TransactionsLoad(transactions)));
   }
@@ -161,7 +161,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
       ));
       final computeResult = _computeTransactionLine(transactions);
 
-      await _accountRepository.saveTransactions(transactions);
+      await _transactionsRepository.saveTransactions(transactions);
       
       emit(state.copyWith(
         currentTransaction: null,
@@ -211,7 +211,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(),

lib/pages/data/widgets/account_settings.dart

@@ -6,7 +6,7 @@ import 'package:tunas/pages/common/titled_container.dart';
 class AccountSettings extends StatelessWidget {
   const AccountSettings({super.key});
 
-  List<Widget> _computeCategoryList(Set<String> subAccounts) {
+  List<Widget> _computeCategoryList(List<String> subAccounts) {
     return subAccounts.map((subAccount) => Row(
       children: [
         Text(subAccount),
@@ -23,7 +23,7 @@ class AccountSettings extends StatelessWidget {
           scrollDirection: Axis.vertical,
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
-            children: _computeCategoryList(state.subAccounts),
+            children: _computeCategoryList(state.accounts.map((account) => account.label).toList()),
           ),
         ),
       ),

lib/pages/data/widgets/categories_settings.dart

@@ -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});

lib/pages/home/home_page.dart

@@ -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) => AccountBloc(transactionsRepository: RepositoryProvider.of<TransactionsRepository>(context), metadataRepository: RepositoryProvider.of<MetadataRepository>(context))),
-        BlocProvider(create: (context) => TransactionBloc(accountRepository: RepositoryProvider.of<AccountRepository>(context))),
+        BlocProvider(create: (context) => TransactionBloc(transactionsRepository: RepositoryProvider.of<TransactionsRepository>(context))),
-        BlocProvider(create: (context) => CategoryBloc(accountRepository: RepositoryProvider.of<AccountRepository>(context))),
+        BlocProvider(create: (context) => CategoryBloc(metadataRepository: RepositoryProvider.of<MetadataRepository>(context))),
-        BlocProvider(create: (context) => BudgetBloc(accountRepository: RepositoryProvider.of<AccountRepository>(context))),
+        BlocProvider(create: (context) => BudgetBloc(metadataRepository: RepositoryProvider.of<MetadataRepository>(context))),
       ],
       child: DefaultTabController(
         length: 4,

lib/pages/stats/stats_page.dart

@@ -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: [

lib/pages/transactions/widgets/transaction_add_dialog.dart

@@ -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});

lib/pages/transactions/widgets/transaction_form.dart

@@ -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',

lib/pages/transactions/widgets/transaction_line.dart

@@ -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;

lib/repositories/account/account_repository.dart

@@ -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);
-  }
-}

lib/repositories/account/models/account.dart

@@ -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()),
-  };
-}

lib/repositories/json/json_repository.dart

@@ -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());
+  }
+}

lib/repositories/json/models/json.dart

@@ -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);
+}

lib/repositories/metadata/metadata_repository.dart

@@ -0,0 +1,76 @@
+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();
+  }
+
+  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,
+    );
+  }
+}

lib/repositories/metadata/models/account.dart

@@ -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));
+  }
+}

lib/repositories/metadata/models/metadata.dart

@@ -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))),
+    );
+  }
+}

lib/repositories/transactions/models/transactions.dart

@@ -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))),
+    );
+  }
+}

lib/repositories/transactions/transactions_repository.dart

@@ -0,0 +1,35 @@
+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;
+
+  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([]);
+  }
+}