Skip to content

Commit df7a547

Browse files
fullenifulleni
committed
style: misc
1 parent cfc4ab5 commit df7a547

File tree

10 files changed

+245
-161
lines changed

10 files changed

+245
-161
lines changed

‎lib/app/bloc/app_bloc.dart

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import 'package:bloc/bloc.dart';
44
import 'package:equatable/equatable.dart';
55
import 'package:flex_color_scheme/flex_color_scheme.dart';
66
import 'package:flutter/material.dart';
7-
import 'package:google_fonts/google_fonts.dart';
87
import 'package:ht_auth_repository/ht_auth_repository.dart';
98
import 'package:ht_data_repository/ht_data_repository.dart';
109
import 'package:ht_shared/ht_shared.dart'; // Import shared models and exceptions
@@ -104,9 +103,15 @@ class AppBloc extends Bloc<AppEvent, AppState> {
104103
// Map language code to Locale
105104
final newLocale = Locale(userAppSettings.language);
106105

107-
print('[AppBloc] _onAppSettingsRefreshed: userAppSettings.fontFamily: ${userAppSettings.displaySettings.fontFamily}');
108-
print('[AppBloc] _onAppSettingsRefreshed: userAppSettings.fontWeight: ${userAppSettings.displaySettings.fontWeight}');
109-
print('[AppBloc] _onAppSettingsRefreshed: newFontFamily mapped to: $newFontFamily');
106+
print(
107+
'[AppBloc] _onAppSettingsRefreshed: userAppSettings.fontFamily: ${userAppSettings.displaySettings.fontFamily}',
108+
);
109+
print(
110+
'[AppBloc] _onAppSettingsRefreshed: userAppSettings.fontWeight: ${userAppSettings.displaySettings.fontWeight}',
111+
);
112+
print(
113+
'[AppBloc] _onAppSettingsRefreshed: newFontFamily mapped to: $newFontFamily',
114+
);
110115

111116
emit(
112117
state.copyWith(
@@ -127,7 +132,9 @@ class AppBloc extends Bloc<AppEvent, AppState> {
127132
themeMode: ThemeMode.system,
128133
flexScheme: FlexScheme.material,
129134
appTextScaleFactor: AppTextScaleFactor.medium, // Default enum value
130-
locale: const Locale('en'), // Default to English if settings not found
135+
locale: const Locale(
136+
'en',
137+
), // Default to English if settings not found
131138
settings: UserAppSettings(
132139
id: state.user!.id,
133140
), // Provide default settings
@@ -254,13 +261,17 @@ class AppBloc extends Bloc<AppEvent, AppState> {
254261
String? _mapFontFamily(String fontFamilyString) {
255262
// If the input is 'SystemDefault', return null so FlexColorScheme uses its default.
256263
if (fontFamilyString == 'SystemDefault') {
257-
print('[AppBloc] _mapFontFamily: Input is SystemDefault, returning null.');
264+
print(
265+
'[AppBloc] _mapFontFamily: Input is SystemDefault, returning null.',
266+
);
258267
return null;
259268
}
260269
// Otherwise, return the font family string directly.
261270
// The GoogleFonts.xyz().fontFamily getters often return strings like "Roboto-Regular",
262271
// but FlexColorScheme's fontFamily parameter or GoogleFonts.xyzTextTheme() expect simple names.
263-
print('[AppBloc] _mapFontFamily: Input is $fontFamilyString, returning as is.');
272+
print(
273+
'[AppBloc] _mapFontFamily: Input is $fontFamilyString, returning as is.',
274+
);
264275
return fontFamilyString;
265276
}
266277

‎lib/app/view/app.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,12 @@ class _AppViewState extends State<_AppView> {
186186
builder: (context, state) {
187187
print('[_AppViewState] Building MaterialApp.router');
188188
print('[_AppViewState] state.fontFamily: ${state.fontFamily}');
189-
print('[_AppViewState] state.settings.displaySettings.fontFamily: ${state.settings.displaySettings.fontFamily}');
190-
print('[_AppViewState] state.settings.displaySettings.fontWeight: ${state.settings.displaySettings.fontWeight}');
189+
print(
190+
'[_AppViewState] state.settings.displaySettings.fontFamily: ${state.settings.displaySettings.fontFamily}',
191+
);
192+
print(
193+
'[_AppViewState] state.settings.displaySettings.fontWeight: ${state.settings.displaySettings.fontWeight}',
194+
);
191195
return MaterialApp.router(
192196
debugShowCheckedModeBanner: false,
193197
themeMode: state.themeMode,

‎lib/router/router.dart

Lines changed: 49 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,11 @@ GoRouter createRouter({
531531
routes: [
532532
// ShellRoute for settings to provide SettingsBloc to children
533533
ShellRoute(
534-
builder: (BuildContext context, GoRouterState state, Widget child) {
534+
builder: (
535+
BuildContext context,
536+
GoRouterState state,
537+
Widget child,
538+
) {
535539
// This builder provides SettingsBloc to all routes within this ShellRoute.
536540
// 'child' will be SettingsPage, AppearanceSettingsPage, etc.
537541
final appBloc = context.read<AppBloc>();
@@ -541,7 +545,8 @@ GoRouter createRouter({
541545
create: (context) {
542546
final settingsBloc = SettingsBloc(
543547
userAppSettingsRepository:
544-
context.read<HtDataRepository<UserAppSettings>>(),
548+
context
549+
.read<HtDataRepository<UserAppSettings>>(),
545550
);
546551
// Only load settings if a userId is available
547552
if (userId != null) {
@@ -556,47 +561,74 @@ GoRouter createRouter({
556561
}
557562
return settingsBloc;
558563
},
559-
child: child, // child is the actual page widget (SettingsPage, AppearanceSettingsPage, etc.)
564+
child:
565+
child, // child is the actual page widget (SettingsPage, AppearanceSettingsPage, etc.)
560566
);
561567
},
562568
routes: [
563569
GoRoute(
564-
path: Routes.settings, // Relative path 'settings' from /account
570+
path:
571+
Routes
572+
.settings, // Relative path 'settings' from /account
565573
name: Routes.settingsName,
566574
builder: (context, state) => const SettingsPage(),
567575
// --- Settings Sub-Routes ---
568576
routes: [
569577
GoRoute(
570-
path: Routes.settingsAppearance, // 'appearance' relative to /account/settings
578+
path:
579+
Routes
580+
.settingsAppearance, // 'appearance' relative to /account/settings
571581
name: Routes.settingsAppearanceName,
572-
builder: (context, state) => const AppearanceSettingsPage(),
573-
routes: [ // Children of AppearanceSettingsPage
582+
builder:
583+
(context, state) =>
584+
const AppearanceSettingsPage(),
585+
routes: [
586+
// Children of AppearanceSettingsPage
574587
GoRoute(
575-
path: Routes.settingsAppearanceTheme, // 'theme' relative to /account/settings/appearance
588+
path:
589+
Routes
590+
.settingsAppearanceTheme, // 'theme' relative to /account/settings/appearance
576591
name: Routes.settingsAppearanceThemeName,
577-
builder: (context, state) => const ThemeSettingsPage(),
592+
builder:
593+
(context, state) =>
594+
const ThemeSettingsPage(),
578595
),
579596
GoRoute(
580-
path: Routes.settingsAppearanceFont, // 'font' relative to /account/settings/appearance
597+
path:
598+
Routes
599+
.settingsAppearanceFont, // 'font' relative to /account/settings/appearance
581600
name: Routes.settingsAppearanceFontName,
582-
builder: (context, state) => const FontSettingsPage(),
601+
builder:
602+
(context, state) =>
603+
const FontSettingsPage(),
583604
),
584605
],
585606
),
586607
GoRoute(
587-
path: Routes.settingsFeed, // 'feed' relative to /account/settings
608+
path:
609+
Routes
610+
.settingsFeed, // 'feed' relative to /account/settings
588611
name: Routes.settingsFeedName,
589-
builder: (context, state) => const FeedSettingsPage(),
612+
builder:
613+
(context, state) => const FeedSettingsPage(),
590614
),
591615
GoRoute(
592-
path: Routes.settingsNotifications, // 'notifications' relative to /account/settings
616+
path:
617+
Routes
618+
.settingsNotifications, // 'notifications' relative to /account/settings
593619
name: Routes.settingsNotificationsName,
594-
builder: (context, state) => const NotificationSettingsPage(),
620+
builder:
621+
(context, state) =>
622+
const NotificationSettingsPage(),
595623
),
596624
GoRoute(
597-
path: Routes.settingsLanguage, // 'language' relative to /account/settings
625+
path:
626+
Routes
627+
.settingsLanguage, // 'language' relative to /account/settings
598628
name: Routes.settingsLanguageName,
599-
builder: (context, state) => const LanguageSettingsPage(),
629+
builder:
630+
(context, state) =>
631+
const LanguageSettingsPage(),
600632
),
601633
],
602634
),

‎lib/router/routes.dart

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,11 @@ abstract final class Routes {
5757
static const settingsAppearanceName = 'settingsAppearance';
5858

5959
// --- Appearance Sub-Routes (relative to /account/settings/appearance) ---
60-
static const settingsAppearanceTheme = 'theme'; // Path: /account/settings/appearance/theme
60+
static const settingsAppearanceTheme =
61+
'theme'; // Path: /account/settings/appearance/theme
6162
static const settingsAppearanceThemeName = 'settingsAppearanceTheme';
62-
static const settingsAppearanceFont = 'font'; // Path: /account/settings/appearance/font
63+
static const settingsAppearanceFont =
64+
'font'; // Path: /account/settings/appearance/font
6365
static const settingsAppearanceFontName = 'settingsAppearanceFont';
6466

6567
static const settingsFeed = 'feed';
@@ -70,7 +72,8 @@ abstract final class Routes {
7072
static const settingsNotificationsName = 'settingsNotifications';
7173

7274
// --- Language Settings Sub-Route (relative to /account/settings) ---
73-
static const settingsLanguage = 'language'; // Path: /account/settings/language
75+
static const settingsLanguage =
76+
'language'; // Path: /account/settings/language
7477
static const settingsLanguageName = 'settingsLanguage';
7578

7679
// Add names for notification sub-selection routes if needed later

‎lib/settings/bloc/settings_bloc.dart

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
4848
_onFeedTileTypeChanged,
4949
transformer: sequential(),
5050
);
51-
on<SettingsLanguageChanged>(
52-
_onLanguageChanged,
53-
transformer: sequential(),
54-
);
51+
on<SettingsLanguageChanged>(_onLanguageChanged, transformer: sequential());
5552
// SettingsNotificationsEnabledChanged event and handler removed.
5653
}
5754

@@ -160,14 +157,18 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
160157
Emitter<SettingsState> emit,
161158
) async {
162159
if (state.userAppSettings == null) return;
163-
print('[SettingsBloc] _onAppFontTypeChanged: Received event.fontType: ${event.fontType}');
160+
print(
161+
'[SettingsBloc] _onAppFontTypeChanged: Received event.fontType: ${event.fontType}',
162+
);
164163

165164
final updatedSettings = state.userAppSettings!.copyWith(
166165
displaySettings: state.userAppSettings!.displaySettings.copyWith(
167166
fontFamily: event.fontType,
168167
),
169168
);
170-
print('[SettingsBloc] _onAppFontTypeChanged: Updated settings.fontFamily: ${updatedSettings.displaySettings.fontFamily}');
169+
print(
170+
'[SettingsBloc] _onAppFontTypeChanged: Updated settings.fontFamily: ${updatedSettings.displaySettings.fontFamily}',
171+
);
171172
emit(state.copyWith(userAppSettings: updatedSettings, clearError: true));
172173
await _persistSettings(updatedSettings, emit);
173174
}
@@ -177,14 +178,18 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
177178
Emitter<SettingsState> emit,
178179
) async {
179180
if (state.userAppSettings == null) return;
180-
print('[SettingsBloc] _onAppFontWeightChanged: Received event.fontWeight: ${event.fontWeight}');
181+
print(
182+
'[SettingsBloc] _onAppFontWeightChanged: Received event.fontWeight: ${event.fontWeight}',
183+
);
181184

182185
final updatedSettings = state.userAppSettings!.copyWith(
183186
displaySettings: state.userAppSettings!.displaySettings.copyWith(
184187
fontWeight: event.fontWeight,
185188
),
186189
);
187-
print('[SettingsBloc] _onAppFontWeightChanged: Updated settings.fontWeight: ${updatedSettings.displaySettings.fontWeight}');
190+
print(
191+
'[SettingsBloc] _onAppFontWeightChanged: Updated settings.fontWeight: ${updatedSettings.displaySettings.fontWeight}',
192+
);
188193
emit(state.copyWith(userAppSettings: updatedSettings, clearError: true));
189194
await _persistSettings(updatedSettings, emit);
190195
}

‎lib/settings/view/appearance_settings_page.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ class AppearanceSettingsPage extends StatelessWidget {
3434
children: [
3535
ListTile(
3636
leading: const Icon(Icons.color_lens_outlined),
37-
title: Text(l10n.settingsAppearanceThemeSubPageTitle), // Use new l10n key
37+
title: Text(
38+
l10n.settingsAppearanceThemeSubPageTitle,
39+
), // Use new l10n key
3840
trailing: const Icon(Icons.chevron_right),
3941
onTap: () {
4042
context.goNamed(Routes.settingsAppearanceThemeName);
@@ -43,7 +45,9 @@ class AppearanceSettingsPage extends StatelessWidget {
4345
const Divider(indent: AppSpacing.lg, endIndent: AppSpacing.lg),
4446
ListTile(
4547
leading: const Icon(Icons.font_download_outlined),
46-
title: Text(l10n.settingsAppearanceFontSubPageTitle), // Use new l10n key
48+
title: Text(
49+
l10n.settingsAppearanceFontSubPageTitle,
50+
), // Use new l10n key
4751
trailing: const Icon(Icons.chevron_right),
4852
onTap: () {
4953
context.goNamed(Routes.settingsAppearanceFontName);

0 commit comments

Comments
 (0)