Skip to content

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

Add an Ltr widget and keep rolling numbers left to right

InlitX59781b7b2f80
diff --git a/lib/l10n/l10n.dart b/lib/l10n/l10n.dart
index 604ab87..0d11036 100644
--- a/lib/l10n/l10n.dart
+++ b/lib/l10n/l10n.dart
@@ -11,14 +11,23 @@ export 'app_localizations.dart';
final Map<String, String> _decimalSeparators = {};
-String get decimalSeparator =>
- _decimalSeparators.putIfAbsent(intlLocale, () => NumberFormat.decimalPattern(intlLocale).symbols.DECIMAL_SEP);
+String get decimalSeparator => _decimalSeparators.putIfAbsent(intlLocale, () {
+ final sep = NumberFormat.decimalPattern(intlLocale).symbols.DECIMAL_SEP;
+ return sep == '٫' ? '.' : sep;
+ });
String decimalText(String s) => s.replaceFirst('.', decimalSeparator);
+bool get isRtlLanguage => appLanguage == 'ar' || appLanguage == 'fa';
+
+String ltr(String s) => isRtlLanguage ? '\u2066$s\u2069' : s;
+
final _grouped = <String, NumberFormat>{};
-String groupedInt(int n) => (_grouped[intlLocale] ??= NumberFormat.decimalPattern(intlLocale)).format(n);
+String groupedInt(int n) {
+ final locale = appLanguage == 'fa' ? 'en' : intlLocale;
+ return (_grouped[locale] ??= NumberFormat.decimalPattern(locale)).format(n);
+}
const Map<String, Map<String, String>> _catalogNames = {'es': kExerciseNameEs, 'it': kExerciseNameIt, 'zh': kExerciseNameZh};
const Map<String, Map<String, List<String>>> _catalogSteps = {'es': kExerciseStepsEs, 'it': kExerciseStepsIt, 'zh': kExerciseStepsZh};
diff --git a/lib/widgets/entrance.dart b/lib/widgets/entrance.dart
index 6993f05..4ccada7 100644
--- a/lib/widgets/entrance.dart
+++ b/lib/widgets/entrance.dart
@@ -179,7 +179,7 @@ class _RollInState extends State<RollIn> with SingleTickerProviderStateMixin {
animation: c,
builder: (context, _) {
final count = total * Curves.easeOutCubic.transform(c.value);
- return Row(
+ return Directionality(textDirection: TextDirection.ltr, child: Row(
mainAxisSize: MainAxisSize.min,
children: [
for (var i = 0; i < chars.length; i++)
@@ -194,7 +194,7 @@ class _RollInState extends State<RollIn> with SingleTickerProviderStateMixin {
else
_wheel(count, digits.length - 1 - digits.indexOf(i), line, cell),
],
- );
+ ));
},
),
);
diff --git a/lib/widgets/rolling_text.dart b/lib/widgets/rolling_text.dart
index edebbec..1a9566e 100644
--- a/lib/widgets/rolling_text.dart
+++ b/lib/widgets/rolling_text.dart
@@ -104,7 +104,7 @@ class _RollingTextState extends State<RollingText> {
TextAlign.center => Alignment.center,
_ => Alignment.centerLeft,
},
- child: row,
+ child: Directionality(textDirection: TextDirection.ltr, child: row),
),
);
}
diff --git a/lib/widgets/ui_kit.dart b/lib/widgets/ui_kit.dart
index dc62805..41fe34f 100644
--- a/lib/widgets/ui_kit.dart
+++ b/lib/widgets/ui_kit.dart
@@ -104,6 +104,15 @@ class SectionLabel extends StatelessWidget {
TextStyle kickerStyle(GymColors gc, {Color? color}) =>
AppTheme.f(10.5, weight: FontWeight.w700, color: color ?? gc.textTertiary, letterSpacing: 1.4);
+class Ltr extends StatelessWidget {
+ const Ltr({super.key, required this.child});
+
+ final Widget child;
+
+ @override
+ Widget build(BuildContext context) => Directionality(textDirection: TextDirection.ltr, child: child);
+}
+
class SoftCard extends StatelessWidget {
const SoftCard({
super.key,
@@ -836,15 +845,17 @@ class StepperControl extends StatelessWidget {
if (onEdit != null) {
label = GestureDetector(behavior: HitTestBehavior.opaque, onTap: onEdit, child: label);
}
- return Row(
- mainAxisSize: MainAxisSize.min,
- children: [
- btn('–', onDec),
- SizedBox(width: gap),
- label,
- SizedBox(width: gap),
- btn('+', onInc),
- ],
+ return Ltr(
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ btn('–', onDec),
+ SizedBox(width: gap),
+ label,
+ SizedBox(width: gap),
+ btn('+', onInc),
+ ],
+ ),
);
}
}
diff --git a/test/rtl_numbers_test.dart b/test/rtl_numbers_test.dart
new file mode 100644
index 0000000..3e7ae92
--- /dev/null
+++ b/test/rtl_numbers_test.dart
@@ -0,0 +1,42 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:gymmane/theme/app_colors.dart';
+import 'package:gymmane/widgets/rolling_text.dart';
+import 'package:gymmane/widgets/ui_kit.dart';
+
+void main() {
+ Future<void> rtl(WidgetTester tester, Widget child) async {
+ await tester.pumpWidget(MaterialApp(
+ theme: ThemeData(extensions: const [GymColors.dark]),
+ home: Directionality(textDirection: TextDirection.rtl, child: Scaffold(body: Center(child: child))),
+ ));
+ await tester.pump(const Duration(seconds: 1));
+ }
+
+ double x(WidgetTester tester, String text) => tester.getTopLeft(find.text(text).first).dx;
+
+ testWidgets('el reloj sigue de izquierda a derecha en árabe', (tester) async {
+ await rtl(tester, const RollingText('12:34', style: TextStyle(fontSize: 20)));
+ expect(x(tester, '1'), lessThan(x(tester, '2')));
+ expect(x(tester, '2'), lessThan(x(tester, ':')));
+ expect(x(tester, ':'), lessThan(x(tester, '3')));
+ expect(x(tester, '3'), lessThan(x(tester, '4')));
+ });
+
+ testWidgets('el contador con signos mas y menos no se invierte en árabe', (tester) async {
+ await rtl(tester, StepperControl(value: '60', onDec: () {}, onInc: () {}));
+ expect(x(tester, '–'), lessThan(x(tester, '6')));
+ expect(x(tester, '6'), lessThan(x(tester, '0')));
+ expect(x(tester, '0'), lessThan(x(tester, '+')));
+ });
+
+ testWidgets('Ltr deja la cifra antes que la unidad', (tester) async {
+ await rtl(
+ tester,
+ const Ltr(
+ child: Row(mainAxisSize: MainAxisSize.min, children: [Text('60'), SizedBox(width: 4), Text('kg')]),
+ ),
+ );
+ expect(x(tester, '60'), lessThan(x(tester, 'kg')));
+ });
+}