Merge pull request #621 from flow-mn:develop

sadespresso · web-flow · commit 91cce2229d43 · 2025-12-17T11:47:00.000+08:00
RC: 0.16.6
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,28 +1,39 @@
 # Changelog
 
+## 0.16.6
+
+### New features
+
+* Now you can select categories when exporting PDFs
+* New theme: Monochrome for those who resemble Wednesday
+
+### Fixes
+
+* Android widget now opens the app (I'm really sorry, it was working when I tested)
+
 ## 0.16.5
 
-## New features
+### New features
 
 * Now we have our initial widget for Android, yey!
 * Home widgets now respects the Button Order settings.
 * Long-pressing on a date will prompt you to create a new transaction,
   closes [#617](https://github.com/flow-mn/flow/issues/617)
 
-## Fixes
+### Fixes
 
 * Text selection is now transparent in the markdown editor
 
 ## 0.16.4
 
-## New features
+### New features
 
 * Now we have a very basic iOS widget, which I plan to improve later, part of
   [#411](https://github.com/flow-mn/flow/issues/411)
 * Now you can search accounts in the accounts tab if you have more than
   4 accounts, closes [#607](https://github.com/flow-mn/flow/issues/607)
 
-## Fixes
+### Fixes
 
 * Fixed setup preset accounts always having USD currency thanks to Duluu
 * Fixed long text getting clipped in home screen actionable reminders [#608](https://github.com/flow-mn/flow/issues/608)
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -39,6 +39,9 @@
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
+      <intent-filter>
+        <action android:name="es.antonborri.home_widget.action.LAUNCH" />
+      </intent-filter>
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
 
@@ -57,8 +60,6 @@
     <meta-data
       android:name="flutterEmbedding"
       android:value="2" />
-
-
     <receiver
       android:exported="false"
       android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />
@@ -75,7 +76,6 @@
     <receiver
       android:exported="false"
       android:name="com.dexterous.flutterlocalnotifications.ActionBroadcastReceiver" />
-
     <receiver
       android:name=".glance.TwoEntryReceiver"
       android:exported="true">
@@ -86,7 +86,6 @@
         android:name="android.appwidget.provider"
         android:resource="@xml/two_entry_widget_info" />
     </receiver>
-
     <provider
       android:name="androidx.core.content.FileProvider"
       android:authorities="${applicationId}.provider"
@@ -97,4 +96,4 @@
         android:resource="@xml/provider_paths" />
     </provider>
   </application>
-</manifest>
+</manifest>
diff --git a/android/app/src/main/kotlin/mn/flow/flow/glance/TwoEntry.kt b/android/app/src/main/kotlin/mn/flow/flow/glance/TwoEntry.kt
@@ -37,7 +37,6 @@ import androidx.glance.preview.Preview
 import androidx.glance.state.GlanceStateDefinition
 import mn.flow.flow.R
 import java.util.Locale.getDefault
-import kotlin.math.min
 
 class TwoEntry : GlanceAppWidget() {
   override val sizeMode = SizeMode.Exact
@@ -97,14 +96,13 @@ private fun Content(context: Context, currentState: HomeWidgetGlanceState) {
               .width(buttonSize)
               .height(buttonSize)
               .cornerRadius(999.dp)
-              .clickable {
-                actionStartActivity(
-                  Intent(
-                    Intent.ACTION_VIEW,
-                    "flow-mn:///transaction/new?type=${operation}".toUri()
-                  )
+              .clickable(
+                onClick = actionStartActivity(
+                  Intent(Intent.ACTION_VIEW, "flow-mn:///transaction/new?type=${operation}".toUri()).apply {
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                  }
                 )
-              },
+              ),
             contentAlignment = Alignment.Center
           ) {
             Image(
diff --git a/assets/l10n/ar.json b/assets/l10n/ar.json
@@ -493,6 +493,8 @@
   "sync.export.onDeviceWarning": "جميع النسخ الاحتياطية مخزنة على الجهاز، مما يعني أنه عند إلغاء تثبيت Flow أو إعادة ضبط جهازك، ستختفي جميع النسخ الاحتياطية!",
   "sync.export.pdf.accounts": "الحسابات",
   "sync.export.pdf.accounts.selected": "تم اختيار {n} (من أصل {total})",
+  "sync.export.pdf.categories": "الفئات",
+  "sync.export.pdf.categories.selected": "المختارة {n} (من أصل {total})",
   "sync.export.pdf.header": "Flow - السجلات المالية الشخصية (غير رسمية، {range})",
   "sync.export.pdf.notice[0]": "تم الإنشاء بواسطة ",
   "sync.export.pdf.notice[1]": ". هذا ليس مستندًا قانونيًا. هذا ليس بيانًا ماليًا. هذه ليست إيصالًا. هذا لا يمثل الواقع بأي شكل من الأشكال. هذا مخصص للاستخدام الشخصي فقط.",
diff --git a/assets/l10n/cs_CZ.json b/assets/l10n/cs_CZ.json
@@ -493,6 +493,8 @@
   "sync.export.onDeviceWarning": "Všechny zálohy jsou uloženy na zařízení. Pokud aplikaci Flow odinstalujete nebo resetujete zařízení, všechny zálohy budou ztraceny!",
   "sync.export.pdf.accounts": "Účty",
   "sync.export.pdf.accounts.selected": "Vybráno {n} z {total}",
+  "sync.export.pdf.categories": "Kategorie",
+  "sync.export.pdf.categories.selected": "Vybráno {n} (z {total})",
   "sync.export.pdf.header": "Flow - Osobní finanční záznamy (neoficiální, {range})",
   "sync.export.pdf.notice[0]": "Vytvořeno pomocí ",
   "sync.export.pdf.notice[1]": ". Toto není právní dokument, finanční výkaz ani účtenka. Je určeno pouze pro osobní použití.",
diff --git a/assets/l10n/de_DE.json b/assets/l10n/de_DE.json
@@ -493,6 +493,8 @@
   "sync.export.onDeviceWarning": "Alle Sicherungen werden auf deinem Gerät gespeichert. Das heißt, wenn du Flow deinstallierst oder dein Gerät zurücksetzt, sind alle Sicherungen weg!",
   "sync.export.pdf.accounts": "Konten",
   "sync.export.pdf.accounts.selected": "Ausgewählt {n} (von {total})",
+  "sync.export.pdf.categories": "Kategorien",
+  "sync.export.pdf.categories.selected": "Ausgewählt: {n} (von {total})",
   "sync.export.pdf.header": "Flow - Persönliche Finanzaufzeichnungen (inoffiziell, {range})",
   "sync.export.pdf.notice[0]": "Erstellt von ",
   "sync.export.pdf.notice[1]": ". Dies ist kein rechtliches Dokument. Dies ist keine Finanzaufstellung. Dies ist keine Quittung. Dies stellt in keiner Weise die Realität dar. Es ist ausschließlich für den persönlichen Gebrauch bestimmt.",
diff --git a/assets/l10n/en.json b/assets/l10n/en.json
@@ -493,6 +493,8 @@
   "sync.export.onDeviceWarning": "All backups are stored on-device, meaning when you uninstall Flow or reset your device, all the backups will be gone!",
   "sync.export.pdf.accounts": "Accounts",
   "sync.export.pdf.accounts.selected": "Selected {n} (out of {total})",
+  "sync.export.pdf.categories": "Categories",
+  "sync.export.pdf.categories.selected": "Selected {n} (out of {total})",
   "sync.export.pdf.header": "Flow - Personal financial records (unofficial, {range})",
   "sync.export.pdf.notice[0]": "Generated by ",
   "sync.export.pdf.notice[1]": ". This is not a legal document. This is not a financial statement. This is not a receipt. This is not a representation of reality in any way or form. This is meant for personal use only.",
diff --git a/assets/l10n/es_ES.json b/assets/l10n/es_ES.json
@@ -493,6 +493,8 @@
   "sync.export.onDeviceWarning": "¡Todas las copias de seguridad se almacenan en el dispositivo, lo que significa que si desinstalas Flow o restableces tu dispositivo, todas las copias de seguridad se perderán!",
   "sync.export.pdf.accounts": "Cuentas",
   "sync.export.pdf.accounts.selected": "Seleccionadas {n} (de {total})",
+  "sync.export.pdf.categories": "Categorías",
+  "sync.export.pdf.categories.selected": "Seleccionadas {n} (de {total})",
   "sync.export.pdf.header": "Flow - Registros financieros personales (no oficial, {range})",
   "sync.export.pdf.notice[0]": "Generado por ",
   "sync.export.pdf.notice[1]": ". Este no es un documento legal. Esto no es un estado financiero. Esto no es un recibo. Esto no representa la realidad de ninguna manera o forma. Está destinado únicamente para uso personal.",
diff --git a/assets/l10n/fr_FR.json b/assets/l10n/fr_FR.json
@@ -493,6 +493,8 @@
   "sync.export.onDeviceWarning": "Toutes les sauvegardes sont stockées sur l'appareil, ce qui signifie que lorsque vous désinstallez Flow ou réinitialisez votre appareil, toutes les sauvegardes seront perdues!",
   "sync.export.pdf.accounts": "Comptes",
   "sync.export.pdf.accounts.selected": "Sélectionné {n} (sur {total})",
+  "sync.export.pdf.categories": "Catégories",
+  "sync.export.pdf.categories.selected": "Sélectionné(s) {n} (sur {total})",
   "sync.export.pdf.header": "Flow - Registres financiers personnels (non officiel, {range})",
   "sync.export.pdf.notice[0]": "Généré par ",
   "sync.export.pdf.notice[1]": ". Ce document n'est pas légal. Ce n'est pas un relevé financier. Ce n'est pas un reçu. Ce document ne représente en aucun cas la réalité. Il est destiné uniquement à un usage personnel.",
diff --git a/assets/l10n/it_IT.json b/assets/l10n/it_IT.json
@@ -493,6 +493,8 @@
   "sync.export.onDeviceWarning": "Tutti i backup sono memorizzati sul dispositivo, il che significa che quando disinstalli Flow o reimposti il tuo dispositivo, tutti i backup saranno persi!",
   "sync.export.pdf.accounts": "Conti",
   "sync.export.pdf.accounts.selected": "Selezionati {n} (su {total})",
+  "sync.export.pdf.categories": "Categorie",
+  "sync.export.pdf.categories.selected": "Selezionate {n} (di {total})",
   "sync.export.pdf.header": "Flow - Registri finanziari personali (non ufficiale, {range})",
   "sync.export.pdf.notice[0]": "Generato da ",
   "sync.export.pdf.notice[1]": ". Questo non è un documento legale. Questo non è un estratto conto. Questa non è una ricevuta. Questo non rappresenta in alcun modo la realtà. È destinato esclusivamente a uso personale.",
diff --git a/assets/l10n/mn_MN.json b/assets/l10n/mn_MN.json
@@ -493,6 +493,8 @@
   "sync.export.onDeviceWarning": "Таны нөөцөлсөн өгөгдөл аппыг устгах болон утасны өгөгдлийг шинэчлэх үед хамт устахыг анхаарна уу!",
   "sync.export.pdf.accounts": "Дансууд",
   "sync.export.pdf.accounts.selected": "Сонгосон {n}, (нийт {total})",
+  "sync.export.pdf.categories": "Ангилалууд",
+  "sync.export.pdf.categories.selected": "Сонгосон {n}, (нийт {total})",
   "sync.export.pdf.header": "Flow - Гүйлгээний түүх (албан бус , {range})",
   "sync.export.pdf.notice[0]": "Үүсгэсэн: ",
   "sync.export.pdf.notice[1]": ". Энэ нь хууль ёсны баримт бичиг биш юм. Энэ нь санхүүгийн тайлан биш юм. Энэ нь ямар нэгэн байдлаар бодит байдлыг илэрхийлэхгүй болно. Зөвхөн хувийн хэрэглээнд зориулагдсан болно.",
diff --git a/assets/l10n/ru_RU.json b/assets/l10n/ru_RU.json
@@ -493,6 +493,8 @@
   "sync.export.onDeviceWarning": "Все резервные копии хранятся на устройстве, что означает, что при удалении Flow или сбросе устройства все резервные копии будут удалены!",
   "sync.export.pdf.accounts": "Счета",
   "sync.export.pdf.accounts.selected": "Выбрано {n} (из {total})",
+  "sync.export.pdf.categories": "Категории",
+  "sync.export.pdf.categories.selected": "Выбрано {n} из {total}",
   "sync.export.pdf.header": "Flow - Личные финансовые записи (неофициально, {range})",
   "sync.export.pdf.notice[0]": "Создано с помощью ",
   "sync.export.pdf.notice[1]": ". Это не является юридическим документом. Это не является финансовым отчетом. Это не является квитанцией. Это не представляет реальность ни в каком виде. Это предназначено только для личного использования.",
diff --git a/assets/l10n/tr_TR.json b/assets/l10n/tr_TR.json
@@ -493,6 +493,8 @@
   "sync.export.onDeviceWarning": "Tüm yedeklemeler cihazda saklanır, yani Flow'u kaldırdığınızda veya cihazınızı sıfırladığınızda tüm yedeklemeler kaybolacaktır!",
   "sync.export.pdf.accounts": "Hesaplar",
   "sync.export.pdf.accounts.selected": "Seçilen {n} (toplam {total})",
+  "sync.export.pdf.categories": "Kategoriler",
+  "sync.export.pdf.categories.selected": "Seçilen {n} (toplam {total} içinden)",
   "sync.export.pdf.header": "Flow - Kişisel finansal kayıtlar (resmi olmayan, {range})",
   "sync.export.pdf.notice[0]": "Tarafından oluşturuldu ",
   "sync.export.pdf.notice[1]": ". Bu bir yasal belge değildir. Bu bir finansal tablo değildir. Bu bir makbuz değildir. Bu hiçbir şekilde gerçeği temsil etmez. Bu yalnızca kişisel kullanım için tasarlanmıştır.",
diff --git a/assets/l10n/uk_UA.json b/assets/l10n/uk_UA.json
@@ -493,6 +493,8 @@
   "sync.export.onDeviceWarning": "Усі резервні копії зберігаються на пристрої, що означає, що при видаленні Flow або скиданні пристрою всі резервні копії будуть видалені!",
   "sync.export.pdf.accounts": "Рахунки",
   "sync.export.pdf.accounts.selected": "Вибрано {n} (з {total})",
+  "sync.export.pdf.categories": "Категорії",
+  "sync.export.pdf.categories.selected": "Вибрано {n} (із {total})",
   "sync.export.pdf.header": "Flow - Особисті фінансові записи (неофіційно, {range})",
   "sync.export.pdf.notice[0]": "Створено за допомогою ",
   "sync.export.pdf.notice[1]": ". Це не є юридичним документом. Це не є фінансовою звітністю. Це не є квитанцією. Це жодним чином не відображає реальність. Це призначено лише для особистого використання.",
diff --git a/lib/routes.dart b/lib/routes.dart
@@ -62,7 +62,11 @@ import "package:flutter/material.dart";
 import "package:go_router/go_router.dart";
 import "package:moment_dart/moment_dart.dart";
 
-final router = GoRouter(
+final GlobalKey<NavigatorState> globalNavigatorKey =
+    GlobalKey<NavigatorState>();
+
+final GoRouter router = GoRouter(
+  navigatorKey: globalNavigatorKey,
   errorBuilder: (context, state) => ErrorPage(error: state.error?.toString()),
   routes: [
     GoRoute(path: "/", builder: (context, state) => const HomePage()),
diff --git a/lib/routes/export/export_pdf_page.dart b/lib/routes/export/export_pdf_page.dart
@@ -1,5 +1,8 @@
 import "package:flow/entity/account.dart";
+import "package:flow/entity/category.dart";
 import "package:flow/l10n/extensions.dart";
+import "package:flow/objectbox.dart";
+import "package:flow/objectbox/actions.dart";
 import "package:flow/services/accounts.dart";
 import "package:flow/sync/export/export_pdf.dart";
 import "package:flow/widgets/general/button.dart";
@@ -10,7 +13,8 @@ import "package:flow/widgets/general/modal_sheet.dart";
 import "package:flow/widgets/general/spinner.dart";
 import "package:flow/widgets/transaction_filter_head/select_multi_account_sheet.dart";
 import "package:flow/utils/time_and_range.dart";
-import "package:flutter/foundation.dart";
+import "package:flow/widgets/transaction_filter_head/select_multi_category_sheet.dart";
+import "package:flutter/foundation.dart" hide Category;
 import "package:flutter/material.dart";
 import "package:go_router/go_router.dart";
 import "package:material_symbols_icons/symbols.dart";
@@ -26,6 +30,10 @@ class ExportPdfPage extends StatefulWidget {
 class _ExportPdfPageState extends State<ExportPdfPage> {
   final List<Account> _accounts = [];
   final Set<String> _selectedAccounts = {};
+
+  final List<Category> _categories = [];
+  final Set<String> _selectedCategories = {};
+
   bool _useA4 = true;
   TimeRange _range = TimeRange.allTime();
 
@@ -46,6 +54,9 @@ class _ExportPdfPageState extends State<ExportPdfPage> {
   void initState() {
     super.initState();
 
+    _categories.addAll(ObjectBox().getCategories());
+    _selectedCategories.addAll(_categories.map((category) => category.uuid));
+
     AccountsService()
         .getAll()
         .then((accounts) {
@@ -119,6 +130,18 @@ class _ExportPdfPageState extends State<ExportPdfPage> {
                   onTap: _selectAccounts,
                   trailing: DirectionalChevron(),
                 ),
+                ListTile(
+                  leading: Icon(Symbols.category_rounded),
+                  title: Text("sync.export.pdf.categories".t(context)),
+                  subtitle: Text(
+                    "sync.export.pdf.categories.selected".tr({
+                      "n": _selectedCategories.length.toString(),
+                      "total": _categories.length.toString(),
+                    }),
+                  ),
+                  onTap: _selectCategories,
+                  trailing: DirectionalChevron(),
+                ),
                 ListTile(
                   leading: Icon(Symbols.schedule_rounded),
                   title: Text("sync.export.pdf.timeRange".t(context)),
@@ -170,6 +193,24 @@ class _ExportPdfPageState extends State<ExportPdfPage> {
     });
   }
 
+  void _selectCategories() async {
+    final List<Category>? selected = await showModalBottomSheet(
+      context: context,
+      builder: (context) => SelectMultiCategorySheet(
+        categories: _categories,
+        selectedUuids: _selectedCategories.toList(),
+      ),
+      isScrollControlled: true,
+    );
+
+    if (selected == null) return;
+
+    setState(() {
+      _selectedCategories.clear();
+      _selectedCategories.addAll(selected.map((category) => category.uuid));
+    });
+  }
+
   void _selectRange() async {
     final TimeRange? newRange = await showTimeRangePickerSheet(context);
 
@@ -219,6 +260,9 @@ class _ExportPdfPageState extends State<ExportPdfPage> {
         whitelistedAccounts: _accounts
             .where((account) => _selectedAccounts.contains(account.uuid))
             .toList(),
+        whitelistedCategories: _categories
+            .where((category) => _selectedCategories.contains(category.uuid))
+            .toList(),
         useA4: _useA4,
       ),
     );
diff --git a/lib/routes/home_page.dart b/lib/routes/home_page.dart
@@ -6,6 +6,7 @@ import "package:flow/entity/account.dart";
 import "package:flow/entity/transaction.dart";
 import "package:flow/objectbox.dart";
 import "package:flow/prefs/local_preferences.dart";
+import "package:flow/routes.dart";
 import "package:flow/routes/home/accounts_tab.dart";
 import "package:flow/routes/home/home_tab.dart";
 import "package:flow/routes/home/profile_tab.dart";
@@ -60,7 +61,7 @@ class _HomePageState extends State<HomePage>
       });
     });
 
-    Future.delayed(const Duration(milliseconds: 200)).then((_) {
+    Future.delayed(const Duration(milliseconds: 250)).then((_) {
       if (!mounted) return;
 
       NavigationService().pendingStack.addListener(
@@ -233,10 +234,20 @@ class _HomePageState extends State<HomePage>
   }
 
   Future<bool> _consumePendingNavigation(String path) async {
-    if (!mounted) return false;
-
     try {
-      unawaited(context.push(path));
+      final BuildContext? globalNavigatorContext =
+          globalNavigatorKey.currentState?.context;
+      if (globalNavigatorContext == null) {
+        throw "Global navigator context is null";
+      }
+
+      final goRouter = GoRouter.maybeOf(globalNavigatorContext);
+      if (goRouter == null) {
+        throw "GoRouter is null";
+      }
+
+      goRouter.go(path);
+
       return true;
     } catch (e) {
       return false;
diff --git a/lib/services/navigation.dart b/lib/services/navigation.dart
diff --git a/lib/sync/export/export_pdf.dart b/lib/sync/export/export_pdf.dart
diff --git a/lib/theme/color_themes/monochrome.dart b/lib/theme/color_themes/monochrome.dart
diff --git a/lib/theme/color_themes/registry.dart b/lib/theme/color_themes/registry.dart
diff --git a/lib/theme/names.dart b/lib/theme/names.dart
diff --git a/pubspec.yaml b/pubspec.yaml
