Skip to content

Commit f10042f

Browse files
fullenifulleni
committed
refactor(router): update imports and package names
- Update import statements to use new package names - Replace HtAuthRepository with AuthRepository - Replace HtDataRepository with DataRepository - Update repository imports to use new package structure - Adjust bloc imports to use new package paths
1 parent 65698b4 commit f10042f

File tree

1 file changed

+71
-72
lines changed

1 file changed

+71
-72
lines changed

‎lib/router/router.dart

Lines changed: 71 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,72 @@
1+
import 'package:auth_repository/auth_repository.dart';
2+
import 'package:core/core.dart' hide AppStatus;
3+
import 'package:data_repository/data_repository.dart';
14
import 'package:flutter/material.dart';
25
import 'package:flutter_bloc/flutter_bloc.dart';
6+
import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/account_bloc.dart';
7+
import 'package:flutter_news_app_mobile_client_full_source_code/account/view/account_page.dart';
8+
import 'package:flutter_news_app_mobile_client_full_source_code/account/view/manage_followed_items/manage_followed_items_page.dart';
9+
import 'package:flutter_news_app_mobile_client_full_source_code/account/view/manage_followed_items/sources/add_source_to_follow_page.dart';
10+
import 'package:flutter_news_app_mobile_client_full_source_code/account/view/manage_followed_items/sources/followed_sources_list_page.dart';
11+
import 'package:flutter_news_app_mobile_client_full_source_code/account/view/manage_followed_items/topics/add_topic_to_follow_page.dart';
12+
import 'package:flutter_news_app_mobile_client_full_source_code/account/view/manage_followed_items/topics/followed_topics_list_page.dart';
13+
import 'package:flutter_news_app_mobile_client_full_source_code/account/view/saved_headlines_page.dart';
14+
import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
15+
import 'package:flutter_news_app_mobile_client_full_source_code/app/config/config.dart'
16+
as local_config;
17+
import 'package:flutter_news_app_mobile_client_full_source_code/app/view/app_shell.dart';
18+
import 'package:flutter_news_app_mobile_client_full_source_code/authentication/bloc/authentication_bloc.dart';
19+
import 'package:flutter_news_app_mobile_client_full_source_code/authentication/view/authentication_page.dart';
20+
import 'package:flutter_news_app_mobile_client_full_source_code/authentication/view/email_code_verification_page.dart';
21+
import 'package:flutter_news_app_mobile_client_full_source_code/authentication/view/request_code_page.dart';
22+
import 'package:flutter_news_app_mobile_client_full_source_code/entity_details/view/entity_details_page.dart';
23+
import 'package:flutter_news_app_mobile_client_full_source_code/headline-details/bloc/headline_details_bloc.dart';
24+
import 'package:flutter_news_app_mobile_client_full_source_code/headline-details/bloc/similar_headlines_bloc.dart';
25+
import 'package:flutter_news_app_mobile_client_full_source_code/headline-details/view/headline_details_page.dart';
26+
// import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/bloc/countries_filter_bloc.dart';
27+
import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/bloc/headlines_feed_bloc.dart';
28+
import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/bloc/sources_filter_bloc.dart';
29+
import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/bloc/topics_filter_bloc.dart';
30+
// import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/view/country_filter_page.dart';
31+
import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/view/headlines_feed_page.dart';
32+
import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/view/headlines_filter_page.dart';
33+
import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/view/source_filter_page.dart';
34+
import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/view/topic_filter_page.dart';
35+
import 'package:flutter_news_app_mobile_client_full_source_code/headlines-search/bloc/headlines_search_bloc.dart';
36+
import 'package:flutter_news_app_mobile_client_full_source_code/headlines-search/view/headlines_search_page.dart';
37+
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
38+
import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
39+
import 'package:flutter_news_app_mobile_client_full_source_code/settings/bloc/settings_bloc.dart';
40+
import 'package:flutter_news_app_mobile_client_full_source_code/settings/view/appearance_settings_page.dart';
41+
import 'package:flutter_news_app_mobile_client_full_source_code/settings/view/feed_settings_page.dart';
42+
import 'package:flutter_news_app_mobile_client_full_source_code/settings/view/font_settings_page.dart';
43+
import 'package:flutter_news_app_mobile_client_full_source_code/settings/view/language_settings_page.dart';
44+
import 'package:flutter_news_app_mobile_client_full_source_code/settings/view/notification_settings_page.dart';
45+
import 'package:flutter_news_app_mobile_client_full_source_code/settings/view/settings_page.dart';
46+
import 'package:flutter_news_app_mobile_client_full_source_code/settings/view/theme_settings_page.dart';
47+
import 'package:flutter_news_app_mobile_client_full_source_code/shared/services/feed_injector_service.dart';
348
import 'package:go_router/go_router.dart';
4-
import 'package:ht_auth_repository/ht_auth_repository.dart';
5-
import 'package:ht_data_repository/ht_data_repository.dart';
6-
import 'package:ht_main/account/bloc/account_bloc.dart';
7-
import 'package:ht_main/account/view/account_page.dart';
8-
import 'package:ht_main/account/view/manage_followed_items/manage_followed_items_page.dart';
9-
import 'package:ht_main/account/view/manage_followed_items/sources/add_source_to_follow_page.dart';
10-
import 'package:ht_main/account/view/manage_followed_items/sources/followed_sources_list_page.dart';
11-
import 'package:ht_main/account/view/manage_followed_items/topics/add_topic_to_follow_page.dart';
12-
import 'package:ht_main/account/view/manage_followed_items/topics/followed_topics_list_page.dart';
13-
import 'package:ht_main/account/view/saved_headlines_page.dart';
14-
import 'package:ht_main/app/bloc/app_bloc.dart';
15-
import 'package:ht_main/app/config/config.dart' as local_config;
16-
import 'package:ht_main/app/view/app_shell.dart';
17-
import 'package:ht_main/authentication/bloc/authentication_bloc.dart';
18-
import 'package:ht_main/authentication/view/authentication_page.dart';
19-
import 'package:ht_main/authentication/view/email_code_verification_page.dart';
20-
import 'package:ht_main/authentication/view/request_code_page.dart';
21-
import 'package:ht_main/entity_details/view/entity_details_page.dart';
22-
import 'package:ht_main/headline-details/bloc/headline_details_bloc.dart';
23-
import 'package:ht_main/headline-details/bloc/similar_headlines_bloc.dart';
24-
import 'package:ht_main/headline-details/view/headline_details_page.dart';
25-
// import 'package:ht_main/headlines-feed/bloc/countries_filter_bloc.dart';
26-
import 'package:ht_main/headlines-feed/bloc/headlines_feed_bloc.dart';
27-
import 'package:ht_main/headlines-feed/bloc/sources_filter_bloc.dart';
28-
import 'package:ht_main/headlines-feed/bloc/topics_filter_bloc.dart';
29-
// import 'package:ht_main/headlines-feed/view/country_filter_page.dart';
30-
import 'package:ht_main/headlines-feed/view/headlines_feed_page.dart';
31-
import 'package:ht_main/headlines-feed/view/headlines_filter_page.dart';
32-
import 'package:ht_main/headlines-feed/view/source_filter_page.dart';
33-
import 'package:ht_main/headlines-feed/view/topic_filter_page.dart';
34-
import 'package:ht_main/headlines-search/bloc/headlines_search_bloc.dart';
35-
import 'package:ht_main/headlines-search/view/headlines_search_page.dart';
36-
import 'package:ht_main/l10n/l10n.dart';
37-
import 'package:ht_main/router/routes.dart';
38-
import 'package:ht_main/settings/bloc/settings_bloc.dart';
39-
import 'package:ht_main/settings/view/appearance_settings_page.dart';
40-
import 'package:ht_main/settings/view/feed_settings_page.dart';
41-
import 'package:ht_main/settings/view/font_settings_page.dart';
42-
import 'package:ht_main/settings/view/language_settings_page.dart';
43-
import 'package:ht_main/settings/view/notification_settings_page.dart';
44-
import 'package:ht_main/settings/view/settings_page.dart';
45-
import 'package:ht_main/settings/view/theme_settings_page.dart';
46-
import 'package:ht_main/shared/services/feed_injector_service.dart';
47-
import 'package:ht_shared/ht_shared.dart' hide AppStatus;
4849

