Skip to content

Refactor sync with new shared UI fpackage #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jul 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/app/view/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import 'package:ht_dashboard/dashboard/bloc/dashboard_bloc.dart';
import 'package:ht_dashboard/l10n/app_localizations.dart';
import 'package:ht_dashboard/router/router.dart';
// Import for app_theme.dart
import 'package:ht_dashboard/shared/theme/app_theme.dart';
import 'package:ht_data_repository/ht_data_repository.dart';
import 'package:ht_kv_storage_service/ht_kv_storage_service.dart';
import 'package:ht_shared/ht_shared.dart' hide AppStatus;
Expand Down
4 changes: 2 additions & 2 deletions lib/app/view/app_shell.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:go_router/go_router.dart';
import 'package:ht_dashboard/app/bloc/app_bloc.dart';
import 'package:ht_dashboard/l10n/l10n.dart';
import 'package:ht_dashboard/router/routes.dart';
import 'package:ht_dashboard/shared/constants/app_spacing.dart';
import 'package:ht_ui_kit/ht_ui_kit.dart';

/// A responsive scaffold shell for the main application sections.
///
Expand All @@ -24,7 +24,7 @@ class AppShell extends StatelessWidget {

@override
Widget build(BuildContext context) {
final l10n = context.l10n;
final l10n = AppLocalizationsX(context).l10n;
return Scaffold(
appBar: AppBar(
title: Text(l10n.dashboard),
Expand Down
6 changes: 4 additions & 2 deletions lib/app_configuration/bloc/app_configuration_bloc.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:bloc/bloc.dart';
import 'package:equatable/equatable.dart';
import 'package:ht_data_repository/ht_data_repository.dart';
import 'package:ht_shared/ht_shared.dart';
import 'package:ht_shared/ht_shared.dart';

part 'app_configuration_event.dart';
part 'app_configuration_state.dart';
Expand All @@ -28,7 +28,9 @@ class AppConfigurationBloc
) async {
emit(state.copyWith(status: AppConfigurationStatus.loading));
try {
final remoteConfig = await _remoteConfigRepository.read(id: kRemoteConfigId);
final remoteConfig = await _remoteConfigRepository.read(
id: kRemoteConfigId,
);
emit(
state.copyWith(
status: AppConfigurationStatus.success,
Expand Down
130 changes: 65 additions & 65 deletions lib/app_configuration/view/app_configuration_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:ht_dashboard/app_configuration/bloc/app_configuration_bloc.dart';
import 'package:ht_dashboard/l10n/app_localizations.dart';
import 'package:ht_dashboard/l10n/l10n.dart';
import 'package:ht_dashboard/shared/constants/app_spacing.dart';
import 'package:ht_dashboard/shared/widgets/widgets.dart';
import 'package:ht_shared/ht_shared.dart';
import 'package:ht_ui_kit/ht_ui_kit.dart'; // Import for toFriendlyMessage
import 'package:ht_ui_kit/ht_ui_kit.dart';

/// {@template app_configuration_page}
/// A page for managing the application's remote configuration.
Expand Down Expand Up @@ -42,7 +40,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>

@override
Widget build(BuildContext context) {
final l10n = context.l10n;
final l10n = AppLocalizationsX(context).l10n;
return Scaffold(
appBar: AppBar(
title: Text(
Expand All @@ -65,8 +63,8 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
child: Text(
l10n.appConfigurationPageDescription,
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
),
TabBar(
Expand Down Expand Up @@ -94,8 +92,8 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
content: Text(
l10n.appConfigSaveSuccessMessage,
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Theme.of(context).colorScheme.onPrimary,
),
color: Theme.of(context).colorScheme.onPrimary,
),
),
backgroundColor: Theme.of(context).colorScheme.primary,
),
Expand All @@ -113,8 +111,8 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
content: Text(
state.exception!.toFriendlyMessage(context),
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Theme.of(context).colorScheme.onError,
),
color: Theme.of(context).colorScheme.onError,
),
),
backgroundColor: Theme.of(context).colorScheme.error,
),
Expand Down Expand Up @@ -229,7 +227,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
);
}
: null,
child: Text(context.l10n.discardChangesButton),
child: Text(AppLocalizationsX(context).l10n.discardChangesButton),
),
const SizedBox(width: AppSpacing.md),
ElevatedButton(
Expand All @@ -245,7 +243,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
}
}
: null,
child: Text(context.l10n.saveChangesButton),
child: Text(AppLocalizationsX(context).l10n.saveChangesButton),
),
],
),
Expand All @@ -259,17 +257,19 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
builder: (BuildContext dialogContext) {
return AlertDialog(
title: Text(
context.l10n.confirmConfigUpdateDialogTitle,
AppLocalizationsX(context).l10n.confirmConfigUpdateDialogTitle,
style: Theme.of(dialogContext).textTheme.titleLarge,
),
content: Text(
context.l10n.confirmConfigUpdateDialogContent,
AppLocalizationsX(
context,
).l10n.confirmConfigUpdateDialogContent,
style: Theme.of(dialogContext).textTheme.bodyMedium,
),
actions: <Widget>[
TextButton(
onPressed: () => Navigator.of(dialogContext).pop(false),
child: Text(context.l10n.cancelButton),
child: Text(AppLocalizationsX(context).l10n.cancelButton),
),
ElevatedButton(
onPressed: () => Navigator.of(dialogContext).pop(true),
Expand All @@ -279,7 +279,9 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
dialogContext,
).colorScheme.onError,
),
child: Text(context.l10n.confirmSaveButton),
child: Text(
AppLocalizationsX(context).l10n.confirmSaveButton,
),
),
],
);
Expand All @@ -292,7 +294,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
BuildContext context,
RemoteConfig remoteConfig,
) {
final l10n = context.l10n;
final l10n = AppLocalizationsX(context).l10n;
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expand Down Expand Up @@ -371,7 +373,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
BuildContext context,
RemoteConfig remoteConfig,
) {
final l10n = context.l10n;
final l10n = AppLocalizationsX(context).l10n;
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expand Down Expand Up @@ -450,7 +452,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
BuildContext context,
RemoteConfig remoteConfig,
) {
final l10n = context.l10n;
final l10n = AppLocalizationsX(context).l10n;
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expand Down Expand Up @@ -509,7 +511,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
BuildContext context,
RemoteConfig remoteConfig,
) {
final l10n = context.l10n;
final l10n = AppLocalizationsX(context).l10n;
return ExpansionTile(
title: Text(l10n.maintenanceModeTitle),
childrenPadding: const EdgeInsets.symmetric(
Expand All @@ -523,9 +525,8 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
Text(
l10n.maintenanceModeDescription,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color:
Theme.of(context).colorScheme.onSurface.withOpacity(0.7),
),
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7),
),
),
const SizedBox(height: AppSpacing.lg),
SwitchListTile(
Expand All @@ -534,14 +535,14 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
value: remoteConfig.appStatus.isUnderMaintenance,
onChanged: (value) {
context.read<AppConfigurationBloc>().add(
AppConfigurationFieldChanged(
remoteConfig: remoteConfig.copyWith(
appStatus: remoteConfig.appStatus.copyWith(
isUnderMaintenance: value,
),
),
AppConfigurationFieldChanged(
remoteConfig: remoteConfig.copyWith(
appStatus: remoteConfig.appStatus.copyWith(
isUnderMaintenance: value,
),
);
),
),
);
},
),
],
Expand All @@ -554,7 +555,7 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
BuildContext context,
RemoteConfig remoteConfig,
) {
final l10n = context.l10n;
final l10n = AppLocalizationsX(context).l10n;
return ExpansionTile(
title: Text(l10n.forceUpdateTitle),
childrenPadding: const EdgeInsets.symmetric(
Expand All @@ -568,9 +569,8 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
Text(
l10n.forceUpdateDescription,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color:
Theme.of(context).colorScheme.onSurface.withOpacity(0.7),
),
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7),
),
),
const SizedBox(height: AppSpacing.lg),
_buildTextField(
Expand All @@ -580,14 +580,14 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
value: remoteConfig.appStatus.latestAppVersion,
onChanged: (value) {
context.read<AppConfigurationBloc>().add(
AppConfigurationFieldChanged(
remoteConfig: remoteConfig.copyWith(
appStatus: remoteConfig.appStatus.copyWith(
latestAppVersion: value,
),
),
AppConfigurationFieldChanged(
remoteConfig: remoteConfig.copyWith(
appStatus: remoteConfig.appStatus.copyWith(
latestAppVersion: value,
),
);
),
),
);
},
),
SwitchListTile(
Expand All @@ -596,14 +596,14 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
value: remoteConfig.appStatus.isLatestVersionOnly,
onChanged: (value) {
context.read<AppConfigurationBloc>().add(
AppConfigurationFieldChanged(
remoteConfig: remoteConfig.copyWith(
appStatus: remoteConfig.appStatus.copyWith(
isLatestVersionOnly: value,
),
),
AppConfigurationFieldChanged(
remoteConfig: remoteConfig.copyWith(
appStatus: remoteConfig.appStatus.copyWith(
isLatestVersionOnly: value,
),
);
),
),
);
},
),
_buildTextField(
Expand All @@ -613,14 +613,14 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
value: remoteConfig.appStatus.iosUpdateUrl,
onChanged: (value) {
context.read<AppConfigurationBloc>().add(
AppConfigurationFieldChanged(
remoteConfig: remoteConfig.copyWith(
appStatus: remoteConfig.appStatus.copyWith(
iosUpdateUrl: value,
),
),
AppConfigurationFieldChanged(
remoteConfig: remoteConfig.copyWith(
appStatus: remoteConfig.appStatus.copyWith(
iosUpdateUrl: value,
),
);
),
),
);
},
),
_buildTextField(
Expand All @@ -630,14 +630,14 @@ class _AppConfigurationPageState extends State<AppConfigurationPage>
value: remoteConfig.appStatus.androidUpdateUrl,
onChanged: (value) {
context.read<AppConfigurationBloc>().add(
AppConfigurationFieldChanged(
remoteConfig: remoteConfig.copyWith(
appStatus: remoteConfig.appStatus.copyWith(
androidUpdateUrl: value,
),
),
AppConfigurationFieldChanged(
remoteConfig: remoteConfig.copyWith(
appStatus: remoteConfig.appStatus.copyWith(
androidUpdateUrl: value,
),
);
),
),
);
},
),
],
Expand Down Expand Up @@ -836,7 +836,7 @@ class _UserPreferenceLimitsFormState extends State<_UserPreferenceLimitsForm> {
@override
Widget build(BuildContext context) {
final userPreferenceConfig = widget.remoteConfig.userPreferenceConfig;
final l10n = context.l10n;
final l10n = AppLocalizationsX(context).l10n;

return Column(
children: [
Expand Down Expand Up @@ -1103,7 +1103,7 @@ class _AdConfigFormState extends State<_AdConfigForm> {
@override
Widget build(BuildContext context) {
final adConfig = widget.remoteConfig.adConfig;
final l10n = context.l10n;
final l10n = AppLocalizationsX(context).l10n;

return Column(
children: [
Expand Down Expand Up @@ -1310,7 +1310,7 @@ class _AccountActionConfigFormState extends State<_AccountActionConfigForm> {
Widget build(BuildContext context) {
final accountActionConfig = widget.remoteConfig.accountActionConfig;
final relevantActionTypes = _getDaysMap(accountActionConfig).keys.toList();
final l10n = context.l10n;
final l10n = AppLocalizationsX(context).l10n;

return Column(
children: relevantActionTypes.map((actionType) {
Expand Down
3 changes: 1 addition & 2 deletions lib/authentication/view/authentication_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import 'package:go_router/go_router.dart';
import 'package:ht_dashboard/authentication/bloc/authentication_bloc.dart';
import 'package:ht_dashboard/l10n/l10n.dart';
import 'package:ht_dashboard/router/routes.dart';
import 'package:ht_dashboard/shared/constants/app_spacing.dart';
import 'package:ht_ui_kit/ht_ui_kit.dart';

/// {@template authentication_page}
Expand All @@ -19,7 +18,7 @@ class AuthenticationPage extends StatelessWidget {

@override
Widget build(BuildContext context) {
final l10n = context.l10n;
final l10n = AppLocalizationsX(context).l10n;
final textTheme = Theme.of(context).textTheme;
final colorScheme = Theme.of(context).colorScheme;

Expand Down
Loading
Loading