Format

analysis_options.yaml

@@ -26,3 +26,8 @@ linter:
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
+analyzer:
+  exclude:
+    - "**/*.g.dart"
+    - build/**
+    - .dart_tool/**

lib/database/sqlite.dart

@@ -56,9 +56,8 @@ class Budgets extends Table {
 
 class BudgetsDto {
   final Budget budget;
-  final List<BudgetItemDto> budgetItems;
 
-  BudgetsDto({required this.budget, required this.budgetItems});
+  BudgetsDto({required this.budget});
 }
 
 class Loans extends Table {
@@ -76,13 +75,8 @@ class LoanChanges extends Table {
 class LoanDto {
   final Loan loan;
   final Beneficiary beneficiary;
-  final List<LoanChange> changes;
 
-  LoanDto({
+  LoanDto({required this.loan, required this.beneficiary});
-    required this.loan,
-    required this.beneficiary,
-    required this.changes,
-  });
 }
 
 class RecurringTransactions extends Table {
@@ -373,6 +367,12 @@ class ExpenseCategoriesDao extends DatabaseAccessor<OkaneDatabase>
 
     return select(expenseCategories).get();
   }
+
+  Future<ExpenseCategory> upsertCategory(ExpenseCategoriesCompanion category) {
+    return into(
+      expenseCategories,
+    ).insertReturning(category, mode: InsertMode.insertOrReplace);
+  }
 }
 
 @DriftAccessor(tables: [Budgets, BudgetItems])
@@ -381,23 +381,12 @@ class BudgetsDao extends DatabaseAccessor<OkaneDatabase>
   BudgetsDao(OkaneDatabase db) : super(db);
 
   Stream<List<BudgetsDto>> budgetsStream(Account account) {
-    return (select(budgets)..where((b) => b.accountId.equals(account.id)))
+    return (select(budgets)
-        .join([
+      ..where((b) => b.accountId.equals(account.id))).watch().map((rows) {
-          leftOuterJoin(
+      return rows.map((row) {
-            budgetItems,
+        return BudgetsDto(budget: row);
-            budgetItems.budgetId.equalsExp(budgets.id),
+      }).toList();
-          ),
+    });
-        ])
-        .watch()
-        .map((rows) {
-          return rows.map((row) {
-            return BudgetsDto(
-              budget: row.readTable(budgets),
-              // TODO
-              budgetItems: List.empty(),
-            );
-          }).toList();
-        });
   }
 
   Future<List<BudgetsDto>> getBudgets(Account? account) {
@@ -405,20 +394,28 @@ class BudgetsDao extends DatabaseAccessor<OkaneDatabase>
       return Future.value(List.empty());
     }
 
-    return (select(budgets)..where((b) => b.accountId.equals(account.id)))
+    return (select(budgets)
+      ..where((b) => b.accountId.equals(account.id))).get().then((rows) {
+      return rows.map((row) {
+        return BudgetsDto(budget: row);
+      }).toList();
+    });
+  }
+
+  Stream<List<BudgetItemDto>> watchBudgetItems(Budget budget) {
+    return (select(budgetItems)..where((b) => b.budgetId.equals(budget.id)))
         .join([
           leftOuterJoin(
-            budgetItems,
+            expenseCategories,
-            budgetItems.budgetId.equalsExp(budgets.id),
+            expenseCategories.id.equalsExp(budgetItems.expenseCategoryId),
           ),
         ])
-        .get()
+        .watch()
-        .then((rows) {
+        .map((rows) {
           return rows.map((row) {
-            return BudgetsDto(
+            return BudgetItemDto(
-              budget: row.readTable(budgets),
+              expenseCategory: row.readTable(expenseCategories),
-              // TODO
+              item: row.readTable(budgetItems),
-              budgetItems: List.empty(),
             );
           }).toList();
         });
@@ -452,12 +449,10 @@ class LoansDao extends DatabaseAccessor<OkaneDatabase> with _$LoansDaoMixin {
         .watch()
         .map((rows) {
           return rows.map((row) {
-            return (
+            return LoanDto(
-                  loan: row.readTable(loans),
+              loan: row.readTable(loans),
-                  beneficiary: row.readTable(beneficiaries),
+              beneficiary: row.readTable(beneficiaries),
-                  changes: List.empty(),
+            );
-                )
-                as LoanDto;
           }).toList();
         });
   }
@@ -477,12 +472,10 @@ class LoansDao extends DatabaseAccessor<OkaneDatabase> with _$LoansDaoMixin {
         .get()
         .then((rows) {
           return rows.map((row) {
-            return (
+            return LoanDto(
-                  loan: row.readTable(loans),
+              loan: row.readTable(loans),
-                  beneficiary: row.readTable(beneficiaries),
+              beneficiary: row.readTable(beneficiaries),
-                  changes: List.empty(),
+            );
-                )
-                as LoanDto;
           }).toList();
         });
   }
@@ -506,6 +499,11 @@ class LoansDao extends DatabaseAccessor<OkaneDatabase> with _$LoansDaoMixin {
     ).insertReturning(loanChange, mode: InsertMode.insertOrReplace);
   }
 
+  Stream<List<LoanChange>> watchLoanChanges(Loan loan) {
+    return (select(loanChanges)
+      ..where((c) => c.loanId.equals(loan.id))).watch();
+  }
+
   Future<void> deleteLoanChange(int id) {
     return (delete(loanChanges)..where((c) => c.id.equals(id))).go();
   }

lib/ui/pages/account/account.dart

@@ -44,7 +44,7 @@ class AccountListPageState extends State<AccountListPage> {
                                 width: 150,
                                 height: 100,
                                 child: Card(
-                                  color: colorHash(state.accounts[index].name!),
+                                  color: colorHash(state.accounts[index].name),
                                   shape:
                                       index == state.activeAccountIndex
                                           ? RoundedRectangleBorder(
@@ -61,7 +61,7 @@ class AccountListPageState extends State<AccountListPage> {
                                     child: Column(
                                       mainAxisSize: MainAxisSize.min,
                                       children: [
-                                        Text(state.accounts[index].name!),
+                                        Text(state.accounts[index].name),
                                         FutureBuilder(
                                           future: GetIt.I
                                               .get<OkaneDatabase>()

lib/ui/pages/account/balance_graph_card.dart

@@ -80,7 +80,6 @@ class AccountBalanceGraphCard extends StatelessWidget {
               child: FutureBuilder(
                 future: getAccountBalance(),
                 builder: (context, snapshot) {
-                  print("SNAPSHOT: ${snapshot.data}");
                   if (!snapshot.hasData) {
                     return CircularProgressIndicator();
                   }

lib/ui/pages/budgets/add_budget_item.dart

@@ -9,11 +9,13 @@ import 'package:okane/ui/widgets/add_expense_category.dart';
 class AddBudgetItemPopup extends StatefulWidget {
   final VoidCallback onDone;
   final BudgetsDto budget;
+  final List<BudgetItemDto> items;
 
   const AddBudgetItemPopup({
     super.key,
     required this.onDone,
     required this.budget,
+    required this.items,
   });
 
   @override
@@ -72,7 +74,7 @@ class AddBudgetItemState extends State<AddBudgetItemPopup> {
                     _expenseCategory == null) {
                   return;
                 }
-                if (widget.budget.budgetItems
+                if (widget.items
                         .where(
                           (i) =>
                               i.expenseCategory.name == _expenseCategory!.name,
@@ -84,10 +86,11 @@ class AddBudgetItemState extends State<AddBudgetItemPopup> {
 
                 await GetIt.I.get<OkaneDatabase>().budgetsDao.upsertBudgetItem(
                   BudgetItemsCompanion(
-                    expenseCategoryId: Value(_expenseCategory!.id),
                     amount: Value(
                       double.parse(_budgetItemAmountEditController.text),
                     ),
+                    expenseCategoryId: Value(_expenseCategory!.id),
+                    budgetId: Value(widget.budget.budget.id),
                   ),
                 );
                 widget.onDone();

lib/ui/pages/budgets/budget_details.dart

@@ -22,6 +22,7 @@ class BudgetDetailsPage extends StatelessWidget {
       builder:
           (_) => AddBudgetItemPopup(
             budget: state.activeBudget!,
+            items: state.budgetItems,
             onDone: () {
               Navigator.of(context).pop();
             },
@@ -55,7 +56,7 @@ class BudgetDetailsPage extends StatelessWidget {
                 return Text(t.pages.budgets.details.noBudgetSelected);
               }
 
-              if (state.activeBudget!.budgetItems.isEmpty) {
+              if (state.budgetItems.isEmpty) {
                 return Row(
                   children: [
                     Text(t.pages.budgets.details.noBudgetItems),
@@ -95,10 +96,9 @@ class BudgetDetailsPage extends StatelessWidget {
                         ),
                         ListView.builder(
                           shrinkWrap: true,
-                          itemCount: state.activeBudget!.budgetItems.length,
+                          itemCount: state.budgetItems.length,
                           itemBuilder: (context, index) {
-                            final item = state.activeBudget!.budgetItems
+                            final item = state.budgetItems.elementAt(index);
-                                .elementAt(index);
                             final amount = formatCurrency(item.item.amount);
                             return ListTile(
                               title: Text(
@@ -120,7 +120,7 @@ class BudgetDetailsPage extends StatelessWidget {
                   }
 
                   final categories =
-                      state.activeBudget!.budgetItems
+                      state.budgetItems
                           // TODO
                           //.map((i) => i.expenseCategory.value!.name)
                           .map((i) => "lol")
@@ -149,7 +149,7 @@ class BudgetDetailsPage extends StatelessWidget {
                       spending.isEmpty
                           ? 0
                           : spending.values.reduce((acc, val) => acc + val);
-                  final budgetTotal = state.activeBudget!.budgetItems
+                  final budgetTotal = state.budgetItems
                       .map((i) => i.item.amount)
                       .reduce((acc, val) => acc + val);
                   return Column(
@@ -271,7 +271,7 @@ class BudgetDetailsPage extends StatelessWidget {
                               fallbackText: "",
                               valueConverter: formatCurrency,
                               items:
-                                  state.activeBudget!.budgetItems
+                                  state.budgetItems
                                       .map(
                                         (i) => (
                                           title: i.expenseCategory.name,
@@ -342,10 +342,9 @@ class BudgetDetailsPage extends StatelessWidget {
                         padding: EdgeInsets.all(8),
                         child: ListView.builder(
                           shrinkWrap: true,
-                          itemCount: state.activeBudget!.budgetItems.length,
+                          itemCount: state.budgetItems.length,
                           itemBuilder: (context, index) {
-                            final item = state.activeBudget!.budgetItems
+                            final item = state.budgetItems.elementAt(index);
-                                .elementAt(index);
                             final amount = formatCurrency(item.item.amount);
                             final spent = spending[item.expenseCategory.name];
                             final left =

lib/ui/pages/loans/add_loan_change.dart

@@ -91,6 +91,7 @@ class AddLoanPopupState extends State<AddLoanChangePopup> {
                     sign * double.parse(_amountController.text).abs(),
                   ),
                   date: Value(DateTime.now()),
+                  loanId: Value(widget.loan.loan.id),
                 ),
               );
               widget.onDone();

lib/ui/pages/loans/loan_details.dart

@@ -43,10 +43,9 @@ class LoanDetailsPage extends StatelessWidget {
                   return Text("No loan selected");
                 }
 
-                final loanChanges = state.activeLoan!.changes.toList();
                 final loanSum =
-                    loanChanges.isNotEmpty
+                    state.loanChanges.isNotEmpty
-                        ? loanChanges
+                        ? state.loanChanges
                             .map((c) => c.amount)
                             .reduce((acc, val) => acc + val)
                         : 0.0;
@@ -94,9 +93,9 @@ class LoanDetailsPage extends StatelessWidget {
 
                     SliverToBoxAdapter(
                       child:
-                          loanChanges.isNotEmpty
+                          state.loanChanges.isNotEmpty
                               ? GroupedListView(
-                                elements: loanChanges,
+                                elements: state.loanChanges,
                                 shrinkWrap: true,
                                 reverse: true,
                                 groupBy:

lib/ui/pages/transaction_details.dart

@@ -135,7 +135,7 @@ class TransactionDetailsPage extends StatelessWidget {
                                         GetIt.I
                                             .get<CoreCubit>()
                                             .activeAccount!
-                                            .name!,
+                                            .name,
                                       ),
                                     ),
                                   ],

lib/ui/state/core.dart

@@ -20,8 +20,10 @@ abstract class CoreState with _$CoreState {
     @Default([]) List<Beneficiary> beneficiaries,
     @Default([]) List<ExpenseCategory> expenseCategories,
     @Default([]) List<BudgetsDto> budgets,
+    @Default([]) List<BudgetItemDto> budgetItems,
     @Default(null) BudgetsDto? activeBudget,
     @Default([]) List<LoanDto> loans,
+    @Default([]) List<LoanChange> loanChanges,
     @Default(null) LoanDto? activeLoan,
     @Default(false) bool isDeletingAccount,
   }) = _CoreState;
@@ -37,7 +39,9 @@ class CoreCubit extends Cubit<CoreState> {
   StreamSubscription<void>? _beneficiariesStreamSubscription;
   StreamSubscription<void>? _expenseCategoryStreamSubscription;
   StreamSubscription<void>? _budgetsStreamSubscription;
+  StreamSubscription<void>? _budgetItemsStreamSubscription;
   StreamSubscription<void>? _loanStreamSubscription;
+  StreamSubscription<void>? _loanChangesSubscription;
 
   void setupAccountStream() {
     _accountsStreamSubscription?.cancel();
@@ -122,17 +126,6 @@ class CoreCubit extends Cubit<CoreState> {
       state.copyWith(
         accounts: accounts,
         activeAccountIndex: accounts.isEmpty ? null : 0,
-        transactions: await db.transactionsDao.getTransactions(account),
-        beneficiaries: await db.beneficiariesDao.getBeneficiaries(),
-        transactionTemplates: await db.transactionTemplatesDao
-            .getTransactionTemplates(account),
-        recurringTransactions: await db.recurringTransactionsDao
-            .getRecurringTransactions(account),
-        expenseCategories: await db.expenseCategoriesDao.getExpenseCategories(
-          account,
-        ),
-        budgets: await db.budgetsDao.getBudgets(account),
-        loans: await db.loansDao.getLoans(account),
       ),
     );
 
@@ -179,7 +172,17 @@ class CoreCubit extends Cubit<CoreState> {
   }
 
   void setActiveBudget(BudgetsDto? budget) {
-    emit(state.copyWith(activeBudget: budget));
+    emit(state.copyWith(activeBudget: budget, budgetItems: []));
+    _budgetItemsStreamSubscription?.cancel();
+    if (budget != null) {
+      _budgetItemsStreamSubscription = GetIt.I
+          .get<OkaneDatabase>()
+          .budgetsDao
+          .watchBudgetItems(budget.budget)
+          .listen((items) {
+            emit(state.copyWith(budgetItems: items));
+          });
+    }
   }
 
   Future<void> deleteAccount(Account account) async {
@@ -198,8 +201,18 @@ class CoreCubit extends Cubit<CoreState> {
     await init();
   }
 
-  void setActiveLoan(LoanDto loan) {
+  void setActiveLoan(LoanDto? loan) {
-    emit(state.copyWith(activeLoan: loan));
+    emit(state.copyWith(activeLoan: loan, loanChanges: []));
+    _loanChangesSubscription?.cancel();
+    if (loan != null) {
+      _loanChangesSubscription = GetIt.I
+          .get<OkaneDatabase>()
+          .loansDao
+          .watchLoanChanges(loan.loan)
+          .listen((changes) {
+            emit(state.copyWith(loanChanges: changes));
+          });
+    }
   }
 
   Account? get activeAccount =>

lib/ui/state/core.freezed.dart

@@ -30,8 +30,10 @@ mixin _$CoreState {
   List<ExpenseCategory> get expenseCategories =>
       throw _privateConstructorUsedError;
   List<BudgetsDto> get budgets => throw _privateConstructorUsedError;
+  List<BudgetItemDto> get budgetItems => throw _privateConstructorUsedError;
   BudgetsDto? get activeBudget => throw _privateConstructorUsedError;
   List<LoanDto> get loans => throw _privateConstructorUsedError;
+  List<LoanChange> get loanChanges => throw _privateConstructorUsedError;
   LoanDto? get activeLoan => throw _privateConstructorUsedError;
   bool get isDeletingAccount => throw _privateConstructorUsedError;
 
@@ -56,8 +58,10 @@ abstract class $CoreStateCopyWith<$Res> {
     List<Beneficiary> beneficiaries,
     List<ExpenseCategory> expenseCategories,
     List<BudgetsDto> budgets,
+    List<BudgetItemDto> budgetItems,
     BudgetsDto? activeBudget,
     List<LoanDto> loans,
+    List<LoanChange> loanChanges,
     LoanDto? activeLoan,
     bool isDeletingAccount,
   });
@@ -86,8 +90,10 @@ class _$CoreStateCopyWithImpl<$Res, $Val extends CoreState>
     Object? beneficiaries = null,
     Object? expenseCategories = null,
     Object? budgets = null,
+    Object? budgetItems = null,
     Object? activeBudget = freezed,
     Object? loans = null,
+    Object? loanChanges = null,
     Object? activeLoan = freezed,
     Object? isDeletingAccount = null,
   }) {
@@ -143,6 +149,11 @@ class _$CoreStateCopyWithImpl<$Res, $Val extends CoreState>
                     ? _value.budgets
                     : budgets // ignore: cast_nullable_to_non_nullable
                         as List<BudgetsDto>,
+            budgetItems:
+                null == budgetItems
+                    ? _value.budgetItems
+                    : budgetItems // ignore: cast_nullable_to_non_nullable
+                        as List<BudgetItemDto>,
             activeBudget:
                 freezed == activeBudget
                     ? _value.activeBudget
@@ -153,6 +164,11 @@ class _$CoreStateCopyWithImpl<$Res, $Val extends CoreState>
                     ? _value.loans
                     : loans // ignore: cast_nullable_to_non_nullable
                         as List<LoanDto>,
+            loanChanges:
+                null == loanChanges
+                    ? _value.loanChanges
+                    : loanChanges // ignore: cast_nullable_to_non_nullable
+                        as List<LoanChange>,
             activeLoan:
                 freezed == activeLoan
                     ? _value.activeLoan
@@ -189,8 +205,10 @@ abstract class _$$CoreStateImplCopyWith<$Res>
     List<Beneficiary> beneficiaries,
     List<ExpenseCategory> expenseCategories,
     List<BudgetsDto> budgets,
+    List<BudgetItemDto> budgetItems,
     BudgetsDto? activeBudget,
     List<LoanDto> loans,
+    List<LoanChange> loanChanges,
     LoanDto? activeLoan,
     bool isDeletingAccount,
   });
@@ -218,8 +236,10 @@ class __$$CoreStateImplCopyWithImpl<$Res>
     Object? beneficiaries = null,
     Object? expenseCategories = null,
     Object? budgets = null,
+    Object? budgetItems = null,
     Object? activeBudget = freezed,
     Object? loans = null,
+    Object? loanChanges = null,
     Object? activeLoan = freezed,
     Object? isDeletingAccount = null,
   }) {
@@ -275,6 +295,11 @@ class __$$CoreStateImplCopyWithImpl<$Res>
                 ? _value._budgets
                 : budgets // ignore: cast_nullable_to_non_nullable
                     as List<BudgetsDto>,
+        budgetItems:
+            null == budgetItems
+                ? _value._budgetItems
+                : budgetItems // ignore: cast_nullable_to_non_nullable
+                    as List<BudgetItemDto>,
         activeBudget:
             freezed == activeBudget
                 ? _value.activeBudget
@@ -285,6 +310,11 @@ class __$$CoreStateImplCopyWithImpl<$Res>
                 ? _value._loans
                 : loans // ignore: cast_nullable_to_non_nullable
                     as List<LoanDto>,
+        loanChanges:
+            null == loanChanges
+                ? _value._loanChanges
+                : loanChanges // ignore: cast_nullable_to_non_nullable
+                    as List<LoanChange>,
         activeLoan:
             freezed == activeLoan
                 ? _value.activeLoan
@@ -314,8 +344,10 @@ class _$CoreStateImpl implements _CoreState {
     final List<Beneficiary> beneficiaries = const [],
     final List<ExpenseCategory> expenseCategories = const [],
     final List<BudgetsDto> budgets = const [],
+    final List<BudgetItemDto> budgetItems = const [],
     this.activeBudget = null,
     final List<LoanDto> loans = const [],
+    final List<LoanChange> loanChanges = const [],
     this.activeLoan = null,
     this.isDeletingAccount = false,
   }) : _accounts = accounts,
@@ -325,7 +357,9 @@ class _$CoreStateImpl implements _CoreState {
        _beneficiaries = beneficiaries,
        _expenseCategories = expenseCategories,
        _budgets = budgets,
-       _loans = loans;
+       _budgetItems = budgetItems,
+       _loans = loans,
+       _loanChanges = loanChanges;
 
   @override
   @JsonKey()
@@ -401,6 +435,15 @@ class _$CoreStateImpl implements _CoreState {
     return EqualUnmodifiableListView(_budgets);
   }
 
+  final List<BudgetItemDto> _budgetItems;
+  @override
+  @JsonKey()
+  List<BudgetItemDto> get budgetItems {
+    if (_budgetItems is EqualUnmodifiableListView) return _budgetItems;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_budgetItems);
+  }
+
   @override
   @JsonKey()
   final BudgetsDto? activeBudget;
@@ -413,6 +456,15 @@ class _$CoreStateImpl implements _CoreState {
     return EqualUnmodifiableListView(_loans);
   }
 
+  final List<LoanChange> _loanChanges;
+  @override
+  @JsonKey()
+  List<LoanChange> get loanChanges {
+    if (_loanChanges is EqualUnmodifiableListView) return _loanChanges;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_loanChanges);
+  }
+
   @override
   @JsonKey()
   final LoanDto? activeLoan;
@@ -422,7 +474,7 @@ class _$CoreStateImpl implements _CoreState {
 
   @override
   String toString() {
-    return 'CoreState(activePage: $activePage, activeAccountIndex: $activeAccountIndex, activeTransaction: $activeTransaction, accounts: $accounts, recurringTransactions: $recurringTransactions, transactions: $transactions, transactionTemplates: $transactionTemplates, beneficiaries: $beneficiaries, expenseCategories: $expenseCategories, budgets: $budgets, activeBudget: $activeBudget, loans: $loans, activeLoan: $activeLoan, isDeletingAccount: $isDeletingAccount)';
+    return 'CoreState(activePage: $activePage, activeAccountIndex: $activeAccountIndex, activeTransaction: $activeTransaction, accounts: $accounts, recurringTransactions: $recurringTransactions, transactions: $transactions, transactionTemplates: $transactionTemplates, beneficiaries: $beneficiaries, expenseCategories: $expenseCategories, budgets: $budgets, budgetItems: $budgetItems, activeBudget: $activeBudget, loans: $loans, loanChanges: $loanChanges, activeLoan: $activeLoan, isDeletingAccount: $isDeletingAccount)';
   }
 
   @override
@@ -458,9 +510,17 @@ class _$CoreStateImpl implements _CoreState {
               _expenseCategories,
             ) &&
             const DeepCollectionEquality().equals(other._budgets, _budgets) &&
+            const DeepCollectionEquality().equals(
+              other._budgetItems,
+              _budgetItems,
+            ) &&
             (identical(other.activeBudget, activeBudget) ||
                 other.activeBudget == activeBudget) &&
             const DeepCollectionEquality().equals(other._loans, _loans) &&
+            const DeepCollectionEquality().equals(
+              other._loanChanges,
+              _loanChanges,
+            ) &&
             (identical(other.activeLoan, activeLoan) ||
                 other.activeLoan == activeLoan) &&
             (identical(other.isDeletingAccount, isDeletingAccount) ||
@@ -480,8 +540,10 @@ class _$CoreStateImpl implements _CoreState {
     const DeepCollectionEquality().hash(_beneficiaries),
     const DeepCollectionEquality().hash(_expenseCategories),
     const DeepCollectionEquality().hash(_budgets),
+    const DeepCollectionEquality().hash(_budgetItems),
     activeBudget,
     const DeepCollectionEquality().hash(_loans),
+    const DeepCollectionEquality().hash(_loanChanges),
     activeLoan,
     isDeletingAccount,
   );
@@ -505,8 +567,10 @@ abstract class _CoreState implements CoreState {
     final List<Beneficiary> beneficiaries,
     final List<ExpenseCategory> expenseCategories,
     final List<BudgetsDto> budgets,
+    final List<BudgetItemDto> budgetItems,
     final BudgetsDto? activeBudget,
     final List<LoanDto> loans,
+    final List<LoanChange> loanChanges,
     final LoanDto? activeLoan,
     final bool isDeletingAccount,
   }) = _$CoreStateImpl;
@@ -532,10 +596,14 @@ abstract class _CoreState implements CoreState {
   @override
   List<BudgetsDto> get budgets;
   @override
+  List<BudgetItemDto> get budgetItems;
+  @override
   BudgetsDto? get activeBudget;
   @override
   List<LoanDto> get loans;
   @override
+  List<LoanChange> get loanChanges;
+  @override
   LoanDto? get activeLoan;
   @override
   bool get isDeletingAccount;

lib/ui/widgets/account_indicator.dart

@@ -25,7 +25,7 @@ class AccountSwitcher extends StatelessWidget {
                       itemBuilder: (context, index) {
                         final item = state.accounts[index];
                         return ListTile(
-                          title: Text(item.name!),
+                          title: Text(item.name),
                           trailing: IconButton(
                             icon: Icon(Icons.delete),
                             color: Colors.red,
@@ -65,7 +65,7 @@ class AccountSwitcher extends StatelessWidget {
                 mainAxisSize: MainAxisSize.min,
                 children: [
                   Text(
-                    bloc.activeAccount!.name!,
+                    bloc.activeAccount!.name,
                     style: Theme.of(context).textTheme.titleLarge,
                   ),
                   Icon(Icons.arrow_drop_down),

lib/ui/widgets/add_expense_category.dart

@@ -1,5 +1,8 @@
+import 'package:drift/drift.dart' show Value;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:get_it/get_it.dart';
+import 'package:okane/database/sqlite.dart';
 import 'package:okane/i18n/strings.g.dart';
 import 'package:okane/ui/state/core.dart';
 
@@ -48,14 +51,16 @@ class AddExpenseCategoryState extends State<AddExpenseCategory> {
                     Spacer(),
                     OutlinedButton(
                       onPressed: () async {
-                        // TODO
+                        final category = await GetIt.I
-                        /*
+                            .get<OkaneDatabase>()
-                        final category =
+                            .expenseCategoriesDao
-                            ExpenseCategory()
+                            .upsertCategory(
-                              ..name = _categoryNameController.text;
+                              ExpenseCategoriesCompanion(
-                        await upsertExpenseCategory(category);
+                                name: Value(_categoryNameController.text),
+                              ),
+                            );
                         _categoryNameController.text = "";
-                        Navigator.of(context).pop(category);*/
+                        Navigator.of(context).pop(category);
                       },
                       child: Text(t.modals.add),
                     ),