Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update formatting for ima
  • Loading branch information
reidbaker committed Oct 10, 2025
commit 927d508ec35cc90ac579a22d8dfa12f7880ca871
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ class AdsManagerDelegate {
void Function(AdErrorEvent event)? onAdErrorEvent,
}) : this.fromPlatformCreationParams(
PlatformAdsManagerDelegateCreationParams(
onAdEvent:
(PlatformAdEvent event) =>
onAdEvent?.call(AdEvent._fromPlatform(event)),
onAdEvent: (PlatformAdEvent event) =>
onAdEvent?.call(AdEvent._fromPlatform(event)),
onAdErrorEvent: onAdErrorEvent,
),
);
Expand Down
6 changes: 2 additions & 4 deletions packages/interactive_media_ads/lib/src/ads_request.dart
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,8 @@ class AdsRequest {
/// based on content progress (cue points).
ContentProgressProvider? get contentProgressProvider =>
platform.contentProgressProvider != null
? ContentProgressProvider.fromPlatform(
platform.contentProgressProvider!,
)
: null;
? ContentProgressProvider.fromPlatform(platform.contentProgressProvider!)
: null;

/// Notifies the SDK whether the player intends to start the content and ad in
/// response to a user action or whether it will be automatically played.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ base class AndroidAdDisplayContainer extends PlatformAdDisplayContainer {

// The `ViewGroup` used to create the native `ima.AdDisplayContainer`. The
// `View` that handles playing an ad is added as a child to this `ViewGroup`.
late final ima.FrameLayout _frameLayout =
_androidParams._imaProxy.newFrameLayout();
late final ima.FrameLayout _frameLayout = _androidParams._imaProxy
.newFrameLayout();

// Handles loading and displaying an ad.
late ima.VideoView _videoView;
Expand Down Expand Up @@ -132,10 +132,10 @@ base class AndroidAdDisplayContainer extends PlatformAdDisplayContainer {

late final AndroidAdDisplayContainerCreationParams _androidParams =
params is AndroidAdDisplayContainerCreationParams
? params as AndroidAdDisplayContainerCreationParams
: AndroidAdDisplayContainerCreationParams.fromPlatformAdDisplayContainerCreationParams(
params,
);
? params as AndroidAdDisplayContainerCreationParams
: AndroidAdDisplayContainerCreationParams.fromPlatformAdDisplayContainerCreationParams(
params,
);

@override
Widget build(BuildContext context) {
Expand Down Expand Up @@ -306,8 +306,8 @@ base class AndroidAdDisplayContainer extends PlatformAdDisplayContainer {
// app is returned to the foreground.
container._startPlayerWhenVideoIsPrepared = false;
await player.pause();
container._savedAdPosition =
await container._videoView.getCurrentPosition();
container._savedAdPosition = await container._videoView
.getCurrentPosition();
container._stopAdProgressTracking();
await Future.wait(<Future<void>>[
for (final ima.VideoAdPlayerCallback callback
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,16 @@ base class AndroidAdsLoader extends PlatformAdsLoader {
_adsLoaderFuture = _createAdsLoader();
}

late final ima.ImaSdkFactory _sdkFactory =
_androidParams._proxy.instanceImaSdkFactory();
late final ima.ImaSdkFactory _sdkFactory = _androidParams._proxy
.instanceImaSdkFactory();
late Future<ima.AdsLoader> _adsLoaderFuture;

late final AndroidAdsLoaderCreationParams _androidParams =
params is AndroidAdsLoaderCreationParams
? params as AndroidAdsLoaderCreationParams
: AndroidAdsLoaderCreationParams.fromPlatformAdsLoaderCreationParams(
params,
);
? params as AndroidAdsLoaderCreationParams
: AndroidAdsLoaderCreationParams.fromPlatformAdsLoaderCreationParams(
params,
);

@override
Future<void> contentComplete() async {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,9 @@ class AndroidAdsManager extends PlatformAdsManager {
Future<void> init({PlatformAdsRenderingSettings? settings}) async {
ima.AdsRenderingSettings? nativeSettings;
if (settings != null) {
nativeSettings =
settings is AndroidAdsRenderingSettings
? await settings.nativeSettings
: await AndroidAdsRenderingSettings(
settings.params,
).nativeSettings;
nativeSettings = settings is AndroidAdsRenderingSettings
? await settings.nativeSettings
: await AndroidAdsRenderingSettings(settings.params).nativeSettings;
}

await _manager.init(nativeSettings);
Expand Down Expand Up @@ -142,35 +139,32 @@ PlatformAd _asPlatformAd(ima.Ad ad) {
creativeId: ad.creativeId,
dealId: ad.dealId,
description: ad.description,
duration:
ad.duration == -1
? null
: Duration(
milliseconds:
(ad.duration * Duration.millisecondsPerSecond).round(),
),
duration: ad.duration == -1
? null
: Duration(
milliseconds: (ad.duration * Duration.millisecondsPerSecond)
.round(),
),
height: ad.height,
skipTimeOffset:
ad.skipTimeOffset == -1
? null
: Duration(
milliseconds:
(ad.skipTimeOffset * Duration.millisecondsPerSecond).round(),
),
skipTimeOffset: ad.skipTimeOffset == -1
? null
: Duration(
milliseconds: (ad.skipTimeOffset * Duration.millisecondsPerSecond)
.round(),
),
surveyUrl: ad.surveyUrl,
title: ad.title,
traffickingParameters: ad.traffickingParameters,
uiElements:
ad.uiElements
.map((ima.UiElement element) {
return switch (element) {
ima.UiElement.adAttribution => AdUIElement.adAttribution,
ima.UiElement.countdown => AdUIElement.countdown,
ima.UiElement.unknown => null,
};
})
.whereType<AdUIElement>()
.toSet(),
uiElements: ad.uiElements
.map((ima.UiElement element) {
return switch (element) {
ima.UiElement.adAttribution => AdUIElement.adAttribution,
ima.UiElement.countdown => AdUIElement.countdown,
ima.UiElement.unknown => null,
};
})
.whereType<AdUIElement>()
.toSet(),
universalAdIds: ad.universalAdIds.map(_asPlatformUniversalAdId).toList(),
vastMediaBitrate: ad.vastMediaBitrate,
vastMediaHeight: ad.vastMediaHeight,
Expand All @@ -184,18 +178,17 @@ PlatformAd _asPlatformAd(ima.Ad ad) {
PlatformAdPodInfo _asPlatformAdInfo(ima.AdPodInfo adPodInfo) {
return PlatformAdPodInfo(
adPosition: adPodInfo.adPosition,
maxDuration:
adPodInfo.maxDuration == -1
? null
: Duration(
milliseconds:
(adPodInfo.maxDuration * Duration.millisecondsPerSecond)
.round(),
),
maxDuration: adPodInfo.maxDuration == -1
? null
: Duration(
milliseconds:
(adPodInfo.maxDuration * Duration.millisecondsPerSecond)
.round(),
),
podIndex: adPodInfo.podIndex,
timeOffset: Duration(
milliseconds:
(adPodInfo.timeOffset * Duration.millisecondsPerSecond).round(),
milliseconds: (adPodInfo.timeOffset * Duration.millisecondsPerSecond)
.round(),
),
totalAds: adPodInfo.totalAds,
isBumper: adPodInfo.isBumper,
Expand All @@ -215,11 +208,11 @@ PlatformUniversalAdId _asPlatformUniversalAdId(
ima.UniversalAdId universalAdId,
) {
return PlatformUniversalAdId(
adIdValue:
universalAdId.adIdValue == 'unknown' ? null : universalAdId.adIdValue,
adIdRegistry:
universalAdId.adIdRegistry == 'unknown'
? null
: universalAdId.adIdRegistry,
adIdValue: universalAdId.adIdValue == 'unknown'
? null
: universalAdId.adIdValue,
adIdRegistry: universalAdId.adIdRegistry == 'unknown'
? null
: universalAdId.adIdRegistry,
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ base class AndroidAdsRenderingSettings extends PlatformAdsRenderingSettings {

late final AndroidAdsRenderingSettingsCreationParams _androidParams =
params is AndroidAdsRenderingSettingsCreationParams
? params as AndroidAdsRenderingSettingsCreationParams
: AndroidAdsRenderingSettingsCreationParams.fromPlatformAdsRenderingSettingsCreationParams(
params,
);
? params as AndroidAdsRenderingSettingsCreationParams
: AndroidAdsRenderingSettingsCreationParams.fromPlatformAdsRenderingSettingsCreationParams(
params,
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ base class AndroidCompanionAdSlot extends PlatformCompanionAdSlot {
_initAndroidParams(params);

// ViewGroup used to display the Ad.
late final ima.ViewGroup _frameLayout =
_androidParams._proxy.newFrameLayout();
late final ima.ViewGroup _frameLayout = _androidParams._proxy
.newFrameLayout();

late final Future<ima.CompanionAdSlot> _adSlotFuture = _initCompanionAdSlot();

Expand Down Expand Up @@ -87,10 +87,9 @@ base class AndroidCompanionAdSlot extends PlatformCompanionAdSlot {
}

Future<ima.CompanionAdSlot> _initCompanionAdSlot() async {
final ima.CompanionAdSlot adSlot =
await _androidParams._proxy
.instanceImaSdkFactory()
.createCompanionAdSlot();
final ima.CompanionAdSlot adSlot = await _androidParams._proxy
.instanceImaSdkFactory()
.createCompanionAdSlot();

await Future.wait(<Future<void>>[
adSlot.setContainer(_frameLayout),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,16 @@ base class AndroidContentProgressProvider
///
/// This allows the SDK to track progress of the content video.
@internal
late final ima.ContentProgressProvider progressProvider =
_androidParams._proxy.newContentProgressProvider();
late final ima.ContentProgressProvider progressProvider = _androidParams
._proxy
.newContentProgressProvider();

late final AndroidContentProgressProviderCreationParams _androidParams =
params is AndroidContentProgressProviderCreationParams
? params as AndroidContentProgressProviderCreationParams
: AndroidContentProgressProviderCreationParams.fromPlatformContentProgressProviderCreationParams(
params,
);
? params as AndroidContentProgressProviderCreationParams
: AndroidContentProgressProviderCreationParams.fromPlatformContentProgressProviderCreationParams(
params,
);

@override
Future<void> setProgress({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ final class AndroidImaSettings extends PlatformImaSettings {
}

Future<ImaSdkSettings> _createSettings() async {
final ImaSdkSettings settings =
await ImaSdkFactory.instance.createImaSdkSettings();
final ImaSdkSettings settings = await ImaSdkFactory.instance
.createImaSdkSettings();
if (params.language case final String language) {
await settings.setLanguage(language);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,15 @@ class AndroidViewWidget extends StatelessWidget {
Widget build(BuildContext context) {
return PlatformViewLink(
viewType: _viewType,
surfaceFactory: (
BuildContext context,
PlatformViewController controller,
) {
return AndroidViewSurface(
controller: controller as AndroidViewController,
hitTestBehavior: PlatformViewHitTestBehavior.opaque,
gestureRecognizers: const <Factory<OneSequenceGestureRecognizer>>{},
);
},
surfaceFactory:
(BuildContext context, PlatformViewController controller) {
return AndroidViewSurface(
controller: controller as AndroidViewController,
hitTestBehavior: PlatformViewHitTestBehavior.opaque,
gestureRecognizers:
const <Factory<OneSequenceGestureRecognizer>>{},
);
},
onCreatePlatformView: (PlatformViewCreationParams params) {
return _initAndroidView(params)
..addOnPlatformViewCreatedListener((int id) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,8 @@ class PigeonInstanceManager {
final PigeonInternalProxyApiBaseClass? strongInstance =
_strongInstances[identifier];
if (strongInstance != null) {
final PigeonInternalProxyApiBaseClass copy =
strongInstance.pigeon_copy();
final PigeonInternalProxyApiBaseClass copy = strongInstance
.pigeon_copy();
_identifiers[copy] = identifier;
_weakInstances[identifier] =
WeakReference<PigeonInternalProxyApiBaseClass>(copy);
Expand Down Expand Up @@ -2293,8 +2293,8 @@ class AdsManager extends BaseManager {
arg_pigeon_instanceIdentifier != null,
'Argument for dev.flutter.pigeon.interactive_media_ads.AdsManager.pigeon_newInstance was null, expected non-null int.',
);
final List<double>? arg_adCuePoints =
(args[1] as List<Object?>?)?.cast<double>();
final List<double>? arg_adCuePoints = (args[1] as List<Object?>?)
?.cast<double>();
assert(
arg_adCuePoints != null,
'Argument for dev.flutter.pigeon.interactive_media_ads.AdsManager.pigeon_newInstance was null, expected non-null List<double>.',
Expand Down Expand Up @@ -7940,14 +7940,14 @@ class Ad extends PigeonInternalProxyApiBaseClass {
arg_adWrapperCreativeIds != null,
'Argument for dev.flutter.pigeon.interactive_media_ads.Ad.pigeon_newInstance was null, expected non-null List<String>.',
);
final List<String>? arg_adWrapperIds =
(args[5] as List<Object?>?)?.cast<String>();
final List<String>? arg_adWrapperIds = (args[5] as List<Object?>?)
?.cast<String>();
assert(
arg_adWrapperIds != null,
'Argument for dev.flutter.pigeon.interactive_media_ads.Ad.pigeon_newInstance was null, expected non-null List<String>.',
);
final List<String>? arg_adWrapperSystems =
(args[6] as List<Object?>?)?.cast<String>();
final List<String>? arg_adWrapperSystems = (args[6] as List<Object?>?)
?.cast<String>();
assert(
arg_adWrapperSystems != null,
'Argument for dev.flutter.pigeon.interactive_media_ads.Ad.pigeon_newInstance was null, expected non-null List<String>.',
Expand Down Expand Up @@ -8002,8 +8002,8 @@ class Ad extends PigeonInternalProxyApiBaseClass {
arg_traffickingParameters != null,
'Argument for dev.flutter.pigeon.interactive_media_ads.Ad.pigeon_newInstance was null, expected non-null String.',
);
final List<UiElement>? arg_uiElements =
(args[20] as List<Object?>?)?.cast<UiElement>();
final List<UiElement>? arg_uiElements = (args[20] as List<Object?>?)
?.cast<UiElement>();
assert(
arg_uiElements != null,
'Argument for dev.flutter.pigeon.interactive_media_ads.Ad.pigeon_newInstance was null, expected non-null List<UiElement>.',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -454,8 +454,8 @@ class PigeonInstanceManager {
final PigeonInternalProxyApiBaseClass? strongInstance =
_strongInstances[identifier];
if (strongInstance != null) {
final PigeonInternalProxyApiBaseClass copy =
strongInstance.pigeon_copy();
final PigeonInternalProxyApiBaseClass copy = strongInstance
.pigeon_copy();
_identifiers[copy] = identifier;
_weakInstances[identifier] =
WeakReference<PigeonInternalProxyApiBaseClass>(copy);
Expand Down Expand Up @@ -3899,8 +3899,8 @@ class IMAAdsManager extends NSObject {
arg_pigeon_instanceIdentifier != null,
'Argument for dev.flutter.pigeon.interactive_media_ads.IMAAdsManager.pigeon_newInstance was null, expected non-null int.',
);
final List<double>? arg_adCuePoints =
(args[1] as List<Object?>?)?.cast<double>();
final List<double>? arg_adCuePoints = (args[1] as List<Object?>?)
?.cast<double>();
assert(
arg_adCuePoints != null,
'Argument for dev.flutter.pigeon.interactive_media_ads.IMAAdsManager.pigeon_newInstance was null, expected non-null List<double>.',
Expand Down Expand Up @@ -6671,8 +6671,8 @@ class IMAAd extends NSObject {
arg_dealID != null,
'Argument for dev.flutter.pigeon.interactive_media_ads.IMAAd.pigeon_newInstance was null, expected non-null String.',
);
final List<String>? arg_wrapperAdIDs =
(args[25] as List<Object?>?)?.cast<String>();
final List<String>? arg_wrapperAdIDs = (args[25] as List<Object?>?)
?.cast<String>();
assert(
arg_wrapperAdIDs != null,
'Argument for dev.flutter.pigeon.interactive_media_ads.IMAAd.pigeon_newInstance was null, expected non-null List<String>.',
Expand All @@ -6683,8 +6683,8 @@ class IMAAd extends NSObject {
arg_wrapperCreativeIDs != null,
'Argument for dev.flutter.pigeon.interactive_media_ads.IMAAd.pigeon_newInstance was null, expected non-null List<String>.',
);
final List<String>? arg_wrapperSystems =
(args[27] as List<Object?>?)?.cast<String>();
final List<String>? arg_wrapperSystems = (args[27] as List<Object?>?)
?.cast<String>();
assert(
arg_wrapperSystems != null,
'Argument for dev.flutter.pigeon.interactive_media_ads.IMAAd.pigeon_newInstance was null, expected non-null List<String>.',
Expand Down
Loading