Skip to content

Commit 47971e8

Browse files
fullenifulleni
committed
refactor(app_configuration): update imports and exceptions
- Replace HtDataRepository with DataRepository - Replace HtHttpException with HttpException - Update import paths for core, data_repository, and ui_kit packages - Simplify some code by removing unnecessary line breaks
1 parent 0f9a8d5 commit 47971e8

File tree

3 files changed

+28
-62
lines changed

3 files changed

+28
-62
lines changed

‎lib/app_configuration/bloc/app_configuration_bloc.dart

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
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 'app_configuration_event.dart';
77
part 'app_configuration_state.dart';
88

99
class AppConfigurationBloc
1010
extends Bloc<AppConfigurationEvent, AppConfigurationState> {
1111
AppConfigurationBloc({
12-
required HtDataRepository<RemoteConfig> remoteConfigRepository,
12+
required DataRepository<RemoteConfig> remoteConfigRepository,
1313
}) : _remoteConfigRepository = remoteConfigRepository,
14-
super(
15-
const AppConfigurationState(),
16-
) {
14+
super(const AppConfigurationState()) {
1715
on<AppConfigurationLoaded>(_onAppConfigurationLoaded);
1816
on<AppConfigurationUpdated>(_onAppConfigurationUpdated);
1917
on<AppConfigurationFieldChanged>(_onAppConfigurationFieldChanged);
2018
on<AppConfigurationDiscarded>(_onAppConfigurationDiscarded);
2119
}
2220

23-
final HtDataRepository<RemoteConfig> _remoteConfigRepository;
21+
final DataRepository<RemoteConfig> _remoteConfigRepository;
2422

2523
Future<void> _onAppConfigurationLoaded(
2624
AppConfigurationLoaded event,
@@ -41,12 +39,9 @@ class AppConfigurationBloc
4139
true, // Clear any previous success snackbar flag
4240
),
4341
);
44-
} on HtHttpException catch (e) {
42+
} on HttpException catch (e) {
4543
emit(
46-
state.copyWith(
47-
status: AppConfigurationStatus.failure,
48-
exception: e,
49-
),
44+
state.copyWith(status: AppConfigurationStatus.failure, exception: e),
5045
);
5146
} catch (e) {
5247
emit(
@@ -77,12 +72,9 @@ class AppConfigurationBloc
7772
showSaveSuccess: true, // Set flag to show success snackbar
7873
),
7974
);
80-
} on HtHttpException catch (e) {
75+
} on HttpException catch (e) {
8176
emit(
82-
state.copyWith(
83-
status: AppConfigurationStatus.failure,
84-
exception: e,
85-
),
77+
state.copyWith(status: AppConfigurationStatus.failure, exception: e),
8678
);
8779
} catch (e) {
8880
emit(

‎lib/app_configuration/bloc/app_configuration_state.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class AppConfigurationState extends Equatable {
3939
final RemoteConfig? originalRemoteConfig;
4040

4141
/// An error exception if an operation failed.
42-
final HtHttpException? exception;
42+
final HttpException? exception;
4343

4444
/// Indicates if there are unsaved changes to the configuration.
4545
final bool isDirty;
@@ -52,7 +52,7 @@ class AppConfigurationState extends Equatable {
5252
AppConfigurationStatus? status,
5353
RemoteConfig? remoteConfig,
5454
RemoteConfig? originalRemoteConfig,
55-
HtHttpException? exception,
55+
HttpException? exception,
5656
bool? isDirty,
5757
bool clearException = false,
5858
bool? showSaveSuccess,

‎lib/app_configuration/view/app_configuration_page.dart

Lines changed: 17 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import 'package:core/core.dart';
12
import 'package:flutter/material.dart';
23
import 'package:flutter_bloc/flutter_bloc.dart';
3-
import 'package:ht_dashboard/app_configuration/bloc/app_configuration_bloc.dart';
4-
import 'package:ht_dashboard/l10n/app_localizations.dart';
5-
import 'package:ht_dashboard/l10n/l10n.dart';
6-
import 'package:ht_shared/ht_shared.dart';
7-
import 'package:ht_ui_kit/ht_ui_kit.dart';
4+
import 'package:flutter_news_app_web_dashboard_full_source_code/app_configuration/bloc/app_configuration_bloc.dart';
5+
import 'package:flutter_news_app_web_dashboard_full_source_code/l10n/app_localizations.dart';
6+
import 'package:flutter_news_app_web_dashboard_full_source_code/l10n/l10n.dart';
7+
import 'package:ui_kit/ui_kit.dart';
88

99
/// {@template app_configuration_page}
1010
/// A page for managing the application's remote configuration.
@@ -176,9 +176,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
176176
childrenPadding: const EdgeInsets.symmetric(
177177
horizontal: AppSpacing.xxl,
178178
),
179-
children: [
180-
_buildAdConfigSection(context, remoteConfig),
181-
],
179+
children: [_buildAdConfigSection(context, remoteConfig)],
182180
),
183181
],
184182
),
@@ -316,9 +314,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
316314
remoteConfig: remoteConfig,
317315
onConfigChanged: (newConfig) {
318316
context.read<AppConfigurationBloc>().add(
319-
AppConfigurationFieldChanged(
320-
remoteConfig: newConfig,
321-
),
317+
AppConfigurationFieldChanged(remoteConfig: newConfig),
322318
);
323319
},
324320
buildIntField: _buildIntField,
@@ -336,9 +332,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
336332
remoteConfig: remoteConfig,
337333
onConfigChanged: (newConfig) {
338334
context.read<AppConfigurationBloc>().add(
339-
AppConfigurationFieldChanged(
340-
remoteConfig: newConfig,
341-
),
335+
AppConfigurationFieldChanged(remoteConfig: newConfig),
342336
);
343337
},
344338
buildIntField: _buildIntField,
@@ -356,9 +350,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
356350
remoteConfig: remoteConfig,
357351
onConfigChanged: (newConfig) {
358352
context.read<AppConfigurationBloc>().add(
359-
AppConfigurationFieldChanged(
360-
remoteConfig: newConfig,
361-
),
353+
AppConfigurationFieldChanged(remoteConfig: newConfig),
362354
);
363355
},
364356
buildIntField: _buildIntField,
@@ -395,9 +387,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
395387
remoteConfig: remoteConfig,
396388
onConfigChanged: (newConfig) {
397389
context.read<AppConfigurationBloc>().add(
398-
AppConfigurationFieldChanged(
399-
remoteConfig: newConfig,
400-
),
390+
AppConfigurationFieldChanged(remoteConfig: newConfig),
401391
);
402392
},
403393
buildIntField: _buildIntField,
@@ -415,9 +405,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
415405
remoteConfig: remoteConfig,
416406
onConfigChanged: (newConfig) {
417407
context.read<AppConfigurationBloc>().add(
418-
AppConfigurationFieldChanged(
419-
remoteConfig: newConfig,
420-
),
408+
AppConfigurationFieldChanged(remoteConfig: newConfig),
421409
);
422410
},
423411
buildIntField: _buildIntField,
@@ -435,9 +423,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
435423
remoteConfig: remoteConfig,
436424
onConfigChanged: (newConfig) {
437425
context.read<AppConfigurationBloc>().add(
438-
AppConfigurationFieldChanged(
439-
remoteConfig: newConfig,
440-
),
426+
AppConfigurationFieldChanged(remoteConfig: newConfig),
441427
);
442428
},
443429
buildIntField: _buildIntField,
@@ -474,9 +460,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
474460
remoteConfig: remoteConfig,
475461
onConfigChanged: (newConfig) {
476462
context.read<AppConfigurationBloc>().add(
477-
AppConfigurationFieldChanged(
478-
remoteConfig: newConfig,
479-
),
463+
AppConfigurationFieldChanged(remoteConfig: newConfig),
480464
);
481465
},
482466
buildIntField: _buildIntField,
@@ -494,9 +478,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
494478
remoteConfig: remoteConfig,
495479
onConfigChanged: (newConfig) {
496480
context.read<AppConfigurationBloc>().add(
497-
AppConfigurationFieldChanged(
498-
remoteConfig: newConfig,
499-
),
481+
AppConfigurationFieldChanged(remoteConfig: newConfig),
500482
);
501483
},
502484
buildIntField: _buildIntField,
@@ -659,10 +641,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
659641
child: Column(
660642
crossAxisAlignment: CrossAxisAlignment.start,
661643
children: [
662-
Text(
663-
label,
664-
style: Theme.of(context).textTheme.titleMedium,
665-
),
644+
Text(label, style: Theme.of(context).textTheme.titleMedium),
666645
const SizedBox(height: AppSpacing.xs),
667646
Text(
668647
description,
@@ -704,10 +683,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
704683
child: Column(
705684
crossAxisAlignment: CrossAxisAlignment.start,
706685
children: [
707-
Text(
708-
label,
709-
style: Theme.of(context).textTheme.titleMedium,
710-
),
686+
Text(label, style: Theme.of(context).textTheme.titleMedium),
711687
const SizedBox(height: AppSpacing.xs),
712688
Text(
713689
description,
@@ -1326,9 +1302,7 @@ class _AccountActionConfigFormState extends State<_AccountActionConfigForm> {
13261302
return widget.buildIntField(
13271303
context,
13281304
label: '$localizedActionType ${l10n.daysSuffix}',
1329-
description: l10n.daysBetweenPromptDescription(
1330-
localizedActionType,
1331-
),
1305+
description: l10n.daysBetweenPromptDescription(localizedActionType),
13321306
value: _getDaysMap(accountActionConfig)[actionType] ?? 0,
13331307
onChanged: (value) {
13341308
final currentMap = Map<FeedActionType, int>.from(

0 commit comments

Comments
 (0)