Offline gym log for Android. No account, no ads, no internet.
Dart androidbodybuildingdartexercisesf-droidfitnessfluttergymgym-apphealthprivacyself-hostedworkoutworkout-appworkout-tracker
Wilks and FFMI calculators, and the Today widget shows rest when nothing is planned
InlitX4a331e629679
diff --git a/android/app/src/main/kotlin/com/gymmane/app/TodayWidgetProvider.kt b/android/app/src/main/kotlin/com/gymmane/app/TodayWidgetProvider.ktindex b62f552..8e88691 100644--- a/android/app/src/main/kotlin/com/gymmane/app/TodayWidgetProvider.kt+++ b/android/app/src/main/kotlin/com/gymmane/app/TodayWidgetProvider.kt@@ -19,8 +19,7 @@ class TodayWidgetProvider : DayWidgetProvider() {val key = when {saved == null || saved == dayStamp(now) -> "today_img"week.getOrNull(weekdayIndex(now)) == '1' -> "today_plan_img"- '1' in week -> "today_rest_img"- else -> "today_idle_img"+ else -> "today_rest_img"}val shown = if (widgetData.getString(key, null) == null) "today_img" else keyappWidgetIds.forEach { widgetId ->diff --git a/lib/catalog/exercise_catalog.dart b/lib/catalog/exercise_catalog.dartindex c343b8e..e3d4eca 100644--- a/lib/catalog/exercise_catalog.dart+++ b/lib/catalog/exercise_catalog.dart@@ -7158,10 +7158,12 @@ const List<ToolMeta> kToolMeta = [ToolMeta('bmi', 'BMI', 'Body mass index'),ToolMeta('cal', 'Calories', 'Calories & macros'),ToolMeta('bf', 'Body Fat', 'Body fat percentage'),+ ToolMeta('ffmi', 'FFMI', 'Fat-free mass index'),ToolMeta('plate', 'Plates', 'Barbell plate calculator'),ToolMeta('warmup', 'Warm-up', 'Ramp-up sets'),ToolMeta('rpe', 'RPE load', 'Weight for a target effort'),ToolMeta('dots', 'Strength level', 'DOTS score'),+ ToolMeta('wilks', 'Wilks', 'Wilks score'),];const List<String> kFilterMuscles = [diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex 175042e..9d7a4a7 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -548,8 +548,8 @@"exercisesInside": "{n} exercises","@exercisesInside": { "placeholders": { "n": { "type": "int" } } },"exercisesInsideWhy": "Every one with an animation and step-by-step instructions.",- "calculatorsInside": "8 calculators",- "calculatorsInsideWhy": "1RM, plates, BMI, calories, body fat, warm-up, RPE load and DOTS strength level — all with published formulas.",+ "calculatorsInside": "10 calculators",+ "calculatorsInsideWhy": "1RM, plates, BMI, calories, body fat, FFMI, warm-up, RPE load, and DOTS and Wilks strength scores — all with published formulas.","mathInside": "Honest maths","mathInsideWhy": "Volume, records and streaks come from your own sets. Nothing here is decoration.","streakCaps": "STREAK",@@ -1141,6 +1141,22 @@"dotsLevel2": "Advanced","dotsLevel3": "Very advanced","dotsLevel4": "Elite",+ "toolNameWilks": "Wilks",+ "toolTitleWilks": "Wilks score",+ "toolDescWilks": "The classic powerlifting score",+ "wilksExplain": "The classic powerlifting formula. DOTS replaced it in 2020, but many meets and rankings still use it.",+ "toolNameFfmi": "FFMI",+ "toolTitleFfmi": "Fat-free mass index",+ "toolDescFfmi": "How much muscle for your height",+ "ffmiBodyFat": "BODY FAT",+ "ffmiLeanLine": "Lean mass: {value}",+ "@ffmiLeanLine": {"placeholders": {"value": {"type": "String"}}},+ "ffmiExplain": "Like BMI, but without the fat: it only counts your lean mass. Adjusted to your height so tall and short people compare fairly.",+ "ffmiLevel0": "Below average",+ "ffmiLevel1": "Average",+ "ffmiLevel2": "Above average",+ "ffmiLevel3": "Excellent",+ "ffmiLevel4": "Exceptional","rpeEffortLabel": "Effort (RPE)","restRowHint": "Between sets, unless the exercise has its own.","effortRowHint": "Log RPE or RIR on each set.",diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arbindex 76c3002..1ae48ea 100644--- a/lib/l10n/app_es.arb+++ b/lib/l10n/app_es.arb@@ -506,8 +506,8 @@"whatsInside": "QUÉ LLEVA DENTRO","exercisesInside": "{n} ejercicios","exercisesInsideWhy": "Cada uno con su animación y sus instrucciones paso a paso.",- "calculatorsInside": "8 calculadoras",- "calculatorsInsideWhy": "1RM, discos, IMC, calorías, grasa, calentamiento, peso por RPE y nivel de fuerza DOTS — todas con fórmulas publicadas.",+ "calculatorsInside": "10 calculadoras",+ "calculatorsInsideWhy": "1RM, discos, IMC, calorías, grasa, FFMI, calentamiento, peso por RPE y puntuaciones de fuerza DOTS y Wilks — todas con fórmulas publicadas.","mathInside": "Cuentas honestas","mathInsideWhy": "El volumen, los récords y la racha salen de tus series. Aquí no hay nada decorativo.","streakCaps": "RACHA",@@ -1046,6 +1046,21 @@"dotsLevel2": "Avanzado","dotsLevel3": "Muy avanzado","dotsLevel4": "Élite",+ "toolNameWilks": "Wilks",+ "toolTitleWilks": "Puntuación Wilks",+ "toolDescWilks": "La puntuación clásica del powerlifting",+ "wilksExplain": "La fórmula clásica del powerlifting. DOTS la sustituyó en 2020, pero muchas competiciones y rankings la siguen usando.",+ "toolNameFfmi": "FFMI",+ "toolTitleFfmi": "Índice de masa magra",+ "toolDescFfmi": "Cuánto músculo para tu altura",+ "ffmiBodyFat": "GRASA CORPORAL",+ "ffmiLeanLine": "Masa magra: {value}",+ "ffmiExplain": "Como el IMC, pero sin la grasa: solo cuenta tu masa magra. Ajustado a tu altura para comparar igual a altos y bajos.",+ "ffmiLevel0": "Por debajo de la media",+ "ffmiLevel1": "En la media",+ "ffmiLevel2": "Por encima de la media",+ "ffmiLevel3": "Excelente",+ "ffmiLevel4": "Excepcional","rpeEffortLabel": "Esfuerzo (RPE)","restRowHint": "Entre series, si el ejercicio no tiene el suyo.","effortRowHint": "Anota RPE o RIR en cada serie.",diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex 7ed881f..06f4946 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -2905,13 +2905,13 @@ abstract class AppLocalizations {/// No description provided for @calculatorsInside.////// In en, this message translates to:- /// **'8 calculators'**+ /// **'10 calculators'**String get calculatorsInside;/// No description provided for @calculatorsInsideWhy.////// In en, this message translates to:- /// **'1RM, plates, BMI, calories, body fat, warm-up, RPE load and DOTS strength level — all with published formulas.'**+ /// **'1RM, plates, BMI, calories, body fat, FFMI, warm-up, RPE load, and DOTS and Wilks strength scores — all with published formulas.'**String get calculatorsInsideWhy;/// No description provided for @mathInside.@@ -5866,6 +5866,96 @@ abstract class AppLocalizations {/// **'Elite'**String get dotsLevel4;+ /// No description provided for @toolNameWilks.+ ///+ /// In en, this message translates to:+ /// **'Wilks'**+ String get toolNameWilks;++ /// No description provided for @toolTitleWilks.+ ///+ /// In en, this message translates to:+ /// **'Wilks score'**+ String get toolTitleWilks;++ /// No description provided for @toolDescWilks.+ ///+ /// In en, this message translates to:+ /// **'The classic powerlifting score'**+ String get toolDescWilks;++ /// No description provided for @wilksExplain.+ ///+ /// In en, this message translates to:+ /// **'The classic powerlifting formula. DOTS replaced it in 2020, but many meets and rankings still use it.'**+ String get wilksExplain;++ /// No description provided for @toolNameFfmi.+ ///+ /// In en, this message translates to:+ /// **'FFMI'**+ String get toolNameFfmi;++ /// No description provided for @toolTitleFfmi.+ ///+ /// In en, this message translates to:+ /// **'Fat-free mass index'**+ String get toolTitleFfmi;++ /// No description provided for @toolDescFfmi.+ ///+ /// In en, this message translates to:+ /// **'How much muscle for your height'**+ String get toolDescFfmi;++ /// No description provided for @ffmiBodyFat.+ ///+ /// In en, this message translates to:+ /// **'BODY FAT'**+ String get ffmiBodyFat;++ /// No description provided for @ffmiLeanLine.+ ///+ /// In en, this message translates to:+ /// **'Lean mass: {value}'**+ String ffmiLeanLine(String value);++ /// No description provided for @ffmiExplain.+ ///+ /// In en, this message translates to:+ /// **'Like BMI, but without the fat: it only counts your lean mass. Adjusted to your height so tall and short people compare fairly.'**+ String get ffmiExplain;++ /// No description provided for @ffmiLevel0.+ ///+ /// In en, this message translates to:+ /// **'Below average'**+ String get ffmiLevel0;++ /// No description provided for @ffmiLevel1.+ ///+ /// In en, this message translates to:+ /// **'Average'**+ String get ffmiLevel1;++ /// No description provided for @ffmiLevel2.+ ///+ /// In en, this message translates to:+ /// **'Above average'**+ String get ffmiLevel2;++ /// No description provided for @ffmiLevel3.+ ///+ /// In en, this message translates to:+ /// **'Excellent'**+ String get ffmiLevel3;++ /// No description provided for @ffmiLevel4.+ ///+ /// In en, this message translates to:+ /// **'Exceptional'**+ String get ffmiLevel4;+/// No description provided for @rpeEffortLabel.////// In en, this message translates to:diff --git a/lib/l10n/app_localizations_ar.dart b/lib/l10n/app_localizations_ar.dartindex be13e4c..eea7d4d 100644--- a/lib/l10n/app_localizations_ar.dart+++ b/lib/l10n/app_localizations_ar.dart@@ -3281,6 +3281,55 @@ class AppLocalizationsAr extends AppLocalizations {@overrideString get dotsLevel4 => 'نخبة';+ @override+ String get toolNameWilks => 'Wilks';++ @override+ String get toolTitleWilks => 'Wilks score';++ @override+ String get toolDescWilks => 'The classic powerlifting score';++ @override+ String get wilksExplain =>+ 'The classic powerlifting formula. DOTS replaced it in 2020, but many meets and rankings still use it.';++ @override+ String get toolNameFfmi => 'FFMI';++ @override+ String get toolTitleFfmi => 'Fat-free mass index';++ @override+ String get toolDescFfmi => 'How much muscle for your height';++ @override+ String get ffmiBodyFat => 'BODY FAT';++ @override+ String ffmiLeanLine(String value) {+ return 'Lean mass: $value';+ }++ @override+ String get ffmiExplain =>+ 'Like BMI, but without the fat: it only counts your lean mass. Adjusted to your height so tall and short people compare fairly.';++ @override+ String get ffmiLevel0 => 'Below average';++ @override+ String get ffmiLevel1 => 'Average';++ @override+ String get ffmiLevel2 => 'Above average';++ @override+ String get ffmiLevel3 => 'Excellent';++ @override+ String get ffmiLevel4 => 'Exceptional';+@overrideString get rpeEffortLabel => 'الجهد (RPE)';diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dartindex 71921e1..1f1c0cb 100644--- a/lib/l10n/app_localizations_de.dart+++ b/lib/l10n/app_localizations_de.dart@@ -3299,6 +3299,55 @@ class AppLocalizationsDe extends AppLocalizations {@overrideString get dotsLevel4 => 'Elite';+ @override+ String get toolNameWilks => 'Wilks';++ @override+ String get toolTitleWilks => 'Wilks score';++ @override+ String get toolDescWilks => 'The classic powerlifting score';++ @override+ String get wilksExplain =>+ 'The classic powerlifting formula. DOTS replaced it in 2020, but many meets and rankings still use it.';++ @override+ String get toolNameFfmi => 'FFMI';++ @override+ String get toolTitleFfmi => 'Fat-free mass index';++ @override+ String get toolDescFfmi => 'How much muscle for your height';++ @override+ String get ffmiBodyFat => 'BODY FAT';++ @override+ String ffmiLeanLine(String value) {+ return 'Lean mass: $value';+ }++ @override+ String get ffmiExplain =>+ 'Like BMI, but without the fat: it only counts your lean mass. Adjusted to your height so tall and short people compare fairly.';++ @override+ String get ffmiLevel0 => 'Below average';++ @override+ String get ffmiLevel1 => 'Average';++ @override+ String get ffmiLevel2 => 'Above average';++ @override+ String get ffmiLevel3 => 'Excellent';++ @override+ String get ffmiLevel4 => 'Exceptional';+@overrideString get rpeEffortLabel => 'Anstrengung (RPE)';diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex 71d6d23..bfb495f 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -1587,11 +1587,11 @@ class AppLocalizationsEn extends AppLocalizations {String get exercisesInsideWhy => 'Every one with an animation and step-by-step instructions.';@override- String get calculatorsInside => '8 calculators';+ String get calculatorsInside => '10 calculators';@overrideString get calculatorsInsideWhy =>- '1RM, plates, BMI, calories, body fat, warm-up, RPE load and DOTS strength level — all with published formulas.';+ '1RM, plates, BMI, calories, body fat, FFMI, warm-up, RPE load, and DOTS and Wilks strength scores — all with published formulas.';@overrideString get mathInside => 'Honest maths';@@ -3278,6 +3278,55 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString get dotsLevel4 => 'Elite';+ @override+ String get toolNameWilks => 'Wilks';++ @override+ String get toolTitleWilks => 'Wilks score';++ @override+ String get toolDescWilks => 'The classic powerlifting score';++ @override+ String get wilksExplain =>+ 'The classic powerlifting formula. DOTS replaced it in 2020, but many meets and rankings still use it.';++ @override+ String get toolNameFfmi => 'FFMI';++ @override+ String get toolTitleFfmi => 'Fat-free mass index';++ @override+ String get toolDescFfmi => 'How much muscle for your height';++ @override+ String get ffmiBodyFat => 'BODY FAT';++ @override+ String ffmiLeanLine(String value) {+ return 'Lean mass: $value';+ }++ @override+ String get ffmiExplain =>+ 'Like BMI, but without the fat: it only counts your lean mass. Adjusted to your height so tall and short people compare fairly.';++ @override+ String get ffmiLevel0 => 'Below average';++ @override+ String get ffmiLevel1 => 'Average';++ @override+ String get ffmiLevel2 => 'Above average';++ @override+ String get ffmiLevel3 => 'Excellent';++ @override+ String get ffmiLevel4 => 'Exceptional';+@overrideString get rpeEffortLabel => 'Effort (RPE)';diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dartindex 423fe95..0aae77d 100644--- a/lib/l10n/app_localizations_es.dart+++ b/lib/l10n/app_localizations_es.dart@@ -1586,11 +1586,11 @@ class AppLocalizationsEs extends AppLocalizations {String get exercisesInsideWhy => 'Cada uno con su animación y sus instrucciones paso a paso.';@override- String get calculatorsInside => '8 calculadoras';+ String get calculatorsInside => '10 calculadoras';@overrideString get calculatorsInsideWhy =>- '1RM, discos, IMC, calorías, grasa, calentamiento, peso por RPE y nivel de fuerza DOTS — todas con fórmulas publicadas.';+ '1RM, discos, IMC, calorías, grasa, FFMI, calentamiento, peso por RPE y puntuaciones de fuerza DOTS y Wilks — todas con fórmulas publicadas.';@overrideString get mathInside => 'Cuentas honestas';@@ -3283,6 +3283,55 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString get dotsLevel4 => 'Élite';+ @override+ String get toolNameWilks => 'Wilks';++ @override+ String get toolTitleWilks => 'Puntuación Wilks';++ @override+ String get toolDescWilks => 'La puntuación clásica del powerlifting';++ @override+ String get wilksExplain =>+ 'La fórmula clásica del powerlifting. DOTS la sustituyó en 2020, pero muchas competiciones y rankings la siguen usando.';++ @override+ String get toolNameFfmi => 'FFMI';++ @override+ String get toolTitleFfmi => 'Índice de masa magra';++ @override+ String get toolDescFfmi => 'Cuánto músculo para tu altura';++ @override+ String get ffmiBodyFat => 'GRASA CORPORAL';++ @override+ String ffmiLeanLine(String value) {+ return 'Masa magra: $value';+ }++ @override+ String get ffmiExplain =>+ 'Como el IMC, pero sin la grasa: solo cuenta tu masa magra. Ajustado a tu altura para comparar igual a altos y bajos.';++ @override+ String get ffmiLevel0 => 'Por debajo de la media';++ @override+ String get ffmiLevel1 => 'En la media';++ @override+ String get ffmiLevel2 => 'Por encima de la media';++ @override+ String get ffmiLevel3 => 'Excelente';++ @override+ String get ffmiLevel4 => 'Excepcional';+@overrideString get rpeEffortLabel => 'Esfuerzo (RPE)';diff --git a/lib/l10n/app_localizations_fa.dart b/lib/l10n/app_localizations_fa.dartindex 6f35db7..d6391e3 100644--- a/lib/l10n/app_localizations_fa.dart+++ b/lib/l10n/app_localizations_fa.dart@@ -3269,6 +3269,55 @@ class AppLocalizationsFa extends AppLocalizations {@overrideString get dotsLevel4 => 'نخبه';+ @override+ String get toolNameWilks => 'Wilks';++ @override+ String get toolTitleWilks => 'Wilks score';++ @override+ String get toolDescWilks => 'The classic powerlifting score';++ @override+ String get wilksExplain =>+ 'The classic powerlifting formula. DOTS replaced it in 2020, but many meets and rankings still use it.';++ @override+ String get toolNameFfmi => 'FFMI';++ @override+ String get toolTitleFfmi => 'Fat-free mass index';++ @override+ String get toolDescFfmi => 'How much muscle for your height';++ @override+ String get ffmiBodyFat => 'BODY FAT';++ @override+ String ffmiLeanLine(String value) {+ return 'Lean mass: $value';+ }++ @override+ String get ffmiExplain =>+ 'Like BMI, but without the fat: it only counts your lean mass. Adjusted to your height so tall and short people compare fairly.';++ @override+ String get ffmiLevel0 => 'Below average';++ @override+ String get ffmiLevel1 => 'Average';++ @override+ String get ffmiLevel2 => 'Above average';++ @override+ String get ffmiLevel3 => 'Excellent';++ @override+ String get ffmiLevel4 => 'Exceptional';+@overrideString get rpeEffortLabel => 'فشار (RPE)';diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dartindex 1b0c79b..361ded0 100644--- a/lib/l10n/app_localizations_fr.dart+++ b/lib/l10n/app_localizations_fr.dart@@ -3304,6 +3304,55 @@ class AppLocalizationsFr extends AppLocalizations {@overrideString get dotsLevel4 => 'Élite';+ @override+ String get toolNameWilks => 'Wilks';++ @override+ String get toolTitleWilks => 'Wilks score';++ @override+ String get toolDescWilks => 'The classic powerlifting score';++ @override+ String get wilksExplain =>+ 'The classic powerlifting formula. DOTS replaced it in 2020, but many meets and rankings still use it.';++ @override+ String get toolNameFfmi => 'FFMI';++ @override+ String get toolTitleFfmi => 'Fat-free mass index';++ @override+ String get toolDescFfmi => 'How much muscle for your height';++ @override+ String get ffmiBodyFat => 'BODY FAT';++ @override+ String ffmiLeanLine(String value) {+ return 'Lean mass: $value';+ }++ @override+ String get ffmiExplain =>+ 'Like BMI, but without the fat: it only counts your lean mass. Adjusted to your height so tall and short people compare fairly.';++ @override+ String get ffmiLevel0 => 'Below average';++ @override+ String get ffmiLevel1 => 'Average';++ @override+ String get ffmiLevel2 => 'Above average';++ @override+ String get ffmiLevel3 => 'Excellent';++ @override+ String get ffmiLevel4 => 'Exceptional';+@overrideString get rpeEffortLabel => 'Effort (RPE)';diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dartindex ff59c70..ae0219a 100644--- a/lib/l10n/app_localizations_it.dart+++ b/lib/l10n/app_localizations_it.dart@@ -3292,6 +3292,55 @@ class AppLocalizationsIt extends AppLocalizations {@overrideString get dotsLevel4 => 'Élite';+ @override+ String get toolNameWilks => 'Wilks';++ @override+ String get toolTitleWilks => 'Wilks score';++ @override+ String get toolDescWilks => 'The classic powerlifting score';++ @override+ String get wilksExplain =>+ 'The classic powerlifting formula. DOTS replaced it in 2020, but many meets and rankings still use it.';++ @override+ String get toolNameFfmi => 'FFMI';++ @override+ String get toolTitleFfmi => 'Fat-free mass index';++ @override+ String get toolDescFfmi => 'How much muscle for your height';++ @override+ String get ffmiBodyFat => 'BODY FAT';++ @override+ String ffmiLeanLine(String value) {+ return 'Lean mass: $value';+ }++ @override+ String get ffmiExplain =>+ 'Like BMI, but without the fat: it only counts your lean mass. Adjusted to your height so tall and short people compare fairly.';++ @override+ String get ffmiLevel0 => 'Below average';++ @override+ String get ffmiLevel1 => 'Average';++ @override+ String get ffmiLevel2 => 'Above average';++ @override+ String get ffmiLevel3 => 'Excellent';++ @override+ String get ffmiLevel4 => 'Exceptional';+@overrideString get rpeEffortLabel => 'Sforzo (RPE)';diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dartindex 9fc4ab5..aedb6aa 100644--- a/lib/l10n/app_localizations_ja.dart+++ b/lib/l10n/app_localizations_ja.dart@@ -3192,6 +3192,55 @@ class AppLocalizationsJa extends AppLocalizations {@overrideString get dotsLevel4 => 'エリート';+ @override+ String get toolNameWilks => 'Wilks';++ @override+ String get toolTitleWilks => 'Wilks score';++ @override+ String get toolDescWilks => 'The classic powerlifting score';++ @override+ String get wilksExplain =>+ 'The classic powerlifting formula. DOTS replaced it in 2020, but many meets and rankings still use it.';++ @override+ String get toolNameFfmi => 'FFMI';++ @override+ String get toolTitleFfmi => 'Fat-free mass index';++ @override+ String get toolDescFfmi => 'How much muscle for your height';++ @override+ String get ffmiBodyFat => 'BODY FAT';++ @override+ String ffmiLeanLine(String value) {+ return 'Lean mass: $value';+ }++ @override+ String get ffmiExplain =>+ 'Like BMI, but without the fat: it only counts your lean mass. Adjusted to your height so tall and short people compare fairly.';++ @override+ String get ffmiLevel0 => 'Below average';++ @override+ String get ffmiLevel1 => 'Average';++ @override+ String get ffmiLevel2 => 'Above average';++ @override+ String get ffmiLevel3 => 'Excellent';++ @override+ String get ffmiLevel4 => 'Exceptional';+@overrideString get rpeEffortLabel => '強度(RPE)';diff --git a/lib/l10n/app_localizations_ko.dart b/lib/l10n/app_localizations_ko.dartindex 87e3497..6f5d211 100644--- a/lib/l10n/app_localizations_ko.dart+++ b/lib/l10n/app_localizations_ko.dart@@ -3203,6 +3203,55 @@ class AppLocalizationsKo extends AppLocalizations {@overrideString get dotsLevel4 => '엘리트';+ @override+ String get toolNameWilks => 'Wilks';++ @override+ String get toolTitleWilks => 'Wilks score';++ @override+ String get toolDescWilks => 'The classic powerlifting score';++ @override+ String get wilksExplain =>+ 'The classic powerlifting formula. DOTS replaced it in 2020, but many meets and rankings still use it.';++ @override+ String get toolNameFfmi => 'FFMI';++ @override+ String get toolTitleFfmi => 'Fat-free mass index';++ @override+ String get toolDescFfmi => 'How much muscle for your height';++ @override+ String get ffmiBodyFat => 'BODY FAT';++ @override+ String ffmiLeanLine(String value) {+ return 'Lean mass: $value';+ }++ @override+ String get ffmiExplain =>+ 'Like BMI, but without the fat: it only counts your lean mass. Adjusted to your height so tall and short people compare fairly.';++ @override+ String get ffmiLevel0 => 'Below average';++ @override+ String get ffmiLevel1 => 'Average';++ @override+ String get ffmiLevel2 => 'Above average';++ @override+ String get ffmiLevel3 => 'Excellent';++ @override+ String get ffmiLevel4 => 'Exceptional';+@overrideString get rpeEffortLabel => '강도 (RPE)';diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dartindex f57ebe8..49046e5 100644--- a/lib/l10n/app_localizations_nl.dart+++ b/lib/l10n/app_localizations_nl.dart@@ -3292,6 +3292,55 @@ class AppLocalizationsNl extends AppLocalizations {@overrideString get dotsLevel4 => 'Elite';+ @override+ String get toolNameWilks => 'Wilks';++ @override+ String get toolTitleWilks => 'Wilks score';++ @override+ String get toolDescWilks => 'The classic powerlifting score';++ @override+ String get wilksExplain =>+ 'The classic powerlifting formula. DOTS replaced it in 2020, but many meets and rankings still use it.';++ @override+ String get toolNameFfmi => 'FFMI';++ @override+ String get toolTitleFfmi => 'Fat-free mass index';++ @override+ String get toolDescFfmi => 'How much muscle for your height';++ @override+ String get ffmiBodyFat => 'BODY FAT';++ @override+ String ffmiLeanLine(String value) {+ return 'Lean mass: $value';+ }++ @override+ String get ffmiExplain =>+ 'Like BMI, but without the fat: it only counts your lean mass. Adjusted to your height so tall and short people compare fairly.';++ @override+ String get ffmiLevel0 => 'Below average';++ @override+ String get ffmiLevel1 => 'Average';++ @override+ String get ffmiLevel2 => 'Above average';++ @override+ String get ffmiLevel3 => 'Excellent';++ @override+ String get ffmiLevel4 => 'Exceptional';+@overrideString get rpeEffortLabel => 'Inspanning (RPE)';diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dartindex 94d0bd9..def404f 100644--- a/lib/l10n/app_localizations_pl.dart+++ b/lib/l10n/app_localizations_pl.dart@@ -3297,6 +3297,55 @@ class AppLocalizationsPl extends AppLocalizations {@overrideString get dotsLevel4 => 'Elita';+ @override+ String get toolNameWilks => 'Wilks';++ @override+ String get toolTitleWilks => 'Wilks score';++ @override+ String get toolDescWilks => 'The classic powerlifting score';++ @override+ String get wilksExplain =>+ 'The classic powerlifting formula. DOTS replaced it in 2020, but many meets and rankings still use it.';++ @override+ String get toolNameFfmi => 'FFMI';++ @override+ String get toolTitleFfmi => 'Fat-free mass index';++ @override+ String get toolDescFfmi => 'How much muscle for your height';++ @override+ String get ffmiBodyFat => 'BODY FAT';++ @override+ String ffmiLeanLine(String value) {+ return 'Lean mass: $value';+ }++ @override+ String get ffmiExplain =>+ 'Like BMI, but without the fat: it only counts your lean mass. Adjusted to your height so tall and short people compare fairly.';++ @override+ String get ffmiLevel0 => 'Below average';++ @override+ String get ffmiLevel1 => 'Average';++ @override+ String get ffmiLevel2 => 'Above average';++ @override+ String get ffmiLevel3 => 'Excellent';++ @override+ String get ffmiLevel4 => 'Exceptional';+@overrideString get rpeEffortLabel => 'Wysiłek (RPE)';diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dartindex db21f6d..98e90c4 100644--- a/lib/l10n/app_localizations_pt.dart+++ b/lib/l10n/app_localizations_pt.dart@@ -3284,6 +3284,55 @@ class AppLocalizationsPt extends AppLocalizations {@overrideString get dotsLevel4 => 'Elite';+ @override+ String get toolNameWilks => 'Wilks';++ @override+ String get toolTitleWilks => 'Wilks score';++ @override+ String get toolDescWilks => 'The classic powerlifting score';++ @override+ String get wilksExplain =>+ 'The classic powerlifting formula. DOTS replaced it in 2020, but many meets and rankings still use it.';++ @override+ String get toolNameFfmi => 'FFMI';++ @override+ String get toolTitleFfmi => 'Fat-free mass index';++ @override+ String get toolDescFfmi => 'How much muscle for your height';++ @override+ String get ffmiBodyFat => 'BODY FAT';++ @override+ String ffmiLeanLine(String value) {+ return 'Lean mass: $value';+ }++ @override+ String get ffmiExplain =>+ 'Like BMI, but without the fat: it only counts your lean mass. Adjusted to your height so tall and short people compare fairly.';++ @override+ String get ffmiLevel0 => 'Below average';++ @override+ String get ffmiLevel1 => 'Average';++ @override+ String get ffmiLevel2 => 'Above average';++ @override+ String get ffmiLevel3 => 'Excellent';++ @override+ String get ffmiLevel4 => 'Exceptional';+@overrideString get rpeEffortLabel => 'Esforço (RPE)';diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dartindex 7ea92d1..b07f1c7 100644--- a/lib/l10n/app_localizations_ru.dart+++ b/lib/l10n/app_localizations_ru.dart@@ -3382,6 +3382,55 @@ class AppLocalizationsRu extends AppLocalizations {@overrideString get dotsLevel4 => 'Элита';+ @override+ String get toolNameWilks => 'Wilks';++ @override+ String get toolTitleWilks => 'Wilks score';++ @override+ String get toolDescWilks => 'The classic powerlifting score';++ @override+ String get wilksExplain =>+ 'The classic powerlifting formula. DOTS replaced it in 2020, but many meets and rankings still use it.';++ @override+ String get toolNameFfmi => 'FFMI';++ @override+ String get toolTitleFfmi => 'Fat-free mass index';++ @override+ String get toolDescFfmi => 'How much muscle for your height';++ @override+ String get ffmiBodyFat => 'BODY FAT';++ @override+ String ffmiLeanLine(String value) {+ return 'Lean mass: $value';+ }++ @override+ String get ffmiExplain =>+ 'Like BMI, but without the fat: it only counts your lean mass. Adjusted to your height so tall and short people compare fairly.';++ @override+ String get ffmiLevel0 => 'Below average';++ @override+ String get ffmiLevel1 => 'Average';++ @override+ String get ffmiLevel2 => 'Above average';++ @override+ String get ffmiLevel3 => 'Excellent';++ @override+ String get ffmiLevel4 => 'Exceptional';+@overrideString get rpeEffortLabel => 'Усилие (RPE)';diff --git a/lib/l10n/app_localizations_tr.dart b/lib/l10n/app_localizations_tr.dartindex e8c3152..a2bcef2 100644--- a/lib/l10n/app_localizations_tr.dart+++ b/lib/l10n/app_localizations_tr.dart@@ -3289,6 +3289,55 @@ class AppLocalizationsTr extends AppLocalizations {@overrideString get dotsLevel4 => 'Elit';+ @override+ String get toolNameWilks => 'Wilks';++ @override+ String get toolTitleWilks => 'Wilks score';++ @override+ String get toolDescWilks => 'The classic powerlifting score';++ @override+ String get wilksExplain =>+ 'The classic powerlifting formula. DOTS replaced it in 2020, but many meets and rankings still use it.';++ @override+ String get toolNameFfmi => 'FFMI';++ @override+ String get toolTitleFfmi => 'Fat-free mass index';++ @override+ String get toolDescFfmi => 'How much muscle for your height';++ @override+ String get ffmiBodyFat => 'BODY FAT';++ @override+ String ffmiLeanLine(String value) {+ return 'Lean mass: $value';+ }++ @override+ String get ffmiExplain =>+ 'Like BMI, but without the fat: it only counts your lean mass. Adjusted to your height so tall and short people compare fairly.';++ @override+ String get ffmiLevel0 => 'Below average';++ @override+ String get ffmiLevel1 => 'Average';++ @override+ String get ffmiLevel2 => 'Above average';++ @override+ String get ffmiLevel3 => 'Excellent';++ @override+ String get ffmiLevel4 => 'Exceptional';+@overrideString get rpeEffortLabel => 'Efor (RPE)';diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dartindex eaa872e..d1c2ad4 100644--- a/lib/l10n/app_localizations_uk.dart+++ b/lib/l10n/app_localizations_uk.dart@@ -3302,6 +3302,55 @@ class AppLocalizationsUk extends AppLocalizations {@overrideString get dotsLevel4 => 'Еліта';+ @override+ String get toolNameWilks => 'Wilks';++ @override+ String get toolTitleWilks => 'Wilks score';++ @override+ String get toolDescWilks => 'The classic powerlifting score';++ @override+ String get wilksExplain =>+ 'The classic powerlifting formula. DOTS replaced it in 2020, but many meets and rankings still use it.';++ @override+ String get toolNameFfmi => 'FFMI';++ @override+ String get toolTitleFfmi => 'Fat-free mass index';++ @override+ String get toolDescFfmi => 'How much muscle for your height';++ @override+ String get ffmiBodyFat => 'BODY FAT';++ @override+ String ffmiLeanLine(String value) {+ return 'Lean mass: $value';+ }++ @override+ String get ffmiExplain =>+ 'Like BMI, but without the fat: it only counts your lean mass. Adjusted to your height so tall and short people compare fairly.';++ @override+ String get ffmiLevel0 => 'Below average';++ @override+ String get ffmiLevel1 => 'Average';++ @override+ String get ffmiLevel2 => 'Above average';++ @override+ String get ffmiLevel3 => 'Excellent';++ @override+ String get ffmiLevel4 => 'Exceptional';+@overrideString get rpeEffortLabel => 'Зусилля (RPE)';diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dartindex 58c777e..b44275d 100644--- a/lib/l10n/app_localizations_zh.dart+++ b/lib/l10n/app_localizations_zh.dart@@ -3148,6 +3148,55 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString get dotsLevel4 => '精英';+ @override+ String get toolNameWilks => 'Wilks';++ @override+ String get toolTitleWilks => 'Wilks score';++ @override+ String get toolDescWilks => 'The classic powerlifting score';++ @override+ String get wilksExplain =>+ 'The classic powerlifting formula. DOTS replaced it in 2020, but many meets and rankings still use it.';++ @override+ String get toolNameFfmi => 'FFMI';++ @override+ String get toolTitleFfmi => 'Fat-free mass index';++ @override+ String get toolDescFfmi => 'How much muscle for your height';++ @override+ String get ffmiBodyFat => 'BODY FAT';++ @override+ String ffmiLeanLine(String value) {+ return 'Lean mass: $value';+ }++ @override+ String get ffmiExplain =>+ 'Like BMI, but without the fat: it only counts your lean mass. Adjusted to your height so tall and short people compare fairly.';++ @override+ String get ffmiLevel0 => 'Below average';++ @override+ String get ffmiLevel1 => 'Average';++ @override+ String get ffmiLevel2 => 'Above average';++ @override+ String get ffmiLevel3 => 'Excellent';++ @override+ String get ffmiLevel4 => 'Exceptional';+@overrideString get rpeEffortLabel => '强度(RPE)';diff --git a/lib/l10n/l10n.dart b/lib/l10n/l10n.dartindex 6a271a1..217038c 100644--- a/lib/l10n/l10n.dart+++ b/lib/l10n/l10n.dart@@ -88,6 +88,8 @@ extension GymL10n on AppLocalizations {'plate' => toolNamePlate,'rpe' => toolNameRpe,'dots' => toolNameDots,+ 'wilks' => toolNameWilks,+ 'ffmi' => toolNameFfmi,_ => toolNameWarmup,};@@ -99,6 +101,8 @@ extension GymL10n on AppLocalizations {'plate' => toolTitlePlate,'rpe' => toolTitleRpe,'dots' => toolTitleDots,+ 'wilks' => toolTitleWilks,+ 'ffmi' => toolTitleFfmi,_ => toolTitleWarmup,};@@ -130,6 +134,8 @@ extension GymL10n on AppLocalizations {'plate' => toolDescPlate,'rpe' => toolDescRpe,'dots' => toolDescDots,+ 'wilks' => toolDescWilks,+ 'ffmi' => toolDescFfmi,_ => toolDescWarmup,};@@ -141,6 +147,14 @@ extension GymL10n on AppLocalizations {_ => dotsLevel4,};+ String ffmiLevelName(int level) => switch (level) {+ 0 => ffmiLevel0,+ 1 => ffmiLevel1,+ 2 => ffmiLevel2,+ 3 => ffmiLevel3,+ _ => ffmiLevel4,+ };+String bmiCategory(String key) => switch (key) {'Underweight' => bmiUnderweight,'Normal' => bmiNormal,diff --git a/lib/screens/tool_detail_screen.dart b/lib/screens/tool_detail_screen.dartindex 5a91e78..c863e89 100644--- a/lib/screens/tool_detail_screen.dart+++ b/lib/screens/tool_detail_screen.dart@@ -100,6 +100,10 @@ class ToolDetailScreen extends StatelessWidget {t.rpeResultHint(fit.rpeTargetReps, fmt(fit.rpeTargetRpe)));case 'dots':return (t.toolTitle('dots'), fmt(fit.dotsScore), t.dotsLevelName(fit.dotsLevel));+ case 'wilks':+ return (t.toolTitle('wilks'), fmt(fit.wilksScore), t.dotsLevelName(fit.wilksLevel));+ case 'ffmi':+ return (t.toolTitle('ffmi'), fmt(fit.ffmiScore), t.ffmiLevelName(fit.ffmiLevel));default:return ('', '', '');}@@ -180,6 +184,7 @@ class ToolDetailScreen extends StatelessWidget {_note(gc, '${t.rpeOneRmLine(fit.weightLabel(fit.rpeOneRm))}\n${t.rpeExplain}'),];case 'dots':+ case 'wilks':final step = fit.fromDisplayWeight(fit.weightStep);Widget lift(String label, double kg, void Function(double) bump) => ToolRow(label: label,@@ -203,7 +208,21 @@ class ToolDetailScreen extends StatelessWidget {lift(t.dotsSquat, fit.dotsSquat, fit.bumpDotsSquat),lift(t.dotsBench, fit.dotsBench, fit.bumpDotsBench),lift(t.dotsDeadlift, fit.dotsDeadlift, fit.bumpDotsDeadlift),- _note(gc, '${t.dotsTotalLine(fit.weightLabel(fit.dotsTotal))}\n${t.dotsExplain}'),+ _note(gc, '${t.dotsTotalLine(fit.weightLabel(fit.dotsTotal))}\n${id == 'wilks' ? t.wilksExplain : t.dotsExplain}'),+ ];+ case 'ffmi':+ return [+ ToolRow(+ label: t.sexLabel,+ control: SegToggle([+ SegOption(t.male, fit.ffmiSex == 'male', () => fit.setFfmiSex('male')),+ SegOption(t.female, fit.ffmiSex == 'female', () => fit.setFfmiSex('female')),+ ]),+ ),+ ToolRow(label: t.heightLabel, control: StepperControl(value: fit.heightLabel(fit.ffmiHeight), onDec: () => fit.bumpFfmiHeight(-fit.heightStep), onInc: () => fit.bumpFfmiHeight(fit.heightStep), onEdit: () => _editNumber(context, title: t.heightLabel, current: fit.toDisplayCm(fit.ffmiHeight), decimal: true, apply: (v) => fit.bumpFfmiHeight(fit.fromDisplayCm(v) - fit.ffmiHeight)))),+ ToolRow(label: t.weightLabel, control: StepperControl(value: '${fit.weightValue(fit.ffmiWeight)} ${fit.units}', onDec: () => fit.bumpFfmiWeight(-fit.fromDisplayWeight(fit.isLb ? 1 : 0.5)), onInc: () => fit.bumpFfmiWeight(fit.fromDisplayWeight(fit.isLb ? 1 : 0.5)), onEdit: () => _editNumber(context, title: t.weightLabel, current: fit.toDisplayWeight(fit.ffmiWeight), decimal: true, apply: (v) => fit.bumpFfmiWeight(fit.fromDisplayWeight(v) - fit.ffmiWeight)))),+ ToolRow(label: t.ffmiBodyFat, control: StepperControl(value: '${fmt(fit.ffmiBf)}%', minWidth: 52, onDec: () => fit.bumpFfmiBf(-0.5), onInc: () => fit.bumpFfmiBf(0.5), onEdit: () => _editNumber(context, title: t.ffmiBodyFat, current: fit.ffmiBf, decimal: true, apply: (v) => fit.bumpFfmiBf(v - fit.ffmiBf)))),+ _note(gc, '${t.ffmiLeanLine(fit.weightLabel(fit.ffmiLean))}\n${t.ffmiExplain}'),];default:return const [];diff --git a/lib/services/home_widget_bridge.dart b/lib/services/home_widget_bridge.dartindex 6107b2c..07a73aa 100644--- a/lib/services/home_widget_bridge.dart+++ b/lib/services/home_widget_bridge.dart@@ -18,7 +18,6 @@ class HomeWidgetBridge {static const statsKey = 'stats_img';static const bodyKey = 'body_img';static const todayKey = 'today_img';- static const todayIdleKey = 'today_idle_img';static const todayPlanKey = 'today_plan_img';static const todayRestKey = 'today_rest_img';static const weekKey = 'week_img';@@ -89,7 +88,6 @@ class HomeWidgetBridge {final levels = fit.heatmapWeeksFor(26);final heat = fit.muscleHeatOver(bodyDays);final plannedToday = fit.todayRoutine != null;- final hasPlan = fit.weeklyPlan.isNotEmpty;final views = <(String, String, Size, Widget Function(GymColors))>[(@@ -137,14 +135,13 @@ class HomeWidgetBridge {gc: gc,done: fit.todayPlanDone,planned: plannedToday,- rest: !plannedToday && hasPlan,+ rest: !plannedToday,streak: fit.currentStreak,size: todaySize,framed: framed,),),for (final (key, planned, rest) in [- (todayIdleKey, false, false),(todayPlanKey, true, false),(todayRestKey, false, true),])diff --git a/lib/state/tools_state.dart b/lib/state/tools_state.dartindex 943d3cd..15ed3aa 100644--- a/lib/state/tools_state.dart+++ b/lib/state/tools_state.dart@@ -31,6 +31,10 @@ mixin ToolsState on FitCore {double dotsBench = 100;double dotsDeadlift = 180;bool _dotsSeeded = false;+ String ffmiSex = 'male';+ double ffmiHeight = 175;+ double ffmiWeight = 75;+ double ffmiBf = 15;static const dotsLifts = ['qXTaZnJ', 'EIeI8Vf', 'ila4NZS'];@@ -46,6 +50,9 @@ mixin ToolsState on FitCore {bfSex = profile.sex;dotsBody = profile.weightKg;dotsSex = profile.sex;+ ffmiHeight = profile.heightCm;+ ffmiWeight = profile.weightKg;+ ffmiSex = profile.sex;}double bestLift(String id) => 0;@@ -62,7 +69,7 @@ mixin ToolsState on FitCore {void goTools() => pushRoute('tools');void openTool(String id) {- if (id == 'dots') _seedDots();+ if (id == 'dots' || id == 'wilks') _seedDots();activeToolId = id;pushRoute('tools-detail');}@@ -289,8 +296,24 @@ mixin ToolsState on FitCore {return _round1(dotsTotal * 500 / den);}- int get dotsLevel {- final s = dotsScore;+ int get dotsLevel => strengthLevel(dotsScore);++ double get wilksScore {+ final male = dotsSex == 'male';+ final bw = dotsBody.clamp(male ? 40 : 26.51, male ? 201.9 : 154.53).toDouble();+ final c = male+ ? const [-216.0475144, 16.2606339, -0.002388645, -0.00113732, 7.01863e-6, -1.291e-8]+ : const [594.31747775582, -27.23842536447, 0.82112226871, -0.00930733913, 4.731582e-5, -9.054e-8];+ var den = 0.0;+ for (var i = 0; i < c.length; i++) {+ den += c[i] * math.pow(bw, i);+ }+ return _round1(dotsTotal * 500 / den);+ }++ int get wilksLevel => strengthLevel(wilksScore);++ static int strengthLevel(double s) {if (s < 250) return 0;if (s < 325) return 1;if (s < 400) return 2;@@ -308,5 +331,29 @@ mixin ToolsState on FitCore {void bumpDotsDeadlift(double d) { dotsDeadlift = _clamp(dotsDeadlift + d, 0, null); notifyListeners(); }+ double get ffmiLean => ffmiWeight * (1 - ffmiBf / 100);++ double get ffmiScore {+ final m = ffmiHeight / 100;+ return _round1(ffmiLean / (m * m) + 6.1 * (1.8 - m));+ }++ int get ffmiLevel {+ final s = ffmiScore - (ffmiSex == 'male' ? 0 : 3);+ if (s < 18) return 0;+ if (s < 20) return 1;+ if (s < 22) return 2;+ if (s < 25) return 3;+ return 4;+ }++ void setFfmiSex(String s) { ffmiSex = s; notifyListeners(); }++ void bumpFfmiHeight(double d) { ffmiHeight = _clamp(ffmiHeight + d, 100, 250); notifyListeners(); }++ void bumpFfmiWeight(double d) { ffmiWeight = _clamp(ffmiWeight + d, 30, 300); notifyListeners(); }++ void bumpFfmiBf(double d) { ffmiBf = _clamp(ffmiBf + d, 3, 60); notifyListeners(); }+void bumpWarmupTarget(double d) { warmupTarget = _clamp(warmupTarget + d, 0, null); notifyListeners(); }}diff --git a/lib/widgets/tool_art.dart b/lib/widgets/tool_art.dartindex 08a51fa..daf64c2 100644--- a/lib/widgets/tool_art.dart+++ b/lib/widgets/tool_art.dart@@ -280,6 +280,108 @@ class _ToolArtPainter extends CustomPainter {..style = PaintingStyle.stroke..strokeWidth = 1.4..color = const Color(0xFF9C7334).withValues(alpha: 0.6));+ case 'wilks':+ const goldLight = Color(0xFFFBE9B8), goldDark = Color(0xFFC9934A), rim = Color(0xFF9C7334);+ final cx = w / 2;+ Shader gold(Rect r) =>+ const LinearGradient(begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [goldLight, goldDark])+ .createShader(r);+ final handle = Paint()+ ..style = PaintingStyle.stroke+ ..strokeWidth = 3.2+ ..strokeCap = StrokeCap.round+ ..color = goldDark;+ for (final s in [-1.0, 1.0]) {+ canvas.drawPath(+ Path()+ ..moveTo(cx + s * 12.5, 9)+ ..cubicTo(cx + s * 22, 8, cx + s * 22, 20, cx + s * 8.5, 23),+ handle);+ }+ final cup = Path()+ ..moveTo(cx - 14, 5)+ ..lineTo(cx + 14, 5)+ ..cubicTo(cx + 14, 17, cx + 9, 25, cx + 2.6, 27.5)+ ..lineTo(cx + 2.6, 34)+ ..cubicTo(cx + 2.6, 36, cx + 8, 37, cx + 9, 39.5)+ ..lineTo(cx - 9, 39.5)+ ..cubicTo(cx - 8, 37, cx - 2.6, 36, cx - 2.6, 34)+ ..lineTo(cx - 2.6, 27.5)+ ..cubicTo(cx - 9, 25, cx - 14, 17, cx - 14, 5)+ ..close();+ final base = _block(canvas, Rect.fromLTWH(cx - 14, 39, 28, 11), 3, _hue(4));+ canvas.drawRRect(RRect.fromRectAndRadius(Rect.fromCenter(center: base.center, width: 12, height: 2.4), const Radius.circular(1.2)),+ Paint()..color = _ink(_hue(4)).withValues(alpha: 0.35));+ _shadow(canvas, cup);+ canvas.drawPath(cup, Paint()..shader = gold(cup.getBounds()));+ canvas.drawOval(Rect.fromCenter(center: Offset(cx, 30.5), width: 9, height: 3.6), Paint()..shader = gold(Rect.fromLTWH(cx - 5, 28, 10, 5)));+ canvas.drawOval(Rect.fromCenter(center: Offset(cx, 5.5), width: 28, height: 4), Paint()..color = rim.withValues(alpha: 0.55));+ canvas.drawOval(Rect.fromCenter(center: Offset(cx, 5), width: 25, height: 2.6), Paint()..color = goldLight);+ canvas.drawPath(+ Path()+ ..moveTo(cx - 9.5, 10)+ ..cubicTo(cx - 9.5, 17, cx - 7, 21, cx - 4, 23),+ Paint()+ ..style = PaintingStyle.stroke+ ..strokeWidth = 2.6+ ..strokeCap = StrokeCap.round+ ..color = Colors.white.withValues(alpha: 0.55));+ final star = Path();+ for (var k = 0; k < 10; k++) {+ final a = -math.pi / 2 + k * math.pi / 5;+ final r = k.isEven ? 4.2 : 1.8;+ final pt = Offset(cx + math.cos(a) * r, 15 + math.sin(a) * r);+ k == 0 ? star.moveTo(pt.dx, pt.dy) : star.lineTo(pt.dx, pt.dy);+ }+ canvas.drawPath(star..close(), Paint()..color = rim.withValues(alpha: 0.55));+ case 'ffmi':+ final ruler = Rect.fromLTWH(7, 3, 14, h - 6);+ _block(canvas, ruler, 3.5, _hue(2));+ final tick = Paint()..color = _ink(_hue(2)).withValues(alpha: 0.5);+ for (var k = 0; k <= 12; k++) {+ final y = ruler.top + 5 + k * (ruler.height - 10) / 12;+ final len = k % 4 == 0 ? 8.0 : (k.isEven ? 5.5 : 3.5);+ canvas.drawRRect(RRect.fromRectAndRadius(Rect.fromLTWH(ruler.left + 2, y - 0.7, len, 1.4), const Radius.circular(0.7)), tick);+ }+ final bx = w - 21.0, by = h - 18.0;+ final iron = _hue(0);+ canvas.drawPath(+ Path()+ ..moveTo(bx - 9.5, by - 1)+ ..cubicTo(bx - 12, by - 26, bx + 12, by - 26, bx + 9.5, by - 1),+ Paint()+ ..style = PaintingStyle.stroke+ ..strokeWidth = 4.6+ ..strokeCap = StrokeCap.round+ ..color = _ink(iron).withValues(alpha: 0.9));+ canvas.drawPath(+ Path()+ ..moveTo(bx - 9.5, by - 1.5)+ ..cubicTo(bx - 12, by - 26, bx + 12, by - 26, bx + 9.5, by - 1.5),+ Paint()+ ..style = PaintingStyle.stroke+ ..strokeWidth = 3+ ..strokeCap = StrokeCap.round+ ..color = Color.lerp(iron, Colors.black, 0.18)!);+ final bell = Path()+ ..moveTo(bx - 7, by + 13.5)+ ..cubicTo(bx - 17, by + 11, bx - 16.5, by - 9, bx, by - 10)+ ..cubicTo(bx + 16.5, by - 9, bx + 17, by + 11, bx + 7, by + 13.5)+ ..close();+ _shadow(canvas, bell);+ _fill(canvas, bell, iron);+ canvas.save();+ canvas.clipPath(bell);+ canvas.drawPath(bell.shift(const Offset(-2.5, 2)),+ Paint()+ ..style = PaintingStyle.stroke+ ..strokeWidth = 2+ ..color = Colors.white.withValues(alpha: 0.3));+ canvas.restore();+ canvas.drawOval(Rect.fromCenter(center: Offset(bx - 5, by - 3), width: 6, height: 3.6),+ Paint()..color = Colors.white.withValues(alpha: 0.42));+ canvas.drawRRect(RRect.fromRectAndRadius(Rect.fromCenter(center: Offset(bx, by + 4), width: 10, height: 6), const Radius.circular(2)),+ Paint()..color = _ink(iron).withValues(alpha: 0.28));}}