diff --git a/lib/#main.dart# b/lib/#main.dart# index 66fbc74..0c3b620 100644 --- a/lib/#main.dart# +++ b/lib/#main.dart# @@ -5,17 +5,13 @@ import 'package:fforte/screens/settings.dart'; import 'package:fforte/screens/viewCam/view_cams.dart'; import 'package:flutter/material.dart'; import 'package:flex_color_scheme/flex_color_scheme.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +mport 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'home.dart'; import 'l10n/l10n.dart'; -/* void main() async { - runApp(const MyApp()); -} */ - void main() async { WidgetsFlutterBinding.ensureInitialized(); SharedPreferences prefs = await SharedPreferences.getInstance(); diff --git a/lib/main.dart b/lib/main.dart index 66fbc74..4277bd9 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -12,10 +12,6 @@ import 'package:shared_preferences/shared_preferences.dart'; import 'home.dart'; import 'l10n/l10n.dart'; -/* void main() async { - runApp(const MyApp()); -} */ - void main() async { WidgetsFlutterBinding.ensureInitialized(); SharedPreferences prefs = await SharedPreferences.getInstance(); diff --git a/lib/screens/Excursion/excursion_main.dart b/lib/screens/Excursion/excursion_main.dart index 1fde48e..aa2db5b 100644 --- a/lib/screens/Excursion/excursion_main.dart +++ b/lib/screens/Excursion/excursion_main.dart @@ -2,6 +2,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/Excursion/widgets/strecke_u_spurbedingungen.dart'; import 'package:fforte/screens/sharedWidgets/datum.dart'; import 'package:fforte/screens/sharedWidgets/var_text_field.dart'; import 'package:flutter/material.dart'; @@ -213,6 +214,10 @@ class _ExcursionMainState extends State { required: false), const SizedBox(height: 10), LetzterNiederschlag(controller: getTextFields()["RegenVor"]!), + const SizedBox(height: 20), + StreckeUSpurbedingungen(), + + ], )) ]; diff --git a/lib/screens/Excursion/widgets/strecke_u_spurbedingungen.dart b/lib/screens/Excursion/widgets/strecke_u_spurbedingungen.dart new file mode 100644 index 0000000..cef59c5 --- /dev/null +++ b/lib/screens/Excursion/widgets/strecke_u_spurbedingungen.dart @@ -0,0 +1,93 @@ +import 'package:flutter/material.dart'; + +class StreckeUSpurbedingungen extends StatefulWidget { + const StreckeUSpurbedingungen({super.key}); + + @override + StreckeUSpurbedingungenState createState() => StreckeUSpurbedingungenState(); +} + +class StreckeUSpurbedingungenState extends State { + @override + Widget build(BuildContext context) { + return Column( + children: [ + Align( + alignment: Alignment.bottomLeft, + child: Text("Zurueckgelegte Strecke (km)", + style: TextStyle(fontSize: 16, decoration: TextDecoration.underline), + )), + Row( + children: [ + Expanded(child: Text("Auto")), + Expanded(child: TextField()), + Expanded(child: Center(child: Text("="))), + Expanded(child: Center(child: Text(""))), + Expanded(child: Center(child: Text("%"))), + ], + ), + Row( + children: [ + Expanded(child: Text("zu Fuss")), + Expanded(child: TextField()), + Expanded(child: Center(child: Text("="))), + Expanded(child: Center(child: Text(""))), + Expanded(child: Center(child: Text("%"))), + ], + ), + Row( + children: [ + Expanded(child: Text("Rad")), + Expanded(child: TextField()), + Expanded(child: Center(child: Text("="))), + Expanded(child: Center(child: Text(""))), + Expanded(child: Center(child: Text("%"))), + ], + ), + const SizedBox(height: 20,), + Row( + children: [ + Expanded(flex: 1,child: Text("Gesamt:"),), + Expanded(flex: 3,child: Align(alignment: Alignment.bottomLeft, child: Text("data"),),) + + ], + ), + + const SizedBox(height: 20,), + Align( + alignment: Alignment.bottomLeft, + child: Text("Spurbedingungen (km)", + style: TextStyle(fontSize: 16, decoration: TextDecoration.underline), + ), + ), + Row( + children: [ + Expanded(child: Text("Gut")), + Expanded(child: TextField()), + Expanded(child: Center(child: Text("="))), + Expanded(child: Center(child: Text(""))), + Expanded(child: Center(child: Text("%"))), + ], + ), + Row( + children: [ + Expanded(child: Text("Mittel")), + Expanded(child: TextField()), + Expanded(child: Center(child: Text("="))), + Expanded(child: Center(child: Text(""))), + Expanded(child: Center(child: Text("%"))), + ], + ), + Row( + children: [ + Expanded(child: Text("Schlecht")), + Expanded(child: TextField()), + Expanded(child: Center(child: Text("="))), + Expanded(child: Center(child: Text(""))), + Expanded(child: Center(child: Text("%"))), + ], + ), + ], + ); + } +} diff --git a/lib/screens/Excursion/widgets/strecke_u_spurbedingungen.dart~ b/lib/screens/Excursion/widgets/strecke_u_spurbedingungen.dart~ new file mode 100644 index 0000000..67446b3 --- /dev/null +++ b/lib/screens/Excursion/widgets/strecke_u_spurbedingungen.dart~ @@ -0,0 +1,31 @@ +import 'package:flutter/material.dart'; + +class StreckeUSpurbedingungen extends StatefulWidget { + const StreckeUSpurbedingungen({super.key}); + + @override + StreckeUSpurbedingungenState createState() => StreckeUSpurbedingungenState(); +} + +class StreckeUSpurbedingungenState extends State { + @override + Widget build(BuildContext context) { + return Column( + children: [ + Text("Zurueckgelegte Strecke (km)"), + Row( + children: [ + Text("Auto"), + TextField(), + ], + ), + Row( + children: [ + Text("Auto"), + TextField(), + ], + ), + ], + ); + } +} diff --git a/pubspec.lock b/pubspec.lock index acd7441..7d66de4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -45,10 +45,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" cross_file: dependency: transitive description: @@ -345,18 +345,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: @@ -569,7 +569,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: @@ -630,10 +630,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" stream_channel: dependency: transitive description: @@ -646,10 +646,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" synchronized: dependency: transitive description: @@ -670,10 +670,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.3" typed_data: dependency: transitive description: @@ -710,10 +710,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.3.0" web: dependency: transitive description: