lib/view/home.dart

@@ -8,6 +8,7 @@ import 'package:app/view/locationSearch.dart';
 import 'package:app/view/status.dart';
 import 'package:app/view/map.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_map/flutter_map.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:provider/provider.dart';
@@ -23,18 +24,14 @@ class _HomePageState extends State<HomeView> {
   bool locationEnabled = false;
 
   Future<LatLng?> getLatLng() async {
-    LocationPermission permission = await Geolocator.checkPermission();
-    if (permission == LocationPermission.denied) {
-      permission = await Geolocator.requestPermission();
-      if (permission == LocationPermission.denied || permission == LocationPermission.deniedForever) {
+    LocationPermission permissionStatus = await Geolocator.checkPermission();
+    if (permissionStatus == LocationPermission.denied) {
+      permissionStatus = await Geolocator.requestPermission();
+      if (permissionStatus == LocationPermission.denied || permissionStatus == LocationPermission.deniedForever) {
         return null;
       }
     }
 
-    setState(() {
-      locationEnabled = true;
-    });
-
     Position? position;
     try {
       position = await Geolocator.getCurrentPosition();
@@ -48,16 +45,6 @@ class _HomePageState extends State<HomeView> {
     return null;
   }
 
-
-  @override
-  void initState() {
-    super.initState();
-
-    Geolocator.checkPermission().then((permission) => setState(() {
-      locationEnabled = permission != LocationPermission.denied && permission != LocationPermission.deniedForever;
-    }));
-  }
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -104,6 +91,9 @@ class _HomePageState extends State<HomeView> {
           LatLng? latLng = await getLatLng();
           if (latLng != null) {
             mapState.getMapController.move(latLng, 16);
+            setState(() {
+              locationEnabled = true;
+            });
           }
           mapState.setLoading(false);
         },