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

feat: allow creating new wallets + fix bugs

Browse source
This commit is contained in:
Matyáš Caras 2023-11-01 18:39:21 +01:00
parent f614c4dfac
commit 574180c5f2
Signed by untrusted user who does not match committer: hernik
GPG key ID: 2A3175F98820C5C6
6 changed files with 199 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
integration_test/setup_test.dart
View file

@ -1,4 +1,3 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart'; import 'package:integration_test/integration_test.dart';

12
lib/api/walletmanager.dart
View file

@ -5,13 +5,17 @@ import 'package:path_provider/path_provider.dart';
import 'package:prasule/api/wallet.dart'; import 'package:prasule/api/wallet.dart';
class WalletManager { class WalletManager {
static Future<List<String>> listWallets() async { static Future<List<Wallet>> listWallets() async {
var path = var path =
Directory("${(await getApplicationDocumentsDirectory()).path}/wallets"); Directory("${(await getApplicationDocumentsDirectory()).path}/wallets");
if (!path.existsSync()) { if (!path.existsSync()) {
path.createSync(); path.createSync();
} }
return path.listSync().map((e) => e.path.split("/").last).toList(); var wallets = <Wallet>[];
for (var w in path.listSync().map((e) => e.path.split("/").last).toList()) {
wallets.add(await loadWallet(w));
}
return wallets;
} }
static Future<Wallet> loadWallet(String name) async { static Future<Wallet> loadWallet(String name) async {
@ -27,14 +31,16 @@ class WalletManager {
return Wallet.fromJson(jsonDecode(wallet.readAsStringSync())); return Wallet.fromJson(jsonDecode(wallet.readAsStringSync()));
} }
static Future<void> saveWallet(Wallet w) async { static Future<bool> saveWallet(Wallet w) async {
var path = var path =
Directory("${(await getApplicationDocumentsDirectory()).path}/wallets"); Directory("${(await getApplicationDocumentsDirectory()).path}/wallets");
var wallet = File("${path.path}/${w.name}"); var wallet = File("${path.path}/${w.name}");
if (!path.existsSync()) { if (!path.existsSync()) {
path.createSync(); path.createSync();
} }
if (wallet.existsSync()) return false;
wallet.writeAsStringSync(jsonEncode(w.toJson())); wallet.writeAsStringSync(jsonEncode(w.toJson()));
return true;
} }
static Future<void> deleteWallet(Wallet w) async { static Future<void> deleteWallet(Wallet w) async {

7
lib/l10n/app_cs.arb
View file

@ -7,7 +7,7 @@
"back": "Zpět", "back": "Zpět",
"finish": "Dokončit", "finish": "Dokončit",
"errorEmptyName": "Název nemůže být prázdný!", "errorEmptyName": "Název nemůže být prázdný!",
"welcome": "Vítej!", "welcome": "Vítejte!",
"welcomeAboutPrasule": "Prašule je správce výdajů navržený pro lidi, kteří nechtějí vyplňovat každý malý detail.", "welcomeAboutPrasule": "Prašule je správce výdajů navržený pro lidi, kteří nechtějí vyplňovat každý malý detail.",
"welcomeInstruction": "Na této obrazovce si nastavíte svoji 'peněženku', ve které budou zaznamenány vaše výdaje uspořádané do kategorií, které si nastavíte hned potom.", "welcomeInstruction": "Na této obrazovce si nastavíte svoji 'peněženku', ve které budou zaznamenány vaše výdaje uspořádané do kategorií, které si nastavíte hned potom.",
"setupWalletNameCurrency": "Nastavte si název a měnu peněženky", "setupWalletNameCurrency": "Nastavte si název a měnu peněženky",
@ -53,5 +53,8 @@
"langDownloadProgress": "Postup: $progress %", "langDownloadProgress": "Postup: $progress %",
"addingFromOcr": "Přidat skrz OCR", "addingFromOcr": "Přidat skrz OCR",
"license":"©️ 2023 Matyáš Caras\nVydáno pod licencí GNU AGPL license verze 3", "license":"©️ 2023 Matyáš Caras\nVydáno pod licencí GNU AGPL license verze 3",
"description":"Popis" "description":"Popis",
"newWallet":"Přidat novou peněženku",
"walletExists":"Peněženka s tímto názvem již existuje!"
} }

4
lib/l10n/app_en.arb
View file

@ -89,5 +89,7 @@
}, },
"addingFromOcr": "Add from OCR", "addingFromOcr": "Add from OCR",
"license":"©️ 2023 Matyáš Caras\nReleased under the GNU AGPL license version 3", "license":"©️ 2023 Matyáš Caras\nReleased under the GNU AGPL license version 3",
"description":"Description" "description":"Description",
"newWallet":"Add new wallet",
"walletExists":"A wallet with this name already exists!"
} }

194
lib/views/home.dart
View file

