From 2b89c0a5b8d68cbff84d4433d3f41b0c3ac4204c Mon Sep 17 00:00:00 2001 From: Nico Date: Mon, 5 May 2025 22:20:17 +0200 Subject: [PATCH] added forgotten localization and removed vim savefiles --- lib/l10n/app_de.arb | 3 +- lib/l10n/app_en.arb | 4 +- lib/screens/Excursion/widgets/anzahlen.dart~ | 0 .../Excursion/widgets/bimaNutzer.dart~ | 0 .../Excursion/widgets/bima_nutzer.dart~ | 107 ------------------ .../Excursion/widgets/hund_u_leine.dart~ | 0 .../widgets/letzter_niederschlag.dart~ | 44 ------- .../widgets/strecke_u_spurbedingungen.dart | 45 +++++--- 8 files changed, 36 insertions(+), 167 deletions(-) delete mode 100644 lib/screens/Excursion/widgets/anzahlen.dart~ delete mode 100644 lib/screens/Excursion/widgets/bimaNutzer.dart~ delete mode 100644 lib/screens/Excursion/widgets/bima_nutzer.dart~ delete mode 100644 lib/screens/Excursion/widgets/hund_u_leine.dart~ delete mode 100644 lib/screens/Excursion/widgets/letzter_niederschlag.dart~ diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb index b1c6db3..0c1958a 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -151,6 +151,7 @@ "sichtung": "Sichtung", "heulen": "Heulen", "sonstiges": "Sonstiges", - "hinweise": "Hinweise" + "hinweise": "Hinweise", + "zurueckgelegteStrecke": "Zurückgelegte Strecke" } diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 3b88015..53b6407 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -642,6 +642,8 @@ "sonstiges": "Sonstiges", - "hinweise": "clues" + "hinweise": "clues", + + "zurueckgelegteStrecke": "Distance traveled" } diff --git a/lib/screens/Excursion/widgets/anzahlen.dart~ b/lib/screens/Excursion/widgets/anzahlen.dart~ deleted file mode 100644 index e69de29..0000000 diff --git a/lib/screens/Excursion/widgets/bimaNutzer.dart~ b/lib/screens/Excursion/widgets/bimaNutzer.dart~ deleted file mode 100644 index e69de29..0000000 diff --git a/lib/screens/Excursion/widgets/bima_nutzer.dart~ b/lib/screens/Excursion/widgets/bima_nutzer.dart~ deleted file mode 100644 index aa14489..0000000 --- a/lib/screens/Excursion/widgets/bima_nutzer.dart~ +++ /dev/null @@ -1,107 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; - -// Bundeswehr -// Gastreitkraefte -// NNE Bund -// Geschaeftsliegenschaft/AGV -// kein - -class Status extends StatefulWidget { - final Function(String) onStatusChanged; - final String initialStatus; - - const Status( - {super.key, required this.onStatusChanged, this.initialStatus = 'Aktiv'}); - - @override - State createState() => _StatusState(); -} - -class _StatusState extends State { - String? _selectedStatus; - - @override - void initState() { - super.initState(); - _selectedStatus = widget.initialStatus; - } - - @override - Widget build(BuildContext context) { - return Column( - children: [ - ListTile( - visualDensity: const VisualDensity(vertical: -4), - title: Text(AppLocalizations.of(context)!.), - leading: Radio( - value: 'Bundeswehr', - groupValue: _selectedStatus, - onChanged: (value) { - setState(() { - _selectedStatus = value; - widget.onStatusChanged(value!); - }); - }, - ), - ), - ListTile( - visualDensity: const VisualDensity(vertical: -4), - title: Text(AppLocalizations.of(context)!.gesamtstreitkraefte), - leading: Radio( - value: 'Gaststreitkraefte', - groupValue: _selectedStatus, - onChanged: (value) { - setState(() { - _selectedStatus = value; - widget.onStatusChanged(value!); - }); - }, - ), - ), - ListTile( - visualDensity: const VisualDensity(vertical: -4), - title: Text(AppLocalizations.of(context)!.), - leading: Radio( - value: 'NNE-Bund', - groupValue: _selectedStatus, - onChanged: (value) { - setState(() { - _selectedStatus = value; - widget.onStatusChanged(value!); - }); - }, - ), - ), - ListTile( - visualDensity: const VisualDensity(vertical: -4), - title: Text(AppLocalizations.of(context)!.), - leading: Radio( - value: 'Geschaeftsliegenschaft/AGV', - groupValue: _selectedStatus, - onChanged: (value) { - setState(() { - _selectedStatus = value; - widget.onStatusChanged(value!); - }); - }, - ), - ), - ListTile( - visualDensity: const VisualDensity(vertical: -4), - title: Text(AppLocalizations.of(context)!.), - leading: Radio( - value: 'kein', - groupValue: _selectedStatus, - onChanged: (value) { - setState(() { - _selectedStatus = value; - widget.onStatusChanged(value!); - }); - }, - ), - ), - ], - ); - } -} diff --git a/lib/screens/Excursion/widgets/hund_u_leine.dart~ b/lib/screens/Excursion/widgets/hund_u_leine.dart~ deleted file mode 100644 index e69de29..0000000 diff --git a/lib/screens/Excursion/widgets/letzter_niederschlag.dart~ b/lib/screens/Excursion/widgets/letzter_niederschlag.dart~ deleted file mode 100644 index a8c93e6..0000000 --- a/lib/screens/Excursion/widgets/letzter_niederschlag.dart~ +++ /dev/null @@ -1,44 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; - -class LetzterNiederschlag extends StatefulWidget { - final TextEditingController controller; - - const LetzterNiederschlag({super.key, required this.controller}); - - @override - LetzterNiederschlagState createState() => LetzterNiederschlagState(); -} - -class LetzterNiederschlagState extends State { - @override - Widget build(BuildContext context) { - return DropdownMenu( - controller: widget.controller, - label: Text(AppLocalizations.of(context)!.letzterNiederschlag), - dropdownMenuEntries: [ - DropdownMenuEntry( - value: "aktuell", - label: AppLocalizations.of(context)!.aktuell), - DropdownMenuEntry( - value: "selberMorgen", - label: AppLocalizations.of(context)!.selberMorgen), - DropdownMenuEntry( - value: "nacht", - label: AppLocalizations.of(context)!.nacht), - DropdownMenuEntry( - value: "vortag", - label: AppLocalizations.of(context)!.vortag), - DropdownMenuEntry( - value: "vor23Tagen", - label: AppLocalizations.of(context)!.vor23Tagen), - DropdownMenuEntry( - value: "vor46Tagen", - label: AppLocalizations.of(context)!.vor46Tagen), - DropdownMenuEntry( - value: "vor1Woche", - label: AppLocalizations.of(context)!.vor1Woche) - ], - ); - } -} diff --git a/lib/screens/Excursion/widgets/strecke_u_spurbedingungen.dart b/lib/screens/Excursion/widgets/strecke_u_spurbedingungen.dart index 21b6f55..70566c7 100644 --- a/lib/screens/Excursion/widgets/strecke_u_spurbedingungen.dart +++ b/lib/screens/Excursion/widgets/strecke_u_spurbedingungen.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; - // TODO FINISH!! class StreckeUSpurbedingungen extends StatefulWidget { @@ -12,8 +11,8 @@ class StreckeUSpurbedingungen extends StatefulWidget { final TextEditingController spMittelController; final TextEditingController spSchlechtController; - const StreckeUSpurbedingungen({ - required this.kmAutoController, + const StreckeUSpurbedingungen( + {required this.kmAutoController, required this.kmFussController, required this.kmRadController, required this.spGutController, @@ -33,14 +32,17 @@ class StreckeUSpurbedingungenState extends State { Align( alignment: Alignment.bottomLeft, child: Text( - "Zurueckgelegte Strecke (km)", - style: - Theme.of(context).textTheme.titleMedium, + AppLocalizations.of(context)!.zurueckgelegteStrecke, + style: Theme.of(context).textTheme.titleMedium, )), Row( children: [ Expanded(child: Text(AppLocalizations.of(context)!.auto)), - Expanded(child: TextField(keyboardType: TextInputType.number, controller: widget.kmAutoController,)), + Expanded( + child: TextField( + keyboardType: TextInputType.number, + controller: widget.kmAutoController, + )), Expanded(child: Center(child: Text("="))), Expanded(child: Center(child: Text(""))), Expanded(child: Center(child: Text("%"))), @@ -49,7 +51,10 @@ class StreckeUSpurbedingungenState extends State { Row( children: [ Expanded(child: Text(AppLocalizations.of(context)!.zuFuss)), - Expanded(child: TextField(keyboardType: TextInputType.number, controller: widget.kmFussController)), + Expanded( + child: TextField( + keyboardType: TextInputType.number, + controller: widget.kmFussController)), Expanded(child: Center(child: Text("="))), Expanded(child: Center(child: Text(""))), Expanded(child: Center(child: Text("%"))), @@ -58,7 +63,10 @@ class StreckeUSpurbedingungenState extends State { Row( children: [ Expanded(child: Text(AppLocalizations.of(context)!.fahrrad)), - Expanded(child: TextField(keyboardType: TextInputType.number, controller: widget.kmRadController)), + Expanded( + child: TextField( + keyboardType: TextInputType.number, + controller: widget.kmRadController)), Expanded(child: Center(child: Text("="))), Expanded(child: Center(child: Text(""))), Expanded(child: Center(child: Text("%"))), @@ -89,14 +97,16 @@ class StreckeUSpurbedingungenState extends State { alignment: Alignment.bottomLeft, child: Text( AppLocalizations.of(context)!.spurbedingungen, - style: - Theme.of(context).textTheme.titleMedium, + style: Theme.of(context).textTheme.titleMedium, ), ), Row( children: [ Expanded(child: Text(AppLocalizations.of(context)!.gut)), - Expanded(child: TextField(keyboardType: TextInputType.number, controller: widget.spGutController)), + Expanded( + child: TextField( + keyboardType: TextInputType.number, + controller: widget.spGutController)), Expanded(child: Center(child: Text("="))), Expanded(child: Center(child: Text(""))), Expanded(child: Center(child: Text("%"))), @@ -105,7 +115,10 @@ class StreckeUSpurbedingungenState extends State { Row( children: [ Expanded(child: Text(AppLocalizations.of(context)!.mittel)), - Expanded(child: TextField(keyboardType: TextInputType.number, controller: widget.spMittelController)), + Expanded( + child: TextField( + keyboardType: TextInputType.number, + controller: widget.spMittelController)), Expanded(child: Center(child: Text("="))), Expanded(child: Center(child: Text(""))), Expanded(child: Center(child: Text("%"))), @@ -114,7 +127,11 @@ class StreckeUSpurbedingungenState extends State { Row( children: [ Expanded(child: Text(AppLocalizations.of(context)!.schlecht)), - Expanded(child: TextField(keyboardType: TextInputType.number, controller: widget.spSchlechtController,)), + Expanded( + child: TextField( + keyboardType: TextInputType.number, + controller: widget.spSchlechtController, + )), Expanded(child: Center(child: Text("="))), Expanded(child: Center(child: Text(""))), Expanded(child: Center(child: Text("%"))),