Merge pull request #12 from valentingrigorean/bug-map-update-flutter-3.0.0

Bug map update flutter 3.0.0

Author: valentingrigorean

android/src/main/java/com/valentingrigorean/arcgis_maps_flutter/map/ArcgisMapController.java

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.util.Log;
+import android.view.Choreographer;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
@@ -19,6 +20,8 @@
 import com.esri.arcgisruntime.geometry.GeometryEngine;
 import com.esri.arcgisruntime.geometry.Point;
 import com.esri.arcgisruntime.layers.Layer;
+import com.esri.arcgisruntime.loadable.LoadStatusChangedEvent;
+import com.esri.arcgisruntime.loadable.LoadStatusChangedListener;
 import com.esri.arcgisruntime.location.LocationDataSource;
 import com.esri.arcgisruntime.mapping.ArcGISMap;
 import com.esri.arcgisruntime.mapping.LayerList;
@@ -93,6 +96,8 @@ final class ArcgisMapController implements DefaultLifecycleObserver, PlatformVie
 
     private boolean disposed = false;
 
+    private boolean loadedCallbackPending = false;
+
     ArcgisMapController(
             int id,
             Context context,
@@ -258,6 +263,7 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result
             }
             break;
             case "map#setMap": {
+                invalidateMapIfNeeded();
                 final Viewpoint viewpoint = mapView.getCurrentViewpoint(Viewpoint.Type.CENTER_AND_SCALE);
                 changeMapType(call.arguments);
                 if (viewpoint != null) {
@@ -395,11 +401,13 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result
             }
             break;
             case "layers#update": {
+                invalidateMapIfNeeded();
                 layersController.updateFromArgs(call.arguments);
                 result.success(null);
             }
             break;
             case "markers#update": {
+                invalidateMapIfNeeded();
                 List<Object> markersToAdd = call.argument("markersToAdd");
                 markersController.addMarkers(markersToAdd);
                 List<Object> markersToChange = call.argument("markersToChange");
@@ -410,12 +418,14 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result
             }
             break;
             case "map#clearMarkerSelection": {
+                invalidateMapIfNeeded();
                 selectionPropertiesHandler.reset();
                 markersController.clearSelectedMarker();
                 result.success(null);
             }
             break;
             case "polygons#update": {
+                invalidateMapIfNeeded();
                 List<Object> polygonsToAdd = call.argument("polygonsToAdd");
                 polygonsController.addPolygons(polygonsToAdd);
                 List<Object> polygonsToChange = call.argument("polygonsToChange");
@@ -426,6 +436,7 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result
             }
             break;
             case "polylines#update": {
+                invalidateMapIfNeeded();
                 List<Object> polylinesToAdd = call.argument("polylinesToAdd");
                 polylinesController.addPolylines(polylinesToAdd);
                 List<Object> polylinesToChange = call.argument("polylinesToChange");
@@ -522,6 +533,42 @@ private void destroyMapViewIfNecessary() {
         }
     }
 
+    /**
+     * Invalidates the map view after the map has finished rendering.
+     *
+     * <p>gmscore GL renderer uses a {@link android.view.TextureView}. Android platform views that are
+     * displayed as a texture after Flutter v3.0.0. require that the view hierarchy is notified after
+     * all drawing operations have been flushed.
+     *
+     * <p>Since the GL renderer doesn't use standard Android views, and instead uses GL directly, we
+     * notify the view hierarchy by invalidating the view.
+     *
+     * <p>To workaround this limitation, wait two frames. This ensures that at least the frame budget
+     * (16.66ms at 60hz) have passed since the drawing operation was issued.
+     */
+    private void invalidateMapIfNeeded() {
+        if (mapView == null || mapView.getMap() == null || loadedCallbackPending) {
+            return;
+        }
+
+        loadedCallbackPending = true;
+        mapView.getMap().addDoneLoadingListener(() -> {
+            loadedCallbackPending = false;
+            postFrameCallback(() -> postFrameCallback(
+                    () -> {
+                        if (mapView != null) {
+                            mapView.invalidate();
+                        }
+                    }));
+        });
+    }
+
+    private static void postFrameCallback(Runnable f) {
+        Choreographer.getInstance()
+                .postFrameCallback(frameTimeNanos -> f.run());
+    }
+
+
     private void handleTimeAwareLayerInfos(MethodChannel.Result result) {
         final ArcGISMap map = mapView.getMap();
         if (map == null || map.getOperationalLayers().size() == 0) {

pubspec.yaml

@@ -1,6 +1,6 @@
 name: arcgis_maps_flutter
 description: A new flutter plugin project.
-version: 0.0.4+2
+version: 0.0.4+3
 homepage:
 
 environment:
@@ -24,7 +24,7 @@ dev_dependencies:
     sdk: flutter
   flutter_lints: ^2.0.1
   mockito: ^5.2.0
-  build_runner: ^2.1.11
+  build_runner: ^2.2.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec