Compare commits

...

2 commits

Author SHA1 Message Date
4da346f6d7 added prototype for editing baskets 2023-06-25 18:11:26 +02:00
0ee26fedb0 added a prototype for a basket 2023-06-25 15:11:23 +02:00
4 changed files with 140 additions and 53 deletions

View file

@ -1,30 +1,78 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'sample_data.dart'; import 'sample_data.dart';
/* todo: /* todo:
- Flag für Ansicht/Bearbeitung
- individuelle Icons je nach Kategorie - individuelle Icons je nach Kategorie
- Gesamtpreis - Gesamtpreis
*/ */
class ShowBasket extends StatelessWidget { class ShowBasket extends StatelessWidget {
final Transaction transaction; final int index;
final bool editable;
const ShowBasket({super.key, required this.transaction}); const ShowBasket(this.index, {this.editable = false, super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final List<Basket> basket = SampleData().transactions[index].basket!;
return Column(
children: [
Expanded(
child: getBasket(basket),
),
const Divider(),
ListTile(
leading: const Icon(
Icons.euro,
),
title: const Text(
'Kosten:',
),
subtitle: Text(
'${SampleData().transactions[index].amount / 100}',
),
trailing: editable
? Row(
mainAxisSize: MainAxisSize.min,
children: [
FloatingActionButton(
backgroundColor: Colors.redAccent.shade100,
child: const Icon(Icons.delete),
onPressed: () {}),
const SizedBox(
width: 10,
),
FloatingActionButton(
child: const Icon(Icons.shopping_cart_checkout),
onPressed: () {}),
],
)
: null),
],
);
}
ListView getBasket(List<Basket> basket) {
return ListView.builder( return ListView.builder(
itemCount: null, itemCount: null,
itemBuilder: (context, index) { itemBuilder: (context, index) {
if (index < transaction.basket!.length) { if (index < basket.length) {
return Card( return Card(
child: ListTile( child: ListTile(
leading: const Icon(Icons.abc), leading: getLeading(basket[index].products.category),
title: Text( title: Text(basket[index].products.name),
transaction.basket![index].products.name), //better null check subtitle: Text(
//trailing: Text(), '${basket[index].amount} ${basket[index].products.unit}'),
), trailing: editable
? SizedBox(
width: 100,
child: TextField(
keyboardType: TextInputType.number,
inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.digitsOnly
]),
)
: null),
); );
} else { } else {
return null; return null;
@ -32,4 +80,24 @@ class ShowBasket extends StatelessWidget {
}, },
); );
} }
Widget getLeading(Category category) {
switch (category) {
case Category.obstUndGemuese:
return const Text("🍅");
case Category.brotCerealienUndAufstriche:
return const Text(
'🍞',
style: TextStyle(fontSize: 24),
);
case Category.drogerieUndHaushalt:
case Category.getraenke:
case Category.kochenUndBacken:
case Category.pfand:
case Category.suessesUndKnabbereien:
case Category.oeleSossenUndGewuerze:
default:
return const Icon(Icons.error);
}
}
} }

View file

@ -11,6 +11,7 @@ todo:
- farbliche Hervorhebungen - farbliche Hervorhebungen
- semanticLabels, Screenreader - semanticLabels, Screenreader
- monatliche Aufladung: ausstehende Beträge - monatliche Aufladung: ausstehende Beträge
- Icons: maybe flutter awesome
*/ */
class Finance extends StatelessWidget { class Finance extends StatelessWidget {
@ -45,40 +46,17 @@ class Finance extends StatelessWidget {
leading: getIcon(SampleData().transactions[index].type), leading: getIcon(SampleData().transactions[index].type),
title: Text( title: Text(
gettitle(SampleData().transactions[index].type)), gettitle(SampleData().transactions[index].type)),
subtitle: getSubtitle(index), subtitle: getSubtitle(SampleData().transactions[index]),
trailing: SampleData().transactions[index].type == trailing: getTrailing(context, index),
TransaktionArt.einkauf onTap: (SampleData().transactions[index].basket != null)
? PopupMenuButton( ? () {
onSelected: (value) {},
itemBuilder: (BuildContext context) =>
<PopupMenuEntry<String>>[
const PopupMenuItem<String>(
value: 'Option',
child: ListTile(
leading: Icon(Icons.manage_history),
title: Text('Warenkorb bearbeiten')),
),
const PopupMenuItem<String>(
value: 'Option',
child: ListTile(
leading:
Icon(Icons.remove_shopping_cart),
title: Text('Einkauf stornieren')),
),
],
)
: null,
onTap: () {
if (SampleData().transactions[index].basket != null) {
showBottomSheet( showBottomSheet(
context: context, context: context,
builder: (BuildContext context) { builder: (BuildContext context) {
return ShowBasket( return ShowBasket(index);
transaction:
SampleData().transactions[index]);
}); });
} }
})); : null));
} else { } else {
return null; return null;
} }
@ -94,17 +72,19 @@ class Finance extends StatelessWidget {
case TransaktionArt.korrektur: case TransaktionArt.korrektur:
return 'Korrektur'; return 'Korrektur';
case TransaktionArt.monatlBeitrag: case TransaktionArt.monatlBeitrag:
return 'monatlicher Beitrag'; return 'Monatlicher Beitrag';
default:
return 'Ein Error ist aufgetreten';
} }
} }
Text getSubtitle(int index) { Text getSubtitle(Transaction transaction) {
String text = '${SampleData().transactions[index].amount / 100}'; String text = '${transaction.amount / 100}';
text += ''; text += '';
text += DateFormat("EEEE, dd. MMMM yyyy HH:mm", 'de_DE') text += DateFormat("EEEE, dd. MMMM yyyy HH:mm", 'de_DE')
.format(SampleData().transactions[index].date); .format(transaction.date);
if (SampleData().transactions[index].description != null) { if (transaction.description != null) {
(text += '\n${SampleData().transactions[index].description}'); (text += '\n${transaction.description}');
} }
return Text(text); return Text(text);
@ -116,10 +96,42 @@ class Finance extends StatelessWidget {
return const Icon(Icons.savings); return const Icon(Icons.savings);
case TransaktionArt.einkauf: case TransaktionArt.einkauf:
return const Icon(Icons.shopping_basket); return const Icon(Icons.shopping_basket);
case TransaktionArt.korrektur:
return const Icon(Icons.priority_high);
case TransaktionArt.monatlBeitrag: case TransaktionArt.monatlBeitrag:
return const Icon(Icons.payment); return const Icon(Icons.payment);
default:
return const Icon(Icons.priority_high);
}
}
getTrailing(BuildContext context, int index) {
if (SampleData().transactions[index].type == TransaktionArt.einkauf) {
return PopupMenuButton(
onSelected: (value) {
if (value == 'edit') {
showBottomSheet(
context: context,
builder: (BuildContext context) {
return ShowBasket(index, editable: true);
});
}
},
itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
const PopupMenuItem<String>(
value: 'edit',
child: ListTile(
leading: Icon(Icons.manage_history),
title: Text('Warenkorb bearbeiten')),
),
const PopupMenuItem<String>(
value: 'delete',
child: ListTile(
leading: Icon(Icons.remove_shopping_cart),
title: Text('Einkauf stornieren')),
),
],
);
} else {
return null;
} }
} }
} }

View file

@ -27,7 +27,7 @@ class MyApp extends StatelessWidget {
brightness: Brightness.dark, brightness: Brightness.dark,
seedColor: const Color(0xff5f7c61), seedColor: const Color(0xff5f7c61),
)), )),
themeMode: ThemeMode.dark, themeMode: ThemeMode.system,
home: const MyHomePage(), home: const MyHomePage(),
); );
} }

View file

@ -59,6 +59,13 @@ class SampleData {
]; ];
static List<Basket> basket = [ static List<Basket> basket = [
Basket(products[0], 20),
Basket(products[1], 2200),
Basket(products[2], 2),
Basket(products[3], 1),
Basket(products[4], 1),
Basket(products[5], 2),
Basket(products[6], 222),
Basket(products[0], 20), Basket(products[0], 20),
Basket(products[1], 2200), Basket(products[1], 2200),
Basket(products[2], 2), Basket(products[2], 2),