jonaszbigda/menui_mobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

visual improvements / icons wrap / hours wrap / autocomplete fix

Browse Source
This commit is contained in:
Jonasz Bigda
2020-12-27 21:23:24 +01:00
parent 223feb8c5c
commit fa15a161ae
6 changed files with 529 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

347
lib/components/dishView.dart
View File

@@ -10,146 +10,224 @@ class DishView extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Scaffold(
body: Container(
decoration: BoxDecoration(color: Colors.grey[850]),
child: Column(
children: <Widget>[
Container(
decoration: BoxDecoration(
image: DecorationImage(
image: NetworkImage(
dish.imgUrl,
body: Container(
decoration: BoxDecoration(color: Colors.grey[850]),
child: ListView(
children: <Widget>[
Column(
children: <Widget>[
Container(
decoration: BoxDecoration(
image: DecorationImage(
image: NetworkImage(
dish.imgUrl,
),
fit: BoxFit.cover),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
SizedBox(
height: 160,
width: double.infinity,
),
Container(
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.grey[850],
borderRadius:
BorderRadius.all(Radius.circular(8))),
child: Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Icon(
Icons.restaurant,
color: Colors.orange,
),
SizedBox(
width: 8,
),
Text(
dish.name,
style: TextStyle(
fontSize: 24,
color: Colors.white,
fontWeight: FontWeight.w300),
),
],
),
margin: EdgeInsets.all(12),
)
],
),
),
fit: BoxFit.cover),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
SizedBox(
height: 160,
width: double.infinity,
),
Container(
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.grey[850],
borderRadius: BorderRadius.all(Radius.circular(8))),
child: Row(
mainAxisSize: MainAxisSize.min,
SizedBox(
height: 6,
),
if (dish.allergens.hasAllergens()) SizedBox(height: 8),
if (dish.allergens.hasAllergens())
Text(
'Może zawierać',
style: TextStyle(color: Colors.orange, fontSize: 14),
),
Allergens(allergens: dish.allergens),
if (dish.allergens.hasAllergens())
Divider(
height: 14,
thickness: 4,
),
SizedBox(
height: 8,
),
Prices(prices: dish.prices),
SizedBox(
height: 8,
),
Divider(
height: 14,
thickness: 4,
),
SizedBox(
height: 6,
),
Text(
'Składniki',
style: TextStyle(color: Colors.orange, fontSize: 14),
),
SizedBox(
height: 12,
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 12),
child: Text(
'${dish.ingredients}',
style: TextStyle(color: Colors.grey[200], fontSize: 12),
textAlign: TextAlign.center,
),
),
SizedBox(
height: 6,
),
Divider(
height: 14,
thickness: 4,
),
SizedBox(
height: 6,
),
Wrap(
spacing: 10,
children: <Widget>[
Icon(
Icons.restaurant,
color: Colors.orange,
),
SizedBox(
width: 8,
),
Text(
dish.name,
style: TextStyle(
fontSize: 24,
color: Colors.white,
fontWeight: FontWeight.w300),
),
IconChip(
icon: Icons.battery_charging_full,
leading: "Wartość energetyczna",
value: (() {
if (dish.kCal != "") {
return dish.kCal + " kcal";
} else {
return "";
}
}())),
IconChip(
icon: Icons.cake,
leading: "Indeks glikemiczny",
value: dish.glicemicIndex),
],
),
margin: EdgeInsets.all(12),
)
],
),
),
SizedBox(height: 8),
Text(
'Może zawierać',
style: TextStyle(color: Colors.orange, fontSize: 14),
),
Allergens(allergens: dish.allergens),
Divider(
height: 14,
thickness: 4,
),
SizedBox(
height: 8,
),
Prices(prices: dish.prices),
SizedBox(
height: 8,
),
Divider(
height: 14,
thickness: 4,
),
SizedBox(
height: 6,
),
Text(
'Składniki',
style: TextStyle(color: Colors.orange, fontSize: 14),
),
SizedBox(
height: 12,
),
Text(
'${dish.ingredients}',
style: TextStyle(color: Colors.grey[200], fontSize: 12),
),
SizedBox(
height: 6,
),
Divider(
height: 14,
thickness: 4,
),
SizedBox(
height: 6,
),
Wrap(
spacing: 10,
children: <Widget>[
IconChip(
icon: Icons.battery_charging_full,
leading: "Wartość energetyczna",
value: dish.kCal),
IconChip(
icon: Icons.cake,
leading: "Indeks glikemiczny",
value: dish.glicemicIndex),
SizedBox(
height: 12,
),
if (dish.notes != "")
Text(
'Uwagi',
style: TextStyle(color: Colors.orange, fontSize: 14),
),
SizedBox(
height: 12,
),
if (dish.notes != "")
Text(
'${dish.notes}',
style: TextStyle(color: Colors.grey[200], fontSize: 12),
),
if (dish.vegan)
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.info_rounded,
color: Colors.grey,
),
SizedBox(
width: 6,
),
Text(
'Danie wegańskie',
style: TextStyle(
color: Colors.grey[200], fontSize: 12),
),
],
),
if (dish.vegetarian)
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.info_rounded,
color: Colors.grey,
),
SizedBox(
width: 6,
),
Text(
'Danie wegetariańskie',
style: TextStyle(
color: Colors.grey[200], fontSize: 12),
),
],
),
],
),
SizedBox(
height: 28,
)
],
),
SizedBox(
height: 12,
),
Text(
'Uwagi',
style: TextStyle(color: Colors.orange, fontSize: 14),
),
SizedBox(
height: 12,
),
if (dish.notes == "")
Text(
'---',
style: TextStyle(color: Colors.grey[200], fontSize: 12),
)),
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
floatingActionButton: Stack(
children: <Widget>[
Align(
alignment: Alignment.bottomLeft,
child: Padding(
padding: EdgeInsets.only(left: 18),
child: FloatingActionButton(
heroTag: null,
backgroundColor: Colors.grey[900],
child: Icon(
Icons.arrow_back_rounded,
color: Colors.orange,
),
onPressed: () => Navigator.pop(context),
),
),
if (dish.notes != "")
Text(
'${dish.notes}',
style: TextStyle(color: Colors.grey[200], fontSize: 12),
),
if (dish.vegan)
Text(
'Danie wegańskie',
style: TextStyle(color: Colors.grey[200], fontSize: 12),
),
if (dish.vegetarian)
Text(
'Danie wegetariańskie',
style: TextStyle(color: Colors.grey[200], fontSize: 12),
),
Align(
alignment: Alignment.bottomRight,
child: Padding(
padding: EdgeInsets.only(right: 18),
child: FloatingActionButton(
heroTag: null,
backgroundColor: Colors.grey[900],
child: Icon(
Icons.favorite_rounded,
color: Colors.orange,
),
onPressed: () {},
),
),
)
],
),
),
);
));
}
}
@@ -161,7 +239,7 @@ class Prices extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
if (prices.price1.priceName == "")
Container(
@@ -185,6 +263,7 @@ class Prices extends StatelessWidget {
),
if (prices.price1.priceName != "")
Container(
margin: EdgeInsets.all(10),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.grey[800],
@@ -209,6 +288,7 @@ class Prices extends StatelessWidget {
),
if (prices.price2.priceName != "")
Container(
margin: EdgeInsets.all(10),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.grey[800],
@@ -233,6 +313,7 @@ class Prices extends StatelessWidget {
),
if (prices.price3.priceName != "")
Container(
margin: EdgeInsets.all(10),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.grey[800],