From 9261abfc578add12962325faee6378e7b88c0dd5 Mon Sep 17 00:00:00 2001
From: Nico <nicovessen@gmail.com>
Date: Wed, 4 Jun 2025 20:59:50 +0200
Subject: [PATCH] Update AndroidManifest to include foreground service
 permissions and implement tracking service in excursion screens. Refactor
 tracking logic to utilize TrackingService for better state management and
 streamline position updates.

---
 android/app/src/main/AndroidManifest.xml    |  15 +-
 assets/icons/tracking_off.png               | Bin 0 -> 5185 bytes
 assets/icons/tracking_on.png                | Bin 0 -> 6536 bytes
 lib/screens/excursion/excursion_main.dart   | 510 ++++++++++----------
 lib/screens/excursion/widgets/tracking.dart | 173 ++-----
 lib/services/tracking_service.dart          |  83 ++++
 6 files changed, 404 insertions(+), 377 deletions(-)
 create mode 100644 assets/icons/tracking_off.png
 create mode 100644 assets/icons/tracking_on.png
 create mode 100644 lib/services/tracking_service.dart

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 8d2c0fd..fa4e753 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
   <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
   <uses-permission android:name="android.permission.INTERNET"/>
-  <!-- <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> -->
-  <!-- <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" /> -->
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
     <application
         android:label="LUPUS"
         android:name="${applicationName}"
@@ -37,11 +37,12 @@
             android:name="flutterEmbedding"
           android:value="2" />
 
-    <!-- <service -->
-    <!--     android:name="com.dexterous.flutterlocalnotifications.ForegroundService" -->
-    <!--     android:exported="false" -->
-    <!--     android:stopWithTask="false" -->
-    <!--     android:foregroundServiceType="<location>"> -->
+        <service
+            android:name=".TrackingService"
+            android:exported="false"
+            android:stopWithTask="false"
+            android:foregroundServiceType="location">
+        </service>
 
     </application>
     <!-- Required to query activities that can process text, see:
diff --git a/assets/icons/tracking_off.png b/assets/icons/tracking_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae66960e8cb1853c7c8d8da7ed59c4b00ebb78fe
GIT binary patch
literal 5185
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

literal 0
HcmV?d00001

diff --git a/assets/icons/tracking_on.png b/assets/icons/tracking_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d068c29b6479ffdaf920c283e6ce0ce094ba669
GIT binary patch
literal 6536
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

literal 0
HcmV?d00001

diff --git a/lib/screens/excursion/excursion_main.dart b/lib/screens/excursion/excursion_main.dart
index bcfad61..5d07111 100644
--- a/lib/screens/excursion/excursion_main.dart
+++ b/lib/screens/excursion/excursion_main.dart
@@ -19,6 +19,7 @@ import 'package:fforte/screens/sharedMethods/save_template.dart';
 import 'package:fforte/screens/sharedWidgets/datum.dart';
 import 'package:fforte/screens/sharedWidgets/var_text_field.dart';
 import 'package:fforte/l10n/app_localizations.dart';
+import 'package:fforte/services/tracking_service.dart';
 import 'package:flutter/material.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -147,7 +148,6 @@ class _ExcursionMainState extends State<ExcursionMain> {
       return currentPosition;
     });
 
