Skip to content

Commit b6dda33

Browse files
fullenifulleni
committed
refactor(dependencies): rename and restructure package imports
- Rename 'ht_' prefix packages to 'flutter_news_app_mobile_client_full_source_code' - Restructure package imports to use core, data_repository, and kv_storage_service - Update import paths for consistency and remove redundant ones
1 parent 4a7651f commit b6dda33

File tree

5 files changed

+77
-77
lines changed

5 files changed

+77
-77
lines changed

‎lib/app/bloc/app_bloc.dart

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
import 'dart:async';
22

3+
import 'package:auth_repository/auth_repository.dart';
34
import 'package:bloc/bloc.dart';
5+
import 'package:core/core.dart';
6+
import 'package:data_repository/data_repository.dart';
47
import 'package:equatable/equatable.dart';
58
import 'package:flex_color_scheme/flex_color_scheme.dart';
69
import 'package:flutter/material.dart';
7-
import 'package:ht_auth_repository/ht_auth_repository.dart';
8-
import 'package:ht_data_repository/ht_data_repository.dart';
9-
import 'package:ht_main/app/config/config.dart' as local_config;
10-
import 'package:ht_main/app/services/demo_data_migration_service.dart';
11-
import 'package:ht_shared/ht_shared.dart';
10+
import 'package:flutter_news_app_mobile_client_full_source_code/app/config/config.dart'
11+
as local_config;
12+
import 'package:flutter_news_app_mobile_client_full_source_code/app/services/demo_data_migration_service.dart';
1213

1314
part 'app_event.dart';
1415
part 'app_state.dart';
1516

1617
class AppBloc extends Bloc<AppEvent, AppState> {
1718
AppBloc({
18-
required HtAuthRepository authenticationRepository,
19-
required HtDataRepository<UserAppSettings> userAppSettingsRepository,
20-
required HtDataRepository<RemoteConfig> appConfigRepository,
19+
required AuthRepository authenticationRepository,
20+
required DataRepository<UserAppSettings> userAppSettingsRepository,
21+
required DataRepository<RemoteConfig> appConfigRepository,
2122
required local_config.AppEnvironment environment,
2223
this.demoDataMigrationService,
2324
}) : _authenticationRepository = authenticationRepository,
@@ -66,9 +67,9 @@ class AppBloc extends Bloc<AppEvent, AppState> {
6667
);
6768
}
6869

