Fixed MapController after MVVM Refactor

Author: YarosMallorca

lib/screens/map/map_view.dart

@@ -31,7 +31,7 @@ class _MapScreenState extends State<MapScreen> with TickerProviderStateMixin {
   @override
   Widget build(BuildContext context) {
     return ChangeNotifierProvider(
-      create: (_) => MapViewModel()..initialize(),
+      create: (_) => MapViewModel()..initialize(context, this),
       child: Consumer2<MapProvider, TrackingProvider>(
           builder: (context, mapProvider, trackingProvider, _) {
         return Consumer<MapViewModel>(
@@ -110,7 +110,7 @@ class _MapScreenState extends State<MapScreen> with TickerProviderStateMixin {
                 _routeWaySwitcher(context),
 
               // Update location button
-              _updateLocationButton(context),
+              _updateLocationButtons(context),
 
               if (mapProvider.loadingProgress < 1)
                 _loadingOverlay(context, mapProvider)
@@ -121,7 +121,7 @@ class _MapScreenState extends State<MapScreen> with TickerProviderStateMixin {
     );
   }
 
-  Widget _updateLocationButton(BuildContext context) {
+  Widget _updateLocationButtons(BuildContext context) {
     final mapProvider = Provider.of<MapProvider>(context, listen: false);
     final trackingProvider =
         Provider.of<TrackingProvider>(context, listen: false);
@@ -132,16 +132,19 @@ class _MapScreenState extends State<MapScreen> with TickerProviderStateMixin {
           padding: const EdgeInsets.all(16.0),
           child: Row(
             mainAxisSize: MainAxisSize.min,
+            spacing: 10,
             children: [
               if (trackingProvider.currentLocation != null)
+                // Move to Bus
                 FloatingActionButton(
                     mini: true,
                     onPressed: () {
                       mapProvider.updateLocation(
                           trackingProvider.currentLocation!, 16);
                     },
                     child: const Icon(Icons.directions_bus)),
-              const SizedBox(width: 10),
+
+              // Move to Current Location
               FloatingActionButton(
                   onPressed: () async =>
                       mapProvider.moveToCurrentLocation(context),

lib/screens/map/map_viewmodel.dart

@@ -1,36 +1,27 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
+import 'package:flutter_map_animations/flutter_map_animations.dart';
 import 'package:mallorca_transit_services/mallorca_transit_services.dart';
+import 'package:provider/provider.dart';
 import 'package:via_mallorca/cache/cache_manager.dart';
+import 'package:via_mallorca/providers/map_provider.dart';
 
 class MapViewModel extends ChangeNotifier with WidgetsBindingObserver {
   final bool _havePermission = false;
   bool get havePermission => _havePermission;
   List<Station> _cachedStations = [];
   List<Station> get cachedStations => _cachedStations;
 
-  Future<void> initialize() async {
-    WidgetsBinding.instance.addObserver(this);
+  Future<void> initialize(BuildContext context, TickerProvider vsync) async {
+    context
+        .read<MapProvider>()
+        .setMapController(AnimatedMapController(vsync: vsync));
     _cachedStations = await CacheManager.getAllStations();
     if (_cachedStations.isEmpty) {
       _cachedStations = await Station.getAllStations();
       await CacheManager.setAllStations(_cachedStations);
     }
-    notifyListeners();
-  }
-
-  @override
-  void didChangeAppLifecycleState(AppLifecycleState state) {
-    if (state == AppLifecycleState.resumed) {
-      // Resume tracking
-    } else if (state == AppLifecycleState.paused) {
-      // Pause tracking
-    }
-  }
 
-  @override
-  void dispose() {
-    WidgetsBinding.instance.removeObserver(this);
-    super.dispose();
+    notifyListeners();
   }
 }