From accb2fc3ea98881716b863de8ad116db177fcad2 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Fri, 17 Jul 2026 01:31:18 -0400 Subject: [PATCH] undo tests --- lib/helpers/extensions/scheme_to_theme.dart | 12 +++++------- lib/main.dart | 18 ++---------------- lib/models/settings.dart | 1 - lib/pages/settings_page.dart | 16 ---------------- 4 files changed, 7 insertions(+), 40 deletions(-) diff --git a/lib/helpers/extensions/scheme_to_theme.dart b/lib/helpers/extensions/scheme_to_theme.dart index 26a17a1..b7d7972 100644 --- a/lib/helpers/extensions/scheme_to_theme.dart +++ b/lib/helpers/extensions/scheme_to_theme.dart @@ -1,7 +1,7 @@ import "package:flutter/material.dart"; extension SchemeToTheme on ColorScheme { - ThemeData getTheme(bool useSystemFont) => .from(colorScheme: this).copyWith( + ThemeData get theme => .from(colorScheme: this).copyWith( cardTheme: .new(color: primaryContainer), popupMenuTheme: .new( shape: RoundedRectangleBorder(borderRadius: .circular(16)), @@ -11,12 +11,10 @@ extension SchemeToTheme on ColorScheme { titleSpacing: 0, backgroundColor: surfaceContainerLow, ), - textTheme: useSystemFont - ? ThemeData( - fontFamilyFallback: ["sans", "emoji", "fallback-emoji"], - brightness: brightness, - ).textTheme - : null, + textTheme: ThemeData( + fontFamilyFallback: ["sans", "emoji"], + brightness: brightness, + ).textTheme, inputDecorationTheme: const InputDecorationTheme( border: OutlineInputBorder(), ), diff --git a/lib/main.dart b/lib/main.dart index ed48759..fa13576 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -105,14 +105,7 @@ class App extends StatelessWidget { settings.useDynamicTheming ? lightDynamic : null, ) ?? ColorScheme.fromSeed(seedColor: Colors.indigo)) - .getTheme( - ref - .watch(SettingsController.provider) - .maybeWhen( - orElse: () => true, - data: (settings) => settings.useSystemFont, - ), - ), + .theme, darkTheme: (ref .watch(SettingsController.provider) @@ -125,14 +118,7 @@ class App extends StatelessWidget { seedColor: Colors.indigo, brightness: Brightness.dark, )) - .getTheme( - ref - .watch(SettingsController.provider) - .maybeWhen( - orElse: () => true, - data: (settings) => settings.useSystemFont, - ), - ), + .theme, themeMode: ref .watch(SettingsController.provider) .maybeWhen( diff --git a/lib/models/settings.dart b/lib/models/settings.dart index 9c84386..924c733 100644 --- a/lib/models/settings.dart +++ b/lib/models/settings.dart @@ -8,7 +8,6 @@ abstract class Settings with _$Settings { const factory Settings({ @Default(ThemeMode.system) ThemeMode theme, @Default(true) bool useDynamicTheming, - @Default(true) bool useSystemFont, }) = _Settings; factory Settings.fromJson(Map json) => diff --git a/lib/pages/settings_page.dart b/lib/pages/settings_page.dart index 1def3ab..c302157 100644 --- a/lib/pages/settings_page.dart +++ b/lib/pages/settings_page.dart @@ -75,22 +75,6 @@ class SettingsPage extends ConsumerWidget { : null, ), ), - Setting( - title: "Use System Font", - icon: Icons.abc, - description: - "Use the system's sans and emoji fonts, instead of Flutter's bundled fonts. Turn this off if you are having issues rendering emoji.", - builder: (title, description, icon) => SwitchListTile( - title: Text(title), - subtitle: Text(description), - secondary: Icon(icon), - value: settings.useSystemFont, - onChanged: (value) => ref - .watch(SettingsController.provider.notifier) - .set(settings.copyWith(useSystemFont: value)) - .onError(showError), - ), - ), ]), ), ]),