Skip to content

Commit 45398df

Browse files
fullenifulleni
committed
refactor(data_repository): replace HtDataRepository with DataRepository
- Update import statements to use new DataRepository class - Replace HtDataRepository with DataRepository in bloc classes - Update exception handling from HtHttpException to HttpException - Adjust import paths to reflect new repository structure
1 parent 1072d33 commit 45398df

File tree

7 files changed

+51
-54
lines changed

7 files changed

+51
-54
lines changed

‎lib/entity_details/bloc/entity_details_bloc.dart

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
import 'dart:async';
44

55
import 'package:bloc/bloc.dart';
6+
import 'package:core/core.dart';
7+
import 'package:data_repository/data_repository.dart';
68
import 'package:equatable/equatable.dart';
7-
import 'package:ht_data_repository/ht_data_repository.dart';
8-
import 'package:ht_main/account/bloc/account_bloc.dart';
9-
import 'package:ht_main/app/bloc/app_bloc.dart';
10-
import 'package:ht_main/shared/services/feed_injector_service.dart';
11-
import 'package:ht_shared/ht_shared.dart';
9+
import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/account_bloc.dart';
10+
import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
11+
import 'package:flutter_news_app_mobile_client_full_source_code/shared/services/feed_injector_service.dart';
1212

1313
part 'entity_details_event.dart';
1414
part 'entity_details_state.dart';
1515

1616
class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
1717
EntityDetailsBloc({
18-
required HtDataRepository<Headline> headlinesRepository,
19-
required HtDataRepository<Topic> topicRepository,
20-
required HtDataRepository<Source> sourceRepository,
18+
required DataRepository<Headline> headlinesRepository,
19+
required DataRepository<Topic> topicRepository,
20+
required DataRepository<Source> sourceRepository,
2121
required AccountBloc accountBloc,
2222
required AppBloc appBloc,
2323
required FeedInjectorService feedInjectorService,
@@ -47,9 +47,9 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
4747
});
4848
}
4949

