Skip to content

Commit 3b4018b

Browse files
fullenifulleni
committed
lint: misc
1 parent 5ade1f6 commit 3b4018b

File tree

7 files changed

+17
-41
lines changed

7 files changed

+17
-41
lines changed

‎lib/entity_details/view/entity_details_page.dart‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,6 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
322322
? (state.entity as Source).id
323323
: null,
324324
);
325-
break;
326325
case HeadlineImageStyle.smallThumbnail:
327326
tile = HeadlineTileImageStart(
328327
headline: item,
@@ -338,7 +337,6 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
338337
? (state.entity as Source).id
339338
: null,
340339
);
341-
break;
342340
case HeadlineImageStyle.largeThumbnail:
343341
tile = HeadlineTileImageTop(
344342
headline: item,
@@ -354,7 +352,6 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
354352
? (state.entity as Source).id
355353
: null,
356354
);
357-
break;
358355
}
359356
return tile;
360357
} else if (item is Ad) {

‎lib/headlines-feed/bloc/headlines_feed_bloc.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,10 @@ class HeadlinesFeedBloc extends Bloc<HeadlinesFeedEvent, HeadlinesFeedState> {
185185
) async {
186186
// Determine current filter and cursor based on state
187187
var currentFilter = const HeadlineFilter();
188-
String? currentCursorForFetch = event.cursor;
189-
List<FeedItem> currentFeedItems = [];
190-
bool isPaginating = false;
191-
int currentFeedItemCountForInjector = 0;
188+
var currentCursorForFetch = event.cursor;
189+
var currentFeedItems = <FeedItem>[];
190+
var isPaginating = false;
191+
var currentFeedItemCountForInjector = 0;
192192

193193
if (state is HeadlinesFeedLoaded) {
194194
final loadedState = state as HeadlinesFeedLoaded;
@@ -310,10 +310,10 @@ class HeadlinesFeedBloc extends Bloc<HeadlinesFeedEvent, HeadlinesFeedState> {
310310
limit: _headlinesFetchLimit,
311311
);
312312

313-
final List<Headline> headlinesToInject = headlineResponse.items;
314-
final User? userForInjector = currentUser;
315-
final AppConfig configForInjector = appConfig;
316-
const int itemCountForInjector = 0;
313+
final headlinesToInject = headlineResponse.items;
314+
final userForInjector = currentUser;
315+
final configForInjector = appConfig;
316+
const itemCountForInjector = 0;
317317

318318
final processedFeedItems = _feedInjectorService.injectItems(
319319
headlines: headlinesToInject,

‎lib/headlines-feed/view/headlines_feed_page.dart‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ class _HeadlinesFeedPageState extends State<HeadlinesFeedPage> {
230230
extra: item,
231231
),
232232
);
233-
break;
234233
case HeadlineImageStyle.smallThumbnail:
235234
tile = HeadlineTileImageStart(
236235
headline: item,
@@ -240,7 +239,6 @@ class _HeadlinesFeedPageState extends State<HeadlinesFeedPage> {
240239
extra: item,
241240
),
242241
);
243-
break;
244242
case HeadlineImageStyle.largeThumbnail:
245243
tile = HeadlineTileImageTop(
246244
headline: item,
@@ -250,7 +248,6 @@ class _HeadlinesFeedPageState extends State<HeadlinesFeedPage> {
250248
extra: item,
251249
),
252250
);
253-
break;
254251
}
255252
return tile;
256253
} else if (item is Ad) {

‎lib/headlines-search/bloc/headlines_search_bloc.dart‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ class HeadlinesSearchBloc
117117
_appBloc.state.user?.id != null) {
118118
_appBloc.add(AppUserAccountActionShown(userId: _appBloc.state.user!.id));
119119
}
120-
break;
121120
case SearchModelType.category:
122121
response = await _categoryRepository.readAllByQuery(
123122
{'q': searchTerm, 'model': modelType.toJson()},
@@ -131,7 +130,7 @@ class HeadlinesSearchBloc
131130
cursor: response.cursor,
132131
),
133132
);
134-
break; // Added break
133+
// Added break
135134
case SearchModelType.source:
136135
response = await _sourceRepository.readAllByQuery(
137136
{'q': searchTerm, 'model': modelType.toJson()},
@@ -145,7 +144,7 @@ class HeadlinesSearchBloc
145144
cursor: response.cursor,
146145
),
147146
);
148-
break; // Added break
147+
// Added break
149148
}
150149
} on HtHttpException catch (e) {
151150
emit(successState.copyWith(errorMessage: e.message));
@@ -195,21 +194,18 @@ class HeadlinesSearchBloc
195194
appConfig: appConfig,
196195
currentFeedItemCount: 0,
197196
);
198-
break;
199197
case SearchModelType.category:
200198
rawResponse = await _categoryRepository.readAllByQuery(
201199
{'q': searchTerm, 'model': modelType.toJson()},
202200
limit: _limit,
203201
);
204202
processedItems = rawResponse.items.cast<FeedItem>();
205-
break;
206203
case SearchModelType.source:
207204
rawResponse = await _sourceRepository.readAllByQuery(
208205
{'q': searchTerm, 'model': modelType.toJson()},
209206
limit: _limit,
210207
);
211208
processedItems = rawResponse.items.cast<FeedItem>();
212-
break;
213209
}
214210
emit(
215211
HeadlinesSearchSuccess(

‎lib/headlines-search/view/headlines_search_page.dart‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import 'package:ht_main/headlines-search/widgets/category_item_widget.dart';
1414
import 'package:ht_main/headlines-search/widgets/source_item_widget.dart';
1515
import 'package:ht_main/l10n/l10n.dart';
1616
import 'package:ht_main/router/routes.dart';
17-
import 'package:ht_main/shared/constants/app_spacing.dart';
1817
import 'package:ht_main/shared/shared.dart'; // Imports new headline tiles
1918
import 'package:ht_shared/ht_shared.dart'; // Changed to general import
2019

@@ -303,7 +302,6 @@ class _HeadlinesSearchViewState extends State<_HeadlinesSearchView> {
303302
extra: feedItem,
304303
),
305304
);
306-
break;
307305
case HeadlineImageStyle.smallThumbnail:
308306
tile = HeadlineTileImageStart(
309307
headline: feedItem,
@@ -313,7 +311,6 @@ class _HeadlinesSearchViewState extends State<_HeadlinesSearchView> {
313311
extra: feedItem,
314312
),
315313
);
316-
break;
317314
case HeadlineImageStyle.largeThumbnail:
318315
tile = HeadlineTileImageTop(
319316
headline: feedItem,
@@ -323,7 +320,6 @@ class _HeadlinesSearchViewState extends State<_HeadlinesSearchView> {
323320
extra: feedItem,
324321
),
325322
);
326-
break;
327323
}
328324
return tile;
329325
} else if (feedItem is Category) {

‎lib/router/router.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import 'package:ht_main/headlines-feed/bloc/categories_filter_bloc.dart'; // Imp
2727
// import 'package:ht_main/headlines-feed/bloc/countries_filter_bloc.dart'; // Import new BLoC - REMOVED
2828
import 'package:ht_main/headlines-feed/bloc/headlines_feed_bloc.dart';
2929
import 'package:ht_main/headlines-feed/bloc/sources_filter_bloc.dart'; // Import new BLoC
30-
import 'package:ht_main/shared/services/feed_injector_service.dart'; // Added
3130
import 'package:ht_main/headlines-feed/view/category_filter_page.dart';
3231
// import 'package:ht_main/headlines-feed/view/country_filter_page.dart'; // REMOVED
3332
import 'package:ht_main/headlines-feed/view/headlines_feed_page.dart';
@@ -45,6 +44,7 @@ import 'package:ht_main/settings/view/language_settings_page.dart'; // Added for
4544
import 'package:ht_main/settings/view/notification_settings_page.dart'; // Added
4645
import 'package:ht_main/settings/view/settings_page.dart'; // Added
4746
import 'package:ht_main/settings/view/theme_settings_page.dart'; // Added for new page
47+
import 'package:ht_main/shared/services/feed_injector_service.dart'; // Added
4848
import 'package:ht_shared/ht_shared.dart'; // Shared models, FromJson, ToJson, etc.
4949

5050
/// Creates and configures the GoRouter instance for the application.

‎lib/shared/services/feed_injector_service.dart‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ class FeedInjectorService {
3030
required AppConfig appConfig,
3131
int currentFeedItemCount = 0,
3232
}) {
33-
final List<FeedItem> finalFeed = [];
34-
bool accountActionInjectedThisBatch = false;
35-
int headlinesInThisBatchCount = 0;
33+
final finalFeed = <FeedItem>[];
34+
var accountActionInjectedThisBatch = false;
35+
var headlinesInThisBatchCount = 0;
3636
final adConfig = appConfig.adConfig;
3737
final userRole = user?.role ?? UserRole.guestUser;
3838

@@ -43,19 +43,15 @@ class FeedInjectorService {
4343
case UserRole.guestUser:
4444
adFrequency = adConfig.guestAdFrequency;
4545
adPlacementInterval = adConfig.guestAdPlacementInterval;
46-
break;
4746
case UserRole.standardUser: // Assuming 'authenticated' maps to standard
4847
adFrequency = adConfig.authenticatedAdFrequency;
4948
adPlacementInterval = adConfig.authenticatedAdPlacementInterval;
50-
break;
5149
case UserRole.premiumUser:
5250
adFrequency = adConfig.premiumAdFrequency;
5351
adPlacementInterval = adConfig.premiumAdPlacementInterval;
54-
break;
5552
default: // For any other roles, or if UserRole enum expands
5653
adFrequency = adConfig.guestAdFrequency; // Default to guest ads
5754
adPlacementInterval = adConfig.guestAdPlacementInterval;
58-
break;
5955
}
6056

6157
// Determine if an AccountAction is due before iterating
@@ -64,7 +60,7 @@ class FeedInjectorService {
6460
appConfig: appConfig,
6561
);
6662

67-
for (int i = 0; i < headlines.length; i++) {
63+
for (var i = 0; i < headlines.length; i++) {
6864
final headline = headlines[i];
6965
finalFeed.add(headline);
7066
headlinesInThisBatchCount++;
@@ -139,27 +135,24 @@ class FeedInjectorService {
139135

140136
String title;
141137
String description;
142-
String ctaText = 'Learn More';
138+
var ctaText = 'Learn More';
143139

144140
switch (variant) {
145141
case 0:
146142
title = 'Unlock Your Full Potential!';
147143
description =
148144
'Link your account to enjoy expanded content access, keep your preferences synced, and experience a more streamlined ad display.';
149145
ctaText = 'Link Account & Explore';
150-
break;
151146
case 1:
152147
title = 'Personalize Your Experience!';
153148
description =
154149
'Secure your settings and reading history across all your devices by linking your account. Enjoy a tailored news journey!';
155150
ctaText = 'Secure My Preferences';
156-
break;
157151
default: // case 2
158152
title = 'Get More From Your News!';
159153
description =
160154
'Link your account for enhanced content limits, better ad experiences, and ensure your preferences are always with you.';
161155
ctaText = 'Get Started';
162-
break;
163156
}
164157

165158
return AccountAction(
@@ -181,27 +174,24 @@ class FeedInjectorService {
181174

182175
String title;
183176
String description;
184-
String ctaText = 'Explore Premium';
177+
var ctaText = 'Explore Premium';
185178

186179
switch (variant) {
187180
case 0:
188181
title = 'Unlock Our Best Features!';
189182
description =
190183
'Go Premium to enjoy our most comprehensive content access, the best ad experience, and many more exclusive perks.';
191184
ctaText = 'Upgrade Now';
192-
break;
193185
case 1:
194186
title = 'Elevate Your News Consumption!';
195187
description =
196188
'With Premium, your content limits are greatly expanded and you will enjoy our most favorable ad settings. Discover the difference!';
197189
ctaText = 'Discover Premium Benefits';
198-
break;
199190
default: // case 2
200191
title = 'Want More Control & Fewer Interruptions?';
201192
description =
202193
'Upgrade to Premium for a superior ad experience, massively increased content limits, and a more focused news journey.';
203194
ctaText = 'Yes, Upgrade Me!';
204-
break;
205195
}
206196
return AccountAction(
207197
title: title,

0 commit comments

Comments
 (0)