Skip to content

Commit f2c0cfd

Browse files
fullenifulleni
committed
style: format
1 parent ad6010f commit f2c0cfd

File tree

8 files changed

+117
-46
lines changed

8 files changed

+117
-46
lines changed

‎lib/ads/ad_navigator_observer.dart‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,21 @@ class AdNavigatorObserver extends NavigatorObserver {
134134
// Only proceed if remote config is available, ads are globally enabled,
135135
// and interstitial ads are enabled in the config.
136136
if (remoteConfig == null) {
137-
_logger.warning('AdNavigatorObserver: RemoteConfig is null. Cannot check ad enablement.');
137+
_logger.warning(
138+
'AdNavigatorObserver: RemoteConfig is null. Cannot check ad enablement.',
139+
);
138140
return;
139141
}
140142
if (!remoteConfig.adConfig.enabled) {
141-
_logger.info('AdNavigatorObserver: Ads are globally disabled in RemoteConfig.');
143+
_logger.info(
144+
'AdNavigatorObserver: Ads are globally disabled in RemoteConfig.',
145+
);
142146
return;
143147
}
144148
if (!remoteConfig.adConfig.interstitialAdConfiguration.enabled) {
145-
_logger.info('AdNavigatorObserver: Interstitial ads are disabled in RemoteConfig.');
149+
_logger.info(
150+
'AdNavigatorObserver: Interstitial ads are disabled in RemoteConfig.',
151+
);
146152
return;
147153
}
148154

@@ -211,9 +217,13 @@ class AdNavigatorObserver extends NavigatorObserver {
211217

212218
// In demo environment, display a placeholder interstitial ad directly.
213219
if (appEnvironment == AppEnvironment.demo) {
214-
_logger.info('AdNavigatorObserver: Demo environment: Showing placeholder interstitial ad.');
220+
_logger.info(
221+
'AdNavigatorObserver: Demo environment: Showing placeholder interstitial ad.',
222+
);
215223
if (navigator?.context == null) {
216-
_logger.severe('AdNavigatorObserver: Navigator context is null. Cannot show demo interstitial ad.');
224+
_logger.severe(
225+
'AdNavigatorObserver: Navigator context is null. Cannot show demo interstitial ad.',
226+
);
217227
return;
218228
}
219229
await showDialog<void>(
@@ -245,7 +255,9 @@ class AdNavigatorObserver extends NavigatorObserver {
245255
return;
246256
}
247257

248-
_logger.info('AdNavigatorObserver: Requesting interstitial ad from AdService...');
258+
_logger.info(
259+
'AdNavigatorObserver: Requesting interstitial ad from AdService...',
260+
);
249261
final interstitialAd = await adService.getInterstitialAd(
250262
adConfig: adConfig,
251263
adThemeStyle: _adThemeStyle,
@@ -254,7 +266,9 @@ class AdNavigatorObserver extends NavigatorObserver {
254266
if (interstitialAd != null) {
255267
_logger.info('AdNavigatorObserver: Interstitial ad loaded. Showing...');
256268
if (navigator?.context == null) {
257-
_logger.severe('AdNavigatorObserver: Navigator context is null. Cannot show interstitial ad.');
269+
_logger.severe(
270+
'AdNavigatorObserver: Navigator context is null. Cannot show interstitial ad.',
271+
);
258272
return;
259273
}
260274
// Show the AdMob interstitial ad.
@@ -265,15 +279,21 @@ class AdNavigatorObserver extends NavigatorObserver {
265279
interstitialAd.adObject as admob.InterstitialAd
266280
..fullScreenContentCallback = admob.FullScreenContentCallback(
267281
onAdDismissedFullScreenContent: (ad) {
268-
_logger.info('AdNavigatorObserver: AdMob Interstitial Ad dismissed.');
282+
_logger.info(
283+
'AdNavigatorObserver: AdMob Interstitial Ad dismissed.',
284+
);
269285
ad.dispose();
270286
},
271287
onAdFailedToShowFullScreenContent: (ad, error) {
272-
_logger.severe('AdNavigatorObserver: AdMob Interstitial Ad failed to show: $error');
288+
_logger.severe(
289+
'AdNavigatorObserver: AdMob Interstitial Ad failed to show: $error',
290+
);
273291
ad.dispose();
274292
},
275293
onAdShowedFullScreenContent: (ad) {
276-
_logger.info('AdNavigatorObserver: AdMob Interstitial Ad showed.');
294+
_logger.info(
295+
'AdNavigatorObserver: AdMob Interstitial Ad showed.',
296+
);
277297
},
278298
);
279299
await admobInterstitialAd.show();

‎lib/ads/ad_service.dart‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/ad_th
44
import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/inline_ad.dart';
55
import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/interstitial_ad.dart';
66
import 'package:logging/logging.dart';
7-
import 'package:uuid/uuid.dart';
87

98
/// {@template ad_service}
109
/// A service responsible for managing and providing ads to the application.
@@ -27,7 +26,6 @@ class AdService {
2726

2827
final Map<AdPlatformType, AdProvider> _adProviders;
2928
final Logger _logger;
30-
final Uuid _uuid = const Uuid();
3129

3230
/// Initializes all underlying ad providers.
3331
///
@@ -100,7 +98,9 @@ class AdService {
10098
final adProvider = _adProviders[primaryAdPlatform];
10199

102100
if (adProvider == null) {
103-
_logger.warning('AdService: No AdProvider found for platform: $primaryAdPlatform');
101+
_logger.warning(
102+
'AdService: No AdProvider found for platform: $primaryAdPlatform',
103+
);
104104
return null;
105105
}
106106

@@ -141,7 +141,11 @@ class AdService {
141141
return null;
142142
}
143143
} catch (e, s) {
144-
_logger.severe('AdService: Error getting Interstitial ad from AdProvider: $e', e, s);
144+
_logger.severe(
145+
'AdService: Error getting Interstitial ad from AdProvider: $e',
146+
e,
147+
s,
148+
);
145149
return null;
146150
}
147151
}
@@ -223,7 +227,9 @@ class AdService {
223227
final adProvider = _adProviders[primaryAdPlatform];
224228

225229
if (adProvider == null) {
226-
_logger.warning('AdService: No AdProvider found for platform: $primaryAdPlatform');
230+
_logger.warning(
231+
'AdService: No AdProvider found for platform: $primaryAdPlatform',
232+
);
227233
return null;
228234
}
229235

@@ -293,7 +299,11 @@ class AdService {
293299
return null;
294300
}
295301
} catch (e, s) {
296-
_logger.severe('AdService: Error getting $adType ad from AdProvider: $e', e, s);
302+
_logger.severe(
303+
'AdService: Error getting $adType ad from AdProvider: $e',
304+
e,
305+
s,
306+
);
297307
return null;
298308
}
299309
}

‎lib/ads/admob_ad_provider.dart‎

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,13 @@ class AdMobAdProvider implements AdProvider {
3333
_logger.info('AdMobAdProvider: Initializing Google Mobile Ads SDK...');
3434
try {
3535
await admob.MobileAds.instance.initialize();
36-
_logger.info('AdMobAdProvider: Google Mobile Ads SDK initialized successfully.');
36+
_logger.info(
37+
'AdMobAdProvider: Google Mobile Ads SDK initialized successfully.',
38+
);
3739
} catch (e) {
38-
_logger.severe('AdMobAdProvider: Failed to initialize Google Mobile Ads SDK: $e');
40+
_logger.severe(
41+
'AdMobAdProvider: Failed to initialize Google Mobile Ads SDK: $e',
42+
);
3943
// Depending on requirements, you might want to rethrow or handle this more gracefully.
4044
// For now, we log and continue, as ad loading might still work in some cases.
4145
}
@@ -50,11 +54,15 @@ class AdMobAdProvider implements AdProvider {
5054
}) async {
5155
_logger.info('AdMobAdProvider: loadNativeAd called for adId: $adId');
5256
if (adId == null || adId.isEmpty) {
53-
_logger.warning('AdMobAdProvider: No native ad unit ID provided for AdMob.');
57+
_logger.warning(
58+
'AdMobAdProvider: No native ad unit ID provided for AdMob.',
59+
);
5460
return null;
5561
}
5662

57-
_logger.info('AdMobAdProvider: Attempting to load native ad from unit ID: $adId');
63+
_logger.info(
64+
'AdMobAdProvider: Attempting to load native ad from unit ID: $adId',
65+
);
5866

5967
// Determine the template type based on the user's feed style preference.
6068
final templateType = headlineImageStyle == HeadlineImageStyle.largeThumbnail
@@ -117,7 +125,9 @@ class AdMobAdProvider implements AdProvider {
117125
);
118126

119127
if (googleNativeAd == null) {
120-
_logger.warning('AdMobAdProvider: Google Native Ad object is null after load attempt.');
128+
_logger.warning(
129+
'AdMobAdProvider: Google Native Ad object is null after load attempt.',
130+
);
121131
return null;
122132
}
123133

@@ -139,11 +149,15 @@ class AdMobAdProvider implements AdProvider {
139149
}) async {
140150
_logger.info('AdMobAdProvider: loadBannerAd called for adId: $adId');
141151
if (adId == null || adId.isEmpty) {
142-
_logger.warning('AdMobAdProvider: No banner ad unit ID provided for AdMob.');
152+
_logger.warning(
153+
'AdMobAdProvider: No banner ad unit ID provided for AdMob.',
154+
);
143155
return null;
144156
}
145157

146-
_logger.info('AdMobAdProvider: Attempting to load banner ad from unit ID: $adId');
158+
_logger.info(
159+
'AdMobAdProvider: Attempting to load banner ad from unit ID: $adId',
160+
);
147161

148162
// Determine the ad size based on the user's feed style preference.
149163
final adSize = headlineImageStyle == HeadlineImageStyle.largeThumbnail
@@ -195,7 +209,9 @@ class AdMobAdProvider implements AdProvider {
195209
);
196210

197211
if (googleBannerAd == null) {
198-
_logger.warning('AdMobAdProvider: Google Banner Ad object is null after load attempt.');
212+
_logger.warning(
213+
'AdMobAdProvider: Google Banner Ad object is null after load attempt.',
214+
);
199215
return null;
200216
}
201217

@@ -216,11 +232,15 @@ class AdMobAdProvider implements AdProvider {
216232
}) async {
217233
_logger.info('AdMobAdProvider: loadInterstitialAd called for adId: $adId');
218234
if (adId == null || adId.isEmpty) {
219-
_logger.warning('AdMobAdProvider: No interstitial ad unit ID provided for AdMob.');
235+
_logger.warning(
236+
'AdMobAdProvider: No interstitial ad unit ID provided for AdMob.',
237+
);
220238
return null;
221239
}
222240

223-
_logger.info('AdMobAdProvider: Attempting to load interstitial ad from unit ID: $adId');
241+
_logger.info(
242+
'AdMobAdProvider: Attempting to load interstitial ad from unit ID: $adId',
243+
);
224244

225245
final completer = Completer<admob.InterstitialAd?>();
226246

@@ -233,7 +253,9 @@ class AdMobAdProvider implements AdProvider {
233253
completer.complete(ad);
234254
},
235255
onAdFailedToLoad: (error) {
236-
_logger.severe('AdMobAdProvider: Interstitial Ad failed to load: $error');
256+
_logger.severe(
257+
'AdMobAdProvider: Interstitial Ad failed to load: $error',
258+
);
237259
completer.complete(null);
238260
},
239261
),
@@ -248,7 +270,9 @@ class AdMobAdProvider implements AdProvider {
248270
);
249271

250272
if (googleInterstitialAd == null) {
251-
_logger.warning('AdMobAdProvider: Google Interstitial Ad object is null after load attempt.');
273+
_logger.warning(
274+
'AdMobAdProvider: Google Interstitial Ad object is null after load attempt.',
275+
);
252276
return null;
253277
}
254278

‎lib/ads/local_ad_provider.dart‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ class LocalAdProvider implements AdProvider {
3333
/// This implementation does not require any specific SDK initialization.
3434
@override
3535
Future<void> initialize() async {
36-
_logger.info('LocalAdProvider: Local Ad Provider initialized (no specific SDK to init).');
36+
_logger.info(
37+
'LocalAdProvider: Local Ad Provider initialized (no specific SDK to init).',
38+
);
3739
}
3840

3941
@override
@@ -49,7 +51,9 @@ class LocalAdProvider implements AdProvider {
4951
return null;
5052
}
5153

52-
_logger.info('LocalAdProvider: Attempting to load local native ad with ID: $adId');
54+
_logger.info(
55+
'LocalAdProvider: Attempting to load local native ad with ID: $adId',
56+
);
5357

5458
try {
5559
final localNativeAd = await _localAdRepository.read(id: adId);
@@ -74,7 +78,9 @@ class LocalAdProvider implements AdProvider {
7478
return null;
7579
}
7680
} on HttpException catch (e) {
77-
_logger.severe('LocalAdProvider: Error fetching local native ad with ID $adId: $e');
81+
_logger.severe(
82+
'LocalAdProvider: Error fetching local native ad with ID $adId: $e',
83+
);
7884
return null;
7985
} catch (e, s) {
8086
_logger.severe(
@@ -99,7 +105,9 @@ class LocalAdProvider implements AdProvider {
99105
return null;
100106
}
101107

102-
_logger.info('LocalAdProvider: Attempting to load local banner ad with ID: $adId');
108+
_logger.info(
109+
'LocalAdProvider: Attempting to load local banner ad with ID: $adId',
110+
);
103111

104112
try {
105113
final localBannerAd = await _localAdRepository.read(id: adId);
@@ -121,7 +129,9 @@ class LocalAdProvider implements AdProvider {
121129
return null;
122130
}
123131
} on HttpException catch (e) {
124-
_logger.severe('LocalAdProvider: Error fetching local banner ad with ID $adId: $e');
132+
_logger.severe(
133+
'LocalAdProvider: Error fetching local banner ad with ID $adId: $e',
134+
);
125135
return null;
126136
} catch (e, s) {
127137
_logger.severe(
@@ -145,7 +155,9 @@ class LocalAdProvider implements AdProvider {
145155
return null;
146156
}
147157

148-
_logger.info('LocalAdProvider: Attempting to load local interstitial ad with ID: $adId');
158+
_logger.info(
159+
'LocalAdProvider: Attempting to load local interstitial ad with ID: $adId',
160+
);
149161

150162
try {
151163
final localInterstitialAd = await _localAdRepository.read(id: adId);
@@ -167,7 +179,9 @@ class LocalAdProvider implements AdProvider {
167179
return null;
168180
}
169181
} on HttpException catch (e) {
170-
_logger.severe('LocalAdProvider: Error fetching local interstitial ad with ID $adId: $e');
182+
_logger.severe(
183+
'LocalAdProvider: Error fetching local interstitial ad with ID $adId: $e',
184+
);
171185
return null;
172186
} catch (e, s) {
173187
_logger.severe(

‎lib/ads/widgets/admob_inline_ad_widget.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ class _AdmobInlineAdWidgetState extends State<AdmobInlineAdWidget> {
118118
adHeight = switch (widget.bannerAdShape) {
119119
BannerAdShape.square => 250,
120120
BannerAdShape.rectangle => 50,
121-
_ => 50, // Default to standard banner height if shape is null or unknown
121+
_ =>
122+
50, // Default to standard banner height if shape is null or unknown
122123
};
123124
} else {
124125
// Fallback height for unknown inline ad types.

‎lib/ads/widgets/demo_banner_ad_widget.dart‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ import 'package:ui_kit/ui_kit.dart';
1111
/// {@endtemplate}
1212
class DemoBannerAdWidget extends StatelessWidget {
1313
/// {@macro demo_banner_ad_widget}
14-
const DemoBannerAdWidget({this.headlineImageStyle, this.bannerAdShape, super.key});
14+
const DemoBannerAdWidget({
15+
this.headlineImageStyle,
16+
this.bannerAdShape,
17+
super.key,
18+
});
1519

1620
/// The user's preference for feed layout, used to determine the ad's visual size.
1721
final HeadlineImageStyle? headlineImageStyle;

‎lib/ads/widgets/in_article_ad_loader_widget.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,8 @@ class _InArticleAdLoaderWidgetState extends State<InArticleAdLoaderWidget> {
241241
_loadedAd!.adObject is LocalBannerAd) {
242242
return LocalBannerAdWidget(
243243
localBannerAd: _loadedAd!.adObject as LocalBannerAd,
244-
bannerAdShape: widget.adConfig.articleAdConfiguration.bannerAdShape,
244+
bannerAdShape:
245+
widget.adConfig.articleAdConfiguration.bannerAdShape,
245246
);
246247
}
247248
// Fallback for unsupported local ad types or errors

0 commit comments

Comments
 (0)