3 Commits

Author SHA1 Message Date
0943104cc8 Can show expense in full screen
All checks were successful
continuous-integration/drone/push Build is passing
2025-07-20 18:23:37 +02:00
3beaba806a Can clear cost value quickly 2025-07-20 18:18:20 +02:00
1788e7f184 Can disable dates extraction 2025-07-20 18:14:03 +02:00
5 changed files with 64 additions and 5 deletions

View File

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:logging/logging.dart'; import 'package:logging/logging.dart';
import 'package:moneymgr_mobile/services/storage/expenses.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/ocr_utils.dart';
import 'package:moneymgr_mobile/utils/pdf_utils.dart'; import 'package:moneymgr_mobile/utils/pdf_utils.dart';
import 'package:moneymgr_mobile/widgets/expense_editor.dart'; import 'package:moneymgr_mobile/widgets/expense_editor.dart';
@@ -14,9 +15,14 @@ part 'scan_screen.g.dart';
/// Scan a document & return generated PDF as byte file /// Scan a document & return generated PDF as byte file
@riverpod @riverpod
Future<(Uint8List?, BaseExpenseInfo?)> _scanDocument(Ref ref) async { Future<(Uint8List?, BaseExpenseInfo?)> _scanDocument(Ref ref) async {
final prefs = ref.watch(prefsProvider).requireValue;
final pdf = await scanDocAsPDF(); final pdf = await scanDocAsPDF();
final img = await renderPdf(pdfBytes: pdf); final img = await renderPdf(pdfBytes: pdf);
final amount = await extractInfoFromBill(img); final amount = await extractInfoFromBill(
imgBuff: img,
extractDates: !prefs.disableExtractDates(),
);
return (pdf, amount); return (pdf, amount);
} }

View File

@@ -22,6 +22,11 @@ class SettingsScreen extends ConsumerWidget {
ref.invalidate(prefsProvider); ref.invalidate(prefsProvider);
} }
handleToggleDisableExtractDate(v) async {
await prefs.setDisableExtractDates(v);
ref.invalidate(prefsProvider);
}
return Scaffold( return Scaffold(
appBar: AppBar(title: const Text('Settings')), appBar: AppBar(title: const Text('Settings')),
body: ListView( body: ListView(
@@ -40,6 +45,14 @@ class SettingsScreen extends ConsumerWidget {
"Do not start camera automatically on application startup", "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(), const Divider(),
ListTile( ListTile(
leading: const Icon(Icons.info_outline), leading: const Icon(Icons.info_outline),

View File

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

View File

@@ -8,7 +8,10 @@ import 'package:logging/logging.dart';
import 'package:moneymgr_mobile/services/storage/expenses.dart'; import 'package:moneymgr_mobile/services/storage/expenses.dart';
/// Attempt to extract information from invoice image /// Attempt to extract information from invoice image
Future<BaseExpenseInfo?> extractInfoFromBill(Uint8List imgBuff) async { Future<BaseExpenseInfo?> extractInfoFromBill({
required Uint8List imgBuff,
required bool extractDates,
}) async {
final decodedImage = await decodeImageFromList(imgBuff); final decodedImage = await decodeImageFromList(imgBuff);
final byteData = await decodedImage.toByteData( final byteData = await decodedImage.toByteData(
@@ -74,6 +77,8 @@ Future<BaseExpenseInfo?> extractInfoFromBill(Uint8List imgBuff) async {
return BaseExpenseInfo( return BaseExpenseInfo(
label: null, label: null,
cost: highestCost, cost: highestCost,
time: newest?.isBefore(currDate) ?? false ? newest! : currDate, time: extractDates && (newest?.isBefore(currDate) ?? false)
? newest!
: currDate,
); );
} }

View File

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