synced with main branch

maplibre · Jun 24, 2024 · 5b5e639 · 5b5e639
2 parents 925ba67 + 5c11535
commit 5b5e639
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 18 deletions.
diff --git a/example/lib/place_symbol.dart b/example/lib/place_symbol.dart
@@ -260,8 +260,8 @@ class PlaceSymbolBodyState extends State<PlaceSymbolBody> {
     setState(() {
       _iconAllowOverlap = !_iconAllowOverlap;
     });
-    controller!.setSymbolIconAllowOverlap(_iconAllowOverlap);
-    controller!.setSymbolTextAllowOverlap(_iconAllowOverlap);
+    await controller!.setSymbolIconAllowOverlap(_iconAllowOverlap);
+    await controller!.setSymbolTextAllowOverlap(_iconAllowOverlap);
   }
 
   @override

diff --git a/maplibre_gl/android/build.gradle b/maplibre_gl/android/build.gradle
@@ -2,13 +2,15 @@ group 'org.maplibre.maplibregl'
 version '1.0-SNAPSHOT'
 
 buildscript {
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
@@ -20,15 +22,15 @@ rootProject.allprojects {
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'org.jetbrains.kotlin.android'
+apply plugin: 'kotlin-android'
 
 android {
     if (project.android.hasProperty("namespace")) {
         namespace 'org.maplibre.maplibregl'
     }
 
     compileSdkVersion 34
-    ndkVersion "20.1.5948944"
+    ndkVersion "26.1.10909125"
 
     defaultConfig {
         minSdkVersion 21

diff --git a/maplibre_gl/android/gradle/wrapper/gradle-wrapper.properties b/maplibre_gl/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sat Mar 06 23:07:28 CET 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
diff --git a/maplibre_gl/android/src/main/java/org/maplibre/maplibregl/MapLibreMapController.java b/maplibre_gl/android/src/main/java/org/maplibre/maplibregl/MapLibreMapController.java
@@ -1791,15 +1791,17 @@ private void destroyMapViewIfNecessary() {
     if (mapView == null) {
       return;
     }
-    mapViewContainer.removeView(mapView);
-    mapView.onStop();
-    mapView.onDestroy();
 
     if (locationComponent != null) {
       locationComponent.setLocationComponentEnabled(false);
     }
     stopListeningForLocationUpdates();
 
+    mapViewContainer.removeView(mapView);
+
+    mapView.onStop();
+    mapView.onDestroy();
+
     mapView = null;
   }
 

diff --git a/maplibre_gl/android/src/main/java/org/maplibre/maplibregl/MapLibreMapsPlugin.java b/maplibre_gl/android/src/main/java/org/maplibre/maplibregl/MapLibreMapsPlugin.java
@@ -4,20 +4,14 @@
 
 package org.maplibre.maplibregl;
 
-import android.app.Activity;
-import android.app.Application;
-import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.LifecycleRegistry;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.embedding.engine.plugins.lifecycle.HiddenLifecycleReference;
 import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 /**
  * Plugin for controlling a set of MapLibreMap views to be shown as overlays on top of the Flutter
@@ -27,8 +21,6 @@
  */
 public class MapLibreMapsPlugin implements FlutterPlugin, ActivityAware {
 
-  private static final String VIEW_TYPE = "plugins.flutter.io/maplibre_gl";
-
   static FlutterAssets flutterAssets;
   private Lifecycle lifecycle;