50-
final HtDataRepository<Headline> _headlinesRepository;
51-
final HtDataRepository<Topic> _topicRepository;
52-
final HtDataRepository<Source> _sourceRepository;
50+
final DataRepository<Headline> _headlinesRepository;
51+
final DataRepository<Topic> _topicRepository;
52+
final DataRepository<Source> _sourceRepository;
5353
final AccountBloc _accountBloc;
5454
final AppBloc _appBloc;
5555
final FeedInjectorService _feedInjectorService;
@@ -155,7 +155,7 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
155155
),
156156
);
157157
}
158-
} on HtHttpException catch (e) {
158+
} on HttpException catch (e) {
159159
emit(state.copyWith(status: EntityDetailsStatus.failure, exception: e));
160160
} catch (e) {
161161
emit(
@@ -248,7 +248,7 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
248248
),
249249
);
250250
}
251-
} on HtHttpException catch (e) {
251+
} on HttpException catch (e) {
252252
emit(
253253
state.copyWith(
254254
status: EntityDetailsStatus.partialFailure,

‎lib/entity_details/bloc/entity_details_state.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class EntityDetailsState extends Equatable {
6363
final String? headlinesCursor;
6464

6565
/// The exception that occurred, if any.
66-
final HtHttpException? exception;
66+
final HttpException? exception;
6767

6868
/// Creates a copy of the current state with updated values.
6969
EntityDetailsState copyWith({
@@ -74,7 +74,7 @@ class EntityDetailsState extends Equatable {
7474
List<FeedItem>? feedItems,
7575
bool? hasMoreHeadlines,
7676
String? headlinesCursor,
77-
HtHttpException? exception,
77+
HttpException? exception,
7878
bool clearEntity = false,
7979
bool clearHeadlinesCursor = false,
8080
bool clearException = false,

‎lib/entity_details/view/entity_details_page.dart

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
// ignore_for_file: no_default_cases
22

3+
import 'package:core/core.dart';
4+
import 'package:data_repository/data_repository.dart';
35
import 'package:flutter/material.dart';
46
import 'package:flutter_bloc/flutter_bloc.dart';
7+
import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/account_bloc.dart';
8+
import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
9+
import 'package:flutter_news_app_mobile_client_full_source_code/entity_details/bloc/entity_details_bloc.dart';
10+
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/app_localizations.dart';
11+
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
12+
import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
13+
import 'package:flutter_news_app_mobile_client_full_source_code/shared/shared.dart';
514
import 'package:go_router/go_router.dart';
6-
import 'package:ht_data_repository/ht_data_repository.dart';
7-
import 'package:ht_main/account/bloc/account_bloc.dart';
8-
import 'package:ht_main/app/bloc/app_bloc.dart';
9-
import 'package:ht_main/entity_details/bloc/entity_details_bloc.dart';
10-
import 'package:ht_main/l10n/app_localizations.dart';
11-
import 'package:ht_main/l10n/l10n.dart';
12-
import 'package:ht_main/router/routes.dart';
13-
import 'package:ht_main/shared/shared.dart';
14-
import 'package:ht_shared/ht_shared.dart';
15-
import 'package:ht_ui_kit/ht_ui_kit.dart';
15+
import 'package:ui_kit/ui_kit.dart';
1616

1717
class EntityDetailsPageArguments {
1818
const EntityDetailsPageArguments({
@@ -48,9 +48,9 @@ class EntityDetailsPage extends StatelessWidget {
4848
final feedInjectorService = FeedInjectorService();
4949
final entityDetailsBloc =
5050
EntityDetailsBloc(
51-
headlinesRepository: context.read<HtDataRepository<Headline>>(),
52-
topicRepository: context.read<HtDataRepository<Topic>>(),
53-
sourceRepository: context.read<HtDataRepository<Source>>(),
51+
headlinesRepository: context.read<DataRepository<Headline>>(),
52+
topicRepository: context.read<DataRepository<Topic>>(),
53+
sourceRepository: context.read<DataRepository<Source>>(),
5454
accountBloc: context.read<AccountBloc>(),
5555
appBloc: context.read<AppBloc>(),
5656
feedInjectorService: feedInjectorService,

‎lib/headline-details/bloc/headline_details_bloc.dart

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

33
import 'package:bloc/bloc.dart';
4+
import 'package:core/core.dart' show Headline, HttpException, UnknownException;
5+
import 'package:data_repository/data_repository.dart';
46
import 'package:equatable/equatable.dart';
5-
import 'package:ht_data_repository/ht_data_repository.dart';
6-
import 'package:ht_shared/ht_shared.dart'
7-
show Headline, HtHttpException, UnknownException;
87

98
part 'headline_details_event.dart';
109
part 'headline_details_state.dart';
1110

1211
class HeadlineDetailsBloc
1312
extends Bloc<HeadlineDetailsEvent, HeadlineDetailsState> {
14-
HeadlineDetailsBloc({required HtDataRepository<Headline> headlinesRepository})
13+
HeadlineDetailsBloc({required DataRepository<Headline> headlinesRepository})
1514
: _headlinesRepository = headlinesRepository,
1615
super(HeadlineDetailsInitial()) {
1716
on<FetchHeadlineById>(_onFetchHeadlineById);
1817
on<HeadlineProvided>(_onHeadlineProvided);
1918
}
2019

21-
final HtDataRepository<Headline> _headlinesRepository;
20+
final DataRepository<Headline> _headlinesRepository;
2221

2322
Future<void> _onFetchHeadlineById(
2423
FetchHeadlineById event,
@@ -28,7 +27,7 @@ class HeadlineDetailsBloc
2827
try {
2928
final headline = await _headlinesRepository.read(id: event.headlineId);
3029
emit(HeadlineDetailsLoaded(headline: headline));
31-
} on HtHttpException catch (e) {
30+
} on HttpException catch (e) {
3231
emit(HeadlineDetailsFailure(exception: e));
3332
} catch (e) {
3433
emit(

‎lib/headline-details/bloc/headline_details_state.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class HeadlineDetailsLoaded extends HeadlineDetailsState {
2323
class HeadlineDetailsFailure extends HeadlineDetailsState {
2424
const HeadlineDetailsFailure({required this.exception});
2525

26-
final HtHttpException exception;
26+
final HttpException exception;
2727

2828
@override
2929
List<Object> get props => [exception];

‎lib/headline-details/bloc/similar_headlines_bloc.dart

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

33
import 'package:bloc/bloc.dart';
4+
import 'package:core/core.dart' show Headline, HttpException, PaginationOptions;
5+
import 'package:data_repository/data_repository.dart';
46
import 'package:equatable/equatable.dart';
5-
import 'package:ht_data_repository/ht_data_repository.dart';
6-
import 'package:ht_shared/ht_shared.dart'
7-
show Headline, HtHttpException, PaginationOptions;
87

98
part 'similar_headlines_event.dart';
109
part 'similar_headlines_state.dart';
1110

1211
class SimilarHeadlinesBloc
1312
extends Bloc<SimilarHeadlinesEvent, SimilarHeadlinesState> {
14-
SimilarHeadlinesBloc({
15-
required HtDataRepository<Headline> headlinesRepository,
16-
}) : _headlinesRepository = headlinesRepository,
17-
super(SimilarHeadlinesInitial()) {
13+
SimilarHeadlinesBloc({required DataRepository<Headline> headlinesRepository})
14+
: _headlinesRepository = headlinesRepository,
15+
super(SimilarHeadlinesInitial()) {
1816
on<FetchSimilarHeadlines>(_onFetchSimilarHeadlines);
1917
}
2018

21-
final HtDataRepository<Headline> _headlinesRepository;
19+
final DataRepository<Headline> _headlinesRepository;
2220
static const int _similarHeadlinesLimit = 5;
2321

2422
Future<void> _onFetchSimilarHeadlines(
@@ -55,7 +53,7 @@ class SimilarHeadlinesBloc
5553
} else {
5654
emit(SimilarHeadlinesLoaded(similarHeadlines: finalSimilarHeadlines));
5755
}
58-
} on HtHttpException catch (e) {
56+
} on HttpException catch (e) {
5957
emit(SimilarHeadlinesError(message: e.message));
6058
} catch (e) {
6159
emit(SimilarHeadlinesError(message: 'An unexpected error occurred: $e'));

‎lib/headline-details/view/headline_details_page.dart

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
//
22
// ignore_for_file: avoid_redundant_argument_values
33

4+
import 'package:core/core.dart';
45
import 'package:flutter/foundation.dart' show kIsWeb;
56
import 'package:flutter/material.dart';
67
import 'package:flutter_bloc/flutter_bloc.dart';
8+
import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/account_bloc.dart';
9+
import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
10+
import 'package:flutter_news_app_mobile_client_full_source_code/entity_details/view/entity_details_page.dart';
11+
import 'package:flutter_news_app_mobile_client_full_source_code/headline-details/bloc/headline_details_bloc.dart';
12+
import 'package:flutter_news_app_mobile_client_full_source_code/headline-details/bloc/similar_headlines_bloc.dart';
13+
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
14+
import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
15+
import 'package:flutter_news_app_mobile_client_full_source_code/shared/shared.dart';
716
import 'package:go_router/go_router.dart';
8-
import 'package:ht_main/account/bloc/account_bloc.dart';
9-
import 'package:ht_main/app/bloc/app_bloc.dart';
10-
import 'package:ht_main/entity_details/view/entity_details_page.dart';
11-
import 'package:ht_main/headline-details/bloc/headline_details_bloc.dart';
12-
import 'package:ht_main/headline-details/bloc/similar_headlines_bloc.dart';
13-
import 'package:ht_main/l10n/l10n.dart';
14-
import 'package:ht_main/router/routes.dart';
15-
import 'package:ht_main/shared/shared.dart';
16-
import 'package:ht_shared/ht_shared.dart';
17-
import 'package:ht_ui_kit/ht_ui_kit.dart';
1817
import 'package:intl/intl.dart';
1918
import 'package:share_plus/share_plus.dart';
19+
import 'package:ui_kit/ui_kit.dart';
2020
import 'package:url_launcher/url_launcher_string.dart';
2121

2222
class HeadlineDetailsPage extends StatefulWidget {

0 commit comments

Comments
 (0)