diff --git a/lib/components/lineOfAllergens.dart b/lib/components/lineOfAllergens.dart index 0d92fa5..6287e02 100644 --- a/lib/components/lineOfAllergens.dart +++ b/lib/components/lineOfAllergens.dart @@ -3,7 +3,9 @@ import '../services.dart'; class Allergens extends StatelessWidget { final MenuiAllergens allergens; - final double edgeInsets = 6; + final double edgeInsets = 4; + final double imagesWidth = 14; + final double fontSize = 8; Allergens({@required this.allergens}); @@ -22,13 +24,14 @@ class Allergens extends StatelessWidget { alignment: Alignment.center, child: Image.asset( 'img/i_eggs.png', - width: 18, + width: imagesWidth, ), height: 26, ), Text( '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, child: Image.asset( 'img/i_gluten.png', - width: 18, + width: imagesWidth, ), height: 26, ), Text( '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, child: Image.asset( 'img/i_lactose.png', - width: 18, + width: imagesWidth, ), height: 26, ), Text( '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, child: Image.asset( 'img/i_peanuts.png', - width: 18, + width: imagesWidth, ), height: 26, ), Text( '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, child: Image.asset( 'img/i_seaFood.png', - width: 18, + width: imagesWidth, ), height: 26, ), Text( '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, child: Image.asset( 'img/i_sesame.png', - width: 18, + width: imagesWidth, ), height: 26, ), Text( '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, child: Image.asset( 'img/i_soy.png', - width: 18, + width: imagesWidth, ), height: 26, ), Text( 'Soja', - style: TextStyle(fontSize: 10, color: Colors.grey), + style: + TextStyle(fontSize: fontSize, color: Colors.grey[300]), ) ], )), diff --git a/lib/components/lineOfIcons.dart b/lib/components/lineOfIcons.dart index bee2b58..a7ba066 100644 --- a/lib/components/lineOfIcons.dart +++ b/lib/components/lineOfIcons.dart @@ -3,7 +3,9 @@ import '../services.dart'; class LineOfIcons extends StatelessWidget { final MenuiTags tags; - final double edgeInsets = 6; + final double edgeInsets = 4; + final double imagesWidth = 14; + final double fontSize = 8; LineOfIcons({@required this.tags}); @@ -22,13 +24,14 @@ class LineOfIcons extends StatelessWidget { alignment: Alignment.center, child: Image.asset( 'img/i_alcohol.png', - width: 18, + width: imagesWidth, ), height: 26, ), Text( '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, child: Image.asset( 'img/i_card.png', - width: 18, + width: imagesWidth, ), height: 26, ), Text( 'Płatność', - style: TextStyle(fontSize: 10, color: Colors.grey), + style: + TextStyle(fontSize: fontSize, color: Colors.grey[300]), ), Text( '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, child: Image.asset( 'img/i_delivery.png', - width: 18, + width: imagesWidth, ), height: 26, ), Text( '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, child: Image.asset( 'img/i_glutenFree.png', - width: 18, + width: imagesWidth, ), height: 26, ), Text( '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, child: Image.asset( 'img/i_pets.png', - width: 18, + width: imagesWidth, ), height: 26, ), Text( 'Lubimy', - style: TextStyle(fontSize: 10, color: Colors.grey), + style: + TextStyle(fontSize: fontSize, color: Colors.grey[300]), ), Text( '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, child: Image.asset( 'img/i_vegan.png', - width: 18, + width: imagesWidth, ), height: 26, ), Text( '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, child: Image.asset( 'img/i_vegetarian.png', - width: 18, + width: imagesWidth, ), height: 26, ), Text( 'Wegetariańskie', - style: TextStyle(fontSize: 10, color: Colors.grey), + style: + TextStyle(fontSize: fontSize, color: Colors.grey[300]), ) ], )), diff --git a/lib/components/restaurantView.dart b/lib/components/restaurantView.dart index a61acb0..28d6b68 100644 --- a/lib/components/restaurantView.dart +++ b/lib/components/restaurantView.dart @@ -127,7 +127,7 @@ class RestaurantView extends StatelessWidget { TextStyle(color: Colors.orange, fontSize: 14), ), SizedBox( - height: 12, + height: 6, ), MenuiDoubleColorText( leading: 'Kuchnia: ', @@ -143,7 +143,7 @@ class RestaurantView extends StatelessWidget { following: '${restaurant.phone}', ), SizedBox( - height: 12, + height: 6, ), Text( 'Godziny otwarcia', @@ -151,12 +151,12 @@ class RestaurantView extends StatelessWidget { TextStyle(color: Colors.orange, fontSize: 14), ), SizedBox( - height: 12, + height: 6, ), WorkingHoursList( workingHours: restaurant.workingHours), SizedBox( - height: 12, + height: 6, ), Text( 'Social media', @@ -164,11 +164,11 @@ class RestaurantView extends StatelessWidget { TextStyle(color: Colors.orange, fontSize: 14), ), SizedBox( - height: 12, + height: 6, ), SocialMedia(links: restaurant.links), SizedBox( - height: 12, + height: 6, ), ], ), diff --git a/lib/services.dart b/lib/services.dart index 559100b..f6f4e02 100644 --- a/lib/services.dart +++ b/lib/services.dart @@ -151,7 +151,7 @@ class MenuiServices { double lat, double lng) async { final radius = await settings.getRadius(); 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) { final List decoded = jsonDecode(response.body); List results = [];