Compare commits

..

2 Commits

View File

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