Update API that returns all dynamic color tokens in Java to use Suppl…

…ier instead of Function. PiperOrigin-RevId: 706666102
material-foundation · Dec 16, 2024 · 9889de1 · 9889de1
1 parent dbdf4c4
commit 9889de1
Showing 1 changed file with 65 additions and 65 deletions.
diff --git a/java/dynamiccolor/MaterialDynamicColors.java b/java/dynamiccolor/MaterialDynamicColors.java
@@ -17,11 +17,11 @@
 package dynamiccolor;
 
 import androidx.annotation.NonNull;
-import com.google.common.base.Function;
 import dislike.DislikeAnalyzer;
 import hct.Hct;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Supplier;
 
 /** Named colors, otherwise known as tokens, or roles, in the Material Design system. */
 // Prevent lint for Function.apply not being available on Android before API level 14 (4.0.1).
@@ -936,71 +936,71 @@ public DynamicColor textHintInverse() {
         "text_hint_inverse", (s) -> s.neutralPalette, (s) -> s.isDark ? 10.0 : 90.0);
   }
 
-  @NonNull
-  public static List<Function<MaterialDynamicColors, DynamicColor>> allDynamicColors() {
+  /** All dynamic colors in Material Design system. */
+  public final List<Supplier<DynamicColor>> allDynamicColors() {
     return Arrays.asList(
-        MaterialDynamicColors::primaryPaletteKeyColor,
-        MaterialDynamicColors::secondaryPaletteKeyColor,
-        MaterialDynamicColors::tertiaryPaletteKeyColor,
-        MaterialDynamicColors::neutralPaletteKeyColor,
-        MaterialDynamicColors::neutralVariantPaletteKeyColor,
-        MaterialDynamicColors::background,
-        MaterialDynamicColors::onBackground,
-        MaterialDynamicColors::surface,
-        MaterialDynamicColors::surfaceDim,
-        MaterialDynamicColors::surfaceBright,
-        MaterialDynamicColors::surfaceContainerLowest,
-        MaterialDynamicColors::surfaceContainerLow,
-        MaterialDynamicColors::surfaceContainer,
-        MaterialDynamicColors::surfaceContainerHigh,
-        MaterialDynamicColors::surfaceContainerHighest,
-        MaterialDynamicColors::onSurface,
-        MaterialDynamicColors::surfaceVariant,
-        MaterialDynamicColors::onSurfaceVariant,
-        MaterialDynamicColors::inverseSurface,
-        MaterialDynamicColors::inverseOnSurface,
-        MaterialDynamicColors::outline,
-        MaterialDynamicColors::outlineVariant,
-        MaterialDynamicColors::shadow,
-        MaterialDynamicColors::scrim,
-        MaterialDynamicColors::surfaceTint,
-        MaterialDynamicColors::primary,
-        MaterialDynamicColors::onPrimary,
-        MaterialDynamicColors::primaryContainer,
-        MaterialDynamicColors::onPrimaryContainer,
-        MaterialDynamicColors::inversePrimary,
-        MaterialDynamicColors::secondary,
-        MaterialDynamicColors::onSecondary,
-        MaterialDynamicColors::secondaryContainer,
-        MaterialDynamicColors::onSecondaryContainer,
-        MaterialDynamicColors::tertiary,
-        MaterialDynamicColors::onTertiary,
-        MaterialDynamicColors::tertiaryContainer,
-        MaterialDynamicColors::onTertiaryContainer,
-        MaterialDynamicColors::error,
-        MaterialDynamicColors::onError,
-        MaterialDynamicColors::errorContainer,
-        MaterialDynamicColors::onErrorContainer,
-        MaterialDynamicColors::primaryFixed,
-        MaterialDynamicColors::primaryFixedDim,
-        MaterialDynamicColors::onPrimaryFixed,
-        MaterialDynamicColors::onPrimaryFixedVariant,
-        MaterialDynamicColors::secondaryFixed,
-        MaterialDynamicColors::secondaryFixedDim,
-        MaterialDynamicColors::onSecondaryFixed,
-        MaterialDynamicColors::onSecondaryFixedVariant,
-        MaterialDynamicColors::tertiaryFixed,
-        MaterialDynamicColors::tertiaryFixedDim,
-        MaterialDynamicColors::onTertiaryFixed,
-        MaterialDynamicColors::onTertiaryFixedVariant,
-        MaterialDynamicColors::controlActivated,
-        MaterialDynamicColors::controlNormal,
-        MaterialDynamicColors::controlHighlight,
-        MaterialDynamicColors::textPrimaryInverse,
-        MaterialDynamicColors::textSecondaryAndTertiaryInverse,
-        MaterialDynamicColors::textPrimaryInverseDisableOnly,
-        MaterialDynamicColors::textSecondaryAndTertiaryInverseDisabled,
-        MaterialDynamicColors::textHintInverse);
+        this::primaryPaletteKeyColor,
+        this::secondaryPaletteKeyColor,
+        this::tertiaryPaletteKeyColor,
+        this::neutralPaletteKeyColor,
+        this::neutralVariantPaletteKeyColor,
+        this::background,
+        this::onBackground,
+        this::surface,
+        this::surfaceDim,
+        this::surfaceBright,
+        this::surfaceContainerLowest,
+        this::surfaceContainerLow,
+        this::surfaceContainer,
+        this::surfaceContainerHigh,
+        this::surfaceContainerHighest,
+        this::onSurface,
+        this::surfaceVariant,
+        this::onSurfaceVariant,
+        this::inverseSurface,
+        this::inverseOnSurface,
+        this::outline,
+        this::outlineVariant,
+        this::shadow,
+        this::scrim,
+        this::surfaceTint,
+        this::primary,
+        this::onPrimary,
+        this::primaryContainer,
+        this::onPrimaryContainer,
+        this::inversePrimary,
+        this::secondary,
+        this::onSecondary,
+        this::secondaryContainer,
+        this::onSecondaryContainer,
+        this::tertiary,
+        this::onTertiary,
+        this::tertiaryContainer,
+        this::onTertiaryContainer,
+        this::error,
+        this::onError,
+        this::errorContainer,
+        this::onErrorContainer,
+        this::primaryFixed,
+        this::primaryFixedDim,
+        this::onPrimaryFixed,
+        this::onPrimaryFixedVariant,
+        this::secondaryFixed,
+        this::secondaryFixedDim,
+        this::onSecondaryFixed,
+        this::onSecondaryFixedVariant,
+        this::tertiaryFixed,
+        this::tertiaryFixedDim,
+        this::onTertiaryFixed,
+        this::onTertiaryFixedVariant,
+        this::controlActivated,
+        this::controlNormal,
+        this::controlHighlight,
+        this::textPrimaryInverse,
+        this::textSecondaryAndTertiaryInverse,
+        this::textPrimaryInverseDisableOnly,
+        this::textSecondaryAndTertiaryInverseDisabled,
+        this::textHintInverse);
   }
 
   private boolean isFidelity(DynamicScheme scheme) {