diff --git a/google_fonts/Cascadia.ttf b/google_fonts/Cascadia.ttf deleted file mode 100644 index fee603f..0000000 Binary files a/google_fonts/Cascadia.ttf and /dev/null differ diff --git a/google_fonts/FiraCode-Bold.ttf b/google_fonts/FiraCode-Bold.ttf deleted file mode 100644 index 45b1a3c..0000000 Binary files a/google_fonts/FiraCode-Bold.ttf and /dev/null differ diff --git a/google_fonts/FiraCode-Regular.ttf b/google_fonts/FiraCode-Regular.ttf deleted file mode 100644 index 3196d96..0000000 Binary files a/google_fonts/FiraCode-Regular.ttf and /dev/null differ diff --git a/google_fonts/Inconsolata-Bold.ttf b/google_fonts/Inconsolata-Bold.ttf deleted file mode 100644 index fd19ca2..0000000 Binary files a/google_fonts/Inconsolata-Bold.ttf and /dev/null differ diff --git a/google_fonts/Inconsolata-Regular.ttf b/google_fonts/Inconsolata-Regular.ttf deleted file mode 100644 index 18a0708..0000000 Binary files a/google_fonts/Inconsolata-Regular.ttf and /dev/null differ diff --git a/google_fonts/JetBrainsMono-Bold-Italic.ttf b/google_fonts/JetBrainsMono-Bold-Italic.ttf deleted file mode 100644 index 87b9bf8..0000000 Binary files a/google_fonts/JetBrainsMono-Bold-Italic.ttf and /dev/null differ diff --git a/google_fonts/JetBrainsMono-Bold.ttf b/google_fonts/JetBrainsMono-Bold.ttf deleted file mode 100644 index fd1ab3c..0000000 Binary files a/google_fonts/JetBrainsMono-Bold.ttf and /dev/null differ diff --git a/google_fonts/JetBrainsMono-Italic.ttf b/google_fonts/JetBrainsMono-Italic.ttf deleted file mode 100644 index 2b6d374..0000000 Binary files a/google_fonts/JetBrainsMono-Italic.ttf and /dev/null differ diff --git a/google_fonts/JetBrainsMono-Regular.ttf b/google_fonts/JetBrainsMono-Regular.ttf deleted file mode 100644 index dfbece6..0000000 Binary files a/google_fonts/JetBrainsMono-Regular.ttf and /dev/null differ diff --git a/google_fonts/PTMono-Regular.ttf b/google_fonts/PTMono-Regular.ttf deleted file mode 100644 index 13a8004..0000000 Binary files a/google_fonts/PTMono-Regular.ttf and /dev/null differ diff --git a/google_fonts/SourceCodePro-Bold.ttf b/google_fonts/SourceCodePro-Bold.ttf deleted file mode 100644 index c790e04..0000000 Binary files a/google_fonts/SourceCodePro-Bold.ttf and /dev/null differ diff --git a/google_fonts/SourceCodePro-BoldItalic.ttf b/google_fonts/SourceCodePro-BoldItalic.ttf deleted file mode 100644 index 0878199..0000000 Binary files a/google_fonts/SourceCodePro-BoldItalic.ttf and /dev/null differ diff --git a/google_fonts/SourceCodePro-Regular.ttf b/google_fonts/SourceCodePro-Regular.ttf deleted file mode 100644 index 3563e73..0000000 Binary files a/google_fonts/SourceCodePro-Regular.ttf and /dev/null differ diff --git a/google_fonts/SourceCodePro-RegularItalic.ttf b/google_fonts/SourceCodePro-RegularItalic.ttf deleted file mode 100644 index 91a2a44..0000000 Binary files a/google_fonts/SourceCodePro-RegularItalic.ttf and /dev/null differ diff --git a/google_fonts/UbuntuMono-Bold.ttf b/google_fonts/UbuntuMono-Bold.ttf deleted file mode 100644 index 0ac7e58..0000000 Binary files a/google_fonts/UbuntuMono-Bold.ttf and /dev/null differ diff --git a/google_fonts/UbuntuMono-BoldItalic.ttf b/google_fonts/UbuntuMono-BoldItalic.ttf deleted file mode 100644 index 0054c9a..0000000 Binary files a/google_fonts/UbuntuMono-BoldItalic.ttf and /dev/null differ diff --git a/google_fonts/UbuntuMono-Regular.ttf b/google_fonts/UbuntuMono-Regular.ttf deleted file mode 100644 index c8add8e..0000000 Binary files a/google_fonts/UbuntuMono-Regular.ttf and /dev/null differ diff --git a/google_fonts/UbuntuMono-RegularItalic.ttf b/google_fonts/UbuntuMono-RegularItalic.ttf deleted file mode 100644 index 20e04f3..0000000 Binary files a/google_fonts/UbuntuMono-RegularItalic.ttf and /dev/null differ diff --git a/lib/main.dart b/lib/main.dart index 25dfe49..267187a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -6,7 +6,6 @@ import 'package:git_touch/models/code.dart'; import 'package:git_touch/models/notification.dart'; import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; -import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; import 'package:sentry_flutter/sentry_flutter.dart'; @@ -18,8 +17,6 @@ void main() async { }, // Init your App. appRunner: () async { - GoogleFonts.config.allowRuntimeFetching = false; - final notificationModel = NotificationModel(); final themeModel = ThemeModel(); final authModel = AuthModel(); diff --git a/lib/models/code.dart b/lib/models/code.dart index adbf7b1..819f38a 100644 --- a/lib/models/code.dart +++ b/lib/models/code.dart @@ -8,21 +8,15 @@ import 'package:shared_preferences/shared_preferences.dart'; class CodeModel with ChangeNotifier { static var themes = themeMap.keys.toList(); static const fontSizes = [12, 13, 14, 15, 16, 17, 18, 19, 20]; - static const fontFamilies = [ + static final fontFamilies = [ 'System', - 'JetBrains Mono', - 'Fira Code', - 'Inconsolata', - 'PT Mono', - 'Source Code Pro', - 'Ubuntu Mono', - // 'Cascadia Code', // TODO: https://github.com/google/fonts/issues/2179 + ...GoogleFonts.asMap().keys, ]; String _theme = 'vs'; String _themeDark = 'vs2015'; int _fontSize = 14; - String _fontFamily = 'JetBrains Mono'; + String _fontFamily = 'System'; String get theme => _theme; String get themeDark => _themeDark; diff --git a/pubspec.yaml b/pubspec.yaml index 3653767..9df2e9c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -134,7 +134,6 @@ flutter: # see https://flutter.dev/custom-fonts/#from-packages assets: - images/ - - google_fonts/ flutter_intl: enabled: true