Skip to content

fix: use sans-serif font family on Linux when Twemoji is enabled #134

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.

Sign up for GitHub

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

Open
tyronetheqt wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −6
Open

fix: use sans-serif font family on Linux when Twemoji is enabled #134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 21 additions & 6 deletions lib/config/themes.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';

import 'package:extera_next/config/setting_keys.dart';
import 'package:extera_next/utils/platform_infos.dart';
import 'app_config.dart';

abstract class FluffyThemes {
Expand All @@ -18,6 +19,15 @@ abstract class FluffyThemes {
static bool isThreeColumnMode(BuildContext context) =>
MediaQuery.sizeOf(context).width > FluffyThemes.columnWidth * 3.5;

static List<String> _filteredFallbackFonts(String fonts) {
if (fonts.isEmpty) return const [];
final list = fonts.split(',');
if (!PlatformInfos.isAndroid) {
list.removeWhere((f) => f == 'SystemFont' || f == 'Roboto');
}
return list;
}

static LinearGradient backgroundGradient(BuildContext context, int alpha) {
final colorScheme = Theme.of(context).colorScheme;
return LinearGradient(
Expand Down Expand Up @@ -81,16 +91,21 @@ abstract class FluffyThemes {
brightness: brightness,
colorScheme: colorScheme,
useSystemColors: true,
fontFamily: AppSettings.systemFont.value
fontFamily: AppSettings.systemFont.value && PlatformInfos.isAndroid
? 'SystemFont'
: AppSettings.uiFont.value.isEmpty
? null
: AppSettings.uiFont.value,
: AppSettings.uiFont.value.isNotEmpty
? AppSettings.uiFont.value
: PlatformInfos.isLinux && twemoji == true
? 'sans-serif'
: null,
fontFamilyFallback: twemoji == true
? ['Twemoji Mozilla', ...AppSettings.fallbackFonts.value.split(',')]
? [
'Twemoji Mozilla',
..._filteredFallbackFonts(AppSettings.fallbackFonts.value),
]
: AppSettings.fallbackFonts.value.isEmpty
? null
: AppSettings.fallbackFonts.value.split(','),
: _filteredFallbackFonts(AppSettings.fallbackFonts.value),
dividerColor: brightness == Brightness.dark
? colorScheme.surfaceContainerHighest
: colorScheme.surfaceContainer,
Expand Down