CHANGELOG.md

@@ -1,6 +1,5 @@
 # newVersion
 - Upgrade dependencies
-- Use less `await`s in WalletManager class
 
 # 1.1.1
 - Removed deprecated code

analysis_options.yaml

@@ -9,9 +9,6 @@
 # packages, and plugins designed to encourage good coding practices.
 include: package:very_good_analysis/analysis_options.yaml
 
-analyzer:
-  exclude: [/**/*.g.dart]
-
 linter:
   # The lint rules applied to this project can be customized in the
   # section below to disable rules from the `package:flutter_lints/flutter.yaml`

integration_test/app_test.dart

@@ -18,11 +18,11 @@ void main() {
   group("Test classes and API", () {
     test("Test wallet operations", () async {
       expect(
-        WalletManager.listWallets().length,
+        (await WalletManager.listWallets()).length,
         equals(0),
       ); // check that there are no other wallets
-      WalletManager.saveWallet(Wallet.empty);
+      await WalletManager.saveWallet(Wallet.empty);
-      var w = WalletManager.listWallets().firstOrNull;
+      var w = (await WalletManager.listWallets()).firstOrNull;
       expect(w, isNotNull); // check that the wallet was successfully saved
       expect(w!.categories.length, equals(1));
       w.categories.add(
@@ -43,8 +43,8 @@ void main() {
           id: w.nextId,
         ),
       ); // create test entry
-      WalletManager.saveWallet(w); // save again
+      await WalletManager.saveWallet(w); // save again
-      w = WalletManager.loadWallet(w.name); // try loading manually
+      w = await WalletManager.loadWallet(w.name); // try loading manually
       final e = w.entries.where((element) => element.id == testId).firstOrNull;
       expect(
         e,
@@ -55,9 +55,9 @@ void main() {
         equals(1),
       ); // check that the category exists too
 
-      WalletManager.deleteWallet(w);
+      await WalletManager.deleteWallet(w);
       expect(
-        WalletManager.listWallets().length,
+        (await WalletManager.listWallets()).length,
         equals(0),
       );
     });
@@ -66,7 +66,7 @@ void main() {
   group("Test app functionality:", () {
     testWidgets('First-time setup', (WidgetTester tester) async {
       // Delete all data
-      WalletManager.deleteAllData();
+      await WalletManager.deleteAllData();
       // Build our app and trigger a frame.
       await tester.pumpWidget(
         const MyApp(
@@ -113,12 +113,13 @@ void main() {
 
     testWidgets('Test rendering of entries', (WidgetTester tester) async {
       // Delete all data
-      WalletManager.deleteAllData();
+      await WalletManager.deleteAllData();
-      expect(WalletManager.listWallets().length, equals(0));
+      expect((await WalletManager.listWallets()).length, equals(0));
 
       // Create test data
-      Wallet.empty.createTestEntries();
+      final w = Wallet.empty;
-      expect(WalletManager.listWallets().length, equals(1));
+      await w.createTestEntries();
+      expect((await WalletManager.listWallets()).length, equals(1));
 
       // Build our app and trigger a frame.
       await tester.pumpWidget(

lib/api/wallet.dart

@@ -147,7 +147,7 @@ class Wallet {
   ///
   /// All [WalletSingleEntry]s will have their category reassigned
   /// to the default *No category*
-  void removeCategory(WalletCategory category) {
+  Future<void> removeCategory(WalletCategory category) async {
     // First remove the category from existing entries
     for (final entryToChange
         in entries.where((element) => element.category.id == category.id)) {
@@ -157,7 +157,7 @@ class Wallet {
     // Remove the category
     categories.removeWhere((element) => element.id == category.id);
     // Save
-    WalletManager.saveWallet(this);
+    await WalletManager.saveWallet(this);
   }
 
   /// Returns the current balance
@@ -216,7 +216,7 @@ class Wallet {
   );
 
   /// Creates test data used for debugging purposes
-  void createTestEntries() {
+  Future<void> createTestEntries() async {
     entries.clear();
     recurringEntries.clear();
     final random = Random();
@@ -274,6 +274,6 @@ class Wallet {
     );
 
     // save and reload
-    WalletManager.saveWallet(this);
+    await WalletManager.saveWallet(this);
   }
 }

lib/api/wallet_manager.dart

@@ -11,29 +11,18 @@ import 'package:prasule/main.dart';
 
 /// Used for [Wallet]-managing operations
 class WalletManager {
-  /// Currently selected wallet
-  static Wallet? selectedWallet;
-
-  /// Path to the directory with wallet files
-  ///
-  /// Saved beforehand so we don't have to use async everywhere
-  static late String walletPath;
-
   /// Returns a list of all [Wallet]s
-  static List<Wallet> listWallets() {
+  static Future<List<Wallet>> listWallets() async {
-    final path = Directory(walletPath);
+    final path =
+        Directory("${(await getApplicationDocumentsDirectory()).path}/wallets");
     if (!path.existsSync()) {
       path.createSync();
     }
     final wallets = <Wallet>[];
-    for (final w in path
+    for (final w
-        .listSync()
+        in path.listSync().map((e) => e.path.split("/").last).toList()) {
-        .whereType<File>()
-        .where((e) => e.path.endsWith(".json"))
-        .map((e) => e.path.split("/").last)
-        .toList()) {
       try {
-        wallets.add(loadWallet(w));
+        wallets.add(await loadWallet(w));
       } catch (e) {
         logger.e(e);
         // TODO: do something with unreadable wallets
@@ -43,8 +32,9 @@ class WalletManager {
   }
 
   /// Deletes all [Wallet]s
-  static void deleteAllData() {
+  static Future<void> deleteAllData() async {
-    final path = Directory(walletPath);
+    final path =
+        Directory("${(await getApplicationDocumentsDirectory()).path}/wallets");
     if (!path.existsSync()) {
       return;
     }
@@ -134,10 +124,10 @@ class WalletManager {
       d = File(filePath).readAsStringSync();
     }
     final w = Wallet.fromJson(jsonDecode(d) as Map<String, dynamic>);
-    if (WalletManager.exists(w.name)) {
+    if (await WalletManager.exists(w.name)) {
       throw Exception("Wallet already exists!");
     }
-    WalletManager.saveWallet(
+    await WalletManager.saveWallet(
       w,
     );
   }
@@ -176,14 +166,15 @@ class WalletManager {
   }
 
   /// Loads and returns a single [Wallet] by name
-  static Wallet loadWallet(String name) {
+  static Future<Wallet> loadWallet(String name) async {
-    final path = Directory(walletPath);
+    final path =
+        Directory("${(await getApplicationDocumentsDirectory()).path}/wallets");
     final wallet = File("${path.path}/$name");
     if (!path.existsSync()) {
       path.createSync();
     }
     if (!wallet.existsSync()) {
-      throw Exception("Wallet does not exist");
+      return Future.error("Wallet does not exist");
     }
     return Wallet.fromJson(
       jsonDecode(wallet.readAsStringSync()) as Map<String, dynamic>,
@@ -191,26 +182,29 @@ class WalletManager {
   }
 
   /// Converts [Wallet] to JSON and saves it to AppData
-  static void saveWallet(Wallet w) {
+  static Future<bool> saveWallet(Wallet w) async {
-    final path = Directory(walletPath);
+    final path =
+        Directory("${(await getApplicationDocumentsDirectory()).path}/wallets");
     final wallet = File("${path.path}/${w.name}");
     if (!path.existsSync()) {
       path.createSync();
     }
     // if (!wallet.existsSync()) return false;
     wallet.writeAsStringSync(jsonEncode(w.toJson()));
+    return true;
   }
 
   /// Deletes the corresponding [Wallet] file
-  static void deleteWallet(Wallet w) {
+  static Future<void> deleteWallet(Wallet w) async {
-    final path = Directory(walletPath);
+    final path =
+        Directory("${(await getApplicationDocumentsDirectory()).path}/wallets");
     File("${path.path}/${w.name}").deleteSync();
   }
 
   /// Checks if the wallet exists
-  static bool exists(String name) {
+  static Future<bool> exists(String name) async {
     return File(
-      "$walletPath/$name",
+      "${(await getApplicationDocumentsDirectory()).path}/wallets/$name",
     ).existsSync();
   }
 }

lib/main.dart

@@ -6,11 +6,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:logger/logger.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:prasule/api/wallet_manager.dart';
 import 'package:prasule/util/color_schemes.g.dart';
 import 'package:prasule/views/home.dart';
-import 'package:prasule/views/initialization_screen.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 var _materialYou = false;
@@ -23,7 +20,6 @@ void main() async {
   }
 
   _materialYou = s.getBool("useMaterialYou") ?? true;
-
   runApp(const MyApp());
 }
 
@@ -43,7 +39,6 @@ class MyApp extends StatelessWidget {
   /// Override locale, used for testing
   final Locale? locale;
   // This widget is the root of your application.
-
   @override
   Widget build(BuildContext context) {
     return (Platform.isAndroid)
@@ -71,7 +66,7 @@ class MyApp extends StatelessWidget {
                   colorScheme:
                       _materialYou ? dark ?? darkColorScheme : darkColorScheme,
                 ),
-                home: const InitializationScreen(),
+                home: const HomeView(),
               );
             },
           )
@@ -90,7 +85,7 @@ class MyApp extends StatelessWidget {
                 ...GlobalCupertinoLocalizations.delegates,
               ],
               title: 'Prašule',
-              home: InitializationScreen(),
+              home: HomeView(),
             ),
           );
   }

lib/views/create_entry.dart

@@ -236,8 +236,9 @@ class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
                       return;
                     }
                     widget.w.entries.add(newEntry);
-                    WalletManager.saveWallet(widget.w); // TODO loading circle?
+                    WalletManager.saveWallet(widget.w).then(
-                    Navigator.of(context).pop(widget.w);
+                      (value) => Navigator.of(context).pop(widget.w),
+                    ); // TODO loading circle?
                   },
                 ),
               ],

lib/views/create_recur_entry.dart

@@ -323,8 +323,9 @@ class _CreateRecurringEntryViewState extends State<CreateRecurringEntryView> {
                       return;
                     }
                     widget.w.recurringEntries.add(newEntry);
-                    WalletManager.saveWallet(widget.w); // TODO loading circle?
+                    WalletManager.saveWallet(widget.w).then(
-                    Navigator.of(context).pop(widget.w);
+                      (value) => Navigator.of(context).pop(widget.w),
+                    ); // TODO loading circle?
                   },
                 ),
               ],

lib/views/graph_view.dart

@@ -67,8 +67,8 @@ class _GraphViewState extends State<GraphView> {
 
   final availableYears = <WheelChoice<int>>[];
 
-  void loadWallet() {
+  Future<void> loadWallet() async {
-    wallets = WalletManager.listWallets();
+    wallets = await WalletManager.listWallets();
     if (wallets.isEmpty && mounted) {
       unawaited(
         Navigator.of(context)
@@ -224,7 +224,7 @@ class _GraphViewState extends State<GraphView> {
                     ),
                   ),
                 );
-                wallets = WalletManager.listWallets();
+                wallets = await WalletManager.listWallets();
                 logger.i(wallets.length);
                 selectedWallet = wallets.last;
                 setState(() {});
@@ -250,7 +250,7 @@ class _GraphViewState extends State<GraphView> {
                   )
                       .then((value) async {
                     selectedWallet =
-                        WalletManager.loadWallet(selectedWallet!.name);
+                        await WalletManager.loadWallet(selectedWallet!.name);
                     final s = await SharedPreferences.getInstance();
                     chartType = s.getInt("monthlygraph") ?? 2;
                     setState(() {});

lib/views/home.dart

@@ -63,8 +63,8 @@ class _HomeViewState extends State<HomeView> {
     loadWallet();
   }
 
-  void loadWallet() {
+  Future<void> loadWallet() async {
-    wallets = WalletManager.listWallets();
+    wallets = await WalletManager.listWallets();
     if (wallets.isEmpty && mounted) {
       unawaited(
         Navigator.of(context)
@@ -82,7 +82,7 @@ class _HomeViewState extends State<HomeView> {
     return PopScope(
       canPop: !_searchActive, // don't pop when we just want
       //                        to deactivate searchfield
-      onPopInvokedWithResult: (b, d) {
+      onPopInvoked: (b) {
         if (b) return;
         _searchActive = false;
         _filter = "";
@@ -105,12 +105,13 @@ class _HomeViewState extends State<HomeView> {
                 onTap: () {
                   // debug option to quickly fill a wallet with data
                   if (selectedWallet == null) return;
-                  selectedWallet!.createTestEntries();
+                  selectedWallet!.createTestEntries().then((_) {
-                  Navigator.of(context).pushReplacement(
+                    Navigator.of(context).pushReplacement(
-                    platformRoute(
+                      platformRoute(
-                      (p0) => const HomeView(),
+                        (p0) => const HomeView(),
-                    ),
+                      ),
-                  );
+                    );
+                  });
                 },
               ),
             SpeedDialChild(
@@ -193,7 +194,7 @@ class _HomeViewState extends State<HomeView> {
                       ),
                     ),
                   );
-                  wallets = WalletManager.listWallets();
+                  wallets = await WalletManager.listWallets();
                   selectedWallet = wallets.last;
                   setState(() {});
                   return;
@@ -247,9 +248,9 @@ class _HomeViewState extends State<HomeView> {
                             (context) => const SettingsView(),
                           ),
                         )
-                            .then((value) {
+                            .then((value) async {
-                          wallets = WalletManager.listWallets();
+                          wallets = await WalletManager.listWallets();
-                          selectedWallet = WalletManager.loadWallet(
+                          selectedWallet = await WalletManager.loadWallet(
                             selectedWallet!.name,
                           );
                           setState(() {});
@@ -629,14 +630,11 @@ class _HomeViewState extends State<HomeView> {
               onPressed: () {
                 Navigator.of(context)
                     .push(
-                  platformRoute(
+                      platformRoute(
-                    (c) => const TessdataListView(),
+                        (c) => const TessdataListView(),
-                  ),
+                      ),
-                )
+                    )
-                    .then((value) {
+                    .then((value) => Navigator.of(c).pop());
-                  if (!c.mounted) return;
-                  Navigator.of(c).pop();
-                });
               },
             ),
             PlatformButton(
@@ -743,7 +741,7 @@ class _HomeViewState extends State<HomeView> {
                 );
                 if (newEntry == null) return;
                 selectedWallet!.entries.add(newEntry);
-                WalletManager.saveWallet(selectedWallet!);
+                await WalletManager.saveWallet(selectedWallet!);
                 setState(() {});
               },
               child: const Text("Ok"),

lib/views/initialization_screen.dart

@@ -1,41 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:prasule/api/wallet_manager.dart';
-import 'package:prasule/pw/platformroute.dart';
-import 'package:prasule/views/home.dart';
-import 'package:prasule/views/setup.dart';
-
-class InitializationScreen extends StatefulWidget {
-  const InitializationScreen({super.key});
-
-  @override
-  State<InitializationScreen> createState() => _InitializationScreenState();
-}
-
-class _InitializationScreenState extends State<InitializationScreen> {
-  @override
-  void initState() {
-    super.initState();
-    getApplicationDocumentsDirectory().then((v) {
-      WalletManager.walletPath = v.path;
-      if (!mounted) return;
-      final wallets = WalletManager.listWallets();
-      if (wallets.isEmpty && mounted) {
-        Navigator.of(context)
-            .pushReplacement(platformRoute((c) => const SetupView()));
-        return;
-      }
-      Navigator.of(context)
-          .pushReplacement(platformRoute((c) => const HomeView()));
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return const Scaffold(
-      body: Align(
-        child: CircularProgressIndicator(),
-      ),
-    );
-  }
-}

lib/views/recurring_view.dart

@@ -44,8 +44,8 @@ class _RecurringEntriesViewState extends State<RecurringEntriesView> {
     loadWallet();
   }
 
-  void loadWallet() {
+  Future<void> loadWallet() async {
-    wallets = WalletManager.listWallets();
+    wallets = await WalletManager.listWallets();
     if (wallets.isEmpty && mounted) {
       unawaited(
         Navigator.of(context)
@@ -91,7 +91,7 @@ class _RecurringEntriesViewState extends State<RecurringEntriesView> {
                   ),
                 ),
               );
-              wallets = WalletManager.listWallets();
+              wallets = await WalletManager.listWallets();
               selectedWallet = wallets.last;
               setState(() {});
               return;
@@ -116,7 +116,7 @@ class _RecurringEntriesViewState extends State<RecurringEntriesView> {
                 )
                     .then((value) async {
                   selectedWallet =
-                      WalletManager.loadWallet(selectedWallet!.name);
+                      await WalletManager.loadWallet(selectedWallet!.name);
                 });
               } else if (value == AppLocalizations.of(context).about) {
                 showAbout(context);

lib/views/settings/edit_categories.dart

@@ -39,7 +39,7 @@ class _EditCategoriesViewState extends State<EditCategoriesView> {
   }
 
   Future<void> loadWallet() async {
-    wallets = WalletManager.listWallets();
+    wallets = await WalletManager.listWallets();
     if (wallets.isEmpty && mounted) {
       unawaited(
         Navigator.of(context)
@@ -82,7 +82,7 @@ class _EditCategoriesViewState extends State<EditCategoriesView> {
                   ),
                 ),
               );
-              wallets = WalletManager.listWallets();
+              wallets = await WalletManager.listWallets();
               logger.i(wallets.length);
               selectedWallet = wallets.last;
               setState(() {});
@@ -122,7 +122,7 @@ class _EditCategoriesViewState extends State<EditCategoriesView> {
                   textAlign: TextAlign.center,
                 ),
                 IconButton(
-                  onPressed: () {
+                  onPressed: () async {
                     selectedWallet!.categories.add(
                       WalletCategory(
                         name: AppLocalizations.of(context)
@@ -137,7 +137,7 @@ class _EditCategoriesViewState extends State<EditCategoriesView> {
                         ),
                       ),
                     );
-                    WalletManager.saveWallet(selectedWallet!);
+                    await WalletManager.saveWallet(selectedWallet!);
                     setState(() {});
                   },
                   icon: const Icon(Icons.add),
@@ -206,7 +206,7 @@ class _EditCategoriesViewState extends State<EditCategoriesView> {
                                     ),
                                   ),
                                 );
-                                WalletManager.saveWallet(selectedWallet!);
+                                await WalletManager.saveWallet(selectedWallet!);
                                 setState(() {});
                               },
                               child: Container(
@@ -226,8 +226,8 @@ class _EditCategoriesViewState extends State<EditCategoriesView> {
                             ),
                             trailing: IconButton(
                               icon: const Icon(Icons.cancel),
-                              onPressed: () {
+                              onPressed: () async {
-                                selectedWallet!.removeCategory(
+                                await selectedWallet!.removeCategory(
                                   selectedWallet!.categories[i],
                                 );
                                 setState(() {});
@@ -243,11 +243,11 @@ class _EditCategoriesViewState extends State<EditCategoriesView> {
                                   builder: (c) => AlertDialog.adaptive(
                                     actions: [
                                       TextButton(
-                                        onPressed: () {
+                                        onPressed: () async {
                                           if (controller.text.isEmpty) return;
                                           selectedWallet!.categories[i].name =
                                               controller.text;
-                                          WalletManager.saveWallet(
+                                          await WalletManager.saveWallet(
                                             selectedWallet!,
                                           );
                                           if (!context.mounted) return;

lib/views/settings/settings.dart

@@ -117,7 +117,7 @@ class _SettingsViewState extends State<SettingsView> {
                   description:
                       Text(AppLocalizations.of(context).exportSingleDesc),
                   onPressed: (ctx) async {
-                    final all = WalletManager.listWallets();
+                    final all = await WalletManager.listWallets();
                     if (!ctx.mounted) return;
                     final w = await showAdaptiveDialog<String>(
                       context: ctx,

lib/views/setup.dart

@@ -131,7 +131,7 @@ class _SetupViewState extends State<SetupView> {
             next: Text(AppLocalizations.of(context).next),
             back: Text(AppLocalizations.of(context).back),
             done: Text(AppLocalizations.of(context).finish),
-            onDone: () {
+            onDone: () async {
               if (_nameController.text.isEmpty) {
                 unawaited(
                   showMessage(
@@ -141,7 +141,7 @@ class _SetupViewState extends State<SetupView> {
                 );
                 return;
               }
-              if (WalletManager.exists(_nameController.text) &&
+              if (await WalletManager.exists(_nameController.text) &&
                   context.mounted) {
                 unawaited(
                   showMessage(
@@ -157,7 +157,7 @@ class _SetupViewState extends State<SetupView> {
                 categories: categories,
                 starterBalance: double.parse(_balanceController.text),
               );
-              WalletManager.saveWallet(wallet);
+              await WalletManager.saveWallet(wallet);
 
               if (widget.newWallet && context.mounted) {
                 Navigator.of(context).pop();

pubspec.lock

@@ -409,10 +409,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_tesseract_ocr
-      sha256: a45b76842f9670a3b69a4d1276367926aa8428d33e439e80541e699b7c5fb96b
+      sha256: f6f55804d2c1fe385dba150a2c1c8641e5add2694fdaa72d835aca051f9faa75
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.23"
+    version: "0.4.25"
   flutter_test:
     dependency: "direct dev"
     description: flutter

pubspec.yaml

@@ -28,7 +28,7 @@ dependencies:
     sdk: flutter
   flutter_slidable: ^3.0.0
   flutter_speed_dial: ^7.0.0
-  flutter_tesseract_ocr: 0.4.23
+  flutter_tesseract_ocr: ^0.4.23
   fluttertoast: ^8.2.4
   grouped_list: ^5.1.2
   intl: any