Offline gym log for Android. No account, no ads, no internet.
Dart androidbodybuildingdartexercisesf-droidfitnessfluttergymgym-apphealthprivacyself-hostedworkoutworkout-appworkout-tracker
fix: narrow volume correction to separate left and right reps
Alexander Petrov19cc5518d0cd
diff --git a/docs/images/volume-paired.png b/docs/images/volume-paired.pngdeleted file mode 100644index ba5163a..0000000Binary files a/docs/images/volume-paired.png and /dev/null differdiff --git a/docs/images/volume-sides.png b/docs/images/volume-sides.pngdeleted file mode 100644index 24669ad..0000000Binary files a/docs/images/volume-sides.png and /dev/null differdiff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex fbae7b8..6449218 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -2588,7 +2588,7 @@"lightSessionNote": "Doesn't count for progression","lightSessionOff": "Turn off",- "eachSideRepsHint": "Enter the load moved by one side and log left and right reps separately. New sets count both sides for volume, without an extra pair multiplier. Progression follows the weaker side.",+ "eachSideRepsHint": "Log the left and right reps separately. Progression follows the weaker side.","repsLeftCol": "REPS L","repsRightCol": "REPS R","repsLeftTitle": "LEFT REPS",@@ -2777,16 +2777,8 @@"keepCountingHint": "It beeps at your time and keeps going until you stop it","holdOvertime": "Extra time",- "weightPerDumbbellCol": "{unit}/DB",- "@weightPerDumbbellCol": {"placeholders": {"unit": {"type": "String"}}},- "weightPerSideCol": "{unit}/SIDE",- "@weightPerSideCol": {"placeholders": {"unit": {"type": "String"}}},- "weightPerDumbbellTitle": "Weight per dumbbell ({unit})",- "@weightPerDumbbellTitle": {"placeholders": {"unit": {"type": "String"}}},- "weightPerSideTitle": "Load moved by one side ({unit})",- "@weightPerSideTitle": {"placeholders": {"unit": {"type": "String"}}},"pairSetting": "Pair of dumbbells",- "pairSettingHint": "Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.",+ "pairSettingHint": "Log the weight of one. Volume counts both.","helpCommon": "Common questions","helpQuestions": "Questions",@@ -2805,7 +2797,7 @@"helpSidesA": "Open the exercise › {settings} › {sides}.","@helpSidesA": {"placeholders": {"settings": {"type": "String"}, "sides": {"type": "String"}}},"helpPairQ": "Dumbbells: do I log one or both?",- "helpPairA": "One. Turn on “{pair}” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.",+ "helpPairA": "One. Turn on “{pair}” in the exercise’s settings and the volume counts both.","@helpPairA": {"placeholders": {"pair": {"type": "String"}}},"helpKeepQ": "Can a timed set keep going past the time?","helpKeepA": "Yes: turn on “{keep}” in the exercise’s settings. It beeps at your time and keeps counting until you stop it.",diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arbindex 6dcf5e8..135136a 100644--- a/lib/l10n/app_es.arb+++ b/lib/l10n/app_es.arb@@ -2250,7 +2250,7 @@"lightSessionNote": "No cuenta para la progresión","lightSessionOff": "Quitar",- "eachSideRepsHint": "Introduce la carga movida por un lado y registra las repeticiones de izquierda y derecha por separado. Las series nuevas suman ambos lados sin duplicar el par. La progresión sigue al lado más débil.",+ "eachSideRepsHint": "Apunta las reps de la izquierda y la derecha por separado. La progresión sigue al lado más flojo.","repsLeftCol": "REPS I","repsRightCol": "REPS D","repsLeftTitle": "REPS IZQUIERDA",@@ -2436,16 +2436,8 @@"keepCountingHint": "Suena al llegar a tu tiempo y sigue hasta que lo pares","holdOvertime": "Tiempo extra",- "weightPerDumbbellCol": "{unit}/MANC.",- "@weightPerDumbbellCol": {"placeholders": {"unit": {"type": "String"}}},- "weightPerSideCol": "{unit}/LADO",- "@weightPerSideCol": {"placeholders": {"unit": {"type": "String"}}},- "weightPerDumbbellTitle": "Peso por mancuerna ({unit})",- "@weightPerDumbbellTitle": {"placeholders": {"unit": {"type": "String"}}},- "weightPerSideTitle": "Carga movida por un lado ({unit})",- "@weightPerSideTitle": {"placeholders": {"unit": {"type": "String"}}},"pairSetting": "Par de mancuernas",- "pairSettingHint": "Introduce el peso de una mancuerna. Las series nuevas cuentan las dos. Con repeticiones separadas, cada lado se cuenta una sola vez. Los entrenos anteriores no cambian.",+ "pairSettingHint": "Apunta el peso de una. El volumen cuenta las dos.","helpCommon": "Preguntas frecuentes","helpQuestions": "Preguntas",@@ -2461,7 +2453,7 @@"helpSidesQ": "¿Cómo apunto izquierda y derecha por separado?","helpSidesA": "Abre el ejercicio › {settings} › {sides}.","helpPairQ": "Mancuernas: ¿apunto el peso de una o de las dos?",- "helpPairA": "Una. Activa «{pair}» en los ajustes del ejercicio para contar ambas en las series nuevas. Con repeticiones separadas, el volumen suma ambos lados sin volver a duplicarlos. Los entrenos anteriores no cambian.",+ "helpPairA": "El de una. Activa «{pair}» en los ajustes del ejercicio y el volumen cuenta las dos.","helpKeepQ": "¿Puede una serie por tiempo seguir después de llegar?","helpKeepA": "Sí: activa «{keep}» en los ajustes del ejercicio. Suena al llegar a tu tiempo y sigue hasta que lo pares.","helpDayOffQ": "¿Cómo marco un día de descanso, enfermo o de viaje?",diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex 54a397f..d07975c 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -13157,7 +13157,7 @@ abstract class AppLocalizations {/// No description provided for @eachSideRepsHint.////// In en, this message translates to:- /// **'Enter the load moved by one side and log left and right reps separately. New sets count both sides for volume, without an extra pair multiplier. Progression follows the weaker side.'**+ /// **'Log the left and right reps separately. Progression follows the weaker side.'**String get eachSideRepsHint;/// No description provided for @repsLeftCol.@@ -14066,30 +14066,6 @@ abstract class AppLocalizations {/// **'Extra time'**String get holdOvertime;- /// No description provided for @weightPerDumbbellCol.- ///- /// In en, this message translates to:- /// **'{unit}/DB'**- String weightPerDumbbellCol(String unit);-- /// No description provided for @weightPerSideCol.- ///- /// In en, this message translates to:- /// **'{unit}/SIDE'**- String weightPerSideCol(String unit);-- /// No description provided for @weightPerDumbbellTitle.- ///- /// In en, this message translates to:- /// **'Weight per dumbbell ({unit})'**- String weightPerDumbbellTitle(String unit);-- /// No description provided for @weightPerSideTitle.- ///- /// In en, this message translates to:- /// **'Load moved by one side ({unit})'**- String weightPerSideTitle(String unit);-/// No description provided for @pairSetting.////// In en, this message translates to:@@ -14099,7 +14075,7 @@ abstract class AppLocalizations {/// No description provided for @pairSettingHint.////// In en, this message translates to:- /// **'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.'**+ /// **'Log the weight of one. Volume counts both.'**String get pairSettingHint;/// No description provided for @helpCommon.@@ -14189,7 +14165,7 @@ abstract class AppLocalizations {/// No description provided for @helpPairA.////// In en, this message translates to:- /// **'One. Turn on “{pair}” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.'**+ /// **'One. Turn on “{pair}” in the exercise’s settings and the volume counts both.'**String helpPairA(String pair);/// No description provided for @helpKeepQ.diff --git a/lib/l10n/app_localizations_ar.dart b/lib/l10n/app_localizations_ar.dartindex f93a84a..395745b 100644--- a/lib/l10n/app_localizations_ar.dart+++ b/lib/l10n/app_localizations_ar.dart@@ -8116,32 +8116,11 @@ class AppLocalizationsAr extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -8193,7 +8172,7 @@ class AppLocalizationsAr extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_bn.dart b/lib/l10n/app_localizations_bn.dartindex 670aec5..0c5b36a 100644--- a/lib/l10n/app_localizations_bn.dart+++ b/lib/l10n/app_localizations_bn.dart@@ -8016,32 +8016,11 @@ class AppLocalizationsBn extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -8093,7 +8072,7 @@ class AppLocalizationsBn extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dartindex 0edd84f..c254493 100644--- a/lib/l10n/app_localizations_de.dart+++ b/lib/l10n/app_localizations_de.dart@@ -8071,32 +8071,11 @@ class AppLocalizationsDe extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -8148,7 +8127,7 @@ class AppLocalizationsDe extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex 732ebff..47c0842 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -7497,7 +7497,7 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString get eachSideRepsHint =>- 'Enter the load moved by one side and log left and right reps separately. New sets count both sides for volume, without an extra pair multiplier. Progression follows the weaker side.';+ 'Log the left and right reps separately. Progression follows the weaker side.';@overrideString get repsLeftCol => 'REPS L';@@ -7996,32 +7996,11 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -8073,7 +8052,7 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dartindex d939ff1..98867e6 100644--- a/lib/l10n/app_localizations_es.dart+++ b/lib/l10n/app_localizations_es.dart@@ -7541,7 +7541,7 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString get eachSideRepsHint =>- 'Introduce la carga movida por un lado y registra las repeticiones de izquierda y derecha por separado. Las series nuevas suman ambos lados sin duplicar el par. La progresión sigue al lado más débil.';+ 'Apunta las reps de la izquierda y la derecha por separado. La progresión sigue al lado más flojo.';@overrideString get repsLeftCol => 'REPS I';@@ -8042,32 +8042,11 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString get holdOvertime => 'Tiempo extra';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/MANC.';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/LADO';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Peso por mancuerna ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Carga movida por un lado ($unit)';- }-@overrideString get pairSetting => 'Par de mancuernas';@override- String get pairSettingHint =>- 'Introduce el peso de una mancuerna. Las series nuevas cuentan las dos. Con repeticiones separadas, cada lado se cuenta una sola vez. Los entrenos anteriores no cambian.';+ String get pairSettingHint => 'Apunta el peso de una. El volumen cuenta las dos.';@overrideString get helpCommon => 'Preguntas frecuentes';@@ -8120,7 +8099,7 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'Una. Activa «$pair» en los ajustes del ejercicio para contar ambas en las series nuevas. Con repeticiones separadas, el volumen suma ambos lados sin volver a duplicarlos. Los entrenos anteriores no cambian.';+ return 'El de una. Activa «$pair» en los ajustes del ejercicio y el volumen cuenta las dos.';}@overridediff --git a/lib/l10n/app_localizations_fa.dart b/lib/l10n/app_localizations_fa.dartindex d8d421a..2a417c1 100644--- a/lib/l10n/app_localizations_fa.dart+++ b/lib/l10n/app_localizations_fa.dart@@ -7922,32 +7922,11 @@ class AppLocalizationsFa extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -7999,7 +7978,7 @@ class AppLocalizationsFa extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dartindex 08cc0f3..bf9269e 100644--- a/lib/l10n/app_localizations_fr.dart+++ b/lib/l10n/app_localizations_fr.dart@@ -8074,32 +8074,11 @@ class AppLocalizationsFr extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -8151,7 +8130,7 @@ class AppLocalizationsFr extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_hi.dart b/lib/l10n/app_localizations_hi.dartindex 45a99a1..89eef46 100644--- a/lib/l10n/app_localizations_hi.dart+++ b/lib/l10n/app_localizations_hi.dart@@ -7989,32 +7989,11 @@ class AppLocalizationsHi extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -8066,7 +8045,7 @@ class AppLocalizationsHi extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_id.dart b/lib/l10n/app_localizations_id.dartindex 499d881..5f47047 100644--- a/lib/l10n/app_localizations_id.dart+++ b/lib/l10n/app_localizations_id.dart@@ -7870,32 +7870,11 @@ class AppLocalizationsId extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -7947,7 +7926,7 @@ class AppLocalizationsId extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dartindex 1a94038..4c28529 100644--- a/lib/l10n/app_localizations_it.dart+++ b/lib/l10n/app_localizations_it.dart@@ -8046,32 +8046,11 @@ class AppLocalizationsIt extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -8123,7 +8102,7 @@ class AppLocalizationsIt extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dartindex 0836eb0..289212c 100644--- a/lib/l10n/app_localizations_ja.dart+++ b/lib/l10n/app_localizations_ja.dart@@ -7759,32 +7759,11 @@ class AppLocalizationsJa extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -7836,7 +7815,7 @@ class AppLocalizationsJa extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_ko.dart b/lib/l10n/app_localizations_ko.dartindex 7527b1d..8df9683 100644--- a/lib/l10n/app_localizations_ko.dart+++ b/lib/l10n/app_localizations_ko.dart@@ -7771,32 +7771,11 @@ class AppLocalizationsKo extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -7848,7 +7827,7 @@ class AppLocalizationsKo extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dartindex ebbfb32..8633843 100644--- a/lib/l10n/app_localizations_nl.dart+++ b/lib/l10n/app_localizations_nl.dart@@ -8052,32 +8052,11 @@ class AppLocalizationsNl extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -8129,7 +8108,7 @@ class AppLocalizationsNl extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dartindex e6a51a7..b775c9e 100644--- a/lib/l10n/app_localizations_pl.dart+++ b/lib/l10n/app_localizations_pl.dart@@ -8220,32 +8220,11 @@ class AppLocalizationsPl extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -8297,7 +8276,7 @@ class AppLocalizationsPl extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dartindex c9811d9..e13453e 100644--- a/lib/l10n/app_localizations_pt.dart+++ b/lib/l10n/app_localizations_pt.dart@@ -8059,32 +8059,11 @@ class AppLocalizationsPt extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -8136,7 +8115,7 @@ class AppLocalizationsPt extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dartindex e5ade6d..4a68a5a 100644--- a/lib/l10n/app_localizations_ru.dart+++ b/lib/l10n/app_localizations_ru.dart@@ -8328,32 +8328,11 @@ class AppLocalizationsRu extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -8405,7 +8384,7 @@ class AppLocalizationsRu extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_tr.dart b/lib/l10n/app_localizations_tr.dartindex e7e586f..f13868f 100644--- a/lib/l10n/app_localizations_tr.dart+++ b/lib/l10n/app_localizations_tr.dart@@ -8021,32 +8021,11 @@ class AppLocalizationsTr extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -8098,7 +8077,7 @@ class AppLocalizationsTr extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dartindex f13f30a..341b2a4 100644--- a/lib/l10n/app_localizations_uk.dart+++ b/lib/l10n/app_localizations_uk.dart@@ -8216,32 +8216,11 @@ class AppLocalizationsUk extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -8293,7 +8272,7 @@ class AppLocalizationsUk extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_ur.dart b/lib/l10n/app_localizations_ur.dartindex 4f278f6..6f896df 100644--- a/lib/l10n/app_localizations_ur.dart+++ b/lib/l10n/app_localizations_ur.dart@@ -7949,32 +7949,11 @@ class AppLocalizationsUr extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -8026,7 +8005,7 @@ class AppLocalizationsUr extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_vi.dart b/lib/l10n/app_localizations_vi.dartindex 0d1d29c..98c5f25 100644--- a/lib/l10n/app_localizations_vi.dart+++ b/lib/l10n/app_localizations_vi.dart@@ -7878,32 +7878,11 @@ class AppLocalizationsVi extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -7955,7 +7934,7 @@ class AppLocalizationsVi extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dartindex a380230..b947e09 100644--- a/lib/l10n/app_localizations_zh.dart+++ b/lib/l10n/app_localizations_zh.dart@@ -7692,32 +7692,11 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString get holdOvertime => 'Extra time';- @override- String weightPerDumbbellCol(String unit) {- return '$unit/DB';- }-- @override- String weightPerSideCol(String unit) {- return '$unit/SIDE';- }-- @override- String weightPerDumbbellTitle(String unit) {- return 'Weight per dumbbell ($unit)';- }-- @override- String weightPerSideTitle(String unit) {- return 'Load moved by one side ($unit)';- }-@overrideString get pairSetting => 'Pair of dumbbells';@override- String get pairSettingHint =>- 'Enter the weight of one dumbbell. New sets count both dumbbells. With separate left/right reps, each side is counted once. Existing workouts stay unchanged.';+ String get pairSettingHint => 'Log the weight of one. Volume counts both.';@overrideString get helpCommon => 'Common questions';@@ -7769,7 +7748,7 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString helpPairA(String pair) {- return 'One. Turn on “$pair” in the exercise’s settings for new sets to count both. With separate left/right reps, volume adds both sides without doubling again. Existing workouts stay unchanged.';+ return 'One. Turn on “$pair” in the exercise’s settings and the volume counts both.';}@overridediff --git a/lib/models/live_session.dart b/lib/models/live_session.dartindex 8178610..5d759cb 100644--- a/lib/models/live_session.dart+++ b/lib/models/live_session.dart@@ -2,10 +2,7 @@ import 'workout.dart';class SessionSet {SessionSet(this.reps, this.weight, this.done,- {this.kind = SetKind.normal, this.rpe, this.sec, this.km, this.rest, this.note = '', this.repsR,- this.goal, this.volumeMultiplier, this.preserveLegacyVolume = false});- int? volumeMultiplier;- final bool preserveLegacyVolume;+ {this.kind = SetKind.normal, this.rpe, this.sec, this.km, this.rest, this.note = '', this.repsR, this.goal});int reps;int? repsR;String? goal;@@ -29,19 +26,11 @@ class SessionSet {LoggedSet get logged => LoggedSet(weakReps, weight,kind: kind, rpe: rpe, sec: sec, km: km, note: note.trim(), left: repsR == null ? null : reps, right: repsR);- LoggedSet loggedForVolume(bool paired) => LoggedSet(weakReps, weight,- kind: kind, rpe: rpe, sec: sec, km: km, note: note.trim(),- left: repsR == null ? null : reps, right: repsR,- volumeMultiplier: preserveLegacyVolume ? null : volumeMultiplier ?? (paired ? 2 : 1));-- SessionSet copy({bool done = false}) => SessionSet(reps, weight, done,- kind: kind, rpe: rpe, sec: sec, km: km, repsR: repsR, goal: goal,- volumeMultiplier: volumeMultiplier, preserveLegacyVolume: preserveLegacyVolume);+ SessionSet copy({bool done = false}) =>+ SessionSet(reps, weight, done, kind: kind, rpe: rpe, sec: sec, km: km, repsR: repsR, goal: goal);Map<String, dynamic> toJson() => {'r': reps,- if (volumeMultiplier != null) 'vm': volumeMultiplier,- if (preserveLegacyVolume) 'lv': true,if (repsR != null) 'rr': repsR,if (goal != null) 'g': goal,'w': weight,@@ -66,8 +55,6 @@ class SessionSet {note: j['n'] as String? ?? '',repsR: (j['rr'] as num?)?.toInt(),goal: j['g'] as String?,- volumeMultiplier: (j['vm'] as num?)?.toInt(),- preserveLegacyVolume: j['lv'] == true,)..half = j['h'] as bool? ?? false;}diff --git a/lib/models/workout.dart b/lib/models/workout.dartindex 1273278..2e97e1c 100644--- a/lib/models/workout.dart+++ b/lib/models/workout.dart@@ -16,13 +16,11 @@ double? rpePercent(int reps, double? rpe) {return i < _rpeTable.length ? _rpeTable[i] : null;}-final Set<String> legacyPairedDumbbells = {};+final Set<String> pairedDumbbells = {};class LoggedSet {LoggedSet(this.reps, this.weight,- {this.kind = SetKind.normal, this.rpe, this.sec, this.km, this.note = '', this.left, this.right,- this.volumeMultiplier});- final int? volumeMultiplier;+ {this.kind = SetKind.normal, this.rpe, this.sec, this.km, this.note = '', this.left, this.right});final int reps;final int? left;final int? right;@@ -36,11 +34,7 @@ class LoggedSet {bool get counts => kind != SetKind.warmup;bool get sided => left != null && right != null;double? get rir => rpe == null ? null : 10 - rpe!;- double get volume {- if (!counts) return 0;- if (volumeMultiplier == null) return reps * weight;- return weight * (sided ? left! + right! : reps * volumeMultiplier!);- }+ double get volume => counts ? (sided ? left! + right! : reps) * weight : 0;double get oneRm {if (!counts || reps <= 0) return 0;@@ -51,7 +45,6 @@ class LoggedSet {Map<String, dynamic> toJson() => {'r': reps,'w': weight,- if (volumeMultiplier != null) 'vm': volumeMultiplier,if (sided) 'rl': left,if (sided) 'rr': right,if (kind != SetKind.normal) 'k': kind.index,@@ -70,7 +63,6 @@ class LoggedSet {note: j['n'] as String? ?? '',left: (j['rl'] as num?)?.toInt(),right: (j['rr'] as num?)?.toInt(),- volumeMultiplier: (j['vm'] as num?)?.toInt(),);}@@ -101,10 +93,8 @@ class LoggedExercise {List<LoggedSet> get workingSets => sets.where((s) => s.counts).toList();- double volumeOf(LoggedSet set) =>- set.volume * (set.volumeMultiplier == null && legacyPairedDumbbells.contains(id) ? 2 : 1);-- double get volume => workingSets.fold(0.0, (s, x) => s + volumeOf(x));+ double get volume => workingSets.fold(0.0,+ (s, x) => s + x.volume * (!x.sided && pairedDumbbells.contains(id) ? 2 : 1));double get topWeight {final w = workingSets;return w.isEmpty ? 0 : w.map((s) => s.weight).reduce((a, b) => a > b ? a : b);diff --git a/lib/screens/session_screen.dart b/lib/screens/session_screen.dartindex effe65f..98ad7f0 100644--- a/lib/screens/session_screen.dart+++ b/lib/screens/session_screen.dart@@ -1178,8 +1178,7 @@ class SessionScreen extends StatelessWidget {Expanded(flex: _prevFlex, child: label(t.previousCol)),],for (final h in _headers(mode, repsOnly, sided, exId == null ? fit.units : fit.unitsFor(exId),- exId == null ? fit.distanceUnit : fit.distanceUnitFor(exId),- paired: exId != null && fit.isPaired(exId))) ...[+ exId == null ? fit.distanceUnit : fit.distanceUnitFor(exId))) ...[SizedBox(width: gap),Expanded(flex: _cellFlex, child: label(h)),],@@ -1457,11 +1456,7 @@ class SessionScreen extends StatelessWidget {26,onEdit: (context) => _ruler(context,- title: fit.isSidedReps(exId)- ? t.weightPerSideTitle(fit.unitsFor(exId).toUpperCase())- : fit.isPaired(exId)- ? t.weightPerDumbbellTitle(fit.unitsFor(exId).toUpperCase())- : t.weightTitle(fit.unitsFor(exId).toUpperCase()),+ title: t.weightTitle(fit.unitsFor(exId).toUpperCase()),value: fit.toShownFor(exId, st.weight),max: fit.isLbFor(exId) ? 1540 : 700,step: fit.rulerStepFor(exId),@@ -1522,18 +1517,12 @@ class SessionScreen extends StatelessWidget {};}- List<String> _headers(String mode, bool repsOnly, bool sided, String unit, String dist,- {bool paired = false}) => switch (mode) {+ List<String> _headers(String mode, bool repsOnly, bool sided, String unit, String dist) => switch (mode) {'cardio' => [t.distanceCol(dist.toUpperCase()), t.timeCol],'time' => [sided ? t.timePerSideCol : t.timeCol, if (!repsOnly) t.weightCol(unit.toUpperCase())],_ => [if (sided) ...[t.repsLeftCol, t.repsRightCol] else t.repsCol,- if (!repsOnly)- sided- ? t.weightPerSideCol(unit.toUpperCase())- : paired- ? t.weightPerDumbbellCol(unit.toUpperCase())- : t.weightCol(unit.toUpperCase()),+ if (!repsOnly) t.weightCol(unit.toUpperCase()),],};diff --git a/lib/state/fit_core.dart b/lib/state/fit_core.dartindex 94ded78..7eee556 100644--- a/lib/state/fit_core.dart+++ b/lib/state/fit_core.dart@@ -89,7 +89,7 @@ abstract class FitCore extends ChangeNotifier {final Set<String> eachSideOff = {};final Set<String> keepCounting = {};- final Set<String> pairOn = {};+ final Set<String> pairOn = pairedDumbbells;final Set<String> assistedOn = {};final Set<String> assistedOff = {};diff --git a/lib/state/fit_state.dart b/lib/state/fit_state.dartindex 2fb4938..022d037 100644--- a/lib/state/fit_state.dart+++ b/lib/state/fit_state.dart@@ -467,9 +467,6 @@ class FitState extends FitCorepairOn..clear()..addAll(((data['pairOn'] as List?) ?? const []).cast<String>());- legacyPairedDumbbells- ..clear()- ..addAll(((data['legacyPairOn'] as List?) ?? (data['pairOn'] as List?) ?? const []).cast<String>());assistedOn..clear()..addAll(((data['assisted'] as List?) ?? const []).cast<String>());@@ -672,7 +669,6 @@ class FitState extends FitCore'eachSideOff': eachSideOff.toList(),if (keepCounting.isNotEmpty) 'keepCounting': keepCounting.toList(),if (pairOn.isNotEmpty) 'pairOn': pairOn.toList(),- 'legacyPairOn': legacyPairedDumbbells.toList(),if (assistedOn.isNotEmpty) 'assisted': assistedOn.toList(),if (assistedOff.isNotEmpty) 'assistedOff': assistedOff.toList(),'sessions': _stored('sessions', sessions, (s) => s.toJson(), parts: _sessionParts),@@ -778,7 +774,6 @@ class FitState extends FitCoreeachSideOff.clear();keepCounting.clear();pairOn.clear();- legacyPairedDumbbells.clear();assistedOn.clear();assistedOff.clear();exerciseRest.clear();diff --git a/lib/state/stats_state.dart b/lib/state/stats_state.dartindex 8f0943d..9b2e426 100644--- a/lib/state/stats_state.dart+++ b/lib/state/stats_state.dart@@ -477,7 +477,6 @@ mixin StatsState on FitCore, ToolsState, LibraryState, SettingsState, TimelineSte.sets[i] = LoggedSet(reps ?? old.reps,weight ?? old.weight,- volumeMultiplier: old.volumeMultiplier,kind: old.kind,rpe: old.rpe,sec: sec ?? old.sec,@@ -608,8 +607,7 @@ mixin StatsState on FitCore, ToolsState, LibraryState, SettingsState, TimelineStvoid addLoggedSet(LoggedExercise e) {final last = e.sets.isNotEmpty ? e.sets.last : LoggedSet(10, isRepsOnly(e.id) ? 0 : 20);- e.sets.add(LoggedSet(last.reps, last.weight, sec: last.sec, km: last.km, left: last.left, right: last.right,- volumeMultiplier: last.volumeMultiplier));+ e.sets.add(LoggedSet(last.reps, last.weight, sec: last.sec, km: last.km, left: last.left, right: last.right));persistNow();_refreshWidgets();notifyListeners();diff --git a/lib/state/workout_state.dart b/lib/state/workout_state.dartindex cadaff2..fa3d75d 100644--- a/lib/state/workout_state.dart+++ b/lib/state/workout_state.dart@@ -898,9 +898,9 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStdouble get sessionVolumeKg {var kg = 0.0;for (final e in session?.exercises ?? const <SessionExercise>[]) {- final logged = LoggedExercise(e.id, e.name, e.primary, const []);+ final times = isPaired(e.id) ? 2 : 1;for (final st in e.sets) {- if (st.done && st.counts) kg += logged.volumeOf(st.loggedForVolume(isPaired(e.id)));+ if (st.done && st.counts) kg += st.logged.volume * (st.repsR == null ? times : 1);}}return kg;@@ -934,15 +934,14 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStif (done.isEmpty) continue;final before = [for (final p in last.exercises)- if (p.id == e.id) ...p.workingSets.map(p.volumeOf),+ if (p.id == e.id) ...p.workingSets,];if (before.isEmpty) continue;var now = 0.0;var then = 0.0;for (var i = 0; i < done.length; i++) {- now += LoggedExercise(e.id, e.name, e.primary, const [])- .volumeOf(done[i].loggedForVolume(isPaired(e.id)));- if (i < before.length) then += before[i];+ now += done[i].logged.volume;+ if (i < before.length) then += before[i].volume;}if (now <= 0 && then <= 0) continue;rows.add((id: e.id, name: e.name, now: now, then: then));@@ -1912,7 +1911,7 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStif (st.counts) working.add(st);}}- s.summaryVolume = sessionVolumeKg.round();+ s.summaryVolume = working.fold<double>(0, (sum, st) => sum + st.logged.volume).round();s.summarySets = working.length;s.summaryDuration = s.manual ? _elapsedBefore : sessionElapsed;s.complete = true;@@ -1922,11 +1921,7 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStif (done.isNotEmpty) {final logged = <LoggedExercise>[];for (final e in s.exercises) {- final doneSets = e.sets.where((st) => st.done).map((st) {- final logged = st.loggedForVolume(isPaired(e.id));- st.volumeMultiplier = logged.volumeMultiplier;- return logged;- }).toList();+ final doneSets = e.sets.where((st) => st.done).map((st) => st.logged).toList();if (doneSets.isNotEmpty) {logged.add(LoggedExercise(e.id, e.name, e.primary, doneSets, incline: lastIncline(e.id)));}@@ -2390,10 +2385,7 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsSte.primary,e.sets.map((x) => SessionSet(x.sided ? x.left! : x.reps, x.weight, true,- kind: x.kind, rpe: x.rpe, sec: x.sec, km: x.km, note: x.note, repsR: x.right,- volumeMultiplier: x.volumeMultiplier,- preserveLegacyVolume: x.volumeMultiplier == null,- ))+ kind: x.kind, rpe: x.rpe, sec: x.sec, km: x.km, note: x.note, repsR: x.right)).toList())).toList();_restTimer?.cancel();diff --git a/test/pending_translation_keys.txt b/test/pending_translation_keys.txtindex 8d363ee..5f7f160 100644--- a/test/pending_translation_keys.txt+++ b/test/pending_translation_keys.txt@@ -18,7 +18,3 @@ routineNotesAddedreportChooseCsvreportWeighInsreportSessionDetails-weightPerDumbbellCol-weightPerSideCol-weightPerDumbbellTitle-weightPerSideTitlediff --git a/test/sided_volume_test.dart b/test/sided_volume_test.dartindex 66da4fc..302c342 100644--- a/test/sided_volume_test.dart+++ b/test/sided_volume_test.dart@@ -27,106 +27,72 @@ void main() {}for (final paired in [false, true]) {- for (final right in [0, 8, 10]) {- test('separate reps count once: paired=$paired, right=$right', () {+ for (final right in [0, 8, 10, 12]) {+ test('both sides count once: paired=$paired, right=$right', () {start(paired: paired, right: right);final expected = 10.0 * (10 + right);expect(fit.sessionVolumeKg, expected);fit.finishSession();final session = fit.filedSession!;final set = session.exercises.single.sets.single;- expect(set.reps, right);+ final weak = right < 10 ? right : 10;+ expect(set.reps, weak);expect(set.weight, 10);- expect(set.oneRm, LoggedSet(right, 10).oneRm);+ expect(set.oneRm, LoggedSet(weak, 10).oneRm);expect(session.volume, expected);expect(fit.session!.summaryVolume, expected);expect(LoggedSession.fromJson(session.toJson()).volume, expected);+ expect(set.toJson(), {'r': weak, 'w': 10.0, 'rl': 10, 'rr': right});fit.togglePaired(session.exercises.single.id);expect(session.volume, expected);});}}- test('paired reps, warmups and single load share the same saved calculation', () {- start(paired: true);- final e = fit.session!.exercises.single;- e.sets.add(SessionSet(20, 100, true, kind: SetKind.warmup));- expect(fit.sessionVolumeKg, 200);- fit.finishSession();- expect(fit.filedSession!.volume, 200);- fit.togglePaired(e.id);- expect(fit.filedSession!.volume, 200);- fit.saveAndExit();- start();- expect(fit.sessionVolumeKg, 100);- fit.finishSession();- expect(fit.filedSession!.volume, 100);+ test('mixed sets retain paired behavior for ordinary reps and exclude warmups', () {+ final id = fit.matchExerciseByName('Dumbbell Curl')!.id;+ final exercise = LoggedExercise(id, 'Curl', 'biceps', [+ LoggedSet(8, 10, left: 10, right: 8),+ LoggedSet(10, 10),+ LoggedSet(20, 100, left: 20, right: 20, kind: SetKind.warmup),+ ]);+ expect(exercise.volume, 280);+ fit.togglePaired(id);+ expect(exercise.volume, 380);+ fit.togglePaired(id);+ expect(exercise.volume, 280);});- for (final paired in [false, true]) {- test('legacy records and pairing survive settings, backup and resume: $paired', () {- final id = fit.matchExerciseByName('Dumbbell Curl')!.id;- final old = LoggedSession(DateTime(2026, 10, 1), 600, [- LoggedExercise(id, 'Curl', 'biceps', [LoggedSet(8, 10, left: 10, right: 8)]),- ]).toJson();- final backup = fit.toJson()..remove('legacyPairOn');- backup['pairOn'] = paired ? [id] : <String>[];- backup['sessions'] = [old];- expect(fit.importJson(jsonEncode(backup)), isTrue);- final expected = paired ? 160.0 : 80.0;- expect(fit.totalVolumeKg, expected);- fit.togglePaired(id);- expect(fit.totalVolumeKg, expected);- expect(fit.sessions.single.toJson(), old);- final exported = fit.exportJson();- fit.resetAllData();- expect(fit.importJson(exported), isTrue);- expect(fit.totalVolumeKg, expected);- expect(fit.sessions.single.toJson(), old);- fit.resumeLoggedSession(fit.sessions.single);- fit.session = WorkoutSession.fromJson(fit.session!.toJson());- expect(fit.sessionVolumeKg, expected);- fit.finishSession();- expect(fit.filedSession!.volume, expected);- expect(fit.filedSession!.exercises.single.toJson(), (old['ex'] as List).single);- });- }-- test('history edits and resume retain the saved new convention', () {- start(paired: true, right: 8);- fit.finishSession();- final logged = fit.filedSession!;- final e = logged.exercises.single;- fit.setLoggedReps(e, 0, 9);- expect(e.volume, 180);- fit.setLoggedWeight(e, 0, 12);- expect(e.volume, 216);- fit.togglePaired(e.id);- fit.saveAndExit();- fit.resumeLoggedSession(logged);- expect(fit.sessionVolumeKg, 216);- fit.finishSession();- expect(fit.filedSession!.volume, 216);- final backup = fit.exportJson();+ test('existing sided records calculate both sides without rewriting saved data', () {+ final id = fit.matchExerciseByName('Dumbbell Curl')!.id;+ final old = LoggedSession(DateTime(2026, 10, 1), 600, [+ LoggedExercise(id, 'Curl', 'biceps', [LoggedSet(8, 10, left: 10, right: 8)]),+ ]).toJson();+ final backup = fit.toJson();+ backup['pairOn'] = [id];+ backup['sessions'] = [old];+ expect(fit.importJson(jsonEncode(backup)), isTrue);+ expect(fit.totalVolumeKg, 180);+ expect(fit.sessions.single.toJson(), old);+ final exported = fit.exportJson();fit.resetAllData();- expect(fit.importJson(backup), isTrue);- expect(fit.totalVolumeKg, 216);- });-- test('continuing a filed workout preserves its saved pairing', () {- start(paired: true);- fit.finishSession();- final id = fit.filedSession!.exercises.single.id;- fit.togglePaired(id);- fit.continueSession();- expect(fit.sessionVolumeKg, 200);+ expect(fit.importJson(exported), isTrue);+ expect(fit.totalVolumeKg, 180);+ expect(fit.sessions.single.toJson(), old);+ fit.resumeLoggedSession(fit.sessions.single);+ expect(fit.sessionVolumeKg, 180);fit.finishSession();- expect(fit.filedSession!.volume, 200);+ expect(fit.filedSession!.volume, 180);+ expect(fit.filedSession!.exercises.single.toJson(), (old['ex'] as List).single);});- test('comparison uses the same total as the session and history', () {+ test('sided comparison and summary agree with saved volume, excluding warmups', () {start(paired: true, right: 8);+ fit.session!.exercises.single.sets.add(SessionSet(20, 100, true, repsR: 20, kind: SetKind.warmup));+ expect(fit.sessionVolumeKg, 180);fit.finishSession();+ expect(fit.session!.summaryVolume, 180);+ expect(fit.filedSession!.volume, 180);fit.saveAndExit();start(right: 10);expect(fit.raceRows.single.then, 180);diff --git a/test/sided_volume_ui_test.dart b/test/sided_volume_ui_test.dartdeleted file mode 100644index a1e6087..0000000--- a/test/sided_volume_ui_test.dart+++ /dev/null@@ -1,50 +0,0 @@-import 'package:flutter/material.dart';-import 'package:flutter_test/flutter_test.dart';-import 'package:gymmane/l10n/l10n.dart';-import 'package:gymmane/models/live_session.dart';-import 'package:gymmane/screens/session_screen.dart';-import 'package:gymmane/services/local_store.dart';-import 'package:gymmane/state/fit_state.dart';-import 'package:gymmane/theme/app_theme.dart';-import 'package:shared_preferences/shared_preferences.dart';--void main() {- setUp(() async {- SharedPreferences.setMockInitialValues({});- await Store.instance.init();- fit.resetAllData();- setAppLanguage('en');- });-- tearDown(() => fit.saveAndExit());-- for (final sided in [false, true]) {- testWidgets('weight label explains ${sided ? 'one side' : 'one dumbbell'}', (tester) async {- tester.view.physicalSize = const Size(430, 932);- tester.view.devicePixelRatio = 1;- addTearDown(tester.view.resetPhysicalSize);- addTearDown(tester.view.resetDevicePixelRatio);- final ex = fit.matchExerciseByName('Dumbbell Hammer Curl') ?? fit.matchExerciseByName('Dumbbell Curl')!;- fit.togglePaired(ex.id);- if (sided) fit.toggleSidedReps(ex.id);- fit.session = WorkoutSession()- ..exercises = [- SessionExercise(ex.id, ex.name, ex.primary, [SessionSet(10, 10, false, repsR: sided ? 10 : null)]),- ];- await tester.pumpWidget(- MaterialApp(- theme: AppTheme.dark,- home: const Scaffold(body: SessionScreen()),- ),- );- await tester.pump(const Duration(seconds: 1));- expect(find.text(sided ? t.weightPerSideCol('KG') : t.weightPerDumbbellCol('KG')), findsOneWidget);- if (sided) {- expect(find.text(t.repsLeftCol), findsOneWidget);- expect(find.text(t.repsRightCol), findsOneWidget);- }- expect(tester.takeException(), isNull);- await tester.pumpWidget(const SizedBox());- });- }-}diff --git a/test/stats_totals_test.dart b/test/stats_totals_test.dartindex d6b5558..8b55b7a 100644--- a/test/stats_totals_test.dart+++ b/test/stats_totals_test.dart@@ -235,15 +235,15 @@ void main() {});group('#369 par de mancuernas', () {- test('pair settings do not reinterpret existing workouts', () {+ test('el volumen cuenta las dos, también en lo ya hecho, y se puede quitar', () {final fly = fit.matchExerciseByName('Dumbbell Fly')!.id;fit.sessions.add(LoggedSession(DateTime.now().subtract(const Duration(hours: 2)), 1800,[LoggedExercise(fly, 'Fly', 'chest', [LoggedSet(10, 24), LoggedSet(5, 30, kind: SetKind.warmup)])]));expect(fit.canPair(fly), isTrue);expect(fit.totalVolumeKg, 240);fit.togglePaired(fly);- expect(fit.totalVolumeKg, 240);- expect(fit.volumeThisWeekKg, 240);+ expect(fit.totalVolumeKg, 480);+ expect(fit.volumeThisWeekKg, 480);expect(fit.personalRecords.single.best, 24, reason: 'el récord sigue siendo el de una mancuerna');fit.togglePaired(fly);expect(fit.totalVolumeKg, 240);