Skip to content

Commit c72ff08

Browse files
fullenifulleni
committed
style: format
1 parent 5e3948b commit c72ff08

File tree

2 files changed

+73
-66
lines changed

2 files changed

+73
-66
lines changed

‎lib/entity_details/view/entity_details_page.dart‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
// ignore_for_file: no_default_cases
22

33
import 'package:core/core.dart';
4-
import 'package:data_repository/data_repository.dart';
54
import 'package:flutter/material.dart';
65
import 'package:flutter_bloc/flutter_bloc.dart';
7-
import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/account_bloc.dart';
86
import 'package:flutter_news_app_mobile_client_full_source_code/ads/ad_service.dart';
97
import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/ad_placeholder.dart';
108
import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/ad_theme_style.dart';
@@ -14,7 +12,6 @@ import 'package:flutter_news_app_mobile_client_full_source_code/entity_details/b
1412
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/app_localizations.dart';
1513
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
1614
import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
17-
import 'package:flutter_news_app_mobile_client_full_source_code/shared/shared.dart';
1815
import 'package:flutter_news_app_mobile_client_full_source_code/shared/widgets/feed_core/feed_core.dart';
1916
import 'package:go_router/go_router.dart';
2017
import 'package:ui_kit/ui_kit.dart';
@@ -75,10 +72,10 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
7572
void _onScroll() {
7673
if (_isBottom) {
7774
context.read<EntityDetailsBloc>().add(
78-
EntityDetailsLoadMoreHeadlinesRequested(
79-
adThemeStyle: AdThemeStyle.fromTheme(Theme.of(context)),
80-
),
81-
);
75+
EntityDetailsLoadMoreHeadlinesRequested(
76+
adThemeStyle: AdThemeStyle.fromTheme(Theme.of(context)),
77+
),
78+
);
8279
}
8380
}
8481

@@ -138,12 +135,12 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
138135
return FailureStateWidget(
139136
exception: state.exception!,
140137
onRetry: () => context.read<EntityDetailsBloc>().add(
141-
EntityDetailsLoadRequested(
142-
entityId: widget.args.entityId,
143-
contentType: widget.args.contentType,
144-
adThemeStyle: AdThemeStyle.fromTheme(theme),
145-
),
146-
),
138+
EntityDetailsLoadRequested(
139+
entityId: widget.args.entityId,
140+
contentType: widget.args.contentType,
141+
adThemeStyle: AdThemeStyle.fromTheme(theme),
142+
),
143+
),
147144
);
148145
}
149146

@@ -169,11 +166,11 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
169166
final description = state.entity is Topic
170167
? (state.entity! as Topic).description
171168
: state.entity is Source
172-
? (state.entity! as Source).description
173-
: state.entity is Country
174-
? (state.entity! as Country)
175-
.name // Using name as description for country
176-
: null;
169+
? (state.entity! as Source).description
170+
: state.entity is Country
171+
? (state.entity! as Country)
172+
.name // Using name as description for country
173+
: null;
177174

178175
final followButton = IconButton(
179176
icon: Icon(
@@ -185,16 +182,16 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
185182
: l10n.followButtonLabel,
186183
onPressed: () {
187184
context.read<EntityDetailsBloc>().add(
188-
const EntityDetailsToggleFollowRequested(),
189-
);
185+
const EntityDetailsToggleFollowRequested(),
186+
);
190187
},
191188
);
192189

193190
final entityIconUrl = (state.entity is Topic)
194191
? (state.entity! as Topic).iconUrl
195192
: (state.entity is Country)
196-
? (state.entity! as Country).flagUrl
197-
: null;
193+
? (state.entity! as Country).flagUrl
194+
: null;
198195

