Skip to content

Commit e0d1fd1

Browse files
committed
style: format misc
1 parent b6dc7bb commit e0d1fd1

10 files changed

+149
-104
lines changed

lib/headlines-feed/bloc/countries_filter_bloc.dart

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ class CountriesFilterBloc
2424
CountriesFilterBloc({
2525
required DataRepository<Country> countriesRepository,
2626
required DataRepository<UserContentPreferences>
27-
userContentPreferencesRepository, // Inject UserContentPreferencesRepository
27+
userContentPreferencesRepository, // Inject UserContentPreferencesRepository
2828
required AppBloc appBloc, // Inject AppBloc
29-
}) : _countriesRepository = countriesRepository,
30-
_userContentPreferencesRepository = userContentPreferencesRepository,
31-
_appBloc = appBloc,
32-
super(const CountriesFilterState()) {
29+
}) : _countriesRepository = countriesRepository,
30+
_userContentPreferencesRepository = userContentPreferencesRepository,
31+
_appBloc = appBloc,
32+
super(const CountriesFilterState()) {
3333
on<CountriesFilterRequested>(
3434
_onCountriesFilterRequested,
3535
transformer: restartable(),
@@ -41,7 +41,8 @@ class CountriesFilterBloc
4141
}
4242

4343
final DataRepository<Country> _countriesRepository;
44-
final DataRepository<UserContentPreferences> _userContentPreferencesRepository;
44+
final DataRepository<UserContentPreferences>
45+
_userContentPreferencesRepository;
4546
final AppBloc _appBloc;
4647

4748
/// Handles the request to fetch countries based on a specific usage.
@@ -93,7 +94,9 @@ class CountriesFilterBloc
9394
CountriesFilterApplyFollowedRequested event,
9495
Emitter<CountriesFilterState> emit,
9596
) async {
96-
emit(state.copyWith(followedCountriesStatus: CountriesFilterStatus.loading));
97+
emit(
98+
state.copyWith(followedCountriesStatus: CountriesFilterStatus.loading),
99+
);
97100

98101
final currentUser = _appBloc.state.user;
99102

@@ -120,7 +123,9 @@ class CountriesFilterBloc
120123
state.copyWith(
121124
followedCountriesStatus: CountriesFilterStatus.success,
122125
followedCountries: const [],
123-
error: const OperationFailedException('No followed countries found.'),
126+
error: const OperationFailedException(
127+
'No followed countries found.',
128+
),
124129
clearFollowedCountriesError: true,
125130
),
126131
);
@@ -135,7 +140,12 @@ class CountriesFilterBloc
135140
),
136141
);
137142
} on HttpException catch (e) {
138-
emit(state.copyWith(followedCountriesStatus: CountriesFilterStatus.failure, error: e));
143+
emit(
144+
state.copyWith(
145+
followedCountriesStatus: CountriesFilterStatus.failure,
146+
error: e,
147+
),
148+
);
139149
} catch (e) {
140150
emit(
141151
state.copyWith(

lib/headlines-feed/bloc/countries_filter_event.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ final class CountriesFilterRequested extends CountriesFilterEvent {
3131
/// {@template countries_filter_apply_followed_requested}
3232
/// Event triggered to request applying the user's followed countries as filters.
3333
/// {@endtemplate}
34-
final class CountriesFilterApplyFollowedRequested extends CountriesFilterEvent {}
34+
final class CountriesFilterApplyFollowedRequested
35+
extends CountriesFilterEvent {}

lib/headlines-feed/bloc/sources_filter_bloc.dart

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ class SourcesFilterBloc extends Bloc<SourcesFilterEvent, SourcesFilterState> {
1414
required DataRepository<Source> sourcesRepository,
1515
required DataRepository<Country> countriesRepository,
1616
required DataRepository<UserContentPreferences>
17-
userContentPreferencesRepository,
17+
userContentPreferencesRepository,
1818
required AppBloc appBloc,
19-
}) : _sourcesRepository = sourcesRepository,
20-
_countriesRepository = countriesRepository,
21-
_userContentPreferencesRepository = userContentPreferencesRepository,
22-
_appBloc = appBloc,
23-
super(const SourcesFilterState()) {
19+
}) : _sourcesRepository = sourcesRepository,
20+
_countriesRepository = countriesRepository,
21+
_userContentPreferencesRepository = userContentPreferencesRepository,
22+
_appBloc = appBloc,
23+
super(const SourcesFilterState()) {
2424
on<LoadSourceFilterData>(_onLoadSourceFilterData);
2525
on<CountryCapsuleToggled>(_onCountryCapsuleToggled);
2626
on<AllSourceTypesCapsuleToggled>(_onAllSourceTypesCapsuleToggled);
@@ -34,7 +34,8 @@ class SourcesFilterBloc extends Bloc<SourcesFilterEvent, SourcesFilterState> {
3434

3535
final DataRepository<Source> _sourcesRepository;
3636
final DataRepository<Country> _countriesRepository;
37-
final DataRepository<UserContentPreferences> _userContentPreferencesRepository;
37+
final DataRepository<UserContentPreferences>
38+
_userContentPreferencesRepository;
3839
final AppBloc _appBloc;
3940

4041
Future<void> _onLoadSourceFilterData(
@@ -197,7 +198,11 @@ class SourcesFilterBloc extends Bloc<SourcesFilterEvent, SourcesFilterState> {
197198
SourcesFilterApplyFollowedRequested event,
198199
Emitter<SourcesFilterState> emit,
199200
) async {
200-
emit(state.copyWith(followedSourcesStatus: SourceFilterDataLoadingStatus.loading));
201+
emit(
202+
state.copyWith(
203+
followedSourcesStatus: SourceFilterDataLoadingStatus.loading,
204+
),
205+
);
201206

202207
final currentUser = _appBloc.state.user;
203208

@@ -235,12 +240,19 @@ class SourcesFilterBloc extends Bloc<SourcesFilterEvent, SourcesFilterState> {
235240
state.copyWith(
236241
followedSourcesStatus: SourceFilterDataLoadingStatus.success,
237242
followedSources: preferences.followedSources,
238-
finallySelectedSourceIds: preferences.followedSources.map((s) => s.id).toSet(),
243+
finallySelectedSourceIds: preferences.followedSources
244+
.map((s) => s.id)
245+
.toSet(),
239246
clearFollowedSourcesError: true,
240247
),
241248
);
242249
} on HttpException catch (e) {
243-
emit(state.copyWith(followedSourcesStatus: SourceFilterDataLoadingStatus.failure, error: e));
250+
emit(
251+
state.copyWith(
252+
followedSourcesStatus: SourceFilterDataLoadingStatus.failure,
253+
error: e,
254+
),
255+
);
244256
} catch (e) {
245257
emit(
246258
state.copyWith(

lib/headlines-feed/bloc/sources_filter_event.dart

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,13 @@ abstract class SourcesFilterEvent extends Equatable {
2020
/// {@endtemplate}
2121
class LoadSourceFilterData extends SourcesFilterEvent {
2222
/// {@macro load_source_filter_data}
23-
const LoadSourceFilterData({
24-
this.initialSelectedSources = const [],
25-
});
23+
const LoadSourceFilterData({this.initialSelectedSources = const []});
2624

2725
/// The list of sources that were initially selected on the previous page.
2826
final List<Source> initialSelectedSources;
2927

3028
@override
31-
List<Object?> get props => [
32-
initialSelectedSources,
33-
];
29+
List<Object?> get props => [initialSelectedSources];
3430
}
3531

3632
class CountryCapsuleToggled extends SourcesFilterEvent {

lib/headlines-feed/bloc/topics_filter_bloc.dart

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ class TopicsFilterBloc extends Bloc<TopicsFilterEvent, TopicsFilterState> {
2323
TopicsFilterBloc({
2424
required DataRepository<Topic> topicsRepository,
2525
required DataRepository<UserContentPreferences>
26-
userContentPreferencesRepository,
27-
required AppBloc appBloc,
28-
}) : _topicsRepository = topicsRepository,
29-
_userContentPreferencesRepository = userContentPreferencesRepository,
30-
_appBloc = appBloc,
31-
super(const TopicsFilterState()) {
26+
userContentPreferencesRepository,
27+
required AppBloc appBloc,
28+
}) : _topicsRepository = topicsRepository,
29+
_userContentPreferencesRepository = userContentPreferencesRepository,
30+
_appBloc = appBloc,
31+
super(const TopicsFilterState()) {
3232
on<TopicsFilterRequested>(
3333
_onTopicsFilterRequested,
3434
transformer: restartable(),
@@ -40,11 +40,12 @@ class TopicsFilterBloc extends Bloc<TopicsFilterEvent, TopicsFilterState> {
4040
on<TopicsFilterApplyFollowedRequested>(
4141
_onTopicsFilterApplyFollowedRequested,
4242
transformer: restartable(),
43-
);
43+
);
4444
}
4545

4646
final DataRepository<Topic> _topicsRepository;
47-
final DataRepository<UserContentPreferences> _userContentPreferencesRepository;
47+
final DataRepository<UserContentPreferences>
48+
_userContentPreferencesRepository;
4849
final AppBloc _appBloc;
4950

5051
/// Number of topics to fetch per page.
@@ -165,7 +166,12 @@ class TopicsFilterBloc extends Bloc<TopicsFilterEvent, TopicsFilterState> {
165166
),
166167
);
167168
} on HttpException catch (e) {
168-
emit(state.copyWith(followedTopicsStatus: TopicsFilterStatus.failure, error: e));
169+
emit(
170+
state.copyWith(
171+
followedTopicsStatus: TopicsFilterStatus.failure,
172+
error: e,
173+
),
174+
);
169175
} catch (e) {
170176
emit(
171177
state.copyWith(

lib/headlines-feed/bloc/topics_filter_state.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ final class TopicsFilterState extends Equatable {
7979
cursor: clearCursor ? null : (cursor ?? this.cursor),
8080
// Clear error if requested, otherwise keep existing or use new one
8181
error: clearError ? null : error ?? this.error,
82-
followedTopicsStatus:
83-
followedTopicsStatus ?? this.followedTopicsStatus,
82+
followedTopicsStatus: followedTopicsStatus ?? this.followedTopicsStatus,
8483
followedTopics: followedTopics ?? this.followedTopics,
8584
);
8685
}

lib/headlines-feed/view/country_filter_page.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class _CountryFilterPageState extends State<CountryFilterPage> {
9191
BlocBuilder<CountriesFilterBloc, CountriesFilterState>(
9292
builder: (context, state) {
9393
// Determine if the "Apply My Followed" icon should be filled
94-
final bool isFollowedFilterActive =
94+
final isFollowedFilterActive =
9595
state.followedCountries.isNotEmpty &&
9696
_pageSelectedCountries.length ==
9797
state.followedCountries.length &&
@@ -171,11 +171,11 @@ class _CountryFilterPageState extends State<CountryFilterPage> {
171171
child: BlocBuilder<CountriesFilterBloc, CountriesFilterState>(
172172
builder: (context, state) {
173173
// Determine overall loading status for the main list
174-
final bool isLoadingMainList =
174+
final isLoadingMainList =
175175
state.status == CountriesFilterStatus.loading;
176176

177177
// Determine if followed countries are currently loading
178-
final bool isLoadingFollowedCountries =
178+
final isLoadingFollowedCountries =
179179
state.followedCountriesStatus == CountriesFilterStatus.loading;
180180

181181
// Handle initial loading state
@@ -275,7 +275,7 @@ class _CountryFilterPageState extends State<CountryFilterPage> {
275275
// Show loading overlay if followed countries are being fetched
276276
if (isLoadingFollowedCountries)
277277
Positioned.fill(
278-
child: Container(
278+
child: ColoredBox(
279279
color: Colors.black54, // Semi-transparent overlay
280280
child: Center(
281281
child: Column(

lib/headlines-feed/view/headlines_filter_page.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,9 @@ class _HeadlinesFilterPageState extends State<HeadlinesFilterPage> {
140140
_currentUserPreferences = preferences;
141141
_tempSelectedTopics = List.from(preferences.followedTopics);
142142
_tempSelectedSources = List.from(preferences.followedSources);
143-
_tempSelectedEventCountries = List.from(preferences.followedCountries);
143+
_tempSelectedEventCountries = List.from(
144+
preferences.followedCountries,
145+
);
144146
_isLoadingFollowedFilters = false;
145147
});
146148
}
@@ -254,7 +256,7 @@ class _HeadlinesFilterPageState extends State<HeadlinesFilterPage> {
254256

255257
// Determine if the "Apply my followed items" feature is active and loading.
256258
// This will disable the individual filter tiles.
257-
final bool isFollowedFilterActiveOrLoading =
259+
final isFollowedFilterActiveOrLoading =
258260
_useFollowedFilters || _isLoadingFollowedFilters;
259261

260262
return Scaffold(

0 commit comments

Comments
 (0)