Skip to content

Fix language selection #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LeaMarieKindermann merged 3 commits into from
Oct 24, 2026
Merged

Fix language selection #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ce366c
refactor: adjusted language translations
LeaMarieKindermann Oct 24, 2026
82c89e1
feat: added history_screen translations
LeaMarieKindermann Oct 24, 2026
54580fb
refactor: adjusted tests and removed double entires is arb files
LeaMarieKindermann Oct 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/lib/app/app.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,21 @@ import 'router.dart';
import '../features/walk/presentation/walk_session_lifecycle.dart';

class SixMinuteWalkApp extends StatelessWidget {
const SixMinuteWalkApp({super.key});
const SixMinuteWalkApp({super.key, this.locale});

final Locale? locale;

@override
Widget build(BuildContext context) {
return MaterialApp.router(
title: kDebugMode ? '6MWT Debug' : '6MWT',
locale: locale,

theme: ThemeData(useMaterial3: true, colorSchemeSeed: Colors.blue),

supportedLocales: const [Locale('de'), Locale('en')],

// Rest deiner bisherigen Konfiguration bleibt unverändert
localizationsDelegates: const [
AppLocalizations.delegate,
GlobalMaterialLocalizations.delegate,
Expand Down
14 changes: 9 additions & 5 deletions app/lib/features/history/history_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ import 'package:go_router/go_router.dart';
import 'package:six_minute_walk_test/core/data/providers.dart';
import 'package:six_minute_walk_test/core/presentation/session_export_service.dart';
import 'package:six_minute_walk_test/features/walk/domain/fitness_assessment.dart';
import 'package:six_minute_walk_test/l10n/app_localizations.dart';

class HistoryScreen extends ConsumerWidget {
const HistoryScreen({super.key});

@override
Widget build(BuildContext context, WidgetRef ref) {
final l10n = AppLocalizations.of(context)!;
final walkSessions = ref.watch(walkSessionsWithProfilesProvider);

return Scaffold(
Expand All @@ -33,7 +35,7 @@ class HistoryScreen extends ConsumerWidget {
color: Colors.black87,
),
),
const Text('History'),
Text(l10n.historyTitle),
],
),
actions: [
Expand All @@ -50,7 +52,7 @@ class HistoryScreen extends ConsumerWidget {
body: walkSessions.when(
data: (sessions) {
if (sessions.isEmpty) {
return const Center(child: Text('Keine Einträge vorhanden'));
return Center(child: Text(l10n.historyNoEntries));
}

return ListView.builder(
Expand Down Expand Up @@ -80,7 +82,7 @@ class HistoryScreen extends ConsumerWidget {
Expanded(child: Text(profile.name.toString())),
if (assessment != null)
Text(
"${assessment.percentOfExpected.toStringAsFixed(0)} % fit",
"${assessment.percentOfExpected.toStringAsFixed(0)} % ${l10n.historyFit}",
),
],
),
Expand Down Expand Up @@ -127,10 +129,12 @@ extension RelativeDateTimeExtension on DateTime {
); // z.B. 14:50 (de) oder 2:50 PM (en)
final timeString = timeFormat.format(local);

final l10n = AppLocalizations.of(context)!;

if (dateToCompare == today) {
return 'Heute, $timeString';
return '${l10n.historyToday}, $timeString';
} else if (dateToCompare == yesterday) {
return 'Gestern, $timeString';
return '${l10n.historyYesterday}, $timeString';
} else if (dateToCompare.year == now.year) {
// z. B. "12. Mai, 14:50"
return DateFormat('d. MMM, ', locale).format(local) + timeString;
Expand Down
100 changes: 49 additions & 51 deletions app/lib/features/walk/presentation/result_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,11 +284,10 @@ class ResultScreen extends ConsumerWidget {
: DistanceConfidence(storedConfidence);

double? percentage;
String category = 'No assessment';
String category = l10n.resultNoAssessment;
// A session still marked as running after the app restarted was
// interrupted as well, e.g. by a crash.
var explanation =
'No assessment is possible because the test was stopped early.';
var explanation = l10n.resultEarlyStopExplanation;

if (session.phase == WalkPhase.finished) {
final assessment = assessFitness(
Expand All @@ -302,9 +301,7 @@ class ResultScreen extends ConsumerWidget {

percentage = assessment.percentOfExpected;
category = assessment.category.name;
explanation =
'Your performance is based on your '
'age, height and walking distance.';
explanation = l10n.resultPerformanceExplanation;
}

return Scaffold(
Expand Down Expand Up @@ -349,10 +346,10 @@ class ResultScreen extends ConsumerWidget {

const SizedBox(width: 18),

const Expanded(
Expanded(
child: Text(
'Test Results',
style: TextStyle(
l10n.resultTitle,
style: const TextStyle(
fontSize: 30,
fontWeight: FontWeight.w400,
color: Colors.black,
Expand All @@ -373,10 +370,9 @@ class ResultScreen extends ConsumerWidget {

const SizedBox(height: 18),

const Text(
'Here are your results from the\n'
'6-minute walk test.',
style: TextStyle(
Text(
l10n.resultIntro,
style: const TextStyle(
fontSize: 15,
height: 1.3,
color: Colors.black87,
Expand All @@ -394,9 +390,9 @@ class ResultScreen extends ConsumerWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const Text(
'Performance',
style: TextStyle(
Text(
l10n.resultPerformance,
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.w700,
),
Expand All @@ -414,10 +410,13 @@ class ResultScreen extends ConsumerWidget {
),
),

const Text(
'of expected distance',
Text(
l10n.resultExpectedDistance,
textAlign: TextAlign.center,
style: TextStyle(fontSize: 15, color: Colors.black54),
style: const TextStyle(
fontSize: 15,
color: Colors.black54,
),
),

const SizedBox(height: 22),
Expand Down Expand Up @@ -468,69 +467,69 @@ class ResultScreen extends ConsumerWidget {
const SizedBox(height: 14),

_buildDetailsCard(
title: 'Test Details',
title: l10n.resultTestDetails,
children: [
_buildDetailRow(
icon: Icons.swap_horiz_rounded,
label: 'Distance walked',
label: l10n.resultDistanceWalked,
value: '${session.distance.toStringAsFixed(1)} m',
),

_buildDetailRow(
icon: Icons.verified_outlined,
label: 'Distance confidence',
label: l10n.resultDistanceConfidence,
value: formatConfidence(confidence),
valueColor: confidenceColor(confidence),
),

_buildDetailRow(
icon: Icons.access_time_rounded,
label: 'Test duration',
label: l10n.resultTestDuration,
value: durationText,
),

_buildDetailRow(
icon: Icons.flag_rounded,
label: 'Test status',
label: l10n.resultTestStatus,
value: session.phase == WalkPhase.aborted
? 'Stopped early'
: 'Completed',
? l10n.resultStoppedEarly
: l10n.resultCompleted,
showDivider: false,
),
],
),

const SizedBox(height: 14),
_buildDetailsCard(
title: 'Your Profile',
title: l10n.resultYourProfile,
children: [
_buildDetailRow(
icon: Icons.person_outline_rounded,
label: 'Name',
label: l10n.resultName,
value: profile.name ?? '—',
),

_buildDetailRow(
icon: Icons.cake_outlined,
label: 'Age',
value: '${profile.age} years',
label: l10n.resultAge,
value: l10n.resultAgeYears(profile.age),
),

_buildDetailRow(
icon: Icons.height_rounded,
label: 'Height',
value: '${profile.height} cm',
label: l10n.resultHeight,
value: l10n.resultHeightCm(profile.height),
),

_buildDetailRow(
icon: Icons.monitor_weight_outlined,
label: 'Weight',
value: '$weightText kg',
label: l10n.resultWeight,
value: l10n.resultWeightKg(weightText),
),

_buildDetailRow(
icon: Icons.person_outline_rounded,
label: 'Gender',
label: l10n.resultGender,
value: genderLabel,
showDivider: false,
),
Expand All @@ -555,32 +554,32 @@ class ResultScreen extends ConsumerWidget {
border: Border.all(color: Colors.grey.shade300),
borderRadius: BorderRadius.circular(16),
),
child: const Column(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Text(
'Distance comparison',
style: TextStyle(
l10n.resultDistanceComparison,
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.w700,
),
),
SizedBox(height: 16),
const SizedBox(height: 16),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SizedBox(
const SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(
strokeWidth: 2.5,
color: primaryBlue,
),
),
SizedBox(width: 14),
const SizedBox(width: 14),
Text(
'Calculating distance comparisons...',
style: TextStyle(
l10n.resultCalculatingDistanceComparisons,
style: const TextStyle(
fontSize: 14,
color: Colors.black54,
),
Expand Down Expand Up @@ -611,9 +610,9 @@ class ResultScreen extends ConsumerWidget {
size: 22,
),
const SizedBox(width: 8),
const Text(
'Distance comparison',
style: TextStyle(
Text(
l10n.resultDistanceComparison,
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.w700,
),
Expand All @@ -622,7 +621,7 @@ class ResultScreen extends ConsumerWidget {
),
const SizedBox(height: 10),
Text(
'Could not calculate distance comparisons.',
l10n.resultDistanceComparisonFailed,
style: TextStyle(
fontSize: 14,
color: Colors.red.shade900,
Expand All @@ -634,11 +633,10 @@ class ResultScreen extends ConsumerWidget {
),
),

const Text(
'The result provides an orientation based on '
'your recorded walking distance and personal data.',
Text(
l10n.resultDisclaimer,
textAlign: TextAlign.center,
style: TextStyle(
style: const TextStyle(
fontSize: 12,
height: 1.35,
color: Colors.black54,
Expand Down
Loading
Loading