Bump tag

.gitignore

@@ -11,6 +11,7 @@
 .svn/
 .swiftpm/
 migrate_working_dir/
+.sentry-native/
 
 # IntelliJ related
 *.iml
@@ -45,4 +46,4 @@ app.*.map.json
 /android/app/release
 
 # Build artifacts
-lib/i18n/*
+lib/i18n/*

lib/database/sqlite.dart

@@ -179,10 +179,19 @@ class OkaneDatabase extends _$OkaneDatabase {
   }
 }
 
-@DriftAccessor(tables: [Accounts])
+@DriftAccessor(
+  tables: [
+    Accounts,
+    Transactions,
+    TransactionTemplates,
+    RecurringTransactions,
+    Budgets,
+    Beneficiaries,
+  ],
+)
 class AccountsDao extends DatabaseAccessor<OkaneDatabase>
     with _$AccountsDaoMixin {
-  AccountsDao(OkaneDatabase db) : super(db);
+  AccountsDao(super.db);
 
   Stream<List<Account>> accountsStream() {
     return select(accounts).watch();
@@ -195,6 +204,22 @@ class AccountsDao extends DatabaseAccessor<OkaneDatabase>
   Future<int> upsertAccount(AccountsCompanion account) {
     return into(accounts).insertOnConflictUpdate(account);
   }
+
+  Future<void> removeAccount(Account account) async {
+    // Delete dependent data
+    await (delete(transactions)
+      ..where((t) => t.accountId.equals(account.id))).go();
+    await (delete(recurringTransactions)
+      ..where((r) => r.accountId.equals(account.id))).go();
+    await (delete(transactionTemplates)
+      ..where((t) => t.accountId.equals(account.id))).go();
+    await (delete(budgets)..where((b) => b.accountId.equals(account.id))).go();
+    await (delete(beneficiaries)
+      ..where((b) => b.accountId.equals(account.id))).go();
+
+    // Delete the account
+    await (delete(accounts)..where((a) => a.id.equals(account.id))).go();
+  }
 }
 
 enum TransactionQueryDateOption { thisMonth }
@@ -202,7 +227,7 @@ enum TransactionQueryDateOption { thisMonth }
 @DriftAccessor(tables: [Transactions, Beneficiaries, ExpenseCategories])
 class TransactionsDao extends DatabaseAccessor<OkaneDatabase>
     with _$TransactionsDaoMixin {
-  TransactionsDao(OkaneDatabase db) : super(db);
+  TransactionsDao(super.db);
 
   JoinedSelectStatement _transactionQuery(Account account) {
     return (select(transactions)
@@ -325,7 +350,7 @@ class TransactionsDao extends DatabaseAccessor<OkaneDatabase>
 @DriftAccessor(tables: [Beneficiaries])
 class BeneficiariesDao extends DatabaseAccessor<OkaneDatabase>
     with _$BeneficiariesDaoMixin {
-  BeneficiariesDao(OkaneDatabase db) : super(db);
+  BeneficiariesDao(super.db);
 
   Stream<List<Beneficiary>> beneficiariesStream() {
     return select(beneficiaries).watch();
@@ -354,7 +379,7 @@ class BeneficiariesDao extends DatabaseAccessor<OkaneDatabase>
 @DriftAccessor(tables: [ExpenseCategories])
 class ExpenseCategoriesDao extends DatabaseAccessor<OkaneDatabase>
     with _$ExpenseCategoriesDaoMixin {
-  ExpenseCategoriesDao(OkaneDatabase db) : super(db);
+  ExpenseCategoriesDao(super.db);
 
   Stream<List<ExpenseCategory>> expenseCategoriesStream(Account account) {
     return select(expenseCategories).watch();
@@ -378,7 +403,7 @@ class ExpenseCategoriesDao extends DatabaseAccessor<OkaneDatabase>
 @DriftAccessor(tables: [Budgets, BudgetItems])
 class BudgetsDao extends DatabaseAccessor<OkaneDatabase>
     with _$BudgetsDaoMixin {
-  BudgetsDao(OkaneDatabase db) : super(db);
+  BudgetsDao(super.db);
 
   Stream<List<BudgetsDto>> budgetsStream(Account account) {
     return (select(budgets)
@@ -436,7 +461,7 @@ class BudgetsDao extends DatabaseAccessor<OkaneDatabase>
 
 @DriftAccessor(tables: [Loans, LoanChanges, Beneficiaries])
 class LoansDao extends DatabaseAccessor<OkaneDatabase> with _$LoansDaoMixin {
-  LoansDao(OkaneDatabase db) : super(db);
+  LoansDao(super.db);
 
   Stream<List<LoanDto>> loansStream(Account account) {
     return select(loans)
@@ -512,7 +537,7 @@ class LoansDao extends DatabaseAccessor<OkaneDatabase> with _$LoansDaoMixin {
 @DriftAccessor(tables: [TransactionTemplates, ExpenseCategories, Beneficiaries])
 class TransactionTemplatesDao extends DatabaseAccessor<OkaneDatabase>
     with _$TransactionTemplatesDaoMixin {
-  TransactionTemplatesDao(OkaneDatabase db) : super(db);
+  TransactionTemplatesDao(super.db);
 
   Stream<List<TransactionTemplateDto>> transactionTemplatesStream(
     Account account,
@@ -593,7 +618,7 @@ class TransactionTemplatesDao extends DatabaseAccessor<OkaneDatabase>
 @DriftAccessor(tables: [TransactionTemplates, RecurringTransactions])
 class RecurringTransactionsDao extends DatabaseAccessor<OkaneDatabase>
     with _$RecurringTransactionsDaoMixin {
-  RecurringTransactionsDao(OkaneDatabase db) : super(db);
+  RecurringTransactionsDao(super.db);
 
   Stream<List<RecurringTransactionDto>> recurringTransactionsStream(
     Account account,

lib/database/sqlite.g.dart

@@ -8190,6 +8190,15 @@ class $OkaneDatabaseManager {
 
 mixin _$AccountsDaoMixin on DatabaseAccessor<OkaneDatabase> {
   $AccountsTable get accounts => attachedDatabase.accounts;
+  $ExpenseCategoriesTable get expenseCategories =>
+      attachedDatabase.expenseCategories;
+  $BeneficiariesTable get beneficiaries => attachedDatabase.beneficiaries;
+  $TransactionsTable get transactions => attachedDatabase.transactions;
+  $TransactionTemplatesTable get transactionTemplates =>
+      attachedDatabase.transactionTemplates;
+  $RecurringTransactionsTable get recurringTransactions =>
+      attachedDatabase.recurringTransactions;
+  $BudgetsTable get budgets => attachedDatabase.budgets;
 }
 mixin _$BeneficiariesDaoMixin on DatabaseAccessor<OkaneDatabase> {
   $AccountsTable get accounts => attachedDatabase.accounts;

lib/main.dart

@@ -12,6 +12,7 @@ import 'package:okane/ui/pages/budgets/budget_details.dart';
 import 'package:okane/ui/pages/transaction_details.dart';
 import 'package:okane/ui/state/core.dart';
 import 'package:okane/ui/state/settings.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
 
 import 'ui/pages/loans/loan_details.dart';
 
@@ -21,11 +22,20 @@ Future<void> main() async {
 
   final settings = SettingsCubit();
   await settings.loadSettings();
+
   GetIt.I.registerSingleton<SettingsCubit>(settings);
   GetIt.I.registerSingleton<CoreCubit>(CoreCubit());
   GetIt.I.registerSingleton<OkaneDatabase>(OkaneDatabase());
 
-  runApp(const MyApp());
+  appRunner() => runApp(const MyApp());
+  if (settings.sentryDsn != null) {
+    print("Setting up Sentry!");
+    await SentryFlutter.init((options) {
+      options.dsn = settings.sentryDsn!;
+    }, appRunner: appRunner);
+  } else {
+    appRunner();
+  }
 }
 
 class MyApp extends StatelessWidget {

lib/ui/pages/account/breakdown_card.dart

@@ -46,7 +46,7 @@ class BreakdownCard extends StatelessWidget {
     Map<String, double> expenses = {};
     Map<String, Color> 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);
   }
 

lib/ui/pages/settings.dart

@@ -67,6 +67,74 @@ class SettingsPage extends StatelessWidget {
                 },
               ),
         ),
+
+        BlocBuilder<SettingsCubit, SettingsWrapper>(
+          builder:
+              (context, state) => ListTile(
+                title: Text("Sentry"),
+                subtitle: Text(
+                  "When enabled sends errors to the configured Sentry DSN.",
+                ),
+                trailing: IconButton(
+                  icon: Icon(Icons.clear),
+                  onPressed:
+                      state.settings.sentryDsn == null
+                          ? null
+                          : () async {
+                            final result = await confirm(
+                              context,
+                              "Clear Sentry DSN",
+                              "Are you sure you want to clear the Sentry DSN?",
+                            );
+                            if (!result) {
+                              return;
+                            }
+
+                            await GetIt.I.get<SettingsCubit>().setSettings(
+                              state.settings.copyWith(sentryDsn: null),
+                            );
+                          },
+                ),
+                onTap: () async {
+                  final controller = TextEditingController(
+                    text: state.settings.sentryDsn ?? '',
+                  );
+                  final result = await showDialogOrModal<String>(
+                    context: context,
+                    builder: (context) {
+                      return Column(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          TextField(
+                            controller: controller,
+                            decoration: InputDecoration(hintText: "Sentry DSN"),
+                          ),
+                          Row(
+                            mainAxisSize: MainAxisSize.min,
+                            mainAxisAlignment: MainAxisAlignment.end,
+                            children: [
+                              OutlinedButton(
+                                child: Text("Apply"),
+                                onPressed: () {
+                                  Navigator.of(context).pop(controller.text);
+                                },
+                              ),
+                            ],
+                          ),
+                        ],
+                      );
+                    },
+                  );
+                  if (result == null) {
+                    return;
+                  }
+
+                  await GetIt.I.get<SettingsCubit>().setSettings(
+                    state.settings.copyWith(sentryDsn: result),
+                  );
+                },
+              ),
+        ),
       ],
     );
   }

lib/ui/state/core.dart

@@ -193,8 +193,7 @@ class CoreCubit extends Cubit<CoreState> {
 
     cancelStreams();
     try {
-      // TODO
+      await GetIt.I.get<OkaneDatabase>().accountsDao.removeAccount(account);
-      //await db.deleteAccount(account);
     } finally {
       emit(state.copyWith(isDeletingAccount: false));
     }

lib/ui/state/settings.dart

@@ -13,6 +13,7 @@ enum ColorSchemeSettings { light, dark, system }
 abstract class Settings with _$Settings {
   const factory Settings({
     @Default(ColorSchemeSettings.system) ColorSchemeSettings colorScheme,
+    @Default(null) String? sentryDsn,
   }) = _Settings;
 
   factory Settings.fromJson(Map<String, Object?> json) =>
@@ -45,4 +46,6 @@ class SettingsCubit extends Cubit<SettingsWrapper> {
 
     await _prefs.setString("settings", jsonEncode(settings.toJson()));
   }
+
+  String? get sentryDsn => state.settings.sentryDsn;
 }

lib/ui/state/settings.freezed.dart

@@ -22,6 +22,7 @@ Settings _$SettingsFromJson(Map<String, dynamic> json) {
 /// @nodoc
 mixin _$Settings {
   ColorSchemeSettings get colorScheme => throw _privateConstructorUsedError;
+  String? get sentryDsn => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -34,7 +35,7 @@ abstract class $SettingsCopyWith<$Res> {
   factory $SettingsCopyWith(Settings value, $Res Function(Settings) then) =
       _$SettingsCopyWithImpl<$Res, Settings>;
   @useResult
-  $Res call({ColorSchemeSettings colorScheme});
+  $Res call({ColorSchemeSettings colorScheme, String? sentryDsn});
 }
 
 /// @nodoc
@@ -49,7 +50,7 @@ class _$SettingsCopyWithImpl<$Res, $Val extends Settings>
 
   @pragma('vm:prefer-inline')
   @override
-  $Res call({Object? colorScheme = null}) {
+  $Res call({Object? colorScheme = null, Object? sentryDsn = freezed}) {
     return _then(
       _value.copyWith(
             colorScheme:
@@ -57,6 +58,11 @@ class _$SettingsCopyWithImpl<$Res, $Val extends Settings>
                     ? _value.colorScheme
                     : colorScheme // ignore: cast_nullable_to_non_nullable
                         as ColorSchemeSettings,
+            sentryDsn:
+                freezed == sentryDsn
+                    ? _value.sentryDsn
+                    : sentryDsn // ignore: cast_nullable_to_non_nullable
+                        as String?,
           )
           as $Val,
     );
@@ -72,7 +78,7 @@ abstract class _$$SettingsImplCopyWith<$Res>
   ) = __$$SettingsImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({ColorSchemeSettings colorScheme});
+  $Res call({ColorSchemeSettings colorScheme, String? sentryDsn});
 }
 
 /// @nodoc
@@ -86,7 +92,7 @@ class __$$SettingsImplCopyWithImpl<$Res>
 
   @pragma('vm:prefer-inline')
   @override
-  $Res call({Object? colorScheme = null}) {
+  $Res call({Object? colorScheme = null, Object? sentryDsn = freezed}) {
     return _then(
       _$SettingsImpl(
         colorScheme:
@@ -94,6 +100,11 @@ class __$$SettingsImplCopyWithImpl<$Res>
                 ? _value.colorScheme
                 : colorScheme // ignore: cast_nullable_to_non_nullable
                     as ColorSchemeSettings,
+        sentryDsn:
+            freezed == sentryDsn
+                ? _value.sentryDsn
+                : sentryDsn // ignore: cast_nullable_to_non_nullable
+                    as String?,
       ),
     );
   }
@@ -102,7 +113,10 @@ class __$$SettingsImplCopyWithImpl<$Res>
 /// @nodoc
 @JsonSerializable()
 class _$SettingsImpl implements _Settings {
-  const _$SettingsImpl({this.colorScheme = ColorSchemeSettings.system});
+  const _$SettingsImpl({
+    this.colorScheme = ColorSchemeSettings.system,
+    this.sentryDsn = null,
+  });
 
   factory _$SettingsImpl.fromJson(Map<String, dynamic> json) =>
       _$$SettingsImplFromJson(json);
@@ -110,10 +124,13 @@ class _$SettingsImpl implements _Settings {
   @override
   @JsonKey()
   final ColorSchemeSettings colorScheme;
+  @override
+  @JsonKey()
+  final String? sentryDsn;
 
   @override
   String toString() {
-    return 'Settings(colorScheme: $colorScheme)';
+    return 'Settings(colorScheme: $colorScheme, sentryDsn: $sentryDsn)';
   }
 
   @override
@@ -122,12 +139,14 @@ class _$SettingsImpl implements _Settings {
         (other.runtimeType == runtimeType &&
             other is _$SettingsImpl &&
             (identical(other.colorScheme, colorScheme) ||
-                other.colorScheme == colorScheme));
+                other.colorScheme == colorScheme) &&
+            (identical(other.sentryDsn, sentryDsn) ||
+                other.sentryDsn == sentryDsn));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode => Object.hash(runtimeType, colorScheme);
+  int get hashCode => Object.hash(runtimeType, colorScheme, sentryDsn);
 
   @JsonKey(ignore: true)
   @override
@@ -142,8 +161,10 @@ class _$SettingsImpl implements _Settings {
 }
 
 abstract class _Settings implements Settings {
-  const factory _Settings({final ColorSchemeSettings colorScheme}) =
+  const factory _Settings({
-      _$SettingsImpl;
+    final ColorSchemeSettings colorScheme,
+    final String? sentryDsn,
+  }) = _$SettingsImpl;
 
   factory _Settings.fromJson(Map<String, dynamic> json) =
       _$SettingsImpl.fromJson;
@@ -151,6 +172,8 @@ abstract class _Settings implements Settings {
   @override
   ColorSchemeSettings get colorScheme;
   @override
+  String? get sentryDsn;
+  @override
   @JsonKey(ignore: true)
   _$$SettingsImplCopyWith<_$SettingsImpl> get copyWith =>
       throw _privateConstructorUsedError;

lib/ui/state/settings.g.dart

@@ -14,11 +14,13 @@ _$SettingsImpl _$$SettingsImplFromJson(Map<String, dynamic> json) =>
             json['colorScheme'],
           ) ??
           ColorSchemeSettings.system,
+      sentryDsn: json['sentryDsn'] as String? ?? null,
     );
 
 Map<String, dynamic> _$$SettingsImplToJson(_$SettingsImpl instance) =>
     <String, dynamic>{
       'colorScheme': _$ColorSchemeSettingsEnumMap[instance.colorScheme]!,
+      'sentryDsn': instance.sentryDsn,
     };
 
 const _$ColorSchemeSettingsEnumMap = {

linux/flutter/generated_plugin_registrant.cc

@@ -6,9 +6,13 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <sentry_flutter/sentry_flutter_plugin.h>
 #include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) sentry_flutter_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "SentryFlutterPlugin");
+  sentry_flutter_plugin_register_with_registrar(sentry_flutter_registrar);
   g_autoptr(FlPluginRegistrar) sqlite3_flutter_libs_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "Sqlite3FlutterLibsPlugin");
   sqlite3_flutter_libs_plugin_register_with_registrar(sqlite3_flutter_libs_registrar);

linux/flutter/generated_plugins.cmake

@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  sentry_flutter
   sqlite3_flutter_libs
 )
 

pubspec.lock

@@ -405,6 +405,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
+  http:
+    dependency: transitive
+    description:
+      name: http
+      sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -565,6 +573,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.0"
+  package_info_plus:
+    dependency: transitive
+    description:
+      name: package_info_plus
+      sha256: "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.3.0"
+  package_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: package_info_plus_platform_interface
+      sha256: "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.0"
   path:
     dependency: "direct main"
     description:
@@ -685,6 +709,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.9"
+  sentry:
+    dependency: transitive
+    description:
+      name: sentry
+      sha256: "599701ca0693a74da361bc780b0752e1abc98226cf5095f6b069648116c896bb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.14.2"
+  sentry_flutter:
+    dependency: "direct main"
+    description:
+      name: sentry_flutter
+      sha256: "5ba2cf40646a77d113b37a07bd69f61bb3ec8a73cbabe5537b05a7c89d2656f8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.14.2"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -810,6 +850,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.10.1"
+  sprintf:
+    dependency: transitive
+    description:
+      name: sprintf
+      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
   sqlite3:
     dependency: transitive
     description:
@@ -898,6 +946,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  uuid:
+    dependency: transitive
+    description:
+      name: uuid
+      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.1"
   vector_math:
     dependency: transitive
     description:

pubspec.yaml

@@ -2,7 +2,7 @@ name: okane
 description: "A cross-platform finance tracker."
 publish_to: "none"
 
-version: 1.0.0+3
+version: 1.0.0+6
 environment:
   sdk: ^3.7.0
 
@@ -29,6 +29,9 @@ dependencies:
   drift: ^2.26.1
   drift_flutter: ^0.2.4
 
+  # For optional error tracking
+  sentry_flutter: ^8.14.2
+
 dev_dependencies:
   flutter_test:
     sdk: flutter

test/database/collections/recurrent.dart

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