hernik/prasule
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 3 Activity Actions

feat: create basic function to load from ocr

Browse source
This commit is contained in:
Matyáš Caras 2023-11-01 17:58:05 +01:00
parent 4852cf1839
commit f614c4dfac
Signed by untrusted user who does not match committer: hernik
GPG key ID: 2A3175F98820C5C6
11 changed files with 93 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.vscode/settings.json vendored
View file

@ -1,6 +1,7 @@
{
"conventionalCommits.scopes": [
"ocr",
"ui"
"ui",
"translations"
]
}

3
lib/api/entry_data.dart
View file

@ -4,9 +4,10 @@ part 'entry_data.g.dart';
@JsonSerializable()
class EntryData {
String name;
String description;
double amount;
EntryData({required this.name, required this.amount});
EntryData({required this.name, required this.amount, this.description = ""});
factory EntryData.fromJson(Map<String, dynamic> json) =>
_$EntryDataFromJson(json);

2
lib/api/entry_data.g.dart
View file

@ -9,9 +9,11 @@ part of 'entry_data.dart';
EntryData _$EntryDataFromJson(Map<String, dynamic> json) => EntryData(
name: json['name'] as String,
amount: (json['amount'] as num).toDouble(),
description: json['description'] as String? ?? "",
);
Map<String, dynamic> _$EntryDataToJson(EntryData instance) => <String, dynamic>{
'name': instance.name,
'description': instance.description,
'amount': instance.amount,
};

25
lib/api/multientry.dart
View file

@ -1,25 +0,0 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:prasule/api/category.dart';
import 'package:prasule/api/entry_data.dart';
part 'multientry.g.dart';
@JsonSerializable()
class MultiEntry {
EntryType type;
List<EntryData> data;
DateTime date;
WalletCategory category;
int id;
MultiEntry(
{required this.data,
required this.type,
required this.date,
required this.category,
required this.id});
factory MultiEntry.fromJson(Map<String, dynamic> json) =>
_$MultiEntryFromJson(json);
Map<String, dynamic> toJson() => _$MultiEntryToJson(this);
}

32
lib/api/multientry.g.dart
View file

@ -1,32 +0,0 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'multientry.dart';
// **************************************************************************
// JsonSerializableGenerator
// **************************************************************************
MultiEntry _$MultiEntryFromJson(Map<String, dynamic> json) => MultiEntry(
data: (json['data'] as List<dynamic>)
.map((e) => EntryData.fromJson(e as Map<String, dynamic>))
.toList(),
type: $enumDecode(_$EntryTypeEnumMap, json['type']),
date: DateTime.parse(json['date'] as String),
category:
WalletCategory.fromJson(json['category'] as Map<String, dynamic>),
id: json['id'] as int,
);
Map<String, dynamic> _$MultiEntryToJson(MultiEntry instance) =>
<String, dynamic>{
'type': _$EntryTypeEnumMap[instance.type]!,
'data': instance.data,
'date': instance.date.toIso8601String(),
'category': instance.category,
'id': instance.id,
};
const _$EntryTypeEnumMap = {
EntryType.expense: 'expense',
EntryType.income: 'income',
};

9
lib/api/wallet.dart
View file

@ -29,4 +29,13 @@ class Wallet {
/// Connect the generated [_$PersonToJson] function to the `toJson` method.
Map<String, dynamic> toJson() => _$WalletToJson(this);
/// Getter for the next unused unique number ID in the wallet's entry list
int get nextId {
var id = 1;
while (entries.where((element) => element.id == id).isNotEmpty) {
id++; // create unique ID
}
return id;
}
}

2
lib/l10n/app_cs.arb
View file

@ -26,7 +26,7 @@
"settings": "Nastavení",
"about": "O aplikaci",
"noEntries": "Žádné záznamy :(",
"noEntriesSub": "Přidejte nějaký skrz plovoucího tlačítka vpravo dole.",
"noEntriesSub": "Přidejte nějaký skrz plovoucí tlačítka vpravo dole.",
"sureDialog": "Jste si jisti?",
"deleteSure": "Opravdu chcete smazat tento záznam?",
"missingOcr": "Nemáte stažené žádné jazyky pro OCR!",

8
lib/pw/platformfield.dart
View file

@ -15,6 +15,7 @@ class PlatformField extends PlatformWidget<TextField, CupertinoTextField> {
final List<String>? autofillHints;
final TextStyle? textStyle;
final TextAlign textAlign;
final int? maxLines;
const PlatformField(
{super.key,
this.controller,
@ -27,7 +28,8 @@ class PlatformField extends PlatformWidget<TextField, CupertinoTextField> {
this.onChanged,
this.autofillHints,
this.textStyle,
this.textAlign = TextAlign.start});
this.textAlign = TextAlign.start,
this.maxLines = 1});
@override
TextField createAndroidWidget(BuildContext context) => TextField(
@ -44,6 +46,7 @@ class PlatformField extends PlatformWidget<TextField, CupertinoTextField> {
inputFormatters: inputFormatters,
onChanged: onChanged,
autofillHints: autofillHints,
maxLines: maxLines,
);
@override
@ -51,13 +54,14 @@ class PlatformField extends PlatformWidget<TextField, CupertinoTextField> {
CupertinoTextField(
textAlign: textAlign,
controller: controller,
enabled: enabled,
enabled: enabled ?? true,
obscureText: obscureText,
prefix: (labelText == null) ? null : Text(labelText!),
autocorrect: autocorrect,
keyboardType: keyboardType,
inputFormatters: inputFormatters,
onChanged: onChanged,
maxLines: maxLines,
style: textStyle,
);
}

9
lib/pw/platformroute.dart Normal file
View file

@ -0,0 +1,9 @@
import 'dart:io';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
Route<T> platformRoute<T>(Widget Function(BuildContext) builder) =>
(Platform.isIOS)
? CupertinoPageRoute<T>(builder: builder)
: MaterialPageRoute<T>(builder: builder);

34
lib/views/create_entry.dart
View file

@ -26,12 +26,8 @@ class _CreateEntryViewState extends State<CreateEntryView> {
if (widget.editEntry != null) {
newEntry = widget.editEntry!;
} else {
var id = 1;
while (widget.w.entries.where((element) => element.id == id).isNotEmpty) {
id++; // create unique ID
}
newEntry = WalletSingleEntry(
id: id,
id: widget.w.nextId,
data: EntryData(amount: 0, name: ""),
type: EntryType.expense,
date: DateTime.now(),
@ -152,6 +148,28 @@ class _CreateEntryViewState extends State<CreateEntryView> {
},
),
),
const SizedBox(
height: 20,
),
Text(AppLocalizations.of(context)!.description),
const SizedBox(
height: 10,
),
SizedBox(
height: 300,
width: MediaQuery.of(context).size.width * 0.8,
child: PlatformField(
keyboardType: TextInputType.multiline,
maxLines: null,
controller: TextEditingController(
text: newEntry.data.description,
),
onChanged: (v) {
newEntry.data.description = v;
setState(() {});
},
),
),
const SizedBox(
height: 15,
),
@ -173,9 +191,9 @@ class _CreateEntryViewState extends State<CreateEntryView> {
return;
}
widget.w.entries.add(newEntry);
WalletManager.saveWallet(widget.w).then((value) =>
Navigator.of(context)
.pop(widget.w)); // TODO loading circle?
WalletManager.saveWallet(widget.w).then(
(value) => Navigator.of(context).pop(widget.w),
); // TODO loading circle?
},
)
],

