diff --git a/.vscode/settings.json b/.vscode/settings.json index a770516..5f096e2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,12 @@ { "task.slowProviderWarning": true, - "dart.flutterSdkPaths": [ - "fvm" - ], + "dart.flutterSdkPath": "fvm", + "search.exclude": { + "**/.fvm": true + }, + "files.watcherExclude": { + "**/.fvm": true + }, "dart.lineLength": 100, "[dart]": { "editor.formatOnSave": true, @@ -20,5 +24,5 @@ "dart.doNotFormat": [ "**/generated/**", "lib/data/**" - ] + ], } \ No newline at end of file diff --git a/lib/res/theme.dart b/lib/res/theme.dart index 9eedad7..e41d71b 100644 --- a/lib/res/theme.dart +++ b/lib/res/theme.dart @@ -26,7 +26,7 @@ class ThemeProvider extends StatefulWidget { class ThemeProviderState extends State { UserPreferencesService get _prefs => context.read(); - + late final _themeTypeNotifier = ValueNotifier(_prefs.themeType); late final _dynamicColorNotifier = ValueNotifier(_prefs.dynamicColor); late final _primaryColorNotifier = ValueNotifier(const Color(0xFF2196f3)); @@ -159,6 +159,7 @@ class _ThemeDataProvider extends StatelessWidget { final scheme = brightness == Brightness.light ? Scheme.light(primaryColor.value) : Scheme.dark(primaryColor.value); + return ColorScheme( brightness: brightness, primary: Color(scheme.primary), @@ -171,10 +172,15 @@ class _ThemeDataProvider extends StatelessWidget { onError: Color(scheme.onError), background: Color(scheme.background), onBackground: Color(scheme.onBackground), - surface: Color.alphaBlend(Color(scheme.primary).withOpacity(0.05), Color(scheme.background)), + surface: Color.alphaBlend( + Color(scheme.primary).withOpacity(0.05), + Color(scheme.background), + ), onSurface: Color(scheme.onSurface), - surfaceVariant: - Color.alphaBlend(Color(scheme.primary).withOpacity(0.5), Color(scheme.background)), + surfaceVariant: Color.alphaBlend( + Color(scheme.primary).withOpacity(0.5), + Color(scheme.background), + ), onSurfaceVariant: Color(scheme.onSurfaceVariant), ); }