Skip to content

Commit 79f2c88

Browse files
fullenifulleni
committed
refactor(settings): update imports and organize dependencies
- Replace ht_data_repository with data_repository - Replace ht_shared with core - Update import paths for l10n, router, and ui_kit - Rename HttpException to HtHttpException
1 parent 0333816 commit 79f2c88

9 files changed

+45
-45
lines changed

‎lib/settings/bloc/settings_bloc.dart

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

33
import 'package:bloc/bloc.dart';
44
import 'package:bloc_concurrency/bloc_concurrency.dart';
5+
import 'package:core/core.dart';
6+
import 'package:data_repository/data_repository.dart';
57
import 'package:equatable/equatable.dart';
6-
import 'package:ht_data_repository/ht_data_repository.dart';
7-
import 'package:ht_shared/ht_shared.dart';
88

99
part 'settings_event.dart';
1010
part 'settings_state.dart';
1111

1212
/// {@template settings_bloc}
1313
/// Manages the state for the application settings feature.
1414
///
15-
/// Handles loading [UserAppSettings] from [HtDataRepository] and processing
15+
/// Handles loading [UserAppSettings] from [DataRepository] and processing
1616
/// user actions to update these settings.
1717
/// {@endtemplate}
1818
class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
1919
/// {@macro settings_bloc}
2020
SettingsBloc({
21-
required HtDataRepository<UserAppSettings> userAppSettingsRepository,
21+
required DataRepository<UserAppSettings> userAppSettingsRepository,
2222
}) : _userAppSettingsRepository = userAppSettingsRepository,
2323
super(const SettingsState()) {
2424
// Register event handlers
@@ -52,7 +52,7 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
5252
// SettingsNotificationsEnabledChanged event and handler removed.
5353
}
5454

55-
final HtDataRepository<UserAppSettings> _userAppSettingsRepository;
55+
final DataRepository<UserAppSettings> _userAppSettingsRepository;
5656

