feat: add basic sorting (#9)

also made some cosmetic changes elsewhere,

CHANGELOG.md

@@ -4,6 +4,9 @@
 - Placeholder text is now inserted into the field in setup, instead of showing as label
 - Show version text in about dialog
 - Added tessdata license text into about dialog
+- Added sorting by oldest
+- Moved search into three-dot menu
+- Make search case-insensitive
 # 1.0.0-alpha+5
 - Add tests
 - Add searching through entries to homepage

lib/l10n/app_cs.arb

@@ -106,5 +106,9 @@
     "exportCompleted":"Export dokončen",
     "importCompleted":"Import dokončen",
     "setup":"Prvotní nastavení",
-    "sourceCode":"Zdrojový kód"
+    "sourceCode":"Zdrojový kód",
+    "sortNewest":"Nejnovější první",
+    "sortOldest":"Nejstarší první",
+    "sort":"Seřadit",
+    "search":"Prohledat"
 }

lib/l10n/app_en.arb

@@ -222,5 +222,9 @@
     "exportCompleted":"Export completed",
     "importCompleted":"Import completed",
     "setup":"Setup",
-    "sourceCode":"Source code"
+    "sourceCode":"Source code",
+    "sortNewest":"Newest first",
+    "sortOldest":"Oldest first",
+    "sort":"Sort",
+    "search":"Search"
 }

lib/util/sorting.dart

@@ -0,0 +1,58 @@
+import 'package:grouped_list/grouped_list.dart';
+import 'package:intl/intl.dart';
+
+/// Sorts [GroupedListView]'s group by newest group
+int groupSortNewest(String a, String b, String locale) {
+  // TODO: better sorting algorithm lol
+  final yearA = RegExp(r'\d+').firstMatch(a);
+  if (yearA == null) return 0;
+  final yearB = RegExp(r'\d+').firstMatch(b);
+  if (yearB == null) return 0;
+  final compareYears = int.parse(yearB.group(0)!).compareTo(
+    int.parse(yearA.group(0)!),
+  );
+  if (compareYears != 0) {
+    return compareYears;
+  }
+  final months = List<String>.generate(
+    12,
+    (index) => DateFormat.MMMM(locale).format(
+      DateTime(2023, index + 1),
+    ),
+  );
+  final monthA = RegExp('[^0-9 ]+').firstMatch(a);
+  if (monthA == null) return 0;
+  final monthB = RegExp('[^0-9 ]+').firstMatch(b);
+  if (monthB == null) return 0;
+  return months.indexOf(monthB.group(0)!).compareTo(
+        months.indexOf(monthA.group(0)!),
+      );
+}
+
+/// Sorts [GroupedListView]'s group by oldest group
+int groupSortOldest(String a, String b, String locale) {
+  // TODO: better sorting algorithm lol
+  final yearA = RegExp(r'\d+').firstMatch(a);
+  if (yearA == null) return 0;
+  final yearB = RegExp(r'\d+').firstMatch(b);
+  if (yearB == null) return 0;
+  final compareYears = int.parse(yearA.group(0)!).compareTo(
+    int.parse(yearB.group(0)!),
+  );
+  if (compareYears != 0) {
+    return compareYears;
+  }
+  final months = List<String>.generate(
+    12,
+    (index) => DateFormat.MMMM(locale).format(
+      DateTime(2023, index + 1),
+    ),
+  );
+  final monthA = RegExp('[^0-9 ]+').firstMatch(a);
+  if (monthA == null) return 0;
+  final monthB = RegExp('[^0-9 ]+').firstMatch(b);
+  if (monthB == null) return 0;
+  return months.indexOf(monthA.group(0)!).compareTo(
+        months.indexOf(monthB.group(0)!),
+      );
+}

lib/views/home.dart

@@ -24,6 +24,7 @@ import 'package:prasule/pw/platformbutton.dart';
 import 'package:prasule/pw/platformfield.dart';
 import 'package:prasule/pw/platformroute.dart';
 import 'package:prasule/util/drawer.dart';
+import 'package:prasule/util/sorting.dart';
 import 'package:prasule/util/text_color.dart';
 import 'package:prasule/util/utils.dart';
 import 'package:prasule/views/create_entry.dart';
@@ -41,13 +42,15 @@ class HomeView extends StatefulWidget {
 }
 
 class _HomeViewState extends State<HomeView> {
-  Wallet? selectedWallet;
+  Wallet? selectedWallet; // current wallet
-  List<Wallet> wallets = [];
+  List<Wallet> wallets = []; // all available wallets
   DateTime? prevDate;
-  late String locale;
+  late String locale; // user's locale
-  var _searchActive = false;
+  var _searchActive = false; // whether search field is shown
-  var _filter = "";
+  var _filter = ""; // search filter
   final searchFocus = FocusNode();
+  var sort = SortType.newest;
+
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
@@ -191,21 +194,42 @@ class _HomeViewState extends State<HomeView> {
               },
             ),
           ),
