add mapbox gl

devtools_options.yaml

@@ -0,0 +1 @@
+extensions:

ios/Podfile

@@ -38,4 +38,7 @@ post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
   end
+  installer.pods_project.build_configurations.each do |config|
+    config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
+  end
 end

ios/Podfile.lock

@@ -10,6 +10,15 @@ PODS:
   - GoogleMaps/Base (6.2.1)
   - GoogleMaps/Maps (6.2.1):
     - GoogleMaps/Base
+  - Mapbox-iOS-SDK (6.4.1):
+    - MapboxMobileEvents (~> 0.10.12)
+  - mapbox_gl (0.0.1):
+    - Flutter
+    - Mapbox-iOS-SDK (~> 6.4.0)
+    - MapboxAnnotationExtension (~> 0.0.1-beta.1)
+  - MapboxAnnotationExtension (0.0.1-beta.2):
+    - Mapbox-iOS-SDK (~> 6.0)
+  - MapboxMobileEvents (0.10.14)
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -22,13 +31,17 @@ DEPENDENCIES:
   - audioplayers_darwin (from `.symlinks/plugins/audioplayers_darwin/ios`)
   - Flutter (from `Flutter`)
   - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
+  - mapbox_gl (from `.symlinks/plugins/mapbox_gl/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
   - wakelock (from `.symlinks/plugins/wakelock/ios`)
 
 SPEC REPOS:
   trunk:
     - GoogleMaps
+    - Mapbox-iOS-SDK
+    - MapboxAnnotationExtension
+    - MapboxMobileEvents
 
 EXTERNAL SOURCES:
   audioplayers_darwin:
@@ -37,6 +50,8 @@ EXTERNAL SOURCES:
     :path: Flutter
   google_maps_flutter_ios:
     :path: ".symlinks/plugins/google_maps_flutter_ios/ios"
+  mapbox_gl:
+    :path: ".symlinks/plugins/mapbox_gl/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   video_player_avfoundation:
@@ -49,10 +64,14 @@ SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   google_maps_flutter_ios: 3e0b99383a8003b8169d06e7e324170bd0424105
   GoogleMaps: 20d7b12be49a14287f797e88e0e31bc4156aaeb4
+  Mapbox-iOS-SDK: f870f83cbdc7aa4a74afcee143aafb0dae390c82
+  mapbox_gl: 33c5ab6306cbfa72289bb3606d2cd2e8baee9ff0
+  MapboxAnnotationExtension: 4eee6c26349ef6d909f1a23a7eae2d0f7ca5fa7d
+  MapboxMobileEvents: 5a172cc9bbf8ac0e45ba86095cbee685ede248cc
   path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
   video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126
   wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
 
-PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011
+PODFILE CHECKSUM: 3ea40ac0978505df4275c2e24526ea6055c94efa
 
 COCOAPODS: 1.15.2

ios/Runner/Info.plist

@@ -2,6 +2,14 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>io.flutter.embedded_views_preview</key>
+	<true/>
+	<key>MGLMapboxMetricsEnabledSettingShownInApp</key>
+	<true/>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>Shows your location on the map and helps improve the map</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>Shows your location on the map and helps improve the map</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>

lib/additionals/location.dart

@@ -1,6 +1,6 @@
 import 'package:audioplayers/audioplayers.dart';
 import 'package:flutter/material.dart';
-import 'package:google_maps_flutter/google_maps_flutter.dart';
+import 'package:mapbox_gl/mapbox_gl.dart';
 
 class Location {
   int id;

lib/additionals/locations_list.dart

@@ -1,6 +1,6 @@
 import 'package:audioplayers/audioplayers.dart';
 import 'package:flutter/material.dart';
-import 'package:google_maps_flutter/google_maps_flutter.dart';
+import 'package:mapbox_gl/mapbox_gl.dart';
 
 import 'location.dart';
 
@@ -18,7 +18,7 @@ class LocationList {
           'assets/images/burning_man/burning_man_2.jpg',
         ],
         audio: AssetSource('audio/Burning_Man.mp3'),
-        coords: const LatLng(32.9172973, -96.7637959),
+        coords: const LatLng(40.7829, -119.2006),
         interviewers: ["Unknown"],
         interviewees: ["Brad Pitt"],
         video: 'assets/video/Burning_Man.mp4'),
@@ -34,7 +34,7 @@ class LocationList {
           'assets/images/brazil_carnaval/brazil_carnaval_2.jpg',
         ],
         audio: AssetSource('audio/Brazil_Carnaval.mp3'),
-        coords: const LatLng(32.8437457, -96.8326761),
+        coords: const LatLng(-22.9068, -43.1729),
         interviewers: ["Unknown", "Angelina Jolie"],
         interviewees: ["Leonardo DiCaprio", "Jennifer Aniston"],
         video: 'assets/video/Brazil_Carnaval.mp4'),
@@ -50,7 +50,7 @@ class LocationList {
         'assets/images/oktoberfest/oktoberfest_2.jpg',
       ],
       audio: AssetSource('audio/Oktoberfest.mp3'),
-      coords: const LatLng(32.8439148, -96.8299776),
+      coords: const LatLng(48.1351, 11.5820),
       interviewers: ["Tom Hanks", "Meryl Streep"],
       interviewees: ["George Clooney", "Julia Roberts"],
       video: 'assets/video/Oktoberfest.mp4',
@@ -68,7 +68,7 @@ class LocationList {
         'assets/images/day_of_dead/day_of_dead_2.jpg',
       ],
       audio: AssetSource('audio/DayOfDead.mp3'),
-      coords: const LatLng(32.7824583, -96.7949716),
+      coords: const LatLng(19.4326, -99.1332),
       interviewers: ["Denzel Washington", "Charlize Theron"],
       interviewees: ["Johnny Depp", "Sandra Bullock"],
       video: 'assets/video/DayOfDead.mp4',
@@ -84,7 +84,7 @@ class LocationList {
         'assets/images/rodeo/rodeo_2.jpg',
       ],
       audio: AssetSource('audio/Rodeo.mp3'),
-      coords: const LatLng(32.8334168, -96.8075467),
+      coords: const LatLng(29.7604, -95.3698),
       interviewers: ["Robert Downey Jr."],
       interviewees: ["Nicole Kidman"],
       video: 'assets/video/Rodeo.mp4',

lib/screens/map_screen.dart

@@ -2,10 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:my_app/additionals/locations_list.dart';
 import 'package:my_app/main.dart';
 import 'package:my_app/widgets/carousel.dart';
+import 'package:my_app/widgets/locations_carousel.dart';
+import 'package:my_app/widgets/map_box_gl.dart';
 import 'package:my_app/widgets/panel_widget.dart';
 import 'package:provider/provider.dart';
 import 'package:sliding_up_panel/sliding_up_panel.dart';
-import 'package:my_app/widgets/map_google.dart';
 import 'package:my_app/widgets/short_info_block.dart';
 import 'package:my_app/widgets/full_info_block.dart';
 import 'package:my_app/widgets/menu.dart';
@@ -49,20 +50,19 @@ class MapScreenState extends State<MapScreen> {
 
     return Stack(children: [
       Scaffold(
-          body: SafeArea(
-        top: true,
-        child: SlidingUpPanel(
+        body: SlidingUpPanel(
           minHeight: panelHeightClosed,
           maxHeight: panelHeightOpen,
           parallaxEnabled: false,
           controller: panelController,
           color: themeOverlayColor,
           borderRadius: const BorderRadius.vertical(top: Radius.circular(15)),
           onPanelSlide: _snapPointPanel,
-          panelSnapping: false,
+          panelSnapping: true,
           snapPoint: 0.5,
           backdropEnabled: true,
           backdropTapClosesPanel: true,
+          boxShadow: null,
           panelBuilder: (controller) => PanelWidget(
               controller: controller, panelController: panelController),
           panel: Container(
@@ -71,27 +71,29 @@ class MapScreenState extends State<MapScreen> {
                 // Close Icons
                 Row(
                   children: [
-                    IconButton(
-                      icon: const Icon(Icons.close),
-                      iconSize: 30.0,
-                      onPressed: () {
-                        _closePanel();
-                        if (appState.currentLocation != null &&
-                            appState.experianceType == "Virtual") {
-                          final currentIndex =
-                              locations.indexOf(appState.currentLocation!);
-                          if (currentIndex < locations.length - 1) {
-                            appState.changeCurrentLocation(
-                                locations[currentIndex + 1]);
-                          }
-                        }
-                      },
-                    ),
+                    Container(
+                        padding: const EdgeInsets.only(left: 16.0, top: 16.0),
+                        child: IconButton(
+                          icon: const Icon(Icons.close),
+                          iconSize: 30.0,
+                          onPressed: () {
+                            _closePanel();
+                            if (appState.currentLocation != null &&
+                                appState.experianceType == "Virtual") {
+                              final currentIndex =
+                                  locations.indexOf(appState.currentLocation!);
+                              if (currentIndex < locations.length - 1) {
+                                appState.changeCurrentLocation(
+                                    locations[currentIndex + 1]);
+                              }
+                            }
+                          },
+                        )),
                   ],
                 ),
                 // Full height block
                 Visibility(
-                    visible: previousPosition > 0.5,
+                    visible: previousPosition > 0.5 + 0.01,
                     child: FullInfoBlock(
                       closePanel: _closePanel,
                     )),
@@ -100,23 +102,27 @@ class MapScreenState extends State<MapScreen> {
                     visible: previousPosition <= 0.5,
                     child: const ShortInfoBlock()),
               ])),
-          body: Center(
-            child: MapGoogle(
-              togglePanel: _togglePanel,
-            ),
-          ),
+          body: MapBoxGl(
+              togglePanel: _togglePanel, panelPosition: previousPosition),
         ),
-      )),
+      ),
       Positioned(
         left: 25.0,
         bottom: 80.0,
         child: FloatingActionButton(
+          backgroundColor: themeSecondaryColor,
           onPressed: () {
             _showMenuModal(context);
           },
           child: const Icon(Icons.menu),
         ),
       ),
+      Positioned(
+        right: 25.0,
+        left: 100.0,
+        bottom: 50.0,
+        child: LocationsCarousel(togglePanel: _togglePanel),
+      ),
     ]);
   }