Upgrade dart and flutter versions

Author: TarekTolba1

arcgis_map_sdk/lib/arcgis_map_sdk.dart

@@ -1,6 +1,3 @@
-// ignore: unnecessary_library_directive
-library arcgis_map;
-
 export 'package:arcgis_map_sdk/src/arcgis_location_display.dart';
 export 'package:arcgis_map_sdk/src/arcgis_map_controller.dart';
 export 'package:arcgis_map_sdk/src/arcgis_map_sdk.dart';

arcgis_map_sdk/pubspec.yaml

@@ -6,8 +6,8 @@ maintainer: Matthaios Saitakis (@MatthaiosSait), Stefan Schaller (@stefanschalle
   Pascal Welsch (@passsy), Max Peters (@maxpeters)
 
 environment:
-  sdk: ">=3.0.0 <4.0.0"
-  flutter: ">=3.10.0"
+  sdk: ">=3.2.0 <4.0.0"
+  flutter: ">=3.16.0"
 
 dependencies:
   arcgis_map_sdk_android: ^0.8.0

arcgis_map_sdk_android/pubspec.yaml

@@ -5,8 +5,8 @@ repository: https://github.com/fluttercommunity/arcgis_map_sdk
 maintainer: Stefan Schaller (@stefanschaller), Julian Bissekkou (@JulianBissekkou)
 
 environment:
-  sdk: ">=3.0.0 <4.0.0"
-  flutter: ">=3.10.0"
+  sdk: ">=3.2.0 <4.0.0"
+  flutter: ">=3.16.0"
 
 dependencies:
   arcgis_map_sdk_method_channel: ^0.8.0

arcgis_map_sdk_ios/pubspec.yaml

@@ -5,8 +5,8 @@ repository: https://github.com/fluttercommunity/arcgis_map_sdk
 maintainer: Stefan Schaller (@stefanschaller), Julian Bissekkou (@JulianBissekkou)
 
 environment:
-  sdk: ">=3.0.0 <4.0.0"
-  flutter: ">=3.10.0"
+  sdk: ">=3.2.0 <4.0.0"
+  flutter: ">=3.16.0"
 
 dependencies:
   arcgis_map_sdk_method_channel: ^0.8.0

arcgis_map_sdk_method_channel/lib/src/method_channel_arcgis_map_plugin.dart

@@ -25,7 +25,7 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
     int mapId,
     void Function(double)? getZoom,
     String layerId,
-  ) async {
+  ) {
     throw UnimplementedError('addFeatureLayer() has not been implemented.');
   }
 
@@ -43,7 +43,8 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
 
   @override
   Future<void> setAutoPanMode(String autoPanMode, int mapId) {
-    return _methodChannelBuilder(mapId).invokeMethod("set_auto_pan_mode", autoPanMode);
+    return _methodChannelBuilder(mapId)
+        .invokeMethod("set_auto_pan_mode", autoPanMode);
   }
 
   @override
@@ -121,7 +122,7 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
     required int mapId,
     required String featureLayerId,
     required List<Graphic> data,
-  }) async {
+  }) {
     throw UnimplementedError('addFeatureLayer() has not been implemented.');
   }
 
@@ -165,7 +166,7 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
     AnimationOptions? animationOptions,
     int? threeDHeading,
     int? threeDTilt,
-  }) async {
+  }) {
     return _methodChannelBuilder(mapId).invokeMethod<bool>(
       "move_camera",
       {
@@ -196,7 +197,7 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
     required int lodFactor,
     required int mapId,
     AnimationOptions? animationOptions,
-  }) async {
+  }) {
     return _methodChannelBuilder(mapId).invokeMethod<bool>(
       "zoom_in",
       {"lodFactor": lodFactor},
@@ -208,15 +209,15 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
     required int lodFactor,
     required int mapId,
     AnimationOptions? animationOptions,
-  }) async {
+  }) {
     return _methodChannelBuilder(mapId).invokeMethod<bool>(
       "zoom_out",
       {"lodFactor": lodFactor},
     ).then((value) => value!);
   }
 
   @override
