Skip to content

Offline gym log for Android. No account, no ads, no internet.

Add categories and per-100 g values to your own foods

InlitX73ba26b9e59d
diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb
index 80d5b18..7b0cda0 100644
--- a/lib/l10n/app_ar.arb
+++ b/lib/l10n/app_ar.arb
@@ -596,6 +596,7 @@
"rpeHint": "10 = لا يمكن تكرار إضافي؛ 8 = نحو تكرارين احتياطيين.",
"superset": "سوبر سيت",
"supersetLink": "ربط بالتالي",
+ "supersetUnlink": "فصل عن التالي",
"supersetHint": "لا راحة بين التمارين المرتبطة — تنتقل مباشرة إلى التالي.",
"aiRoutine": "روتين بالذكاء الاصطناعي",
"aiIntro": "لا يتواصل GymMane مباشرةً مع أي ذكاء اصطناعي. تصدّر قائمة تمارينك وتلصقها في المساعد الذي تستخدمه ثم تستورد رده. لا شيء يغادر هاتفك تلقائيًا.",
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index 75181ec..242c306 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -596,6 +596,7 @@
"rpeHint": "10 bedeutet, dass keine Wiederholung mehr möglich ist; bei 8 bleiben zwei Wiederholungen übrig.",
"superset": "Supersatz",
"supersetLink": "Mit der nächsten Übung verknüpfen",
+ "supersetUnlink": "Von der nächsten Übung trennen",
"supersetHint": "Keine Pause zwischen verknüpften Übungen — du gehst direkt zur nächsten.",
"aiRoutine": "Trainingsplan mit KI",
"aiIntro": "GymMane spricht nie mit einer KI. Du exportierst deine Übungsliste, fügst sie in einen Assistenten deiner Wahl ein und importierst dessen Antwort wieder. Dein Handy sendet von selbst nichts nach außen.",
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index f15995e..888320a 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -712,6 +712,7 @@
"superset": "Superset",
"supersetLink": "Chain with the next one",
+ "supersetUnlink": "Unchain from the next one",
"supersetHint": "No rest between chained exercises — you go straight to the next one.",
"aiRoutine": "Routine with AI",
@@ -1322,6 +1323,7 @@
"per100": "per 100 {unit}",
"@per100": {"placeholders": {"unit": {"type": "String"}}},
"perServingShort": "per serving",
+ "foodCategory": "CATEGORY",
"portionUnit": "{count, plural, one{1 piece} other{{count} pieces}}",
"@portionUnit": {"placeholders": {"count": {"type": "int"}}},
"portionSlice": "{count, plural, one{1 slice} other{{count} slices}}",
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
index f4109dd..bc3f7f7 100644
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -596,6 +596,7 @@
"rpeHint": "10 es no poder con una más; 8, que te sobraban dos.",
"superset": "Superserie",
"supersetLink": "Encadenar con el siguiente",
+ "supersetUnlink": "Separar del siguiente",
"supersetHint": "Sin descanso entre los ejercicios encadenados: pasas directo al siguiente.",
"aiRoutine": "Rutina con IA",
"aiIntro": "GymMane no habla con ninguna IA. Tú sacas tu lista de ejercicios, la pegas en el asistente que ya uses y traes su respuesta de vuelta. Del móvil no sale nada solo.",
@@ -1119,6 +1120,7 @@
"ofGoal": "de {goal} {unit}",
"per100": "por 100 {unit}",
"perServingShort": "por ración",
+ "foodCategory": "CATEGORÍA",
"portionUnit": "{count, plural, =1{1 unidad} other{{count} unidades}}",
"portionSlice": "{count, plural, =1{1 loncha} other{{count} lonchas}}",
"portionScoop": "{count, plural, =1{1 cacito} other{{count} cacitos}}",
diff --git a/lib/l10n/app_fa.arb b/lib/l10n/app_fa.arb
index e96db82..c58ee78 100644
--- a/lib/l10n/app_fa.arb
+++ b/lib/l10n/app_fa.arb
@@ -596,6 +596,7 @@
"rpeHint": "۱۰ یعنی دیگر نمی‌توانی، ۸ یعنی دو تکرار مانده.",
"superset": "سوپرست",
"supersetLink": "وصل به بعدی",
+ "supersetUnlink": "جدا کردن از بعدی",
"supersetHint": "بین حرکات سوپرست استراحت نیست — مستقیم می‌روی سراغ بعدی.",
"aiRoutine": "روتین با AI",
"aiIntro": "Gymo هرگز با AI حرف نمی‌زند. فهرست حرکاتت را بیرون می‌بری، در هر دستیار که داری پیست می‌کنی، و جوابش را برمی‌گردانی. چیزی خودبه‌خود از گوشی خارج نمی‌شود.",
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index 5af95b8..c76ca83 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -596,6 +596,7 @@
"rpeHint": "10 = plus aucune répétition possible ; 8 = environ deux répétitions en réserve.",
"superset": "Superset",
"supersetLink": "Enchaîner avec le suivant",
+ "supersetUnlink": "Séparer du suivant",
"supersetHint": "Aucun repos entre les exercices enchaînés — tu passes directement au suivant.",
"aiRoutine": "Programme avec une IA",
"aiIntro": "GymMane ne communique jamais directement avec une IA. Tu exportes ta liste d’exercices, tu la colles dans l’assistant que tu utilises déjà, puis tu réimportes sa réponse. Rien ne quitte le téléphone tout seul.",
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
index 2778251..98ade6e 100644
--- a/lib/l10n/app_it.arb
+++ b/lib/l10n/app_it.arb
@@ -596,6 +596,7 @@
"rpeHint": "10 è non farne un'altra; 8, che te ne avanzavano due.",
"superset": "Superserie",
"supersetLink": "Concatena con il prossimo",
+ "supersetUnlink": "Separa dal prossimo",
"supersetHint": "Nessun riposo tra gli esercizi concatenati: passi dritto al prossimo.",
"aiRoutine": "Scheda con l'IA",
"aiIntro": "GymMane non parla con nessuna IA. Sei tu che esporti la tua lista di esercizi, la incolli nell'assistente che già usi e riporti dentro la sua risposta. Dal telefono non esce niente da solo.",
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
index d747438..2d7d7f3 100644
--- a/lib/l10n/app_ja.arb
+++ b/lib/l10n/app_ja.arb
@@ -596,6 +596,7 @@
"rpeHint": "10 = もう1回もできない;8 = あと約2回できる。",
"superset": "スーパーセット",
"supersetLink": "次と連結",
+ "supersetUnlink": "次との連結を解除",
"supersetHint": "連結した種目の間は休憩なし — そのまま次へ進みます。",
"aiRoutine": "AIでルーティン作成",
"aiIntro": "GymManeがAIと直接通信することはありません。種目リストを書き出し、普段使っているAIアシスタントに貼り付け、その回答を読み込みます。端末から自動で送信されるものはありません。",
diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arb
index f1d5376..10fc65b 100644
--- a/lib/l10n/app_ko.arb
+++ b/lib/l10n/app_ko.arb
@@ -596,6 +596,7 @@
"rpeHint": "10 = 더 이상 반복 불가; 8 = 약 2회 여유.",
"superset": "슈퍼세트",
"supersetLink": "다음과 연결",
+ "supersetUnlink": "다음과 연결 해제",
"supersetHint": "연결된 운동 사이에는 휴식 없이 바로 다음 운동으로 넘어갑니다.",
"aiRoutine": "AI 루틴",
"aiIntro": "GymMane은 AI와 직접 통신하지 않습니다. 운동 목록을 내보내고 이미 사용하는 AI 도우미에 붙여넣은 뒤 응답을 다시 가져옵니다. 어떤 데이터도 자동으로 휴대전화 밖으로 나가지 않습니다.",
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index 41fba16..07083a7 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -3700,6 +3700,12 @@ abstract class AppLocalizations {
/// **'Chain with the next one'**
String get supersetLink;
+ /// No description provided for @supersetUnlink.
+ ///
+ /// In en, this message translates to:
+ /// **'Unchain from the next one'**
+ String get supersetUnlink;
+
/// No description provided for @supersetHint.
///
/// In en, this message translates to:
@@ -6838,6 +6844,12 @@ abstract class AppLocalizations {
/// **'per serving'**
String get perServingShort;
+ /// No description provided for @foodCategory.
+ ///
+ /// In en, this message translates to:
+ /// **'CATEGORY'**
+ String get foodCategory;
+
/// No description provided for @portionUnit.
///
/// In en, this message translates to:
diff --git a/lib/l10n/app_localizations_ar.dart b/lib/l10n/app_localizations_ar.dart
index 684c41b..22bd115 100644
--- a/lib/l10n/app_localizations_ar.dart
+++ b/lib/l10n/app_localizations_ar.dart
@@ -2022,6 +2022,9 @@ class AppLocalizationsAr extends AppLocalizations {
@override
String get supersetLink => 'ربط بالتالي';
+ @override
+ String get supersetUnlink => 'فصل عن التالي';
+
@override
String get supersetHint => 'لا راحة بين التمارين المرتبطة — تنتقل مباشرة إلى التالي.';
@@ -3820,6 +3823,9 @@ class AppLocalizationsAr extends AppLocalizations {
@override
String get perServingShort => 'لكل حصة';
+ @override
+ String get foodCategory => 'CATEGORY';
+
@override
String portionUnit(int count) {
String _temp0 = intl.Intl.pluralLogic(count, locale: localeName, other: '$count قطع', one: 'قطعة واحدة');
diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart
index 0fe717d..d863159 100644
--- a/lib/l10n/app_localizations_de.dart
+++ b/lib/l10n/app_localizations_de.dart
@@ -2044,6 +2044,9 @@ class AppLocalizationsDe extends AppLocalizations {
@override
String get supersetLink => 'Mit der nächsten Übung verknüpfen';
+ @override
+ String get supersetUnlink => 'Von der nächsten Übung trennen';
+
@override
String get supersetHint => 'Keine Pause zwischen verknüpften Übungen — du gehst direkt zur nächsten.';
@@ -3847,6 +3850,9 @@ class AppLocalizationsDe extends AppLocalizations {
@override
String get perServingShort => 'pro Portion';
+ @override
+ String get foodCategory => 'CATEGORY';
+
@override
String portionUnit(int count) {
String _temp0 = intl.Intl.pluralLogic(count, locale: localeName, other: '$count Stück', one: '1 Stück');
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index c0fcf02..53ce903 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -2032,6 +2032,9 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get supersetLink => 'Chain with the next one';
+ @override
+ String get supersetUnlink => 'Unchain from the next one';
+
@override
String get supersetHint => 'No rest between chained exercises — you go straight to the next one.';
@@ -3823,6 +3826,9 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get perServingShort => 'per serving';
+ @override
+ String get foodCategory => 'CATEGORY';
+
@override
String portionUnit(int count) {
String _temp0 = intl.Intl.pluralLogic(count, locale: localeName, other: '$count pieces', one: '1 piece');
diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart
index cc11d91..3cc47de 100644
--- a/lib/l10n/app_localizations_es.dart
+++ b/lib/l10n/app_localizations_es.dart
@@ -2032,6 +2032,9 @@ class AppLocalizationsEs extends AppLocalizations {
@override
String get supersetLink => 'Encadenar con el siguiente';
+ @override
+ String get supersetUnlink => 'Separar del siguiente';
+
@override
String get supersetHint => 'Sin descanso entre los ejercicios encadenados: pasas directo al siguiente.';
@@ -3827,6 +3830,9 @@ class AppLocalizationsEs extends AppLocalizations {
@override
String get perServingShort => 'por ración';
+ @override
+ String get foodCategory => 'CATEGORÍA';
+
@override
String portionUnit(int count) {
String _temp0 = intl.Intl.pluralLogic(
diff --git a/lib/l10n/app_localizations_fa.dart b/lib/l10n/app_localizations_fa.dart
index 4daaa0c..a07f9af 100644
--- a/lib/l10n/app_localizations_fa.dart
+++ b/lib/l10n/app_localizations_fa.dart
@@ -2022,6 +2022,9 @@ class AppLocalizationsFa extends AppLocalizations {
@override
String get supersetLink => 'وصل به بعدی';
+ @override
+ String get supersetUnlink => 'جدا کردن از بعدی';
+
@override
String get supersetHint => 'بین حرکات سوپرست استراحت نیست — مستقیم می‌روی سراغ بعدی.';
@@ -3810,6 +3813,9 @@ class AppLocalizationsFa extends AppLocalizations {
@override
String get perServingShort => 'برای هر وعده';
+ @override
+ String get foodCategory => 'CATEGORY';
+
@override
String portionUnit(int count) {
String _temp0 = intl.Intl.pluralLogic(count, locale: localeName, other: '$count عدد', one: '۱ عدد');
diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart
index 4ee347d..007991a 100644
--- a/lib/l10n/app_localizations_fr.dart
+++ b/lib/l10n/app_localizations_fr.dart
@@ -2043,6 +2043,9 @@ class AppLocalizationsFr extends AppLocalizations {
@override
String get supersetLink => 'Enchaîner avec le suivant';
+ @override
+ String get supersetUnlink => 'Séparer du suivant';
+
@override
String get supersetHint => 'Aucun repos entre les exercices enchaînés — tu passes directement au suivant.';
@@ -3850,6 +3853,9 @@ class AppLocalizationsFr extends AppLocalizations {
@override
String get perServingShort => 'par portion';
+ @override
+ String get foodCategory => 'CATEGORY';
+
@override
String portionUnit(int count) {
String _temp0 = intl.Intl.pluralLogic(count, locale: localeName, other: '$count pièces', one: '1 pièce');
diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart
index 8298b8f..0059ad4 100644
--- a/lib/l10n/app_localizations_it.dart
+++ b/lib/l10n/app_localizations_it.dart
@@ -2033,6 +2033,9 @@ class AppLocalizationsIt extends AppLocalizations {
@override
String get supersetLink => 'Concatena con il prossimo';
+ @override
+ String get supersetUnlink => 'Separa dal prossimo';
+
@override
String get supersetHint => 'Nessun riposo tra gli esercizi concatenati: passi dritto al prossimo.';
@@ -3836,6 +3839,9 @@ class AppLocalizationsIt extends AppLocalizations {
@override
String get perServingShort => 'per porzione';
+ @override
+ String get foodCategory => 'CATEGORY';
+
@override
String portionUnit(int count) {
String _temp0 = intl.Intl.pluralLogic(count, locale: localeName, other: '$count pezzi', one: '1 pezzo');
diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart
index fcf5124..fdb8664 100644
--- a/lib/l10n/app_localizations_ja.dart
+++ b/lib/l10n/app_localizations_ja.dart
@@ -1967,6 +1967,9 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get supersetLink => '次と連結';
+ @override
+ String get supersetUnlink => '次との連結を解除';
+
@override
String get supersetHint => '連結した種目の間は休憩なし — そのまま次へ進みます。';
@@ -3719,6 +3722,9 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get perServingShort => '1食あたり';
+ @override
+ String get foodCategory => 'CATEGORY';
+
@override
String portionUnit(int count) {
String _temp0 = intl.Intl.pluralLogic(count, locale: localeName, other: '$count 個');
diff --git a/lib/l10n/app_localizations_ko.dart b/lib/l10n/app_localizations_ko.dart
index ea99447..def1676 100644
--- a/lib/l10n/app_localizations_ko.dart
+++ b/lib/l10n/app_localizations_ko.dart
@@ -1980,6 +1980,9 @@ class AppLocalizationsKo extends AppLocalizations {
@override
String get supersetLink => '다음과 연결';
+ @override
+ String get supersetUnlink => '다음과 연결 해제';
+
@override
String get supersetHint => '연결된 운동 사이에는 휴식 없이 바로 다음 운동으로 넘어갑니다.';
@@ -3730,6 +3733,9 @@ class AppLocalizationsKo extends AppLocalizations {
@override
String get perServingShort => '1회분당';
+ @override
+ String get foodCategory => 'CATEGORY';
+
@override
String portionUnit(int count) {
String _temp0 = intl.Intl.pluralLogic(count, locale: localeName, other: '$count개');
diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dart
index f171a74..a96943d 100644
--- a/lib/l10n/app_localizations_nl.dart
+++ b/lib/l10n/app_localizations_nl.dart
@@ -2040,6 +2040,9 @@ class AppLocalizationsNl extends AppLocalizations {
@override
String get supersetLink => 'Koppelen aan de volgende';
+ @override
+ String get supersetUnlink => 'Loskoppelen van de volgende';
+
@override
String get supersetHint => 'Geen rust tussen gekoppelde oefeningen — je gaat meteen door naar de volgende.';
@@ -3837,6 +3840,9 @@ class AppLocalizationsNl extends AppLocalizations {
@override
String get perServingShort => 'per portie';
+ @override
+ String get foodCategory => 'CATEGORY';
+
@override
String portionUnit(int count) {
String _temp0 = intl.Intl.pluralLogic(count, locale: localeName, other: '$count stuks', one: '1 stuk');
diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dart
index 11a1320..7063fb9 100644
--- a/lib/l10n/app_localizations_pl.dart
+++ b/lib/l10n/app_localizations_pl.dart
@@ -2034,6 +2034,9 @@ class AppLocalizationsPl extends AppLocalizations {
@override
String get supersetLink => 'Połącz z następnym';
+ @override
+ String get supersetUnlink => 'Odłącz od następnego';
+
@override
String get supersetHint =>
'Bez odpoczynku między połączonymi ćwiczeniami — przechodzisz od razu do następnego.';
@@ -3841,6 +3844,9 @@ class AppLocalizationsPl extends AppLocalizations {
@override
String get perServingShort => 'na porcję';
+ @override
+ String get foodCategory => 'CATEGORY';
+
@override
String portionUnit(int count) {
String _temp0 = intl.Intl.pluralLogic(
diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart
index c6e8cd2..19915f8 100644
--- a/lib/l10n/app_localizations_pt.dart
+++ b/lib/l10n/app_localizations_pt.dart
@@ -2034,6 +2034,9 @@ class AppLocalizationsPt extends AppLocalizations {
@override
String get supersetLink => 'Encadear com o próximo';
+ @override
+ String get supersetUnlink => 'Separar do próximo';
+
@override
String get supersetHint => 'Sem descanso entre exercícios encadeados: passa logo ao próximo.';
@@ -3825,6 +3828,9 @@ class AppLocalizationsPt extends AppLocalizations {
@override
String get perServingShort => 'por porção';
+ @override
+ String get foodCategory => 'CATEGORY';
+
@override
String portionUnit(int count) {
String _temp0 = intl.Intl.pluralLogic(
diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart
index f430bbd..598625d 100644
--- a/lib/l10n/app_localizations_ru.dart
+++ b/lib/l10n/app_localizations_ru.dart
@@ -2104,6 +2104,9 @@ class AppLocalizationsRu extends AppLocalizations {
@override
String get supersetLink => 'Связать со следующим';
+ @override
+ String get supersetUnlink => 'Отвязать от следующего';
+
@override
String get supersetHint => 'Между связанными упражнениями отдыха нет: сразу идёшь к следующему.';
@@ -3929,6 +3932,9 @@ class AppLocalizationsRu extends AppLocalizations {
@override
String get perServingShort => 'на порцию';
+ @override
+ String get foodCategory => 'CATEGORY';
+
@override
String portionUnit(int count) {
String _temp0 = intl.Intl.pluralLogic(
diff --git a/lib/l10n/app_localizations_tr.dart b/lib/l10n/app_localizations_tr.dart
index 160ebf7..089a865 100644
--- a/lib/l10n/app_localizations_tr.dart
+++ b/lib/l10n/app_localizations_tr.dart
@@ -2042,6 +2042,9 @@ class AppLocalizationsTr extends AppLocalizations {
@override
String get supersetLink => 'Sonrakiyle eşleştir';
+ @override
+ String get supersetUnlink => 'Sonrakinden ayır';
+
@override
String get supersetHint => 'Bağlı egzersizler arasında dinlenme yok — doğrudan sonrakine geçersin.';
@@ -3831,6 +3834,9 @@ class AppLocalizationsTr extends AppLocalizations {
@override
String get perServingShort => 'porsiyon başına';
+ @override
+ String get foodCategory => 'CATEGORY';
+
@override
String portionUnit(int count) {
String _temp0 = intl.Intl.pluralLogic(count, locale: localeName, other: '$count adet', one: '1 adet');
diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart
index fc5acec..ac04e24 100644
--- a/lib/l10n/app_localizations_uk.dart
+++ b/lib/l10n/app_localizations_uk.dart
@@ -2034,6 +2034,9 @@ class AppLocalizationsUk extends AppLocalizations {
@override
String get supersetLink => 'Поєднати з наступною';
+ @override
+ String get supersetUnlink => 'Від’єднати від наступної';
+
@override
String get supersetHint => 'Без відпочинку між поєднаними вправами — одразу переходиш до наступної.';
@@ -3848,6 +3851,9 @@ class AppLocalizationsUk extends AppLocalizations {
@override
String get perServingShort => 'на порцію';
+ @override
+ String get foodCategory => 'CATEGORY';
+
@override
String portionUnit(int count) {
String _temp0 = intl.Intl.pluralLogic(
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
index 3015981..01442d0 100644
--- a/lib/l10n/app_localizations_zh.dart
+++ b/lib/l10n/app_localizations_zh.dart
@@ -1948,6 +1948,9 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get supersetLink => '与下一个动作相连';
+ @override
+ String get supersetUnlink => '与下一个动作断开';
+
@override
String get supersetHint => '相连的动作之间不休息,直接进入下一个。';
@@ -3674,6 +3677,9 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get perServingShort => '每份';
+ @override
+ String get foodCategory => 'CATEGORY';
+
@override
String portionUnit(int count) {
String _temp0 = intl.Intl.pluralLogic(count, locale: localeName, other: '$count 个');
@@ -7005,6 +7011,9 @@ class AppLocalizationsZhHant extends AppLocalizationsZh {
@override
String get supersetLink => '與下一個連接';
+ @override
+ String get supersetUnlink => '與下一個斷開';
+
@override
String get supersetHint => '連接的動作之間不休息 — 直接進入下一個動作。';
diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb
index ce6f05a..63e3a87 100644
--- a/lib/l10n/app_nl.arb
+++ b/lib/l10n/app_nl.arb
@@ -596,6 +596,7 @@
"rpeHint": "10 = geen herhaling meer mogelijk; 8 = ongeveer twee herhalingen over.",
"superset": "Superset",
"supersetLink": "Koppelen aan de volgende",
+ "supersetUnlink": "Loskoppelen van de volgende",
"supersetHint": "Geen rust tussen gekoppelde oefeningen — je gaat meteen door naar de volgende.",
"aiRoutine": "Routine met AI",
"aiIntro": "GymMane communiceert nooit rechtstreeks met AI. Je exporteert je oefeningenlijst, plakt die in de assistent die je al gebruikt en importeert daarna het antwoord. Niets verlaat je telefoon vanzelf.",
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
index a0ea9f4..418618d 100644
--- a/lib/l10n/app_pl.arb
+++ b/lib/l10n/app_pl.arb
@@ -596,6 +596,7 @@
"rpeHint": "10 = brak możliwości kolejnego powtórzenia; 8 = około dwa powtórzenia w zapasie.",
"superset": "Superseria",
"supersetLink": "Połącz z następnym",
+ "supersetUnlink": "Odłącz od następnego",
"supersetHint": "Bez odpoczynku między połączonymi ćwiczeniami — przechodzisz od razu do następnego.",
"aiRoutine": "Plan z AI",
"aiIntro": "GymMane nigdy nie łączy się bezpośrednio z AI. Eksportujesz listę ćwiczeń, wklejasz ją do używanego asystenta, a potem importujesz jego odpowiedź. Nic samo nie opuszcza telefonu.",
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
index 9409669..7cd3644 100644
--- a/lib/l10n/app_pt.arb
+++ b/lib/l10n/app_pt.arb
@@ -596,6 +596,7 @@
"rpeHint": "10 é não conseguir fazer mais nenhuma repetição; 8, é que sobravam duas.",
"superset": "Supersérie",
"supersetLink": "Encadear com o próximo",
+ "supersetUnlink": "Separar do próximo",
"supersetHint": "Sem descanso entre exercícios encadeados: passa logo ao próximo.",
"aiRoutine": "Rotina com IA",
"aiIntro": "O GymMane não fala com nenhuma IA. Você copia a sua lista de exercícios, cola no assistente que a usa e traz a resposta de volta. Do seu celular não sai nada sozinho.",
diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb
index c6c63d4..e510379 100644
--- a/lib/l10n/app_ru.arb
+++ b/lib/l10n/app_ru.arb
@@ -596,6 +596,7 @@
"rpeHint": "10 — больше ни одного повторения; 8 — оставалось ещё два.",
"superset": "Суперсет",
"supersetLink": "Связать со следующим",
+ "supersetUnlink": "Отвязать от следующего",
"supersetHint": "Между связанными упражнениями отдыха нет: сразу идёшь к следующему.",
"aiRoutine": "Программа с ИИ",
"aiIntro": "GymMane ни с каким ИИ не общается. Ты сам выгружаешь список упражнений, вставляешь его в тот ассистент, которым уже пользуешься, и приносишь ответ обратно. С телефона само ничего не уходит.",
diff --git a/lib/l10n/app_tr.arb b/lib/l10n/app_tr.arb
index 00f9452..bef78ff 100644
--- a/lib/l10n/app_tr.arb
+++ b/lib/l10n/app_tr.arb
@@ -596,6 +596,7 @@
"rpeHint": "10 = artık tekrar yok; 8 = yaklaşık iki tekrar yedekte.",
"superset": "Süperset",
"supersetLink": "Sonrakiyle eşleştir",
+ "supersetUnlink": "Sonrakinden ayır",
"supersetHint": "Bağlı egzersizler arasında dinlenme yok — doğrudan sonrakine geçersin.",
"aiRoutine": "Yapay zekâ ile program",
"aiIntro": "GymMane hiçbir zaman doğrudan bir yapay zekâyla iletişim kurmaz. Egzersiz listesini dışa aktarır, kullandığın asistana yapıştırır ve yanıtını yeniden içe aktarırsın. Hiçbir şey kendiliğinden telefondan çıkmaz.",
diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb
index 4a6ab4b..153dd45 100644
--- a/lib/l10n/app_uk.arb
+++ b/lib/l10n/app_uk.arb
@@ -596,6 +596,7 @@
"rpeHint": "10 = більше жодного повторення; 8 = приблизно два повторення в запасі.",
"superset": "Суперсет",
"supersetLink": "Поєднати з наступною",
+ "supersetUnlink": "Від’єднати від наступної",
"supersetHint": "Без відпочинку між поєднаними вправами — одразу переходиш до наступної.",
"aiRoutine": "Програма з ШІ",
"aiIntro": "GymMane ніколи напряму не зв’язується зі ШІ. Ти експортуєш список вправ, вставляєш його в асистент, яким уже користуєшся, а потім імпортуєш відповідь. Нічого саме не залишає телефон.",
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
index d20d9d6..85668ea 100644
--- a/lib/l10n/app_zh.arb
+++ b/lib/l10n/app_zh.arb
@@ -596,6 +596,7 @@
"rpeHint": "10 表示一次也做不动了,8 表示还能再做两次。",
"superset": "超级组",
"supersetLink": "与下一个动作相连",
+ "supersetUnlink": "与下一个动作断开",
"supersetHint": "相连的动作之间不休息,直接进入下一个。",
"aiRoutine": "用 AI 生成计划",
"aiIntro": "GymMane 不会和任何 AI 通信。你把动作清单导出,粘贴给你惯用的助手,再把它的回答导回来。手机不会自己往外发任何东西。",
diff --git a/lib/l10n/app_zh_Hant.arb b/lib/l10n/app_zh_Hant.arb
index c153ba4..a87e8c4 100644
--- a/lib/l10n/app_zh_Hant.arb
+++ b/lib/l10n/app_zh_Hant.arb
@@ -596,6 +596,7 @@
"rpeHint": "10 = 無法再做一次;8 = 約還能做兩次。",
"superset": "超級組",
"supersetLink": "與下一個連接",
+ "supersetUnlink": "與下一個斷開",
"supersetHint": "連接的動作之間不休息 — 直接進入下一個動作。",
"aiRoutine": "AI 課表",
"aiIntro": "GymMane 絕不直接與 AI 通訊。你先匯出動作清單,貼到你已在使用的 AI 助手,再把回覆匯入。任何資料都不會自行離開手機。",
diff --git a/lib/models/nutrition.dart b/lib/models/nutrition.dart
index 92c7ba2..5f683fd 100644
--- a/lib/models/nutrition.dart
+++ b/lib/models/nutrition.dart
@@ -243,6 +243,7 @@ class FoodItem {
bool? liquid,
Macros? macros,
double? cookedYield,
+ FoodCat? Function()? cat,
}) =>
FoodItem(
id: id,
@@ -256,7 +257,7 @@ class FoodItem {
macros: macros ?? this.macros,
cookedYield: cookedYield ?? this.cookedYield,
approx: approx,
- cat: cat,
+ cat: cat == null ? this.cat : cat(),
);
Map<String, dynamic> toJson() => {
@@ -267,6 +268,7 @@ class FoodItem {
if (grams > 0) 'g': grams,
if (liquid) 'lq': true,
if (cookedYield > 0) 'cy': cookedYield,
+ if (cat != null) 'c': cat!.name,
'm': macros.toJson(),
};
@@ -279,6 +281,7 @@ class FoodItem {
liquid: j['lq'] as bool? ?? false,
cookedYield: _num(j['cy']).clamp(0, 5).toDouble(),
macros: Macros.fromJson((j['m'] as Map?)?.cast<String, dynamic>()),
+ cat: FoodCat.values.asNameMap()[j['c']],
);
}
diff --git a/lib/screens/nutrition/food.dart b/lib/screens/nutrition/food.dart
index 09a1346..b56f1e0 100644
--- a/lib/screens/nutrition/food.dart
+++ b/lib/screens/nutrition/food.dart
@@ -226,7 +226,7 @@ class _AddFoodSheetState extends State<_AddFoodSheet> {
final browsing = q.isNotEmpty || _cat != null || _dishes;
final recipes = _cat != null ? const <Recipe>[] : fit.searchRecipes(q);
final dishes = _cat != null || (q.isEmpty && !_dishes) ? const <Recipe>[] : fit.searchDishes(q);
- final mine = _cat != null || _dishes ? const <FoodItem>[] : fit.searchFoods(q);
+ final mine = _dishes ? const <FoodItem>[] : fit.searchFoods(q, cat: _cat);
final library = [
if (!_dishes)
for (final f in FoodLibrary.search(q, appLanguage, cat: _cat, limit: _cat != null && q.isEmpty ? 200 : 60))
@@ -941,7 +941,8 @@ class _LogFoodSheetState extends State<_LogFoodSheet> {
final unit = _unitOf(food.liquid);
final total = food.macros * _servings;
final picking = widget.onPick != null;
- final shownPer = _cooked ? food.macros * (1 / food.cookedYield) : food.macros;
+ final per100 = food.byWeight ? food.macros * (100 / food.grams) : food.macros;
+ final shownPer = _cooked ? per100 * (1 / food.cookedYield) : per100;
final perTitle = _cooked ? '${t.per100(unit)} · ${t.cookedLabel.toLowerCase()}' : t.per100(unit);
return _sheetFrame(context, [
_FoodHero(photo: food.photo, name: food.name, favId: food.id),
@@ -1161,7 +1162,7 @@ class _EntrySheetState extends State<_EntrySheet> {
_macroSummary(context, e.per * _servings),
const SizedBox(height: 12),
_ValueRows(
- per: e.per,
+ per: e.grams > 0 ? e.per * (100 / e.grams) : e.per,
title: e.grams > 0 ? t.per100(unit) : t.perServingShort,
onEdit: () => showEntryValuesSheet(context, e),
),
@@ -1250,11 +1251,13 @@ class _EntryValuesSheet extends StatefulWidget {
}
class _EntryValuesSheetState extends State<_EntryValuesSheet> {
+ late final double _k = widget.entry.grams > 0 ? 100 / widget.entry.grams : 1;
+ late final _shown = widget.entry.per * _k;
late final _name = TextEditingController(text: widget.entry.name);
- late final _kcal = TextEditingController(text: _seed(fit.energyOf(widget.entry.per.kcal).toDouble()));
- late final _p = TextEditingController(text: _seed(widget.entry.per.protein));
- late final _c = TextEditingController(text: _seed(widget.entry.per.carbs));
- late final _f = TextEditingController(text: _seed(widget.entry.per.fat));
+ late final _kcal = TextEditingController(text: _seed(fit.energyOf(_shown.kcal).toDouble()));
+ late final _p = TextEditingController(text: _seed(_shown.protein));
+ late final _c = TextEditingController(text: _seed(_shown.carbs));
+ late final _f = TextEditingController(text: _seed(_shown.fat));
@override
void dispose() {
@@ -1280,7 +1283,7 @@ class _EntryValuesSheetState extends State<_EntryValuesSheet> {
PrimaryButton(
label: t.save,
onTap: () {
- final m = _macrosOf(_kcal, _p, _c, _f);
+ final m = _macrosOf(_kcal, _p, _c, _f) * (1 / _k);
final next = Macros(
kcal: m.kcal,
protein: m.protein,
@@ -1732,6 +1735,8 @@ class _FoodEditorState extends State<_FoodEditor> with _StickerDrafts {
late bool _extras = _base?.macros.hasExtras ?? false;
late bool _shake = widget.asShake || (widget.food != null && fit.isShakeFood(widget.food!.id));
late double _animalShare = _shareOf(_base?.macros);
+ late FoodCat? _cat = _base?.cat;
+ bool _per100 = false;
late final _p = TextEditingController(text: _seed(_base?.macros.protein ?? 0));
late final _c = TextEditingController(text: _seed(_base?.macros.carbs ?? 0));
late final _f = TextEditingController(text: _seed(_base?.macros.fat ?? 0));
@@ -1760,15 +1765,19 @@ class _FoodEditorState extends State<_FoodEditor> with _StickerDrafts {
HapticFeedback.heavyImpact();
return;
}
+ var grams = (_read(_grams) * _k).clamp(0, 5000).toDouble();
+ if (_per100 && grams <= 0) grams = 100;
+ final typed = _macrosOf(_kcal, _p, _c, _f, fiber: _fi, sugar: _su, sodium: _na);
final saved = fit.saveFood(
id: widget.food?.id,
name: name,
photo: _photo,
serving: _serving.text,
- grams: (_read(_grams) * _k).clamp(0, 5000).toDouble(),
+ grams: grams,
liquid: _base?.liquid ?? false,
cookedYield: _base?.cookedYield ?? 0,
- macros: _withSource(_keepDetail(_macrosOf(_kcal, _p, _c, _f, fiber: _fi, sugar: _su, sodium: _na))),
+ macros: _withSource(_keepDetail(_per100 ? typed * (grams / 100) : typed)),
+ cat: _cat,
);
fit.setShakeTag(saved.id, _shake);
if (widget.asShake) fit.setShakeFood(saved.id);
@@ -1781,6 +1790,43 @@ class _FoodEditorState extends State<_FoodEditor> with _StickerDrafts {
if (meal != null) showLogFoodSheet(context, saved, meal);
}
+ void _setPer100(bool on) {
+ if (on == _per100) return;
+ HapticFeedback.selectionClick();
+ final grams = _read(_grams) * _k;
+ if (grams > 0) {
+ final k = on ? 100 / grams : grams / 100;
+ for (final c in [_kcal, _p, _c, _f, _fi, _su, _na]) {
+ final v = _read(c);
+ if (v > 0) c.text = _seed(v * k);
+ }
+ }
+ setState(() => _per100 = on);
+ }
+
+ Widget _catPicker(GymColors gc) => SizedBox(
+ height: 40,
+ child: ListView(
+ scrollDirection: Axis.horizontal,
+ clipBehavior: Clip.none,
+ children: [
+ for (final c in FoodCat.values) ...[
+ Pill(
+ label: catName(c),
+ bg: _cat == c ? gc.accentSoft : gc.bgRaised2,
+ fg: _cat == c ? gc.accent : gc.textSecondary,
+ fontSize: 12.5,
+ onTap: () {
+ HapticFeedback.selectionClick();
+ setState(() => _cat = _cat == c ? null : c);
+ },
+ ),
+ const SizedBox(width: 6),
+ ],
+ ],
+ ),
+ );
+
static double _shareOf(Macros? m) {
if (m == null || m.protein <= 0) return 0;
final r = m.animal / m.protein;
@@ -1905,7 +1951,20 @@ class _FoodEditorState extends State<_FoodEditor> with _StickerDrafts {
),
]),
const SizedBox(height: 14),
- Text(t.perServing, style: AppTheme.f(10.5, weight: FontWeight.w700, color: gc.textTertiary, letterSpacing: 1.1)),
+ Text(t.foodCategory, style: AppTheme.f(10.5, weight: FontWeight.w700, color: gc.textTertiary, letterSpacing: 1.1)),
+ const SizedBox(height: 8),
+ _catPicker(gc),
+ const SizedBox(height: 14),
+ Row(children: [
+ Expanded(
+ child: Text(_per100 ? t.per100(_unitOf(_base?.liquid ?? false)).toUpperCase() : t.perServing,
+ style: AppTheme.f(10.5, weight: FontWeight.w700, color: gc.textTertiary, letterSpacing: 1.1)),
+ ),
+ SegToggle([
+ SegOption(t.perServingShort, !_per100, () => _setPer100(false)),
+ SegOption('100 ${_unitOf(_base?.liquid ?? false)}', _per100, () => _setPer100(true)),
+ ], hPad: 11, vPad: 5, fontSize: 11.5),
+ ]),
const SizedBox(height: 8),
_MacroInputs(kcal: _kcal, protein: _p, carbs: _c, fat: _f),
const SizedBox(height: 8),
diff --git a/lib/state/nutrition_state.dart b/lib/state/nutrition_state.dart
index 66be9fd..2fe6bf6 100644
--- a/lib/state/nutrition_state.dart
+++ b/lib/state/nutrition_state.dart
@@ -647,11 +647,11 @@ mixin NutritionState on FitCore, ToolsState, StatsState {
];
}
- List<FoodItem> searchFoods(String query) {
+ List<FoodItem> searchFoods(String query, {FoodCat? cat}) {
final q = foldText(query.trim());
return [
for (final f in foodsByUse)
- if (q.isEmpty || foldText(f.name).contains(q)) f,
+ if ((q.isEmpty || foldText(f.name).contains(q)) && (cat == null || f.cat == cat)) f,
];
}
@@ -1074,6 +1074,7 @@ mixin NutritionState on FitCore, ToolsState, StatsState {
bool liquid = false,
double cookedYield = 0,
Macros macros = Macros.zero,
+ FoodCat? cat,
}) {
final clean = name.trim();
final i = id == null ? -1 : foods.indexWhere((f) => f.id == id);
@@ -1087,7 +1088,8 @@ mixin NutritionState on FitCore, ToolsState, StatsState {
grams: grams,
liquid: liquid,
macros: macros,
- cookedYield: cookedYield);
+ cookedYield: cookedYield,
+ cat: () => cat);
_persist();
notifyListeners();
return foods[i];
@@ -1101,6 +1103,7 @@ mixin NutritionState on FitCore, ToolsState, StatsState {
liquid: liquid,
cookedYield: cookedYield,
macros: macros,
+ cat: cat,
);
foods.add(food);
_persist();
diff --git a/test/nutrition_beta_keys.txt b/test/nutrition_beta_keys.txt
index bb26b16..8dfbd00 100644
--- a/test/nutrition_beta_keys.txt
+++ b/test/nutrition_beta_keys.txt
@@ -120,3 +120,4 @@ leftAfterKcal
leftAfterBoth
leftAfterOver
perDayUnit
+foodCategory