Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions lib/features/edit_meal/presentation/edit_meal_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class _EditMealScreenState extends State<EditMealScreen> {

// TODO: Add base quantity and unit
String baseQuantity = "100";
String baseQuantityUnit = " g/ml";
String baseQuantityUnit = "g/ml";

@override
void initState() {
Expand Down Expand Up @@ -243,7 +243,7 @@ class _EditMealScreenState extends State<EditMealScreen> {
inputFormatters: CustomTextInputFormatter.doubleOnly(),
decoration: InputDecoration(
labelText:
S.of(context).mealKcalLabel + baseQuantity + baseQuantityUnit,
"${S.of(context).mealKcalLabel} $baseQuantity $baseQuantityUnit",
border: const OutlineInputBorder(),
),
keyboardType: const TextInputType.numberWithOptions(decimal: true),
Expand All @@ -253,10 +253,9 @@ class _EditMealScreenState extends State<EditMealScreen> {
controller: _carbsTextController,
inputFormatters: CustomTextInputFormatter.doubleOnly(),
decoration: InputDecoration(
labelText:
S.of(context).mealCarbsLabel + baseQuantity + baseQuantityUnit,
border: const OutlineInputBorder(),
),
labelText:
"${S.of(context).mealCarbsLabel} $baseQuantity $baseQuantityUnit",
border: const OutlineInputBorder()),
keyboardType: const TextInputType.numberWithOptions(decimal: true),
),
const SizedBox(height: 16),
Expand All @@ -265,7 +264,7 @@ class _EditMealScreenState extends State<EditMealScreen> {
inputFormatters: CustomTextInputFormatter.doubleOnly(),
decoration: InputDecoration(
labelText:
S.of(context).mealFatLabel + baseQuantity + baseQuantityUnit,
"${S.of(context).mealFatLabel} $baseQuantity $baseQuantityUnit",
border: const OutlineInputBorder(),
),
keyboardType: const TextInputType.numberWithOptions(decimal: true),
Expand All @@ -275,11 +274,9 @@ class _EditMealScreenState extends State<EditMealScreen> {
controller: _proteinTextController,
inputFormatters: CustomTextInputFormatter.doubleOnly(),
decoration: InputDecoration(
labelText: S.of(context).mealProteinLabel +
baseQuantity +
baseQuantityUnit,
border: const OutlineInputBorder(),
),
labelText:
"${S.of(context).mealProteinLabel} $baseQuantity $baseQuantityUnit",
border: const OutlineInputBorder()),
keyboardType: const TextInputType.numberWithOptions(decimal: true),
),
],
Expand Down
11 changes: 4 additions & 7 deletions lib/generated/intl/messages_de.dart
Original file line number Diff line number Diff line change
Expand Up @@ -185,14 +185,11 @@ class MessageLookup extends MessageLookupByLibrary {
MessageLookupByLibrary.simpleMessage('Makronährstoff-Verteilung:'),
'mealBrandsLabel': MessageLookupByLibrary.simpleMessage('Marken'),
'mealCarbsLabel':
MessageLookupByLibrary.simpleMessage('Kohlenhydrate pro 100 g/ml'),
'mealFatLabel':
MessageLookupByLibrary.simpleMessage('Fett pro 100 g/ml'),
'mealKcalLabel':
MessageLookupByLibrary.simpleMessage('kcal pro 100 g/ml'),
MessageLookupByLibrary.simpleMessage('Kohlenhydrate pro'),
'mealFatLabel': MessageLookupByLibrary.simpleMessage('Fett pro'),
'mealKcalLabel': MessageLookupByLibrary.simpleMessage('kcal pro'),
'mealNameLabel': MessageLookupByLibrary.simpleMessage('Mahlzeitenname'),
'mealProteinLabel':
MessageLookupByLibrary.simpleMessage('Protein pro 100 g/ml'),
'mealProteinLabel': MessageLookupByLibrary.simpleMessage('Protein pro'),
'mealSizeLabel':
MessageLookupByLibrary.simpleMessage('Mahlzeitsgröße (g/ml)'),
'mealSizeLabelImperial':
Expand Down
3 changes: 1 addition & 2 deletions lib/generated/intl/messages_en.dart
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,7 @@ class MessageLookup extends MessageLookupByLibrary {
'mealFatLabel': MessageLookupByLibrary.simpleMessage('fat per'),
'mealKcalLabel': MessageLookupByLibrary.simpleMessage('kcal per'),
'mealNameLabel': MessageLookupByLibrary.simpleMessage('Meal name'),
'mealProteinLabel':
MessageLookupByLibrary.simpleMessage('protein per 100 g/ml'),
'mealProteinLabel': MessageLookupByLibrary.simpleMessage('protein per'),
'mealSizeLabel':
MessageLookupByLibrary.simpleMessage('Meal size (g/ml)'),
'mealSizeLabelImperial':
Expand Down
2 changes: 1 addition & 1 deletion lib/generated/intl/messages_tr.dart
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ class MessageLookup extends MessageLookupByLibrary {
'mealKcalLabel': MessageLookupByLibrary.simpleMessage('kcal başına'),
'mealNameLabel': MessageLookupByLibrary.simpleMessage('Yemek adı'),
'mealProteinLabel':
MessageLookupByLibrary.simpleMessage('protein başına 100 g/ml'),
MessageLookupByLibrary.simpleMessage('protein başına'),
'mealSizeLabel':
MessageLookupByLibrary.simpleMessage('Yemek boyutu (g/ml)'),
'mealSizeLabelImperial':
Expand Down
10 changes: 5 additions & 5 deletions lib/l10n/intl_de.arb
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,10 @@
"servingSizeLabelMetric": "Portionsgröße (g/ml)",
"servingSizeLabelImperial": "Portionsgröße (oz/fl oz)",
"mealUnitLabel": "Mahlzeiteinheit",
"mealKcalLabel": "kcal pro 100 g/ml",
"mealCarbsLabel": "Kohlenhydrate pro 100 g/ml",
"mealFatLabel": "Fett pro 100 g/ml",
"mealProteinLabel": "Protein pro 100 g/ml",
"mealKcalLabel": "kcal pro",
"mealCarbsLabel": "Kohlenhydrate pro",
"mealFatLabel": "Fett pro",
"mealProteinLabel": "Protein pro",
"errorMealSave": "Fehler beim Speichern der Mahlzeit. Haben Sie die korrekten Mahlzeiteninformationen eingegeben?",
"bmiLabel": "BMI",
"bmiInfo": "Der Body-Mass-Index (BMI) ist ein Index zur Klassifizierung von Übergewicht und Fettleibigkeit bei Erwachsenen. Er wird berechnet, indem das Gewicht in Kilogramm durch das Quadrat der Körpergröße in Metern (kg/m²) geteilt wird.\n\nDer BMI unterscheidet nicht zwischen Fett- und Muskelmasse und kann für einige Personen irreführend sein.",
Expand Down Expand Up @@ -402,4 +402,4 @@
"paSkiingGeneralDesc": "allgemein",
"paSnowShovingModerate": "Schnee schaufeln",
"paSnowShovingModerateDesc": "manuell, mäßige Anstrengung"
}
}
4 changes: 2 additions & 2 deletions lib/l10n/intl_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
"mealKcalLabel": "kcal per",
"mealCarbsLabel": "carbs per",
"mealFatLabel": "fat per",
"mealProteinLabel": "protein per 100 g/ml",
"mealProteinLabel": "protein per",
"errorMealSave": "Error while saving meal. Did you input the correct meal information?",
"bmiLabel": "BMI",
"bmiInfo": "Body Mass Index (BMI) is a index to classify overweight and obesity in adults. It is defined as weight in kilograms divided by the square of height in meters (kg/m²).\n\nBMI does not differentiate between fat and muscle mass and can be misleading for some individuals.",
Expand Down Expand Up @@ -412,4 +412,4 @@
"paSkiingGeneralDesc": "general",
"paSnowShovingModerate": "snow shoveling",
"paSnowShovingModerateDesc": "by hand, moderate effort"
}
}
2 changes: 1 addition & 1 deletion lib/l10n/intl_tr.arb
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
"mealKcalLabel": "kcal başına",
"mealCarbsLabel": "karbonhidrat başına",
"mealFatLabel": "yağ başına",
"mealProteinLabel": "protein başına 100 g/ml",
"mealProteinLabel": "protein başına",
"errorMealSave": "Yemek kaydedilirken hata oluştu. Doğru yemek bilgilerini girdiniz mi?",
"bmiLabel": "BMI",
"bmiInfo": "Vücut Kitle İndeksi (BMI), yetişkinlerde aşırı kiloyu ve obeziteyi sınıflandırmak için kullanılan bir indekstir. Kilogram cinsinden ağırlığın, metre cinsinden boyun karesine bölünmesiyle tanımlanır (kg/m²).\n\nBMI, yağ ve kas kütlesi arasında ayrım yapmaz ve bazı bireyler için yanıltıcı olabilir.",
Expand Down