Fix date extraction

Reviewed-on: #47

.drone.yml

@@ -4,9 +4,17 @@ type: docker
 name: default
 
 steps:
+# Needs a full git clone
+- name: fetch
+  image: alpine/git
+  commands:
+  - git fetch --tags
+
 # Frontend
 - name: web_build
   image: node:23
+  depends_on:
+  - fetch
   volumes:
     - name: web_app
       path: /tmp/web_build
@@ -20,6 +28,8 @@ steps:
 # Backend
 - name: backend_fetch_deps
   image: rust
+  depends_on:
+  - fetch
   volumes:
     - name: rust_registry
       path: /usr/local/cargo/registry
@@ -54,6 +64,9 @@ steps:
 
 - name: backend_build
   image: rust
+  when:
+    event:
+      - tag
   volumes:
   - name: rust_registry
     path: /usr/local/cargo/registry
@@ -72,12 +85,58 @@ steps:
   - ls -lah target/release/moneymgr_backend target/release/examples/api_curl
   - cp target/release/moneymgr_backend target/release/examples/api_curl /tmp/release
 
+# Mobile app code quality
+- name: mobile_app_code_quality
+  image: ghcr.io/cirruslabs/flutter:latest
+  depends_on:
+  - fetch
+  commands:
+  - echo "Build version:" $(git describe --tags --abbrev=0)
+  - echo "Build number:" $(git rev-list --count $(git describe --tags --abbrev=0))
+  - cd moneymgr_mobile
+  - flutter --disable-analytics
+  - flutter pub get --enforce-lockfile
+  - dart run build_runner build
+  - flutter analyze
+
+# Mobile app build
+- name: mobile_app_build
+  image: ghcr.io/cirruslabs/flutter:latest
+  depends_on:
+  - backend_build # prevent synchronous backend & frontend build
+  - mobile_app_code_quality
+  when:
+    event:
+      - tag
+  environment:
+    JKS_KEYSTORE:
+      from_secret: JKS_KEYSTORE
+    JKS_KEYSTORE_PASSWORD:
+      from_secret: JKS_KEYSTORE_PASSWORD
+  volumes:
+  - name: release
+    path: /tmp/release
+  commands:
+  - cd moneymgr_mobile
+  - flutter --disable-analytics
+  - bash android/ci_write_keystore.sh
+  - flutter pub get --enforce-lockfile
+  - dart run build_runner build
+  - flutter build apk
+    --release
+    --flavor publish
+    --build-name $(git describe --tags --abbrev=0)
+    --split-per-abi
+    --target-platform android-arm64
+    --build-number $(git rev-list --count $(git describe --tags --abbrev=0))
+  - cp build/app/outputs/flutter-apk/app-arm64-v8a-publish-release.apk /tmp/release/moneymgr_mobile_arm64-v8a.apk
 
 # Release
 - name: gitea_release
   image: plugins/gitea-release
   depends_on:
   - backend_build
+  - mobile_app_build
   when:
     event:
       - tag

moneymgr_backend/Cargo.lock

