Skip to content

Commit fcff01b

Browse files
authored
Merge pull request #32 from headlines-toolkit/feature_for_you_headlines_feed
Feature for you headlines feed
2 parents 3b4018b + 07ad1ce commit fcff01b

File tree

5 files changed

+272
-61
lines changed

5 files changed

+272
-61
lines changed

lib/headlines-feed/bloc/headlines_feed_bloc.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ class HeadlinesFeedBloc extends Bloc<HeadlinesFeedEvent, HeadlinesFeedState> {
155155
feedItems: processedFeedItems,
156156
hasMore: headlineResponse.hasMore,
157157
cursor: headlineResponse.cursor,
158+
filter: const HeadlineFilter(), // Ensure filter is reset
158159
),
159160
);
160161

lib/headlines-feed/models/headline_filter.dart

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ class HeadlineFilter extends Equatable {
1111
this.sources,
1212
this.selectedSourceCountryIsoCodes,
1313
this.selectedSourceSourceTypes,
14+
this.isFromFollowedItems = false, // Added new field with default
1415
});
1516

1617
/// The list of selected category filters.
@@ -27,13 +28,17 @@ class HeadlineFilter extends Equatable {
2728
/// The set of selected source types for source filtering.
2829
final Set<SourceType>? selectedSourceSourceTypes;
2930

31+
/// Indicates if this filter was generated from the user's followed items.
32+
final bool isFromFollowedItems;
33+
3034
@override
3135
List<Object?> get props => [
32-
categories,
33-
sources,
34-
selectedSourceCountryIsoCodes,
35-
selectedSourceSourceTypes,
36-
];
36+
categories,
37+
sources,
38+
selectedSourceCountryIsoCodes,
39+
selectedSourceSourceTypes,
40+
isFromFollowedItems, // Added to props
41+
];
3742

3843
/// Creates a copy of this [HeadlineFilter] with the given fields
3944
/// replaced with the new values.
@@ -42,6 +47,7 @@ class HeadlineFilter extends Equatable {
4247
List<Source>? sources,
4348
Set<String>? selectedSourceCountryIsoCodes,
4449
Set<SourceType>? selectedSourceSourceTypes,
50+
bool? isFromFollowedItems, // Added to copyWith
4551
}) {
4652
return HeadlineFilter(
4753
categories: categories ?? this.categories,
@@ -50,6 +56,7 @@ class HeadlineFilter extends Equatable {
5056
selectedSourceCountryIsoCodes ?? this.selectedSourceCountryIsoCodes,
5157
selectedSourceSourceTypes:
5258
selectedSourceSourceTypes ?? this.selectedSourceSourceTypes,
59+
isFromFollowedItems: isFromFollowedItems ?? this.isFromFollowedItems, // Added
5360
);
5461
}
5562
}

0 commit comments

Comments
 (0)