Skip to content

Commit abbc6b8

Browse files
committed
refactor(dependencies): update package imports and rename classes
- Replace `ht_` prefixed package imports with new package names - Remove `Ht` prefix from class names and use new class names - Update `KVStorageSharedPreferences` import path - Rename `App` to `FlutterNewsAppWebDashboardFullSourceCodeApp` - Update `bootstrap` function import
1 parent e01c1e2 commit abbc6b8

File tree

2 files changed

+101
-107
lines changed

2 files changed

+101
-107
lines changed

lib/bootstrap.dart

Lines changed: 99 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
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_dashboard/app/app.dart';
8-
import 'package:ht_dashboard/app/config/config.dart' as app_config;
9-
import 'package:ht_dashboard/bloc_observer.dart';
10-
import 'package:ht_data_api/ht_data_api.dart';
11-
import 'package:ht_data_client/ht_data_client.dart';
12-
import 'package:ht_data_inmemory/ht_data_inmemory.dart';
13-
import 'package:ht_data_repository/ht_data_repository.dart';
14-
import 'package:ht_http_client/ht_http_client.dart';
15-
import 'package:ht_kv_storage_shared_preferences/ht_kv_storage_shared_preferences.dart';
16-
import 'package:ht_shared/ht_shared.dart';
17-
import 'package:ht_ui_kit/ht_ui_kit.dart';
12+
import 'package:flutter_news_app_web_dashboard_full_source_code/app/app.dart';
13+
import 'package:flutter_news_app_web_dashboard_full_source_code/app/config/config.dart'
14+
as app_config;
15+
import 'package:flutter_news_app_web_dashboard_full_source_code/bloc_observer.dart';
16+
import 'package:http_client/http_client.dart';
17+
import 'package:kv_storage_shared_preferences/kv_storage_shared_preferences.dart';
1818
import 'package:logging/logging.dart';
1919
import 'package:timeago/timeago.dart' as timeago;
20+
import 'package:ui_kit/ui_kit.dart';
2021

