[google_maps_flutter] supports v2 android embedding. (#2488)
diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 9028c8c..75a5832 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.5.22
+
+* Support Android v2 embedding.
+* Bump the min flutter version to `1.12.13+hotfix.5`.
+* Fixes some e2e tests on Android.
+
## 0.5.21+17
* Fix Swift example in README.md.
diff --git a/packages/google_maps_flutter/android/build.gradle b/packages/google_maps_flutter/android/build.gradle
index 9baaea8..250939f 100644
--- a/packages/google_maps_flutter/android/build.gradle
+++ b/packages/google_maps_flutter/android/build.gradle
@@ -34,31 +34,8 @@
dependencies {
implementation 'com.google.android.gms:play-services-maps:17.0.0'
+ androidTestImplementation 'androidx.test:runner:1.2.0'
+ androidTestImplementation 'androidx.test:rules:1.2.0'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
}
}
-
-// TODO(cyanglaz): Remove this hack once androidx.lifecycle is included on stable. https://github.com/flutter/flutter/issues/42348
-afterEvaluate {
- def containsEmbeddingDependencies = false
- for (def configuration : configurations.all) {
- for (def dependency : configuration.dependencies) {
- if (dependency.group == 'io.flutter' &&
- dependency.name.startsWith('flutter_embedding') &&
- dependency.isTransitive())
- {
- containsEmbeddingDependencies = true
- break
- }
- }
- }
- if (!containsEmbeddingDependencies) {
- android {
- dependencies {
- def lifecycle_version = "1.1.1"
- compileOnly "android.arch.lifecycle:runtime:$lifecycle_version"
- compileOnly "android.arch.lifecycle:common:$lifecycle_version"
- compileOnly "android.arch.lifecycle:common-java8:$lifecycle_version"
- }
- }
- }
-}
\ No newline at end of file
diff --git a/packages/google_maps_flutter/android/gradle.properties b/packages/google_maps_flutter/android/gradle.properties
index 8bd86f6..38c8d45 100644
--- a/packages/google_maps_flutter/android/gradle.properties
+++ b/packages/google_maps_flutter/android/gradle.properties
@@ -1 +1,4 @@
org.gradle.jvmargs=-Xmx1536M
+android.enableR8=true
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
index e78908d..535e2ce 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
@@ -4,11 +4,14 @@
package io.flutter.plugins.googlemaps;
+import android.app.Application;
import android.content.Context;
import android.graphics.Rect;
+import androidx.lifecycle.Lifecycle;
import com.google.android.gms.maps.GoogleMapOptions;
import com.google.android.gms.maps.model.CameraPosition;
import com.google.android.gms.maps.model.LatLngBounds;
+import io.flutter.plugin.common.BinaryMessenger;
import io.flutter.plugin.common.PluginRegistry;
import java.util.concurrent.atomic.AtomicInteger;
@@ -27,9 +30,25 @@
private Rect padding = new Rect(0, 0, 0, 0);
GoogleMapController build(
- int id, Context context, AtomicInteger state, PluginRegistry.Registrar registrar) {
+ int id,
+ Context context,
+ AtomicInteger state,
+ BinaryMessenger binaryMessenger,
+ Application application,
+ Lifecycle lifecycle,
+ PluginRegistry.Registrar registrar,
+ int activityHashCode) {
final GoogleMapController controller =
- new GoogleMapController(id, context, state, registrar, options);
+ new GoogleMapController(
+ id,
+ context,
+ state,
+ binaryMessenger,
+ application,
+ lifecycle,
+ registrar,
+ activityHashCode,
+ options);
controller.init();
controller.setMyLocationEnabled(myLocationEnabled);
controller.setMyLocationButtonEnabled(myLocationButtonEnabled);
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
index 5c7d094..c7c02bd 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
@@ -21,6 +21,10 @@
import android.os.Bundle;
import android.util.Log;
import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
import com.google.android.gms.maps.CameraUpdate;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.GoogleMapOptions;
@@ -34,6 +38,8 @@
import com.google.android.gms.maps.model.Marker;
import com.google.android.gms.maps.model.Polygon;
import com.google.android.gms.maps.model.Polyline;
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
+import io.flutter.plugin.common.BinaryMessenger;
import io.flutter.plugin.common.MethodCall;
import io.flutter.plugin.common.MethodChannel;
import io.flutter.plugin.common.PluginRegistry;
@@ -48,6 +54,8 @@
/** Controller of a single GoogleMaps MapView instance. */
final class GoogleMapController
implements Application.ActivityLifecycleCallbacks,
+ DefaultLifecycleObserver,
+ ActivityPluginBinding.OnSaveInstanceStateListener,
GoogleMap.OnCameraIdleListener,
GoogleMap.OnCameraMoveListener,
GoogleMap.OnCameraMoveStartedListener,
@@ -68,7 +76,6 @@
private final int id;
private final AtomicInteger activityState;
private final MethodChannel methodChannel;
- private final PluginRegistry.Registrar registrar;
private final MapView mapView;
private GoogleMap googleMap;
private boolean trackCameraPosition = false;
@@ -80,8 +87,13 @@
private boolean disposed = false;
private final float density;
private MethodChannel.Result mapReadyResult;
- private final int registrarActivityHashCode;
+ private final int
+ activityHashCode; // Do not use directly, use getActivityHashCode() instead to get correct hashCode for both v1 and v2 embedding.
+ private final Lifecycle lifecycle;
private final Context context;
+ private final Application
+ mApplication; // Do not use direclty, use getApplication() instead to get correct application object for both v1 and v2 embedding.
+ private final PluginRegistry.Registrar registrar; // For v1 embedding only.
private final MarkersController markersController;
private final PolygonsController polygonsController;
private final PolylinesController polylinesController;
@@ -95,18 +107,23 @@
int id,
Context context,
AtomicInteger activityState,
+ BinaryMessenger binaryMessenger,
+ Application application,
+ Lifecycle lifecycle,
PluginRegistry.Registrar registrar,
+ int registrarActivityHashCode,
GoogleMapOptions options) {
this.id = id;
this.context = context;
this.activityState = activityState;
- this.registrar = registrar;
this.mapView = new MapView(context, options);
this.density = context.getResources().getDisplayMetrics().density;
- methodChannel =
- new MethodChannel(registrar.messenger(), "plugins.flutter.io/google_maps_" + id);
+ methodChannel = new MethodChannel(binaryMessenger, "plugins.flutter.io/google_maps_" + id);
methodChannel.setMethodCallHandler(this);
- this.registrarActivityHashCode = registrar.activity().hashCode();
+ mApplication = application;
+ this.lifecycle = lifecycle;
+ this.registrar = registrar;
+ this.activityHashCode = registrarActivityHashCode;
this.markersController = new MarkersController(methodChannel);
this.polygonsController = new PolygonsController(methodChannel);
this.polylinesController = new PolylinesController(methodChannel, density);
@@ -152,7 +169,11 @@
throw new IllegalArgumentException(
"Cannot interpret " + activityState.get() + " as an activity state");
}
- registrar.activity().getApplication().registerActivityLifecycleCallbacks(this);
+ if (lifecycle != null) {
+ lifecycle.addObserver(this);
+ } else {
+ getApplication().registerActivityLifecycleCallbacks(this);
+ }
mapView.getMapAsync(this);
}
@@ -368,6 +389,10 @@
result.success(googleMap.isBuildingsEnabled());
break;
}
+ case "map#getZoomLevel":
+ {
+ result.success(googleMap.getCameraPosition().zoom);
+ }
case "map#setStyle":
{
String mapStyle = (String) call.arguments;
@@ -472,7 +497,7 @@
disposed = true;
methodChannel.setMethodCallHandler(null);
mapView.onDestroy();
- registrar.activity().getApplication().unregisterActivityLifecycleCallbacks(this);
+ getApplication().unregisterActivityLifecycleCallbacks(this);
}
// @Override
@@ -489,9 +514,10 @@
// TODO(mklim): Remove this empty override once https://github.com/flutter/flutter/issues/40126 is fixed in stable.
};
+ // Application.ActivityLifecycleCallbacks methods
@Override
public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
- if (disposed || activity.hashCode() != registrarActivityHashCode) {
+ if (disposed || activity.hashCode() != getActivityHashCode()) {
return;
}
mapView.onCreate(savedInstanceState);
@@ -499,7 +525,7 @@
@Override
public void onActivityStarted(Activity activity) {
- if (disposed || activity.hashCode() != registrarActivityHashCode) {
+ if (disposed || activity.hashCode() != getActivityHashCode()) {
return;
}
mapView.onStart();
@@ -507,7 +533,7 @@
@Override
public void onActivityResumed(Activity activity) {
- if (disposed || activity.hashCode() != registrarActivityHashCode) {
+ if (disposed || activity.hashCode() != getActivityHashCode()) {
return;
}
mapView.onResume();
@@ -515,7 +541,7 @@
@Override
public void onActivityPaused(Activity activity) {
- if (disposed || activity.hashCode() != registrarActivityHashCode) {
+ if (disposed || activity.hashCode() != getActivityHashCode()) {
return;
}
mapView.onPause();
@@ -523,7 +549,7 @@
@Override
public void onActivityStopped(Activity activity) {
- if (disposed || activity.hashCode() != registrarActivityHashCode) {
+ if (disposed || activity.hashCode() != getActivityHashCode()) {
return;
}
mapView.onStop();
@@ -531,7 +557,7 @@
@Override
public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
- if (disposed || activity.hashCode() != registrarActivityHashCode) {
+ if (disposed || activity.hashCode() != getActivityHashCode()) {
return;
}
mapView.onSaveInstanceState(outState);
@@ -539,12 +565,78 @@
@Override
public void onActivityDestroyed(Activity activity) {
- if (disposed || activity.hashCode() != registrarActivityHashCode) {
+ if (disposed || activity.hashCode() != getActivityHashCode()) {
return;
}
mapView.onDestroy();
}
+ // DefaultLifecycleObserver and OnSaveInstanceStateListener
+
+ @Override
+ public void onCreate(@NonNull LifecycleOwner owner) {
+ if (disposed) {
+ return;
+ }
+ mapView.onCreate(null);
+ }
+
+ @Override
+ public void onStart(@NonNull LifecycleOwner owner) {
+ if (disposed) {
+ return;
+ }
+ mapView.onStart();
+ }
+
+ @Override
+ public void onResume(@NonNull LifecycleOwner owner) {
+ if (disposed) {
+ return;
+ }
+ mapView.onResume();
+ }
+
+ @Override
+ public void onPause(@NonNull LifecycleOwner owner) {
+ if (disposed) {
+ return;
+ }
+ mapView.onResume();
+ }
+
+ @Override
+ public void onStop(@NonNull LifecycleOwner owner) {
+ if (disposed) {
+ return;
+ }
+ mapView.onStop();
+ }
+
+ @Override
+ public void onDestroy(@NonNull LifecycleOwner owner) {
+ if (disposed) {
+ return;
+ }
+ mapView.onDestroy();
+ }
+
+ @Override
+ public void onRestoreInstanceState(Bundle bundle) {
+ if (disposed) {
+ return;
+ }
+ mapView.onCreate(bundle);
+ }
+
+ @Override
+ public void onSaveInstanceState(Bundle bundle) {
+ if (disposed) {
+ return;
+ }
+ mapView.onSaveInstanceState(bundle);
+ }
+
// GoogleMapOptionsSink methods
@Override
@@ -716,6 +808,22 @@
permission, android.os.Process.myPid(), android.os.Process.myUid());
}
+ private int getActivityHashCode() {
+ if (registrar != null && registrar.activity() != null) {
+ return registrar.activity().hashCode();
+ } else {
+ return activityHashCode;
+ }
+ }
+
+ private Application getApplication() {
+ if (registrar != null && registrar.activity() != null) {
+ return registrar.activity().getApplication();
+ } else {
+ return mApplication;
+ }
+ }
+
public void setIndoorEnabled(boolean indoorEnabled) {
this.indoorEnabled = indoorEnabled;
}
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
index 9d1b331..b6bc7e5 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
@@ -4,10 +4,12 @@
package io.flutter.plugins.googlemaps;
-import static io.flutter.plugin.common.PluginRegistry.Registrar;
-
+import android.app.Application;
import android.content.Context;
+import androidx.lifecycle.Lifecycle;
import com.google.android.gms.maps.model.CameraPosition;
+import io.flutter.plugin.common.BinaryMessenger;
+import io.flutter.plugin.common.PluginRegistry;
import io.flutter.plugin.common.StandardMessageCodec;
import io.flutter.plugin.platform.PlatformView;
import io.flutter.plugin.platform.PlatformViewFactory;
@@ -17,12 +19,26 @@
public class GoogleMapFactory extends PlatformViewFactory {
private final AtomicInteger mActivityState;
- private final Registrar mPluginRegistrar;
+ private final BinaryMessenger binaryMessenger;
+ private final Application application;
+ private final int activityHashCode;
+ private final Lifecycle lifecycle;
+ private final PluginRegistry.Registrar registrar; // V1 embedding only.
- GoogleMapFactory(AtomicInteger state, Registrar registrar) {
+ GoogleMapFactory(
+ AtomicInteger state,
+ BinaryMessenger binaryMessenger,
+ Application application,
+ Lifecycle lifecycle,
+ PluginRegistry.Registrar registrar,
+ int activityHashCode) {
super(StandardMessageCodec.INSTANCE);
mActivityState = state;
- mPluginRegistrar = registrar;
+ this.binaryMessenger = binaryMessenger;
+ this.application = application;
+ this.activityHashCode = activityHashCode;
+ this.lifecycle = lifecycle;
+ this.registrar = registrar;
}
@SuppressWarnings("unchecked")
@@ -48,6 +64,14 @@
if (params.containsKey("circlesToAdd")) {
builder.setInitialCircles(params.get("circlesToAdd"));
}
- return builder.build(id, context, mActivityState, mPluginRegistrar);
+ return builder.build(
+ id,
+ context,
+ mActivityState,
+ binaryMessenger,
+ application,
+ lifecycle,
+ registrar,
+ activityHashCode);
}
}
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java
index b27fea4..9f9f378 100644
--- a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java
+++ b/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java
@@ -7,6 +7,14 @@
import android.app.Activity;
import android.app.Application;
import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
+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.FlutterLifecycleAdapter;
import io.flutter.plugin.common.PluginRegistry.Registrar;
import java.util.concurrent.atomic.AtomicInteger;
@@ -16,7 +24,11 @@
* the map. A Texture drawn using GoogleMap bitmap snapshots can then be shown instead of the
* overlay.
*/
-public class GoogleMapsPlugin implements Application.ActivityLifecycleCallbacks {
+public class GoogleMapsPlugin
+ implements Application.ActivityLifecycleCallbacks,
+ FlutterPlugin,
+ ActivityAware,
+ DefaultLifecycleObserver {
static final int CREATED = 1;
static final int STARTED = 2;
static final int RESUMED = 3;
@@ -24,7 +36,11 @@
static final int STOPPED = 5;
static final int DESTROYED = 6;
private final AtomicInteger state = new AtomicInteger(0);
- private final int registrarActivityHashCode;
+ private int registrarActivityHashCode;
+ private FlutterPluginBinding pluginBinding;
+ private Lifecycle lifecycle;
+
+ private static final String VIEW_TYPE = "plugins.flutter.io/google_maps";
public static void registerWith(Registrar registrar) {
if (registrar.activity() == null) {
@@ -32,14 +48,98 @@
// We stop the registration process as this plugin is foreground only.
return;
}
- final GoogleMapsPlugin plugin = new GoogleMapsPlugin(registrar);
+ final GoogleMapsPlugin plugin = new GoogleMapsPlugin(registrar.activity());
registrar.activity().getApplication().registerActivityLifecycleCallbacks(plugin);
registrar
.platformViewRegistry()
.registerViewFactory(
- "plugins.flutter.io/google_maps", new GoogleMapFactory(plugin.state, registrar));
+ VIEW_TYPE,
+ new GoogleMapFactory(plugin.state, registrar.messenger(), null, null, registrar, -1));
}
+ public GoogleMapsPlugin() {}
+
+ // FlutterPlugin
+
+ @Override
+ public void onAttachedToEngine(FlutterPluginBinding binding) {
+ pluginBinding = binding;
+ }
+
+ @Override
+ public void onDetachedFromEngine(FlutterPluginBinding binding) {
+ pluginBinding = null;
+ }
+
+ // ActivityAware
+
+ @Override
+ public void onAttachedToActivity(ActivityPluginBinding binding) {
+ lifecycle = FlutterLifecycleAdapter.getActivityLifecycle(binding);
+ lifecycle.addObserver(this);
+ pluginBinding
+ .getPlatformViewRegistry()
+ .registerViewFactory(
+ VIEW_TYPE,
+ new GoogleMapFactory(
+ state,
+ pluginBinding.getBinaryMessenger(),
+ binding.getActivity().getApplication(),
+ lifecycle,
+ null,
+ binding.getActivity().hashCode()));
+ }
+
+ @Override
+ public void onDetachedFromActivity() {
+ lifecycle.removeObserver(this);
+ }
+
+ @Override
+ public void onDetachedFromActivityForConfigChanges() {
+ this.onDetachedFromActivity();
+ }
+
+ @Override
+ public void onReattachedToActivityForConfigChanges(ActivityPluginBinding binding) {
+ lifecycle = FlutterLifecycleAdapter.getActivityLifecycle(binding);
+ lifecycle.addObserver(this);
+ }
+
+ // DefaultLifecycleObserver methods
+
+ @Override
+ public void onCreate(@NonNull LifecycleOwner owner) {
+ state.set(CREATED);
+ }
+
+ @Override
+ public void onStart(@NonNull LifecycleOwner owner) {
+ state.set(STARTED);
+ }
+
+ @Override
+ public void onResume(@NonNull LifecycleOwner owner) {
+ state.set(RESUMED);
+ }
+
+ @Override
+ public void onPause(@NonNull LifecycleOwner owner) {
+ state.set(PAUSED);
+ }
+
+ @Override
+ public void onStop(@NonNull LifecycleOwner owner) {
+ state.set(STOPPED);
+ }
+
+ @Override
+ public void onDestroy(@NonNull LifecycleOwner owner) {
+ state.set(DESTROYED);
+ }
+
+ // Application.ActivityLifecycleCallbacks methods
+
@Override
public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
if (activity.hashCode() != registrarActivityHashCode) {
@@ -92,7 +192,7 @@
state.set(DESTROYED);
}
- private GoogleMapsPlugin(Registrar registrar) {
- this.registrarActivityHashCode = registrar.activity().hashCode();
+ private GoogleMapsPlugin(Activity activity) {
+ this.registrarActivityHashCode = activity.hashCode();
}
}
diff --git a/packages/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java b/packages/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java
new file mode 100644
index 0000000..ff39d1d
--- /dev/null
+++ b/packages/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java
@@ -0,0 +1,14 @@
+package io.flutter.plugins.googlemaps;
+
+import androidx.test.rule.ActivityTestRule;
+import dev.flutter.plugins.e2e.FlutterRunner;
+import io.flutter.plugins.googlemapsexample.*;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+@RunWith(FlutterRunner.class)
+public class EmbeddingV1ActivityTest {
+ @Rule
+ public ActivityTestRule<EmbeddingV1Activity> rule =
+ new ActivityTestRule<>(EmbeddingV1Activity.class);
+}
diff --git a/packages/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/MainActivityTest.java b/packages/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/MainActivityTest.java
new file mode 100644
index 0000000..525d2da
--- /dev/null
+++ b/packages/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/MainActivityTest.java
@@ -0,0 +1,13 @@
+package io.flutter.plugins.googlemaps;
+
+import androidx.test.rule.ActivityTestRule;
+import dev.flutter.plugins.e2e.FlutterRunner;
+import io.flutter.embedding.android.FlutterActivity;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+@RunWith(FlutterRunner.class)
+public class MainActivityTest {
+ @Rule
+ public ActivityTestRule<FlutterActivity> rule = new ActivityTestRule<>(FlutterActivity.class);
+}
diff --git a/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml b/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
index 1e20d08..0ff45c3 100644
--- a/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
@@ -15,9 +15,7 @@
<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="${mapsApiKey}" />
- <activity
- android:name=".MainActivity"
- android:launchMode="singleTop"
+ <activity android:name="io.flutter.embedding.android.FlutterActivity"
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale"
android:hardwareAccelerated="true"
@@ -30,5 +28,13 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
+ <activity
+ android:name=".EmbeddingV1Activity"
+ android:theme="@style/LaunchTheme"
+ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale"
+ android:hardwareAccelerated="true"
+ android:windowSoftInputMode="adjustResize">
+ </activity>
+ <meta-data android:name="flutterEmbedding" android:value="2"/>
</application>
</manifest>
diff --git a/packages/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java b/packages/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java
new file mode 100644
index 0000000..8d7b305
--- /dev/null
+++ b/packages/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java
@@ -0,0 +1,15 @@
+package io.flutter.plugins.googlemapsexample;
+
+import android.os.Bundle;
+import dev.flutter.plugins.e2e.E2EPlugin;
+import io.flutter.app.FlutterActivity;
+import io.flutter.plugins.googlemaps.GoogleMapsPlugin;
+
+public class EmbeddingV1Activity extends FlutterActivity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ GoogleMapsPlugin.registerWith(registrarFor("io.flutter.plugins.googlemaps.GoogleMapsPlugin"));
+ E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin"));
+ }
+}
diff --git a/packages/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/MainActivity.java b/packages/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/MainActivity.java
deleted file mode 100644
index 80a7946..0000000
--- a/packages/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/MainActivity.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.flutter.plugins.googlemapsexample;
-
-import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
-import io.flutter.plugins.GeneratedPluginRegistrant;
-
-public class MainActivity extends FlutterActivity {
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- GeneratedPluginRegistrant.registerWith(this);
- }
-}
diff --git a/packages/google_maps_flutter/example/android/gradle.properties b/packages/google_maps_flutter/example/android/gradle.properties
index 38c8d45..207beb6 100644
--- a/packages/google_maps_flutter/example/android/gradle.properties
+++ b/packages/google_maps_flutter/example/android/gradle.properties
@@ -2,3 +2,4 @@
android.enableR8=true
android.useAndroidX=true
android.enableJetifier=true
+
diff --git a/packages/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/example/pubspec.yaml
index 7e533a8..4f34304 100644
--- a/packages/google_maps_flutter/example/pubspec.yaml
+++ b/packages/google_maps_flutter/example/pubspec.yaml
@@ -8,10 +8,11 @@
# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^0.1.0
-
-dev_dependencies:
google_maps_flutter:
path: ../
+ flutter_plugin_android_lifecycle: ^1.0.0
+
+dev_dependencies:
flutter_driver:
sdk: flutter
test: ^1.6.0
diff --git a/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart b/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
index ab0f82a..1f87a87 100644
--- a/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
+++ b/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
@@ -30,6 +30,12 @@
return MinMaxZoomPreference(zoomLevels[0], zoomLevels[1]);
}
+ Future<double> getZoomLevel() async {
+ final double zoomLevel =
+ await _channel.invokeMethod<double>('map#getZoomLevel');
+ return zoomLevel;
+ }
+
Future<bool> isZoomGesturesEnabled() async {
return await _channel.invokeMethod<bool>('map#isZoomGesturesEnabled');
}
diff --git a/packages/google_maps_flutter/example/test_driver/google_maps_e2e.dart b/packages/google_maps_flutter/example/test_driver/google_maps_e2e.dart
index 0c1f33c..1b1c086 100644
--- a/packages/google_maps_flutter/example/test_driver/google_maps_e2e.dart
+++ b/packages/google_maps_flutter/example/test_driver/google_maps_e2e.dart
@@ -101,12 +101,23 @@
});
testWidgets('updateMinMaxZoomLevels', (WidgetTester tester) async {
+ // The behaviors of setting min max zoom level on iOS and Android are different.
+ // On iOS, when we get the min or max zoom level after setting the preference, the
+ // min and max will be exactly the same as the value we set; on Android however,
+ // the values we get do not equal to the value we set.
+ //
+ // Also, when we call zoomTo to set the zoom, on Android, it usually
+ // honors the preferences that we set and the zoom cannot pass beyond the boundary.
+ // On iOS, on the other hand, zoomTo seems to override the preferences.
+ //
+ // Thus we test iOS and Android a little differently here.
final Key key = GlobalKey();
final Completer<GoogleMapInspector> inspectorCompleter =
Completer<GoogleMapInspector>();
+ GoogleMapController controller;
- const MinMaxZoomPreference initialZoomLevel = MinMaxZoomPreference(2, 4);
- const MinMaxZoomPreference finalZoomLevel = MinMaxZoomPreference(3, 8);
+ const MinMaxZoomPreference initialZoomLevel = MinMaxZoomPreference(4, 8);
+ const MinMaxZoomPreference finalZoomLevel = MinMaxZoomPreference(6, 10);
await tester.pumpWidget(Directionality(
textDirection: TextDirection.ltr,
@@ -114,18 +125,32 @@
key: key,
initialCameraPosition: _kInitialCameraPosition,
minMaxZoomPreference: initialZoomLevel,
- onMapCreated: (GoogleMapController controller) {
+ onMapCreated: (GoogleMapController c) async {
final GoogleMapInspector inspector =
// ignore: invalid_use_of_visible_for_testing_member
- GoogleMapInspector(controller.channel);
+ GoogleMapInspector(c.channel);
+ controller = c;
inspectorCompleter.complete(inspector);
},
),
));
final GoogleMapInspector inspector = await inspectorCompleter.future;
- MinMaxZoomPreference zoomLevel = await inspector.getMinMaxZoomLevels();
- expect(zoomLevel, equals(initialZoomLevel));
+
+ if (Platform.isIOS) {
+ MinMaxZoomPreference zoomLevel = await inspector.getMinMaxZoomLevels();
+ expect(zoomLevel, equals(initialZoomLevel));
+ } else if (Platform.isAndroid) {
+ await controller.moveCamera(CameraUpdate.zoomTo(15));
+ await tester.pumpAndSettle();
+ double zoomLevel = await inspector.getZoomLevel();
+ expect(zoomLevel, equals(initialZoomLevel.maxZoom));
+
+ await controller.moveCamera(CameraUpdate.zoomTo(1));
+ await tester.pumpAndSettle();
+ zoomLevel = await inspector.getZoomLevel();
+ expect(zoomLevel, equals(initialZoomLevel.minZoom));
+ }
await tester.pumpWidget(Directionality(
textDirection: TextDirection.ltr,
@@ -139,8 +164,20 @@
),
));
- zoomLevel = await inspector.getMinMaxZoomLevels();
- expect(zoomLevel, equals(finalZoomLevel));
+ if (Platform.isIOS) {
+ MinMaxZoomPreference zoomLevel = await inspector.getMinMaxZoomLevels();
+ expect(zoomLevel, equals(finalZoomLevel));
+ } else {
+ await controller.moveCamera(CameraUpdate.zoomTo(15));
+ await tester.pumpAndSettle();
+ double zoomLevel = await inspector.getZoomLevel();
+ expect(zoomLevel, equals(finalZoomLevel.maxZoom));
+
+ await controller.moveCamera(CameraUpdate.zoomTo(1));
+ await tester.pumpAndSettle();
+ zoomLevel = await inspector.getZoomLevel();
+ expect(zoomLevel, equals(finalZoomLevel.minZoom));
+ }
});
testWidgets('testZoomGesturesEnabled', (WidgetTester tester) async {
@@ -426,6 +463,7 @@
expect(isBuildingsEnabled, true);
});
+ // Location button tests are skipped in Android because we don't have location permission to test.
testWidgets('testMyLocationButtonToggle', (WidgetTester tester) async {
final Key key = GlobalKey();
final Completer<GoogleMapInspector> inspectorCompleter =
@@ -466,7 +504,7 @@
myLocationButtonEnabled = await inspector.isMyLocationButtonEnabled();
expect(myLocationButtonEnabled, false);
- });
+ }, skip: Platform.isAndroid);
testWidgets('testMyLocationButton initial value false',
(WidgetTester tester) async {
@@ -494,7 +532,7 @@
final bool myLocationButtonEnabled =
await inspector.isMyLocationButtonEnabled();
expect(myLocationButtonEnabled, false);
- });
+ }, skip: Platform.isAndroid);
testWidgets('testMyLocationButton initial value true',
(WidgetTester tester) async {
@@ -522,7 +560,7 @@
final bool myLocationButtonEnabled =
await inspector.isMyLocationButtonEnabled();
expect(myLocationButtonEnabled, true);
- });
+ }, skip: Platform.isAndroid);
testWidgets('testSetMapStyle valid Json String', (WidgetTester tester) async {
final Key key = GlobalKey();
@@ -569,8 +607,7 @@
await controller.setMapStyle('invalid_value');
fail('expected MapStyleException');
} on MapStyleException catch (e) {
- expect(e.cause,
- 'The data couldn’t be read because it isn’t in the correct format.');
+ expect(e.cause, isNotNull);
}
});
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index da20706..37e0ad0 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -236,6 +236,8 @@
} else if ([call.method isEqualToString:@"map#getMinMaxZoomLevels"]) {
NSArray* zoomLevels = @[ @(_mapView.minZoom), @(_mapView.maxZoom) ];
result(zoomLevels);
+ } else if ([call.method isEqualToString:@"map#getZoomLevel"]) {
+ result(@(_mapView.camera.zoom));
} else if ([call.method isEqualToString:@"map#isZoomGesturesEnabled"]) {
NSNumber* isZoomGesturesEnabled = @(_mapView.settings.zoomGestures);
result(isZoomGesturesEnabled);
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 77510d0..b2ea9a1 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -1,11 +1,12 @@
name: google_maps_flutter
description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.21+17
+version: 0.5.22
dependencies:
flutter:
sdk: flutter
+ flutter_plugin_android_lifecycle: ^1.0.0
dev_dependencies:
flutter_test:
@@ -29,4 +30,4 @@
environment:
sdk: ">=2.0.0-dev.47.0 <3.0.0"
- flutter: ">=1.10.0 <2.0.0"
+ flutter: ">=1.12.13+hotfix.5 <2.0.0"
