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

fixes (cosmetic)

Browse Source
This commit is contained in:
Jonasz Bigda
2020-12-10 18:59:55 +01:00
parent db2563e3db
commit de1c5ba070
4 changed files with 59 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/components/lineOfAllergens.dart
View File

@@ -3,7 +3,9 @@ import '../services.dart';
class Allergens extends StatelessWidget { class Allergens extends StatelessWidget {
final MenuiAllergens allergens; final MenuiAllergens allergens;
final double edgeInsets = 6; final double edgeInsets = 4;
final double imagesWidth = 14;
final double fontSize = 8;
Allergens({@required this.allergens}); Allergens({@required this.allergens});
@@ -22,13 +24,14 @@ class Allergens extends StatelessWidget {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
'img/i_eggs.png', 'img/i_eggs.png',
width: 18, width: imagesWidth,
), ),
height: 26, height: 26,
), ),
Text( Text(
'Jaja', 'Jaja',
style: TextStyle(fontSize: 10, color: Colors.grey), style:
TextStyle(fontSize: fontSize, color: Colors.grey[300]),
) )
], ],
)), )),
@@ -41,13 +44,14 @@ class Allergens extends StatelessWidget {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
'img/i_gluten.png', 'img/i_gluten.png',
width: 18, width: imagesWidth,
), ),
height: 26, height: 26,
), ),
Text( Text(
'Gluten', 'Gluten',
style: TextStyle(fontSize: 10, color: Colors.grey), style:
TextStyle(fontSize: fontSize, color: Colors.grey[300]),
) )
], ],
)), )),
@@ -60,13 +64,14 @@ class Allergens extends StatelessWidget {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
'img/i_lactose.png', 'img/i_lactose.png',
width: 18, width: imagesWidth,
), ),
height: 26, height: 26,
), ),
Text( Text(
'Laktoza', 'Laktoza',
style: TextStyle(fontSize: 10, color: Colors.grey), style:
TextStyle(fontSize: fontSize, color: Colors.grey[300]),
) )
], ],
)), )),
@@ -79,13 +84,14 @@ class Allergens extends StatelessWidget {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
'img/i_peanuts.png', 'img/i_peanuts.png',
width: 18, width: imagesWidth,
), ),
height: 26, height: 26,
), ),
Text( Text(
'Orzechy', 'Orzechy',
style: TextStyle(fontSize: 10, color: Colors.grey), style:
TextStyle(fontSize: fontSize, color: Colors.grey[300]),
) )
], ],
)), )),
@@ -98,13 +104,14 @@ class Allergens extends StatelessWidget {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
'img/i_seaFood.png', 'img/i_seaFood.png',
width: 18, width: imagesWidth,
), ),
height: 26, height: 26,
), ),
Text( Text(
'Owoce morza', 'Owoce morza',
style: TextStyle(fontSize: 10, color: Colors.grey), style:
TextStyle(fontSize: fontSize, color: Colors.grey[300]),
) )
], ],
)), )),
@@ -117,13 +124,14 @@ class Allergens extends StatelessWidget {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
'img/i_sesame.png', 'img/i_sesame.png',
width: 18, width: imagesWidth,
), ),
height: 26, height: 26,
), ),
Text( Text(
'Sezam', 'Sezam',
style: TextStyle(fontSize: 10, color: Colors.grey), style:
TextStyle(fontSize: fontSize, color: Colors.grey[300]),
) )
], ],
)), )),
@@ -136,13 +144,14 @@ class Allergens extends StatelessWidget {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
'img/i_soy.png', 'img/i_soy.png',
width: 18, width: imagesWidth,
), ),
height: 26, height: 26,
), ),
Text( Text(
'Soja', 'Soja',
style: TextStyle(fontSize: 10, color: Colors.grey), style:
TextStyle(fontSize: fontSize, color: Colors.grey[300]),
) )
], ],
)), )),

45
lib/components/lineOfIcons.dart
View File