2122
Future<Widget> bootstrap(
2223
app_config.AppConfig appConfig,
@@ -28,242 +29,235 @@ Future<Widget> bootstrap(
2829
timeago.setLocaleMessages('en', EnTimeagoMessages());
2930
timeago.setLocaleMessages('ar', ArTimeagoMessages());
3031

31-
final kvStorage = await HtKvStorageSharedPreferences.getInstance();
32+
final kvStorage = await KVStorageSharedPreferences.getInstance();
3233

33-
late final HtAuthClient authClient;
34-
late final HtAuthRepository authenticationRepository;
35-
HtHttpClient? httpClient;
34+
late final AuthClient authClient;
35+
late final AuthRepository authenticationRepository;
36+
HttpClient? httpClient;
3637

3738
if (appConfig.environment == app_config.AppEnvironment.demo) {
38-
authClient = HtAuthInmemory(
39-
logger: Logger('HtAuthInmemory'),
40-
);
41-
authenticationRepository = HtAuthRepository(
39+
authClient = AuthInmemory(logger: Logger('AuthInmemory'));
40+
authenticationRepository = AuthRepository(
4241
authClient: authClient,
4342
storageService: kvStorage,
4443
);
4544
} else {
46-
httpClient = HtHttpClient(
45+
httpClient = HttpClient(
4746
baseUrl: appConfig.baseUrl,
4847
tokenProvider: () => authenticationRepository.getAuthToken(),
4948
);
50-
authClient = HtAuthApi(
51-
httpClient: httpClient,
52-
logger: Logger('HtAuthApi'),
53-
);
54-
authenticationRepository = HtAuthRepository(
49+
authClient = AuthApi(httpClient: httpClient, logger: Logger('AuthApi'));
50+
authenticationRepository = AuthRepository(
5551
authClient: authClient,
5652
storageService: kvStorage,
5753
);
5854
}
5955

60-
HtDataClient<Headline> headlinesClient;
61-
HtDataClient<Topic> topicsClient;
62-
HtDataClient<Country> countriesClient;
63-
HtDataClient<Source> sourcesClient;
64-
HtDataClient<UserContentPreferences> userContentPreferencesClient;
65-
HtDataClient<UserAppSettings> userAppSettingsClient;
66-
HtDataClient<RemoteConfig> remoteConfigClient;
67-
HtDataClient<DashboardSummary> dashboardSummaryClient;
56+
DataClient<Headline> headlinesClient;
57+
DataClient<Topic> topicsClient;
58+
DataClient<Country> countriesClient;
59+
DataClient<Source> sourcesClient;
60+
DataClient<UserContentPreferences> userContentPreferencesClient;
61+
DataClient<UserAppSettings> userAppSettingsClient;
62+
DataClient<RemoteConfig> remoteConfigClient;
63+
DataClient<DashboardSummary> dashboardSummaryClient;
6864

6965
if (appConfig.environment == app_config.AppEnvironment.demo) {
70-
headlinesClient = HtDataInMemory<Headline>(
66+
headlinesClient = DataInMemory<Headline>(
7167
toJson: (i) => i.toJson(),
7268
getId: (i) => i.id,
7369
initialData: headlinesFixturesData,
74-
logger: Logger('HtDataInMemory<Headline>'),
70+
logger: Logger('DataInMemory<Headline>'),
7571
);
76-
topicsClient = HtDataInMemory<Topic>(
72+
topicsClient = DataInMemory<Topic>(
7773
toJson: (i) => i.toJson(),
7874
getId: (i) => i.id,
7975
initialData: topicsFixturesData,
80-
logger: Logger('HtDataInMemory<Topic>'),
76+
logger: Logger('DataInMemory<Topic>'),
8177
);
82-
countriesClient = HtDataInMemory<Country>(
78+
countriesClient = DataInMemory<Country>(
8379
toJson: (i) => i.toJson(),
8480
getId: (i) => i.id,
8581
initialData: countriesFixturesData,
86-
logger: Logger('HtDataInMemory<Country>'),
82+
logger: Logger('DataInMemory<Country>'),
8783
);
88-
sourcesClient = HtDataInMemory<Source>(
84+
sourcesClient = DataInMemory<Source>(
8985
toJson: (i) => i.toJson(),
9086
getId: (i) => i.id,
9187
initialData: sourcesFixturesData,
92-
logger: Logger('HtDataInMemory<Source>'),
88+
logger: Logger('DataInMemory<Source>'),
9389
);
94-
userContentPreferencesClient = HtDataInMemory<UserContentPreferences>(
90+
userContentPreferencesClient = DataInMemory<UserContentPreferences>(
9591
toJson: (i) => i.toJson(),
9692
getId: (i) => i.id,
97-
logger: Logger('HtDataInMemory<UserContentPreferences>'),
93+
logger: Logger('DataInMemory<UserContentPreferences>'),
9894
);
99-
userAppSettingsClient = HtDataInMemory<UserAppSettings>(
95+
userAppSettingsClient = DataInMemory<UserAppSettings>(
10096
toJson: (i) => i.toJson(),
10197
getId: (i) => i.id,
102-
logger: Logger('HtDataInMemory<UserAppSettings>'),
98+
logger: Logger('DataInMemory<UserAppSettings>'),
10399
);
104-
remoteConfigClient = HtDataInMemory<RemoteConfig>(
100+
remoteConfigClient = DataInMemory<RemoteConfig>(
105101
toJson: (i) => i.toJson(),
106102
getId: (i) => i.id,
107103
initialData: remoteConfigsFixturesData,
108-
logger: Logger('HtDataInMemory<RemoteConfig>'),
104+
logger: Logger('DataInMemory<RemoteConfig>'),
109105
);
110-
dashboardSummaryClient = HtDataInMemory<DashboardSummary>(
106+
dashboardSummaryClient = DataInMemory<DashboardSummary>(
111107
toJson: (i) => i.toJson(),
112108
getId: (i) => i.id,
113109
initialData: dashboardSummaryFixturesData,
114-
logger: Logger('HtDataInMemory<DashboardSummary>'),
110+
logger: Logger('DataInMemory<DashboardSummary>'),
115111
);
116112
} else if (appConfig.environment == app_config.AppEnvironment.development) {
117-
headlinesClient = HtDataApi<Headline>(
113+
headlinesClient = DataApi<Headline>(
118114
httpClient: httpClient!,
119115
modelName: 'headline',
120116
fromJson: Headline.fromJson,
121117
toJson: (headline) => headline.toJson(),
122-
logger: Logger('HtDataApi<Headline>'),
118+
logger: Logger('DataApi<Headline>'),
123119
);
124-
topicsClient = HtDataApi<Topic>(
120+
topicsClient = DataApi<Topic>(
125121
httpClient: httpClient,
126122
modelName: 'topic',
127123
fromJson: Topic.fromJson,
128124
toJson: (topic) => topic.toJson(),
129-
logger: Logger('HtDataApi<Topic>'),
125+
logger: Logger('DataApi<Topic>'),
130126
);
131-
countriesClient = HtDataApi<Country>(
127+
countriesClient = DataApi<Country>(
132128
httpClient: httpClient,
133129
modelName: 'country',
134130
fromJson: Country.fromJson,
135131
toJson: (country) => country.toJson(),
136-
logger: Logger('HtDataApi<Country>'),
132+
logger: Logger('DataApi<Country>'),
137133
);
138-
sourcesClient = HtDataApi<Source>(
134+
sourcesClient = DataApi<Source>(
139135
httpClient: httpClient,
140136
modelName: 'source',
141137
fromJson: Source.fromJson,
142138
toJson: (source) => source.toJson(),
143-
logger: Logger('HtDataApi<Source>'),
139+
logger: Logger('DataApi<Source>'),
144140
);
145-
userContentPreferencesClient = HtDataApi<UserContentPreferences>(
141+
userContentPreferencesClient = DataApi<UserContentPreferences>(
146142
httpClient: httpClient,
147143
modelName: 'user_content_preferences',
148144
fromJson: UserContentPreferences.fromJson,
149145
toJson: (prefs) => prefs.toJson(),
150-
logger: Logger('HtDataApi<UserContentPreferences>'),
146+
logger: Logger('DataApi<UserContentPreferences>'),
151147
);
152-
userAppSettingsClient = HtDataApi<UserAppSettings>(
148+
userAppSettingsClient = DataApi<UserAppSettings>(
153149
httpClient: httpClient,
154150
modelName: 'user_app_settings',
155151
fromJson: UserAppSettings.fromJson,
156152
toJson: (settings) => settings.toJson(),
157-
logger: Logger('HtDataApi<UserAppSettings>'),
153+
logger: Logger('DataApi<UserAppSettings>'),
158154
);
159-
remoteConfigClient = HtDataApi<RemoteConfig>(
155+
remoteConfigClient = DataApi<RemoteConfig>(
160156
httpClient: httpClient,
161157
modelName: 'remote_config',
162158
fromJson: RemoteConfig.fromJson,
163159
toJson: (config) => config.toJson(),
164-
logger: Logger('HtDataApi<RemoteConfig>'),
160+
logger: Logger('DataApi<RemoteConfig>'),
165161
);
166-
dashboardSummaryClient = HtDataApi<DashboardSummary>(
162+
dashboardSummaryClient = DataApi<DashboardSummary>(
167163
httpClient: httpClient,
168164
modelName: 'dashboard_summary',
169165
fromJson: DashboardSummary.fromJson,
170166
toJson: (summary) => summary.toJson(),
171-
logger: Logger('HtDataApi<DashboardSummary>'),
167+
logger: Logger('DataApi<DashboardSummary>'),
172168
);
173169
} else {
174-
headlinesClient = HtDataApi<Headline>(
170+
headlinesClient = DataApi<Headline>(
175171
httpClient: httpClient!,
176172
modelName: 'headline',
177173
fromJson: Headline.fromJson,
178174
toJson: (headline) => headline.toJson(),
179-
logger: Logger('HtDataApi<Headline>'),
175+
logger: Logger('DataApi<Headline>'),
180176
);
181-
topicsClient = HtDataApi<Topic>(
177+
topicsClient = DataApi<Topic>(
182178
httpClient: httpClient,
183179
modelName: 'topic',
184180
fromJson: Topic.fromJson,
185181
toJson: (topic) => topic.toJson(),
186-
logger: Logger('HtDataApi<Topic>'),
182+
logger: Logger('DataApi<Topic>'),
187183
);
188-
countriesClient = HtDataApi<Country>(
184+
countriesClient = DataApi<Country>(
189185
httpClient: httpClient,
190186
modelName: 'country',
191187
fromJson: Country.fromJson,
192188
toJson: (country) => country.toJson(),
193-
logger: Logger('HtDataApi<Country>'),
189+
logger: Logger('DataApi<Country>'),
194190
);
195-
sourcesClient = HtDataApi<Source>(
191+
sourcesClient = DataApi<Source>(
196192
httpClient: httpClient,
197193
modelName: 'source',
198194
fromJson: Source.fromJson,
199195
toJson: (source) => source.toJson(),
200-
logger: Logger('HtDataApi<Source>'),
196+
logger: Logger('DataApi<Source>'),
201197
);
202-
userContentPreferencesClient = HtDataApi<UserContentPreferences>(
198+
userContentPreferencesClient = DataApi<UserContentPreferences>(
203199
httpClient: httpClient,
204200
modelName: 'user_content_preferences',
205201
fromJson: UserContentPreferences.fromJson,
206202
toJson: (prefs) => prefs.toJson(),
207-
logger: Logger('HtDataApi<UserContentPreferences>'),
203+
logger: Logger('DataApi<UserContentPreferences>'),
208204
);
209-
userAppSettingsClient = HtDataApi<UserAppSettings>(
205+
userAppSettingsClient = DataApi<UserAppSettings>(
210206
httpClient: httpClient,
211207
modelName: 'user_app_settings',
212208
fromJson: UserAppSettings.fromJson,
213209
toJson: (settings) => settings.toJson(),
214-
logger: Logger('HtDataApi<UserAppSettings>'),
210+
logger: Logger('DataApi<UserAppSettings>'),
215211
);
216-
remoteConfigClient = HtDataApi<RemoteConfig>(
212+
remoteConfigClient = DataApi<RemoteConfig>(
217213
httpClient: httpClient,
218214
modelName: 'remote_config',
219215
fromJson: RemoteConfig.fromJson,
220216
toJson: (config) => config.toJson(),
221-
logger: Logger('HtDataApi<RemoteConfig>'),
217+
logger: Logger('DataApi<RemoteConfig>'),
222218
);
223-
dashboardSummaryClient = HtDataApi<DashboardSummary>(
219+
dashboardSummaryClient = DataApi<DashboardSummary>(
224220
httpClient: httpClient,
225221
modelName: 'dashboard_summary',
226222
fromJson: DashboardSummary.fromJson,
227223
toJson: (summary) => summary.toJson(),
228-
logger: Logger('HtDataApi<DashboardSummary>'),
224+
logger: Logger('DataApi<DashboardSummary>'),
229225
);
230226
}
231227

232-
final headlinesRepository = HtDataRepository<Headline>(
228+
final headlinesRepository = DataRepository<Headline>(
233229
dataClient: headlinesClient,
234230
);
235-
final topicsRepository = HtDataRepository<Topic>(
236-
dataClient: topicsClient,
237-
);
238-
final countriesRepository = HtDataRepository<Country>(
231+
final topicsRepository = DataRepository<Topic>(dataClient: topicsClient);
232+
final countriesRepository = DataRepository<Country>(
239233
dataClient: countriesClient,
240234
);
241-
final sourcesRepository = HtDataRepository<Source>(dataClient: sourcesClient);
235+
final sourcesRepository = DataRepository<Source>(dataClient: sourcesClient);
242236
final userContentPreferencesRepository =
243-
HtDataRepository<UserContentPreferences>(
237+
DataRepository<UserContentPreferences>(
244238
dataClient: userContentPreferencesClient,
245239
);
246-
final userAppSettingsRepository = HtDataRepository<UserAppSettings>(
240+
final userAppSettingsRepository = DataRepository<UserAppSettings>(
247241
dataClient: userAppSettingsClient,
248242
);
249-
final remoteConfigRepository = HtDataRepository<RemoteConfig>(
243+
final remoteConfigRepository = DataRepository<RemoteConfig>(
250244
dataClient: remoteConfigClient,
251245
);
252-
final dashboardSummaryRepository = HtDataRepository<DashboardSummary>(
246+
final dashboardSummaryRepository = DataRepository<DashboardSummary>(
253247
dataClient: dashboardSummaryClient,
254248
);
255249

256250
return App(
257-
htAuthenticationRepository: authenticationRepository,
258-
htHeadlinesRepository: headlinesRepository,
259-
htTopicsRepository: topicsRepository,
260-
htCountriesRepository: countriesRepository,
261-
htSourcesRepository: sourcesRepository,
262-
htUserAppSettingsRepository: userAppSettingsRepository,
263-
htUserContentPreferencesRepository: userContentPreferencesRepository,
264-
htRemoteConfigRepository: remoteConfigRepository,
265-
htDashboardSummaryRepository: dashboardSummaryRepository,
266-
kvStorageService: kvStorage,
251+
authenticationRepository: authenticationRepository,
252+
headlinesRepository: headlinesRepository,
253+
topicsRepository: topicsRepository,
254+
countriesRepository: countriesRepository,
255+
sourcesRepository: sourcesRepository,
256+
userAppSettingsRepository: userAppSettingsRepository,
257+
userContentPreferencesRepository: userContentPreferencesRepository,
258+
remoteConfigRepository: remoteConfigRepository,
259+
dashboardSummaryRepository: dashboardSummaryRepository,
260+
storageService: kvStorage,
267261
environment: environment,
268262
);
269263
}

lib/main.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import 'dart:js_interop';
22

33
import 'package:flutter/foundation.dart';
44
import 'package:flutter/material.dart';
5-
import 'package:ht_dashboard/app/config/config.dart';
6-
import 'package:ht_dashboard/bootstrap.dart';
5+
import 'package:flutter_news_app_web_dashboard_full_source_code/app/config/config.dart';
6+
import 'package:flutter_news_app_web_dashboard_full_source_code/bootstrap.dart';
77

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

0 commit comments

Comments
 (0)