69-
final HtAuthRepository _authenticationRepository;
70-
final HtDataRepository<UserAppSettings> _userAppSettingsRepository;
71-
final HtDataRepository<RemoteConfig> _appConfigRepository;
70+
final AuthRepository _authenticationRepository;
71+
final DataRepository<UserAppSettings> _userAppSettingsRepository;
72+
final DataRepository<RemoteConfig> _appConfigRepository;
7273
final local_config.AppEnvironment _environment;
7374
final DemoDataMigrationService? demoDataMigrationService;
7475
late final StreamSubscription<User?> _userSubscription;
@@ -449,9 +450,9 @@ class AppBloc extends Bloc<AppEvent, AppState> {
449450
status: newStatusBasedOnUser,
450451
),
451452
);
452-
} on HtHttpException catch (e) {
453+
} on HttpException catch (e) {
453454
print(
454-
'[AppBloc] Failed to fetch AppConfig (HtHttpException) for user ${state.user?.id}: ${e.runtimeType} - ${e.message}',
455+
'[AppBloc] Failed to fetch AppConfig (HttpException) for user ${state.user?.id}: ${e.runtimeType} - ${e.message}',
455456
);
456457
emit(
457458
state.copyWith(
@@ -505,7 +506,7 @@ class AppBloc extends Bloc<AppEvent, AppState> {
505506
// Emit the change so UI can react if needed, and other BLoCs get the update.
506507
emit(state.copyWith(user: updatedUser));
507508

508-
// TODO: Persist this change to the backend.
509+
// TODO(fulleni): Persist this change to the backend.
509510
// This would typically involve calling a method on a repository, e.g.:
510511
// try {
511512
// await _authenticationRepository.updateUserFeedActionStatus(
@@ -536,7 +537,7 @@ class AppBloc extends Bloc<AppEvent, AppState> {
536537
return;
537538
}
538539

539-
// TODO(ht-development): Get the current app version from a package like
540+
// TODO(fulleni): Get the current app version from a package like
540541
// package_info_plus and compare it with appStatus.latestAppVersion.
541542
if (appStatus.isLatestVersionOnly) {
542543
emit(state.copyWith(status: AppStatus.updateRequired));

‎lib/app/config/app_config.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:ht_main/app/config/app_environment.dart';
1+
import 'package:flutter_news_app_mobile_client_full_source_code/app/config/app_environment.dart';
22

33
class AppConfig {
44
const AppConfig({

‎lib/app/services/demo_data_migration_service.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:ht_data_repository/ht_data_repository.dart';
2-
import 'package:ht_shared/ht_shared.dart';
1+
import 'package:core/core.dart';
2+
import 'package:data_repository/data_repository.dart';
33

44
/// {@template demo_data_migration_service}
55
/// A service responsible for migrating user data (settings and preferences)
@@ -12,14 +12,14 @@ import 'package:ht_shared/ht_shared.dart';
1212
class DemoDataMigrationService {
1313
/// {@macro demo_data_migration_service}
1414
const DemoDataMigrationService({
15-
required HtDataRepository<UserAppSettings> userAppSettingsRepository,
16-
required HtDataRepository<UserContentPreferences>
15+
required DataRepository<UserAppSettings> userAppSettingsRepository,
16+
required DataRepository<UserContentPreferences>
1717
userContentPreferencesRepository,
1818
}) : _userAppSettingsRepository = userAppSettingsRepository,
1919
_userContentPreferencesRepository = userContentPreferencesRepository;
2020

21-
final HtDataRepository<UserAppSettings> _userAppSettingsRepository;
22-
final HtDataRepository<UserContentPreferences>
21+
final DataRepository<UserAppSettings> _userAppSettingsRepository;
22+
final DataRepository<UserContentPreferences>
2323
_userContentPreferencesRepository;
2424

2525
/// Migrates user settings and content preferences from an old anonymous

‎lib/app/view/app.dart

Lines changed: 53 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
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:flex_color_scheme/flex_color_scheme.dart';
25
import 'package:flutter/material.dart';
36
import 'package:flutter_bloc/flutter_bloc.dart';
7+
import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
8+
import 'package:flutter_news_app_mobile_client_full_source_code/app/config/app_environment.dart';
9+
import 'package:flutter_news_app_mobile_client_full_source_code/app/services/demo_data_migration_service.dart';
10+
import 'package:flutter_news_app_mobile_client_full_source_code/authentication/bloc/authentication_bloc.dart';
11+
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/app_localizations.dart';
12+
import 'package:flutter_news_app_mobile_client_full_source_code/router/router.dart';
413
import 'package:go_router/go_router.dart';
5-
import 'package:ht_auth_repository/ht_auth_repository.dart';
6-
import 'package:ht_data_repository/ht_data_repository.dart';
7-
import 'package:ht_kv_storage_service/ht_kv_storage_service.dart';
8-
import 'package:ht_main/app/bloc/app_bloc.dart';
9-
import 'package:ht_main/app/config/app_environment.dart';
10-
import 'package:ht_main/app/services/demo_data_migration_service.dart';
11-
import 'package:ht_main/authentication/bloc/authentication_bloc.dart';
12-
import 'package:ht_main/l10n/app_localizations.dart';
13-
import 'package:ht_main/router/router.dart';
14-
import 'package:ht_shared/ht_shared.dart' hide AppStatus;
15-
import 'package:ht_ui_kit/ht_ui_kit.dart';
14+
import 'package:kv_storage_service/kv_storage_service.dart';
15+
import 'package:ui_kit/ui_kit.dart';
1616

1717
class App extends StatelessWidget {
1818
const App({
19-
required HtAuthRepository htAuthenticationRepository,
20-
required HtDataRepository<Headline> htHeadlinesRepository,
21-
required HtDataRepository<Topic> htTopicsRepository,
22-
required HtDataRepository<Country> htCountriesRepository,
23-
required HtDataRepository<Source> htSourcesRepository,
24-
required HtDataRepository<UserAppSettings> htUserAppSettingsRepository,
25-
required HtDataRepository<UserContentPreferences>
19+
required AuthRepository authenticationRepository,
20+
required DataRepository<Headline> htHeadlinesRepository,
21+
required DataRepository<Topic> htTopicsRepository,
22+
required DataRepository<Country> htCountriesRepository,
23+
required DataRepository<Source> htSourcesRepository,
24+
required DataRepository<UserAppSettings> htUserAppSettingsRepository,
25+
required DataRepository<UserContentPreferences>
2626
htUserContentPreferencesRepository,
27-
required HtDataRepository<RemoteConfig> htRemoteConfigRepository,
28-
required HtKVStorageService kvStorageService,
27+
required DataRepository<RemoteConfig> htRemoteConfigRepository,
28+
required KVStorageService kvStorageService,
2929
required AppEnvironment environment,
3030
this.demoDataMigrationService,
3131
super.key,
32-
}) : _htAuthenticationRepository = htAuthenticationRepository,
32+
}) : _authenticationRepository = authenticationRepository,
3333
_htHeadlinesRepository = htHeadlinesRepository,
3434
_htTopicsRepository = htTopicsRepository,
3535
_htCountriesRepository = htCountriesRepository,
@@ -40,24 +40,24 @@ class App extends StatelessWidget {
4040
_kvStorageService = kvStorageService,
4141
_environment = environment;
4242

43-
final HtAuthRepository _htAuthenticationRepository;
44-
final HtDataRepository<Headline> _htHeadlinesRepository;
45-
final HtDataRepository<Topic> _htTopicsRepository;
46-
final HtDataRepository<Country> _htCountriesRepository;
47-
final HtDataRepository<Source> _htSourcesRepository;
48-
final HtDataRepository<UserAppSettings> _htUserAppSettingsRepository;
49-
final HtDataRepository<UserContentPreferences>
43+
final AuthRepository _authenticationRepository;
44+
final DataRepository<Headline> _htHeadlinesRepository;
45+
final DataRepository<Topic> _htTopicsRepository;
46+
final DataRepository<Country> _htCountriesRepository;
47+
final DataRepository<Source> _htSourcesRepository;
48+
final DataRepository<UserAppSettings> _htUserAppSettingsRepository;
49+
final DataRepository<UserContentPreferences>
5050
_htUserContentPreferencesRepository;
51-
final HtDataRepository<RemoteConfig> _htAppConfigRepository;
52-
final HtKVStorageService _kvStorageService;
51+
final DataRepository<RemoteConfig> _htAppConfigRepository;
52+
final KVStorageService _kvStorageService;
5353
final AppEnvironment _environment;
5454
final DemoDataMigrationService? demoDataMigrationService;
5555

5656
@override
5757
Widget build(BuildContext context) {
5858
return MultiRepositoryProvider(
5959
providers: [
60-
RepositoryProvider.value(value: _htAuthenticationRepository),
60+
RepositoryProvider.value(value: _authenticationRepository),
6161
RepositoryProvider.value(value: _htHeadlinesRepository),
6262
RepositoryProvider.value(value: _htTopicsRepository),
6363
RepositoryProvider.value(value: _htCountriesRepository),
@@ -71,23 +71,22 @@ class App extends StatelessWidget {
7171
providers: [
7272
BlocProvider(
7373
create: (context) => AppBloc(
74-
authenticationRepository: context.read<HtAuthRepository>(),
74+
authenticationRepository: context.read<AuthRepository>(),
7575
userAppSettingsRepository: context
76-
.read<HtDataRepository<UserAppSettings>>(),
77-
appConfigRepository: context
78-
.read<HtDataRepository<RemoteConfig>>(),
76+
.read<DataRepository<UserAppSettings>>(),
77+
appConfigRepository: context.read<DataRepository<RemoteConfig>>(),
7978
environment: _environment,
8079
demoDataMigrationService: demoDataMigrationService,
8180
),
8281
),
8382
BlocProvider(
8483
create: (context) => AuthenticationBloc(
85-
authenticationRepository: context.read<HtAuthRepository>(),
84+
authenticationRepository: context.read<AuthRepository>(),
8685
),
8786
),
8887
],
8988
child: _AppView(
90-
htAuthenticationRepository: _htAuthenticationRepository,
89+
authenticationRepository: _authenticationRepository,
9190
htHeadlinesRepository: _htHeadlinesRepository,
9291
htTopicRepository: _htTopicsRepository,
9392
htCountriesRepository: _htCountriesRepository,
@@ -105,7 +104,7 @@ class App extends StatelessWidget {
105104

106105
class _AppView extends StatefulWidget {
107106
const _AppView({
108-
required this.htAuthenticationRepository,
107+
required this.authenticationRepository,
109108
required this.htHeadlinesRepository,
110109
required this.htTopicRepository,
111110
required this.htCountriesRepository,
@@ -116,15 +115,15 @@ class _AppView extends StatefulWidget {
116115
required this.environment,
117116
});
118117

119-
final HtAuthRepository htAuthenticationRepository;
120-
final HtDataRepository<Headline> htHeadlinesRepository;
121-
final HtDataRepository<Topic> htTopicRepository;
122-
final HtDataRepository<Country> htCountriesRepository;
123-
final HtDataRepository<Source> htSourcesRepository;
124-
final HtDataRepository<UserAppSettings> htUserAppSettingsRepository;
125-
final HtDataRepository<UserContentPreferences>
118+
final AuthRepository authenticationRepository;
119+
final DataRepository<Headline> htHeadlinesRepository;
120+
final DataRepository<Topic> htTopicRepository;
121+
final DataRepository<Country> htCountriesRepository;
122+
final DataRepository<Source> htSourcesRepository;
123+
final DataRepository<UserAppSettings> htUserAppSettingsRepository;
124+
final DataRepository<UserContentPreferences>
126125
htUserContentPreferencesRepository;
127-
final HtDataRepository<RemoteConfig> htAppConfigRepository;
126+
final DataRepository<RemoteConfig> htAppConfigRepository;
128127
final AppEnvironment environment;
129128

130129
@override
@@ -145,7 +144,7 @@ class _AppViewState extends State<_AppView> {
145144
_statusNotifier = ValueNotifier<AppStatus>(appBloc.state.status);
146145
_router = createRouter(
147146
authStatusNotifier: _statusNotifier,
148-
htAuthenticationRepository: widget.htAuthenticationRepository,
147+
authenticationRepository: widget.authenticationRepository,
149148
htHeadlinesRepository: widget.htHeadlinesRepository,
150149
htTopicsRepository: widget.htTopicRepository,
151150
htCountriesRepository: widget.htCountriesRepository,
@@ -205,11 +204,11 @@ class _AppViewState extends State<_AppView> {
205204
.themeMode, // Still respect light/dark if available from system
206205
localizationsDelegates: const [
207206
...AppLocalizations.localizationsDelegates,
208-
...HtUiKitLocalizations.localizationsDelegates,
207+
...UiKitLocalizations.localizationsDelegates,
209208
],
210209
supportedLocales: const [
211210
...AppLocalizations.supportedLocales,
212-
...HtUiKitLocalizations.supportedLocales,
211+
...UiKitLocalizations.supportedLocales,
213212
],
214213
home: Scaffold(
215214
body: Builder(
@@ -246,19 +245,19 @@ class _AppViewState extends State<_AppView> {
246245
themeMode: state.themeMode,
247246
localizationsDelegates: const [
248247
...AppLocalizations.localizationsDelegates,
249-
...HtUiKitLocalizations.localizationsDelegates,
248+
...UiKitLocalizations.localizationsDelegates,
250249
],
251250
supportedLocales: const [
252251
...AppLocalizations.supportedLocales,
253-
...HtUiKitLocalizations.supportedLocales,
252+
...UiKitLocalizations.supportedLocales,
254253
],
255254
home: Scaffold(
256255
body: Builder(
257256
// Use Builder to get context under MaterialApp
258257
builder: (innerContext) {
259258
return FailureStateWidget(
260259
exception: const NetworkException(),
261-
retryButtonText: HtUiKitLocalizations.of(
260+
retryButtonText: UiKitLocalizations.of(
262261
innerContext,
263262
)!.retryButtonText,
264263
onRetry: () {
@@ -308,11 +307,11 @@ class _AppViewState extends State<_AppView> {
308307
locale: state.locale,
309308
localizationsDelegates: const [
310309
...AppLocalizations.localizationsDelegates,
311-
...HtUiKitLocalizations.localizationsDelegates,
310+
...UiKitLocalizations.localizationsDelegates,
312311
],
313312
supportedLocales: const [
314313
...AppLocalizations.supportedLocales,
315-
...HtUiKitLocalizations.supportedLocales,
314+
...UiKitLocalizations.supportedLocales,
316315
],
317316
);
318317
},

‎lib/app/view/app_shell.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
import 'package:flutter/material.dart';
55
import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
6+
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
67
import 'package:go_router/go_router.dart';
7-
import 'package:ht_main/l10n/l10n.dart';
88

99
/// A responsive scaffold shell for the main application sections.
1010
///

0 commit comments

Comments
 (0)