diff --git a/lib/database/sqlite.dart b/lib/database/sqlite.dart index 04a4567..7470198 100644 --- a/lib/database/sqlite.dart +++ b/lib/database/sqlite.dart @@ -191,7 +191,7 @@ class OkaneDatabase extends _$OkaneDatabase { ) class AccountsDao extends DatabaseAccessor with _$AccountsDaoMixin { - AccountsDao(OkaneDatabase db) : super(db); + AccountsDao(super.db); Stream> accountsStream() { return select(accounts).watch(); @@ -227,7 +227,7 @@ enum TransactionQueryDateOption { thisMonth } @DriftAccessor(tables: [Transactions, Beneficiaries, ExpenseCategories]) class TransactionsDao extends DatabaseAccessor with _$TransactionsDaoMixin { - TransactionsDao(OkaneDatabase db) : super(db); + TransactionsDao(super.db); JoinedSelectStatement _transactionQuery(Account account) { return (select(transactions) @@ -350,7 +350,7 @@ class TransactionsDao extends DatabaseAccessor @DriftAccessor(tables: [Beneficiaries]) class BeneficiariesDao extends DatabaseAccessor with _$BeneficiariesDaoMixin { - BeneficiariesDao(OkaneDatabase db) : super(db); + BeneficiariesDao(super.db); Stream> beneficiariesStream() { return select(beneficiaries).watch(); @@ -379,7 +379,7 @@ class BeneficiariesDao extends DatabaseAccessor @DriftAccessor(tables: [ExpenseCategories]) class ExpenseCategoriesDao extends DatabaseAccessor with _$ExpenseCategoriesDaoMixin { - ExpenseCategoriesDao(OkaneDatabase db) : super(db); + ExpenseCategoriesDao(super.db); Stream> expenseCategoriesStream(Account account) { return select(expenseCategories).watch(); @@ -403,7 +403,7 @@ class ExpenseCategoriesDao extends DatabaseAccessor @DriftAccessor(tables: [Budgets, BudgetItems]) class BudgetsDao extends DatabaseAccessor with _$BudgetsDaoMixin { - BudgetsDao(OkaneDatabase db) : super(db); + BudgetsDao(super.db); Stream> budgetsStream(Account account) { return (select(budgets) @@ -461,7 +461,7 @@ class BudgetsDao extends DatabaseAccessor @DriftAccessor(tables: [Loans, LoanChanges, Beneficiaries]) class LoansDao extends DatabaseAccessor with _$LoansDaoMixin { - LoansDao(OkaneDatabase db) : super(db); + LoansDao(super.db); Stream> loansStream(Account account) { return select(loans) @@ -537,7 +537,7 @@ class LoansDao extends DatabaseAccessor with _$LoansDaoMixin { @DriftAccessor(tables: [TransactionTemplates, ExpenseCategories, Beneficiaries]) class TransactionTemplatesDao extends DatabaseAccessor with _$TransactionTemplatesDaoMixin { - TransactionTemplatesDao(OkaneDatabase db) : super(db); + TransactionTemplatesDao(super.db); Stream> transactionTemplatesStream( Account account, @@ -618,7 +618,7 @@ class TransactionTemplatesDao extends DatabaseAccessor @DriftAccessor(tables: [TransactionTemplates, RecurringTransactions]) class RecurringTransactionsDao extends DatabaseAccessor with _$RecurringTransactionsDaoMixin { - RecurringTransactionsDao(OkaneDatabase db) : super(db); + RecurringTransactionsDao(super.db); Stream> recurringTransactionsStream( Account account, diff --git a/lib/main.dart b/lib/main.dart index 870e3c7..03a2df6 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -27,7 +27,7 @@ Future main() async { GetIt.I.registerSingleton(CoreCubit()); GetIt.I.registerSingleton(OkaneDatabase()); - final appRunner = () => runApp(const MyApp()); + appRunner() => runApp(const MyApp()); if (settings.sentryDsn != null) { print("Setting up Sentry!"); await SentryFlutter.init((options) { diff --git a/lib/ui/pages/account/breakdown_card.dart b/lib/ui/pages/account/breakdown_card.dart index 3d0f984..66f1d49 100644 --- a/lib/ui/pages/account/breakdown_card.dart +++ b/lib/ui/pages/account/breakdown_card.dart @@ -46,7 +46,7 @@ class BreakdownCard extends StatelessWidget { Map expenses = {}; Map colors = {}; double usableMoney = 0; - transactions.forEach((t) { + for (var t in transactions) { String category; if (t.transaction.amount > 0) { category = CATEGORY_INCOME; @@ -67,7 +67,7 @@ class BreakdownCard extends StatelessWidget { ifAbsent: () => t.transaction.amount.abs().toDouble(), ); usableMoney += t.transaction.amount; - }); + } return (expenses: expenses, colors: colors, usable: usableMoney); } diff --git a/lib/ui/pages/settings.dart b/lib/ui/pages/settings.dart index d4f0321..b0f60b1 100644 --- a/lib/ui/pages/settings.dart +++ b/lib/ui/pages/settings.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:get_it/get_it.dart'; import 'package:okane/i18n/strings.g.dart'; -import 'package:okane/ui/pages/account/breakdown_card.dart'; import 'package:okane/ui/state/settings.dart'; import 'package:okane/ui/utils.dart'; diff --git a/test/database/collections/recurrent.dart b/test/database/collections/recurrent.dart deleted file mode 100644 index ef65596..0000000 --- a/test/database/collections/recurrent.dart +++ /dev/null @@ -1,38 +0,0 @@ -import 'package:flutter_test/flutter_test.dart'; -import 'package:okane/database/collections/recurrent.dart'; - -void main() { - group("isDue", () { - test("null value", () { - final t = RecurringTransaction()..lastExecution = null; - expect(t.isDue(DateTime.now()), true); - }); - - test("Date before", () { - final now = DateTime.now(); - final t = - RecurringTransaction() - ..lastExecution = now - ..days = 30; - expect(t.isDue(now.add(Duration(days: 10))), false); - }); - - test("Date before warning", () { - final now = DateTime.now(); - final t = - RecurringTransaction() - ..lastExecution = now - ..days = 30; - expect(t.isDue(now.add(Duration(days: 20))), true); - }); - - test("Expired", () { - final now = DateTime.now(); - final t = - RecurringTransaction() - ..lastExecution = now - ..days = 30; - expect(t.isDue(now.add(Duration(days: 31))), true); - }); - }); -}