-
     if (widget.existingData?.isNotEmpty ?? false) {
       for (var key in widget.existingData!.keys) {
         rmap[key]!["controller"]!.text =
@@ -188,268 +188,288 @@ class _ExcursionMainState extends State<ExcursionMain> {
   @override
   Widget build(BuildContext context) {
     List<Step> getSteps() => [
-      Step(
-        title: Text(AppLocalizations.of(context)!.dateandtime),
-        content: Column(
-          children: [
-            // ---------- Date
-            Datum(
-              initDatum: DateTime.now(),
-              onDateChanged: (date) {
-                rmap["Datum"]!["controller"]!.text = date.toString();
-              },
-              name: AppLocalizations.of(context)!.date,
-            ),
-            const SizedBox(height: 10),
-            // ---------- Pack
-            VarTextField(
-              textController: rmap["Rudel"]!["controller"]!,
-              localization: AppLocalizations.of(context)!.rudel,
-              dbName: "Rudel",
-              required: false,
-              dbDesignation: DatabasesEnum.excursion,
-            ),
-            const SizedBox(height: 10),
-            // ---------- Participants
-            VarTextField(
-              textController: rmap["Teilnehmer"]!["controller"]!,
-              localization: AppLocalizations.of(context)!.teilnehmer,
-              dbName: "Teilnehmer",
-              required: false,
-              dbDesignation: DatabasesEnum.excursion,
-            ),
-            const SizedBox(height: 10),
-            // ---------- Duration
-            VarTextField(
-              textController: rmap["Dauer"]!["controller"]!,
-              localization: AppLocalizations.of(context)!.dauer,
-              dbName: "Dauer",
-              required: false,
-              dbDesignation: DatabasesEnum.excursion,
-            ),
-            const SizedBox(height: 20),
-            // ---------- Dog(leash)
-            HundULeine(
-              mHund: rmap["MHund"]!["controller"]!,
-              mLeine: rmap["MLeine"]!["controller"]!,
-            ),
-            const SizedBox(height: 10),
-            // ---------- State
-            VarTextField(
-              textController: rmap["BLand"]!["controller"]!,
-              localization: AppLocalizations.of(context)!.bland,
-              dbName: "BLand",
-              required: false,
-              dbDesignation: DatabasesEnum.excursion,
-            ),
-            const SizedBox(height: 10),
-            // ---------- Country
-            VarTextField(
-              textController: rmap["Lkr"]!["controller"]!,
-              localization: AppLocalizations.of(context)!.lkr,
-              dbName: "Lkr",
-              required: false,
-              dbDesignation: DatabasesEnum.excursion,
-            ),
-            const SizedBox(height: 10),
-            // ---------- By State
-            VarTextField(
-              textController: rmap["BeiOrt"]!["controller"]!,
-              localization: AppLocalizations.of(context)!.beiort,
-              dbName: "BeiOrt",
-              required: false,
-              dbDesignation: DatabasesEnum.excursion,
-            ),
-            const SizedBox(height: 10),
-            // ---------- Bima number
-            const Divider(),
-            const SizedBox(height: 10),
-            ClipRRect(
-              borderRadius: BorderRadius.all(Radius.circular(10)),
-              child: ExpansionPanelList(
-                expansionCallback:
-                    ((int index, bool isExpanded) =>
+          Step(
+            title: Text(AppLocalizations.of(context)!.dateandtime),
+            content: Column(
+              children: [
+                // ---------- Date
+                Datum(
+                  initDatum: DateTime.now(),
+                  onDateChanged: (date) {
+                    rmap["Datum"]!["controller"]!.text = date.toString();
+                  },
+                  name: AppLocalizations.of(context)!.date,
+                ),
+                const SizedBox(height: 10),
+                // ---------- Pack
+                VarTextField(
+                  textController: rmap["Rudel"]!["controller"]!,
+                  localization: AppLocalizations.of(context)!.rudel,
+                  dbName: "Rudel",
+                  required: false,
+                  dbDesignation: DatabasesEnum.excursion,
+                ),
+                const SizedBox(height: 10),
+                // ---------- Participants
+                VarTextField(
+                  textController: rmap["Teilnehmer"]!["controller"]!,
+                  localization: AppLocalizations.of(context)!.teilnehmer,
+                  dbName: "Teilnehmer",
+                  required: false,
+                  dbDesignation: DatabasesEnum.excursion,
+                ),
+                const SizedBox(height: 10),
+                // ---------- Duration
+                VarTextField(
+                  textController: rmap["Dauer"]!["controller"]!,
+                  localization: AppLocalizations.of(context)!.dauer,
+                  dbName: "Dauer",
+                  required: false,
+                  dbDesignation: DatabasesEnum.excursion,
+                ),
+                const SizedBox(height: 20),
+                // ---------- Dog(leash)
+                HundULeine(
+                  mHund: rmap["MHund"]!["controller"]!,
+                  mLeine: rmap["MLeine"]!["controller"]!,
+                ),
+                const SizedBox(height: 10),
+                // ---------- State
+                VarTextField(
+                  textController: rmap["BLand"]!["controller"]!,
+                  localization: AppLocalizations.of(context)!.bland,
+                  dbName: "BLand",
+                  required: false,
+                  dbDesignation: DatabasesEnum.excursion,
+                ),
+                const SizedBox(height: 10),
+                // ---------- Country
+                VarTextField(
+                  textController: rmap["Lkr"]!["controller"]!,
+                  localization: AppLocalizations.of(context)!.lkr,
+                  dbName: "Lkr",
+                  required: false,
+                  dbDesignation: DatabasesEnum.excursion,
+                ),
+                const SizedBox(height: 10),
+                // ---------- By State
+                VarTextField(
+                  textController: rmap["BeiOrt"]!["controller"]!,
+                  localization: AppLocalizations.of(context)!.beiort,
+                  dbName: "BeiOrt",
+                  required: false,
+                  dbDesignation: DatabasesEnum.excursion,
+                ),
+                const SizedBox(height: 10),
+                // ---------- Bima number
+                const Divider(),
+                const SizedBox(height: 10),
+                ClipRRect(
+                  borderRadius: BorderRadius.all(Radius.circular(10)),
+                  child: ExpansionPanelList(
+                    expansionCallback: ((int index, bool isExpanded) =>
                         setState(() => bimaExtended = isExpanded)),
-                expandedHeaderPadding: EdgeInsets.all(0),
-                children: [
-                  ExpansionPanel(
-                    isExpanded: bimaExtended,
-                    canTapOnHeader: true,
-                    headerBuilder: (context, bool isOpen) => Padding(
-                      padding: const EdgeInsets.only(left: 15),
-                      child: Align(alignment: Alignment.centerLeft, child: Text("BImA", style: Theme.of(context).textTheme.bodyLarge,),),
-                    ),
-                    body: Padding(
-                      padding: const EdgeInsets.all(15),
-                      child: Column(
-                        children: [
-                          const SizedBox(height: 10),
-                          VarTextField(
-                            textController: rmap["BimaNr"]!["controller"]!,
-                            localization: AppLocalizations.of(context)!.bimaNr,
-                            dbName: "BimaNr",
-                            required: false,
-                            dbDesignation: DatabasesEnum.excursion,
+                    expandedHeaderPadding: EdgeInsets.all(0),
+                    children: [
+                      ExpansionPanel(
+                        isExpanded: bimaExtended,
+                        canTapOnHeader: true,
+                        headerBuilder: (context, bool isOpen) => Padding(
+                          padding: const EdgeInsets.only(left: 15),
+                          child: Align(
+                            alignment: Alignment.centerLeft,
+                            child: Text(
+                              "BImA",
+                              style: Theme.of(context).textTheme.bodyLarge,
+                            ),
                           ),
-                          const SizedBox(height: 10),
-                          // ---------- Bima name
-                          VarTextField(
-                            textController: rmap["BimaName"]!["controller"]!,
-                            localization: AppLocalizations.of(context)!.bimaName,
-                            dbName: "BimaName",
-                            required: false,
-                            dbDesignation: DatabasesEnum.excursion,
+                        ),
+                        body: Padding(
+                          padding: const EdgeInsets.all(15),
+                          child: Column(
+                            children: [
+                              const SizedBox(height: 10),
+                              VarTextField(
+                                textController: rmap["BimaNr"]!["controller"]!,
+                                localization:
+                                    AppLocalizations.of(context)!.bimaNr,
+                                dbName: "BimaNr",
+                                required: false,
+                                dbDesignation: DatabasesEnum.excursion,
+                              ),
+                              const SizedBox(height: 10),
+                              // ---------- Bima name
+                              VarTextField(
+                                textController:
+                                    rmap["BimaName"]!["controller"]!,
+                                localization:
+                                    AppLocalizations.of(context)!.bimaName,
+                                dbName: "BimaName",
+                                required: false,
+                                dbDesignation: DatabasesEnum.excursion,
+                              ),
+                              const SizedBox(height: 10),
+                              // ---------- Bima user
+                              BimaNutzer(
+                                onBimaNutzerChanged: (value) {
+                                  setState(() {
+                                    rmap["BimaNutzer"]!["controller"]!.text =
+                                        value;
+                                  });
+                                },
+                              ),
+                              const SizedBox(height: 10),
+                              // ---------- Bima AGV
+                              VarTextField(
+                                textController: rmap["BimaAGV"]!["controller"]!,
+                                localization:
+                                    AppLocalizations.of(context)!.bimaAGV,
+                                dbName: "BimaAGV",
+                                required: false,
+                                dbDesignation: DatabasesEnum.excursion,
+                              ),
+                            ],
                           ),
-                          const SizedBox(height: 10),
-                          // ---------- Bima user
-                          BimaNutzer(
-                            onBimaNutzerChanged: (value) {
-                              setState(() {
-                                rmap["BimaNutzer"]!["controller"]!.text = value;
-                              });
-                            },
-                          ),
-                          const SizedBox(height: 10),
-                          // ---------- Bima AGV
-                          VarTextField(
-                            textController: rmap["BimaAGV"]!["controller"]!,
-                            localization: AppLocalizations.of(context)!.bimaAGV,
-                            dbName: "BimaAGV",
-                            required: false,
-                            dbDesignation: DatabasesEnum.excursion,
-                          ),
-                        ],
+                        ),
                       ),
-                    ),
+                    ],
                   ),
-                ],
-              ),
+                ),
+              ],
             ),
-          ],
-        ),
-      ),
-      Step(
-        title: Text(AppLocalizations.of(context)!.umstaendeUndAktionen),
-        content: Column(
-          children: [
-            // ---------- Tracking
-            ElevatedButton(
-              onPressed:
-                  () => Navigator.push(
-                    context,
-                    MaterialPageRoute(
+          ),
+          Step(
+            title: Text(AppLocalizations.of(context)!.umstaendeUndAktionen),
+            content: Column(
+              children: [
+                // ---------- Tracking
+                ElevatedButton(
+                  onPressed: () async {
+                    await Navigator.push(context, MaterialPageRoute(
                       builder: (context) {
                         return Tracking(
                           weg: rmap["Weg"]!["controller"]!,
                           startPosition: currentPosition,
                         );
                       },
-                    ),
-                  ),
-              child: Text(AppLocalizations.of(context)!.trackingAnAusschalten),
-            ),
-            const SizedBox(height: 10),
+                    ));
+                    setState(() {});
+                  },
+                  child:
+                      Text(AppLocalizations.of(context)!.trackingAnAusschalten),
+                ),
+                const SizedBox(height: 10),
 
-            // ---------- Weather
-            VarTextField(
-              textController: rmap["Wetter"]!["controller"]!,
-              localization: AppLocalizations.of(context)!.wetter,
-              dbName: "Wetter",
-              required: false,
-              dbDesignation: DatabasesEnum.excursion,
+                // ---------- Weather
+                VarTextField(
+                  textController: rmap["Wetter"]!["controller"]!,
+                  localization: AppLocalizations.of(context)!.wetter,
+                  dbName: "Wetter",
+                  required: false,
+                  dbDesignation: DatabasesEnum.excursion,
+                ),
+                const SizedBox(height: 10),
+                // ---------- Temperature
+                VarTextField(
+                  textController: rmap["Temperat"]!["controller"]!,
+                  localization: AppLocalizations.of(context)!.temperatur,
+                  dbName: "Temperat",
+                  required: false,
+                  dbDesignation: DatabasesEnum.excursion,
+                ),
+                const SizedBox(height: 10),
+                // ---------- Last precipitation
+                LetzterNiederschlag(
+                    controller: rmap["RegenVor"]!["controller"]!),
+                const SizedBox(height: 20),
+                // ---------- Track conditions
+                StreckeUSpurbedingungen(
+                  kmAutoController: rmap["KmAuto"]!["controller"]!,
+                  kmFussController: rmap["KmFuss"]!["controller"]!,
+                  kmRadController: rmap["KmRad"]!["controller"]!,
+                  spGutController: rmap["SpGut"]!["controller"]!,
+                  spMittelController: rmap["SpMittel"]!["controller"]!,
+                  spSchlechtController: rmap["SpSchlecht"]!["controller"]!,
+                ),
+                const SizedBox(height: 20),
+                const Divider(),
+                // ---------- Track found
+                SpurGefunden(
+                  spurFund: rmap["SpurFund"]!["controller"]!,
+                  spurLang: rmap["SpurLang"]!["controller"]!,
+                  spurTiere: rmap["SpurTiere"]!["controller"]!,
+                  spSicher: rmap["SpSicher"]!["controller"]!,
+                  welpenSp: rmap["WelpenSp"]!["controller"]!,
+                  welpenAnz: rmap["WelpenAnz"]!["controller"]!,
+                  wpSicher: rmap["WpSicher"]!["controller"]!,
+                ),
+                const Divider(),
+                const SizedBox(height: 20),
+                // ---------- Counts
+                Anzahlen(
+                  losungAnz: rmap["LosungAnz"]!["controller"]!,
+                  losungGes: rmap["LosungGes"]!["controller"]!,
+                  losungGen: rmap["LosungGen"]!["controller"]!,
+                  urinAnz: rmap["UrinAnz"]!["controller"]!,
+                  urinGen: rmap["UrinGen"]!["controller"]!,
+                  oestrAnz: rmap["OestrAnz"]!["controller"]!,
+                  oestrGen: rmap["OestrGen"]!["controller"]!,
+                  haarAnz: rmap["HaarAnz"]!["controller"]!,
+                  haarGen: rmap["HaarGen"]!["controller"]!,
+                ),
+                const SizedBox(height: 20),
+                const Divider(),
+                const SizedBox(height: 20),
+                // ---------- Clues
+                Align(
+                  alignment: Alignment.bottomLeft,
+                  child: Text(
+                    AppLocalizations.of(context)!.hinweise,
+                    style: Theme.of(context).textTheme.titleMedium,
+                  ),
+                ),
+                Hinweise(hinweise: rmap["Hinweise"]!["controller"]!),
+              ],
             ),
-            const SizedBox(height: 10),
-            // ---------- Temperature
-            VarTextField(
-              textController: rmap["Temperat"]!["controller"]!,
-              localization: AppLocalizations.of(context)!.temperatur,
-              dbName: "Temperat",
-              required: false,
-              dbDesignation: DatabasesEnum.excursion,
+          ),
+          Step(
+            title: Text(AppLocalizations.of(context)!.intkomm),
+            content: Column(
+              children: [
+                // ---------- Remarks
+                VarTextField(
+                  textController: rmap["Bemerk"]!["controller"]!,
+                  localization: AppLocalizations.of(context)!.sonstbemerkungen,
+                  dbName: "Bemerk",
+                  required: false,
+                  dbDesignation: DatabasesEnum.excursion,
+                ),
+                const SizedBox(height: 20),
+                // ---------- Internal communication
+                VarTextField(
+                  textController: rmap["IntKomm"]!["controller"]!,
+                  localization: AppLocalizations.of(context)!.intkomm,
+                  dbName: "IntKomm",
+                  required: false,
+                  dbDesignation: DatabasesEnum.excursion,
+                ),
+              ],
             ),
-            const SizedBox(height: 10),
-            // ---------- Last precipitation
-            LetzterNiederschlag(controller: rmap["RegenVor"]!["controller"]!),
-            const SizedBox(height: 20),
-            // ---------- Track conditions
-            StreckeUSpurbedingungen(
-              kmAutoController: rmap["KmAuto"]!["controller"]!,
-              kmFussController: rmap["KmFuss"]!["controller"]!,
-              kmRadController: rmap["KmRad"]!["controller"]!,
-              spGutController: rmap["SpGut"]!["controller"]!,
-              spMittelController: rmap["SpMittel"]!["controller"]!,
-              spSchlechtController: rmap["SpSchlecht"]!["controller"]!,
-            ),
-            const SizedBox(height: 20),
-            const Divider(),
-            // ---------- Track found
-            SpurGefunden(
-              spurFund: rmap["SpurFund"]!["controller"]!,
-              spurLang: rmap["SpurLang"]!["controller"]!,
-              spurTiere: rmap["SpurTiere"]!["controller"]!,
-              spSicher: rmap["SpSicher"]!["controller"]!,
-              welpenSp: rmap["WelpenSp"]!["controller"]!,
-              welpenAnz: rmap["WelpenAnz"]!["controller"]!,
-              wpSicher: rmap["WpSicher"]!["controller"]!,
-            ),
-            const Divider(),
-            const SizedBox(height: 20),
-            // ---------- Counts
-            Anzahlen(
-              losungAnz: rmap["LosungAnz"]!["controller"]!,
-              losungGes: rmap["LosungGes"]!["controller"]!,
-              losungGen: rmap["LosungGen"]!["controller"]!,
-              urinAnz: rmap["UrinAnz"]!["controller"]!,
-              urinGen: rmap["UrinGen"]!["controller"]!,
-              oestrAnz: rmap["OestrAnz"]!["controller"]!,
-              oestrGen: rmap["OestrGen"]!["controller"]!,
-              haarAnz: rmap["HaarAnz"]!["controller"]!,
-              haarGen: rmap["HaarGen"]!["controller"]!,
-            ),
-            const SizedBox(height: 20),
-            const Divider(),
-            const SizedBox(height: 20),
-            // ---------- Clues
-            Align(
-              alignment: Alignment.bottomLeft,
-              child: Text(
-                AppLocalizations.of(context)!.hinweise,
-                style: Theme.of(context).textTheme.titleMedium,
-              ),
-            ),
-            Hinweise(hinweise: rmap["Hinweise"]!["controller"]!),
-          ],
-        ),
-      ),
-      Step(
-        title: Text(AppLocalizations.of(context)!.intkomm),
-        content: Column(
-          children: [
-            // ---------- Remarks
-            VarTextField(
-              textController: rmap["Bemerk"]!["controller"]!,
-              localization: AppLocalizations.of(context)!.sonstbemerkungen,
-              dbName: "Bemerk",
-              required: false,
-              dbDesignation: DatabasesEnum.excursion,
-            ),
-            const SizedBox(height: 20),
-            // ---------- Internal communication
-            VarTextField(
-              textController: rmap["IntKomm"]!["controller"]!,
-              localization: AppLocalizations.of(context)!.intkomm,
-              dbName: "IntKomm",
-              required: false,
-              dbDesignation: DatabasesEnum.excursion,
-            ),
-          ],
-        ),
-      ),
-    ];
+          ),
+        ];
 
     // Begin of widget tree
     return Scaffold(
-      appBar: AppBar(title: Text(AppLocalizations.of(context)!.excursion)),
+      appBar: AppBar(
+        title: Text(AppLocalizations.of(context)!.excursion),
+        actions: [
+          // Text(TrackingService().isTracking ? "Tracking" : "Not tracking")
+          Image.asset(
+            TrackingService().isTracking ? "assets/icons/tracking_on.png" : "assets/icons/tracking_off.png",
+            width: 40,
+            ),
+        ],
+      ),
       body: PageTransitionSwitcher(
         duration: const Duration(microseconds: 800),
         transitionBuilder: (
diff --git a/lib/screens/excursion/widgets/tracking.dart b/lib/screens/excursion/widgets/tracking.dart
index fcca49b..0795586 100644
--- a/lib/screens/excursion/widgets/tracking.dart
+++ b/lib/screens/excursion/widgets/tracking.dart
@@ -1,11 +1,10 @@
 import 'dart:async';
-import 'dart:math';
 
 import 'package:fforte/l10n/app_localizations.dart';
 import 'package:fforte/screens/addCam/services/geolocator_service.dart';
 import 'package:fforte/screens/helper/add_entries_dialog_helper.dart';
 import 'package:fforte/screens/helper/snack_bar_helper.dart';
-import 'package:fforte/services/notification_service.dart';
+import 'package:fforte/services/tracking_service.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_map_location_marker/flutter_map_location_marker.dart';
@@ -22,20 +21,14 @@ class Tracking extends StatefulWidget {
 }
 
 class _TrackingState extends State<Tracking> {
-  List<LatLng> pathList = [];
-  StreamSubscription<Position>? positionStream;
+  final TrackingService _trackingService = TrackingService();
   LocationMarkerPosition? locationMarkerPosition;
-  bool positionStreamRunning = false;
   MapController mapController = MapController();
-
-  Random rand = Random();
+  StreamSubscription? _positionSubscription;
 
   @override
   void initState() {
-    // debugging (i guess)
-    // pathList.add(
-    //   LatLng(widget.startPosition.latitude, widget.startPosition.longitude),
-    // );
+    super.initState();
 
     if (widget.weg.text.isNotEmpty) {
       for (var element in widget.weg.text.split(";")) {
@@ -47,7 +40,7 @@ class _TrackingState extends State<Tracking> {
           // ignore because the double is short enough then
         }
 
-        pathList.add(
+        _trackingService.pathList.add(
           LatLng(double.parse(posSplit.first), double.parse(posSplit[1])),
         );
       }
@@ -59,7 +52,15 @@ class _TrackingState extends State<Tracking> {
       accuracy: widget.startPosition.accuracy,
     );
 
-    super.initState();
+    _positionSubscription = _trackingService.positionStream$.listen((position) {
+      setState(() {
+        locationMarkerPosition = LocationMarkerPosition(
+          latitude: position.latitude,
+          longitude: position.longitude,
+          accuracy: position.accuracy,
+        );
+      });
+    });
 
     GeolocatorService.alwaysPositionEnabled().then((value) {
       if (!value && mounted) {
@@ -71,101 +72,30 @@ class _TrackingState extends State<Tracking> {
 
   @override
   void dispose() {
-    if (positionStream != null) positionStream!.cancel();
-    bool isFirst = true;
-    if (pathList.isNotEmpty) {
-      for (var pos in pathList) {
-        if (!isFirst) {
-          widget.weg.text += ";";
-        } else {
-          isFirst = false;
-        }
-
-        widget.weg.text += "${pos.latitude},${pos.longitude}";
-      }
-    }
-    NotificationService().deleteNotification();
-
+    _positionSubscription?.cancel();
+    widget.weg.text = _trackingService.getPathAsString();
     super.dispose();
   }
 
-  final LocationSettings streamLocationSettings = LocationSettings(
-    accuracy: LocationAccuracy.high,
-    distanceFilter: 10,
-  );
-
-  void onTrackingStart() async {
-    // notification handling for tracking in background notification
-    await NotificationService().initNotification();
-
-    if (mounted) {
-      NotificationService().showNotification(
-        title: AppLocalizations.of(context)!.trackingRunningInBackground,
-      );
-    }
-
-    positionStream = Geolocator.getPositionStream(
-      locationSettings: AndroidSettings(
-        accuracy: LocationAccuracy.high,
-        distanceFilter: 0,
-        foregroundNotificationConfig:
-            mounted
-                ? ForegroundNotificationConfig(
-                  notificationTitle:
-                      AppLocalizations.of(context)!.trackingRunningInBackground,
-                  notificationText: "",
-                )
-                : null,
-
-      ),
-    ).listen((Position? position) {
-      if (position != null) {
-        setState(() {
-          pathList.add(LatLng(position.latitude, position.longitude));
-          // Random value for debugging
-          // pathList.add(LatLng(rand.nextInt(5) + 40, position.longitude));
-
-          locationMarkerPosition = LocationMarkerPosition(
-            latitude: position.latitude,
-            longitude: position.longitude,
-            accuracy: position.accuracy,
-          );
-        });
-      } else {
-        if (mounted) {
-          SnackBarHelper.showSnackBarMessage(
-            context,
-            AppLocalizations.of(context)!.couldntDeterminePosition,
-          );
-        }
-      }
-    });
-    positionStream!.onError((e) {
-      NotificationService().deleteNotification();
-      NotificationService().showNotification(title: "ERROR: $e");
-    });
-  }
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
         title: Text(AppLocalizations.of(context)!.tracking),
-        leading: IconButton(onPressed: () {
-          Navigator.pop(context);
-        }, icon: Icon(Icons.arrow_back_rounded)),
+        leading: IconButton(
+          onPressed: () {
+            Navigator.pop(context);
+          },
+          icon: Icon(Icons.arrow_back_rounded)
+        ),
         actions: [
-          if (!positionStreamRunning)
+          if (!_trackingService.isTracking)
             IconButton(
               onPressed: () async {
-                bool delete =
-                    await AddEntriesDialogHelper.deleteCompleteRouteDialog(
-                      context,
-                    );
-
+                bool delete = await AddEntriesDialogHelper.deleteCompleteRouteDialog(context);
                 if (delete) {
                   setState(() {
-                    pathList = [];
+                    _trackingService.clearPath();
                   });
                 }
               },
@@ -174,32 +104,32 @@ class _TrackingState extends State<Tracking> {
                 color: Theme.of(context).colorScheme.errorContainer,
               ),
             ),
-          if (positionStreamRunning)
+          if (_trackingService.isTracking)
             TextButton(
               onPressed: () {
                 setState(() {
-                  positionStreamRunning = false;
-                  positionStream!.cancel();
-                  NotificationService().deleteNotification();
+                  _trackingService.stopTracking();
                 });
               },
               child: Text(AppLocalizations.of(context)!.trackingStop),
             ),
           TextButton(
             onPressed: () {
-              if (positionStreamRunning) {
-                positionStreamRunning = false;
-                positionStream?.pause();
-              } else {
-                positionStreamRunning = true;
-                onTrackingStart();
-              }
-              setState(() {});
+              setState(() {
+                if (_trackingService.isTracking) {
+                  _trackingService.pauseTracking();
+                } else {
+                  if (_trackingService.positionStream == null) {
+                    _trackingService.startTracking(context);
+                  } else {
+                    _trackingService.resumeTracking();
+                  }
+                }
+              });
             },
-            child:
-                positionStreamRunning
-                    ? Text(AppLocalizations.of(context)!.trackingPause)
-                    : Text(AppLocalizations.of(context)!.trackingStart)
+            child: _trackingService.isTracking
+                ? Text(AppLocalizations.of(context)!.trackingPause)
+                : Text(AppLocalizations.of(context)!.trackingStart),
           ),
         ],
       ),
@@ -219,8 +149,7 @@ class _TrackingState extends State<Tracking> {
         mapController: mapController,
         options: MapOptions(
           interactionOptions: const InteractionOptions(
-            flags:
-                InteractiveFlag.pinchZoom |
+            flags: InteractiveFlag.pinchZoom |
                 InteractiveFlag.drag |
                 InteractiveFlag.pinchMove,
           ),
@@ -235,22 +164,16 @@ class _TrackingState extends State<Tracking> {
             urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
             userAgentPackageName: 'de.lupus.apps',
           ),
-          if (pathList.isNotEmpty)
+          if (_trackingService.pathList.isNotEmpty)
             PolylineLayer(
               polylines: [
-                Polyline(strokeWidth: 2.0, points: pathList, color: Colors.red),
+                Polyline(
+                  strokeWidth: 2.0,
+                  points: _trackingService.pathList,
+                  color: Colors.red
+                ),
               ],
             ),
-          // CircleLayer(
-          //   circles: [
-          //     CircleMarker(
-          //       color: Colors.blue,
-          //       point: pathList.isEmpty ? widget.startPosition : pathList.last,
-          //       radius: 5,
-          //       useRadiusInMeter: true,
-          //     ),
-          //   ],
-          // ),
           CurrentLocationLayer(),
         ],
       ),
diff --git a/lib/services/tracking_service.dart b/lib/services/tracking_service.dart
new file mode 100644
index 0000000..9f48c55
--- /dev/null
+++ b/lib/services/tracking_service.dart
@@ -0,0 +1,83 @@
+import 'dart:async';
+
+import 'package:fforte/l10n/app_localizations.dart';
+import 'package:fforte/services/notification_service.dart';
+import 'package:flutter/material.dart';
+import 'package:geolocator/geolocator.dart';
+import 'package:latlong2/latlong.dart';
+
+class TrackingService {
+  static final TrackingService _instance = TrackingService._internal();
+  factory TrackingService() => _instance;
+  TrackingService._internal();
+
+  List<LatLng> pathList = [];
+  StreamSubscription<Position>? positionStream;
+  bool isTracking = false;
+  final _positionController = StreamController<Position>.broadcast();
+
+  Stream<Position> get positionStream$ => _positionController.stream;
+
+  Future<void> startTracking(BuildContext context) async {
+    if (isTracking) return;
+
+    await NotificationService().initNotification();
+    if (context.mounted) {
+    NotificationService().showNotification(
+      title: AppLocalizations.of(context)!.trackingRunningInBackground,
+    );
+    }
+
+    positionStream = Geolocator.getPositionStream(
+      locationSettings: AndroidSettings(
+        accuracy: LocationAccuracy.high,
+        distanceFilter: 0,
+        foregroundNotificationConfig: ForegroundNotificationConfig(
+          notificationTitle: context.mounted ? AppLocalizations.of(context)!.trackingRunningInBackground : "Tracking",
+          notificationText: "",
+        ),
+      ),
+    ).listen((Position? position) {
+      if (position != null) {
+        pathList.add(LatLng(position.latitude, position.longitude));
+        _positionController.add(position);
+      }
+    });
+
+    positionStream!.onError((e) {
+      NotificationService().deleteNotification();
+      NotificationService().showNotification(title: "ERROR: $e");
+    });
+
+    isTracking = true;
+  }
+
+  void pauseTracking() {
+    positionStream?.pause();
+    isTracking = false;
+  }
+
+  void resumeTracking() {
+    positionStream?.resume();
+    isTracking = true;
+  }
+
+  void stopTracking() {
+    positionStream?.cancel();
+    NotificationService().deleteNotification();
+    isTracking = false;
+  }
+
+  void clearPath() {
+    pathList.clear();
+  }
+
+  String getPathAsString() {
+    return pathList.map((pos) => "${pos.latitude},${pos.longitude}").join(";");
+  }
+
+  void dispose() {
+    stopTracking();
+    _positionController.close();
+  }
+} 
\ No newline at end of file