From 64361d168078cf97b6263788fce93b32562db705 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 2 Oct 2025 13:49:39 +0200 Subject: [PATCH 1/3] chore: Update constructor to latest material signature Signed-off-by: Andy Scherzinger --- .../common/ui/util/extensions/SchemeExtensions.kt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/SchemeExtensions.kt b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/SchemeExtensions.kt index ce689b57..5dd57071 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/SchemeExtensions.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/SchemeExtensions.kt @@ -50,5 +50,17 @@ fun DynamicScheme.toColorScheme(): ColorScheme = surfaceContainerHigh = Color(MaterialDynamicColors().surfaceContainerHigh().getArgb(this)), surfaceContainerHighest = Color(MaterialDynamicColors().surfaceContainerHighest().getArgb(this)), surfaceContainerLow = Color(MaterialDynamicColors().surfaceContainerLow().getArgb(this)), - surfaceContainerLowest = Color(MaterialDynamicColors().surfaceContainerLowest().getArgb(this)) + surfaceContainerLowest = Color(MaterialDynamicColors().surfaceContainerLowest().getArgb(this)), + primaryFixed = Color(MaterialDynamicColors().primaryFixed().getArgb(this)), + primaryFixedDim = Color(MaterialDynamicColors().primaryFixedDim().getArgb(this)), + onPrimaryFixed = Color(MaterialDynamicColors().onPrimaryFixed().getArgb(this)), + onPrimaryFixedVariant = Color(MaterialDynamicColors().onPrimaryFixedVariant().getArgb(this)), + secondaryFixed = Color(MaterialDynamicColors().secondaryFixed().getArgb(this)), + secondaryFixedDim = Color(MaterialDynamicColors().secondaryFixedDim().getArgb(this)), + onSecondaryFixed = Color(MaterialDynamicColors().onSecondaryFixed().getArgb(this)), + onSecondaryFixedVariant = Color(MaterialDynamicColors().onSecondaryFixedVariant().getArgb(this)), + tertiaryFixed = Color(MaterialDynamicColors().tertiaryFixed().getArgb(this)), + tertiaryFixedDim = Color(MaterialDynamicColors().tertiaryFixedDim().getArgb(this)), + onTertiaryFixed = Color(MaterialDynamicColors().onTertiaryFixed().getArgb(this)), + onTertiaryFixedVariant = Color(MaterialDynamicColors().onTertiaryFixedVariant().getArgb(this)) ) From 065c13c75a8aa1276d7f44eabef0060d0a9cdba6 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 2 Oct 2025 13:50:16 +0200 Subject: [PATCH 2/3] ci(chksm): Update meta data Signed-off-by: Andy Scherzinger --- gradle/verification-keyring.keys | 31 ++ gradle/verification-metadata.xml | 544 ++++++++++++++++++++++++++++++- 2 files changed, 570 insertions(+), 5 deletions(-) diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys index 493f9bdf..819b8ab1 100644 --- a/gradle/verification-keyring.keys +++ b/gradle/verification-keyring.keys @@ -3752,6 +3752,37 @@ cDvA =Sagc -----END PGP PUBLIC KEY BLOCK----- +pub 5ED22F661BBF0ACC +uid Igor Sereda + +sub 31ADCD8BFCB760B4 +-----BEGIN PGP PUBLIC KEY BLOCK----- + +xsDiBExyNhsRBAC/W5cMapoP7NUn8S22iWG5bPw0bconApJHP4kQdT17gT2JgNJz +BmuGWV59ZOGQkc6woeFKc1s6twlsgIL51jMeVOtgLJRGTS4So2hthNqDcgO4j8Lm +yXpqbTkbD7/ZlRzL2hhedrMz4NQOZCvsZpQ1RaCDrr2hxDq/HhD2omGdlwCg/9Mt +JNc7897LgfCMmtPOvAFt+rsD/0K87nvW37nlRqHdEtzvwUlyLJmYxdW9hDr8tm4Q +Y/8rDvNFlhKV/yXmxQuhtgQ1qpBo75dwD86aJmzIMIWM0iei9Ecfu2DsWiWvArq1 +heDjMYSeQl6k37cmD59afo6e/jQmg2/ALC6mRf3912SfmqV5spw0k+NYdFxAnbot +9jOfA/41shIdZloZ0aDcJDTNe22wFFh2sW8RwWtJJO8rmOCgh3MmkPn7LHPI9idJ +bSdD1dRcR7UTyeigEeDTu0PAKfKZutc91lfcIGSZdk39SEEhUkL2JdPKVRBotiZZ +Jsi+NxDdsprF/yQtr00XSGJYzh2TW/Srnb5nZQm2Iyokod3M1rQeSWdvciBTZXJl +ZGEgPHNlcmVkYUBnbWFpbC5jb20+zsFNBExyNhsQCACTTDNmrbllfvcMiXHDfS7x +CbLQczZxWZF7jk+PznsWVJCw7zZg084zFKQAIKYcABPekAK4wJ/lnQc7mItsevF6 +AU8ZYuQ0TcInnKBrXMiIWDM1z2o2pa09AhIkhCMAGK3hKx4xjyL7e3oDz02NZz8A +4rUGWgd2MCa29Pnihi2oVgIyU0y0ItpHqKhJQffyotWNe0W+ZNjg6qiQ1rPolfHN +PKbKjyAl9/0lGlybZLZeSyvR0s1iblDAkQ3spfgTyIfxHPxNbF8CGt/TOfjkPtuA +c6TckU8RfMoZXWX3pNvmH/LL3C43gl4/JcMZ+KC5v7WCtXkMEpDeyuQTDLqLABjD +AAMFB/4tehSPbgS+Fx744n1kJo8SmmZXrEn4tpT/0PWHAyRDoJdzQgfeh40YBts4 +eFczYbKZF+DyebNsgdW55M/whJ47sNz6AyvuXuXmQHVbsiy0yVLXEjdV2D0Pwdo8 +lrmAHeoQasg90M/UpFHAl+XD4OZBcHmM6Pi9bXEQKpfRsZj1c0UVpIyGSvldFVPf +GBDx3TC4IH2i25RkL2nGbAWIfbD8W8rMxMoxHArghE6fkU+FI7ZUEcGeW8X+ZJsQ +PbaOMHsOeBQLisXR8TUysDoMMkgAquwOWTRUjvH+0g5huQQ7LKkOAF/gkuvGCsjq +OfeIJF2aLnWFLt21dfdkiSYNUms5wkkEGBECAAkFAkxyNhsCGwwACgkQXtIvZhu/ +CsymUgCg/kZJOCScWbc41n9bn2Ir6X5claEAn0Gu7stpIpkazuPCpeoY2tnRnPE3 +=FQVe +-----END PGP PUBLIC KEY BLOCK----- + pub 5F69AD087600B22C uid Eric Bruneton diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index a459a7c3..0b710b96 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -44,11 +44,6 @@ - - - - - @@ -593,6 +588,11 @@ + + + + + @@ -880,6 +880,14 @@ + + + + + + + + @@ -928,6 +936,14 @@ + + + + + + + + @@ -976,6 +992,14 @@ + + + + + + + + @@ -1024,6 +1048,14 @@ + + + + + + + + @@ -1080,6 +1112,14 @@ + + + + + + + + @@ -1136,6 +1176,14 @@ + + + + + + + + @@ -1192,6 +1240,14 @@ + + + + + + + + @@ -1248,6 +1304,14 @@ + + + + + + + + @@ -1352,6 +1416,14 @@ + + + + + + + + @@ -1408,6 +1480,14 @@ + + + + + + + + @@ -1424,6 +1504,14 @@ + + + + + + + + @@ -1440,6 +1528,14 @@ + + + + + + + + @@ -1496,6 +1592,14 @@ + + + + + + + + @@ -1552,6 +1656,14 @@ + + + + + + + + @@ -1560,6 +1672,14 @@ + + + + + + + + @@ -1568,6 +1688,14 @@ + + + + + + + + @@ -1624,6 +1752,14 @@ + + + + + + + + @@ -1680,6 +1816,14 @@ + + + + + + + + @@ -1736,6 +1880,14 @@ + + + + + + + + @@ -1792,6 +1944,14 @@ + + + + + + + + @@ -1848,6 +2008,14 @@ + + + + + + + + @@ -1904,6 +2072,14 @@ + + + + + + + + @@ -1960,6 +2136,14 @@ + + + + + + + + @@ -2016,6 +2200,14 @@ + + + + + + + + @@ -2072,6 +2264,14 @@ + + + + + + + + @@ -2128,6 +2328,14 @@ + + + + + + + + @@ -2184,6 +2392,14 @@ + + + + + + + + @@ -2240,6 +2456,14 @@ + + + + + + + + @@ -2296,6 +2520,14 @@ + + + + + + + + @@ -2352,6 +2584,14 @@ + + + + + + + + @@ -3145,6 +3385,14 @@ + + + + + + + + @@ -3338,6 +3586,9 @@ + + + @@ -3410,6 +3661,14 @@ + + + + + + + + @@ -3471,6 +3730,14 @@ + + + + + + + + @@ -3635,6 +3902,14 @@ + + + + + + + + @@ -3709,6 +3984,14 @@ + + + + + + + + @@ -3796,6 +4079,14 @@ + + + + + + + + @@ -3913,6 +4204,17 @@ + + + + + + + + + + + @@ -4017,6 +4319,14 @@ + + + + + + + + @@ -4083,6 +4393,14 @@ + + + + + + + + @@ -4237,6 +4555,14 @@ + + + + + + + + @@ -4253,6 +4579,14 @@ + + + + + + + + @@ -4266,6 +4600,14 @@ + + + + + + + + @@ -4282,6 +4624,14 @@ + + + + + + + + @@ -4311,6 +4661,14 @@ + + + + + + + + @@ -5501,6 +5859,14 @@ + + + + + + + + @@ -7861,6 +8227,14 @@ + + + + + + + + @@ -7933,6 +8307,14 @@ + + + + + + + + @@ -8005,6 +8387,14 @@ + + + + + + + + @@ -8181,6 +8571,14 @@ + + + + + + + + @@ -8253,6 +8651,14 @@ + + + + + + + + @@ -8325,6 +8731,14 @@ + + + + + + + + @@ -8397,6 +8811,14 @@ + + + + + + + + @@ -11302,6 +11724,14 @@ + + + + + + + + @@ -11334,6 +11764,14 @@ + + + + + + + + @@ -11366,6 +11804,14 @@ + + + + + + + + @@ -12961,6 +13407,14 @@ + + + + + + + + @@ -12969,6 +13423,14 @@ + + + + + + + + @@ -12977,6 +13439,14 @@ + + + + + + + + @@ -12985,6 +13455,14 @@ + + + + + + + + @@ -12993,6 +13471,14 @@ + + + + + + + + @@ -13001,6 +13487,14 @@ + + + + + + + + @@ -13009,6 +13503,14 @@ + + + + + + + + @@ -13017,6 +13519,14 @@ + + + + + + + + @@ -13025,6 +13535,14 @@ + + + + + + + + @@ -13033,6 +13551,14 @@ + + + + + + + + @@ -16590,6 +17116,14 @@ + + + + + + + + From cecb096cd98aa07314b640413d4a974aa112de3f Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 2 Oct 2025 13:53:59 +0200 Subject: [PATCH 3/3] chore: Update to latest lib changes Signed-off-by: Andy Scherzinger --- .../main/java/dynamiccolor/ColorSpec2025.java | 35 +++++++++++-------- .../src/main/java/quantize/QuantizerWu.java | 12 +++---- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/material-color-utilities/src/main/java/dynamiccolor/ColorSpec2025.java b/material-color-utilities/src/main/java/dynamiccolor/ColorSpec2025.java index c3781572..1ba3cece 100644 --- a/material-color-utilities/src/main/java/dynamiccolor/ColorSpec2025.java +++ b/material-color-utilities/src/main/java/dynamiccolor/ColorSpec2025.java @@ -61,9 +61,13 @@ public DynamicColor background() { @Override public DynamicColor onBackground() { // Remapped to onSurface for 2025 spec. - DynamicColor color2025 = onSurface().toBuilder().setName("on_background").build(); + DynamicColor.Builder color2025Builder = onSurface().toBuilder().setName("on_background"); + color2025Builder.setTone( + (s) -> { + return s.platform == WATCH ? 100.0 : onSurface().getTone(s); + }); return super.onBackground().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) + .extendSpecVersion(SpecVersion.SPEC_2025, color2025Builder.build()) .build(); } @@ -1595,10 +1599,8 @@ public double getTone(DynamicScheme scheme, DynamicColor color) { double relativeDelta = absoluteDelta * (amRoleA ? 1 : -1); switch (constraint) { - case EXACT: - selfTone = MathUtils.clampDouble(0, 100, referenceTone + relativeDelta); - break; - case NEARER: + case EXACT -> selfTone = MathUtils.clampDouble(0, 100, referenceTone + relativeDelta); + case NEARER -> { if (relativeDelta > 0) { selfTone = MathUtils.clampDouble( @@ -1612,14 +1614,14 @@ public double getTone(DynamicScheme scheme, DynamicColor color) { 100, MathUtils.clampDouble(referenceTone + relativeDelta, referenceTone, selfTone)); } - break; - case FARTHER: + } + case FARTHER -> { if (relativeDelta > 0) { selfTone = MathUtils.clampDouble(referenceTone + relativeDelta, 100, selfTone); } else { selfTone = MathUtils.clampDouble(0, referenceTone + relativeDelta, selfTone); } - break; + } } if (color.background != null && color.contrastCurve != null) { @@ -1864,13 +1866,15 @@ public TonalPalette getNeutralVariantPalette( Platform platform, double contrastLevel) { switch (variant) { - case NEUTRAL: + case NEUTRAL -> { return TonalPalette.fromHueAndChroma( sourceColorHct.getHue(), (platform == PHONE ? 1.4 : 6) * 2.2); - case TONAL_SPOT: + } + case TONAL_SPOT -> { return TonalPalette.fromHueAndChroma( sourceColorHct.getHue(), (platform == PHONE ? 5 : 10) * 1.7); - case EXPRESSIVE: + } + case EXPRESSIVE -> { double expressiveNeutralHue = getExpressiveNeutralHue(sourceColorHct); double expressiveNeutralChroma = getExpressiveNeutralChroma(sourceColorHct, isDark, platform); @@ -1878,13 +1882,16 @@ public TonalPalette getNeutralVariantPalette( expressiveNeutralHue, expressiveNeutralChroma * (expressiveNeutralHue >= 105 && expressiveNeutralHue < 125 ? 1.6 : 2.3)); - case VIBRANT: + } + case VIBRANT -> { double vibrantNeutralHue = getVibrantNeutralHue(sourceColorHct); double vibrantNeutralChroma = getVibrantNeutralChroma(sourceColorHct, platform); return TonalPalette.fromHueAndChroma(vibrantNeutralHue, vibrantNeutralChroma * 1.29); - default: + } + default -> { return super.getNeutralVariantPalette( variant, sourceColorHct, isDark, platform, contrastLevel); + } } } diff --git a/material-color-utilities/src/main/java/quantize/QuantizerWu.java b/material-color-utilities/src/main/java/quantize/QuantizerWu.java index 9812d3e4..e7c3cc65 100644 --- a/material-color-utilities/src/main/java/quantize/QuantizerWu.java +++ b/material-color-utilities/src/main/java/quantize/QuantizerWu.java @@ -234,24 +234,24 @@ Boolean cut(Box one, Box two) { two.b1 = one.b1; switch (cutDirection) { - case RED: + case RED -> { one.r1 = maxRResult.cutLocation; two.r0 = one.r1; two.g0 = one.g0; two.b0 = one.b0; - break; - case GREEN: + } + case GREEN -> { one.g1 = maxGResult.cutLocation; two.r0 = one.r0; two.g0 = one.g1; two.b0 = one.b0; - break; - case BLUE: + } + case BLUE -> { one.b1 = maxBResult.cutLocation; two.r0 = one.r0; two.g0 = one.g0; two.b0 = one.b1; - break; + } } one.vol = (one.r1 - one.r0) * (one.g1 - one.g0) * (one.b1 - one.b0);