Skip to content

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

Keep rulers, charts and time pickers left to right in Arabic

InlitX7fc3ed74e4d9
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index a4b46b8..bf38dce 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -286,7 +286,7 @@ class SettingsScreen extends StatelessWidget {
gc,
PhosphorIconsRegular.barbell,
t.weightStepSetting,
- [for (final s in fit.weightSteps) ('$s', '${fmt(s)} ${fit.units}', PhosphorIconsRegular.barbell)],
+ [for (final s in fit.weightSteps) ('$s', ltr('${fmt(s)} ${fit.units}'), PhosphorIconsRegular.barbell)],
() => '${fit.weightStep}',
(v) => fit.setWeightStep(double.parse(v)),
rowHint: t.weightStepHint,
@@ -1501,7 +1501,7 @@ class SettingsScreen extends StatelessWidget {
textAlign: TextAlign.center,
style: AppTheme.f(12, weight: FontWeight.w500, color: gc.textSecondary, height: 1.4)),
] else ...[
- Row(
+ Directionality(textDirection: TextDirection.ltr, child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
StepperControl(
@@ -1528,7 +1528,7 @@ class SettingsScreen extends StatelessWidget {
onInc: () => setSheet(() => minutes = (minutes + 15) % 1440),
),
],
- ),
+ )),
const SizedBox(height: 8),
Text(_clockLabel(sheet, minutes),
textAlign: TextAlign.center,
@@ -2296,6 +2296,7 @@ class _ProfileSheetState extends State<_ProfileSheet> {
padding: const EdgeInsets.symmetric(horizontal: 5),
child: Icon(
PhosphorIconsFill.sealCheck,
+ textDirection: TextDirection.ltr,
size: fit.profile.badge == id ? 26 : 22,
color: fit.profile.badge == id
? badgeColor(id)
diff --git a/lib/widgets/charts.dart b/lib/widgets/charts.dart
index 8509036..ad922bf 100644
--- a/lib/widgets/charts.dart
+++ b/lib/widgets/charts.dart
@@ -8,6 +8,7 @@ import '../theme/app_colors.dart';
import '../theme/app_theme.dart';
import 'body_map.dart';
import 'svg_icon.dart';
+import 'ui_kit.dart';
class GoalRing extends StatelessWidget {
const GoalRing({super.key, required this.pct, this.size = 40, this.color});
@@ -77,7 +78,7 @@ class VolumeChart extends StatelessWidget {
final top = points.isEmpty ? 0.0 : points.reduce(math.max);
final style = AppTheme.d(10, weight: FontWeight.w600, color: gc.textTertiary);
- return Column(
+ return Ltr(child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
SizedBox(
@@ -117,7 +118,7 @@ class VolumeChart extends StatelessWidget {
),
],
],
- );
+ ));
}
}
@@ -466,7 +467,7 @@ class Heatmap extends StatelessWidget {
final top = named ? 16.0 : 0.0;
final labelStyle = AppTheme.f(9, weight: FontWeight.w600, color: gc.textTertiary);
final yearStyle = AppTheme.f(9, weight: FontWeight.w800, color: gc.textSecondary);
- return LayoutBuilder(builder: (context, c) {
+ return Ltr(child: LayoutBuilder(builder: (context, c) {
var cell = cellSize ?? (c.maxWidth - side - gap * (cols - 1)) / cols;
if (cellSize == null && c.hasBoundedHeight) cell = math.min(cell, (c.maxHeight - top - gap * (rows - 1)) / rows);
Widget box(int i) {
@@ -538,7 +539,7 @@ class Heatmap extends StatelessWidget {
Positioned(left: side, top: top, child: grid),
]),
);
- });
+ }));
}
}
@@ -555,7 +556,7 @@ class HeatmapYear extends StatelessWidget {
Widget build(BuildContext context) {
final gc = context.gc;
final labelStyle = AppTheme.f(9, weight: FontWeight.w600, color: gc.textTertiary);
- return Row(crossAxisAlignment: CrossAxisAlignment.start, children: [
+ return Ltr(child: Row(crossAxisAlignment: CrossAxisAlignment.start, children: [
if (weekdays)
Padding(
padding: const EdgeInsets.only(top: 16),
@@ -592,7 +593,7 @@ class HeatmapYear extends StatelessWidget {
),
),
),
- ]);
+ ]));
}
}
diff --git a/lib/widgets/health_cards.dart b/lib/widgets/health_cards.dart
index e97663f..0633e18 100644
--- a/lib/widgets/health_cards.dart
+++ b/lib/widgets/health_cards.dart
@@ -198,7 +198,7 @@ class _HealthFigure extends StatelessWidget {
FittedBox(
fit: BoxFit.scaleDown,
alignment: Alignment.centerLeft,
- child: Row(
+ child: Ltr(child: Row(
crossAxisAlignment: CrossAxisAlignment.baseline,
textBaseline: TextBaseline.alphabetic,
children: [
@@ -209,7 +209,7 @@ class _HealthFigure extends StatelessWidget {
Text(unit, style: AppTheme.f(11, weight: FontWeight.w600, color: gc.textSecondary)),
],
],
- ),
+ )),
),
const SizedBox(height: 2),
Text(healthName(metric),
@@ -412,7 +412,7 @@ class HealthTile extends StatelessWidget {
FittedBox(
fit: BoxFit.scaleDown,
alignment: Alignment.centerLeft,
- child: Row(
+ child: Ltr(child: Row(
crossAxisAlignment: CrossAxisAlignment.baseline,
textBaseline: TextBaseline.alphabetic,
children: [
@@ -423,7 +423,7 @@ class HealthTile extends StatelessWidget {
Text(unit, style: AppTheme.f(12, weight: FontWeight.w500, color: gc.textSecondary)),
],
],
- ),
+ )),
),
const SizedBox(height: 3),
Text(
@@ -692,7 +692,7 @@ void showHealthDetail(BuildContext context, HealthMetric metric) {
Flexible(child: Text(healthName(metric), style: AppTheme.f(19, color: gc.text))),
]),
const SizedBox(height: 14),
- Row(
+ Ltr(child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.baseline,
textBaseline: TextBaseline.alphabetic,
@@ -704,7 +704,7 @@ void showHealthDetail(BuildContext context, HealthMetric metric) {
Text(unit, style: AppTheme.f(15, weight: FontWeight.w600, color: gc.textSecondary)),
],
],
- ),
+ )),
const SizedBox(height: 4),
Text(latest == null ? (fit.healthFailed.contains(metric) ? t.healthReadFailed : t.healthNoData) : healthWhen(latest.day),
textAlign: TextAlign.center,
diff --git a/lib/widgets/home_widget_views.dart b/lib/widgets/home_widget_views.dart
index 882978e..0cc26f7 100644
--- a/lib/widgets/home_widget_views.dart
+++ b/lib/widgets/home_widget_views.dart
@@ -177,7 +177,7 @@ class StatsWidgetView extends StatelessWidget {
FittedBox(
fit: BoxFit.scaleDown,
alignment: Alignment.centerLeft,
- child: Row(
+ child: Ltr(child: Row(
crossAxisAlignment: CrossAxisAlignment.baseline,
textBaseline: TextBaseline.alphabetic,
children: [
@@ -195,7 +195,7 @@ class StatsWidgetView extends StatelessWidget {
style: TextStyle(fontFamily: _kBody, fontSize: 14, color: gc.textSecondary)),
),
],
- ),
+ )),
),
const Spacer(),
Row(
@@ -355,7 +355,7 @@ class WeekWidgetView extends StatelessWidget {
letterSpacing: 1.2,
color: gc.textTertiary)),
const SizedBox(height: 4),
- Row(
+ Ltr(child: Row(
crossAxisAlignment: CrossAxisAlignment.baseline,
textBaseline: TextBaseline.alphabetic,
children: [
@@ -374,7 +374,7 @@ class WeekWidgetView extends StatelessWidget {
fontWeight: FontWeight.w700,
color: gc.textSecondary)),
],
- ),
+ )),
],
),
),
@@ -759,7 +759,7 @@ class KcalWidgetView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
- Row(
+ Ltr(child: Row(
crossAxisAlignment: CrossAxisAlignment.baseline,
textBaseline: TextBaseline.alphabetic,
children: [
@@ -778,7 +778,7 @@ class KcalWidgetView extends StatelessWidget {
fontWeight: FontWeight.w700,
color: gc.textTertiary)),
),
- ]),
+ ])),
macro(PhosphorIconsFill.egg, t.macroProtein, protein, goals.$1, gc.protein),
macro(PhosphorIconsFill.grains, t.macroCarbs, carbs, goals.$2, gc.carbs),
macro(PhosphorIconsFill.drop, t.macroFat, fat, goals.$3, gc.fat),
diff --git a/lib/widgets/ruler_picker.dart b/lib/widgets/ruler_picker.dart
index 857c155..0efddf5 100644
--- a/lib/widgets/ruler_picker.dart
+++ b/lib/widgets/ruler_picker.dart
@@ -95,7 +95,7 @@ class _RulerPickerState extends State<RulerPicker> {
final vertical = widget.axis == Axis.vertical;
return LayoutBuilder(builder: (context, box) {
final side = (vertical ? widget.height : box.maxWidth) / 2 - _gap / 2;
- return SizedBox(
+ return Ltr(child: SizedBox(
height: widget.height,
child: Stack(
alignment: vertical ? Alignment.centerRight : Alignment.topCenter,
@@ -142,7 +142,7 @@ class _RulerPickerState extends State<RulerPicker> {
),
],
),
- );
+ ));
});
}
@@ -280,7 +280,7 @@ Future<double?> askRuler(
builder: (sheet) => StatefulBuilder(
builder: (sheet, setSheet) {
final gc = sheet.gc;
- final reading = Row(
+ final reading = Ltr(child: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.baseline,
textBaseline: TextBaseline.alphabetic,
@@ -291,7 +291,7 @@ Future<double?> askRuler(
Text(unit, style: AppTheme.f(18, weight: FontWeight.w700, color: gc.textSecondary)),
],
],
- );
+ ));
final ruler = RulerPicker(
value: current,
min: min,
diff --git a/lib/widgets/settings_showcase.dart b/lib/widgets/settings_showcase.dart
index dac6148..56d50ae 100644
--- a/lib/widgets/settings_showcase.dart
+++ b/lib/widgets/settings_showcase.dart
@@ -8,6 +8,7 @@ import '../models/gym_pass.dart';
import '../state/fit_state.dart';
import '../theme/app_colors.dart';
import '../theme/app_theme.dart';
+import 'ui_kit.dart';
import 'charts.dart';
import 'gym_pass_card.dart';
import 'medal.dart';
@@ -473,11 +474,11 @@ class HomeExtrasShowcase extends StatelessWidget {
Icon(PhosphorIconsFill.heart, size: 16, color: gc.accent),
const SizedBox(width: 6),
Expanded(child: _kicker(gc, t.healthRestingHr)),
- Row(crossAxisAlignment: CrossAxisAlignment.baseline, textBaseline: TextBaseline.alphabetic, children: [
+ Ltr(child: Row(crossAxisAlignment: CrossAxisAlignment.baseline, textBaseline: TextBaseline.alphabetic, children: [
_big(gc, '56', size: 26),
const SizedBox(width: 3),
Text(t.healthBpm, style: AppTheme.f(11.5, weight: FontWeight.w600, color: gc.textSecondary)),
- ]),
+ ])),
]),
),
]),
diff --git a/lib/widgets/share_cards.dart b/lib/widgets/share_cards.dart
index d48cd13..0d0fd88 100644
--- a/lib/widgets/share_cards.dart
+++ b/lib/widgets/share_cards.dart
@@ -9,6 +9,7 @@ import '../services/media_store.dart';
import '../state/fit_state.dart';
import '../theme/app_colors.dart';
import '../theme/app_theme.dart';
+import 'ui_kit.dart';
import 'body_map.dart';
import 'charts.dart';
import 'profile_avatar.dart';
@@ -128,7 +129,7 @@ class ShareCard extends StatelessWidget {
const Spacer(flex: 3),
_label(t.consistency),
const SizedBox(height: 2),
- Row(
+ Ltr(child: Row(
crossAxisAlignment: CrossAxisAlignment.baseline,
textBaseline: TextBaseline.alphabetic,
children: [
@@ -150,7 +151,7 @@ class ShareCard extends StatelessWidget {
style: AppTheme.f(17, weight: FontWeight.w700, color: gc.textSecondary, height: 1.15)),
),
],
- ),
+ )),
const Spacer(flex: 2),
Heatmap(levels: fit.heatmapWeeksFor(20)),
const Spacer(flex: 3),
diff --git a/lib/widgets/steps_card.dart b/lib/widgets/steps_card.dart
index b091290..3e381b8 100644
--- a/lib/widgets/steps_card.dart
+++ b/lib/widgets/steps_card.dart
@@ -69,7 +69,7 @@ class StepsCard 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: [
@@ -85,7 +85,7 @@ class StepsCard extends StatelessWidget {
Text(t.stepsOfGoal(stepCount(goal)),
style: AppTheme.f(11, weight: FontWeight.w600, color: gc.textSecondary)),
],
- ),
+ )),
const SizedBox(height: 12),
ClipRRect(
borderRadius: BorderRadius.circular(100),