Skip to content

Commit d0a35ea

Browse files
committed
refactor(app): simplify font family mapping
- Use fontFamily string directly - Remove GoogleFonts mapping - Log input and output
1 parent 6edce6a commit d0a35ea

File tree

1 file changed

+10
-19
lines changed

1 file changed

+10
-19
lines changed

lib/app/bloc/app_bloc.dart

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -251,26 +251,17 @@ class AppBloc extends Bloc<AppEvent, AppState> {
251251
}
252252
}
253253

254-
String? _mapFontFamily(String fontFamily) {
255-
// Assuming 'SystemDefault' means use the theme's default font
256-
if (fontFamily == 'SystemDefault') return null;
257-
258-
// Map specific font family names to GoogleFonts
259-
switch (fontFamily) {
260-
case 'Roboto':
261-
return GoogleFonts.roboto().fontFamily;
262-
case 'OpenSans':
263-
return GoogleFonts.openSans().fontFamily;
264-
case 'Lato':
265-
return GoogleFonts.lato().fontFamily;
266-
case 'Montserrat':
267-
return GoogleFonts.montserrat().fontFamily;
268-
case 'Merriweather':
269-
return GoogleFonts.merriweather().fontFamily;
270-
default:
271-
// If an unknown font family is specified, fall back to theme default
272-
return null;
254+
String? _mapFontFamily(String fontFamilyString) {
255+
// If the input is 'SystemDefault', return null so FlexColorScheme uses its default.
256+
if (fontFamilyString == 'SystemDefault') {
257+
print('[AppBloc] _mapFontFamily: Input is SystemDefault, returning null.');
258+
return null;
273259
}
260+
// Otherwise, return the font family string directly.
261+
// The GoogleFonts.xyz().fontFamily getters often return strings like "Roboto-Regular",
262+
// but FlexColorScheme's fontFamily parameter or GoogleFonts.xyzTextTheme() expect simple names.
263+
print('[AppBloc] _mapFontFamily: Input is $fontFamilyString, returning as is.');
264+
return fontFamilyString;
274265
}
275266

276267
// Map AppTextScaleFactor to AppTextScaleFactor (no change needed)

0 commit comments

Comments
 (0)