diff --git a/lib/demos/reference/transformations_demo_edit_board_point.dart b/lib/demos/reference/transformations_demo_edit_board_point.dart index 1aa726459e..3011553be4 100644 --- a/lib/demos/reference/transformations_demo_edit_board_point.dart +++ b/lib/demos/reference/transformations_demo_edit_board_point.dart @@ -27,7 +27,7 @@ class EditBoardPoint extends StatelessWidget { final boardPointColors = { Colors.white, GalleryThemeData.darkColorScheme.primary, - GalleryThemeData.darkColorScheme.primaryVariant, + GalleryThemeData.darkColorScheme.primaryContainer, GalleryThemeData.darkColorScheme.secondary, backgroundColor, }; diff --git a/lib/pages/backdrop.dart b/lib/pages/backdrop.dart index dcc51cf32b..832da4ec77 100644 --- a/lib/pages/backdrop.dart +++ b/lib/pages/backdrop.dart @@ -205,7 +205,7 @@ class _BackdropState extends State with TickerProviderStateMixin { elevation: 7, clipBehavior: Clip.antiAlias, borderRadius: BorderRadius.circular(40), - color: Theme.of(context).colorScheme.secondaryVariant, + color: Theme.of(context).colorScheme.secondaryContainer, child: Container( constraints: const BoxConstraints( maxHeight: 560, @@ -278,7 +278,7 @@ class _SettingsIcon extends AnimatedWidget { color: isSettingsOpenNotifier.value & !animationController.isAnimating ? Colors.transparent - : Theme.of(context).colorScheme.secondaryVariant, + : Theme.of(context).colorScheme.secondaryContainer, clipBehavior: Clip.antiAlias, child: InkWell( onTap: () { diff --git a/lib/pages/home.dart b/lib/pages/home.dart index b1a9148f6c..196c04c42f 100644 --- a/lib/pages/home.dart +++ b/lib/pages/home.dart @@ -266,7 +266,7 @@ class _GalleryHeader extends StatelessWidget { @override Widget build(BuildContext context) { return Header( - color: Theme.of(context).colorScheme.primaryVariant, + color: Theme.of(context).colorScheme.primaryContainer, text: GalleryLocalizations.of(context).homeHeaderGallery, ); } diff --git a/lib/pages/settings.dart b/lib/pages/settings.dart index 06cc5b7983..384cd0e4fd 100644 --- a/lib/pages/settings.dart +++ b/lib/pages/settings.dart @@ -253,7 +253,7 @@ class _SettingsPageState extends State { ]; return Material( - color: colorScheme.secondaryVariant, + color: colorScheme.secondaryContainer, child: Padding( padding: isDesktop ? EdgeInsets.zero diff --git a/lib/studies/rally/app.dart b/lib/studies/rally/app.dart index 82743413e9..86d965e9fd 100644 --- a/lib/studies/rally/app.dart +++ b/lib/studies/rally/app.dart @@ -60,6 +60,7 @@ class RallyApp extends StatelessWidget { return ThemeData( appBarTheme: const AppBarTheme( systemOverlayStyle: SystemUiOverlayStyle.light, + backgroundColor: RallyColors.primaryBackground, elevation: 0, ), scaffoldBackgroundColor: RallyColors.primaryBackground, diff --git a/lib/studies/reply/app.dart b/lib/studies/reply/app.dart index 87930083ac..d70acc628d 100644 --- a/lib/studies/reply/app.dart +++ b/lib/studies/reply/app.dart @@ -174,9 +174,9 @@ ThemeData _buildReplyLightTheme(BuildContext context) { ), colorScheme: const ColorScheme.light( primary: ReplyColors.blue700, - primaryVariant: ReplyColors.blue800, + primaryContainer: ReplyColors.blue800, secondary: ReplyColors.orange500, - secondaryVariant: ReplyColors.orange400, + secondaryContainer: ReplyColors.orange400, surface: ReplyColors.white50, error: ReplyColors.red400, onPrimary: ReplyColors.white50, @@ -221,9 +221,9 @@ ThemeData _buildReplyDarkTheme(BuildContext context) { ), colorScheme: const ColorScheme.dark( primary: ReplyColors.blue200, - primaryVariant: ReplyColors.blue300, + primaryContainer: ReplyColors.blue300, secondary: ReplyColors.orange300, - secondaryVariant: ReplyColors.orange300, + secondaryContainer: ReplyColors.orange300, surface: ReplyColors.black800, error: ReplyColors.red200, onPrimary: ReplyColors.black900, diff --git a/lib/studies/shrine/theme.dart b/lib/studies/shrine/theme.dart index 6538e00153..8e33bb9176 100644 --- a/lib/studies/shrine/theme.dart +++ b/lib/studies/shrine/theme.dart @@ -91,9 +91,9 @@ TextTheme _buildShrineTextTheme(TextTheme base) { const ColorScheme _shrineColorScheme = ColorScheme( primary: shrinePink100, - primaryVariant: shrineBrown900, + primaryContainer: shrineBrown900, secondary: shrinePink50, - secondaryVariant: shrineBrown900, + secondaryContainer: shrineBrown900, surface: shrineSurfaceWhite, background: shrineBackgroundWhite, error: shrineErrorRed, diff --git a/lib/studies/starter/app.dart b/lib/studies/starter/app.dart index 2ba0a87f9b..65eb2527d5 100644 --- a/lib/studies/starter/app.dart +++ b/lib/studies/starter/app.dart @@ -33,9 +33,9 @@ class StarterApp extends StatelessWidget { highlightColor: Colors.transparent, colorScheme: const ColorScheme( primary: _primaryColor, - primaryVariant: Color(0xFF3700B3), + primaryContainer: Color(0xFF3700B3), secondary: Color(0xFF03DAC6), - secondaryVariant: Color(0xFF018786), + secondaryContainer: Color(0xFF018786), background: Colors.white, surface: Colors.white, onBackground: Colors.black, diff --git a/lib/themes/gallery_theme_data.dart b/lib/themes/gallery_theme_data.dart index 5ad3637b82..6459864fb6 100644 --- a/lib/themes/gallery_theme_data.dart +++ b/lib/themes/gallery_theme_data.dart @@ -45,9 +45,9 @@ class GalleryThemeData { static const ColorScheme lightColorScheme = ColorScheme( primary: Color(0xFFB93C5D), - primaryVariant: Color(0xFF117378), + primaryContainer: Color(0xFF117378), secondary: Color(0xFFEFF3F3), - secondaryVariant: Color(0xFFFAFBFB), + secondaryContainer: Color(0xFFFAFBFB), background: Color(0xFFE6EBEB), surface: Color(0xFFFAFBFB), onBackground: Colors.white, @@ -61,9 +61,9 @@ class GalleryThemeData { static const ColorScheme darkColorScheme = ColorScheme( primary: Color(0xFFFF8383), - primaryVariant: Color(0xFF1CDEC9), + primaryContainer: Color(0xFF1CDEC9), secondary: Color(0xFF4D1F7C), - secondaryVariant: Color(0xFF451B6F), + secondaryContainer: Color(0xFF451B6F), background: Color(0xFF241E30), surface: Color(0xFF1F1929), onBackground: Color(0x0DFFFFFF), // White with 0.05 opacity diff --git a/lib/themes/material_demo_theme_data.dart b/lib/themes/material_demo_theme_data.dart index ce5bd09552..9df9528cc7 100644 --- a/lib/themes/material_demo_theme_data.dart +++ b/lib/themes/material_demo_theme_data.dart @@ -32,9 +32,9 @@ class MaterialDemoThemeData { static const _colorScheme = ColorScheme( primary: Color(0xFF6200EE), - primaryVariant: Color(0xFF6200EE), + primaryContainer: Color(0xFF6200EE), secondary: Color(0xFFFF5722), - secondaryVariant: Color(0xFFFF5722), + secondaryContainer: Color(0xFFFF5722), background: Colors.white, surface: Color(0xFFF2F2F2), onBackground: Colors.black, diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 8686a6d4f4..2467eb444a 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -31,4 +31,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c -COCOAPODS: 1.10.1 +COCOAPODS: 1.11.2 diff --git a/pubspec.lock b/pubspec.lock index 975c793bcd..0c8b33d8d4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "24.0.0" + version: "31.0.0" adaptive_breakpoints: dependency: "direct main" description: @@ -21,7 +21,7 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.8.0" animations: dependency: "direct main" description: @@ -290,6 +290,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.2" meta: dependency: "direct main" description: @@ -574,21 +581,21 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.17.11" + version: "1.19.5" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.8" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.4.1" + version: "0.4.9" typed_data: dependency: transitive description: