diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 04c0c1c..8ae9053 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -572,11 +572,30 @@ "name": "Name", "@name": { "description": "name text field" -} +}, + "aktuell": "currently", + "selberMorgen": "same morning", + "nacht": "last night", + + + "vortag": "day before", + + + "vor23Tagen": "2/3 days ago", + + + "vor46Tagen": "4/6 daps ago", + + + "vor1Woche": "=< 1 week", + + + "letzterNiederschlag": "Last precipitation" + } \ No newline at end of file diff --git a/lib/screens/Excursion/excursion_main.dart b/lib/screens/Excursion/excursion_main.dart index e26d32a..31873a0 100644 --- a/lib/screens/Excursion/excursion_main.dart +++ b/lib/screens/Excursion/excursion_main.dart @@ -1,6 +1,7 @@ import 'package:animations/animations.dart'; import 'package:fforte/screens/Excursion/widgets/bima_nutzer.dart'; import 'package:fforte/screens/Excursion/widgets/hund_u_leine.dart'; +import 'package:fforte/screens/Excursion/widgets/letzter_niederschlag.dart~'; import 'package:fforte/screens/sharedWidgets/datum.dart'; import 'package:fforte/screens/sharedWidgets/var_text_field.dart'; import 'package:flutter/material.dart'; @@ -14,11 +15,7 @@ class ExcursionMain extends StatefulWidget { } class _ExcursionMainState extends State { - // alles TextEditingController - - // TODO: - // - Hund dabei u mit leine u fragen was dieses nein textfeld soll - // - Input vorgabe fuer dauer feld + // all TextEditingController because its easier Map getTextFields() { Map rmap = { @@ -84,6 +81,8 @@ class _ExcursionMainState extends State { return rmap; } + int currentStep = 0; + @override Widget build(BuildContext context) { List getSteps() => [ @@ -206,16 +205,18 @@ class _ExcursionMainState extends State { localization: "Wetter", dbName: "Wetter", required: false), + const SizedBox(height: 10), VarTextField( textController: getTextFields()["Temperat"]!, localization: "Temperatur", dbName: "Temperat", required: false), + const SizedBox(height: 10), + LetzterNiederschlag(controller: getTextFields()["RegenVor"]!), ], )) ]; - int currentStep = 0; return Scaffold( appBar: AppBar( @@ -233,7 +234,7 @@ class _ExcursionMainState extends State { ); }, child: Stepper( - key: ValueKey(currentStep), + key: ValueKey(currentStep), steps: getSteps(), currentStep: currentStep, onStepTapped: (value) { @@ -241,13 +242,16 @@ class _ExcursionMainState extends State { currentStep = value; }); }, - onStepContinue: () async { - final bool isLastStep = currentStep == getSteps().length - 1; + onStepContinue: () { + final isLastStep = currentStep == getSteps().length - 1; if (!isLastStep) { setState(() { currentStep += 1; + print(currentStep); }); + } else { + print("help"); } }, onStepCancel: () { diff --git a/lib/screens/Excursion/widgets/letzter_niederschlag.dart b/lib/screens/Excursion/widgets/letzter_niederschlag.dart new file mode 100644 index 0000000..9f5f98a --- /dev/null +++ b/lib/screens/Excursion/widgets/letzter_niederschlag.dart @@ -0,0 +1,45 @@ +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), + requestFocusOnTap: true, + 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/time.txt b/time.txt index 7d850b1..d879890 100644 --- a/time.txt +++ b/time.txt @@ -66,3 +66,4 @@ 25 dez 1h 27 dez 1h 45min 28 dez 45min +29 dez 1h 45min diff --git a/untranslated.txt b/untranslated.txt index 0962be1..5f6c3ac 100644 --- a/untranslated.txt +++ b/untranslated.txt @@ -1,5 +1,13 @@ { "de": [ - "excursion" + "excursion", + "aktuell", + "selberMorgen", + "nacht", + "vortag", + "vor23Tagen", + "vor46Tagen", + "vor1Woche", + "letzterNiederschlag" ] }