Skip to content

Commit 33d1130

Browse files
committed
refactor(dependencies): remove "ht_" prefix from package imports
- Updated import statements to remove "ht_" prefix from package names - Renamed classes and methods to remove "ht" prefix - Updated file paths in import statements - Changed package names in main.dart
1 parent ed5ed16 commit 33d1130

File tree

2 files changed

+64
-63
lines changed

2 files changed

+64
-63
lines changed

lib/bootstrap.dart

Lines changed: 62 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1+
import 'package:auth_api/auth_api.dart';
2+
import 'package:auth_client/auth_client.dart';
3+
import 'package:auth_inmemory/auth_inmemory.dart';
4+
import 'package:auth_repository/auth_repository.dart';
5+
import 'package:core/core.dart';
6+
import 'package:data_api/data_api.dart';
7+
import 'package:data_client/data_client.dart';
8+
import 'package:data_inmemory/data_inmemory.dart';
9+
import 'package:data_repository/data_repository.dart';
110
import 'package:flutter/material.dart';
211
import 'package:flutter_bloc/flutter_bloc.dart';
3-
import 'package:ht_auth_api/ht_auth_api.dart';
4-
import 'package:ht_auth_client/ht_auth_client.dart';
5-
import 'package:ht_auth_inmemory/ht_auth_inmemory.dart';
6-
import 'package:ht_auth_repository/ht_auth_repository.dart';
7-
import 'package:ht_data_api/ht_data_api.dart';
8-
import 'package:ht_data_client/ht_data_client.dart';
9-
import 'package:ht_data_inmemory/ht_data_inmemory.dart';
10-
import 'package:ht_data_repository/ht_data_repository.dart';
11-
import 'package:ht_http_client/ht_http_client.dart';
12-
import 'package:ht_kv_storage_shared_preferences/ht_kv_storage_shared_preferences.dart';
13-
import 'package:ht_main/app/app.dart';
14-
import 'package:ht_main/app/config/config.dart' as app_config;
15-
import 'package:ht_main/app/services/demo_data_migration_service.dart';
16-
import 'package:ht_main/bloc_observer.dart';
17-
import 'package:ht_shared/ht_shared.dart';
18-
import 'package:ht_ui_kit/ht_ui_kit.dart';
12+
import 'package:flutter_news_app_mobile_client_full_source_code/app/app.dart';
13+
import 'package:flutter_news_app_mobile_client_full_source_code/app/config/config.dart'
14+
as app_config;
15+
import 'package:flutter_news_app_mobile_client_full_source_code/app/services/demo_data_migration_service.dart';
16+
import 'package:flutter_news_app_mobile_client_full_source_code/bloc_observer.dart';
17+
import 'package:http_client/http_client.dart';
18+
import 'package:kv_storage_shared_preferences/kv_storage_shared_preferences.dart';
1919
import 'package:logging/logging.dart';
2020
import 'package:timeago/timeago.dart' as timeago;
21+
import 'package:ui_kit/ui_kit.dart';
2122

