sfja/h4-projekt-gruppe-0-sm
1
0
Fork 0
mirror of https://github.com/Mercantec-GHC/h4-projekt-gruppe-0-sm.git synced 2025-04-28 08:44:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

wrap pages in SafeArea widget

Browse Source
This commit is contained in:
Mikkel Troels Kongsted 2025-03-06 10:55:20 +01:00
parent 3991b835fd
commit f58dfae118
4 changed files with 293 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mobile/lib/pages/cart_page.dart
View File

@ -149,8 +149,7 @@ class CartPage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SafeArea( return Column(
child: Column(
children: [ children: [
Expanded( Expanded(
child: Consumer<CartRepo>( child: Consumer<CartRepo>(
@ -170,8 +169,7 @@ class CartPage extends StatelessWidget {
), ),
), ),
Container( Container(
decoration: decoration: const BoxDecoration(color: Color(0xFFFFFFFF), boxShadow: [
const BoxDecoration(color: Color(0xFFFFFFFF), boxShadow: [
BoxShadow( BoxShadow(
blurRadius: 10, blurRadius: 10,
spreadRadius: -4, spreadRadius: -4,
@ -190,8 +188,7 @@ class CartPage extends StatelessWidget {
final inputController = TextEditingController(); final inputController = TextEditingController();
showDialog( showDialog(
context: context, context: context,
builder: (BuildContext context) => builder: (BuildContext context) => AlertDialog(
AlertDialog(
title: const Text( title: const Text(
"Indtast stregkode nummer"), "Indtast stregkode nummer"),
content: TextField( content: TextField(
@ -209,11 +206,9 @@ class CartPage extends StatelessWidget {
context.read<ProductRepo>(); context.read<ProductRepo>();
final CartRepo cartRepo = final CartRepo cartRepo =
context.read<CartRepo>(); context.read<CartRepo>();
final productResult = final productResult = productRepo
productRepo
.productWithBarcode( .productWithBarcode(
inputController inputController.text);
.text);
switch (productResult) { switch (productResult) {
case Ok<Product, String>(): case Ok<Product, String>():
cartRepo.addToCart( cartRepo.addToCart(
@ -221,15 +216,13 @@ class CartPage extends StatelessWidget {
final snackBar = SnackBar( final snackBar = SnackBar(
content: Text( content: Text(
"Tilføjet ${productResult.value.name} til indkøbskurven")); "Tilføjet ${productResult.value.name} til indkøbskurven"));
ScaffoldMessenger.of( ScaffoldMessenger.of(context)
context)
.showSnackBar(snackBar); .showSnackBar(snackBar);
case Err<Product, String>(): case Err<Product, String>():
final snackBar = const SnackBar( final snackBar = const SnackBar(
content: Text( content: Text(
"Den indtastede stregkode eksistere ikke")); "Den indtastede stregkode eksistere ikke"));
ScaffoldMessenger.of( ScaffoldMessenger.of(context)
context)
.showSnackBar(snackBar); .showSnackBar(snackBar);
} }
Navigator.of(context).pop(); Navigator.of(context).pop();
@ -270,8 +263,7 @@ class CartPage extends StatelessWidget {
} }
final CartRepo cartRepo = final CartRepo cartRepo =
context.read<CartRepo>(); context.read<CartRepo>();
final productRepo = final productRepo = context.read<ProductRepo>();
context.read<ProductRepo>();
final productResult = productRepo final productResult = productRepo
.productWithBarcode(result.rawContent); .productWithBarcode(result.rawContent);
switch (productResult) { switch (productResult) {
@ -333,7 +325,6 @@ class CartPage extends StatelessWidget {
), ),
), ),
], ],
),
); );
} }
} }

2
mobile/lib/pages/dashboard.dart
View File

@ -63,7 +63,7 @@ class Dashboard extends StatelessWidget {
label: "Kvitteringer") label: "Kvitteringer")
], ],
), ),
body: pages[currentIndex], body: SafeArea(child: pages[currentIndex]),
); );
} }
} }

4
mobile/lib/pages/home_page.dart
View File

@ -10,8 +10,7 @@ class HomePage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SafeArea( return Column(
child: Column(
children: [ children: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
@ -52,7 +51,6 @@ class HomePage extends StatelessWidget {
), ),
), ),
], ],
),
); );
} }
} }

13
mobile/lib/pages/product_page.dart
View File

@ -17,7 +17,8 @@ class ProductPage extends StatelessWidget {
final AddToCartStateRepo addToCartStateRepo = final AddToCartStateRepo addToCartStateRepo =
context.watch<AddToCartStateRepo>(); context.watch<AddToCartStateRepo>();
return Scaffold( return Scaffold(
body: Card( body: SafeArea(
child: Card(
color: Colors.white, color: Colors.white,
margin: const EdgeInsets.all(10), margin: const EdgeInsets.all(10),
child: Container( child: Container(
@ -56,7 +57,8 @@ class ProductPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
Image( Image(
image: AssetImage("assets/products/${product.name}.png"), image:
AssetImage("assets/products/${product.name}.png"),
errorBuilder: (_, __, ___) => const Image( errorBuilder: (_, __, ___) => const Image(
image: AssetImage("assets/placeholder.png")), image: AssetImage("assets/placeholder.png")),
height: 250, height: 250,
@ -90,10 +92,12 @@ class ProductPage extends StatelessWidget {
'Tilføjet ${addToCartStateRepo.currentAmount} ${product.name} til kurven'), 'Tilføjet ${addToCartStateRepo.currentAmount} ${product.name} til kurven'),
duration: const Duration(seconds: 2), duration: const Duration(seconds: 2),
); );
ScaffoldMessenger.of(context).removeCurrentSnackBar(); ScaffoldMessenger.of(context)
.removeCurrentSnackBar();
final cartRepo = context.read<CartRepo>(); final cartRepo = context.read<CartRepo>();
cartRepo.addToCart(product); cartRepo.addToCart(product);
ScaffoldMessenger.of(context).showSnackBar(snackBar); ScaffoldMessenger.of(context)
.showSnackBar(snackBar);
}, },
child: const Text("Tilføj til indkøbskurv")), child: const Text("Tilføj til indkøbskurv")),
], ],
@ -103,6 +107,7 @@ class ProductPage extends StatelessWidget {
]), ]),
), ),
), ),
),
); );
} }
} }