5757
Future<void> _persistSettings(
5858
UserAppSettings settingsToSave,
@@ -74,7 +74,7 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
7474
item: settingsToSave,
7575
userId: settingsToSave.id,
7676
);
77-
} on HtHttpException catch (e) {
77+
} on HttpException catch (e) {
7878
emit(state.copyWith(status: SettingsStatus.failure, error: e));
7979
} catch (e) {
8080
emit(state.copyWith(status: SettingsStatus.failure, error: e));
@@ -124,7 +124,7 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
124124
);
125125
// Persist these default settings
126126
await _persistSettings(defaultSettings, emit);
127-
} on HtHttpException catch (e) {
127+
} on HttpException catch (e) {
128128
emit(state.copyWith(status: SettingsStatus.failure, error: e));
129129
} catch (e) {
130130
emit(state.copyWith(status: SettingsStatus.failure, error: e));

‎lib/settings/bloc/settings_event.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ part of 'settings_bloc.dart';
33
//
44
// ignore_for_file: avoid_positional_boolean_parameters
55

6-
// Import models and enums from ht_shared
6+
// Import models and enums from core
77

88
/// {@template settings_event}
99
/// Base class for all events related to the settings feature.

‎lib/settings/view/appearance_settings_page.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_bloc/flutter_bloc.dart';
3+
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
4+
import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
5+
import 'package:flutter_news_app_mobile_client_full_source_code/settings/bloc/settings_bloc.dart';
36
import 'package:go_router/go_router.dart';
4-
import 'package:ht_main/l10n/l10n.dart';
5-
import 'package:ht_main/router/routes.dart';
6-
import 'package:ht_main/settings/bloc/settings_bloc.dart';
7-
import 'package:ht_ui_kit/ht_ui_kit.dart';
7+
import 'package:ui_kit/ui_kit.dart';
88

99
/// {@template appearance_settings_page}
1010
/// A menu page for navigating to theme and font appearance settings.

‎lib/settings/view/feed_settings_page.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import 'package:core/core.dart' show HeadlineImageStyle;
12
import 'package:flutter/material.dart';
23
import 'package:flutter_bloc/flutter_bloc.dart';
3-
import 'package:ht_main/app/bloc/app_bloc.dart';
4-
import 'package:ht_main/l10n/app_localizations.dart';
5-
import 'package:ht_main/l10n/l10n.dart';
6-
import 'package:ht_main/settings/bloc/settings_bloc.dart';
7-
import 'package:ht_shared/ht_shared.dart' show HeadlineImageStyle;
8-
import 'package:ht_ui_kit/ht_ui_kit.dart';
4+
import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
5+
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/app_localizations.dart';
6+
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
7+
import 'package:flutter_news_app_mobile_client_full_source_code/settings/bloc/settings_bloc.dart';
8+
import 'package:ui_kit/ui_kit.dart';
99

1010
/// {@template feed_settings_page}
1111
/// A page for configuring feed display settings.

‎lib/settings/view/font_settings_page.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
import 'package:core/core.dart'
2+
show AppFontWeight, AppTextScaleFactor;
13
import 'package:flutter/material.dart';
24
import 'package:flutter_bloc/flutter_bloc.dart';
3-
import 'package:ht_main/app/bloc/app_bloc.dart';
4-
import 'package:ht_main/l10n/app_localizations.dart';
5-
import 'package:ht_main/l10n/l10n.dart';
6-
import 'package:ht_main/settings/bloc/settings_bloc.dart';
7-
import 'package:ht_shared/ht_shared.dart'
8-
show AppFontWeight, AppTextScaleFactor;
9-
import 'package:ht_ui_kit/ht_ui_kit.dart';
5+
import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
6+
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/app_localizations.dart';
7+
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
8+
import 'package:flutter_news_app_mobile_client_full_source_code/settings/bloc/settings_bloc.dart';
9+
import 'package:ui_kit/ui_kit.dart';
1010

1111
/// {@template font_settings_page}
1212
/// A page for configuring font-related settings like size, family, and weight.

‎lib/settings/view/language_settings_page.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_bloc/flutter_bloc.dart';
3-
import 'package:ht_main/app/bloc/app_bloc.dart';
4-
import 'package:ht_main/l10n/l10n.dart';
5-
import 'package:ht_main/settings/bloc/settings_bloc.dart';
6-
import 'package:ht_ui_kit/ht_ui_kit.dart';
3+
import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
4+
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
5+
import 'package:flutter_news_app_mobile_client_full_source_code/settings/bloc/settings_bloc.dart';
6+
import 'package:ui_kit/ui_kit.dart';
77

88
// Defines the available languages and their display names.
99
// In a real app, this might come from a configuration or be more dynamic.

‎lib/settings/view/notification_settings_page.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_bloc/flutter_bloc.dart';
3-
import 'package:ht_main/l10n/l10n.dart';
4-
import 'package:ht_main/settings/bloc/settings_bloc.dart';
5-
import 'package:ht_ui_kit/ht_ui_kit.dart';
3+
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
4+
import 'package:flutter_news_app_mobile_client_full_source_code/settings/bloc/settings_bloc.dart';
5+
import 'package:ui_kit/ui_kit.dart';
66

77
/// {@template notification_settings_page}
88
/// A page for configuring notification settings.

‎lib/settings/view/settings_page.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
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_mobile_client_full_source_code/app/bloc/app_bloc.dart';
5+
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
6+
import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
7+
import 'package:flutter_news_app_mobile_client_full_source_code/settings/bloc/settings_bloc.dart';
38
import 'package:go_router/go_router.dart';
4-
import 'package:ht_main/app/bloc/app_bloc.dart';
5-
import 'package:ht_main/l10n/l10n.dart';
6-
import 'package:ht_main/router/routes.dart';
7-
import 'package:ht_main/settings/bloc/settings_bloc.dart';
8-
import 'package:ht_shared/ht_shared.dart';
9-
import 'package:ht_ui_kit/ht_ui_kit.dart';
9+
import 'package:ui_kit/ui_kit.dart';
1010

1111
/// {@template settings_page}
1212
/// The main page for accessing different application settings categories.
@@ -55,7 +55,7 @@ class SettingsPage extends StatelessWidget {
5555
if (state.status == SettingsStatus.failure) {
5656
return FailureStateWidget(
5757
exception:
58-
state.error as HtHttpException? ??
58+
state.error as HttpException? ??
5959
const UnknownException('An unknown error occurred'),
6060
onRetry: () {
6161
// Access AppBloc to get the current user ID for retry

‎lib/settings/view/theme_settings_page.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import 'package:core/core.dart' show AppAccentTheme, AppBaseTheme;
12
import 'package:flutter/material.dart';
23
import 'package:flutter_bloc/flutter_bloc.dart';
3-
import 'package:ht_main/app/bloc/app_bloc.dart';
4-
import 'package:ht_main/l10n/app_localizations.dart';
5-
import 'package:ht_main/l10n/l10n.dart';
6-
import 'package:ht_main/settings/bloc/settings_bloc.dart';
7-
import 'package:ht_shared/ht_shared.dart' show AppAccentTheme, AppBaseTheme;
8-
import 'package:ht_ui_kit/ht_ui_kit.dart';
4+
import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
5+
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/app_localizations.dart';
6+
import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
7+
import 'package:flutter_news_app_mobile_client_full_source_code/settings/bloc/settings_bloc.dart';
8+
import 'package:ui_kit/ui_kit.dart';
99

1010
/// {@template theme_settings_page}
1111
/// A page for configuring theme-related settings like base and accent themes.

0 commit comments

Comments
 (0)