From 4eca4557fde6f49172dc00d57f579c85d9bba5a4 Mon Sep 17 00:00:00 2001 From: Nico Date: Sun, 24 Mar 2024 15:46:11 +0100 Subject: [PATCH] renamed steps --- Todo.txt | 7 +++---- lib/addCam/add_cam_main.dart | 14 +++++++------ lib/addCam/cam_widgets.dart | 3 +-- lib/l10n/app_de.arb | 12 ++++++----- lib/l10n/app_en.arb | 39 ++++++++++++++++++++++-------------- lib/viewCam/view_cams.dart | 2 +- untranslated.txt | 6 +----- 7 files changed, 45 insertions(+), 38 deletions(-) diff --git a/Todo.txt b/Todo.txt index 3d4bcd5..41f9a78 100644 --- a/Todo.txt +++ b/Todo.txt @@ -1,14 +1,11 @@ todo: maybe auch vorschläge aus templates in dropdown menüs anzeigen im englischen abändern -gespeicherten ordner anzeigen zurückfeld in datenansicht überschriften für view cams -dropdown menü fixen +dropdown menü fixen (ai fragen) fehler beim speichern anzeigen nach koordinaten lkr auswählen (esri-leaflet-geocoder) -dropdown button in add_cam_main fixen -schritte latlang umbenennen fix ktage und nebeneinander positioniere textdateien auch an server senden ausvon und ausbis fixen (falsches datum übergeben (20000-01-01)) @@ -19,6 +16,8 @@ eintrg in db wenn http response (in sent column) not to do: +schritte latlang umbenennen +gespeicherten ordner anzeigen Überall absätze machen und textfeld größer wenn langer text beim nächsten schritt als template add primary ke diff --git a/lib/addCam/add_cam_main.dart b/lib/addCam/add_cam_main.dart index e2d530e..67c1586 100644 --- a/lib/addCam/add_cam_main.dart +++ b/lib/addCam/add_cam_main.dart @@ -405,8 +405,9 @@ class _AddCamMainState extends State { Widget build(BuildContext context) { // List with the steps. The steps itself will be "shown" later List getSteps() => [ + // First step Step( - title: Text(AppLocalizations.of(context)!.firstStep), + title: Text(AppLocalizations.of(context)!.firststep), content: Column( children: [ Align( @@ -509,9 +510,9 @@ class _AddCamMainState extends State { ], )), - // Second step (location) + // Second step Step( - title: Text(AppLocalizations.of(context)!.locations), + title: Text(AppLocalizations.of(context)!.secondstep), content: Column( children: [ Align( @@ -595,9 +596,9 @@ class _AddCamMainState extends State { ), ], )), - // Date Step + // Third step Step( - title: Text(AppLocalizations.of(context)!.date), + title: Text(AppLocalizations.of(context)!.thirdstep), content: Column( children: [ Datum( @@ -656,8 +657,9 @@ class _AddCamMainState extends State { ), ], )), + // Fourth step Step( - title: Text(AppLocalizations.of(context)!.kontakt), + title: Text(AppLocalizations.of(context)!.fourthstep), content: Column( children: [ const SizedBox( diff --git a/lib/addCam/cam_widgets.dart b/lib/addCam/cam_widgets.dart index a7e1feb..e2ba9aa 100644 --- a/lib/addCam/cam_widgets.dart +++ b/lib/addCam/cam_widgets.dart @@ -1,7 +1,6 @@ // ignore_for_file: non_constant_identifier_names import 'package:fforte/db_helper.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:geolocator/geolocator.dart'; @@ -234,7 +233,7 @@ class Karte extends StatefulWidget { } class KarteState extends State { - List markers = [Marker(point: LatLng(0, 0), child: Icon(Icons.location_on))]; + List markers = [const Marker(point: LatLng(0, 0), child: Icon(Icons.location_on))]; LatLng? selectedPosition; Position? updatedPosition; bool saveVisible = false; diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb index c322b32..3b7fef4 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -6,12 +6,12 @@ "deleteEverything": "Alles löschen?", "deleteEverythingContent": "Alle Standorte werden lokal gelöscht!", "camLink": "ID der Kamera", - "secondStep": "DATUM, KONTAKT, ORT", - "date": "DATUM, AUFBAU, KONTROLLE", - "kontakt": "KONTAKT, ANSPRECHPARTNER", + "firststep": "ORT, KAMERA, TERRETORIUM", + "secondstep": "ORT, UMGEBUNG", + "thirdstep": "DATUM, AUFBAU, KONTROLLE", + "fourthstep": "KONTAKT, ANSPRECHPARTNER", "status": "Status", "viewplacesappbar": "Standorte ansehen", - "locations": "ORT, UMGEBUNG", "rudel": "Territorium", "adresse1": "Adresse 1", "adresse2": "Adresse 2", @@ -82,5 +82,7 @@ "apiaddress": "Api-Adresse", "benutzername": "Benutzername", "filelocation": "Ort der zuletzt gespeicherten Datei:", - "open": "öffnen" + "open": "öffnen", + "date": "Datum", + "location": "Standort" } \ No newline at end of file diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 8db0779..d0ac05c 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -27,15 +27,26 @@ "@camLink": { "description": "Camera link textfield" }, - "firstStep": "PLACE, CAMERA, TERRITORY", + + "firststep": "PLACE, CAMERA, TERRITORY", "@firstStep": { "description": "title first step" }, + + "secondstep": "Place, neighbouhood", + "@secondstep": { + "description": "second step header" + }, - "date": "Installation and control date ", - "@date": { + "thirdstep": "Installation and control date ", + "@thirdstep": { "description": "date step" }, + + "fourthstep": "Contact", + "@fourthstep": { + "description": "contact header" + }, "settings": "Settings", "@settings": { @@ -47,18 +58,10 @@ "description": "Change name and state header" }, - "secondStep": "Date, Contact", - "@secondStep": { - "description": "title second step" - }, "viewplacesappbar": "View Places", "@viewplacesappbar": { "description": "view places appbar" }, - "locations": "Place, neighbouhood", - "@locations": { - "description": "Location textfield" - }, "rudel": "Pack", "@rudel": { "description": "Rudel textfield" @@ -202,10 +205,6 @@ "description": "summertime header" }, - "kontakt": "Contact", - "@kontakt": { - "description": "contact header" - }, "auftrag": "Order", "@auftrag": { @@ -398,6 +397,16 @@ "open": "Open", "@open": { "description": "open button" + }, + + "date": "Date", + "@date": { + "description": "date text" + }, + + "location": "Location", + "@location": { + "description": "Location text" } } \ No newline at end of file diff --git a/lib/viewCam/view_cams.dart b/lib/viewCam/view_cams.dart index 0520c34..709344e 100644 --- a/lib/viewCam/view_cams.dart +++ b/lib/viewCam/view_cams.dart @@ -199,7 +199,7 @@ class _ViewCamsState extends State { Text( '${AppLocalizations.of(context)!.betreuung}: ${place['Betreuung']}'), Text( - '${AppLocalizations.of(context)!.locations}: ${place['Standort']}'), + '${AppLocalizations.of(context)!.location}: ${place['Standort']}'), Text( '${AppLocalizations.of(context)!.adresse3}: ${place['Adresse3']}'), Text( diff --git a/untranslated.txt b/untranslated.txt index 1ebadea..9e26dfe 100644 --- a/untranslated.txt +++ b/untranslated.txt @@ -1,5 +1 @@ -{ - "de": [ - "firstStep" - ] -} +{} \ No newline at end of file