Merge remote-tracking branch 'refs/remotes/origin/feature/feed'

# Conflicts:
#	lib/app_router.dart
#	lib/locator_service.dart
This commit is contained in:
mso7nueh
2024-08-13 16:34:48 +03:00
12 changed files with 1232 additions and 85 deletions

View File

@@ -61,6 +61,19 @@ class AboutRecipesScreen extends StatelessWidget {
),
),
SizedBox(height: 12),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Text(
recipes.description,
style: TextStyle(
color: Colors.black,
fontSize: 14,
fontWeight: FontWeight.w400,
height: 1.2,
),
),
),
SizedBox(height: 12),
CachedNetworkImage(
imageUrl: baseUrl + '/storage/' + recipes.image,
),
@@ -124,7 +137,7 @@ class AboutRecipesScreen extends StatelessWidget {
_ingredient(Ingredient ingredient) {
return Text(
'• '+ ingredient.name + ' ' + ingredient.portion + ' ' + (ingredient.unit ?? ''),
'• ' + ingredient.name + ' ' + ingredient.portion + ' ' + (ingredient.unit ?? ''),
style: TextStyle(
color: Colors.black,
fontSize: 14,