Skip to content

Commit 9252be5

Browse files
committed
refactor(dashboard): update imports and dependencies
- Replace HT specific packages with generic ones - Update DataRepository import path - Replace HtHttpException with generic HttpException - Update import paths for UI kit and localization
1 parent cf79a1e commit 9252be5

File tree

3 files changed

+17
-30
lines changed

3 files changed

+17
-30
lines changed

lib/dashboard/bloc/dashboard_bloc.dart

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:bloc/bloc.dart';
2+
import 'package:core/core.dart';
3+
import 'package:data_repository/data_repository.dart';
24
import 'package:equatable/equatable.dart';
3-
import 'package:ht_data_repository/ht_data_repository.dart';
4-
import 'package:ht_shared/ht_shared.dart';
55

66
part 'dashboard_event.dart';
77
part 'dashboard_state.dart';
@@ -10,16 +10,16 @@ part 'dashboard_state.dart';
1010
class DashboardBloc extends Bloc<DashboardEvent, DashboardState> {
1111
/// {@macro dashboard_bloc}
1212
DashboardBloc({
13-
required HtDataRepository<DashboardSummary> dashboardSummaryRepository,
14-
required HtDataRepository<Headline> headlinesRepository,
13+
required DataRepository<DashboardSummary> dashboardSummaryRepository,
14+
required DataRepository<Headline> headlinesRepository,
1515
}) : _dashboardSummaryRepository = dashboardSummaryRepository,
1616
_headlinesRepository = headlinesRepository,
1717
super(const DashboardState()) {
1818
on<DashboardSummaryLoaded>(_onDashboardSummaryLoaded);
1919
}
2020

21-
final HtDataRepository<DashboardSummary> _dashboardSummaryRepository;
22-
final HtDataRepository<Headline> _headlinesRepository;
21+
final DataRepository<DashboardSummary> _dashboardSummaryRepository;
22+
final DataRepository<Headline> _headlinesRepository;
2323

2424
Future<void> _onDashboardSummaryLoaded(
2525
DashboardSummaryLoaded event,
@@ -28,10 +28,7 @@ class DashboardBloc extends Bloc<DashboardEvent, DashboardState> {
2828
emit(state.copyWith(status: DashboardStatus.loading));
2929
try {
3030
// Fetch summary and recent headlines concurrently
31-
final [
32-
summaryResponse,
33-
recentHeadlinesResponse,
34-
] = await Future.wait([
31+
final [summaryResponse, recentHeadlinesResponse] = await Future.wait([
3532
_dashboardSummaryRepository.read(id: kDashboardSummaryId),
3633
_headlinesRepository.readAll(
3734
pagination: const PaginationOptions(limit: 5),
@@ -49,13 +46,8 @@ class DashboardBloc extends Bloc<DashboardEvent, DashboardState> {
4946
recentHeadlines: recentHeadlines,
5047
),
5148
);
52-
} on HtHttpException catch (e) {
53-
emit(
54-
state.copyWith(
55-
status: DashboardStatus.failure,
56-
exception: e,
57-
),
58-
);
49+
} on HttpException catch (e) {
50+
emit(state.copyWith(status: DashboardStatus.failure, exception: e));
5951
} catch (e) {
6052
emit(
6153
state.copyWith(

lib/dashboard/bloc/dashboard_state.dart

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ final class DashboardState extends Equatable {
2727
final DashboardStatus status;
2828
final DashboardSummary? summary;
2929
final List<Headline> recentHeadlines;
30-
final HtHttpException? exception;
30+
final HttpException? exception;
3131

3232
DashboardState copyWith({
3333
DashboardStatus? status,
3434
DashboardSummary? summary,
3535
List<Headline>? recentHeadlines,
36-
HtHttpException? exception,
36+
HttpException? exception,
3737
}) {
3838
return DashboardState(
3939
status: status ?? this.status,
@@ -44,10 +44,5 @@ final class DashboardState extends Equatable {
4444
}
4545

4646
@override
47-
List<Object?> get props => [
48-
status,
49-
summary,
50-
recentHeadlines,
51-
exception,
52-
];
47+
List<Object?> get props => [status, summary, recentHeadlines, exception];
5348
}

lib/dashboard/view/dashboard_page.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import 'package:core/core.dart';
12
import 'package:flutter/material.dart';
23
import 'package:flutter_bloc/flutter_bloc.dart';
4+
import 'package:flutter_news_app_web_dashboard_full_source_code/dashboard/bloc/dashboard_bloc.dart';
5+
import 'package:flutter_news_app_web_dashboard_full_source_code/l10n/l10n.dart';
6+
import 'package:flutter_news_app_web_dashboard_full_source_code/router/routes.dart';
37
import 'package:go_router/go_router.dart';
4-
import 'package:ht_dashboard/dashboard/bloc/dashboard_bloc.dart';
5-
import 'package:ht_dashboard/l10n/l10n.dart';
6-
import 'package:ht_dashboard/router/routes.dart';
7-
import 'package:ht_shared/ht_shared.dart';
8-
import 'package:ht_ui_kit/ht_ui_kit.dart';
8+
import 'package:ui_kit/ui_kit.dart';
99

1010
/// {@template dashboard_page}
1111
/// The main dashboard page, displaying key statistics and quick actions.

0 commit comments

Comments
 (0)