Offline gym log for Android. No account, no ads, no internet.
Dart androidbodybuildingdartexercisesf-droidfitnessfluttergymgym-apphealthprivacyself-hostedworkoutworkout-appworkout-tracker
Keep weights, energy and units in one piece in Arabic
InlitXf84d43d3e64c
diff --git a/lib/screens/awards_screen.dart b/lib/screens/awards_screen.dartindex 9ed1be8..ca4c8aa 100644--- a/lib/screens/awards_screen.dart+++ b/lib/screens/awards_screen.dart@@ -85,7 +85,7 @@ class _AwardsScreenState extends State<AwardsScreen> {const SizedBox(width: 14),Expanded(child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [- Row(+ Ltr(child: Row(crossAxisAlignment: CrossAxisAlignment.baseline,textBaseline: TextBaseline.alphabetic,children: [@@ -94,7 +94,7 @@ class _AwardsScreenState extends State<AwardsScreen> {const SizedBox(width: 5),Text('/ $total', style: AppTheme.f(16, weight: FontWeight.w800, color: gc.textTertiary)),],- ),+ )),const SizedBox(height: 3),Text(t.awardsEarned.toUpperCase(),style: AppTheme.f(10, weight: FontWeight.w700, color: gc.textTertiary, letterSpacing: 1.4)),diff --git a/lib/screens/exercise_detail_screen.dart b/lib/screens/exercise_detail_screen.dartindex 6254d64..7e69816 100644--- a/lib/screens/exercise_detail_screen.dart+++ b/lib/screens/exercise_detail_screen.dart@@ -862,7 +862,7 @@ class _ExerciseDetailScreenState extends State<ExerciseDetailScreen> {return Padding(padding: const EdgeInsets.only(top: 16),child: Row(children: [- if (set != null) cell(t.prBestSet, '${fit.weightLabel(set.set.weight)} × ${set.set.reps}', set.date),+ if (set != null) cell(t.prBestSet, ltr('${fit.weightLabel(set.set.weight)} × ${set.set.reps}'), set.date),if (set != null) const SizedBox(width: 12),cell(t.prBestWorkout, fit.bestWorkoutLabel(work.score, kind), work.date),]),@@ -1049,7 +1049,7 @@ class _ExerciseDetailScreenState extends State<ExerciseDetailScreen> {),const SizedBox(width: 12),StepperControl(- value: '${fmt(bar)} ${fit.units}',+ value: ltr('${fmt(bar)} ${fit.units}'),minWidth: 56,btnSize: 30,gap: 3,@@ -1167,7 +1167,7 @@ class _ExerciseDetailScreenState extends State<ExerciseDetailScreen> {var target = current?.target ??(reps ? math.max(best + 5, 10.0) : fit.fromDisplayWeight(fit.toDisplayWeight(best) + fit.weightStep * 4));DateTime? due = current?.due;- String shown() => reps ? '${target.round()}' : '${fit.weightValue(target)} ${fit.units}';+ String shown() => reps ? '${target.round()}' : ltr('${fit.weightValue(target)} ${fit.units}');await showAppSheet<void>(context: context,backgroundColor: Colors.transparent,diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dartindex 51b91c7..38593a5 100644--- a/lib/screens/home_screen.dart+++ b/lib/screens/home_screen.dart@@ -530,7 +530,7 @@ class HomeScreen extends StatelessWidget {style: AppTheme.f(9.5,weight: FontWeight.w600, color: gc.textTertiary, letterSpacing: 0.9)),const SizedBox(height: 6),- Row(+ Ltr(child: Row(crossAxisAlignment: CrossAxisAlignment.baseline,textBaseline: TextBaseline.alphabetic,children: [@@ -547,7 +547,7 @@ class HomeScreen extends StatelessWidget {style: AppTheme.f(11, weight: FontWeight.w600, color: gc.textSecondary)),],],- ),+ )),],),);diff --git a/lib/screens/measures_screen.dart b/lib/screens/measures_screen.dartindex 932e9a9..3262c1e 100644--- a/lib/screens/measures_screen.dart+++ b/lib/screens/measures_screen.dart@@ -378,7 +378,7 @@ class _MeasureSheetState extends State<_MeasureSheet> {]),const SizedBox(height: 6),Center(- child: Row(+ child: Ltr(child: Row(mainAxisSize: MainAxisSize.min,crossAxisAlignment: CrossAxisAlignment.baseline,textBaseline: TextBaseline.alphabetic,@@ -389,7 +389,7 @@ class _MeasureSheetState extends State<_MeasureSheet> {Text(fit.measureUnit(_key),style: AppTheme.f(18, weight: FontWeight.w700, color: gc.textSecondary)),],- ),+ )),),const SizedBox(height: 14),RulerPicker(diff --git a/lib/screens/onboarding_screen.dart b/lib/screens/onboarding_screen.dartindex 760cb49..dbd1afb 100644--- a/lib/screens/onboarding_screen.dart+++ b/lib/screens/onboarding_screen.dart@@ -702,7 +702,7 @@ class _OnboardingScreenState extends State<OnboardingScreen> {hero: (h) {final kg = fit.units == 'kg';return Column(mainAxisSize: MainAxisSize.min, children: [- Row(+ Ltr(child: Row(mainAxisSize: MainAxisSize.min,crossAxisAlignment: CrossAxisAlignment.baseline,textBaseline: TextBaseline.alphabetic,@@ -719,7 +719,7 @@ class _OnboardingScreenState extends State<OnboardingScreen> {style: AppTheme.f(h * 0.15, weight: FontWeight.w800, color: gc.ember)),),],- ),+ )),]);},child: Row(diff --git a/lib/screens/places_screen.dart b/lib/screens/places_screen.dartindex 0839acd..e49cff8 100644--- a/lib/screens/places_screen.dart+++ b/lib/screens/places_screen.dart@@ -441,7 +441,7 @@ class PlacesScreen extends StatelessWidget {ToolRow(label: t.barWeight,control: StepperControl(- value: '${fmt(bar)} ${fit.units}',+ value: ltr('${fmt(bar)} ${fit.units}'),minWidth: 66,btnSize: 28,gap: 8,@@ -489,7 +489,7 @@ class PlacesScreen extends StatelessWidget {final kg = fit.fromDisplayWeight(size);final pairs = fit.platePairs(place, kg);return ToolRow(- label: '${fmt(size)} ${fit.units}',+ label: ltr('${fmt(size)} ${fit.units}'),control: StepperControl(value: '$pairs',minWidth: 34,diff --git a/lib/screens/progress_screen.dart b/lib/screens/progress_screen.dartindex c84975b..4719a2e 100644--- a/lib/screens/progress_screen.dart+++ b/lib/screens/progress_screen.dart@@ -167,7 +167,7 @@ class ProgressScreen extends StatelessWidget {FittedBox(fit: BoxFit.scaleDown,alignment: Alignment.centerLeft,- child: Row(+ child: Ltr(child: Row(crossAxisAlignment: CrossAxisAlignment.baseline,textBaseline: TextBaseline.alphabetic,children: [@@ -177,7 +177,7 @@ class ProgressScreen extends StatelessWidget {Text(unit, style: AppTheme.f(13, weight: FontWeight.w500, color: gc.textSecondary)),],],- ),+ )),),if (note != null) ...[const SizedBox(height: 4),@@ -1113,7 +1113,7 @@ class _BodyweightSheetState extends State<_BodyweightSheet> {SheetTitle(t.bodyweightLabel, subtitle: latest == null ? null : t.shortDateYear(latest.date)),const SizedBox(height: 14),Center(- child: Row(+ child: Ltr(child: Row(mainAxisSize: MainAxisSize.min,crossAxisAlignment: CrossAxisAlignment.baseline,textBaseline: TextBaseline.alphabetic,@@ -1123,7 +1123,7 @@ class _BodyweightSheetState extends State<_BodyweightSheet> {const SizedBox(width: 6),Text(fit.units, style: AppTheme.f(17, weight: FontWeight.w700, color: gc.textSecondary)),],- ),+ )),),if (trendShown.length >= 2) ...[const SizedBox(height: 4),@@ -2556,7 +2556,7 @@ class _LogBodyweightSheetState extends State<_LogBodyweightSheet> {const SizedBox(height: 4),Text(t.trackWeight, style: AppTheme.s(13, color: gc.textSecondary)),const SizedBox(height: 18),- Row(+ Ltr(child: Row(mainAxisSize: MainAxisSize.min,crossAxisAlignment: CrossAxisAlignment.baseline,textBaseline: TextBaseline.alphabetic,@@ -2566,7 +2566,7 @@ class _LogBodyweightSheetState extends State<_LogBodyweightSheet> {const SizedBox(width: 6),Text(fit.units, style: AppTheme.f(18, weight: FontWeight.w700, color: gc.textSecondary)),],- ),+ )),const SizedBox(height: 16),RulerPicker(value: _shown,diff --git a/lib/screens/recap_screen.dart b/lib/screens/recap_screen.dartindex fcfc446..58540b6 100644--- a/lib/screens/recap_screen.dart+++ b/lib/screens/recap_screen.dart@@ -445,7 +445,7 @@ class _RecapScreenState extends State<RecapScreen> {Widget _bigRow(List<Widget> parts) => FittedBox(fit: BoxFit.scaleDown,alignment: AlignmentDirectional.centerStart,- child: Row(crossAxisAlignment: CrossAxisAlignment.baseline, textBaseline: TextBaseline.alphabetic, children: parts),+ child: Ltr(child: Row(crossAxisAlignment: CrossAxisAlignment.baseline, textBaseline: TextBaseline.alphabetic, children: parts)),);Widget _unit(String text, double size, Color tone) => Padding(@@ -714,7 +714,7 @@ class _RecapScreenState extends State<RecapScreen> {return _bottom([_kicker(t.recapFreshKicker, tone),const SizedBox(height: 6),- Row(crossAxisAlignment: CrossAxisAlignment.baseline, textBaseline: TextBaseline.alphabetic, children: [+ Ltr(child: Row(crossAxisAlignment: CrossAxisAlignment.baseline, textBaseline: TextBaseline.alphabetic, children: [_Count(exs.length.toDouble(), style: _num(112, gc.text), duration: 900),const SizedBox(width: 10),Flexible(@@ -722,7 +722,7 @@ class _RecapScreenState extends State<RecapScreen> {maxLines: 2,style: AppTheme.f(28, weight: FontWeight.w800, color: gc.text, letterSpacing: -0.6, height: 1.05)),),- ]),+ ])),const SizedBox(height: 22),LayoutBuilder(builder: (context, box) {final tile = (box.maxWidth - 20) / 3;@@ -1793,12 +1793,12 @@ class _WorkoutsPageState extends State<_WorkoutsPage> with SingleTickerProviderSreturn Column(crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.end, children: [widget.kicker,const SizedBox(height: 6),- Row(crossAxisAlignment: CrossAxisAlignment.baseline, textBaseline: TextBaseline.alphabetic, children: [+ Ltr(child: Row(crossAxisAlignment: CrossAxisAlignment.baseline, textBaseline: TextBaseline.alphabetic, children: [Text('$shown', style: _num(112, gc.text)),const SizedBox(width: 10),Text(t.recapWorkouts(widget.recap.workouts),style: AppTheme.f(28, weight: FontWeight.w800, color: gc.text, letterSpacing: -0.6)),- ]),+ ])),const SizedBox(height: 14),widget.versus,const SizedBox(height: 22),@@ -2006,13 +2006,13 @@ class RecapCard extends StatelessWidget {FittedBox(fit: BoxFit.scaleDown,alignment: AlignmentDirectional.centerStart,- child: Row(crossAxisAlignment: CrossAxisAlignment.baseline, textBaseline: TextBaseline.alphabetic, children: [+ child: Ltr(child: Row(crossAxisAlignment: CrossAxisAlignment.baseline, textBaseline: TextBaseline.alphabetic, children: [Text(value, style: _num(size, soft ? gc.textSecondary : gc.text)),if (unit.isNotEmpty) ...[const SizedBox(width: 3),Text(unit, style: AppTheme.f(size * 0.4, weight: FontWeight.w800, color: gc.textSecondary)),],- ]),+ ])),),const SizedBox(height: 4),Text(label.toUpperCase(),@@ -2031,12 +2031,12 @@ class RecapCard extends StatelessWidget {Widget _summary(GymColors gc, Color tone) {final time = _time;return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [- Row(crossAxisAlignment: CrossAxisAlignment.baseline, textBaseline: TextBaseline.alphabetic, children: [+ Ltr(child: Row(crossAxisAlignment: CrossAxisAlignment.baseline, textBaseline: TextBaseline.alphabetic, children: [Text('${recap.workouts}', style: _num(80, gc.text)),const SizedBox(width: 8),Text(t.recapWorkouts(recap.workouts),style: AppTheme.f(22, weight: FontWeight.w800, color: gc.text, letterSpacing: -0.4)),- ]),+ ])),const SizedBox(height: 2),Text(t.recapDays(recap.days.length), style: AppTheme.f(13.5, weight: FontWeight.w700, color: gc.textSecondary)),const Spacer(),diff --git a/lib/screens/sticker_screen.dart b/lib/screens/sticker_screen.dartindex 5e64077..72d1c51 100644--- a/lib/screens/sticker_screen.dart+++ b/lib/screens/sticker_screen.dart@@ -497,14 +497,14 @@ class _Sticker extends StatelessWidget {if (showDate) ...[const SizedBox(height: 3), _date()],const SizedBox(height: 12),for (final e in shown) ...[- Row(crossAxisAlignment: CrossAxisAlignment.baseline, textBaseline: TextBaseline.alphabetic, children: [+ Ltr(child: Row(crossAxisAlignment: CrossAxisAlignment.baseline, textBaseline: TextBaseline.alphabetic, children: [Expanded(child: Text(t.catalogName(e.id, e.name),maxLines: 1, overflow: TextOverflow.ellipsis, style: _s(14, FontWeight.w800, height: 1.2)),),const SizedBox(width: 10),Text(_best(e), style: _s(12.5, FontWeight.w700, alpha: 0.8)),- ]),+ ])),const SizedBox(height: 7),],if (more > 0) ...[@@ -561,7 +561,7 @@ class _Sticker extends StatelessWidget {final sets = e.workingSets.isEmpty ? e.sets : e.workingSets;if (sets.isEmpty) return '';final top = sets.reduce((a, b) => a.weight * (a.reps + 1) >= b.weight * (b.reps + 1) ? a : b);- if (top.weight > 0 && top.reps > 0 && (top.km ?? 0) <= 0) return '${fit.weightLabel(top.weight)} × ${top.reps}';+ if (top.weight > 0 && top.reps > 0 && (top.km ?? 0) <= 0) return ltr('${fit.weightLabel(top.weight)} × ${top.reps}');return fit.loggedSetLabel(top);}diff --git a/lib/screens/tool_detail_screen.dart b/lib/screens/tool_detail_screen.dartindex 98a3393..2f5a419 100644--- a/lib/screens/tool_detail_screen.dart+++ b/lib/screens/tool_detail_screen.dart@@ -83,7 +83,7 @@ class ToolDetailScreen extends StatelessWidget {(String, String, String) _meta(String? id) {switch (id) {case 'rm':- return (t.toolTitle('rm'), '${fit.weightValue(fit.rmResult)} ${fit.units}', t.toolResultHint('rm'));+ return (t.toolTitle('rm'), ltr('${fit.weightValue(fit.rmResult)} ${fit.units}'), t.toolResultHint('rm'));case 'bmi':return (t.toolTitle('bmi'), fmt(fit.bmiVal), t.bmiCategory(fit.bmiCat));@@ -92,11 +92,11 @@ class ToolDetailScreen extends StatelessWidget {case 'bf':return (t.toolTitle('bf'), '${fmt(fit.bfVal)}%', t.toolResultHint('bf'));case 'plate':- return (t.toolTitle('plate'), '${fit.weightValue(fit.plateTarget)} ${fit.units}', t.toolResultHint('plate'));+ return (t.toolTitle('plate'), ltr('${fit.weightValue(fit.plateTarget)} ${fit.units}'), t.toolResultHint('plate'));case 'warmup':- return (t.toolTitle('warmup'), '${fit.weightValue(fit.warmupTarget)} ${fit.units}', t.toolResultHint('warmup'));+ return (t.toolTitle('warmup'), ltr('${fit.weightValue(fit.warmupTarget)} ${fit.units}'), t.toolResultHint('warmup'));case 'rpe':- return (t.toolTitle('rpe'), '${fit.weightValue(fit.rpeResult)} ${fit.units}',+ return (t.toolTitle('rpe'), ltr('${fit.weightValue(fit.rpeResult)} ${fit.units}'),t.rpeResultHint(fit.rpeTargetReps, fmt(fit.rpeTargetRpe)));case 'dots':return (t.toolTitle('dots'), fmt(fit.dotsScore), t.dotsLevelName(fit.dotsLevel));@@ -113,7 +113,7 @@ class ToolDetailScreen extends StatelessWidget {switch (id) {case 'rm':return [- ToolRow(label: t.weightLifted, control: StepperControl(value: '${fit.weightValue(fit.rmWeight)} ${fit.units}', onDec: () => fit.bumpRmWeight(-fit.fromDisplayWeight(fit.weightStep)), onInc: () => fit.bumpRmWeight(fit.fromDisplayWeight(fit.weightStep)), onEdit: () => _editNumber(context, title: t.weightLifted, current: fit.toDisplayWeight(fit.rmWeight), decimal: true, apply: (v) => fit.bumpRmWeight(fit.fromDisplayWeight(v) - fit.rmWeight)))),+ ToolRow(label: t.weightLifted, control: StepperControl(value: ltr('${fit.weightValue(fit.rmWeight)} ${fit.units}'), onDec: () => fit.bumpRmWeight(-fit.fromDisplayWeight(fit.weightStep)), onInc: () => fit.bumpRmWeight(fit.fromDisplayWeight(fit.weightStep)), onEdit: () => _editNumber(context, title: t.weightLifted, current: fit.toDisplayWeight(fit.rmWeight), decimal: true, apply: (v) => fit.bumpRmWeight(fit.fromDisplayWeight(v) - fit.rmWeight)))),const SizedBox(height: 10),ToolRow(label: t.repsPerformed, control: StepperControl(value: '${fit.rmReps}', minWidth: 40, onDec: () => fit.bumpRmReps(-1), onInc: () => fit.bumpRmReps(1), onEdit: () => _editNumber(context, title: t.repsPerformed, current: fit.rmReps.toDouble(), decimal: false, apply: (v) => fit.bumpRmReps(v.round() - fit.rmReps)))),const SizedBox(height: 10),@@ -125,7 +125,7 @@ class ToolDetailScreen extends StatelessWidget {return [ToolRow(label: t.heightLabel, control: StepperControl(value: fit.heightLabel(fit.bmiHeight), onDec: () => fit.bumpBmiHeight(-fit.heightStep), onInc: () => fit.bumpBmiHeight(fit.heightStep), onEdit: () => _editNumber(context, title: t.heightLabel, current: fit.toDisplayCm(fit.bmiHeight), decimal: true, apply: (v) => fit.bumpBmiHeight(fit.fromDisplayCm(v) - fit.bmiHeight)))),const SizedBox(height: 10),- ToolRow(label: t.weightLabel, control: StepperControl(value: '${fit.weightValue(fit.bmiWeight)} ${fit.units}', onDec: () => fit.bumpBmiWeight(-fit.fromDisplayWeight(fit.isLb ? 1 : 0.5)), onInc: () => fit.bumpBmiWeight(fit.fromDisplayWeight(fit.isLb ? 1 : 0.5)), onEdit: () => _editNumber(context, title: t.weightLabel, current: fit.toDisplayWeight(fit.bmiWeight), decimal: true, apply: (v) => fit.bumpBmiWeight(fit.fromDisplayWeight(v) - fit.bmiWeight)))),+ ToolRow(label: t.weightLabel, control: StepperControl(value: ltr('${fit.weightValue(fit.bmiWeight)} ${fit.units}'), onDec: () => fit.bumpBmiWeight(-fit.fromDisplayWeight(fit.isLb ? 1 : 0.5)), onInc: () => fit.bumpBmiWeight(fit.fromDisplayWeight(fit.isLb ? 1 : 0.5)), onEdit: () => _editNumber(context, title: t.weightLabel, current: fit.toDisplayWeight(fit.bmiWeight), decimal: true, apply: (v) => fit.bumpBmiWeight(fit.fromDisplayWeight(v) - fit.bmiWeight)))),];case 'cal':return [@@ -141,7 +141,7 @@ class ToolDetailScreen extends StatelessWidget {const SizedBox(height: 10),ToolRow(label: t.heightLabel, control: StepperControl(value: fit.heightLabel(fit.calHeight), onDec: () => fit.bumpCalHeight(-fit.heightStep), onInc: () => fit.bumpCalHeight(fit.heightStep), onEdit: () => _editNumber(context, title: t.heightLabel, current: fit.toDisplayCm(fit.calHeight), decimal: true, apply: (v) => fit.bumpCalHeight(fit.fromDisplayCm(v) - fit.calHeight)))),const SizedBox(height: 10),- ToolRow(label: t.weightLabel, control: StepperControl(value: '${fit.weightValue(fit.calWeight)} ${fit.units}', onDec: () => fit.bumpCalWeight(-fit.fromDisplayWeight(fit.isLb ? 1 : 0.5)), onInc: () => fit.bumpCalWeight(fit.fromDisplayWeight(fit.isLb ? 1 : 0.5)), onEdit: () => _editNumber(context, title: t.weightLabel, current: fit.toDisplayWeight(fit.calWeight), decimal: true, apply: (v) => fit.bumpCalWeight(fit.fromDisplayWeight(v) - fit.calWeight)))),+ ToolRow(label: t.weightLabel, control: StepperControl(value: ltr('${fit.weightValue(fit.calWeight)} ${fit.units}'), onDec: () => fit.bumpCalWeight(-fit.fromDisplayWeight(fit.isLb ? 1 : 0.5)), onInc: () => fit.bumpCalWeight(fit.fromDisplayWeight(fit.isLb ? 1 : 0.5)), onEdit: () => _editNumber(context, title: t.weightLabel, current: fit.toDisplayWeight(fit.calWeight), decimal: true, apply: (v) => fit.bumpCalWeight(fit.fromDisplayWeight(v) - fit.calWeight)))),const SizedBox(height: 10),_activityCard(gc),const SizedBox(height: 10),@@ -159,7 +159,7 @@ class ToolDetailScreen extends StatelessWidget {];case 'plate':return [- ToolRow(label: t.targetWeight, control: StepperControl(value: '${fit.weightValue(fit.plateTarget)} ${fit.units}', onDec: () => fit.bumpPlateTarget(-fit.fromDisplayWeight(fit.weightStep)), onInc: () => fit.bumpPlateTarget(fit.fromDisplayWeight(fit.weightStep)), onEdit: () => _editNumber(context, title: t.targetWeight, current: fit.toDisplayWeight(fit.plateTarget), decimal: true, apply: (v) => fit.bumpPlateTarget(fit.fromDisplayWeight(v) - fit.plateTarget)))),+ ToolRow(label: t.targetWeight, control: StepperControl(value: ltr('${fit.weightValue(fit.plateTarget)} ${fit.units}'), onDec: () => fit.bumpPlateTarget(-fit.fromDisplayWeight(fit.weightStep)), onInc: () => fit.bumpPlateTarget(fit.fromDisplayWeight(fit.weightStep)), onEdit: () => _editNumber(context, title: t.targetWeight, current: fit.toDisplayWeight(fit.plateTarget), decimal: true, apply: (v) => fit.bumpPlateTarget(fit.fromDisplayWeight(v) - fit.plateTarget)))),const SizedBox(height: 10),_barWeightCard(context, gc),const SizedBox(height: 10),@@ -167,7 +167,7 @@ class ToolDetailScreen extends StatelessWidget {];case 'warmup':return [- ToolRow(label: t.workingWeight, control: StepperControl(value: '${fit.weightValue(fit.warmupTarget)} ${fit.units}', onDec: () => fit.bumpWarmupTarget(-fit.fromDisplayWeight(fit.weightStep)), onInc: () => fit.bumpWarmupTarget(fit.fromDisplayWeight(fit.weightStep)), onEdit: () => _editNumber(context, title: t.workingWeight, current: fit.toDisplayWeight(fit.warmupTarget), decimal: true, apply: (v) => fit.bumpWarmupTarget(fit.fromDisplayWeight(v) - fit.warmupTarget)))),+ ToolRow(label: t.workingWeight, control: StepperControl(value: ltr('${fit.weightValue(fit.warmupTarget)} ${fit.units}'), onDec: () => fit.bumpWarmupTarget(-fit.fromDisplayWeight(fit.weightStep)), onInc: () => fit.bumpWarmupTarget(fit.fromDisplayWeight(fit.weightStep)), onEdit: () => _editNumber(context, title: t.workingWeight, current: fit.toDisplayWeight(fit.warmupTarget), decimal: true, apply: (v) => fit.bumpWarmupTarget(fit.fromDisplayWeight(v) - fit.warmupTarget)))),const SizedBox(height: 10),_warmupCard(gc),];@@ -175,7 +175,7 @@ class ToolDetailScreen extends StatelessWidget {final step = fit.fromDisplayWeight(fit.weightStep);return [_sectionLabel(gc, t.rpeYourSet),- ToolRow(label: t.weightLifted, control: StepperControl(value: '${fit.weightValue(fit.rpeWeight)} ${fit.units}', onDec: () => fit.bumpRpeWeight(-step), onInc: () => fit.bumpRpeWeight(step), onEdit: () => _editNumber(context, title: t.weightLifted, current: fit.toDisplayWeight(fit.rpeWeight), decimal: true, apply: (v) => fit.bumpRpeWeight(fit.fromDisplayWeight(v) - fit.rpeWeight)))),+ ToolRow(label: t.weightLifted, control: StepperControl(value: ltr('${fit.weightValue(fit.rpeWeight)} ${fit.units}'), onDec: () => fit.bumpRpeWeight(-step), onInc: () => fit.bumpRpeWeight(step), onEdit: () => _editNumber(context, title: t.weightLifted, current: fit.toDisplayWeight(fit.rpeWeight), decimal: true, apply: (v) => fit.bumpRpeWeight(fit.fromDisplayWeight(v) - fit.rpeWeight)))),ToolRow(label: t.repsPerformed, control: StepperControl(value: '${fit.rpeReps}', minWidth: 40, onDec: () => fit.bumpRpeReps(-1), onInc: () => fit.bumpRpeReps(1))),ToolRow(label: t.rpeEffortLabel, control: StepperControl(value: fmt(fit.rpeRpe), minWidth: 40, onDec: () => fit.bumpRpe(-0.5), onInc: () => fit.bumpRpe(0.5))),_sectionLabel(gc, t.rpeGoal),@@ -189,7 +189,7 @@ class ToolDetailScreen extends StatelessWidget {Widget lift(String label, double kg, void Function(double) bump) => ToolRow(label: label,control: StepperControl(- value: '${fit.weightValue(kg)} ${fit.units}',+ value: ltr('${fit.weightValue(kg)} ${fit.units}'),onDec: () => bump(-step),onInc: () => bump(step),onEdit: () => _editNumber(context, title: label, current: fit.toDisplayWeight(kg), decimal: true, apply: (v) => bump(fit.fromDisplayWeight(v) - kg)),@@ -220,7 +220,7 @@ class ToolDetailScreen extends StatelessWidget {]),),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.weightLabel, control: StepperControl(value: ltr('${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}'),];@@ -342,7 +342,7 @@ class ToolDetailScreen extends StatelessWidget {opt('${fmt(v)} ${fit.units}', current == v, () => fit.setPlateBar(v)),const SizedBox(width: 8),],- opt(own ? '${fmt(current)} ${fit.units}' : t.custom, own,+ opt(own ? ltr('${fmt(current)} ${fit.units}') : t.custom, own,() => _editNumber(context, title: t.barWeight, current: current, decimal: true, apply: fit.setPlateBar)),]),],@@ -478,12 +478,12 @@ void showPlateSheet(BuildContext context, double displayTarget, {double? startBaconst SizedBox(height: 8),Row(children: [for (final option in fit.barOptions) ...[- _sheetBarChip(gc, '${fmt(option)} ${fit.units}', bar == option, () => setSheet(() => bar = option)),+ _sheetBarChip(gc, ltr('${fmt(option)} ${fit.units}'), bar == option, () => setSheet(() => bar = option)),const SizedBox(width: 8),],_sheetBarChip(gc,- fit.barOptions.contains(bar) ? t.custom : '${fmt(bar)} ${fit.units}',+ fit.barOptions.contains(bar) ? t.custom : ltr('${fmt(bar)} ${fit.units}'),!fit.barOptions.contains(bar), () async {final v = await askNumber(sheet, title: t.barWeight, initial: fmt(bar), decimal: true);if (v != null && v >= 0) setSheet(() => bar = v);diff --git a/lib/state/workout_state.dart b/lib/state/workout_state.dartindex 421022d..d6938dc 100644--- a/lib/state/workout_state.dart+++ b/lib/state/workout_state.dart@@ -521,7 +521,7 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsSt? target.perSet.join('/'): '${target.reps}';final main = '${weightLabel(target.weightKg)} × $reps';- return target.move == NextMove.addSet ? '${target.sets} × $main' : main;+ return ltr(target.move == NextMove.addSet ? '${target.sets} × $main' : main);}void _beginSession(List<Exercise> exs,