fix #62

pbarbenheim · Jan 8, 2025 · 6fc9375 · 6fc9375
1 parent 3b703db
commit 6fc9375
Show file tree

Hide file tree

Showing 12 changed files with 168 additions and 82 deletions.
diff --git a/l10n.yaml b/l10n.yaml
@@ -0,0 +1,3 @@
+arb-dir: lib/l10n
+template-arb-file: app_de.arb
+output-localization-file: app_localizations.dart
diff --git a/lib/app.dart b/lib/app.dart
@@ -0,0 +1,66 @@
+import 'dart:io';
+import 'dart:ui';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:path/path.dart' as path;
+import 'package:window_size/window_size.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+import 'repository/repository.dart';
+import 'ui/routes.dart';
+
+class JulogApp extends ConsumerStatefulWidget {
+  const JulogApp({super.key});
+
+  @override
+  ConsumerState<ConsumerStatefulWidget> createState() => _JulogAppState();
+}
+
+class _JulogAppState extends ConsumerState<JulogApp> {
+  // ignore: unused_field
+  late final AppLifecycleListener _lifecycleListener;
+
+  @override
+  void initState() {
+    _lifecycleListener = AppLifecycleListener(
+      onDetach: _handleShutdown,
+      onExitRequested: _handleShutdown,
+    );
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final router = ref.watch(routerProvider);
+    final filename =
+        ref.watch(repositoryProvider.select((value) => value?.filename));
+    final file = filename != null ? path.basename(filename) : null;
+    final String title;
+    if (file == null) {
+      title = "julog";
+    } else {
+      title = "$file - julog";
+    }
+    if (Platform.isLinux || Platform.isMacOS || Platform.isLinux) {
+      setWindowTitle(title);
+    }
+    return MaterialApp.router(
+      routerConfig: router,
+      title: title,
+      supportedLocales: const [Locale("de")],
+      localizationsDelegates: const [
+        AppLocalizations.delegate,
+        GlobalMaterialLocalizations.delegate,
+        GlobalWidgetsLocalizations.delegate,
+        GlobalCupertinoLocalizations.delegate,
+      ],
+    );
+  }
+
+  Future<AppExitResponse> _handleShutdown() async {
+    ref.read(repositoryProvider.notifier).dispose();
+    return AppExitResponse.exit;
+  }
+}
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
@@ -0,0 +1,5 @@
+{
+  "@@locale": "de",
+  "itemDetailDetail": "Detail",
+  "itemDetailEmptyHint": "Klicke ein Listenelement links an, um dir die Details anzusehen."
+}
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,15 +1,9 @@
-import 'dart:io';
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:path/path.dart' as path;
-import 'package:window_size/window_size.dart';
 
+import 'app.dart';
 import 'repository/repository.dart';
-import 'ui/routes.dart';
 
 void main(List<String> args) async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -33,56 +27,3 @@ void main(List<String> args) async {
     child: const JulogApp(),
   ));
 }
