GitLab
/
fluffychat
mirror of https://gitlab.com/famedly/fluffychat.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: Use system fonts except for desktop

This commit is contained in:
Christian Pauly 2021-12-25 18:52:38 +01:00
parent d0ca0d1d4c
commit 714f0bc573
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/config/themes.dart
View File

@ -15,22 +15,21 @@ abstract class FluffyThemes {
static const fallbackTextStyle = static const fallbackTextStyle =
TextStyle(fontFamily: 'Roboto', fontFamilyFallback: ['NotoEmoji']); TextStyle(fontFamily: 'Roboto', fontFamilyFallback: ['NotoEmoji']);
static var fallbackTextTheme = PlatformInfos.isDesktop static var fallbackTextTheme = const TextTheme(
? const TextTheme( bodyText1: fallbackTextStyle,
bodyText1: fallbackTextStyle, bodyText2: fallbackTextStyle,
bodyText2: fallbackTextStyle, button: fallbackTextStyle,
button: fallbackTextStyle, caption: fallbackTextStyle,
caption: fallbackTextStyle, overline: fallbackTextStyle,
overline: fallbackTextStyle, headline1: fallbackTextStyle,
headline1: fallbackTextStyle, headline2: fallbackTextStyle,
headline2: fallbackTextStyle, headline3: fallbackTextStyle,
headline3: fallbackTextStyle, headline4: fallbackTextStyle,
headline4: fallbackTextStyle, headline5: fallbackTextStyle,
headline5: fallbackTextStyle, headline6: fallbackTextStyle,
headline6: fallbackTextStyle, subtitle1: fallbackTextStyle,
subtitle1: fallbackTextStyle, subtitle2: fallbackTextStyle,
subtitle2: fallbackTextStyle) );
: const TextTheme();
static ThemeData get light => ThemeData( static ThemeData get light => ThemeData(
visualDensity: VisualDensity.standard, visualDensity: VisualDensity.standard,
@ -47,7 +46,9 @@ abstract class FluffyThemes {
backgroundColor: Colors.white, backgroundColor: Colors.white,
secondaryHeaderColor: Colors.blueGrey.shade50, secondaryHeaderColor: Colors.blueGrey.shade50,
scaffoldBackgroundColor: Colors.white, scaffoldBackgroundColor: Colors.white,
textTheme: Typography.material2018().black.merge(fallbackTextTheme), textTheme: PlatformInfos.isDesktop
? Typography.material2018().black.merge(fallbackTextTheme)
: null,
snackBarTheme: snackBarTheme:
const SnackBarThemeData(behavior: SnackBarBehavior.floating), const SnackBarThemeData(behavior: SnackBarBehavior.floating),
pageTransitionsTheme: const PageTransitionsTheme( pageTransitionsTheme: const PageTransitionsTheme(
@ -138,7 +139,9 @@ abstract class FluffyThemes {
surface: FluffyThemes.darken(AppConfig.chatColor, 0.35), surface: FluffyThemes.darken(AppConfig.chatColor, 0.35),
), ),
secondaryHeaderColor: Colors.blueGrey.shade900, secondaryHeaderColor: Colors.blueGrey.shade900,
textTheme: Typography.material2018().white.merge(fallbackTextTheme), textTheme: PlatformInfos.isDesktop
? Typography.material2018().white.merge(fallbackTextTheme)
: null,
dialogTheme: DialogTheme( dialogTheme: DialogTheme(
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppConfig.borderRadius), borderRadius: BorderRadius.circular(AppConfig.borderRadius),