@ -31,6 +31,7 @@ class HomeView extends StatefulWidget {
class _HomeViewState extends State<HomeView> { class _HomeViewState extends State<HomeView> {
Wallet? selectedWallet; Wallet? selectedWallet;
List<Wallet> wallets = [];
DateTime? prevDate; DateTime? prevDate;
late String locale; late String locale;
@override @override
@ -47,13 +48,13 @@ class _HomeViewState extends State<HomeView> {
} }
void loadWallet() async { void loadWallet() async {
var wallets = await WalletManager.listWallets(); wallets = await WalletManager.listWallets();
if (wallets.isEmpty && mounted) { if (wallets.isEmpty && mounted) {
Navigator.of(context).pushReplacement( Navigator.of(context).pushReplacement(
MaterialPageRoute(builder: (c) => const SetupView())); MaterialPageRoute(builder: (c) => const SetupView()));
return; return;
} }
selectedWallet = await WalletManager.loadWallet(wallets.first); selectedWallet = wallets.first;
setState(() {}); setState(() {});
} }
@ -98,7 +99,42 @@ class _HomeViewState extends State<HomeView> {
], ],
), ),
appBar: AppBar( appBar: AppBar(
title: Text(AppLocalizations.of(context)!.home), title: DropdownButton<int>(
value:
(selectedWallet == null) ? -1 : wallets.indexOf(selectedWallet!),
items: [
...wallets.map(
(e) => DropdownMenuItem(
value: wallets.indexOf(
e,
),
child: Text(e.name),
),
),
DropdownMenuItem(
value: -1,
child: Text(AppLocalizations.of(context)!.newWallet),
)
],
onChanged: (v) async {
if (v == null || v == -1) {
Navigator.of(context).push(
platformRoute(
(c) => const SetupView(
newWallet: true,
),
),
);
wallets = await WalletManager.listWallets();
logger.i(wallets.length);
selectedWallet = wallets.last;
setState(() {});
return;
}
selectedWallet = wallets[v];
setState(() {});
},
),
actions: [ actions: [
PopupMenuButton( PopupMenuButton(
itemBuilder: (context) => [ itemBuilder: (context) => [
@ -284,87 +320,87 @@ class _HomeViewState extends State<HomeView> {
builder: (ctx, setState) => PlatformDialog( builder: (ctx, setState) => PlatformDialog(
actions: [ actions: [
TextButton( TextButton(
onPressed: () async { onPressed: () async {
final ImagePicker picker = ImagePicker(); final ImagePicker picker = ImagePicker();
final XFile? media = await picker.pickImage(source: imgSrc); final XFile? media = await picker.pickImage(source: imgSrc);
if (media == null) { if (media == null) {
if (mounted) Navigator.of(context).pop(); if (mounted) Navigator.of(context).pop();
return; return;
} }
// get selected languages // get selected languages
var selected = availableLanguages var selected = availableLanguages
.where((element) => selectedLanguages[ .where((element) =>
availableLanguages.indexOf(element)]) selectedLanguages[availableLanguages.indexOf(element)])
.join("+") .join("+")
.replaceAll(".traineddata", ""); .replaceAll(".traineddata", "");
logger.i(selected); logger.i(selected);
if (!mounted) return; if (!mounted) return;
showDialog( showDialog(
context: context, context: context,
builder: (c) => PlatformDialog( builder: (c) => PlatformDialog(
title: AppLocalizations.of(context)!.ocrLoading), title: AppLocalizations.of(context)!.ocrLoading),
barrierDismissible: false); barrierDismissible: false);
var string = await FlutterTesseractOcr.extractText(media.path, var string = await FlutterTesseractOcr.extractText(media.path,
language: selected, language: selected,
args: { args: {
"psm": "4", "psm": "4",
"preserve_interword_spaces": "1", "preserve_interword_spaces": "1",
});
if (!mounted) return;
Navigator.of(context).pop();
logger.i(string);
if (!mounted) return;
var lines = string.split("\n")
..removeWhere((element) {
element.trim();
return element.isEmpty;
}); });
var price = 0.0; if (!mounted) return;
var description = ""; Navigator.of(context).pop();
for (var line in lines) { logger.i(string);
// find numbered prices on each line if (!mounted) return;
var regex = RegExp(r'\d+(?:(?:\.|,) {0,}\d{0,})+'); var lines = string.split("\n")
for (var match in regex.allMatches(line)) { ..removeWhere((element) {
price += double.tryParse(match.group(0).toString()) ?? 0; element.trim();
} return element.isEmpty;
description += "${line.replaceAll(regex, "")}\n"; });
var price = 0.0;
var description = "";
for (var line in lines) {
// 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;
} }
Navigator.of(ctx).pop(); description += "${line.replaceAll(regex, "")}\n";
// show edit }
Navigator.of(context) Navigator.of(ctx).pop();
.push<WalletSingleEntry>( // show edit
platformRoute<WalletSingleEntry>( Navigator.of(context)
(c) => CreateEntryView( .push<WalletSingleEntry>(
w: selectedWallet!, platformRoute<WalletSingleEntry>(
editEntry: WalletSingleEntry( (c) => CreateEntryView(
data: EntryData( w: selectedWallet!,
name: "", editEntry: WalletSingleEntry(
amount: price, data: EntryData(
description: description), name: "", amount: price, description: description),
type: EntryType.expense, type: EntryType.expense,
date: DateTime.now(), date: DateTime.now(),
category: selectedWallet!.categories.first, category: selectedWallet!.categories.first,
id: selectedWallet!.nextId, id: selectedWallet!.nextId,
),
), ),
), ),
) ),
.then( )
(newEntry) { .then(
// save entry if we didn't return empty (newEntry) {
if (newEntry == null) return; // save entry if we didn't return empty
selectedWallet!.entries.add(newEntry); if (newEntry == null) return;
WalletManager.saveWallet(selectedWallet!); selectedWallet!.entries.add(newEntry);
setState(() {}); WalletManager.saveWallet(selectedWallet!);
}, setState(() {});
); },
}, );
child: const Text("Ok")), },
child: const Text("Ok"),
),
TextButton( TextButton(
onPressed: () { onPressed: () {
Navigator.of(c).pop(); Navigator.of(c).pop();
}, },
child: const Text("Cancel")), child: const Text("Cancel"),
),
], ],
title: AppLocalizations.of(context)!.ocrSelect, title: AppLocalizations.of(context)!.ocrSelect,
content: Column( content: Column(

110
lib/views/setup.dart
View file

@ -12,8 +12,10 @@ import 'package:prasule/views/home.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart';
class SetupView extends StatefulWidget { class SetupView extends StatefulWidget {
const SetupView({super.key}); const SetupView({super.key, this.newWallet = false});
/// We are only creating a new wallet, no first-time setup
final bool newWallet;
@override @override
State<SetupView> createState() => _SetupViewState(); State<SetupView> createState() => _SetupViewState();
} }
@ -36,36 +38,40 @@ class _SetupViewState extends State<SetupView> {
var name = ""; var name = "";
@override @override
void initState() { void didChangeDependencies() {
super.initState(); super.didChangeDependencies();
categories = [ if (categories.isEmpty) {
WalletCategory( categories = [
name: AppLocalizations.of(context)!.categoryHealth, WalletCategory(
type: EntryType.expense, name: AppLocalizations.of(context)!.categoryHealth,
id: 1, type: EntryType.expense,
icon: IconData(Icons.medical_information.codePoint, id: 1,
fontFamily: 'MaterialIcons'), icon: IconData(Icons.medical_information.codePoint,
), fontFamily: 'MaterialIcons'),
WalletCategory( ),
name: AppLocalizations.of(context)!.categoryCar, WalletCategory(
type: EntryType.expense, name: AppLocalizations.of(context)!.categoryCar,
id: 2, type: EntryType.expense,
icon: IconData(Icons.car_repair.codePoint, fontFamily: 'MaterialIcons'), id: 2,
), icon:
WalletCategory( IconData(Icons.car_repair.codePoint, fontFamily: 'MaterialIcons'),
name: AppLocalizations.of(context)!.categoryFood, ),
type: EntryType.expense, WalletCategory(
id: 3, name: AppLocalizations.of(context)!.categoryFood,
icon: IconData(Icons.restaurant.codePoint, fontFamily: 'MaterialIcons'), type: EntryType.expense,
), id: 3,
WalletCategory( icon:
name: AppLocalizations.of(context)!.categoryTravel, IconData(Icons.restaurant.codePoint, fontFamily: 'MaterialIcons'),
type: EntryType.expense, ),
id: 4, WalletCategory(
icon: IconData(Icons.train.codePoint, fontFamily: 'MaterialIcons'), name: AppLocalizations.of(context)!.categoryTravel,
), type: EntryType.expense,
]; id: 4,
setState(() {}); icon: IconData(Icons.train.codePoint, fontFamily: 'MaterialIcons'),
),
];
setState(() {});
}
} }
@override @override
@ -99,11 +105,27 @@ class _SetupViewState extends State<SetupView> {
currency: _selectedCurrency, currency: _selectedCurrency,
categories: categories); categories: categories);
WalletManager.saveWallet(wallet).then( WalletManager.saveWallet(wallet).then(
(value) => Navigator.of(context).pushReplacement( (value) {
MaterialPageRoute( if (!value) {
builder: (c) => const HomeView(), ScaffoldMessenger.of(context).clearSnackBars();
), ScaffoldMessenger.of(context).showSnackBar(
), SnackBar(
content:
Text(AppLocalizations.of(context)!.walletExists),
),
);
return;
}
if (widget.newWallet) {
Navigator.of(context).pop();
return;
}
Navigator.of(context).pushReplacement(
MaterialPageRoute(
builder: (c) => const HomeView(),
),
);
},
); );
}, },
pages: [ pages: [
@ -123,13 +145,15 @@ class _SetupViewState extends State<SetupView> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Flexible( if (!widget.newWallet)
child: Text( Flexible(
AppLocalizations.of(context)!.welcomeAboutPrasule), child: Text(
), AppLocalizations.of(context)!.welcomeAboutPrasule),
const SizedBox( ),
height: 5, if (!widget.newWallet)
), const SizedBox(
height: 5,
),
Flexible( Flexible(
child: Text( child: Text(
AppLocalizations.of(context)!.welcomeInstruction), AppLocalizations.of(context)!.welcomeInstruction),