2223
Future<Widget> bootstrap(
2324
app_config.AppConfig appConfig,
@@ -31,126 +32,126 @@ Future<Widget> bootstrap(
3132

3233
final logger = Logger('bootstrap');
3334

34-
final kvStorage = await HtKvStorageSharedPreferences.getInstance();
35+
final kvStorage = await KVStorageSharedPreferences.getInstance();
3536

36-
late final HtAuthClient authClient;
37-
late final HtAuthRepository authenticationRepository;
38-
HtHttpClient? httpClient;
37+
late final AuthClient authClient;
38+
late final AuthRepository authenticationRepository;
39+
HttpClient? httpClient;
3940

4041
if (appConfig.environment == app_config.AppEnvironment.demo) {
41-
authClient = HtAuthInmemory();
42-
authenticationRepository = HtAuthRepository(
42+
authClient = AuthInmemory();
43+
authenticationRepository = AuthRepository(
4344
authClient: authClient,
4445
storageService: kvStorage,
4546
);
4647
} else {
4748
// For production and development environments, an HTTP client is needed.
48-
httpClient = HtHttpClient(
49+
httpClient = HttpClient(
4950
baseUrl: appConfig.baseUrl,
5051
tokenProvider: () => authenticationRepository.getAuthToken(),
5152
logger: logger,
5253
);
53-
authClient = HtAuthApi(httpClient: httpClient);
54-
authenticationRepository = HtAuthRepository(
54+
authClient = AuthApi(httpClient: httpClient);
55+
authenticationRepository = AuthRepository(
5556
authClient: authClient,
5657
storageService: kvStorage,
5758
);
5859
}
5960

6061
// Conditional data client instantiation based on environment
61-
HtDataClient<Headline> headlinesClient;
62-
HtDataClient<Topic> topicsClient;
63-
HtDataClient<Country> countriesClient;
64-
HtDataClient<Source> sourcesClient;
65-
HtDataClient<UserContentPreferences> userContentPreferencesClient;
66-
HtDataClient<UserAppSettings> userAppSettingsClient;
67-
HtDataClient<RemoteConfig> remoteConfigClient;
62+
DataClient<Headline> headlinesClient;
63+
DataClient<Topic> topicsClient;
64+
DataClient<Country> countriesClient;
65+
DataClient<Source> sourcesClient;
66+
DataClient<UserContentPreferences> userContentPreferencesClient;
67+
DataClient<UserAppSettings> userAppSettingsClient;
68+
DataClient<RemoteConfig> remoteConfigClient;
6869

6970
if (appConfig.environment == app_config.AppEnvironment.demo) {
70-
headlinesClient = HtDataInMemory<Headline>(
71+
headlinesClient = DataInMemory<Headline>(
7172
toJson: (i) => i.toJson(),
7273
getId: (i) => i.id,
7374
initialData: headlinesFixturesData,
7475
logger: logger,
7576
);
76-
topicsClient = HtDataInMemory<Topic>(
77+
topicsClient = DataInMemory<Topic>(
7778
toJson: (i) => i.toJson(),
7879
getId: (i) => i.id,
7980
initialData: topicsFixturesData,
8081
logger: logger,
8182
);
82-
countriesClient = HtDataInMemory<Country>(
83+
countriesClient = DataInMemory<Country>(
8384
toJson: (i) => i.toJson(),
8485
getId: (i) => i.id,
8586
initialData: countriesFixturesData,
8687
logger: logger,
8788
);
88-
sourcesClient = HtDataInMemory<Source>(
89+
sourcesClient = DataInMemory<Source>(
8990
toJson: (i) => i.toJson(),
9091
getId: (i) => i.id,
9192
initialData: sourcesFixturesData,
9293
logger: logger,
9394
);
94-
userContentPreferencesClient = HtDataInMemory<UserContentPreferences>(
95+
userContentPreferencesClient = DataInMemory<UserContentPreferences>(
9596
toJson: (i) => i.toJson(),
9697
getId: (i) => i.id,
9798
logger: logger,
9899
);
99-
userAppSettingsClient = HtDataInMemory<UserAppSettings>(
100+
userAppSettingsClient = DataInMemory<UserAppSettings>(
100101
toJson: (i) => i.toJson(),
101102
getId: (i) => i.id,
102103
logger: logger,
103104
);
104-
remoteConfigClient = HtDataInMemory<RemoteConfig>(
105+
remoteConfigClient = DataInMemory<RemoteConfig>(
105106
toJson: (i) => i.toJson(),
106107
getId: (i) => i.id,
107108
initialData: remoteConfigsFixturesData,
108109
logger: logger,
109110
);
110111
} else if (appConfig.environment == app_config.AppEnvironment.development) {
111-
headlinesClient = HtDataApi<Headline>(
112+
headlinesClient = DataApi<Headline>(
112113
httpClient: httpClient!,
113114
modelName: 'headline',
114115
fromJson: Headline.fromJson,
115116
toJson: (headline) => headline.toJson(),
116117
logger: logger,
117118
);
118-
topicsClient = HtDataApi<Topic>(
119+
topicsClient = DataApi<Topic>(
119120
httpClient: httpClient,
120121
modelName: 'topic',
121122
fromJson: Topic.fromJson,
122123
toJson: (topic) => topic.toJson(),
123124
logger: logger,
124125
);
125-
countriesClient = HtDataApi<Country>(
126+
countriesClient = DataApi<Country>(
126127
httpClient: httpClient,
127128
modelName: 'country',
128129
fromJson: Country.fromJson,
129130
toJson: (country) => country.toJson(),
130131
logger: logger,
131132
);
132-
sourcesClient = HtDataApi<Source>(
133+
sourcesClient = DataApi<Source>(
133134
httpClient: httpClient,
134135
modelName: 'source',
135136
fromJson: Source.fromJson,
136137
toJson: (source) => source.toJson(),
137138
logger: logger,
138139
);
139-
userContentPreferencesClient = HtDataApi<UserContentPreferences>(
140+
userContentPreferencesClient = DataApi<UserContentPreferences>(
140141
httpClient: httpClient,
141142
modelName: 'user_content_preferences',
142143
fromJson: UserContentPreferences.fromJson,
143144
toJson: (prefs) => prefs.toJson(),
144145
logger: logger,
145146
);
146-
userAppSettingsClient = HtDataApi<UserAppSettings>(
147+
userAppSettingsClient = DataApi<UserAppSettings>(
147148
httpClient: httpClient,
148149
modelName: 'user_app_settings',
149150
fromJson: UserAppSettings.fromJson,
150151
toJson: (settings) => settings.toJson(),
151152
logger: logger,
152153
);
153-
remoteConfigClient = HtDataApi<RemoteConfig>(
154+
remoteConfigClient = DataApi<RemoteConfig>(
154155
httpClient: httpClient,
155156
modelName: 'remote_config',
156157
fromJson: RemoteConfig.fromJson,
@@ -159,49 +160,49 @@ Future<Widget> bootstrap(
159160
);
160161
} else {
161162
// Default to API clients for production
162-
headlinesClient = HtDataApi<Headline>(
163+
headlinesClient = DataApi<Headline>(
163164
httpClient: httpClient!,
164165
modelName: 'headline',
165166
fromJson: Headline.fromJson,
166167
toJson: (headline) => headline.toJson(),
167168
logger: logger,
168169
);
169-
topicsClient = HtDataApi<Topic>(
170+
topicsClient = DataApi<Topic>(
170171
httpClient: httpClient,
171172
modelName: 'topic',
172173
fromJson: Topic.fromJson,
173174
toJson: (topic) => topic.toJson(),
174175
logger: logger,
175176
);
176-
countriesClient = HtDataApi<Country>(
177+
countriesClient = DataApi<Country>(
177178
httpClient: httpClient,
178179
modelName: 'country',
179180
fromJson: Country.fromJson,
180181
toJson: (country) => country.toJson(),
181182
logger: logger,
182183
);
183-
sourcesClient = HtDataApi<Source>(
184+
sourcesClient = DataApi<Source>(
184185
httpClient: httpClient,
185186
modelName: 'source',
186187
fromJson: Source.fromJson,
187188
toJson: (source) => source.toJson(),
188189
logger: logger,
189190
);
190-
userContentPreferencesClient = HtDataApi<UserContentPreferences>(
191+
userContentPreferencesClient = DataApi<UserContentPreferences>(
191192
httpClient: httpClient,
192193
modelName: 'user_content_preferences',
193194
fromJson: UserContentPreferences.fromJson,
194195
toJson: (prefs) => prefs.toJson(),
195196
logger: logger,
196197
);
197-
userAppSettingsClient = HtDataApi<UserAppSettings>(
198+
userAppSettingsClient = DataApi<UserAppSettings>(
198199
httpClient: httpClient,
199200
modelName: 'user_app_settings',
200201
fromJson: UserAppSettings.fromJson,
201202
toJson: (settings) => settings.toJson(),
202203
logger: logger,
203204
);
204-
remoteConfigClient = HtDataApi<RemoteConfig>(
205+
remoteConfigClient = DataApi<RemoteConfig>(
205206
httpClient: httpClient,
206207
modelName: 'remote_config',
207208
fromJson: RemoteConfig.fromJson,
@@ -210,22 +211,22 @@ Future<Widget> bootstrap(
210211
);
211212
}
212213

213-
final headlinesRepository = HtDataRepository<Headline>(
214+
final headlinesRepository = DataRepository<Headline>(
214215
dataClient: headlinesClient,
215216
);
216-
final topicsRepository = HtDataRepository<Topic>(dataClient: topicsClient);
217-
final countriesRepository = HtDataRepository<Country>(
217+
final topicsRepository = DataRepository<Topic>(dataClient: topicsClient);
218+
final countriesRepository = DataRepository<Country>(
218219
dataClient: countriesClient,
219220
);
220-
final sourcesRepository = HtDataRepository<Source>(dataClient: sourcesClient);
221+
final sourcesRepository = DataRepository<Source>(dataClient: sourcesClient);
221222
final userContentPreferencesRepository =
222-
HtDataRepository<UserContentPreferences>(
223+
DataRepository<UserContentPreferences>(
223224
dataClient: userContentPreferencesClient,
224225
);
225-
final userAppSettingsRepository = HtDataRepository<UserAppSettings>(
226+
final userAppSettingsRepository = DataRepository<UserAppSettings>(
226227
dataClient: userAppSettingsClient,
227228
);
228-
final remoteConfigRepository = HtDataRepository<RemoteConfig>(
229+
final remoteConfigRepository = DataRepository<RemoteConfig>(
229230
dataClient: remoteConfigClient,
230231
);
231232

@@ -239,7 +240,7 @@ Future<Widget> bootstrap(
239240
: null;
240241

241242
return App(
242-
htAuthenticationRepository: authenticationRepository,
243+
authenticationRepository: authenticationRepository,
243244
htHeadlinesRepository: headlinesRepository,
244245
htTopicsRepository: topicsRepository,
245246
htCountriesRepository: countriesRepository,

lib/main.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import 'dart:js_interop';
33
import 'package:device_preview/device_preview.dart';
44
import 'package:flutter/foundation.dart';
55
import 'package:flutter/material.dart';
6-
import 'package:ht_main/app/config/config.dart';
7-
import 'package:ht_main/bootstrap.dart';
6+
import 'package:flutter_news_app_mobile_client_full_source_code/app/config/config.dart';
7+
import 'package:flutter_news_app_mobile_client_full_source_code/bootstrap.dart';
88

99
// Define the current application environment (production/development/demo).
1010
const appEnvironment = AppEnvironment.demo;

0 commit comments

Comments
 (0)