-          actions: [
+          actions: _searchActive
-            if (!_searchActive)
+              ? []
-              IconButton(
+              : [
-                onPressed: () {
+                  PopupMenuButton(
-                  _searchActive = true;
+                    tooltip: AppLocalizations.of(context).sort,
-                  setState(() {});
+                    icon: const Icon(Icons.sort_rounded),
-                },
+                    itemBuilder: (context) => [
-                icon: const Icon(Icons.search),
+                      AppLocalizations.of(context).sortNewest,
+                      AppLocalizations.of(context).sortOldest,
+                    ]
+                        .map(
+                          (e) => PopupMenuItem(
+                            value: e,
+                            child: Text(e),
+                          ),
+                        )
+                        .toList(),
+                    onSelected: (value) {
+                      if (value == AppLocalizations.of(context).sortNewest) {
+                        sort = SortType.newest;
+                        setState(() {});
+                      } else if (value ==
+                          AppLocalizations.of(context).sortOldest) {
+                        sort = SortType.oldest;
+                        setState(() {});
+                      }
+                    },
                   ),
-            if (!_searchActive)
                   PopupMenuButton(
                     itemBuilder: (context) => [
                       AppLocalizations.of(context).settings,
+                      AppLocalizations.of(context).search,
                       AppLocalizations.of(context).about,
-                ].map((e) => PopupMenuItem(value: e, child: Text(e))).toList(),
+                    ]
+                        .map((e) => PopupMenuItem(value: e, child: Text(e)))
+                        .toList(),
                     onSelected: (value) {
                       if (value == AppLocalizations.of(context).settings) {
                         Navigator.of(context)
@@ -216,11 +240,17 @@ class _HomeViewState extends State<HomeView> {
                         )
                             .then((value) async {
                           wallets = await WalletManager.listWallets();
-                      selectedWallet =
+                          selectedWallet = await WalletManager.loadWallet(
-                          await WalletManager.loadWallet(selectedWallet!.name);
+                              selectedWallet!.name);
                         });
                       } else if (value == AppLocalizations.of(context).about) {
                         showAbout(context);
+                      } else if (value == AppLocalizations.of(context).search) {
+                        _searchActive = !_searchActive;
+                        if (!_searchActive) {
+                          _filter = "";
+                        }
+                        setState(() {});
                       }
                     },
                   ),
@@ -354,47 +384,20 @@ class _HomeViewState extends State<HomeView> {
                                     elements: selectedWallet!.entries
                                         .where(
                                           (element) => element.data.name
-                                              .contains(_filter),
+                                              .toLowerCase()
+                                              .contains(_filter.toLowerCase()),
                                         )
                                         .toList(),
                                     itemComparator: (a, b) =>
-                                        b.date.compareTo(a.date),
+                                        (sort == SortType.newest)
+                                            ? b.date.compareTo(a.date)
+                                            : a.date.compareTo(b.date),
                                     groupBy: (e) =>
                                         DateFormat.yMMMM(locale).format(e.date),
-                                    groupComparator: (a, b) {
+                                    groupComparator: (a, b) =>
-                                      // TODO: better sorting algorithm lol
+                                        (sort == SortType.newest)
-                                      final yearA =
+                                            ? groupSortNewest(a, b, locale)
-                                          RegExp(r'\d+').firstMatch(a);
+                                            : groupSortOldest(a, b, locale),
-                                      if (yearA == null) return 0;
-                                      final yearB =
-                                          RegExp(r'\d+').firstMatch(b);
-                                      if (yearB == null) return 0;
-                                      final compareYears =
-                                          int.parse(yearB.group(0)!).compareTo(
-                                        int.parse(yearA.group(0)!),
-                                      );
-                                      if (compareYears != 0) {
-                                        return compareYears;
-                                      }
-                                      final months = List<String>.generate(
-                                        12,
-                                        (index) =>
-                                            DateFormat.MMMM(locale).format(
-                                          DateTime(2023, index + 1),
-                                        ),
-                                      );
-                                      final monthA =
-                                          RegExp('[^0-9 ]+').firstMatch(a);
-                                      if (monthA == null) return 0;
-                                      final monthB =
-                                          RegExp('[^0-9 ]+').firstMatch(b);
-                                      if (monthB == null) return 0;
-                                      return months
-                                          .indexOf(monthB.group(0)!)
-                                          .compareTo(
-                                            months.indexOf(monthA.group(0)!),
-                                          );
-                                    },
                                     itemBuilder: (context, element) => Slidable(
                                       endActionPane: ActionPane(
                                         motion: const ScrollMotion(),
@@ -760,3 +763,12 @@ class _HomeViewState extends State<HomeView> {
     );
   }
 }
+
+/// Represents entry sorting type
+enum SortType {
+  /// Sort newest first
+  newest,
+
+  /// Sort oldest first
+  oldest
+}

lib/views/setup.dart

@@ -57,6 +57,7 @@ class _SetupViewState extends State<SetupView> {
   void didChangeDependencies() {
     super.didChangeDependencies();
     if (categories.isEmpty) {
+      name = AppLocalizations.of(context).setupNamePlaceholder;
       categories = [
         WalletCategory(
           name: AppLocalizations.of(context).noCategory,