Merge pull request #831 from nextcloud/chore/noid/materialColorRepoSyncNov

Automated Code Change sync 19/11/2025

Author: AndyScherzinger

material-color-utilities/src/main/java/blend/Blend.java

@@ -76,15 +76,9 @@ public static int hctHue(int from, int to, double amount) {
   public static int cam16Ucs(int from, int to, double amount) {
     Cam16 fromCam = Cam16.fromInt(from);
     Cam16 toCam = Cam16.fromInt(to);
-    double fromJ = fromCam.getJstar();
-    double fromA = fromCam.getAstar();
-    double fromB = fromCam.getBstar();
-    double toJ = toCam.getJstar();
-    double toA = toCam.getAstar();
-    double toB = toCam.getBstar();
-    double jstar = fromJ + (toJ - fromJ) * amount;
-    double astar = fromA + (toA - fromA) * amount;
-    double bstar = fromB + (toB - fromB) * amount;
+    double jstar = MathUtils.lerp(fromCam.getJstar(), toCam.getJstar(), amount);
+    double astar = MathUtils.lerp(fromCam.getAstar(), toCam.getAstar(), amount);
+    double bstar = MathUtils.lerp(fromCam.getBstar(), toCam.getBstar(), amount);
     return Cam16.fromUcs(jstar, astar, bstar).toInt();
   }
 }

material-color-utilities/src/main/java/dynamiccolor/ColorSpec2025.java

@@ -428,7 +428,8 @@ public DynamicColor onSurface() {
                     return surfaceContainerHigh();
                   }
                 })
-            .setContrastCurve((s) -> s.isDark ? getContrastCurve(11) : getContrastCurve(9))
+            .setContrastCurve(
+                (s) -> s.isDark && s.platform == PHONE ? getContrastCurve(11) : getContrastCurve(9))
             .build();
     return super.onSurface().toBuilder()
         .extendSpecVersion(SpecVersion.SPEC_2025, color2025)
@@ -625,15 +626,23 @@ public DynamicColor primary() {
                       return tMaxC(s.primaryPalette, 0, 90);
                     }
                   } else if (s.variant == EXPRESSIVE) {
-                    return tMaxC(
-                        s.primaryPalette,
-                        0,
-                        Hct.isYellow(s.primaryPalette.getHue())
-                            ? 25
-                            : Hct.isCyan(s.primaryPalette.getHue()) ? 88 : 98);
+                    if (s.platform == PHONE) {
+                      return tMaxC(
+                          s.primaryPalette,
+                          0,
+                          Hct.isYellow(s.primaryPalette.getHue())
+                              ? 25
+                              : Hct.isCyan(s.primaryPalette.getHue()) ? 88 : 98);
+                    } else { // WATCH
+                      return tMaxC(s.primaryPalette);
+                    }
                   } else { // VIBRANT
-                    return tMaxC(
-                        s.primaryPalette, 0, Hct.isCyan(s.primaryPalette.getHue()) ? 88 : 98);
+                    if (s.platform == PHONE) {
+                      return tMaxC(
+                          s.primaryPalette, 0, Hct.isCyan(s.primaryPalette.getHue()) ? 88 : 98);
+                    } else { // WATCH
+                      return tMaxC(s.primaryPalette);
+                    }
                   }
                 })
             .setIsBackground(true)