-  Future<void> retryLoad(int mapId) async {
+  Future<void> retryLoad(int mapId) {
     return _methodChannelBuilder(mapId).invokeMethod("retryLoad");
   }
 

arcgis_map_sdk_method_channel/lib/src/model_extension.dart

@@ -110,7 +110,7 @@ extension on MeshSymbol3D {
           {
             'type': 'fill',
             'material': {
-              'color': [color.red, color.green, color.blue, colorOpacity],
+              'color': [color.r, color.g, color.b, colorOpacity],
             },
           },
         ],
@@ -174,10 +174,10 @@ Map<String, Object?>? _colorToJson(Color? color) {
   if (color == null) return null;
 
   return {
-    'red': color.red,
-    'green': color.green,
-    'blue': color.blue,
-    'opacity': color.opacity,
+    'red': color.r,
+    'green': color.g,
+    'blue': color.b,
+    'opacity': color.a / 255,
   };
 }
 

arcgis_map_sdk_method_channel/pubspec.yaml

@@ -5,8 +5,8 @@ repository: https://github.com/fluttercommunity/arcgis_map_sdk
 maintainer:  Stefan Schaller (@stefanschaller), Julian Bissekkou (@JulianBissekkou)
 
 environment:
-  sdk: ">=3.0.0 <4.0.0"
-  flutter: ">=3.10.0"
+  sdk: ">=3.2.0 <4.0.0"
+  flutter: ">=3.16.0"
 
 dependencies:
   arcgis_map_sdk_platform_interface: ^1.0.1

arcgis_map_sdk_platform_interface/lib/arcgis_map_sdk_platform_interface.dart

@@ -1,6 +1,3 @@
-// ignore: unnecessary_library_directive
-library arcgis_map_sdk_platform_interface;
-
 export 'package:arcgis_map_sdk_platform_interface/src/arcgis_map_sdk_platform_interface.dart';
 export 'package:arcgis_map_sdk_platform_interface/src/events/map_event.dart';
 export 'package:arcgis_map_sdk_platform_interface/src/models/animation_options.dart';

arcgis_map_sdk_platform_interface/pubspec.yaml

@@ -6,8 +6,8 @@ maintainer: Matthaios Saitakis (@MatthaiosSait), Stefan Schaller (@stefanschalle
   Pascal Welsch (@passsy), Max Peters (@maxpeters)
 
 environment:
-  sdk: ">=3.0.0 <4.0.0"
-  flutter: ">=3.10.0"
+  sdk: ">=3.2.0 <4.0.0"
+  flutter: ">=3.16.0"
 
 dependencies:
   flutter:

arcgis_map_sdk_web/lib/arcgis_map_web_js.dart

@@ -1,10 +1,8 @@
 @JS()
-library arcgis_map_sdk_web;
-
 import 'dart:async';
-import 'dart:js_util';
-
 import 'package:js/js.dart';
+import 'package:js/js_util.dart';
+import 'package:web/web.dart';
 
 export 'package:arcgis_map_sdk_web/src/arcgis_map_sdk_web.dart';
 
@@ -420,12 +418,8 @@ class JsHandle {
 @JS()
 class Popup {}
 
-@JS()
-@staticInterop
-class WebGLRenderingContext {}
-
 extension WebGLRenderingContextExtension on WebGLRenderingContext {
-  external WebglLoseContext? getExtension(String something);
+  external WebglLoseContext? getCustomExtension(String something);
 }
 
 @JS()

arcgis_map_sdk_web/lib/src/arcgis_map_sdk_web.dart

@@ -1,12 +1,12 @@
 import 'dart:async';
-import 'dart:html';
-import 'dart:js';
 
 import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart';
 import 'package:arcgis_map_sdk_web/src/arcgis_map_web_controller.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_web_plugins/flutter_web_plugins.dart';
+import 'package:js/js_util.dart';
+import 'package:web/web.dart';
 
 class ArcgisMapWeb extends ArcgisMapPlatform {
   static final _hasScriptLoaded = Completer();
@@ -15,15 +15,14 @@ class ArcgisMapWeb extends ArcgisMapPlatform {
     ArcgisMapPlatform.instance = ArcgisMapWeb();
 
     //load webpack custom build of the ArcGIS JS API
-    final script = ScriptElement()
-      ..addEventListener("load", (event) => _hasScriptLoaded.complete())
-      // ignore: unsafe_html
+    final script = HTMLScriptElement()
       ..src =
           "assets/packages/arcgis_map_sdk_web/assets/arcgis_js_api_custom_build/main.js";
 
+    script.onLoad.listen((event) => _hasScriptLoaded.complete());
     document.head!.append(script);
 
-    final link = LinkElement()
+    final link = HTMLLinkElement()
       ..type = "text/css"
       ..href =
           "assets/packages/arcgis_map_sdk_web/assets/css_overrides/override_outline.css"
@@ -120,7 +119,7 @@ class ArcgisMapWeb extends ArcgisMapPlatform {
   }
 
   @override
-  Future<void> toggleBaseMap(int mapId, BaseMap baseMap) async {
+  Future<void> toggleBaseMap(int mapId, BaseMap baseMap) {
     return _map(mapId).toggleBaseMap(baseMap: baseMap);
   }
 
@@ -140,7 +139,7 @@ class ArcgisMapWeb extends ArcgisMapPlatform {
     int mapId,
     void Function(double)? getZoom,
     String layerId,
-  ) async {
+  ) {
     return _map(mapId)
         .addFeatureLayer(options, data, onPressed, url, getZoom, layerId);
   }
@@ -151,7 +150,7 @@ class ArcgisMapWeb extends ArcgisMapPlatform {
     int mapId,
     String layerId,
     void Function(dynamic)? onPressed,
-  ) async {
+  ) {
     return _map(mapId).addGraphicsLayer(
       options,
       layerId,
@@ -165,7 +164,7 @@ class ArcgisMapWeb extends ArcgisMapPlatform {
     required String layerId,
     required String url,
     required int mapId,
-  }) async {
+  }) {
     return _map(mapId).addSceneLayer(
       options: options,
       layerId: layerId,
@@ -283,8 +282,14 @@ class ArcgisMapWeb extends ArcgisMapPlatform {
       ///
       /// https://developers.arcgis.com/javascript/latest/es-modules/#managing-assets-locally
       // ignore: avoid_dynamic_calls
-      context["esri"]["core"]["config"]["assetsPath"] =
-          "/assets/packages/arcgis_map_sdk_web/assets/arcgis_js_api_custom_build/assets";
+      final esri = getProperty<Object>(globalThis, 'esri');
+      final core = getProperty<Object>(esri, 'core');
+      final config = getProperty<Object>(core, 'config');
+      setProperty(
+        config,
+        'assetsPath',
+        "/assets/packages/arcgis_map_sdk_web/assets/arcgis_js_api_custom_build/assets",
+      );
     });
 
     final mapController = ArcgisMapWebController(

arcgis_map_sdk_web/lib/src/arcgis_map_web_controller.dart

@@ -1,7 +1,5 @@
 import 'dart:async';
-import 'dart:html';
-import 'dart:js';
-import 'dart:js_util';
+import 'dart:js_interop';
 import 'dart:ui' as ui;
 
 import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart';
@@ -15,6 +13,8 @@ import 'package:async/async.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
+import 'package:js/js_util.dart';
+import 'package:web/web.dart';
 
 class ArcgisMapWebController {
   final int _mapId;
@@ -35,7 +35,7 @@ class ArcgisMapWebController {
     maxZoom: _mapOptions.maxZoom,
   );
 
-  late final _div = DivElement()
+  late final _div = HTMLDivElement()
     ..id = _getViewType(_mapId)
     ..style.width = '100%'
     ..style.height = '100%';
@@ -90,8 +90,10 @@ class ArcgisMapWebController {
   }
 
   Future<void> _createMap() async {
-    // ignore: avoid_dynamic_calls
-    context["esri"]["core"]["config"]["apiKey"] = _mapOptions.apiKey;
+    final esri = getProperty<Object>(globalThis, 'esri');
+    final core = getProperty<Object>(esri, 'core');
+    final config = getProperty<Object>(core, 'config');
+    setProperty(config, 'apiKey', _mapOptions.apiKey);
 
     if (_mapOptions.mapStyle == MapStyle.threeD) {
       _sceneView = _createJsSceneView();
@@ -171,7 +173,7 @@ class ArcgisMapWebController {
     void Function(double)? getZoom,
     String layerId,
   ) async {
-    if (context["FeatureLayer"] == null) {
+    if (getProperty(globalThis, "FeatureLayer") == null) {
       await promiseToFuture(loadFeatureLayer());
     }
     return _layerController!.createFeatureLayer(
@@ -189,7 +191,7 @@ class ArcgisMapWebController {
     required SceneLayerOptions options,
     required String layerId,
     required String url,
-  }) async {
+  }) {
     final scene = _layerController!.createSceneLayer(
       options: options,
       layerId: layerId,
@@ -209,7 +211,7 @@ class ArcgisMapWebController {
     GraphicsLayerOptions options,
     String layerId,
     void Function(dynamic)? onPressed,
-  ) async {
+  ) {
     return _layerController!.createGraphicsLayer(
       options,
       layerId,
@@ -254,23 +256,23 @@ class ArcgisMapWebController {
     );
     // "webgl" (or "experimental-webgl") which will create a WebGLRenderingContext object representing a
     // three-dimensional rendering context. This context is only available on browsers that implement WebGL version 1 (OpenGL ES 2.0).
-    final webgl = (canvasElement as CanvasElement?)?.getContext('webgl');
+    final webgl = (canvasElement as HTMLCanvasElement?)?.getContext('webgl');
     // "webgl2" which will create a WebGL2RenderingContext object representing a three-dimensional rendering context.
     // This context is only available on browsers that implement WebGL version 2 (OpenGL ES 3.0)
     final webgl2 = canvasElement?.getContext('webgl2');
 
     if (webgl != null) {
       (webgl as WebGLRenderingContext)
-          .getExtension('WEBGL_lose_context')
+          .getCustomExtension('WEBGL_lose_context')
           ?.loseContext();
-      webgl.getExtension('WEBGL_lose_context')?.restoreContext();
+      webgl.getCustomExtension('WEBGL_lose_context')?.restoreContext();
     }
 
     if (webgl2 != null) {
       (webgl2 as WebGLRenderingContext)
-          .getExtension('WEBGL_lose_context')
+          .getCustomExtension('WEBGL_lose_context')
           ?.loseContext();
-      webgl2.getExtension('WEBGL_lose_context')?.restoreContext();
+      webgl2.getCustomExtension('WEBGL_lose_context')?.restoreContext();
     }
   }
 

arcgis_map_sdk_web/lib/src/components/attribution.dart

@@ -1,10 +1,9 @@
-import "dart:js_util" as js_util;
-
 import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart';
+import 'package:js/js_util.dart';
 
 /// The attribution attached to the map view
 class Attribution {
   JsAttribution init({dynamic view}) => JsAttribution(
-        js_util.jsify({"view": view}),
+        jsify({"view": view}),
       );
 }