43
lib/views/home.dart
View file

@ -6,6 +6,7 @@ import 'package:grouped_list/grouped_list.dart';
import 'package:image_picker/image_picker.dart';
import 'package:intl/date_symbol_data_local.dart';
import 'package:intl/intl.dart';
import 'package:prasule/api/category.dart';
import 'package:prasule/api/entry_data.dart';
import 'package:prasule/api/walletentry.dart';
import 'package:prasule/api/wallet.dart';
@ -14,6 +15,7 @@ import 'package:prasule/main.dart';
import 'package:prasule/network/tessdata.dart';
import 'package:prasule/pw/platformbutton.dart';
import 'package:prasule/pw/platformdialog.dart';
import 'package:prasule/pw/platformroute.dart';
import 'package:prasule/views/create_entry.dart';
import 'package:prasule/views/settings/settings.dart';
import 'package:prasule/views/settings/tessdata_list.dart';
@ -317,18 +319,45 @@ class _HomeViewState extends State<HomeView> {
element.trim();
return element.isEmpty;
});
var data = <EntryData>[];
var price = 0.0;
var description = "";
for (var line in lines) {
var regex = RegExp(r'\d+(?:\.|,)\d+');
var price = 0.0;
// find numbered prices on each line
var regex = RegExp(r'\d+(?:(?:\.|,) {0,}\d{0,})+');
for (var match in regex.allMatches(line)) {
price += double.tryParse(match.group(0).toString()) ?? 0;
}
data.add(EntryData(name: "Idk", amount: price));
description += "${line.replaceAll(regex, "")}\n";
}
Navigator.of(context).pop();
// TODO: send to create
Navigator.of(ctx).pop();
// show edit
Navigator.of(context)
.push<WalletSingleEntry>(
platformRoute<WalletSingleEntry>(
(c) => CreateEntryView(
w: selectedWallet!,
editEntry: WalletSingleEntry(
data: EntryData(
name: "",
amount: price,
description: description),
type: EntryType.expense,
date: DateTime.now(),
category: selectedWallet!.categories.first,
id: selectedWallet!.nextId,
),
),
),
)
.then(
(newEntry) {
// save entry if we didn't return empty
if (newEntry == null) return;
selectedWallet!.entries.add(newEntry);
WalletManager.saveWallet(selectedWallet!);
setState(() {});
},
);
},
child: const Text("Ok")),
TextButton(