4950
/// Creates and configures the GoRouter instance for the application.
5051
///
5152
/// Requires an [authStatusNotifier] to trigger route re-evaluation when
5253
/// authentication state changes.
5354
GoRouter createRouter({
5455
required ValueNotifier<AppStatus> authStatusNotifier,
55-
required HtAuthRepository htAuthenticationRepository,
56-
required HtDataRepository<Headline> htHeadlinesRepository,
57-
required HtDataRepository<Topic> htTopicsRepository,
58-
required HtDataRepository<Country> htCountriesRepository,
59-
required HtDataRepository<Source> htSourcesRepository,
60-
required HtDataRepository<UserAppSettings> htUserAppSettingsRepository,
61-
required HtDataRepository<UserContentPreferences>
56+
required AuthRepository authenticationRepository,
57+
required DataRepository<Headline> htHeadlinesRepository,
58+
required DataRepository<Topic> htTopicsRepository,
59+
required DataRepository<Country> htCountriesRepository,
60+
required DataRepository<Source> htSourcesRepository,
61+
required DataRepository<UserAppSettings> htUserAppSettingsRepository,
62+
required DataRepository<UserContentPreferences>
6263
htUserContentPreferencesRepository,
63-
required HtDataRepository<RemoteConfig> htRemoteConfigRepository,
64+
required DataRepository<RemoteConfig> htRemoteConfigRepository,
6465
required local_config.AppEnvironment environment,
6566
}) {
6667
// Instantiate AccountBloc once to be shared
6768
final accountBloc = AccountBloc(
68-
authenticationRepository: htAuthenticationRepository,
69+
authenticationRepository: authenticationRepository,
6970
userContentPreferencesRepository: htUserContentPreferencesRepository,
7071
environment: environment,
7172
);
@@ -226,7 +227,7 @@ GoRouter createRouter({
226227

227228
return BlocProvider(
228229
create: (context) => AuthenticationBloc(
229-
authenticationRepository: context.read<HtAuthRepository>(),
230+
authenticationRepository: context.read<AuthRepository>(),
230231
),
231232
child: AuthenticationPage(
232233
headline: headline,
@@ -355,14 +356,12 @@ GoRouter createRouter({
355356
BlocProvider.value(value: accountBloc),
356357
BlocProvider(
357358
create: (context) => HeadlineDetailsBloc(
358-
headlinesRepository: context
359-
.read<HtDataRepository<Headline>>(),
359+
headlinesRepository: context.read<DataRepository<Headline>>(),
360360
),
361361
),
362362
BlocProvider(
363363
create: (context) => SimilarHeadlinesBloc(
364-
headlinesRepository: context
365-
.read<HtDataRepository<Headline>>(),
364+
headlinesRepository: context.read<DataRepository<Headline>>(),
366365
),
367366
),
368367
],
@@ -386,7 +385,7 @@ GoRouter createRouter({
386385
final feedInjectorService = FeedInjectorService();
387386
return HeadlinesFeedBloc(
388387
headlinesRepository: context
389-
.read<HtDataRepository<Headline>>(),
388+
.read<DataRepository<Headline>>(),
390389
feedInjectorService: feedInjectorService,
391390
appBloc: context.read<AppBloc>(),
392391
)..add(const HeadlinesFeedFetchRequested());
@@ -397,9 +396,9 @@ GoRouter createRouter({
397396
final feedInjectorService = FeedInjectorService();
398397
return HeadlinesSearchBloc(
399398
headlinesRepository: context
400-
.read<HtDataRepository<Headline>>(),
401-
topicRepository: context.read<HtDataRepository<Topic>>(),
402-
sourceRepository: context.read<HtDataRepository<Source>>(),
399+
.read<DataRepository<Headline>>(),
400+
topicRepository: context.read<DataRepository<Topic>>(),
401+
sourceRepository: context.read<DataRepository<Source>>(),
403402
appBloc: context.read<AppBloc>(),
404403
feedInjectorService: feedInjectorService,
405404
);
@@ -433,13 +432,13 @@ GoRouter createRouter({
433432
BlocProvider(
434433
create: (context) => HeadlineDetailsBloc(
435434
headlinesRepository: context
436-
.read<HtDataRepository<Headline>>(),
435+
.read<DataRepository<Headline>>(),
437436
),
438437
),
439438
BlocProvider(
440439
create: (context) => SimilarHeadlinesBloc(
441440
headlinesRepository: context
442-
.read<HtDataRepository<Headline>>(),
441+
.read<DataRepository<Headline>>(),
443442
),
444443
),
445444
],
@@ -486,7 +485,7 @@ GoRouter createRouter({
486485
builder: (context, state) => BlocProvider(
487486
create: (context) => TopicsFilterBloc(
488487
topicsRepository: context
489-
.read<HtDataRepository<Topic>>(),
488+
.read<DataRepository<Topic>>(),
490489
),
491490
child: const TopicFilterPage(),
492491
),
@@ -499,10 +498,10 @@ GoRouter createRouter({
499498
builder: (context, state) => BlocProvider(
500499
create: (context) => SourcesFilterBloc(
501500
sourcesRepository: context
502-
.read<HtDataRepository<Source>>(),
501+
.read<DataRepository<Source>>(),
503502
countriesRepository: // Added missing repository
504503
context
505-
.read<HtDataRepository<Country>>(),
504+
.read<DataRepository<Country>>(),
506505
),
507506
// Pass initialSelectedSources, country ISO codes, and source types from state.extra
508507
child: Builder(
@@ -561,13 +560,13 @@ GoRouter createRouter({
561560
BlocProvider(
562561
create: (context) => HeadlineDetailsBloc(
563562
headlinesRepository: context
564-
.read<HtDataRepository<Headline>>(),
563+
.read<DataRepository<Headline>>(),
565564
),
566565
),
567566
BlocProvider(
568567
create: (context) => SimilarHeadlinesBloc(
569568
headlinesRepository: context
570-
.read<HtDataRepository<Headline>>(),
569+
.read<DataRepository<Headline>>(),
571570
),
572571
),
573572
],
@@ -603,7 +602,7 @@ GoRouter createRouter({
603602
create: (context) {
604603
final settingsBloc = SettingsBloc(
605604
userAppSettingsRepository: context
606-
.read<HtDataRepository<UserAppSettings>>(),
605+
.read<DataRepository<UserAppSettings>>(),
607606
);
608607
// Only load settings if a userId is available
609608
if (userId != null) {
@@ -729,13 +728,13 @@ GoRouter createRouter({
729728
BlocProvider(
730729
create: (context) => HeadlineDetailsBloc(
731730
headlinesRepository: context
732-
.read<HtDataRepository<Headline>>(),
731+
.read<DataRepository<Headline>>(),
733732
),
734733
),
735734
BlocProvider(
736735
create: (context) => SimilarHeadlinesBloc(
737736
headlinesRepository: context
738-
.read<HtDataRepository<Headline>>(),
737+
.read<DataRepository<Headline>>(),
739738
),
740739
),
741740
],

0 commit comments

Comments
 (0)