chore: big package dumps, remove map_controller dep

Author: BrightDV

ios/Runner/GeneratedPluginRegistrant.m

@@ -24,8 +24,8 @@
 @import connectivity_plus;
 #endif
 
-#if __has_include(<device_info_plus/FLTDeviceInfoPlusPlugin.h>)
-#import <device_info_plus/FLTDeviceInfoPlusPlugin.h>
+#if __has_include(<device_info_plus/FPPDeviceInfoPlusPlugin.h>)
+#import <device_info_plus/FPPDeviceInfoPlusPlugin.h>
 #else
 @import device_info_plus;
 #endif
@@ -114,7 +114,7 @@ + (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry {
   [Add2CalendarPlugin registerWithRegistrar:[registry registrarForPlugin:@"Add2CalendarPlugin"]];
   [BackgroundDownloaderPlugin registerWithRegistrar:[registry registrarForPlugin:@"BackgroundDownloaderPlugin"]];
   [ConnectivityPlusPlugin registerWithRegistrar:[registry registrarForPlugin:@"ConnectivityPlusPlugin"]];
-  [FLTDeviceInfoPlusPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTDeviceInfoPlusPlugin"]];
+  [FPPDeviceInfoPlusPlugin registerWithRegistrar:[registry registrarForPlugin:@"FPPDeviceInfoPlusPlugin"]];
   [InAppWebViewFlutterPlugin registerWithRegistrar:[registry registrarForPlugin:@"InAppWebViewFlutterPlugin"]];
   [FluttertoastPlugin registerWithRegistrar:[registry registrarForPlugin:@"FluttertoastPlugin"]];
   [FPPPackageInfoPlusPlugin registerWithRegistrar:[registry registrarForPlugin:@"FPPPackageInfoPlusPlugin"]];

lib/Screens/circuit_map_screen.dart

@@ -25,7 +25,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';
-import 'package:map_controller_plus/map_controller_plus.dart';
 import 'package:boxbox/helpers/circuit_points.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -84,89 +83,85 @@ class MarkersPage extends StatefulWidget {
 }
 
 class _MarkersPageState extends State<MarkersPage> {
-  late MapController mapController;
-  late StatefulMapController statefulMapController;
-  late StreamSubscription<StatefulMapControllerStateChange> sub;
+  MapController mapController = MapController();
 
-  Future<void> addPoints(String circuitId) async {
+  Future<List<Polyline>> addPoints(String circuitId) async {
     List<List> circuitPointsData =
         await GetTrackGeoJSONPoints().getCircuitPoints(
       circuitId,
     );
     List trackPoints = circuitPointsData[0];
-    List mapCenter = circuitPointsData[1];
-
-    statefulMapController.centerOnPoint(
-      LatLng(mapCenter[0], mapCenter[1]),
-    );
+    List<Polyline> parsedPoints = [];
 
     for (final point in trackPoints) {
       num diffPointIndex = trackPoints.length - trackPoints.indexOf(point);
       if (diffPointIndex.toInt() > 1) {
         List secondPoint = trackPoints[trackPoints.indexOf(point) + 1];
-        statefulMapController.addLine(
-          name: point.toString(),
-          points: [
-            LatLng(
-              point[1],
-              point[0],
-            ),
-            LatLng(
-              secondPoint[1],
-              secondPoint[0],
-            ),
-          ],
-          color: Theme.of(context).colorScheme.onPrimary,
+        parsedPoints.add(
+          Polyline(
+            points: [
+              LatLng(
+                point[1],
+                point[0],
+              ),
+              LatLng(
+                secondPoint[1],
+                secondPoint[0],
+              ),
+            ],
+            color: Theme.of(context).colorScheme.onPrimary,
+            strokeWidth: 2.5,
+          ),
         );
       }
     }
-    return;
+
+    return parsedPoints;
   }
 
   @override
   void initState() {
-    mapController = MapController();
-    statefulMapController = StatefulMapController(mapController: mapController);
-    sub = statefulMapController.changeFeed.listen((change) => setState(() {}));
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      addPoints(widget.circuitId);
-    });
     super.initState();
   }
 
   @override
   Widget build(BuildContext context) {
-    return FlutterMap(
-      mapController: mapController,
-      options: MapOptions(
-        zoom: 14.0,
-      ),
-      nonRotatedChildren: [
-        RichAttributionWidget(
-          attributions: [
-            TextSourceAttribution(
-              'OpenStreetMap contributors',
-              onTap: () =>
-                  launchUrl(Uri.parse('https://openstreetmap.org/copyright')),
+    return FutureBuilder<List<Polyline>>(
+      future: addPoints(widget.circuitId),
+      builder: (context, snapshot) {
+        if (snapshot.data != null) {
+          mapController.move(snapshot.data![0].points[1], 14.0);
+        }
+        return FlutterMap(
+          mapController: mapController,
+          options: MapOptions(
+            initialZoom: 14.0,
+          ),
+          children: [
+            RichAttributionWidget(
+              animationConfig: const ScaleRAWA(),
+              attributions: [
+                TextSourceAttribution(
+                  'OpenStreetMap contributors',
+                  onTap: () => launchUrl(
+                      Uri.parse('https://openstreetmap.org/copyright')),
+                ),
+              ],
+            ),
+            TileLayer(
+              urlTemplate: "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
+            ),
+            PolylineLayer<Object>(
+              polylines: snapshot.hasData ? snapshot.data! : [],
             ),
           ],
-        ),
-      ],
-      children: [
-        TileLayer(
-          urlTemplate: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
-          subdomains: const ['a', 'b', 'c'],
-        ),
-        PolylineLayer(
-          polylines: statefulMapController.lines,
-        ),
-      ],
+        );
+      },
     );
   }
 
   @override
   void dispose() {
-    sub.cancel();
     super.dispose();
   }
 }