-
-class JulogApp extends ConsumerStatefulWidget {
-  const JulogApp({super.key});
-
-  @override
-  ConsumerState<ConsumerStatefulWidget> createState() => _JulogAppState();
-}
-
-class _JulogAppState extends ConsumerState<JulogApp> {
-  // ignore: unused_field
-  late final AppLifecycleListener _lifecycleListener;
-
-  @override
-  void initState() {
-    _lifecycleListener = AppLifecycleListener(
-      onDetach: _handleShutdown,
-      onExitRequested: _handleShutdown,
-    );
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final router = ref.watch(routerProvider);
-    final filename =
-        ref.watch(repositoryProvider.select((value) => value?.filename));
-    final file = filename != null ? path.basename(filename) : null;
-    final String title;
-    if (file == null) {
-      title = "julog";
-    } else {
-      title = "$file - julog";
-    }
-    if (Platform.isLinux || Platform.isMacOS || Platform.isLinux) {
-      setWindowTitle(title);
-    }
-    return MaterialApp.router(
-      routerConfig: router,
-      title: title,
-      supportedLocales: const [Locale("de")],
-      localizationsDelegates: const [
-        GlobalMaterialLocalizations.delegate,
-        GlobalWidgetsLocalizations.delegate,
-        GlobalCupertinoLocalizations.delegate,
-      ],
-    );
-  }
-
-  Future<AppExitResponse> _handleShutdown() async {
-    ref.read(repositoryProvider.notifier).dispose();
-    return AppExitResponse.exit;
-  }
-}
diff --git a/lib/ui/frame.dart b/lib/ui/frame.dart
@@ -1,12 +1,25 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:material_symbols_icons/symbols.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 abstract class Item extends StatelessWidget {
   final String title;
-  final String? subtitle;
+  late final String? Function(BuildContext context) getSubtitle;
 
-  const Item({super.key, required this.title, this.subtitle});
+  Item(
+      {super.key,
+      required this.title,
+      String? subtitle,
+      String? Function(BuildContext context)? getSubtitle}) {
+    assert(subtitle == null || getSubtitle == null);
+
+    if (getSubtitle != null) {
+      this.getSubtitle = getSubtitle;
+    } else {
+      this.getSubtitle = (context) => subtitle;
+    }
+  }
 }
 
 class ItemList<T extends Item> extends StatelessWidget {
@@ -26,7 +39,7 @@ class ItemList<T extends Item> extends StatelessWidget {
       children: items
           .map((item) => ListTile(
                 title: Text(item.title),
-                subtitle: Text(item.subtitle ?? ""),
+                subtitle: Text(item.getSubtitle(context) ?? ""),
                 onTap: () => onChanged(item),
                 selected: item == selected,
               ))
@@ -44,13 +57,14 @@ class ItemDetail<T extends Item> extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(item?.title ?? "Details"),
+        title:
+            Text(item?.title ?? AppLocalizations.of(context)!.itemDetailDetail),
         actions: actions,
       ),
       body: Center(
         child: item ??
-            const Text(
-              "Klicke ein Listenelement links an, um dir die Details anzusehen.",
+            Text(
+              AppLocalizations.of(context)!.itemDetailEmptyHint,
             ),
       ),
     );

diff --git a/lib/ui/screens/dashboard.dart b/lib/ui/screens/dashboard.dart
@@ -25,7 +25,7 @@ class DashboardScreen extends ConsumerWidget {
       ),
       body: Center(
         child: Text(
-          "Herzlich Willkommen im Dienstbuch der Jugendfeuerwehr. Die geöffnete Datei ist ${filename ?? "FEHLER"}. Viel Spaß",
+          "Herzlich Willkommen im Dienstbuch der Jugendfeuerwehr. Die geöffnete Datei ist ${filename ?? "FEHLER"}. Viel Spaß\n\nHier: ${Localizations.localeOf(context).languageCode}",
           softWrap: true,
         ),
       ),

diff --git a/lib/ui/widgets/betreuer.dart b/lib/ui/widgets/betreuer.dart
@@ -10,7 +10,7 @@ class BetreuerItem extends Item {
   final String name;
   final int id;
   final Geschlecht geschlecht;
-  const BetreuerItem({
+  BetreuerItem({
     required this.geschlecht,
     super.key,
     required this.name,

diff --git a/lib/ui/widgets/dienstbuch.dart b/lib/ui/widgets/dienstbuch.dart
@@ -1,6 +1,7 @@
 import 'package:dropdown_search/dropdown_search.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:intl/intl.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 
 import '../../repository/repository.dart';
@@ -19,7 +20,13 @@ class EintragItem extends Item {
     required this.beginn,
     required this.thema,
     required this.getEintrag,
-  }) : super(title: thema, subtitle: beginn.toString());
+  }) : super(
+          title: thema,
+          getSubtitle: (context) =>
+              Intl(Localizations.localeOf(context).toLanguageTag())
+                  .date('dd.MM.yy')
+                  .format(beginn),
+        );
 
   @override
   Widget build(BuildContext context) {
@@ -61,14 +68,20 @@ class EintragItem extends Item {
           ),
           Row(
             children: [
-              const Text("Beginn:"),
-              Text(e.beginn.toString()),
+              const Text("Beginn: "),
+              DateTimeValue(
+                dateTime: e.beginn,
+                withTime: true,
+              )
             ],
           ),
           Row(
             children: [
-              const Text("Ende:"),
-              Text(e.ende.toString()),
+              const Text("Ende: "),
+              DateTimeValue(
+                dateTime: e.ende,
+                withTime: true,
+              )
             ],
           ),
           Row(
@@ -128,11 +141,15 @@ class SignaturTile extends StatelessWidget {
   final Signatur signatur;
   const SignaturTile({super.key, required this.signatur});
 
-  Widget _getTile(bool? verified) {
+  Widget _getTile(BuildContext context, bool? verified) {
     final (name, comment, _) = Repository.userIdToComponents(signatur.userId);
     return ListTile(
       title: Text("gez. $name, $comment"),
-      subtitle: Text(signatur.signedAt.toString()),
+      subtitle: DateTimeValue(
+        dateTime: signatur.signedAt,
+        withTime: true,
+        prefix: "am ",
+      ),
       leading: verified == null
           ? const Icon(Icons.question_mark)
           : (verified
@@ -148,9 +165,9 @@ class SignaturTile extends StatelessWidget {
       initialData: null,
       builder: (context, snapshot) {
         if (snapshot.hasData) {
-          return _getTile(snapshot.data!);
+          return _getTile(context, snapshot.data!);
         }
-        return _getTile(null);
+        return _getTile(context, null);
       },
     );
   }

diff --git a/lib/ui/widgets/identities.dart b/lib/ui/widgets/identities.dart
@@ -10,7 +10,7 @@ class SignIdentityItem extends Item {
   final String? comment;
   final String email;
   final String userId;
-  const SignIdentityItem({
+  SignIdentityItem({
     super.key,
     required this.name,
     this.comment,

diff --git a/lib/ui/widgets/jugendliche.dart b/lib/ui/widgets/jugendliche.dart
@@ -11,7 +11,7 @@ class JugendlicheItem extends Item {
   final String name;
   final WidgetRef ref;
 
-  const JugendlicheItem({
+  JugendlicheItem({
     super.key,
     required this.id,
     required this.name,
@@ -29,9 +29,23 @@ class JugendlicheItem extends Item {
         Text("Name: ${ju.name}"),
         Text("Geschlecht: ${ju.geschlecht}"),
         Text("Passnummer: ${ju.passnummer ?? '-'}"),
-        Text("Geburtstag: ${ju.geburtstag}"),
-        Text("Eintrittsdatum: ${ju.eintrittsdatum}"),
-        Text("Austrittsdatum: ${ju.austrittsdatum ?? '-'}"),
+        DateTimeValue(
+          dateTime: ju.geburtstag,
+          withTime: false,
+          prefix: "Geburtstag: ",
+        ),
+        DateTimeValue(
+          dateTime: ju.eintrittsdatum,
+          withTime: false,
+          prefix: "Eintrittsdatum: ",
+        ),
+        ju.austrittsdatum != null
+            ? DateTimeValue(
+                dateTime: ju.austrittsdatum!,
+                withTime: false,
+                prefix: "Austrittsdatum: ",
+              )
+            : const Text("Austrittsdatum: -"),
         Text("Austrittsgrund: ${ju.austrittsgrund ?? '-'}"),
       ],
     );

diff --git a/lib/ui/widgets/util.dart b/lib/ui/widgets/util.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
 import 'package:omni_datetime_picker/omni_datetime_picker.dart';
 
 import '../../pubspec.g.dart';
@@ -107,3 +108,26 @@ class DateTimeField extends StatelessWidget {
     );
   }
 }
+
+class DateTimeValue extends StatelessWidget {
+  final DateTime dateTime;
+  final bool withTime;
+  final String? prefix;
+  final String? suffix;
+  const DateTimeValue({
+    super.key,
+    required this.dateTime,
+    this.withTime = true,
+    this.prefix,
+    this.suffix,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Text((prefix ?? "") +
+        Intl(Localizations.localeOf(context).toLanguageTag())
+            .date(withTime ? "dd.MM.yy HH:mm" : "dd.MM.yy")
+            .format(dateTime) +
+        (suffix ?? ""));
+  }
+}
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -85,6 +85,8 @@ flutter:
   # the material Icons class.
   uses-material-design: true
 
+  generate: true
+
   # To add assets to your application, add an assets section, like this:
   assets:
     - assets/icon/icon.png