From 14c8cb6f7090714f1b2b633acef7ce310e48cf01 Mon Sep 17 00:00:00 2001
From: Mohamed Nouffer <mohamednouffer@Mohameds-Air.lan>
Date: Fri, 15 Sep 2023 12:05:05 +0530
Subject: [PATCH] fix display text issue

---
 lib/pages/camera/camera_page.dart             |  6 +++---
 .../destination/destination_controller.dart   |  1 +
 lib/widgets/map_widget.dart                   | 19 +++++++++++++++++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/lib/pages/camera/camera_page.dart b/lib/pages/camera/camera_page.dart
index 4c14f5f..8323b98 100644
--- a/lib/pages/camera/camera_page.dart
+++ b/lib/pages/camera/camera_page.dart
@@ -223,9 +223,9 @@ class CameraPage extends StatelessWidget {
         appBar: destinationController.is_in_rog.value &&
                 destinationController.rogaining_counted.value == true
             ? AppBar(
-                title: destination!.cp == -1
+                title: destination.cp == -1
                     ? Text("finishing_rogaining".tr)
-                    : Text("${destination!.sub_loc_id} : ${destination!.name}".tr),
+                    : Text("${destination.sub_loc_id} : ${destination.name}"),
                 leading: IconButton(
                   icon: Text("cancel".tr),
                   onPressed: () {
@@ -240,7 +240,7 @@ class CameraPage extends StatelessWidget {
                 centerTitle: true,
               )
             : AppBar(
-                title: const Text("チェックポイント"),
+                title: Text("${destination.sub_loc_id} : ${destination.name}"),
               ),
         body: Column(
           mainAxisAlignment: MainAxisAlignment.spaceAround,
diff --git a/lib/pages/destination/destination_controller.dart b/lib/pages/destination/destination_controller.dart
index 87c6117..f77cf73 100644
--- a/lib/pages/destination/destination_controller.dart
+++ b/lib/pages/destination/destination_controller.dart
@@ -86,6 +86,7 @@ class DestinationController extends GetxController {
 
     return Destination(
         name: fs.properties!["location_name"],
+        sub_loc_id: fs.properties!["sub_loc_id"],
         address: fs.properties!["address"],
         phone: fs.properties!["phone"],
         email: fs.properties!["email"],
diff --git a/lib/widgets/map_widget.dart b/lib/widgets/map_widget.dart
index 9de920c..948fbd5 100644
--- a/lib/widgets/map_widget.dart
+++ b/lib/widgets/map_widget.dart
@@ -50,7 +50,9 @@ class MapWidget extends StatelessWidget {
                   context: context,
                   isScrollControlled: true,
                   isDismissible: true,
-                  builder: ((context) => BottomSheetNew(destination: des,))
+                  builder: ((context) => BottomSheetNew(
+                        destination: des,
+                      ))
                   //builder:((context) => BottomSheetWidget())
                   ).whenComplete(() {
                 destinationController.skip_gps = false;
@@ -178,7 +180,20 @@ class MapWidget extends StatelessWidget {
                           )
                         : Container(),
                   ),
-                  CurrentLocationLayer(),
+                  CurrentLocationLayer(
+                    followOnLocationUpdate: FollowOnLocationUpdate.once,
+                    turnOnHeadingUpdate: TurnOnHeadingUpdate.never,
+                    style: const LocationMarkerStyle(
+                      marker: DefaultLocationMarker(
+                        child: Icon(
+                          Icons.navigation,
+                          color: Colors.yellowAccent,
+                        ),
+                      ),
+                      markerSize: Size(27, 27),
+                      markerDirection: MarkerDirection.heading,
+                    ),
+                  ),
                   indexController.locations.isNotEmpty &&
                           indexController.locations[0].collection.isNotEmpty
                       ? MarkerLayer(