v1.0.7

Merge pull request #422 from dreautall/develop
dreautall · Jul 20, 2024 · ff1f58f · ff1f58f
2 parents 68d3453 + 70d9a1c
commit ff1f58f
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 78 deletions.
diff --git a/fastlane/metadata/android/en-US/changelogs/333.txt b/fastlane/metadata/android/en-US/changelogs/333.txt
@@ -0,0 +1,3 @@
+- Fix for notification amount parsing
+- Fix for selecting bill on transaction
+- Minor bug fixes & version updates
diff --git a/fastlane/metadata/android/version.txt b/fastlane/metadata/android/version.txt
@@ -1,2 +1,2 @@
-versionName=1.0.6
-versionCode=324
+versionName=1.0.7
+versionCode=333
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
@@ -711,6 +711,10 @@
       }
     }
   },
+  "homeTransactionsSettingsShowTags": "Afficher les étiquettes dans la liste des transactions",
+  "@homeTransactionsSettingsShowTags": {
+    "description": "Setting label to show tags in transactioon list."
+  },
   "liabilityDirectionCredit": "On me doit cette dette",
   "@liabilityDirectionCredit": {
     "description": "Firefly Translation String: liability_direction_credit"
@@ -957,14 +961,6 @@
   "@settingsVersionChecking": {
     "description": "Shown while checking for app version"
   },
-  "splashCustomSSLCert": "Certificat SSL personnalisé",
-  "@splashCustomSSLCert": {
-    "description": "Button text & Dialog title for using a custom SSL certificate"
-  },
-  "splashFormLabelCustomSSLCertPEM": "Fichier de certificat (PEM)",
-  "@splashFormLabelCustomSSLCertPEM": {
-    "description": "Label for certificate file text input in PEM format"
-  },
   "transactionAttachments": "Pièces jointes",
   "@transactionAttachments": {
     "description": "Button Label: Attachments"

diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
@@ -1,7 +1,7 @@
 {
   "@@locale": "zh",
   "@@x-reference": true,
-  "accountRoleAssetCashWallet": "现金钱包",
+  "accountRoleAssetCashWallet": "现金",
   "@accountRoleAssetCashWallet": {
     "description": "Firefly Translation String: account_role_cashWalletAsset"
   },
@@ -239,7 +239,7 @@
   "@billsUngrouped": {
     "description": "Title for ungrouped bills"
   },
-  "categoryDeleteConfirm": "您确定要删除这个分类吗？与此分类关联的交易不会被删除，但不再含有此分类。",
+  "categoryDeleteConfirm": "您确定要删除这个分类吗？与该分类关联的账单不会被删除，但该分类将彻底删除。",
   "@categoryDeleteConfirm": {
     "description": "Confirmation text to delete category"
   },

diff --git a/lib/notificationlistener.dart b/lib/notificationlistener.dart
@@ -52,7 +52,7 @@ class NotificationListenerStatus {
 }
 
 final RegExp rFindMoney = RegExp(
-    r'(?:^|\s)(?<preCurrency>(?:[^\r\n\t\f\v 0-9]){0,3})\s*(?<amount>[.,\s\d]+(?:[.,]\d+)?)\s*(?<postCurrency>(?:[^\r\n\t\f\v 0-9]){0,3})(?:$|\s)');
+    r'(?:^|\s)(?<preCurrency>(?:[^\r\n\t\f\v 0-9]){0,3})\s*(?<amount>\d[.,\s\d]+(?:[.,]\d+)?)\s*(?<postCurrency>(?:[^\r\n\t\f\v 0-9]){0,3})(?:$|\s)');
 
 Future<NotificationListenerStatus> nlStatus() async {
   return NotificationListenerStatus(

diff --git a/lib/pages/home/main_charts/category.dart b/lib/pages/home/main_charts/category.dart
@@ -59,7 +59,7 @@ class CategoryChart extends StatelessWidget {
                 color: Theme.of(context).colorScheme.onSurfaceVariant,
               ),
           alignment: ChartAlignment.center,
-          isResponsive: true,
+          isResponsive: false,
         ),
         series: <CircularSeries<LabelAmountChart, String>>[
           PieSeries<LabelAmountChart, String>(

diff --git a/lib/pages/transaction.dart b/lib/pages/transaction.dart
@@ -1930,6 +1930,7 @@ class _TransactionPageState extends State<TransactionPage>
                         onPressed: () async {
                           BillRead? newBill = await showDialog<BillRead>(
                             context: context,
+                            barrierDismissible: false,
                             builder: (BuildContext context) =>
                                 BillDialog(currentBill: _bills[i]),
                           );

diff --git a/lib/pages/transaction/bill.dart b/lib/pages/transaction/bill.dart
@@ -51,6 +51,7 @@ class _BillDialogState extends State<BillDialog> {
       icon: const Icon(Icons.calendar_today),
       title: Text(S.of(context).transactionDialogBillTitle),
       clipBehavior: Clip.hardEdge,
+      scrollable: false,
       actions: <Widget>[
         TextButton(
           child: Text(S.of(context).transactionDialogBillNoBill),
@@ -88,17 +89,19 @@ class _BillDialogState extends State<BillDialog> {
           displayStringForOption: (AutocompleteBill option) => option.name,
           onSelected: (AutocompleteBill option) {
             log.finer(() => "selected bill ${option.id}");
-            _bill = BillRead(
-              type: "bill",
-              id: option.id,
-              attributes: Bill(
-                name: option.name,
-                amountMin: "",
-                amountMax: "",
-                date: DateTime.now(),
-                repeatFreq: BillRepeatFrequency.swaggerGeneratedUnknown,
-              ),
-            );
+            setState(() {
+              _bill = BillRead(
+                type: "bill",
+                id: option.id,
+                attributes: Bill(
+                  name: option.name,
+                  amountMin: "",
+                  amountMax: "",
+                  date: DateTime.now(),
+                  repeatFreq: BillRepeatFrequency.swaggerGeneratedUnknown,
+                ),
+              );
+            });
           },
           optionsBuilder: (TextEditingValue textEditingValue) async {
             try {