@@ -3,7 +3,9 @@ import '../services.dart';
class LineOfIcons extends StatelessWidget { class LineOfIcons extends StatelessWidget {
final MenuiTags tags; final MenuiTags tags;
final double edgeInsets = 6; final double edgeInsets = 4;
final double imagesWidth = 14;
final double fontSize = 8;
LineOfIcons({@required this.tags}); LineOfIcons({@required this.tags});
@@ -22,13 +24,14 @@ class LineOfIcons extends StatelessWidget {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
'img/i_alcohol.png', 'img/i_alcohol.png',
width: 18, width: imagesWidth,
), ),
height: 26, height: 26,
), ),
Text( Text(
'Alkohol', 'Alkohol',
style: TextStyle(fontSize: 10, color: Colors.grey), style:
TextStyle(fontSize: fontSize, color: Colors.grey[300]),
) )
], ],
)), )),
@@ -41,17 +44,19 @@ class LineOfIcons extends StatelessWidget {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
'img/i_card.png', 'img/i_card.png',
width: 18, width: imagesWidth,
), ),
height: 26, height: 26,
), ),
Text( Text(
'Płatność', 'Płatność',
style: TextStyle(fontSize: 10, color: Colors.grey), style:
TextStyle(fontSize: fontSize, color: Colors.grey[300]),
), ),
Text( Text(
'kartą', 'kartą',
style: TextStyle(fontSize: 10, color: Colors.grey), style:
TextStyle(fontSize: fontSize, color: Colors.grey[300]),
) )
], ],
)), )),
@@ -64,13 +69,14 @@ class LineOfIcons extends StatelessWidget {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
'img/i_delivery.png', 'img/i_delivery.png',
width: 18, width: imagesWidth,
), ),
height: 26, height: 26,
), ),
Text( Text(
'Dowozimy', 'Dowozimy',
style: TextStyle(fontSize: 10, color: Colors.grey), style:
TextStyle(fontSize: fontSize, color: Colors.grey[300]),
) )
], ],
)), )),
@@ -83,13 +89,14 @@ class LineOfIcons extends StatelessWidget {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
'img/i_glutenFree.png', 'img/i_glutenFree.png',
width: 18, width: imagesWidth,
), ),
height: 26, height: 26,
), ),
Text( Text(
'Bezglutenowe', 'Bezglutenowe',
style: TextStyle(fontSize: 10, color: Colors.grey), style:
TextStyle(fontSize: fontSize, color: Colors.grey[300]),
) )
], ],
)), )),
@@ -102,17 +109,19 @@ class LineOfIcons extends StatelessWidget {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
'img/i_pets.png', 'img/i_pets.png',
width: 18, width: imagesWidth,
), ),
height: 26, height: 26,
), ),
Text( Text(
'Lubimy', 'Lubimy',
style: TextStyle(fontSize: 10, color: Colors.grey), style:
TextStyle(fontSize: fontSize, color: Colors.grey[300]),
), ),
Text( Text(
'zwierzaczki', 'zwierzaczki',
style: TextStyle(fontSize: 10, color: Colors.grey), style:
TextStyle(fontSize: fontSize, color: Colors.grey[300]),
) )
], ],
)), )),
@@ -125,13 +134,14 @@ class LineOfIcons extends StatelessWidget {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
'img/i_vegan.png', 'img/i_vegan.png',
width: 18, width: imagesWidth,
), ),
height: 26, height: 26,
), ),
Text( Text(
'Wegańskie', 'Wegańskie',
style: TextStyle(fontSize: 10, color: Colors.grey), style:
TextStyle(fontSize: fontSize, color: Colors.grey[300]),
) )
], ],
)), )),
@@ -144,13 +154,14 @@ class LineOfIcons extends StatelessWidget {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
'img/i_vegetarian.png', 'img/i_vegetarian.png',
width: 18, width: imagesWidth,
), ),
height: 26, height: 26,
), ),
Text( Text(
'Wegetariańskie', 'Wegetariańskie',
style: TextStyle(fontSize: 10, color: Colors.grey), style:
TextStyle(fontSize: fontSize, color: Colors.grey[300]),
) )
], ],
)), )),

12
lib/components/restaurantView.dart
View File

@@ -127,7 +127,7 @@ class RestaurantView extends StatelessWidget {
TextStyle(color: Colors.orange, fontSize: 14), TextStyle(color: Colors.orange, fontSize: 14),
), ),
SizedBox( SizedBox(
height: 12, height: 6,
), ),
MenuiDoubleColorText( MenuiDoubleColorText(
leading: 'Kuchnia: ', leading: 'Kuchnia: ',
@@ -143,7 +143,7 @@ class RestaurantView extends StatelessWidget {
following: '${restaurant.phone}', following: '${restaurant.phone}',
), ),
SizedBox( SizedBox(
height: 12, height: 6,
), ),
Text( Text(
'Godziny otwarcia', 'Godziny otwarcia',
@@ -151,12 +151,12 @@ class RestaurantView extends StatelessWidget {
TextStyle(color: Colors.orange, fontSize: 14), TextStyle(color: Colors.orange, fontSize: 14),
), ),
SizedBox( SizedBox(
height: 12, height: 6,
), ),
WorkingHoursList( WorkingHoursList(
workingHours: restaurant.workingHours), workingHours: restaurant.workingHours),
SizedBox( SizedBox(
height: 12, height: 6,
), ),
Text( Text(
'Social media', 'Social media',
@@ -164,11 +164,11 @@ class RestaurantView extends StatelessWidget {
TextStyle(color: Colors.orange, fontSize: 14), TextStyle(color: Colors.orange, fontSize: 14),
), ),
SizedBox( SizedBox(
height: 12, height: 6,
), ),
SocialMedia(links: restaurant.links), SocialMedia(links: restaurant.links),
SizedBox( SizedBox(
height: 12, height: 6,
), ),
], ],
), ),

2
lib/services.dart
View File

@@ -151,7 +151,7 @@ class MenuiServices {
double lat, double lng) async { double lat, double lng) async {
final radius = await settings.getRadius(); final radius = await settings.getRadius();
final response = await http final response = await http
.get('${backendURL}search/location?lon=$lng&lat=$lat&radius=$radius'); .get('${backendURL}search/location?lon=$lat&lat=$lng&radius=$radius');
if (response.statusCode == 200 || response.statusCode == 304) { if (response.statusCode == 200 || response.statusCode == 304) {
final List decoded = jsonDecode(response.body); final List decoded = jsonDecode(response.body);
List<Restaurant> results = []; List<Restaurant> results = [];