@@ -1529,7 +1538,7 @@ private static double tMinC(TonalPalette palette, double lowerBound, double uppe
 
   private static ContrastCurve getContrastCurve(double defaultContrast) {
     if (defaultContrast == 1.5) {
-      return new ContrastCurve(1.5, 1.5, 3, 4.5);
+      return new ContrastCurve(1.5, 1.5, 3, 5.5);
     } else if (defaultContrast == 3) {
       return new ContrastCurve(3, 3, 4.5, 7);
     } else if (defaultContrast == 4.5) {

material-color-utilities/src/main/java/dynamiccolor/DynamicColor.java

@@ -46,12 +46,6 @@
  * flexibility, any desired behavior of a color for any design system, but it usually unnecessary.
  * See the default constructor for more information.
  */
-// Prevent lint for Function.apply not being available on Android before API level 14 (4.0.1).
-// "AndroidJdkLibsChecker" for Function, "NewApi" for Function.apply().
-// A java_library Bazel rule with an Android constraint cannot skip these warnings without this
-// annotation; another solution would be to create an android_library rule and supply
-// AndroidManifest with an SDK set higher than 14.
-@SuppressWarnings("NewApi")
 public final class DynamicColor {
   public final String name;
   public final Function<DynamicScheme, TonalPalette> palette;

material-color-utilities/src/main/java/dynamiccolor/DynamicScheme.java

@@ -141,7 +141,7 @@ public DynamicScheme(
     this.isDark = isDark;
     this.contrastLevel = contrastLevel;
     this.platform = platform;
-    this.specVersion = specVersion;
+    this.specVersion = maybeFallbackSpecVersion(specVersion, variant);
 
     this.primaryPalette = primaryPalette;
     this.secondaryPalette = secondaryPalette;
@@ -171,6 +171,17 @@ public static DynamicScheme from(DynamicScheme other, boolean isDark, double con
         Optional.of(other.errorPalette));
   }
 
+  /**
+   * Returns the spec version to use for the given variant. If the variant is not supported by the
+   * given spec version, the fallback spec version is returned.
+   */
+  private static SpecVersion maybeFallbackSpecVersion(SpecVersion specVersion, Variant variant) {
+    return switch (variant) {
+      case EXPRESSIVE, VIBRANT, TONAL_SPOT, NEUTRAL -> specVersion;
+      default -> SpecVersion.SPEC_2021;
+    };
+  }
+
   /**
    * Returns a new hue based on a piecewise function and input color hue.
    *

material-color-utilities/src/main/java/dynamiccolor/MaterialDynamicColors.java

@@ -23,12 +23,6 @@
 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).
-// "AndroidJdkLibsChecker" for Function, "NewApi" for Function.apply().
-// A java_library Bazel rule with an Android constraint cannot skip these warnings without this
-// annotation; another solution would be to create an android_library rule and supply
-// AndroidManifest with an SDK set higher than 14.
-@SuppressWarnings("NewApi")
 public final class MaterialDynamicColors {
 
   private static final ColorSpec colorSpec = new ColorSpec2025();

material-color-utilities/src/main/java/hct/Cam16.java

@@ -19,6 +19,7 @@
 import static java.lang.Math.max;
 
 import utils.ColorUtils;
+import utils.MathUtils;
 
 /**
  * CAM16, a color appearance model. Colors are not just defined by their hex code, but rather, a hex
@@ -246,10 +247,7 @@ static Cam16 fromXyzInViewingConditions(
     // hue
     double atan2 = Math.atan2(b, a);
     double atanDegrees = Math.toDegrees(atan2);
-    double hue =
-        atanDegrees < 0
-            ? atanDegrees + 360.0
-            : atanDegrees >= 360 ? atanDegrees - 360.0 : atanDegrees;
+    double hue = MathUtils.sanitizeDegreesDouble(atanDegrees);
     double hueRadians = Math.toRadians(hue);
 
     // achromatic response to color

material-color-utilities/src/main/java/temperature/TemperatureCache.java

@@ -276,12 +276,6 @@ private List<Hct> getHctsByHue() {
    *
    * <p>Sorted from coldest first to warmest last.
    */
-  // Prevent lint for Comparator not being available on Android before API level 24, 7.0, 2016.
-  // "AndroidJdkLibsChecker" for one linter, "NewApi" for another.
-  // A java_library Bazel rule with an Android constraint cannot skip these warnings without this
-  // annotation; another solution would be to create an android_library rule and supply
-  // AndroidManifest with an SDK set higher than 23.
-  @SuppressWarnings("NewApi")
   private List<Hct> getHctsByTemp() {
     if (precomputedHctsByTemp != null) {
       return precomputedHctsByTemp;