199196
final Widget appBarTitleWidget = Row(
200197
mainAxisSize: MainAxisSize.min,
@@ -301,7 +298,8 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
301298
horizontal: AppSpacing.paddingMedium,
302299
),
303300
sliver: SliverList.separated(
304-
itemCount: state.feedItems.length +
301+
itemCount:
302+
state.feedItems.length +
305303
(state.hasMoreHeadlines &&
306304
state.status == EntityDetailsStatus.loadingMore
307305
? 1

‎lib/router/router.dart‎

Lines changed: 52 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import 'package:flutter_news_app_mobile_client_full_source_code/account/view/man
1414
import 'package:flutter_news_app_mobile_client_full_source_code/account/view/manage_followed_items/topics/followed_topics_list_page.dart';
1515
import 'package:flutter_news_app_mobile_client_full_source_code/account/view/saved_headlines_page.dart';
1616
import 'package:flutter_news_app_mobile_client_full_source_code/ads/ad_service.dart';
17+
import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/ad_theme_style.dart';
1718
import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
1819
import 'package:flutter_news_app_mobile_client_full_source_code/app/config/config.dart'
1920
as local_config;
@@ -22,7 +23,6 @@ import 'package:flutter_news_app_mobile_client_full_source_code/authentication/b
2223
import 'package:flutter_news_app_mobile_client_full_source_code/authentication/view/authentication_page.dart';
2324
import 'package:flutter_news_app_mobile_client_full_source_code/authentication/view/email_code_verification_page.dart';
2425
import 'package:flutter_news_app_mobile_client_full_source_code/authentication/view/request_code_page.dart';
25-
import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/ad_theme_style.dart';
2626
import 'package:flutter_news_app_mobile_client_full_source_code/entity_details/bloc/entity_details_bloc.dart';
2727
import 'package:flutter_news_app_mobile_client_full_source_code/entity_details/view/entity_details_page.dart';
2828
import 'package:flutter_news_app_mobile_client_full_source_code/headline-details/bloc/headline_details_bloc.dart';
@@ -280,21 +280,24 @@ GoRouter createRouter({
280280
providers: [
281281
BlocProvider.value(value: accountBloc),
282282
BlocProvider(
283-
create: (context) => EntityDetailsBloc(
284-
headlinesRepository: context.read<DataRepository<Headline>>(),
285-
topicRepository: context.read<DataRepository<Topic>>(),
286-
sourceRepository: context.read<DataRepository<Source>>(),
287-
countryRepository: context.read<DataRepository<Country>>(),
288-
accountBloc: accountBloc,
289-
appBloc: context.read<AppBloc>(),
290-
feedDecoratorService: feedDecoratorService,
291-
)..add(
292-
EntityDetailsLoadRequested(
293-
entityId: args.entityId,
294-
contentType: args.contentType,
295-
adThemeStyle: AdThemeStyle.fromTheme(Theme.of(context)),
283+
create: (context) =>
284+
EntityDetailsBloc(
285+
headlinesRepository: context
286+
.read<DataRepository<Headline>>(),
287+
topicRepository: context.read<DataRepository<Topic>>(),
288+
sourceRepository: context.read<DataRepository<Source>>(),
289+
countryRepository: context
290+
.read<DataRepository<Country>>(),
291+
accountBloc: accountBloc,
292+
appBloc: context.read<AppBloc>(),
293+
feedDecoratorService: feedDecoratorService,
294+
)..add(
295+
EntityDetailsLoadRequested(
296+
entityId: args.entityId,
297+
contentType: args.contentType,
298+
adThemeStyle: AdThemeStyle.fromTheme(Theme.of(context)),
299+
),
296300
),
297-
),
298301
),
299302
],
300303
child: EntityDetailsPage(args: args),
@@ -317,21 +320,24 @@ GoRouter createRouter({
317320
providers: [
318321
BlocProvider.value(value: accountBloc),
319322
BlocProvider(
320-
create: (context) => EntityDetailsBloc(
321-
headlinesRepository: context.read<DataRepository<Headline>>(),
322-
topicRepository: context.read<DataRepository<Topic>>(),
323-
sourceRepository: context.read<DataRepository<Source>>(),
324-
countryRepository: context.read<DataRepository<Country>>(),
325-
accountBloc: accountBloc,
326-
appBloc: context.read<AppBloc>(),
327-
feedDecoratorService: feedDecoratorService,
328-
)..add(
329-
EntityDetailsLoadRequested(
330-
entityId: args.entityId,
331-
contentType: args.contentType,
332-
adThemeStyle: AdThemeStyle.fromTheme(Theme.of(context)),
323+
create: (context) =>
324+
EntityDetailsBloc(
325+
headlinesRepository: context
326+
.read<DataRepository<Headline>>(),
327+
topicRepository: context.read<DataRepository<Topic>>(),
328+
sourceRepository: context.read<DataRepository<Source>>(),
329+
countryRepository: context
330+
.read<DataRepository<Country>>(),
331+
accountBloc: accountBloc,
332+
appBloc: context.read<AppBloc>(),
333+
feedDecoratorService: feedDecoratorService,
334+
)..add(
335+
EntityDetailsLoadRequested(
336+
entityId: args.entityId,
337+
contentType: args.contentType,
338+
adThemeStyle: AdThemeStyle.fromTheme(Theme.of(context)),
339+
),
333340
),
334-
),
335341
),
336342
],
337343
child: EntityDetailsPage(args: args),
@@ -354,21 +360,24 @@ GoRouter createRouter({
354360
providers: [
355361
BlocProvider.value(value: accountBloc),
356362
BlocProvider(
357-
create: (context) => EntityDetailsBloc(
358-
headlinesRepository: context.read<DataRepository<Headline>>(),
359-
topicRepository: context.read<DataRepository<Topic>>(),
360-
sourceRepository: context.read<DataRepository<Source>>(),
361-
countryRepository: context.read<DataRepository<Country>>(),
362-
accountBloc: accountBloc,
363-
appBloc: context.read<AppBloc>(),
364-
feedDecoratorService: feedDecoratorService,
365-
)..add(
366-
EntityDetailsLoadRequested(
367-
entityId: args.entityId,
368-
contentType: args.contentType,
369-
adThemeStyle: AdThemeStyle.fromTheme(Theme.of(context)),
363+
create: (context) =>
364+
EntityDetailsBloc(
365+
headlinesRepository: context
366+
.read<DataRepository<Headline>>(),
367+
topicRepository: context.read<DataRepository<Topic>>(),
368+
sourceRepository: context.read<DataRepository<Source>>(),
369+
countryRepository: context
370+
.read<DataRepository<Country>>(),
371+
accountBloc: accountBloc,
372+
appBloc: context.read<AppBloc>(),
373+
feedDecoratorService: feedDecoratorService,
374+
)..add(
375+
EntityDetailsLoadRequested(
376+
entityId: args.entityId,
377+
contentType: args.contentType,
378+
adThemeStyle: AdThemeStyle.fromTheme(Theme.of(context)),
379+
),
370380
),
371-
),
372381
),
373382
],
374383
child: EntityDetailsPage(args: args),

0 commit comments

Comments
 (0)