Fallback to system emoji on windows (#94)

commetchat · Sep 28, 2023 · 9f69a41 · 9f69a41
1 parent f2b3ca0
commit 9f69a41
Show file tree

Hide file tree

Showing 6 changed files with 235 additions and 227 deletions.
diff --git a/tiamat/.gitignore b/tiamat/.gitignore
@@ -31,6 +31,7 @@ migrate_working_dir/
 .pub-cache/
 .pub/
 /build/
+*.g.dart
 
 # Symbolication related
 app.*.symbols

diff --git a/tiamat/lib/config/style/theme_dark.dart b/tiamat/lib/config/style/theme_dark.dart
@@ -2,6 +2,7 @@ import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:tiamat/config/style/theme_extensions.dart';
+import 'dart:io' show Platform;
 
 class ThemeDarkColors {
   static const Color surfaceHigh1 = Color.fromARGB(255, 47, 51, 55);
@@ -21,7 +22,8 @@ class ThemeDark {
   static ThemeData get theme => ThemeData(
       brightness: Brightness.dark,
       fontFamily: "RobotoCustom",
-      fontFamilyFallback: const ["EmojiFont"],
+      // Windows doesnt support the type of font we use :(
+      fontFamilyFallback: Platform.isWindows ? null : const ["EmojiFont"],
       useMaterial3: true,
       extensions: const <ThemeExtension<dynamic>>[
         ExtraColors(

diff --git a/tiamat/lib/config/style/theme_light.dart b/tiamat/lib/config/style/theme_light.dart
@@ -1,5 +1,6 @@
 import 'package:tiamat/config/style/theme_extensions.dart';
 import 'package:flutter/material.dart';
+import 'dart:io' show Platform;
 
 class ThemeLightColors {
   static const Color surfaceHigh1 = Color.fromARGB(255, 245, 245, 245);
@@ -20,7 +21,8 @@ class ThemeLight {
       brightness: Brightness.light,
       useMaterial3: true,
       fontFamily: "RobotoCustom",
-      fontFamilyFallback: const ["EmojiFont"],
+      // Windows doesnt support the type of font we use :(
+      fontFamilyFallback: Platform.isWindows ? null : const ["EmojiFont"],
       extensions: const <ThemeExtension<dynamic>>[
         ExtraColors(
             surfaceHigh1: ThemeLightColors.surfaceHigh1,

diff --git a/tiamat/lib/widgetbook.dart b/tiamat/lib/widgetbook.dart
@@ -1,15 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:tiamat/config/style/theme_dark.dart';
+import 'package:tiamat/config/style/theme_light.dart';
 import 'package:widgetbook/widgetbook.dart';
 import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
-
+import 'dart:io' show Platform;
+// Import the generated directories variable
 import 'widgetbook.directories.g.dart';
 
-import 'package:flutter/material.dart';
-import 'package:tiamat/config/style/theme_dark.dart';
-import 'package:tiamat/config/style/theme_glass.dart';
-import 'package:tiamat/config/style/theme_light.dart';
-import 'package:widgetbook_annotation/widgetbook_annotation.dart';
-
 void main() {
   runApp(WidgetbookApp());
 }