Fix missing dynamic ColorScheme surface roles (#690)

* Fix missing dynamic ColorScheme surface roles

Update `CorePalette.toColorScheme` to start from `ColorScheme.fromSeed` and then override with dynamic palette values, ensuring all newer surface-related roles are populated correctly (including `surfaceVariant` and `surfaceTint`). Add regression tests for light and dark schemes, adjust the example widget test to assert the seeded primary color, and document the fix in the changelog with linked issues.

* x

* Document and test ColorScheme role preservation

Add explanatory comments clarifying why the conversion uses ColorScheme.fromSeed but overrides with legacy Scheme roles. Add test to verify that primary, onPrimary, primaryContainer, onPrimaryContainer, surface, surfaceVariant, and surfaceTint roles are correctly preserved from the Scheme API in both light and dark modes.

* x

* Update CHANGELOG.md

* Standardize dynamic_color changelog format

Reformat the changelog to follow a Keep a Changelog style by adding the top-level header and format note, normalizing section spacing throughout historical entries, and updating the 1.9.0 release date to 2025-08-07.

* Update pubspec.lock

Author: guidezpl

packages/dynamic_color/CHANGELOG.md

@@ -1,8 +1,22 @@
-## 1.9.0 - 2025-08-04
+# Changelog
+
+- Populate the missing `ColorScheme` surface roles so dynamic color schemes render correctly ([#574](https://github.com/material-foundation/flutter-packages/issues/574), [#582](https://github.com/material-foundation/flutter-packages/issues/582), [#649](https://github.com/material-foundation/flutter-packages/issues/649))
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## 1.9.0 - 2025-08-07
+
+### Fixed
+
+- Populate the missing `ColorScheme` surface roles so dynamic color schemes render correctly ([#574](https://github.com/material-foundation/flutter-packages/issues/574), [#582](https://github.com/material-foundation/flutter-packages/issues/582), [#649](https://github.com/material-foundation/flutter-packages/issues/649))
+
 ### Added
+
 - Add support for AGP 9
 
 ### Changed
+
 - Migrate to Kotlin DSL in Android
 - Update `compileSdk` to `flutter.compileSdkVersion`
 - Update `minSdk` to `24`
@@ -11,141 +25,200 @@
 - Update testing docs and examples to use `package:dynamic_color_testing/dynamic_color_testing.dart`
 
 ## 1.8.1 - 2025-08-01
+
 ### Fixed
+
 - Revert moving flutter_test to dev_dependencies
 
 ## 1.8.0 - 2025-08-01
+
 ### Changed
+
 - Update `material_color_utilities` upper constraint to `0.13.0`
 - Update other dependencies
 - Update `compileSdkVersion` to `34`
 - Fix lints
 - Add Swift Package Manager compatibility [\#633](https://github.com/material-foundation/flutter-packages/issues/633).
 
 ### Fixed
+
 - Move flutter_test to dev_dependencies
 
 ## 1.7.0 - 2024-03-01
+
 ### Changed
+
 - Update `material_color_utilities` to `0.8.0`
 
 ## 1.6.9 - 2023-12-16
+
 ### Changed
+
 - Use `DynamicColors.isDynamicColorAvailable` from `com.google.android.material:material` to verify if dynamic colors are available on Android
 
 ## 1.6.8 - 2023-10-17
+
 ### Changed
+
 - Broaden constraint for `material_color_utilities` to support it until its `1.0.0` release
 
 ## 1.6.7 - 2023-09-15
+
 ### Fixed
+
 - Upgraded dependencies
 
 ## 1.6.6 - 2023-07-04
+
 ### Changed
+
 - Improved documentation for content-based color schemes
 
 ## 1.6.5 - 2023-05-15
+
 ### Changed
+
 - Broaden constraint for `material_color_utilities` to support multiple Flutter SDK versions
 
 ## 1.6.4 - 2023-05-05
+
 ### Changed
+
 - Update constraint for `material_color_utilities` to `0.5.0`
 
 ## 1.6.3 - 2023-04-04
+
 ### Changed
+
 - Update constraint for `material_color_utilities` to `0.3.0`
 
 ## 1.6.2 - 2023-02-03
+
 ### Added
+
 - Added screenshots
 
 ## 1.6.1 - 2023-02-03
+
 ### Changed
+
 - Update pubspec `repository`
 
 ## 1.6.0 - 2023-01-31
+
 ### Added
+
 - Add support for `outlineVariant` and `scrim` colors
 
 ### Changed
+
 - Update constraint for `material_color_utilities` to `0.2.0`
 - Update Flutter constraint
 - Make return value of toColorScheme extension method non-nullable ([\#55](https://github.com/material-foundation/material-dynamic-color-flutter/pull/55))
 
 ## 1.5.4 - 2022-09-02
+
 ### Changed
+
 - Update constraint for Flutter SDK
 
 ## 1.5.3 - 2022-08-09
+
 ### Changed
+
 - Update constraint for `material_color_utilities`
 
 ## 1.5.2 - 2022-08-02
+
 ### Added
+
 - Add support for DWM/Windows Aero's color ([\#50](https://github.com/material-foundation/material-dynamic-color-flutter/pull/50))
 - Add support for GTK's accent color on Linux ([\#47](https://github.com/material-foundation/material-dynamic-color-flutter/pull/47))
 - Add example tests
 
 ### Changed
+
 - Expand and improve README
 - Rename `DynamicColorTestingUtils.setMockDynamicColors`'s argument `colorPalette` to `corePalette`
 - Improve `DynamicColorBuilder` short-circuiting logic if dynamic color is detected
 - Tweak debugging messages
 
 ## 1.4.0 - 2022-05-31
+
 ### Added
+
 - Add support for Windows' accent color ([\#43](https://github.com/material-foundation/material-dynamic-color-flutter/pull/43))
 
 ### Changed
+
 - Rename `DynamicColorPlugin.getControlAccentColor` to `DynamicColorPlugin.getAccentColor`
 - Rename `DynamicColorTestingUtils.setMockDynamicColors`'s argument `controlAccentColor` to `accentColor`
 
 ## 1.3.0 - 2022-05-25
+
 ### Added
+
 - Add support for macOS' control accent color ([\#42](https://github.com/material-foundation/material-dynamic-color-flutter/pull/42))
   - Rename `DynamicColorTestingUtils.setMockDynamicColors`'s argument `colors` to `colorPalette`
 
 ## 1.2.3 - 2022-05-23
+
 ### Changed
+
 - Tweak pubspec description
 
 ## 1.2.2 - 2022-04-25
+
 ### Changed
+
 - Update lower Flutter SDK bound
 
 ## 1.2.0 - 2022-03-24
+
 ### Changed
+
 - Improve examples: show how to create dynamic and fallback color schemes, and use harmonization for color schemes and custom colors
 
 ## 1.1.2 - 2022-02-15
+
 ### Changed
+
 - Move samples to their own library
 
 ## 1.1.1 - 2022-02-14
+
 ### Changed
+
 - Provide sample `CorePalette`s and corresponding `ColorScheme`s to test utils
 - Make the extension method which converts a `CorePalette` to a `ColorScheme` public
 
 ## 1.1.0 - 2022-02-08
+
 ### Changed
+
 - Qualify builder parameters (`light` => `lightDynamic`, `dark` => `darkDynamic`) for clarity
 
 ## 1.0.1 - 2022-02-02
+
 ### Changed
+
 - Polish README and examples
 
 ## 1.0.0 - 2022-02-02
+
 ### Added
+
 - Add missing semantic colors to harmonization from updated m3 color scheme
 
 ### Changed
+
 - `DynamicColorBuilder`'s `builder` now provides a light and dark `ColorScheme` rather than a `CorePalette`
   - Advanced users can still obtain the palette with `DynamicColorPlugin.getCorePalette()`
 
 ## 0.1.0 - 2021-10-29
+
 ### Added
+
 - Create `CorePalette` and `TonalPalette` classes
 - Create `DynamicColorPlugin` plugin
 - Create convenience `DynamicColorBuilder` widget

packages/dynamic_color/example/test/widget_test.dart

@@ -40,6 +40,9 @@ void main() {
     DynamicColorTestingUtils.setMockDynamicColors(
       accentColor: Colors.green,
     );
+    final expectedColor = ColorScheme.fromSeed(
+      seedColor: Colors.green,
+    ).primary;
 
     await tester.pumpWidget(
       DynamicColorBuilder(
@@ -52,7 +55,7 @@ void main() {
     await tester.pumpAndSettle();
 
     final container = tester.widget<Container>(find.byKey(key));
-    expect(container.color, const Color(0xff006e1c));
+    expect(container.color, expectedColor);
   });
 
   testWidgets('Verify fallback color is used', (WidgetTester tester) async {

packages/dynamic_color/lib/src/corepalette_to_colorscheme.dart

@@ -16,7 +16,20 @@ extension CorePaletteToColorScheme on CorePalette {
         scheme = Scheme.darkFromCorePalette(this);
         break;
     }
-    return ColorScheme(
+
+    // Start from seeded values to populate newer ColorScheme roles introduced
+    // after the legacy Scheme API was defined (for example, surfaceContainer*).
+    // We then override roles that must stay aligned with the OS-provided dynamic
+    // palette values from [scheme]. Returning fromSeed directly would drift these
+    // roles away from Android's dynamic color output.
+    // TODO(#363): Migrate this conversion to MCU DynamicScheme/CorePalettes so
+    // all roles can be resolved from one canonical dynamic-color path.
+    final colorScheme = ColorScheme.fromSeed(
+      seedColor: Color(scheme.primary),
+      brightness: brightness,
+    );
+
+    return colorScheme.copyWith(
       primary: Color(scheme.primary),
       onPrimary: Color(scheme.onPrimary),
       primaryContainer: Color(scheme.primaryContainer),
@@ -37,14 +50,14 @@ extension CorePaletteToColorScheme on CorePalette {
       outlineVariant: Color(scheme.outlineVariant),
       surface: Color(scheme.surface),
       onSurface: Color(scheme.onSurface),
-      surfaceContainerHighest: Color(scheme.surfaceVariant),
+      surfaceVariant: Color(scheme.surfaceVariant),
       onSurfaceVariant: Color(scheme.onSurfaceVariant),
       inverseSurface: Color(scheme.inverseSurface),
       onInverseSurface: Color(scheme.inverseOnSurface),
       inversePrimary: Color(scheme.inversePrimary),
       shadow: Color(scheme.shadow),
+      surfaceTint: Color(scheme.primary),
       scrim: Color(scheme.scrim),
-      brightness: brightness,
     );
   }
 }

packages/dynamic_color/pubspec.lock

@@ -175,10 +175,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd"
+      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.20"
+    version: "0.12.19"
   material_color_utilities:
     dependency: "direct main"
     description:
@@ -191,10 +191,10 @@ packages:
     dependency: "direct dev"
     description:
       name: meta
-      sha256: "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9"
+      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
       url: "https://pub.dev"
     source: hosted
-    version: "1.19.0"
+    version: "1.18.0"
   path:
     dependency: transitive
     description:
@@ -276,18 +276,18 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11"
+      sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.12"
+    version: "0.7.11"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      sha256: f36f9f3be64c6198714492bb455c11056e33e2f85d9a0b676a48301e44fdcf47
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.2.0"
   version_manipulation:
     dependency: transitive
     description:
@@ -313,5 +313,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.11.0-0 <4.0.0"
+  dart: ">=3.10.0-0 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"