@@ -3232,9 +3232,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.141"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3"
 dependencies = [
  "itoa",
  "memchr",

moneymgr_backend/Cargo.toml

@@ -22,7 +22,7 @@ rust-s3 = "0.36.0-beta.2"
 thiserror = "2.0.12"
 tokio = "1.45.1"
 futures-util = "0.3.31"
-serde_json = "1.0.140"
+serde_json = "1.0.141"
 light-openid = "1.0.4"
 rand = "0.9.1"
 ipnet = { version = "2.11.0", features = ["serde"] }

moneymgr_backend/src/extractors/auth_extractor.rs

@@ -56,7 +56,7 @@ impl FromRequest for AuthExtractor {
         };
 
         Box::pin(async move {
-            // Check for authentication using OpenID
+            // Check for authentication using API token
             if let Some(token) = req.headers().get(constants::API_TOKEN_HEADER) {
                 let Ok(jwt_token) = token.to_str() else {
                     return Err(actix_web::error::ErrorBadRequest(

moneymgr_mobile/android/.gitignore

@@ -1,3 +1,5 @@
+publish_key.properties
+
 gradle-wrapper.jar
 /.gradle
 /captures/

moneymgr_mobile/android/README.md

@@ -0,0 +1,8 @@
+# Android version of application
+
+Generate keystore:
+
+```bash
+keytool -genkey -v -keystore ./keystore.jks -keyalg RSA \
+        -keysize 2048 -validity 20000 -alias moneymgr
+```

moneymgr_mobile/android/app/build.gradle.kts

@@ -1,3 +1,6 @@
+import java.util.Properties
+import java.io.FileInputStream
+
 plugins {
     id("com.android.application")
     id("kotlin-android")
@@ -5,6 +8,12 @@ plugins {
     id("dev.flutter.flutter-gradle-plugin")
 }
 
+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("publish_key.properties")
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+}
+
 android {
     namespace = "org.communiquons.moneymgr"
     compileSdk = flutter.compileSdkVersion
@@ -21,7 +30,6 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId = "org.communiquons.moneymgr"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
@@ -31,13 +39,34 @@ android {
         versionName = flutter.versionName
     }
 
+    signingConfigs {
+        create("publish") {
+            keyAlias = keystoreProperties["keyAlias"] as String
+            keyPassword = keystoreProperties["keyPassword"] as String
+            storeFile = keystoreProperties["storeFile"]?.let { file(it) }
+            storePassword = keystoreProperties["storePassword"] as String
+        }
+    }
+
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
+            // signingConfig = signingConfigs.getByName("debug")
-            // Signing with the debug keys for now, so `flutter run --release` works.
+        }
+    }
+
+    flavorDimensions += "default"
+    productFlavors {
+        create("development") {
+            dimension = "default"
+            applicationIdSuffix = ".debug"
             signingConfig = signingConfigs.getByName("debug")
         }
+        create("publish") {
+            dimension = "default"
+            signingConfig = signingConfigs.getByName("publish")
         }
+    }
+
 }
 
 flutter {

moneymgr_mobile/android/app/src/debug/AndroidManifest.xml

@@ -1,4 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
@@ -6,5 +7,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <!-- In debug mode, unsecure traffic is permitted -->
-    <application android:usesCleartextTraffic="true" />
+    <application
+        android:label="MoneyMgr Debug"
+        android:usesCleartextTraffic="true"
+        tools:replace="android:label" />
 </manifest>

moneymgr_mobile/android/app/src/publish/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:allowBackup="false"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="false" />
+</manifest>

moneymgr_mobile/android/app/src/publish/res/xml/data_extraction_rules.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup>
+        <exclude domain="root" />
+        <exclude domain="file" />
+        <exclude domain="database" />
+        <exclude domain="sharedpref" />
+        <exclude domain="external" />
+    </cloud-backup>
+    <device-transfer>
+        <exclude domain="root" />
+        <exclude domain="file" />
+        <exclude domain="database" />
+        <exclude domain="sharedpref" />
+        <exclude domain="external" />
+    </device-transfer>
+</data-extraction-rules>

moneymgr_mobile/android/ci_write_keystore.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+SCRIPT_DIR="$(temp=$( realpath "$0"  ) && dirname "$temp")"
+
+KEYSTORE_PATH="$SCRIPT_DIR/keystore.jks"
+PROPERTIES_PATH="$SCRIPT_DIR/publish_key.properties"
+
+echo Keystore path : $KEYSTORE_PATH
+echo Properties path : $PROPERTIES_PATH
+
+[ ! -n "$JKS_KEYSTORE" ] && echo 'Missing JKS_KEYSTORE variable!'&& exit 1
+[ ! -n "$JKS_KEYSTORE_PASSWORD" ] && echo 'Missing JKS_KEYSTORE_PASSWORD variable!' && exit 1
+
+# Write keystore
+echo $JKS_KEYSTORE | base64 -d > "$KEYSTORE_PATH"
+
+# Write keystore config
+cat > "$PROPERTIES_PATH" <<_EOF
+storePassword=$JKS_KEYSTORE_PASSWORD
+keyPassword=$JKS_KEYSTORE_PASSWORD
+keyAlias=moneymgr
+storeFile=$KEYSTORE_PATH
+_EOF

moneymgr_mobile/android/publish_key.properties.sample

@@ -0,0 +1,4 @@
+storePassword=<password-from-previous-step>
+keyPassword=<password-from-previous-step>
+keyAlias=upload
+storeFile=<keystore-file-location>

moneymgr_mobile/lib/routes/scan/scan_screen.dart

@@ -1,45 +1,29 @@
-import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:logging/logging.dart';
 import 'package:moneymgr_mobile/services/storage/expenses.dart';
+import 'package:moneymgr_mobile/services/storage/prefs.dart';
+import 'package:moneymgr_mobile/utils/ocr_utils.dart';
+import 'package:moneymgr_mobile/utils/pdf_utils.dart';
 import 'package:moneymgr_mobile/widgets/expense_editor.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:scanbot_sdk/scanbot_sdk.dart';
-import 'package:scanbot_sdk/scanbot_sdk_ui_v2.dart' hide IconButton, EdgeInsets;
 
 part 'scan_screen.g.dart';
 
 /// Scan a document & return generated PDF as byte file
 @riverpod
-Future<Uint8List?> _scanDocument(Ref ref) async {
+Future<(Uint8List?, BaseExpenseInfo?)> _scanDocument(Ref ref) async {
-  var configuration = DocumentScanningFlow(
+  final prefs = ref.watch(prefsProvider).requireValue;
-    appearance: DocumentFlowAppearanceConfiguration(
-      statusBarMode: StatusBarMode.DARK,
-    ),
-    cleanScanningSession: true,
-    outputSettings: DocumentScannerOutputSettings(pagesScanLimit: 1),
-    screens: DocumentScannerScreens(
-      review: ReviewScreenConfiguration(enabled: false),
-    ),
-  );
-  var documentResult = await ScanbotSdkUiV2.startDocumentScanner(configuration);
 
-  if (documentResult.status != OperationStatus.OK) {
+  final pdf = await scanDocAsPDF();
-    throw Exception("Scanner failed with status ${documentResult.status}");
+  final img = await renderPdf(pdfBytes: pdf);
-  }
+  final amount = await extractInfoFromBill(
-
+    imgBuff: img,
-  // Convert result to PDF
+    extractDates: !prefs.disableExtractDates(),
-  var result = await ScanbotSdk.document.createPDFForDocument(
-    PDFFromDocumentParams(
-      documentID: documentResult.data!.uuid,
-      pdfConfiguration: PdfConfiguration(),
-    ),
   );
-  final pdfPath = result.pdfFileUri.replaceFirst("file://", "");
+  return (pdf, amount);
-  return File(pdfPath).readAsBytes();
 }
 
 class ScanScreen extends HookConsumerWidget {
@@ -62,12 +46,13 @@ class ScanScreen extends HookConsumerWidget {
     return Padding(
       padding: const EdgeInsets.all(8.0),
       child: switch (scanDocProvider) {
-        AsyncData(:final value) when value != null => ExpenseEditor(
+        AsyncData(:final value) when value.$1 != null => ExpenseEditor(
-          file: value,
+          file: value.$1!,
+          initialData: value.$2,
           onFinished: (expense) async {
             await expenses.add(
               info: expense,
-              fileContent: value,
+              fileContent: value.$1!,
               fileMimeType: "application/pdf",
             );
             restartScan();
@@ -76,7 +61,7 @@ class ScanScreen extends HookConsumerWidget {
         ),
 
         // No data
-        AsyncData(:final value) when value == null => ScanErrorScreen(
+        AsyncData(:final value) when value.$1 == null => ScanErrorScreen(
           message: "No document scanned!",
           onTryAgain: restartScan,
         ),

moneymgr_mobile/lib/routes/settings/settings_screen.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:moneymgr_mobile/providers/settings.dart';
+import 'package:moneymgr_mobile/services/storage/prefs.dart';
 import 'package:moneymgr_mobile/utils/extensions.dart';
 
 class SettingsScreen extends ConsumerWidget {
@@ -8,6 +9,7 @@ class SettingsScreen extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final prefs = ref.watch(prefsProvider).requireValue;
     final themeMode = ref.watch(currentThemeModeProvider);
 
     void onTapThemeMode() =>
@@ -15,6 +17,16 @@ class SettingsScreen extends ConsumerWidget {
 
     void onTapLicenses() => context.showAppLicensePage();
 
+    handleToggleStartScreen(v) async {
+      await prefs.setStartOnScansListScreen(v);
+      ref.invalidate(prefsProvider);
+    }
+
+    handleToggleDisableExtractDate(v) async {
+      await prefs.setDisableExtractDates(v);
+      ref.invalidate(prefsProvider);
+    }
+
     return Scaffold(
       appBar: AppBar(title: const Text('Settings')),
       body: ListView(
@@ -25,6 +37,22 @@ class SettingsScreen extends ConsumerWidget {
             trailing: Text(themeMode.label),
             onTap: onTapThemeMode,
           ),
+          SwitchListTile(
+            value: prefs.startOnScansListScreen(),
+            onChanged: handleToggleStartScreen,
+            title: Text("Start on scans screen"),
+            subtitle: Text(
+              "Do not start camera automatically on application startup",
+            ),
+          ),
+          SwitchListTile(
+            value: prefs.disableExtractDates(),
+            onChanged: handleToggleDisableExtractDate,
+            title: Text("Do not extract dates"),
+            subtitle: Text(
+              "Do not attempt to extract dates from scanned expenses",
+            ),
+          ),
           const Divider(),
           ListTile(
             leading: const Icon(Icons.info_outline),

moneymgr_mobile/lib/services/router/router.dart

@@ -11,6 +11,7 @@ import 'package:moneymgr_mobile/routes/scan_details/scan_details.dart';
 import 'package:moneymgr_mobile/routes/scans_list/scans_list_screen.dart';
 import 'package:moneymgr_mobile/routes/settings/settings_screen.dart';
 import 'package:moneymgr_mobile/services/router/routes_list.dart';
+import 'package:moneymgr_mobile/services/storage/prefs.dart';
 import 'package:moneymgr_mobile/widgets/load_startup_data.dart';
 import 'package:moneymgr_mobile/widgets/scaffold_with_navigation.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -29,6 +30,8 @@ GoRouter router(Ref ref) {
       authStateNotifier.value = value;
     });
 
+  final prefs = ref.read(prefsProvider).requireValue;
+
   // This is the only place you need to define your navigation items. The items
   // will be propagated automatically to the router and the navigation bar/rail
   // of the scaffold.
@@ -70,22 +73,22 @@ GoRouter router(Ref ref) {
 
   final router = GoRouter(
     debugLogDiagnostics: true,
-    initialLocation: navigationItems.first.path,
+    initialLocation: prefs.startOnScansListScreen() ? scansPage : capturePage,
     routes: [
-      GoRoute(path: homePage, builder: (_, __) => const Scaffold()),
+      GoRoute(path: homePage, builder: (_, _) => const Scaffold()),
-      GoRoute(path: authPage, builder: (_, __) => const LoginScreen()),
+      GoRoute(path: authPage, builder: (_, _) => const LoginScreen()),
-      GoRoute(path: qrAuthPath, builder: (_, __) => const QrAuthScreen()),
+      GoRoute(path: qrAuthPath, builder: (_, _) => const QrAuthScreen()),
       GoRoute(
         path: manualAuthPage,
-        builder: (_, __) => const ManualAuthScreen(),
+        builder: (_, _) => const ManualAuthScreen(),
       ),
-      GoRoute(path: settingsPage, builder: (_, __) => const SettingsScreen()),
+      GoRoute(path: settingsPage, builder: (_, _) => const SettingsScreen()),
 
       // Configuration for the bottom navigation bar routes. The routes themselves
       // should be defined in [navigationItems]. Modification to this [ShellRoute]
       // config is rarely needed.
       ShellRoute(
-        builder: (_, __, child) => child,
+        builder: (_, _, child) => child,
         routes: [
           for (final (index, item) in navigationItems.indexed)
             GoRoute(

moneymgr_mobile/lib/services/storage/prefs.dart

@@ -15,6 +15,22 @@ Future<SharedPreferencesWithCache> prefs(Ref ref) =>
     );
 
 extension MoneyMgrSharedPreferences on SharedPreferencesWithCache {
+  bool startOnScansListScreen() {
+    return getBool("startOnScansListScreen") ?? false;
+  }
+
+  Future<void> setStartOnScansListScreen(bool start) async {
+    await setBool("startOnScansListScreen", start);
+  }
+
+  bool disableExtractDates() {
+    return getBool("disableExtractDates") ?? false;
+  }
+
+  Future<void> setDisableExtractDates(bool disable) async {
+    await setBool("disableExtractDates", disable);
+  }
+
   ServerConfig? serverConfig() {
     final json = getString("serverConfig");
     if (json != null) return ServerConfig.fromJson(jsonDecode(json));

moneymgr_mobile/lib/utils/ocr_utils.dart

@@ -0,0 +1,86 @@
+import 'dart:math';
+import 'dart:typed_data';
+import 'dart:ui' as ui;
+
+import 'package:flutter/material.dart';
+import 'package:google_mlkit_text_recognition/google_mlkit_text_recognition.dart';
+import 'package:logging/logging.dart';
+import 'package:moneymgr_mobile/services/storage/expenses.dart';
+
+/// Attempt to extract information from invoice image
+Future<BaseExpenseInfo?> extractInfoFromBill({
+  required Uint8List imgBuff,
+  required bool extractDates,
+}) async {
+  final decodedImage = await decodeImageFromList(imgBuff);
+
+  final byteData = await decodedImage.toByteData(
+    format: ui.ImageByteFormat.rawRgba,
+  );
+
+  final image = InputImage.fromBitmap(
+    bitmap: byteData!.buffer.asUint8List(),
+    width: decodedImage.width,
+    height: decodedImage.height,
+  );
+
+  final textRecognizer = TextRecognizer(script: TextRecognitionScript.latin);
+  final extractionResult = await textRecognizer.processImage(image);
+
+  Logger.root.fine("Expense text: ${extractionResult.text}");
+
+  // Check for highestCost amount on invoice
+  final costRegexp = RegExp(
+    r'([0-9]+([ ]*(\\.|,)[ ]*[0-9]{1,2}){0,1})([ \\t\\n]*(EUR|eur|€)|E)',
+    multiLine: true,
+    caseSensitive: false,
+  );
+  var highestCost = 0.0;
+  for (final match in costRegexp.allMatches(extractionResult.text)) {
+    if (match.groupCount == 0) continue;
+
+    // Process only numeric value
+    final value = (match.group(1) ?? "").replaceAll(",", ".");
+    highestCost = max(highestCost, double.tryParse(value) ?? 0.0);
+  }
+
+  // Check for highestCost amount on invoice
+  final dateRegexp = RegExp(
+    r'([0-3][0-9])(\/|-)([0-1][0-9])(\/|-)((20|)[0-9]{2})',
+    multiLine: false,
+    caseSensitive: false,
+  );
+  final currDate = DateTime.now();
+  DateTime? newest;
+  for (final match in dateRegexp.allMatches(extractionResult.text)) {
+    if (match.groupCount < 6) continue;
+
+    int year = int.tryParse(match.group(5)!) ?? currDate.year;
+
+    try {
+      final date = DateTime(
+        year > 99 ? year : (2000 + year),
+        int.tryParse(match.group(3)!) ?? currDate.month,
+        int.tryParse(match.group(1)!) ?? currDate.day,
+      );
+
+      if (newest == null) {
+        newest = date;
+      } else {
+        newest = DateTime.fromMillisecondsSinceEpoch(
+          max(newest.millisecondsSinceEpoch, date.millisecondsSinceEpoch),
+        );
+      }
+    } catch (e, s) {
+      Logger.root.warning("Failed to parse date! $e$s");
+    }
+  }
+
+  return BaseExpenseInfo(
+    label: null,
+    cost: highestCost,
+    time: extractDates && (newest?.isBefore(currDate) ?? false)
+        ? newest!
+        : currDate,
+  );
+}

moneymgr_mobile/lib/utils/pdf_utils.dart

@@ -6,14 +6,40 @@ import 'package:flutter/material.dart';
 import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
 import 'package:pdf_image_renderer/pdf_image_renderer.dart';
+import 'package:scanbot_sdk/scanbot_sdk.dart';
+import 'package:scanbot_sdk/scanbot_sdk_ui_v2.dart' hide IconButton, EdgeInsets;
 
+/// Scan document as PDF
+Future<Uint8List> scanDocAsPDF() async {
+  var configuration = DocumentScanningFlow(
+    appearance: DocumentFlowAppearanceConfiguration(
+      statusBarMode: StatusBarMode.DARK,
+    ),
+    cleanScanningSession: true,
+    outputSettings: DocumentScannerOutputSettings(pagesScanLimit: 1),
+    screens: DocumentScannerScreens(
+      review: ReviewScreenConfiguration(enabled: false),
+    ),
+  );
+  var documentResult = await ScanbotSdkUiV2.startDocumentScanner(configuration);
+
+  if (documentResult.status != OperationStatus.OK) {
+    throw Exception("Scanner failed with status ${documentResult.status}");
+  }
+
+  // Convert result to PDF
+  var result = await ScanbotSdk.document.createPDFForDocument(
+    PDFFromDocumentParams(
+      documentID: documentResult.data!.uuid,
+      pdfConfiguration: PdfConfiguration(),
+    ),
+  );
+  final pdfPath = result.pdfFileUri.replaceFirst("file://", "");
+  return File(pdfPath).readAsBytes();
+}
 
 /// Render PDF to image bits
-Future<Uint8List> renderPdf(
+Future<Uint8List> renderPdf({String? path, Uint8List? pdfBytes}) async {
-     {
-      String? path,
-      Uint8List? pdfBytes,
-    }) async {
   assert(path != null || pdfBytes != null);
 
   // Create temporary file if required

moneymgr_mobile/lib/widgets/expense_editor.dart

@@ -40,6 +40,11 @@ class ExpenseEditor extends HookConsumerWidget {
 
     final (:pending, :snapshot, :hasError) = useAsyncTask();
 
+    // Clear cost value
+    handleClearCost() {
+      costController.text = "";
+    }
+
     // Pick a new date
     handlePickDate() async {
       final date = await showDatePicker(
@@ -94,6 +99,19 @@ class ExpenseEditor extends HookConsumerWidget {
       }
     }
 
+    // Open invoice in full screen
+    handleFullScreenInvoice() {
+      showDialog(
+        context: context,
+        builder: (c) => Scaffold(
+          appBar: AppBar(title: Text("Expense")),
+          body: SingleChildScrollView(
+            child: PDFViewer(pdfBytes: file, fit: BoxFit.fitWidth),
+          ),
+        ),
+      );
+    }
+
     return Scaffold(
       appBar: AppBar(
         title: Text("Expense info"),
@@ -125,8 +143,11 @@ class ExpenseEditor extends HookConsumerWidget {
         children: [
           // Expense preview
           Expanded(
+            child: GestureDetector(
+              onTap: handleFullScreenInvoice,
               child: PDFViewer(pdfBytes: file, fit: BoxFit.contain),
             ),
+          ),
 
           SizedBox(height: 10),
 
@@ -137,7 +158,13 @@ class ExpenseEditor extends HookConsumerWidget {
               decimal: true,
               signed: false,
             ),
-            decoration: const InputDecoration(labelText: 'Cost'),
+            decoration: InputDecoration(
+              labelText: 'Cost',
+              suffixIcon: IconButton(
+                onPressed: handleClearCost,
+                icon: const Icon(Icons.clear),
+              ),
+            ),
             textInputAction: TextInputAction.done,
           ),
 

moneymgr_mobile/pubspec.lock

@@ -141,10 +141,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27"
+      sha256: "0b1b12a0a549605e5f04476031cd0bc91ead1d7c8e830773a18ee54179b3cb62"
       url: "https://pub.dev"
     source: hosted
-    version: "8.10.1"
+    version: "8.11.0"
   characters:
     dependency: transitive
     description:
@@ -370,10 +370,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
+      sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "6.0.0"
   flutter_native_splash:
     dependency: "direct main"
     description:
@@ -452,18 +452,18 @@ packages:
     dependency: "direct dev"
     description:
       name: freezed
-      sha256: "6022db4c7bfa626841b2a10f34dd1e1b68e8f8f9650db6112dcdeeca45ca793c"
+      sha256: "2d399f823b8849663744d2a9ddcce01c49268fb4170d0442a655bf6a2f47be22"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.6"
+    version: "3.1.0"
   freezed_annotation:
     dependency: "direct main"
     description:
       name: freezed_annotation
-      sha256: c87ff004c8aa6af2d531668b46a4ea379f7191dc6dfa066acd53d506da6e044b
+      sha256: "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.0"
   frontend_server_client:
     dependency: transitive
     description:
@@ -484,10 +484,26 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: ac294be30ba841830cfa146e5a3b22bb09f8dc5a0fdd9ca9332b04b0bde99ebf
+      sha256: c489908a54ce2131f1d1b7cc631af9c1a06fac5ca7c449e959192089f9489431
       url: "https://pub.dev"
     source: hosted
-    version: "15.2.4"
+    version: "16.0.0"
+  google_mlkit_commons:
+    dependency: transitive
+    description:
+      name: google_mlkit_commons
+      sha256: "8f40fbac10685cad4715d11e6a0d86837d9ad7168684dfcad29610282a88e67a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.11.0"
+  google_mlkit_text_recognition:
+    dependency: "direct main"
+    description:
+      name: google_mlkit_text_recognition
+      sha256: "96173ad4dd7fd06c660e22ac3f9e9f1798a517fe7e48bee68eeec83853224224"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.15.0"
   graphs:
     dependency: transitive
     description:
@@ -604,10 +620,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
+      sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.1"
+    version: "6.0.0"
   logging:
     dependency: "direct main"
     description:
@@ -921,10 +937,10 @@ packages:
     dependency: transitive
     description:
       name: source_helper
-      sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c"
+      sha256: "4f81479fe5194a622cdd1713fe1ecb683a6e6c85cd8cec8e2e35ee5ab3fdf2a1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.5"
+    version: "1.3.6"
   source_span:
     dependency: transitive
     description:

moneymgr_mobile/pubspec.yaml

@@ -52,7 +52,7 @@ dependencies:
   flutter_hooks: ^0.21.2
 
   # Router
-  go_router: ^15.2.4
+  go_router: ^16.0.0
 
   # Flutter extras widgets for columns and rows
   flextras: ^1.0.0
@@ -93,6 +93,9 @@ dependencies:
   # PDF renderer
   pdf_image_renderer: ^1.0.1
 
+  # Text extraction
+  google_mlkit_text_recognition: ^0.15.0
+
 dev_dependencies:
   flutter_test:
     sdk: flutter
@@ -102,7 +105,7 @@ dev_dependencies:
   # activated in the `analysis_options.yaml` file located at the root of your
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
   # Manage app icon
   flutter_launcher_icons: ^0.14.4
@@ -127,6 +130,9 @@ dev_dependencies:
 # The following section is specific to Flutter packages.
 flutter:
 
+  # Default Android flavor
+  default-flavor: development
+
   # The following line ensures that the Material Icons font is
   # included with your application, so that you can use the icons in
   # the material Icons class.

moneymgr_web/package-lock.json

@@ -18,7 +18,7 @@
         "@mui/material": "^7.1.2",
         "@mui/x-charts": "^8.8.0",
         "@mui/x-data-grid": "^8.8.0",
-        "@mui/x-date-pickers": "^8.7.0",
+        "@mui/x-date-pickers": "^8.8.0",
         "date-and-time": "^3.6.0",
         "dayjs": "^1.11.13",
         "filesize": "^10.1.6",
@@ -39,7 +39,7 @@
         "eslint-plugin-react-hooks": "^5.2.0",
         "eslint-plugin-react-refresh": "^00.4.20",
         "eslint-plugin-react-x": "^1.52.3",
-        "globals": "^16.2.0",
+        "globals": "^16.3.0",
         "typescript": "~5.8.3",
         "typescript-eslint": "^8.32.1",
         "vite": "^6.3.5"
@@ -1652,28 +1652,6 @@
         "robust-predicates": "^3.0.2"
       }
     },
-    "node_modules/@mui/x-charts/node_modules/@mui/x-internals": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-8.8.0.tgz",
-      "integrity": "sha512-qTRK5oINkAjZ7sIHpSnESLNq1xtQUmmfmGscYUSEP0uHoYh6pKkNWH9+7yzggRHuTv+4011VBwN9s+efrk+xZg==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.27.6",
-        "@mui/utils": "^7.2.0",
-        "reselect": "^5.1.1"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui-org"
-      },
-      "peerDependencies": {
-        "@mui/system": "^5.15.14 || ^6.0.0 || ^7.0.0",
-        "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
-      }
-    },
     "node_modules/@mui/x-data-grid": {
       "version": "8.8.0",
       "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-8.8.0.tgz",
@@ -1711,37 +1689,15 @@
         }
       }
     },
-    "node_modules/@mui/x-data-grid/node_modules/@mui/x-internals": {
+    "node_modules/@mui/x-date-pickers": {
       "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-8.8.0.tgz",
+      "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-8.8.0.tgz",
-      "integrity": "sha512-qTRK5oINkAjZ7sIHpSnESLNq1xtQUmmfmGscYUSEP0uHoYh6pKkNWH9+7yzggRHuTv+4011VBwN9s+efrk+xZg==",
+      "integrity": "sha512-Rlk1wgkNHjMf22Ejv6jB+XueFYZmiwMYlJz3oRw9d8HhnshtMVjJbSNOI9yZ2wtqyEr0CGfryCnryywHpmfzeA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.27.6",
         "@mui/utils": "^7.2.0",
-        "reselect": "^5.1.1"
+        "@mui/x-internals": "8.8.0",
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui-org"
-      },
-      "peerDependencies": {
-        "@mui/system": "^5.15.14 || ^6.0.0 || ^7.0.0",
-        "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
-      }
-    },
-    "node_modules/@mui/x-date-pickers": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-8.7.0.tgz",
-      "integrity": "sha512-7fCRhhoE/2s7wsJWLoY2IoHlN5ZA+ev7ZzhIjLPAOzMXwIflzCgljq6iG/iXpATugsmlxWHhO/7wdDSD6zUNOw==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.27.6",
-        "@mui/utils": "^7.1.1",
-        "@mui/x-internals": "8.7.0",
         "@types/react-transition-group": "^4.4.12",
         "clsx": "^2.1.1",
         "prop-types": "^15.8.1",
@@ -1809,13 +1765,13 @@
       }
     },
     "node_modules/@mui/x-internals": {
-      "version": "8.7.0",
+      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-8.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-8.8.0.tgz",
-      "integrity": "sha512-1aduds7L2i6t0HIFNlqG4UB07SVEg+wcnJ9GGu8B/X8EVwO72Rt+rc8ZlqK10ooscq1AlTwi2dd0q+hz+aWk+Q==",
+      "integrity": "sha512-qTRK5oINkAjZ7sIHpSnESLNq1xtQUmmfmGscYUSEP0uHoYh6pKkNWH9+7yzggRHuTv+4011VBwN9s+efrk+xZg==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.27.6",
-        "@mui/utils": "^7.1.1",
+        "@mui/utils": "^7.2.0",
         "reselect": "^5.1.1"
       },
       "engines": {
@@ -4322,9 +4278,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "16.2.0",
+      "version": "16.3.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-16.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.3.0.tgz",
-      "integrity": "sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==",
+      "integrity": "sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ==",
       "dev": true,
       "license": "MIT",
       "engines": {

moneymgr_web/package.json

@@ -20,7 +20,7 @@
     "@mui/material": "^7.1.2",
     "@mui/x-charts": "^8.8.0",
     "@mui/x-data-grid": "^8.8.0",
-    "@mui/x-date-pickers": "^8.7.0",
+    "@mui/x-date-pickers": "^8.8.0",
     "date-and-time": "^3.6.0",
     "dayjs": "^1.11.13",
     "filesize": "^10.1.6",
@@ -41,7 +41,7 @@
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^00.4.20",
     "eslint-plugin-react-x": "^1.52.3",
-    "globals": "^16.2.0",
+    "globals": "^16.3.0",
     "typescript": "~5.8.3",
     "typescript-eslint": "^8.32.1",
     "vite": "^6.3.5"