diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md index cdd213db2..ed3645b5f 100644 --- a/packages/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/CHANGELOG.md @@ -9,3 +9,8 @@ * Update google_map_flutter_tizen based on webview_flutter_tizen * Update example and integration_test * Update google_map_flutter to 2.0.8 + +## 0.1.1 + +* Update webview_flutter_tizen to 0.3.8 +* Replace deprecated API (evaluateJavascript -> [runJavascript, runJavascriptForResult]) diff --git a/packages/google_maps_flutter/README.md b/packages/google_maps_flutter/README.md index 81a2aa89e..82fa31e73 100644 --- a/packages/google_maps_flutter/README.md +++ b/packages/google_maps_flutter/README.md @@ -19,7 +19,7 @@ This package is not an _endorsed_ implementation of `google_maps_flutter`. There ```yaml dependencies: google_maps_flutter: ^2.0.8 - google_maps_flutter_tizen: ^0.1.0 + google_maps_flutter_tizen: ^0.1.1 ``` In addition, you need a Maps JavaScript API Key to use this plugin. Please refer to the site below to get the API key. diff --git a/packages/google_maps_flutter/example/tizen/tizen-manifest.xml b/packages/google_maps_flutter/example/tizen/tizen-manifest.xml index 2889fffc0..66a6db3ee 100644 --- a/packages/google_maps_flutter/example/tizen/tizen-manifest.xml +++ b/packages/google_maps_flutter/example/tizen/tizen-manifest.xml @@ -10,6 +10,5 @@ http://tizen.org/privilege/internet - diff --git a/packages/google_maps_flutter/lib/src/circle.dart b/packages/google_maps_flutter/lib/src/circle.dart index e096ef88b..16676f395 100644 --- a/packages/google_maps_flutter/lib/src/circle.dart +++ b/packages/google_maps_flutter/lib/src/circle.dart @@ -28,7 +28,7 @@ class CircleController { Future _addCircleEvent(Future? _controller) async { final String command = "$_circle.addListener('click', (event) => CircleClick.postMessage(JSON.stringify(${_circle?.id})));"; - await (await _controller!).evaluateJavascript(command); + await (await _controller!).runJavascript(command); } /// Returns `true` if this Controller will use its own `onTap` handler to consume events. diff --git a/packages/google_maps_flutter/lib/src/google_maps_controller.dart b/packages/google_maps_flutter/lib/src/google_maps_controller.dart index 8eebeac4f..ad880e091 100644 --- a/packages/google_maps_flutter/lib/src/google_maps_controller.dart +++ b/packages/google_maps_flutter/lib/src/google_maps_controller.dart @@ -29,8 +29,8 @@ class GoogleMapsController { /// Returns min-max zoom levels. Test only. @visibleForTesting Future getMinMaxZoomLevels() async { - final String value = await (await controller) - .evaluateJavascript('JSON.stringify([map.minZoom, map.maxZoom])'); + final String value = await (await controller).runJavascriptReturningResult( + 'JSON.stringify([map.minZoom, map.maxZoom])'); final dynamic bound = json.decode(value); double min = 0, max = 0; if (bound is List) { @@ -52,8 +52,8 @@ class GoogleMapsController { /// Returns if zoomGestures property is enabled. Test only. @visibleForTesting Future isZoomGesturesEnabled() async { - final String value = - await (await controller).evaluateJavascript('map.gestureHandling'); + final String value = await (await controller) + .runJavascriptReturningResult('map.gestureHandling'); return value != 'none'; } @@ -61,16 +61,16 @@ class GoogleMapsController { /// Returns if zoomControls property is enabled. Test only. Future isZoomControlsEnabled() async { - final String value = - await (await controller).evaluateJavascript('map.zoomControl'); + final String value = await (await controller) + .runJavascriptReturningResult('map.zoomControl'); return value != 'false'; } /// Returns if scrollGestures property is enabled. Test only. @visibleForTesting Future isScrollGesturesEnabled() async { - final String value = - await (await controller).evaluateJavascript('map.gestureHandling'); + final String value = await (await controller) + .runJavascriptReturningResult('map.gestureHandling'); return value != 'none'; } @@ -119,7 +119,7 @@ class GoogleMapsController { map.addListener('click', (event) => Click.postMessage(JSON.stringify(event))); map.addListener('rightclick', (event) => RightClick.postMessage(JSON.stringify(event))); '''; - await (await controller).evaluateJavascript(command); + await (await controller).runJavascript(command); } /// The Flutter widget that will contain the rendered Map. Used for caching. @@ -491,7 +491,7 @@ class GoogleMapsController { console.log('trafficLayer detached!!'); } '''; - await (await controller).evaluateJavascript(command); + await (await controller).runJavascript(command); } Future _setMoveCamera(String options) async { @@ -512,8 +512,8 @@ class GoogleMapsController { Future _callMethod( WebViewController mapView, String method, List args) async { - return await mapView - .evaluateJavascript('JSON.stringify(map.$method.apply(map, $args))'); + return await mapView.runJavascriptReturningResult( + 'JSON.stringify(map.$method.apply(map, $args))'); } Future _getZoom(WebViewController c) async { @@ -629,7 +629,7 @@ class GoogleMapsController { JSON.stringify(getPixelToLatLng()); '''; - return await (await controller).evaluateJavascript(command); + return await (await controller).runJavascriptReturningResult(command); } Future _latLngToPoint(LatLng latLng) async { @@ -649,7 +649,7 @@ class GoogleMapsController { JSON.stringify(getLatLngToPixel()); '''; - return await (await controller).evaluateJavascript(command); + return await (await controller).runJavascriptReturningResult(command); } /// Returns the zoom level of the current viewport. diff --git a/packages/google_maps_flutter/lib/src/marker.dart b/packages/google_maps_flutter/lib/src/marker.dart index f2e9c213d..d510364f8 100644 --- a/packages/google_maps_flutter/lib/src/marker.dart +++ b/packages/google_maps_flutter/lib/src/marker.dart @@ -44,7 +44,7 @@ class MarkerController { final String command = '''$marker.addListener("click", (event) => MarkerClick.postMessage(JSON.stringify(${marker?.id}))); $marker.addListener("dragend", (event) => MarkerDragEnd.postMessage(JSON.stringify({id:${marker?.id}, event:event})));'''; - await (await _controller!).evaluateJavascript(command); + await (await _controller!).runJavascript(command); } /// Returns `true` if this Controller will use its own `onTap` handler to consume events. diff --git a/packages/google_maps_flutter/lib/src/polygon.dart b/packages/google_maps_flutter/lib/src/polygon.dart index a839d17b5..8cca2816b 100644 --- a/packages/google_maps_flutter/lib/src/polygon.dart +++ b/packages/google_maps_flutter/lib/src/polygon.dart @@ -28,7 +28,7 @@ class PolygonController { Future _addPolygonEvent(Future? _controller) async { final String command = "$_polygon.addListener('click', (event) => PolygonClick.postMessage(JSON.stringify(${_polygon?.id})));"; - await (await _controller!).evaluateJavascript(command); + await (await _controller!).runJavascript(command); } /// Returns `true` if this Controller will use its own `onTap` handler to consume events. diff --git a/packages/google_maps_flutter/lib/src/polyline.dart b/packages/google_maps_flutter/lib/src/polyline.dart index 73a313975..220f9a2f3 100644 --- a/packages/google_maps_flutter/lib/src/polyline.dart +++ b/packages/google_maps_flutter/lib/src/polyline.dart @@ -28,7 +28,7 @@ class PolylineController { Future _addPolylineEvent(Future? _controller) async { final String command = "$_polyline.addListener('click', (event) => PolylineClick.postMessage(JSON.stringify(${_polyline?.id})));"; - await (await _controller!).evaluateJavascript(command); + await (await _controller!).runJavascript(command); } /// Returns `true` if this Controller will use its own `onTap` handler to consume events. diff --git a/packages/google_maps_flutter/lib/src/util.dart b/packages/google_maps_flutter/lib/src/util.dart index 11e588504..9351b7412 100644 --- a/packages/google_maps_flutter/lib/src/util.dart +++ b/packages/google_maps_flutter/lib/src/util.dart @@ -158,7 +158,7 @@ class GInfoWindow { } Future _createInfoWindow(GInfoWindowOptions? opts) async { - await (await webController!).evaluateJavascript( + await (await webController!).runJavascript( 'var ${toString()} = new google.maps.InfoWindow($opts);'); } @@ -171,7 +171,7 @@ class GInfoWindow { } Future _callCloseInfoWindow() async { - await (await webController!).evaluateJavascript('${toString()}.close();'); + await (await webController!).runJavascript('${toString()}.close();'); } /// Opens InfoWindow on the given map. @@ -182,7 +182,7 @@ class GInfoWindow { } Future _callOpenInfoWindow(GMarker? anchor) async { - await (await webController!).evaluateJavascript( + await (await webController!).runJavascript( '${toString()}.open({anchor: ${anchor.toString()}, map});'); } @@ -217,8 +217,8 @@ class GMarker { } Future _createMarker(GMarkerOptions? opts) async { - await (await webController!).evaluateJavascript( - 'var ${toString()} = new google.maps.Marker($opts);'); + await (await webController!) + .runJavascript('var ${toString()} = new google.maps.Marker($opts);'); } /// GMarker id. @@ -269,8 +269,8 @@ class GPolyline { } Future _createPolyline(GPolylineOptions? opts) async { - await (await webController!).evaluateJavascript( - 'var ${toString()} = new google.maps.Polyline($opts);'); + await (await webController!) + .runJavascript('var ${toString()} = new google.maps.Polyline($opts);'); } /// GPolyline id. @@ -363,8 +363,8 @@ class GPolygon { } Future _createPolygon(GPolygonOptions? opts) async { - await (await webController!).evaluateJavascript( - 'var ${toString()} = new google.maps.Polygon($opts);'); + await (await webController!) + .runJavascript('var ${toString()} = new google.maps.Polygon($opts);'); } /// GPolygon id. @@ -467,8 +467,8 @@ class GCircle { } Future _createCircle(GCircleOptions? opts) async { - await (await webController!).evaluateJavascript( - 'var ${toString()} = new google.maps.Circle($opts);'); + await (await webController!) + .runJavascript('var ${toString()} = new google.maps.Circle($opts);'); } /// GCircle id. @@ -562,7 +562,7 @@ Future? webController; Future getProperty(Object o, String property) async { assert(webController != null, 'mapController is null!!'); final String command = 'JSON.stringify(${o.toString()}[\'$property\'])'; - return await (await webController!).evaluateJavascript(command); + return await (await webController!).runJavascriptReturningResult(command); } /// Sets the value to property of the object. @@ -570,7 +570,7 @@ Future setProperty(Object o, String property, Object? value) async { assert(webController != null, 'mapController is null!!'); final String command = 'JSON.stringify(${o.toString()}[\'$property\'] = $value)'; - return await (await webController!).evaluateJavascript(command); + return await (await webController!).runJavascriptReturningResult(command); } /// Calls the method of the object with the args. @@ -578,5 +578,5 @@ Future callMethod(Object o, String method, List args) async { assert(webController != null, 'webController is null!!'); final String command = 'JSON.stringify(${o.toString()}.$method.apply(${o.toString()}, $args))'; - return await (await webController!).evaluateJavascript(command); + return await (await webController!).runJavascriptReturningResult(command); } diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml index 628fee898..6927593a7 100644 --- a/packages/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_tizen description: Tizen platform implementation of google_maps_flutter homepage: https://github.com/flutter-tizen/plugins repository: https://github.com/flutter-tizen/plugins/tree/master/packages/google_maps_flutter -version: 0.1.0 +version: 0.1.1 flutter: plugin: @@ -18,8 +18,8 @@ dependencies: google_maps_flutter_platform_interface: ^2.0.1 flutter_lints: ^1.0.4 stream_transform: ^2.0.0 - webview_flutter: ^2.0.4 - webview_flutter_tizen: ^0.3.3 + webview_flutter: ^2.3.0 + webview_flutter_tizen: ^0.3.8 dev_dependencies: flutter_test: