CodemateLtd
diff --git a/‎packages/google_adsense/example/integration_test/adsense_test_js_interop.dart
Lines changed: 90 additions & 0 deletions b/‎packages/google_adsense/example/integration_test/adsense_test_js_interop.dart
Lines changed: 90 additions & 0 deletions
diff --git a/‎packages/google_adsense/lib/src/js_interop/adsbygoogle.dart
Lines changed: 36 additions & 0 deletions b/‎packages/google_adsense/lib/src/js_interop/adsbygoogle.dart
Lines changed: 36 additions & 0 deletions
diff --git a/‎packages/google_adsense/lib/src/js_interop/package_web_tweaks.dart
Lines changed: 47 additions & 0 deletions b/‎packages/google_adsense/lib/src/js_interop/package_web_tweaks.dart
Lines changed: 47 additions & 0 deletions
diff --git a/‎packages/google_maps_flutter/google_maps_flutter_android/lib/src/messages.g.dart
Lines changed: 4 additions & 4 deletions b/‎packages/google_maps_flutter/google_maps_flutter_android/lib/src/messages.g.dart
Lines changed: 4 additions & 4 deletions
diff --git a/‎packages/google_maps_flutter/google_maps_flutter_android/pigeons/messages.dart
Lines changed: 2 additions & 4 deletions b/‎packages/google_maps_flutter/google_maps_flutter_android/pigeons/messages.dart
Lines changed: 2 additions & 4 deletions
diff --git a/‎packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.m
Lines changed: 17 additions & 0 deletions b/‎packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.m
Lines changed: 17 additions & 0 deletions
diff --git a/‎packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.m
Lines changed: 4 additions & 26 deletions b/‎packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.m
Lines changed: 4 additions & 26 deletions
@@ -0,0 +1,90 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@JS()
+library;
+
+import 'dart:async';
+import 'dart:js_interop';
+import 'dart:ui';
+
+import 'package:google_adsense/src/adsense/ad_unit_params.dart';
+import 'package:web/web.dart' as web;
+
+typedef VoidFn = void Function();
+
+// window.adsbygoogle uses "duck typing", so let us set anything to it.
+@JS('adsbygoogle')
+external set _adsbygoogle(JSAny? value);
+
+/// Mocks `adsbygoogle` [push] function.
+///
+/// `push` will run in the next tick (`Timer.run`) to ensure async behavior.
+void mockAdsByGoogle(VoidFn push) {
+  _adsbygoogle = <String, Object>{
+    'push': () {
+      Timer.run(push);
+    }.toJS,
+  }.jsify();
+}
+
+/// Sets `adsbygoogle` to null.
+void clearAdsByGoogleMock() {
+  _adsbygoogle = null;
+}
+
+typedef MockAdConfig = ({Size size, String adStatus});
+
+/// Returns a function that generates a "push" function for [mockAdsByGoogle].
+VoidFn mockAd({
+  Size size = Size.zero,
+  String adStatus = AdStatus.FILLED,
+}) {
+  return mockAds(
+    <MockAdConfig>[(size: size, adStatus: adStatus)],
+  );
+}
+
+/// Returns a function that handles a bunch of ad units at once. Can be used with [mockAdsByGoogle].
+VoidFn mockAds(List<MockAdConfig> adConfigs) {
+  return () {
+    final List<web.HTMLElement> foundTargets =
+        web.document.querySelectorAll('div[id^=adUnit] ins').toList;
+
+    for (int i = 0; i < foundTargets.length; i++) {
+      final web.HTMLElement adTarget = foundTargets[i];
+      if (adTarget.children.length > 0) {
+        continue;
+      }
+
+      final (:Size size, :String adStatus) = adConfigs[i];
+
+      final web.HTMLElement fakeAd = web.HTMLDivElement()
+        ..style.width = '${size.width}px'
+        ..style.height = '${size.height}px'
+        ..style.background = '#fabada';
+
+      // AdSense seems to be setting the width/height on the `ins` of the injected ad too.
+      adTarget
+        ..style.width = '${size.width}px'
+        ..style.height = '${size.height}px'
+        ..style.display = 'block'
+        ..appendChild(fakeAd)
+        ..setAttribute('data-ad-status', adStatus);
+    }
+  };
+}
+
+extension on web.NodeList {
+  List<web.HTMLElement> get toList {
+    final List<web.HTMLElement> result = <web.HTMLElement>[];
+    for (int i = 0; i < length; i++) {
+      final web.Node? node = item(i);
+      if (node != null && node.isA<web.HTMLElement>()) {
+        result.add(node as web.HTMLElement);
+      }
+    }
+    return result;
+  }
+}
@@ -0,0 +1,36 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@JS()
+library;
+
+import 'dart:js_interop';
+
+/// JS-interop mappings to the window.adsbygoogle object.
+extension type AdsByGoogle._(JSObject _) implements JSObject {
+  /// Pushes some `params` to the `window.adsbygoogle` object.
+  external void push(JSObject params);
+}
+
+// window.adsbygoogle may be null if this package runs before the JS SDK loads.
+@JS('adsbygoogle')
+external AdsByGoogle? get _adsbygoogle;
+
+// window.adsbygoogle uses "duck typing", so let us set anything to it.
+@JS('adsbygoogle')
+external set _adsbygoogle(JSAny? value);
+
+/// Whether or not the `window.adsbygoogle` object is defined and not null.
+bool get adsbygooglePresent => _adsbygoogle.isDefinedAndNotNull;
+
+/// Binding to the `adsbygoogle` JS global.
+///
+/// See: https://support.google.com/adsense/answer/9274516?hl=en&ref_topic=28893&sjid=11495822575537499409-EU
+AdsByGoogle get adsbygoogle {
+  if (!adsbygooglePresent) {
+    // Initialize _adsbygoole to "something that has a push method".
+    _adsbygoogle = JSArray<JSObject>();
+  }
+  return _adsbygoogle!;
+}
@@ -0,0 +1,47 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:js_interop';
+
+import 'package:web/web.dart' as web;
+
+// Re-use of https://github.com/flutter/packages/blob/main/packages/google_identity_services_web/lib/src/js_interop/package_web_tweaks.dart
+
+/// This extension gives web.window a nullable getter to the `trustedTypes`
+/// property, which needs to be used to check for feature support.
+extension NullableTrustedTypesGetter on web.Window {
+  /// (Nullable) Bindings to window.trustedTypes.
+  ///
+  /// This may be null if the browser doesn't support the Trusted Types API.
+  ///
+  /// See: https://developer.mozilla.org/en-US/docs/Web/API/Trusted_Types_API
+  @JS('trustedTypes')
+  external web.TrustedTypePolicyFactory? get nullableTrustedTypes;
+}
+
+/// Allows setting a TrustedScriptURL as the src of a script element.
+extension TrustedTypeSrcAttribute on web.HTMLScriptElement {
+  @JS('src')
+  external set trustedSrc(web.TrustedScriptURL value);
+}
+
+/// Allows creating a script URL only from a string, with no arguments.
+extension CreateScriptUrlNoArgs on web.TrustedTypePolicy {
+  /// Allows calling `createScriptURL` with only the `input` argument.
+  @JS('createScriptURL')
+  external web.TrustedScriptURL createScriptURLNoArgs(String input);
+}
+
+/// Exception thrown if the Trusted Types feature is supported, enabled, and it
+/// has prevented this loader from injecting the JS SDK.
+class TrustedTypesException implements Exception {
+  ///
+  TrustedTypesException(this.message);
+
+  /// The message of the exception
+  final String message;
+
+  @override
+  String toString() => 'TrustedTypesException: $message';
+}
@@ -1109,7 +1109,7 @@ class PlatformMapConfiguration {
     this.trafficEnabled,
     this.buildingsEnabled,
     this.liteModeEnabled,
-    this.mapId,
+    this.cloudMapId,
     this.style,
   });
 
@@ -1149,7 +1149,7 @@ class PlatformMapConfiguration {
 
   bool? liteModeEnabled;
 
-  String? mapId;
+  String? cloudMapId;
 
   String? style;
 
@@ -1173,7 +1173,7 @@ class PlatformMapConfiguration {
       trafficEnabled,
       buildingsEnabled,
       liteModeEnabled,
-      mapId,
+      cloudMapId,
       style,
     ];
   }
@@ -1199,7 +1199,7 @@ class PlatformMapConfiguration {
       trafficEnabled: result[15] as bool?,
       buildingsEnabled: result[16] as bool?,
       liteModeEnabled: result[17] as bool?,
-      mapId: result[18] as String?,
+      cloudMapId: result[18] as String?,
       style: result[19] as String?,
     );
   }
 
@@ -428,13 +428,11 @@ class PlatformMapViewCreationParams {
   final List<PlatformHeatmap> initialHeatmaps;
   final List<PlatformTileOverlay> initialTileOverlays;
   final List<PlatformClusterManager> initialClusterManagers;
-  final PlatformMarkerType markerType;
+  fina PlatformMarkerType markerType;
 }
 
 enum PlatformMarkerType {
-  marker,
-  advancedMarker,
-}
+marker, advancedMarker,}
 
 /// Pigeon equivalent of MapConfiguration.
 class PlatformMapConfiguration {
 
@@ -106,6 +106,23 @@ - (void)setZIndex:(int)zIndex {
   self.marker.zIndex = zIndex;
 }
 
+- (void)updateFromPlatformMarker:(FGMPlatformMarker *)platformMarker
+                       registrar:(NSObject<FlutterPluginRegistrar> *)registrar
+                     screenScale:(CGFloat)screenScale {
+  [self setAlpha:platformMarker.alpha];
+  [self setAnchor:FGMGetCGPointForPigeonPoint(platformMarker.anchor)];
+  [self setDraggable:platformMarker.draggable];
+  UIImage *image = [self iconFromBitmap:platformMarker.icon
+                              registrar:registrar
+                            screenScale:screenScale];
+  [self setIcon:image];
+  [self setFlat:platformMarker.flat];
+  [self setConsumeTapEvents:platformMarker.consumeTapEvents];
+  [self setPosition:FGMGetCoordinateForPigeonLatLng(platformMarker.position)];
+  [self setRotation:platformMarker.rotation];
+  [self setVisible:platformMarker.visible];
+  [self setZIndex:platformMarker.zIndex];
+}
 - (void)setCollisionBehavior:(int)collisionBehavior {
   if ([self.marker isKindOfClass:[GMSAdvancedMarker class]]) {
     GMSCollisionBehavior collitionBehaviorValue = (GMSCollisionBehavior)collisionBehavior;
 
@@ -1161,7 +1161,7 @@ + (instancetype)makeWithCompassEnabled:(nullable NSNumber *)compassEnabled
                      indoorViewEnabled:(nullable NSNumber *)indoorViewEnabled
                         trafficEnabled:(nullable NSNumber *)trafficEnabled
                       buildingsEnabled:(nullable NSNumber *)buildingsEnabled
-                                 mapId:(nullable NSString *)mapId
+                            cloudMapId:(nullable NSString *)cloudMapId
                                  style:(nullable NSString *)style {
   FGMPlatformMapConfiguration *pigeonResult = [[FGMPlatformMapConfiguration alloc] init];
   pigeonResult.compassEnabled = compassEnabled;
@@ -1179,7 +1179,7 @@ + (instancetype)makeWithCompassEnabled:(nullable NSNumber *)compassEnabled
   pigeonResult.indoorViewEnabled = indoorViewEnabled;
   pigeonResult.trafficEnabled = trafficEnabled;
   pigeonResult.buildingsEnabled = buildingsEnabled;
-  pigeonResult.mapId = mapId;
+  pigeonResult.cloudMapId = cloudMapId;
   pigeonResult.style = style;
   return pigeonResult;
 }
@@ -1200,7 +1200,7 @@ + (FGMPlatformMapConfiguration *)fromList:(NSArray<id> *)list {
   pigeonResult.indoorViewEnabled = GetNullableObjectAtIndex(list, 12);
   pigeonResult.trafficEnabled = GetNullableObjectAtIndex(list, 13);
   pigeonResult.buildingsEnabled = GetNullableObjectAtIndex(list, 14);
-  pigeonResult.mapId = GetNullableObjectAtIndex(list, 15);
+  pigeonResult.cloudMapId = GetNullableObjectAtIndex(list, 15);
   pigeonResult.style = GetNullableObjectAtIndex(list, 16);
   return pigeonResult;
 }
@@ -1224,7 +1224,7 @@ + (nullable FGMPlatformMapConfiguration *)nullableFromList:(NSArray<id> *)list {
     self.indoorViewEnabled ?: [NSNull null],
     self.trafficEnabled ?: [NSNull null],
     self.buildingsEnabled ?: [NSNull null],
-    self.mapId ?: [NSNull null],
+    self.cloudMapId ?: [NSNull null],
     self.style ?: [NSNull null],
   ];
 }
@@ -2398,28 +2398,6 @@ void SetUpFGMMapsApiWithSuffix(id<FlutterBinaryMessenger> binaryMessenger,
       [channel setMessageHandler:nil];
     }
   }
-  /// Returns true if the map supports advanced markers
-  {
-    FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
-           initWithName:[NSString stringWithFormat:@"%@%@",
-                                                   @"dev.flutter.pigeon.google_maps_flutter_ios."
-                                                   @"MapsApi.isAdvancedMarkersAvailable",
-                                                   messageChannelSuffix]
-        binaryMessenger:binaryMessenger
-                  codec:FGMGetMessagesCodec()];
-    if (api) {
-      NSCAssert([api respondsToSelector:@selector(isAdvancedMarkersAvailable:)],
-                @"FGMMapsApi api (%@) doesn't respond to @selector(isAdvancedMarkersAvailable:)",
-                api);
-      [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
-        FlutterError *error;
-        NSNumber *output = [api isAdvancedMarkersAvailable:&error];
-        callback(wrapResult(output, error));
-      }];
-    } else {
-      [channel setMessageHandler:nil];
-    }
-  }
 }
 @interface FGMMapsCallbackApi ()
 @property(nonatomic, strong) NSObject<FlutterBinaryMessenger> *binaryMessenger;