From 7f883326c3c58def4654e30c2166abc25dac979f Mon Sep 17 00:00:00 2001 From: Kristen McWilliam <9575627+Merrit@users.noreply.github.com> Date: Thu, 7 Jul 2022 15:01:33 -0400 Subject: [PATCH] Use flex_color_scheme for themes --- lib/src/app.dart | 30 +++++++++++++++++-- linux/flutter/generated_plugin_registrant.cc | 4 --- linux/flutter/generated_plugins.cmake | 1 - pubspec.lock | 21 ++++++++----- pubspec.yaml | 4 ++- .../flutter/generated_plugin_registrant.cc | 3 -- windows/flutter/generated_plugins.cmake | 1 - 7 files changed, 45 insertions(+), 19 deletions(-) diff --git a/lib/src/app.dart b/lib/src/app.dart index 5d446d20..d3c36451 100644 --- a/lib/src/app.dart +++ b/lib/src/app.dart @@ -1,7 +1,9 @@ +import 'package:flex_color_scheme/flex_color_scheme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:google_fonts/google_fonts.dart'; import 'authentication/authentication.dart'; import 'authentication/login_page.dart'; @@ -35,8 +37,32 @@ class App extends StatelessWidget { ], onGenerateTitle: (BuildContext context) => AppLocalizations.of(context)!.appTitle, - theme: ThemeData(), - darkTheme: ThemeData.dark(), + theme: FlexThemeData.light( + scheme: FlexScheme.blue, + surfaceMode: FlexSurfaceMode.highScaffoldLowSurface, + blendLevel: 20, + appBarOpacity: 0.95, + subThemesData: const FlexSubThemesData( + blendOnLevel: 20, + blendOnColors: false, + ), + visualDensity: FlexColorScheme.comfortablePlatformDensity, + useMaterial3: true, + fontFamily: GoogleFonts.notoSans().fontFamily, + ), + darkTheme: FlexThemeData.dark( + scheme: FlexScheme.blue, + surfaceMode: FlexSurfaceMode.highSurfaceLowScaffold, + blendLevel: 40, + appBarStyle: FlexAppBarStyle.background, + appBarOpacity: 0.90, + subThemesData: const FlexSubThemesData( + blendOnLevel: 30, + ), + visualDensity: FlexColorScheme.comfortablePlatformDensity, + useMaterial3: true, + fontFamily: GoogleFonts.notoSans().fontFamily, + ), themeMode: ThemeMode.system, onGenerateRoute: (RouteSettings routeSettings) { return MaterialPageRoute( diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 25f9f58f..f6f23bfe 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -7,13 +7,9 @@ #include "generated_plugin_registrant.h" #include -#include void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); - g_autoptr(FlPluginRegistrar) window_to_front_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "WindowToFrontPlugin"); - window_to_front_plugin_register_with_registrar(window_to_front_registrar); } diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index e9e5df37..f16b4c34 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -4,7 +4,6 @@ list(APPEND FLUTTER_PLUGIN_LIST url_launcher_linux - window_to_front ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/pubspec.lock b/pubspec.lock index 13d372d4..cc0b0e21 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -148,6 +148,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.6.5" + flex_color_scheme: + dependency: "direct main" + description: + name: flex_color_scheme + url: "https://pub.dartlang.org" + source: hosted + version: "5.0.1" flutter: dependency: "direct main" description: flutter @@ -203,6 +210,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "9.2.0" + google_fonts: + dependency: "direct main" + description: + name: google_fonts + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" google_sign_in: dependency: "direct main" description: @@ -567,13 +581,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.7.0" - window_to_front: - dependency: "direct main" - description: - name: window_to_front - url: "https://pub.dartlang.org" - source: hosted - version: "0.0.3" xdg_directories: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 452c5d5b..e370e06a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,6 +14,7 @@ dependencies: equatable: ^2.0.3 extension_google_sign_in_as_googleapis_auth: ^2.0.5 firebase_auth: ^3.3.20 + flex_color_scheme: ^5.0.1 flutter: sdk: flutter flutter_bloc: ^8.0.1 @@ -21,6 +22,7 @@ dependencies: sdk: flutter flutter_signin_button: ^2.0.0 flutter_slidable: ^1.3.0 + google_fonts: ^3.0.1 google_sign_in: ^5.3.3 googleapis: ^9.1.0 googleapis_auth: ^1.3.1 @@ -33,7 +35,7 @@ dependencies: logging: ^1.0.2 path_provider: ^2.0.11 url_launcher: ^6.1.4 - window_to_front: ^0.0.3 + # window_to_front: ^0.0.3 dev_dependencies: flutter_test: diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 157b2eed..4f788487 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -7,11 +7,8 @@ #include "generated_plugin_registrant.h" #include -#include void RegisterPlugins(flutter::PluginRegistry* registry) { UrlLauncherWindowsRegisterWithRegistrar( registry->GetRegistrarForPlugin("UrlLauncherWindows")); - WindowToFrontPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("WindowToFrontPlugin")); } diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 70c6850b..88b22e5c 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -4,7 +4,6 @@ list(APPEND FLUTTER_PLUGIN_LIST url_launcher_windows - window_to_front ) list(APPEND FLUTTER_FFI_PLUGIN_LIST