Offline gym log for Android. No account, no ads, no internet.
Dart androidbodybuildingdartexercisesf-droidfitnessfluttergymgym-apphealthprivacyself-hostedworkoutworkout-appworkout-tracker
Merge one of your exercises into another
InlitX752ff122ea79
diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arbindex 1da3f11..2eeebc9 100644--- a/lib/l10n/app_ar.arb+++ b/lib/l10n/app_ar.arb@@ -1256,5 +1256,10 @@"recommendedRowHint": "تمارين نقترحها في الرئيسية.","weightStepSetting": "خطوة الوزن","weightStepHint": "ما تضيفه زرّا − و+.",- "prBestWorkout": "أفضل تمرين"+ "prBestWorkout": "أفضل تمرين",+ "mergeExercise": "دمج",+ "mergeExerciseInto": "دمج {name} في…",+ "mergeExerciseTitle": "دمج التمارين؟",+ "mergeExerciseBody": "ينتقل كل سجل «{from}» إلى «{to}». يبقى «{from}» في مكتبتك. لا يمكن التراجع عن ذلك.",+ "mergedToast": "تم دمج السجل"}diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arbindex 4800068..b03815a 100644--- a/lib/l10n/app_de.arb+++ b/lib/l10n/app_de.arb@@ -1137,5 +1137,10 @@"recommendedRowHint": "Übungen, die wir auf der Startseite vorschlagen.","weightStepSetting": "Gewichtsschritt","weightStepHint": "Was die Tasten − und + hinzufügen.",- "prBestWorkout": "Bestes Training"+ "prBestWorkout": "Bestes Training",+ "mergeExercise": "Zusammenführen",+ "mergeExerciseInto": "{name} zusammenführen mit…",+ "mergeExerciseTitle": "Übungen zusammenführen?",+ "mergeExerciseBody": "Der gesamte Verlauf von „{from}“ geht auf „{to}“ über. „{from}“ bleibt in deiner Bibliothek. Das lässt sich nicht rückgängig machen.",+ "mergedToast": "Verlauf zusammengeführt"}diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex 5687c6d..c0ae70d 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -1177,5 +1177,12 @@"recommendedRowHint": "Exercises we suggest on Home.","weightStepSetting": "Weight step","weightStepHint": "What the − and + buttons add.",- "prBestWorkout": "Best workout"+ "prBestWorkout": "Best workout",+ "mergeExercise": "Merge",+ "mergeExerciseInto": "Merge {name} into…",+ "@mergeExerciseInto": {"placeholders": {"name": {"type": "String"}}},+ "mergeExerciseTitle": "Merge exercises?",+ "mergeExerciseBody": "All the history of \"{from}\" moves to \"{to}\". \"{from}\" stays in your library. This can't be undone.",+ "@mergeExerciseBody": {"placeholders": {"from": {"type": "String"}, "to": {"type": "String"}}},+ "mergedToast": "History merged"}diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arbindex c021e1c..fdaa059 100644--- a/lib/l10n/app_es.arb+++ b/lib/l10n/app_es.arb@@ -1081,5 +1081,10 @@"recommendedRowHint": "Ejercicios que te proponemos en Inicio.","weightStepSetting": "Salto de peso","weightStepHint": "Lo que suman los botones − y +.",- "prBestWorkout": "Mejor entreno"+ "prBestWorkout": "Mejor entreno",+ "mergeExercise": "Fusionar",+ "mergeExerciseInto": "Fusionar {name} con…",+ "mergeExerciseTitle": "¿Fusionar ejercicios?",+ "mergeExerciseBody": "Todo el historial de «{from}» pasa a «{to}». «{from}» se queda en tu biblioteca. No se puede deshacer.",+ "mergedToast": "Historial fusionado"}diff --git a/lib/l10n/app_fa.arb b/lib/l10n/app_fa.arbindex 5c0435c..d5888aa 100644--- a/lib/l10n/app_fa.arb+++ b/lib/l10n/app_fa.arb@@ -1617,5 +1617,10 @@"recommendedRowHint": "حرکتهایی که در خانه پیشنهاد میدهیم.","weightStepSetting": "گام وزن","weightStepHint": "مقداری که دکمههای − و + اضافه میکنند.",- "prBestWorkout": "بهترین تمرین"+ "prBestWorkout": "بهترین تمرین",+ "mergeExercise": "ادغام",+ "mergeExerciseInto": "ادغام {name} با…",+ "mergeExerciseTitle": "حرکات ادغام شوند؟",+ "mergeExerciseBody": "تمام سابقهٔ «{from}» به «{to}» منتقل میشود. «{from}» در کتابخانهات میماند. این کار برگشتپذیر نیست.",+ "mergedToast": "سابقه ادغام شد"}diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arbindex 453ffc5..03043b1 100644--- a/lib/l10n/app_fr.arb+++ b/lib/l10n/app_fr.arb@@ -1256,5 +1256,10 @@"recommendedRowHint": "Exercices que l’on vous propose sur l’Accueil.","weightStepSetting": "Pas de poids","weightStepHint": "Ce qu’ajoutent les boutons − et +.",- "prBestWorkout": "Meilleure séance"+ "prBestWorkout": "Meilleure séance",+ "mergeExercise": "Fusionner",+ "mergeExerciseInto": "Fusionner {name} avec…",+ "mergeExerciseTitle": "Fusionner les exercices ?",+ "mergeExerciseBody": "Tout l’historique de « {from} » passe à « {to} ». « {from} » reste dans ta bibliothèque. C’est irréversible.",+ "mergedToast": "Historique fusionné"}diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arbindex 078d2f2..7a2d90c 100644--- a/lib/l10n/app_it.arb+++ b/lib/l10n/app_it.arb@@ -1117,5 +1117,10 @@"recommendedRowHint": "Esercizi che ti proponiamo in Home.","weightStepSetting": "Incremento del peso","weightStepHint": "Quanto aggiungono i pulsanti − e +.",- "prBestWorkout": "Miglior allenamento"+ "prBestWorkout": "Miglior allenamento",+ "mergeExercise": "Unisci",+ "mergeExerciseInto": "Unisci {name} a…",+ "mergeExerciseTitle": "Unire gli esercizi?",+ "mergeExerciseBody": "Tutto lo storico di «{from}» passa a «{to}». «{from}» resta nella tua libreria. Non si può annullare.",+ "mergedToast": "Storico unito"}diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arbindex b6753bd..517b101 100644--- a/lib/l10n/app_ja.arb+++ b/lib/l10n/app_ja.arb@@ -1256,5 +1256,10 @@"recommendedRowHint": "ホームでおすすめする種目。","weightStepSetting": "重量の刻み","weightStepHint": "− と + ボタンで増減する量。",- "prBestWorkout": "ベストワークアウト"+ "prBestWorkout": "ベストワークアウト",+ "mergeExercise": "統合",+ "mergeExerciseInto": "{name} を統合…",+ "mergeExerciseTitle": "種目を統合しますか?",+ "mergeExerciseBody": "「{from}」の履歴はすべて「{to}」に移ります。「{from}」はライブラリに残ります。元に戻せません。",+ "mergedToast": "履歴を統合しました"}diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arbindex 09b529e..0d39a9e 100644--- a/lib/l10n/app_ko.arb+++ b/lib/l10n/app_ko.arb@@ -1256,5 +1256,10 @@"recommendedRowHint": "홈에서 추천하는 운동.","weightStepSetting": "무게 단위","weightStepHint": "− 및 + 버튼이 더하는 양.",- "prBestWorkout": "최고 운동"+ "prBestWorkout": "최고 운동",+ "mergeExercise": "병합",+ "mergeExerciseInto": "{name} 병합 대상…",+ "mergeExerciseTitle": "운동을 병합할까요?",+ "mergeExerciseBody": "「{from}」의 모든 기록이 「{to}」(으)로 옮겨집니다. 「{from}」은(는) 라이브러리에 남습니다. 되돌릴 수 없습니다.",+ "mergedToast": "기록을 병합했어요"}diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex 458410e..37b6fff 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -6081,6 +6081,36 @@ abstract class AppLocalizations {/// In en, this message translates to:/// **'Best workout'**String get prBestWorkout;++ /// No description provided for @mergeExercise.+ ///+ /// In en, this message translates to:+ /// **'Merge'**+ String get mergeExercise;++ /// No description provided for @mergeExerciseInto.+ ///+ /// In en, this message translates to:+ /// **'Merge {name} into…'**+ String mergeExerciseInto(String name);++ /// No description provided for @mergeExerciseTitle.+ ///+ /// In en, this message translates to:+ /// **'Merge exercises?'**+ String get mergeExerciseTitle;++ /// No description provided for @mergeExerciseBody.+ ///+ /// In en, this message translates to:+ /// **'All the history of \"{from}\" moves to \"{to}\". \"{from}\" stays in your library. This can\'t be undone.'**+ String mergeExerciseBody(String from, String to);++ /// No description provided for @mergedToast.+ ///+ /// In en, this message translates to:+ /// **'History merged'**+ String get mergedToast;}class _AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations> {diff --git a/lib/l10n/app_localizations_ar.dart b/lib/l10n/app_localizations_ar.dartindex 72284e0..802d174 100644--- a/lib/l10n/app_localizations_ar.dart+++ b/lib/l10n/app_localizations_ar.dart@@ -3392,4 +3392,23 @@ class AppLocalizationsAr extends AppLocalizations {@overrideString get prBestWorkout => 'أفضل تمرين';++ @override+ String get mergeExercise => 'دمج';++ @override+ String mergeExerciseInto(String name) {+ return 'دمج $name في…';+ }++ @override+ String get mergeExerciseTitle => 'دمج التمارين؟';++ @override+ String mergeExerciseBody(String from, String to) {+ return 'ينتقل كل سجل «$from» إلى «$to». يبقى «$from» في مكتبتك. لا يمكن التراجع عن ذلك.';+ }++ @override+ String get mergedToast => 'تم دمج السجل';}diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dartindex 16f19ea..80d998c 100644--- a/lib/l10n/app_localizations_de.dart+++ b/lib/l10n/app_localizations_de.dart@@ -3413,4 +3413,23 @@ class AppLocalizationsDe extends AppLocalizations {@overrideString get prBestWorkout => 'Bestes Training';++ @override+ String get mergeExercise => 'Zusammenführen';++ @override+ String mergeExerciseInto(String name) {+ return '$name zusammenführen mit…';+ }++ @override+ String get mergeExerciseTitle => 'Übungen zusammenführen?';++ @override+ String mergeExerciseBody(String from, String to) {+ return 'Der gesamte Verlauf von „$from“ geht auf „$to“ über. „$from“ bleibt in deiner Bibliothek. Das lässt sich nicht rückgängig machen.';+ }++ @override+ String get mergedToast => 'Verlauf zusammengeführt';}diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex 0bada86..6aa040f 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -3391,4 +3391,23 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString get prBestWorkout => 'Best workout';++ @override+ String get mergeExercise => 'Merge';++ @override+ String mergeExerciseInto(String name) {+ return 'Merge $name into…';+ }++ @override+ String get mergeExerciseTitle => 'Merge exercises?';++ @override+ String mergeExerciseBody(String from, String to) {+ return 'All the history of \"$from\" moves to \"$to\". \"$from\" stays in your library. This can\'t be undone.';+ }++ @override+ String get mergedToast => 'History merged';}diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dartindex d6e8f9f..c767b9b 100644--- a/lib/l10n/app_localizations_es.dart+++ b/lib/l10n/app_localizations_es.dart@@ -3396,4 +3396,23 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString get prBestWorkout => 'Mejor entreno';++ @override+ String get mergeExercise => 'Fusionar';++ @override+ String mergeExerciseInto(String name) {+ return 'Fusionar $name con…';+ }++ @override+ String get mergeExerciseTitle => '¿Fusionar ejercicios?';++ @override+ String mergeExerciseBody(String from, String to) {+ return 'Todo el historial de «$from» pasa a «$to». «$from» se queda en tu biblioteca. No se puede deshacer.';+ }++ @override+ String get mergedToast => 'Historial fusionado';}diff --git a/lib/l10n/app_localizations_fa.dart b/lib/l10n/app_localizations_fa.dartindex 9d39d1f..0a2bcdc 100644--- a/lib/l10n/app_localizations_fa.dart+++ b/lib/l10n/app_localizations_fa.dart@@ -3381,4 +3381,23 @@ class AppLocalizationsFa extends AppLocalizations {@overrideString get prBestWorkout => 'بهترین تمرین';++ @override+ String get mergeExercise => 'ادغام';++ @override+ String mergeExerciseInto(String name) {+ return 'ادغام $name با…';+ }++ @override+ String get mergeExerciseTitle => 'حرکات ادغام شوند؟';++ @override+ String mergeExerciseBody(String from, String to) {+ return 'تمام سابقهٔ «$from» به «$to» منتقل میشود. «$from» در کتابخانهات میماند. این کار برگشتپذیر نیست.';+ }++ @override+ String get mergedToast => 'سابقه ادغام شد';}diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dartindex fa455eb..2f8d44b 100644--- a/lib/l10n/app_localizations_fr.dart+++ b/lib/l10n/app_localizations_fr.dart@@ -3418,4 +3418,23 @@ class AppLocalizationsFr extends AppLocalizations {@overrideString get prBestWorkout => 'Meilleure séance';++ @override+ String get mergeExercise => 'Fusionner';++ @override+ String mergeExerciseInto(String name) {+ return 'Fusionner $name avec…';+ }++ @override+ String get mergeExerciseTitle => 'Fusionner les exercices ?';++ @override+ String mergeExerciseBody(String from, String to) {+ return 'Tout l’historique de « $from » passe à « $to ». « $from » reste dans ta bibliothèque. C’est irréversible.';+ }++ @override+ String get mergedToast => 'Historique fusionné';}diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dartindex df99d6b..0d2a0cb 100644--- a/lib/l10n/app_localizations_it.dart+++ b/lib/l10n/app_localizations_it.dart@@ -3406,4 +3406,23 @@ class AppLocalizationsIt extends AppLocalizations {@overrideString get prBestWorkout => 'Miglior allenamento';++ @override+ String get mergeExercise => 'Unisci';++ @override+ String mergeExerciseInto(String name) {+ return 'Unisci $name a…';+ }++ @override+ String get mergeExerciseTitle => 'Unire gli esercizi?';++ @override+ String mergeExerciseBody(String from, String to) {+ return 'Tutto lo storico di «$from» passa a «$to». «$from» resta nella tua libreria. Non si può annullare.';+ }++ @override+ String get mergedToast => 'Storico unito';}diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dartindex 0de7f5c..f9c5139 100644--- a/lib/l10n/app_localizations_ja.dart+++ b/lib/l10n/app_localizations_ja.dart@@ -3302,4 +3302,23 @@ class AppLocalizationsJa extends AppLocalizations {@overrideString get prBestWorkout => 'ベストワークアウト';++ @override+ String get mergeExercise => '統合';++ @override+ String mergeExerciseInto(String name) {+ return '$name を統合…';+ }++ @override+ String get mergeExerciseTitle => '種目を統合しますか?';++ @override+ String mergeExerciseBody(String from, String to) {+ return '「$from」の履歴はすべて「$to」に移ります。「$from」はライブラリに残ります。元に戻せません。';+ }++ @override+ String get mergedToast => '履歴を統合しました';}diff --git a/lib/l10n/app_localizations_ko.dart b/lib/l10n/app_localizations_ko.dartindex 2cff3b4..db0df61 100644--- a/lib/l10n/app_localizations_ko.dart+++ b/lib/l10n/app_localizations_ko.dart@@ -3313,4 +3313,23 @@ class AppLocalizationsKo extends AppLocalizations {@overrideString get prBestWorkout => '최고 운동';++ @override+ String get mergeExercise => '병합';++ @override+ String mergeExerciseInto(String name) {+ return '$name 병합 대상…';+ }++ @override+ String get mergeExerciseTitle => '운동을 병합할까요?';++ @override+ String mergeExerciseBody(String from, String to) {+ return '「$from」의 모든 기록이 「$to」(으)로 옮겨집니다. 「$from」은(는) 라이브러리에 남습니다. 되돌릴 수 없습니다.';+ }++ @override+ String get mergedToast => '기록을 병합했어요';}diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dartindex de9bde7..5cbdd63 100644--- a/lib/l10n/app_localizations_nl.dart+++ b/lib/l10n/app_localizations_nl.dart@@ -3405,4 +3405,23 @@ class AppLocalizationsNl extends AppLocalizations {@overrideString get prBestWorkout => 'Beste training';++ @override+ String get mergeExercise => 'Samenvoegen';++ @override+ String mergeExerciseInto(String name) {+ return '$name samenvoegen met…';+ }++ @override+ String get mergeExerciseTitle => 'Oefeningen samenvoegen?';++ @override+ String mergeExerciseBody(String from, String to) {+ return 'De hele geschiedenis van ‘$from’ gaat naar ‘$to’. ‘$from’ blijft in je bibliotheek. Dit kan niet ongedaan worden gemaakt.';+ }++ @override+ String get mergedToast => 'Geschiedenis samengevoegd';}diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dartindex 7dd0ad3..250017d 100644--- a/lib/l10n/app_localizations_pl.dart+++ b/lib/l10n/app_localizations_pl.dart@@ -3409,4 +3409,23 @@ class AppLocalizationsPl extends AppLocalizations {@overrideString get prBestWorkout => 'Najlepszy trening';++ @override+ String get mergeExercise => 'Scal';++ @override+ String mergeExerciseInto(String name) {+ return 'Scal $name z…';+ }++ @override+ String get mergeExerciseTitle => 'Scalić ćwiczenia?';++ @override+ String mergeExerciseBody(String from, String to) {+ return 'Cała historia „$from” przejdzie do „$to”. „$from” zostaje w twojej bibliotece. Tego nie można cofnąć.';+ }++ @override+ String get mergedToast => 'Historia scalona';}diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dartindex 44edb06..ff07ae8 100644--- a/lib/l10n/app_localizations_pt.dart+++ b/lib/l10n/app_localizations_pt.dart@@ -3396,4 +3396,23 @@ class AppLocalizationsPt extends AppLocalizations {@overrideString get prBestWorkout => 'Melhor treino';++ @override+ String get mergeExercise => 'Mesclar';++ @override+ String mergeExerciseInto(String name) {+ return 'Mesclar $name com…';+ }++ @override+ String get mergeExerciseTitle => 'Mesclar exercícios?';++ @override+ String mergeExerciseBody(String from, String to) {+ return 'Todo o histórico de “$from” passa para “$to”. “$from” continua na sua biblioteca. Não dá para desfazer.';+ }++ @override+ String get mergedToast => 'Histórico mesclado';}diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dartindex 19b811b..3b6edaf 100644--- a/lib/l10n/app_localizations_ru.dart+++ b/lib/l10n/app_localizations_ru.dart@@ -3496,4 +3496,23 @@ class AppLocalizationsRu extends AppLocalizations {@overrideString get prBestWorkout => 'Лучшая тренировка';++ @override+ String get mergeExercise => 'Объединить';++ @override+ String mergeExerciseInto(String name) {+ return 'Объединить $name с…';+ }++ @override+ String get mergeExerciseTitle => 'Объединить упражнения?';++ @override+ String mergeExerciseBody(String from, String to) {+ return 'Вся история «$from» перейдёт в «$to». «$from» останется в библиотеке. Это нельзя отменить.';+ }++ @override+ String get mergedToast => 'История объединена';}diff --git a/lib/l10n/app_localizations_tr.dart b/lib/l10n/app_localizations_tr.dartindex c39f730..ab660a2 100644--- a/lib/l10n/app_localizations_tr.dart+++ b/lib/l10n/app_localizations_tr.dart@@ -3401,4 +3401,23 @@ class AppLocalizationsTr extends AppLocalizations {@overrideString get prBestWorkout => 'En iyi antrenman';++ @override+ String get mergeExercise => 'Birleştir';++ @override+ String mergeExerciseInto(String name) {+ return '$name şununla birleştir…';+ }++ @override+ String get mergeExerciseTitle => 'Egzersizler birleştirilsin mi?';++ @override+ String mergeExerciseBody(String from, String to) {+ return '“$from” geçmişinin tamamı “$to” egzersizine taşınır. “$from” kitaplığında kalır. Bu geri alınamaz.';+ }++ @override+ String get mergedToast => 'Geçmiş birleştirildi';}diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dartindex db8f922..387224a 100644--- a/lib/l10n/app_localizations_uk.dart+++ b/lib/l10n/app_localizations_uk.dart@@ -3415,4 +3415,23 @@ class AppLocalizationsUk extends AppLocalizations {@overrideString get prBestWorkout => 'Найкраще тренування';++ @override+ String get mergeExercise => 'Об’єднати';++ @override+ String mergeExerciseInto(String name) {+ return 'Об’єднати $name з…';+ }++ @override+ String get mergeExerciseTitle => 'Об’єднати вправи?';++ @override+ String mergeExerciseBody(String from, String to) {+ return 'Уся історія «$from» перейде до «$to». «$from» залишиться в бібліотеці. Цю дію не можна скасувати.';+ }++ @override+ String get mergedToast => 'Історію об’єднано';}diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dartindex 1564a97..aa0f477 100644--- a/lib/l10n/app_localizations_zh.dart+++ b/lib/l10n/app_localizations_zh.dart@@ -3257,6 +3257,25 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString get prBestWorkout => '最佳训练';++ @override+ String get mergeExercise => '合并';++ @override+ String mergeExerciseInto(String name) {+ return '将 $name 合并到…';+ }++ @override+ String get mergeExerciseTitle => '合并动作?';++ @override+ String mergeExerciseBody(String from, String to) {+ return '「$from」的全部记录将转到「$to」。「$from」仍保留在你的动作库中。此操作无法撤销。';+ }++ @override+ String get mergedToast => '记录已合并';}/// The translations for Chinese, using the Han script (`zh_Hant`).@@ -6529,4 +6548,23 @@ class AppLocalizationsZhHant extends AppLocalizationsZh {@overrideString get prBestWorkout => '最佳訓練';++ @override+ String get mergeExercise => '合併';++ @override+ String mergeExerciseInto(String name) {+ return '將 $name 合併到…';+ }++ @override+ String get mergeExerciseTitle => '合併動作?';++ @override+ String mergeExerciseBody(String from, String to) {+ return '「$from」的全部紀錄將轉到「$to」。「$from」仍保留在你的動作庫中。此操作無法復原。';+ }++ @override+ String get mergedToast => '紀錄已合併';}diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arbindex 111f852..3aa8184 100644--- a/lib/l10n/app_nl.arb+++ b/lib/l10n/app_nl.arb@@ -1256,5 +1256,10 @@"recommendedRowHint": "Oefeningen die we op Start voorstellen.","weightStepSetting": "Gewichtsstap","weightStepHint": "Wat de knoppen − en + toevoegen.",- "prBestWorkout": "Beste training"+ "prBestWorkout": "Beste training",+ "mergeExercise": "Samenvoegen",+ "mergeExerciseInto": "{name} samenvoegen met…",+ "mergeExerciseTitle": "Oefeningen samenvoegen?",+ "mergeExerciseBody": "De hele geschiedenis van ‘{from}’ gaat naar ‘{to}’. ‘{from}’ blijft in je bibliotheek. Dit kan niet ongedaan worden gemaakt.",+ "mergedToast": "Geschiedenis samengevoegd"}diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arbindex d4133eb..f7b4ae6 100644--- a/lib/l10n/app_pl.arb+++ b/lib/l10n/app_pl.arb@@ -1256,5 +1256,10 @@"recommendedRowHint": "Ćwiczenia proponowane na ekranie głównym.","weightStepSetting": "Krok ciężaru","weightStepHint": "Ile dodają przyciski − i +.",- "prBestWorkout": "Najlepszy trening"+ "prBestWorkout": "Najlepszy trening",+ "mergeExercise": "Scal",+ "mergeExerciseInto": "Scal {name} z…",+ "mergeExerciseTitle": "Scalić ćwiczenia?",+ "mergeExerciseBody": "Cała historia „{from}” przejdzie do „{to}”. „{from}” zostaje w twojej bibliotece. Tego nie można cofnąć.",+ "mergedToast": "Historia scalona"}diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arbindex 4be6182..f6d4a83 100644--- a/lib/l10n/app_pt.arb+++ b/lib/l10n/app_pt.arb@@ -1038,5 +1038,10 @@"recommendedRowHint": "Exercícios que sugerimos no Início.","weightStepSetting": "Incremento de peso","weightStepHint": "O que os botões − e + somam.",- "prBestWorkout": "Melhor treino"+ "prBestWorkout": "Melhor treino",+ "mergeExercise": "Mesclar",+ "mergeExerciseInto": "Mesclar {name} com…",+ "mergeExerciseTitle": "Mesclar exercícios?",+ "mergeExerciseBody": "Todo o histórico de “{from}” passa para “{to}”. “{from}” continua na sua biblioteca. Não dá para desfazer.",+ "mergedToast": "Histórico mesclado"}diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arbindex e8a4e37..a47603b 100644--- a/lib/l10n/app_ru.arb+++ b/lib/l10n/app_ru.arb@@ -1065,5 +1065,10 @@"recommendedRowHint": "Упражнения, которые мы предлагаем на главной.","weightStepSetting": "Шаг веса","weightStepHint": "Сколько добавляют кнопки − и +.",- "prBestWorkout": "Лучшая тренировка"+ "prBestWorkout": "Лучшая тренировка",+ "mergeExercise": "Объединить",+ "mergeExerciseInto": "Объединить {name} с…",+ "mergeExerciseTitle": "Объединить упражнения?",+ "mergeExerciseBody": "Вся история «{from}» перейдёт в «{to}». «{from}» останется в библиотеке. Это нельзя отменить.",+ "mergedToast": "История объединена"}diff --git a/lib/l10n/app_tr.arb b/lib/l10n/app_tr.arbindex a5deb51..9e2e0be 100644--- a/lib/l10n/app_tr.arb+++ b/lib/l10n/app_tr.arb@@ -1256,5 +1256,10 @@"recommendedRowHint": "Ana sayfada önerdiğimiz egzersizler.","weightStepSetting": "Ağırlık adımı","weightStepHint": "− ve + düğmelerinin eklediği miktar.",- "prBestWorkout": "En iyi antrenman"+ "prBestWorkout": "En iyi antrenman",+ "mergeExercise": "Birleştir",+ "mergeExerciseInto": "{name} şununla birleştir…",+ "mergeExerciseTitle": "Egzersizler birleştirilsin mi?",+ "mergeExerciseBody": "“{from}” geçmişinin tamamı “{to}” egzersizine taşınır. “{from}” kitaplığında kalır. Bu geri alınamaz.",+ "mergedToast": "Geçmiş birleştirildi"}diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arbindex 5a36f80..658b88b 100644--- a/lib/l10n/app_uk.arb+++ b/lib/l10n/app_uk.arb@@ -1256,5 +1256,10 @@"recommendedRowHint": "Вправи, які ми пропонуємо на головній.","weightStepSetting": "Крок ваги","weightStepHint": "Скільки додають кнопки − і +.",- "prBestWorkout": "Найкраще тренування"+ "prBestWorkout": "Найкраще тренування",+ "mergeExercise": "Об’єднати",+ "mergeExerciseInto": "Об’єднати {name} з…",+ "mergeExerciseTitle": "Об’єднати вправи?",+ "mergeExerciseBody": "Уся історія «{from}» перейде до «{to}». «{from}» залишиться в бібліотеці. Цю дію не можна скасувати.",+ "mergedToast": "Історію об’єднано"}diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arbindex a96ed47..e6a3fd8 100644--- a/lib/l10n/app_zh.arb+++ b/lib/l10n/app_zh.arb@@ -1038,5 +1038,10 @@"recommendedRowHint": "首页推荐的动作。","weightStepSetting": "重量步长","weightStepHint": "− 和 + 按钮每次增减的量。",- "prBestWorkout": "最佳训练"+ "prBestWorkout": "最佳训练",+ "mergeExercise": "合并",+ "mergeExerciseInto": "将 {name} 合并到…",+ "mergeExerciseTitle": "合并动作?",+ "mergeExerciseBody": "「{from}」的全部记录将转到「{to}」。「{from}」仍保留在你的动作库中。此操作无法撤销。",+ "mergedToast": "记录已合并"}diff --git a/lib/l10n/app_zh_Hant.arb b/lib/l10n/app_zh_Hant.arbindex 058b97d..2112954 100644--- a/lib/l10n/app_zh_Hant.arb+++ b/lib/l10n/app_zh_Hant.arb@@ -1256,5 +1256,10 @@"recommendedRowHint": "首頁推薦的動作。","weightStepSetting": "重量步長","weightStepHint": "− 和 + 按鈕每次增減的量。",- "prBestWorkout": "最佳訓練"+ "prBestWorkout": "最佳訓練",+ "mergeExercise": "合併",+ "mergeExerciseInto": "將 {name} 合併到…",+ "mergeExerciseTitle": "合併動作?",+ "mergeExerciseBody": "「{from}」的全部紀錄將轉到「{to}」。「{from}」仍保留在你的動作庫中。此操作無法復原。",+ "mergedToast": "紀錄已合併"}diff --git a/lib/screens/exercise_detail_screen.dart b/lib/screens/exercise_detail_screen.dartindex ee17d6c..995a797 100644--- a/lib/screens/exercise_detail_screen.dart+++ b/lib/screens/exercise_detail_screen.dart@@ -7,6 +7,7 @@ import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../l10n/l10n.dart';import '../models/exercise.dart';import '../models/workout.dart';+import '../services/exercise_match.dart';import '../state/fit_state.dart';import '../theme/app_colors.dart';import '../theme/app_theme.dart';@@ -96,6 +97,14 @@ class _ExerciseDetailScreenState extends State<ExerciseDetailScreen> {),),const SizedBox(width: 10),+ if (history.isNotEmpty) ...[+ RoundAction(+ label: t.mergeExercise,+ onTap: () => _merge(context, ex),+ child: Icon(PhosphorIconsRegular.gitMerge, size: 16, color: gc.textSecondary),+ ),+ const SizedBox(width: 10),+ ],],RoundAction(label: archived ? t.restoreExercise : t.archiveExercise,@@ -654,6 +663,33 @@ class _ExerciseDetailScreenState extends State<ExerciseDetailScreen> {fit.deleteCustomExercise(ex.id);}+ Future<void> _merge(BuildContext context, Exercise ex) async {+ final toId = await showAppSheet<String>(+ context: context,+ isScrollControlled: true,+ backgroundColor: Colors.transparent,+ builder: (_) => _MergeTargetSheet(from: ex),+ );+ if (toId == null || !context.mounted) return;+ final to = fit.exerciseById(toId);+ if (to == null) return;+ final ok = await askConfirm(+ context,+ title: t.mergeExerciseTitle,+ body: t.mergeExerciseBody(exerciseName(ex), exerciseName(to)),+ confirmLabel: t.mergeExercise,+ );+ if (!ok || !context.mounted) return;+ fit.mergeExerciseInto(ex.id, to.id);+ showNotchToast(+ context,+ t.mergedToast,+ subtitle: exerciseName(to),+ icon: PhosphorIconsRegular.gitMerge,+ accent: context.gc.accent,+ );+ }+void _toggleArchived(BuildContext context, Exercise ex) {fit.toggleArchived(ex.id);if (!fit.isArchived(ex.id)) return;@@ -1345,3 +1381,70 @@ class _ExerciseDetailScreenState extends State<ExerciseDetailScreen> {);}}++class _MergeTargetSheet extends StatefulWidget {+ const _MergeTargetSheet({required this.from});++ final Exercise from;++ @override+ State<_MergeTargetSheet> createState() => _MergeTargetSheetState();+}++class _MergeTargetSheetState extends State<_MergeTargetSheet> {+ final TextEditingController _q = TextEditingController();++ @override+ void dispose() {+ _q.dispose();+ super.dispose();+ }++ @override+ Widget build(BuildContext context) {+ final gc = context.gc;+ final all = fit.mergeTargets(widget.from.id);+ final results = _q.text.trim().isEmpty ? all.take(40).toList() : all.where(exerciseSearch(_q.text)).take(60).toList();++ return Padding(+ padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),+ child: Container(+ height: MediaQuery.of(context).size.height * 0.72,+ padding: sheetPad(context, bottom: 16),+ decoration: BoxDecoration(+ color: gc.bgRaised,+ borderRadius: const BorderRadius.vertical(top: Radius.circular(28)),+ ),+ child: Column(+ crossAxisAlignment: CrossAxisAlignment.stretch,+ children: [+ const SheetHandle(),+ const SizedBox(height: 16),+ SheetTitle(t.mergeExerciseInto(exerciseName(widget.from))),+ const SizedBox(height: 14),+ SearchField(+ controller: _q,+ hint: t.searchAllExercises,+ color: gc.bgRaised2,+ onChanged: (_) => setState(() {}),+ ),+ const SizedBox(height: 12),+ Flexible(+ child: OptionGroup(+ scroll: true,+ [+ for (final ex in results)+ OptionItem(+ exerciseName(ex),+ detail: muscleLabel(ex.primary),+ onTap: () => Navigator.of(context).pop(ex.id),+ ),+ ],+ ),+ ),+ ],+ ),+ ),+ );+ }+}diff --git a/lib/state/library_state.dart b/lib/state/library_state.dartindex 414b0c2..357e4d7 100644--- a/lib/state/library_state.dart+++ b/lib/state/library_state.dart@@ -264,6 +264,31 @@ mixin LibraryState on FitCore {notifyListeners();}+ List<Exercise> mergeTargets(String fromId) => [+ for (final e in allExercises)+ if (e.id != fromId && modeOf(e.id) == modeOf(fromId)) e,+ ];++ void mergeExerciseInto(String fromId, String toId) {+ final to = exerciseById(toId);+ if (to == null || fromId == toId || !isCustom(fromId) || modeOf(fromId) != modeOf(toId)) return;+ for (final s in sessions) {+ final i = s.exercises.indexWhere((e) => e.id == fromId);+ if (i < 0) continue;+ final from = s.exercises[i];+ final j = s.exercises.indexWhere((e) => e.id == toId);+ if (j < 0) {+ s.exercises[i] = LoggedExercise(to.id, to.name, to.primary, from.sets);+ } else {+ s.exercises[j].sets.addAll(from.sets);+ s.exercises.removeAt(i);+ }+ }+ persistNow();+ _refreshWidgets();+ notifyListeners();+ }+String mediaFor(String id) => exerciseMedia[id] ?? '';bool hasCustomMedia(String id) => mediaFor(id).isNotEmpty;diff --git a/test/requests_06oct_test.dart b/test/requests_06oct_test.dartnew file mode 100644index 0000000..47f6a66--- /dev/null+++ b/test/requests_06oct_test.dart@@ -0,0 +1,120 @@+import 'package:flutter_test/flutter_test.dart';+import 'package:gymmane/models/workout.dart';+import 'package:gymmane/services/local_store.dart';+import 'package:gymmane/state/fit_state.dart';+import 'package:shared_preferences/shared_preferences.dart';++void main() {+ TestWidgetsFlutterBinding.ensureInitialized();++ setUp(() async {+ SharedPreferences.setMockInitialValues({});+ await Store.instance.init();+ fit.resetAllData();+ fit.setUnits('kg');+ });++ tearDown(() {+ if (fit.session != null) fit.saveAndExit();+ });++ String idOf(String name) => fit.matchExerciseByName(name)!.id;++ LoggedSession day(int ago, List<LoggedExercise> exs) =>+ LoggedSession(DateTime.now().subtract(Duration(days: ago)), 1800, exs);++ group('salto de peso', () {+ test('los botones suman el salto elegido', () {+ final bench = idOf('Barbell Bench Press');+ fit.sessionPicks+ ..clear()+ ..add(bench);+ fit.startSession();+ fit.setSessionWeight(0, 0, 60);++ fit.setWeightStep(2);+ fit.bumpSessionWeight(0, 0, 1);+ expect(fit.session!.exercises[0].sets[0].weight, 62);+ });++ test('kg y lb guardan su propio salto y uno raro no entra', () {+ fit.setWeightStep(1);+ fit.setWeightStep(3);+ expect(fit.weightStep, 1);++ fit.setUnits('lb');+ expect(fit.weightStep, 5);+ fit.setWeightStep(10);+ expect(fit.weightStep, 10);++ fit.setUnits('kg');+ expect(fit.weightStep, 1);+ expect(fit.toJson()['stepKg'], 1);+ expect(fit.toJson()['stepLb'], 10);+ });++ test('los calentamientos siguen redondeando a discos', () {+ fit.setWeightStep(1);+ expect(fit.plateStep, 2.5);+ });+ });++ group('mejor serie y mejor entreno', () {+ test('la mejor serie es la de más 1RM y el mejor entreno el de más volumen', () {+ final bench = idOf('Barbell Bench Press');+ fit.sessions.addAll([+ day(3, [LoggedExercise(bench, 'Bench', 'chest', [LoggedSet(13, 16), LoggedSet(5, 18)])]),+ day(1, [LoggedExercise(bench, 'Bench', 'chest', [LoggedSet(10, 17), LoggedSet(10, 17), LoggedSet(10, 17)])]),+ ]);++ final set = fit.bestSet(bench)!;+ expect((set.set.weight, set.set.reps), (16, 13));++ final work = fit.bestWorkout(bench, PrKind.weight)!;+ expect(work.score, 510);+ });++ test('en un ejercicio de repeticiones el mejor entreno suma repeticiones', () {+ final pull = idOf('Pull Up');+ fit.sessions.add(day(1, [LoggedExercise(pull, 'Pull', 'back', [LoggedSet(8, 0), LoggedSet(6, 0)])]));+ expect(fit.bestWorkout(pull, PrKind.reps)!.score, 14);+ expect(fit.bestSet(pull), isNull);+ });+ });++ group('fusionar ejercicios', () {+ test('el historial pasa al otro y el propio se queda en la biblioteca', () {+ final mine = fit.addCustomExercise(name: 'Mi press', primary: 'chest', equipment: 'Barbell');+ final bench = idOf('Barbell Bench Press');+ fit.sessions.addAll([+ day(2, [LoggedExercise(mine, 'Mi press', 'chest', [LoggedSet(10, 50)])]),+ day(1, [+ LoggedExercise(bench, 'Bench', 'chest', [LoggedSet(8, 60)]),+ LoggedExercise(mine, 'Mi press', 'chest', [LoggedSet(6, 70)]),+ ]),+ ]);++ fit.mergeExerciseInto(mine, bench);++ expect(fit.exerciseHistory(mine), isEmpty);+ expect(fit.exerciseHistory(bench), hasLength(2));+ expect(fit.sessions[1].exercises, hasLength(1), reason: 'el mismo día se juntan las series');+ expect(fit.sessions[1].exercises.single.sets.map((s) => s.reps), [8, 6]);+ expect(fit.exerciseById(mine), isNotNull);+ });++ test('solo se fusiona un ejercicio propio con otro del mismo tipo', () {+ final bench = idOf('Barbell Bench Press');+ final squat = idOf('Barbell Squat');+ fit.sessions.add(day(1, [LoggedExercise(bench, 'Bench', 'chest', [LoggedSet(8, 60)])]));+ fit.mergeExerciseInto(bench, squat);+ expect(fit.exerciseHistory(bench), hasLength(1));++ final run = fit.addCustomExercise(name: 'Mi carrera', primary: 'quads', equipment: 'Bodyweight', mode: 'cardio');+ expect(fit.mergeTargets(run).every((e) => fit.modeOf(e.id) == 'cardio'), isTrue);+ fit.sessions.add(day(2, [LoggedExercise(run, 'Run', 'quads', [LoggedSet(0, 0, sec: 600)])]));+ fit.mergeExerciseInto(run, bench);+ expect(fit.exerciseHistory(run), hasLength(1));+ });+ });+}