From 8027252572d48327ef14dd134bd7123d5df917b6 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 10 Aug 2022 18:33:55 +0200 Subject: [PATCH] repackage to follow original structure for easy c&p replacements in the future Signed-off-by: Andy Scherzinger --- .../nextcloud/talk/ui/theme/ServerTheme.kt | 2 +- .../talk/ui/theme/ServerThemeImpl.kt | 2 +- .../nextcloud/talk/ui/theme/ViewThemeUtils.kt | 2 +- .../blend/Blend.java | 10 ++-- .../hct/Cam16.java | 4 +- .../hct/Hct.java | 4 +- .../hct/HctSolver.java | 6 +- .../hct/ViewingConditions.java | 6 +- .../palettes/CorePalette.java | 6 +- .../palettes/TonalPalette.java | 4 +- .../quantize/PointProvider.java | 2 +- .../quantize/PointProviderLab.java | 4 +- .../quantize/Quantizer.java | 2 +- .../quantize/QuantizerCelebi.java | 2 +- .../quantize/QuantizerMap.java | 2 +- .../quantize/QuantizerResult.java | 2 +- .../quantize/QuantizerWsmeans.java | 2 +- .../quantize/QuantizerWu.java | 4 +- .../scheme/Scheme.java | 56 ++++++++++++++++++- .../score/Score.java | 8 +-- .../utils/ColorUtils.java | 2 +- .../utils/MathUtils.java | 2 +- .../utils/StringUtils.java | 2 +- 23 files changed, 93 insertions(+), 43 deletions(-) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/blend/Blend.java (90%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/hct/Cam16.java (99%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/hct/Hct.java (96%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/hct/HctSolver.java (99%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/hct/ViewingConditions.java (96%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/palettes/CorePalette.java (91%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/palettes/TonalPalette.java (94%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/quantize/PointProvider.java (92%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/quantize/PointProviderLab.java (92%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/quantize/Quantizer.java (91%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/quantize/QuantizerCelebi.java (97%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/quantize/QuantizerMap.java (95%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/quantize/QuantizerResult.java (92%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/quantize/QuantizerWsmeans.java (99%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/quantize/QuantizerWu.java (98%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/scheme/Scheme.java (93%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/score/Score.java (96%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/utils/ColorUtils.java (99%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/utils/MathUtils.java (98%) rename material-color-utilities/src/main/java/{com/material_foundation/material_color_utilities => }/utils/StringUtils.java (94%) diff --git a/app/src/main/java/com/nextcloud/talk/ui/theme/ServerTheme.kt b/app/src/main/java/com/nextcloud/talk/ui/theme/ServerTheme.kt index b43d2d2d9..8df4aa117 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/theme/ServerTheme.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/theme/ServerTheme.kt @@ -22,7 +22,7 @@ package com.nextcloud.talk.ui.theme import androidx.annotation.ColorInt -import com.material_foundation.material_color_utilities.scheme.Scheme +import scheme.Scheme interface ServerTheme { @get:ColorInt diff --git a/app/src/main/java/com/nextcloud/talk/ui/theme/ServerThemeImpl.kt b/app/src/main/java/com/nextcloud/talk/ui/theme/ServerThemeImpl.kt index 8ad80117e..63cf1f53d 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/theme/ServerThemeImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/theme/ServerThemeImpl.kt @@ -26,7 +26,7 @@ package com.nextcloud.talk.ui.theme import com.nextcloud.talk.R import com.nextcloud.talk.models.json.capabilities.ThemingCapability import com.nextcloud.talk.utils.ui.ColorUtil -import com.material_foundation.material_color_utilities.scheme.Scheme +import scheme.Scheme internal class ServerThemeImpl(themingCapability: ThemingCapability?, colorUtil: ColorUtil) : ServerTheme { diff --git a/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt b/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt index 930ab9eb0..1f411c8e4 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt @@ -76,7 +76,7 @@ import com.nextcloud.talk.utils.ui.PlatformThemeUtil.isDarkMode import com.vanniktech.emoji.EmojiTextView import com.yarolegovich.mp.MaterialPreferenceCategory import com.yarolegovich.mp.MaterialSwitchPreference -import com.material_foundation.material_color_utilities.scheme.Scheme +import scheme.Scheme import javax.inject.Inject import kotlin.math.roundToInt diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/blend/Blend.java b/material-color-utilities/src/main/java/blend/Blend.java similarity index 90% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/blend/Blend.java rename to material-color-utilities/src/main/java/blend/Blend.java index 3c3cdd3ac..545e2ff1b 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/blend/Blend.java +++ b/material-color-utilities/src/main/java/blend/Blend.java @@ -16,12 +16,12 @@ // This file is automatically generated. Do not modify it. -package com.material_foundation.material_color_utilities.blend; +package blend; -import com.material_foundation.material_color_utilities.hct.Cam16; -import com.material_foundation.material_color_utilities.hct.Hct; -import com.material_foundation.material_color_utilities.utils.ColorUtils; -import com.material_foundation.material_color_utilities.utils.MathUtils; +import hct.Cam16; +import hct.Hct; +import utils.ColorUtils; +import utils.MathUtils; /** Functions for blending in HCT and CAM16. */ public class Blend { diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/Cam16.java b/material-color-utilities/src/main/java/hct/Cam16.java similarity index 99% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/Cam16.java rename to material-color-utilities/src/main/java/hct/Cam16.java index 0aea46f4d..9dfdb09e0 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/Cam16.java +++ b/material-color-utilities/src/main/java/hct/Cam16.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.material_foundation.material_color_utilities.hct; +package hct; import static java.lang.Math.max; -import com.material_foundation.material_color_utilities.utils.ColorUtils; +import utils.ColorUtils; /** * CAM16, a color appearance model. Colors are not just defined by their hex code, but rather, a hex diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/Hct.java b/material-color-utilities/src/main/java/hct/Hct.java similarity index 96% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/Hct.java rename to material-color-utilities/src/main/java/hct/Hct.java index 49d7202c7..4bcdb7810 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/Hct.java +++ b/material-color-utilities/src/main/java/hct/Hct.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.material_foundation.material_color_utilities.hct; +package hct; -import com.material_foundation.material_color_utilities.utils.ColorUtils; +import utils.ColorUtils; /** * A color system built using CAM16 hue and chroma, and L* from L*a*b*. diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/HctSolver.java b/material-color-utilities/src/main/java/hct/HctSolver.java similarity index 99% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/HctSolver.java rename to material-color-utilities/src/main/java/hct/HctSolver.java index c5769f000..955080c1c 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/HctSolver.java +++ b/material-color-utilities/src/main/java/hct/HctSolver.java @@ -16,10 +16,10 @@ // This file is automatically generated. Do not modify it. -package com.material_foundation.material_color_utilities.hct; +package hct; -import com.material_foundation.material_color_utilities.utils.ColorUtils; -import com.material_foundation.material_color_utilities.utils.MathUtils; +import utils.ColorUtils; +import utils.MathUtils; /** A class that solves the HCT equation. */ public class HctSolver { diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/ViewingConditions.java b/material-color-utilities/src/main/java/hct/ViewingConditions.java similarity index 96% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/ViewingConditions.java rename to material-color-utilities/src/main/java/hct/ViewingConditions.java index 395446c6e..93a3a6bb5 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/ViewingConditions.java +++ b/material-color-utilities/src/main/java/hct/ViewingConditions.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.material_foundation.material_color_utilities.hct; +package hct; -import com.material_foundation.material_color_utilities.utils.ColorUtils; -import com.material_foundation.material_color_utilities.utils.MathUtils; +import utils.ColorUtils; +import utils.MathUtils; /** * In traditional color spaces, a color can be identified solely by the observer's measurement of diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/palettes/CorePalette.java b/material-color-utilities/src/main/java/palettes/CorePalette.java similarity index 91% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/palettes/CorePalette.java rename to material-color-utilities/src/main/java/palettes/CorePalette.java index 13c98cd79..9a47ee79e 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/palettes/CorePalette.java +++ b/material-color-utilities/src/main/java/palettes/CorePalette.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.material_foundation.material_color_utilities.palettes; +package palettes; import static java.lang.Math.max; import static java.lang.Math.min; -import com.material_foundation.material_color_utilities.hct.Hct; +import hct.Hct; /** - * An intermediate concept between the key color for a UI theme, and a full color com.material_foundation.material_color_utilities.scheme. 5 sets of + * An intermediate concept between the key color for a UI theme, and a full color scheme. 5 sets of * tones are generated, all except one use the same hue as the key color, and all vary in chroma. */ public final class CorePalette { diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/palettes/TonalPalette.java b/material-color-utilities/src/main/java/palettes/TonalPalette.java similarity index 94% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/palettes/TonalPalette.java rename to material-color-utilities/src/main/java/palettes/TonalPalette.java index 85d1e59ba..fdcdd2de9 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/palettes/TonalPalette.java +++ b/material-color-utilities/src/main/java/palettes/TonalPalette.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.material_foundation.material_color_utilities.palettes; +package palettes; -import com.material_foundation.material_color_utilities.hct.Hct; +import hct.Hct; import java.util.HashMap; import java.util.Map; diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/PointProvider.java b/material-color-utilities/src/main/java/quantize/PointProvider.java similarity index 92% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/PointProvider.java rename to material-color-utilities/src/main/java/quantize/PointProvider.java index cebf2bdbf..1aa5b32bd 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/PointProvider.java +++ b/material-color-utilities/src/main/java/quantize/PointProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.material_foundation.material_color_utilities.quantize; +package quantize; /** An interface to allow use of different color spaces by quantizers. */ public interface PointProvider { diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/PointProviderLab.java b/material-color-utilities/src/main/java/quantize/PointProviderLab.java similarity index 92% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/PointProviderLab.java rename to material-color-utilities/src/main/java/quantize/PointProviderLab.java index 1dcd323b4..b990e6912 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/PointProviderLab.java +++ b/material-color-utilities/src/main/java/quantize/PointProviderLab.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.material_foundation.material_color_utilities.quantize; +package quantize; -import com.material_foundation.material_color_utilities.utils.ColorUtils; +import utils.ColorUtils; /** * Provides conversions needed for K-Means quantization. Converting input to points, and converting diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/Quantizer.java b/material-color-utilities/src/main/java/quantize/Quantizer.java similarity index 91% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/Quantizer.java rename to material-color-utilities/src/main/java/quantize/Quantizer.java index 3b4dadff3..ab2a0585b 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/Quantizer.java +++ b/material-color-utilities/src/main/java/quantize/Quantizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.material_foundation.material_color_utilities.quantize; +package quantize; interface Quantizer { public QuantizerResult quantize(int[] pixels, int maxColors); diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerCelebi.java b/material-color-utilities/src/main/java/quantize/QuantizerCelebi.java similarity index 97% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerCelebi.java rename to material-color-utilities/src/main/java/quantize/QuantizerCelebi.java index 00daa2203..d0520fe2f 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerCelebi.java +++ b/material-color-utilities/src/main/java/quantize/QuantizerCelebi.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.material_foundation.material_color_utilities.quantize; +package quantize; import java.util.Map; import java.util.Set; diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerMap.java b/material-color-utilities/src/main/java/quantize/QuantizerMap.java similarity index 95% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerMap.java rename to material-color-utilities/src/main/java/quantize/QuantizerMap.java index be89d1270..0af9082b3 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerMap.java +++ b/material-color-utilities/src/main/java/quantize/QuantizerMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.material_foundation.material_color_utilities.quantize; +package quantize; import java.util.HashMap; import java.util.Map; diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerResult.java b/material-color-utilities/src/main/java/quantize/QuantizerResult.java similarity index 92% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerResult.java rename to material-color-utilities/src/main/java/quantize/QuantizerResult.java index 9630ed5fd..b9f009935 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerResult.java +++ b/material-color-utilities/src/main/java/quantize/QuantizerResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.material_foundation.material_color_utilities.quantize; +package quantize; import java.util.Map; diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerWsmeans.java b/material-color-utilities/src/main/java/quantize/QuantizerWsmeans.java similarity index 99% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerWsmeans.java rename to material-color-utilities/src/main/java/quantize/QuantizerWsmeans.java index 084f08030..15116ac1b 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerWsmeans.java +++ b/material-color-utilities/src/main/java/quantize/QuantizerWsmeans.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.material_foundation.material_color_utilities.quantize; +package quantize; import static java.lang.Math.min; diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerWu.java b/material-color-utilities/src/main/java/quantize/QuantizerWu.java similarity index 98% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerWu.java rename to material-color-utilities/src/main/java/quantize/QuantizerWu.java index caed05c5a..9cb661389 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerWu.java +++ b/material-color-utilities/src/main/java/quantize/QuantizerWu.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.material_foundation.material_color_utilities.quantize; +package quantize; -import com.material_foundation.material_color_utilities.utils.ColorUtils; +import utils.ColorUtils; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/scheme/Scheme.java b/material-color-utilities/src/main/java/scheme/Scheme.java similarity index 93% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/scheme/Scheme.java rename to material-color-utilities/src/main/java/scheme/Scheme.java index a2743f933..a31ef0966 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/scheme/Scheme.java +++ b/material-color-utilities/src/main/java/scheme/Scheme.java @@ -16,13 +16,13 @@ // This file is automatically generated. Do not modify it. -package com.material_foundation.material_color_utilities.scheme; +package scheme; import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.CheckReturnValue; -import com.material_foundation.material_color_utilities.palettes.CorePalette; +import palettes.CorePalette; -/** Represents a Material color com.material_foundation.material_color_utilities.scheme, a mapping of color roles to colors. */ +/** Represents a Material color scheme, a mapping of color roles to colors. */ @CheckReturnValue public class Scheme { private int primary; @@ -48,7 +48,9 @@ public class Scheme { private int surfaceVariant; private int onSurfaceVariant; private int outline; + private int outlineVariant; private int shadow; + private int scrim; private int inverseSurface; private int inverseOnSurface; private int inversePrimary; @@ -79,7 +81,9 @@ public class Scheme { int surfaceVariant, int onSurfaceVariant, int outline, + int outlineVariant, int shadow, + int scrim, int inverseSurface, int inverseOnSurface, int inversePrimary) { @@ -107,7 +111,9 @@ public class Scheme { this.surfaceVariant = surfaceVariant; this.onSurfaceVariant = onSurfaceVariant; this.outline = outline; + this.outlineVariant = outlineVariant; this.shadow = shadow; + this.scrim = scrim; this.inverseSurface = inverseSurface; this.inverseOnSurface = inverseOnSurface; this.inversePrimary = inversePrimary; @@ -154,7 +160,9 @@ public class Scheme { .withSurfaceVariant(core.n2.tone(90)) .withOnSurfaceVariant(core.n2.tone(30)) .withOutline(core.n2.tone(50)) + .withOutlineVariant(core.n2.tone(80)) .withShadow(core.n1.tone(0)) + .withScrim(core.n1.tone(0)) .withInverseSurface(core.n1.tone(20)) .withInverseOnSurface(core.n1.tone(95)) .withInversePrimary(core.a1.tone(80)); @@ -185,7 +193,9 @@ public class Scheme { .withSurfaceVariant(core.n2.tone(30)) .withOnSurfaceVariant(core.n2.tone(80)) .withOutline(core.n2.tone(60)) + .withOutlineVariant(core.n2.tone(30)) .withShadow(core.n1.tone(0)) + .withScrim(core.n1.tone(0)) .withInverseSurface(core.n1.tone(90)) .withInverseOnSurface(core.n1.tone(20)) .withInversePrimary(core.a1.tone(40)); @@ -513,6 +523,20 @@ public class Scheme { return this; } + public int getOutlineVariant() { + return outlineVariant; + } + + public void setOutlineVariant(int outlineVariant) { + this.outlineVariant = outlineVariant; + } + + @CanIgnoreReturnValue + public Scheme withOutlineVariant(int outlineVariant) { + this.outlineVariant = outlineVariant; + return this; + } + public int getShadow() { return shadow; } @@ -527,6 +551,20 @@ public class Scheme { return this; } + public int getScrim() { + return scrim; + } + + public void setScrim(int scrim) { + this.scrim = scrim; + } + + @CanIgnoreReturnValue + public Scheme withScrim(int scrim) { + this.scrim = scrim; + return this; + } + public int getInverseSurface() { return inverseSurface; } @@ -618,8 +656,12 @@ public class Scheme { + onSurfaceVariant + ", outline=" + outline + + ", outlineVariant=" + + outlineVariant + ", shadow=" + shadow + + ", scrim=" + + scrim + ", inverseSurface=" + inverseSurface + ", inverseOnSurface=" @@ -712,9 +754,15 @@ public class Scheme { if (outline != scheme.outline) { return false; } + if (outlineVariant != scheme.outlineVariant) { + return false; + } if (shadow != scheme.shadow) { return false; } + if (scrim != scheme.scrim) { + return false; + } if (inverseSurface != scheme.inverseSurface) { return false; } @@ -754,7 +802,9 @@ public class Scheme { result = 31 * result + surfaceVariant; result = 31 * result + onSurfaceVariant; result = 31 * result + outline; + result = 31 * result + outlineVariant; result = 31 * result + shadow; + result = 31 * result + scrim; result = 31 * result + inverseSurface; result = 31 * result + inverseOnSurface; result = 31 * result + inversePrimary; diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/score/Score.java b/material-color-utilities/src/main/java/score/Score.java similarity index 96% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/score/Score.java rename to material-color-utilities/src/main/java/score/Score.java index e728ba0fc..3483067ab 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/score/Score.java +++ b/material-color-utilities/src/main/java/score/Score.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.material_foundation.material_color_utilities.score; +package score; -import com.material_foundation.material_color_utilities.hct.Cam16; -import com.material_foundation.material_color_utilities.utils.ColorUtils; -import com.material_foundation.material_color_utilities.utils.MathUtils; +import hct.Cam16; +import utils.ColorUtils; +import utils.MathUtils; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/ColorUtils.java b/material-color-utilities/src/main/java/utils/ColorUtils.java similarity index 99% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/ColorUtils.java rename to material-color-utilities/src/main/java/utils/ColorUtils.java index c4860479a..bada576ee 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/ColorUtils.java +++ b/material-color-utilities/src/main/java/utils/ColorUtils.java @@ -16,7 +16,7 @@ // This file is automatically generated. Do not modify it. -package com.material_foundation.material_color_utilities.utils; +package utils; /** * Color science utilities. diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/MathUtils.java b/material-color-utilities/src/main/java/utils/MathUtils.java similarity index 98% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/MathUtils.java rename to material-color-utilities/src/main/java/utils/MathUtils.java index 550ae3cba..a1de23497 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/MathUtils.java +++ b/material-color-utilities/src/main/java/utils/MathUtils.java @@ -16,7 +16,7 @@ // This file is automatically generated. Do not modify it. -package com.material_foundation.material_color_utilities.utils; +package utils; /** Utility methods for mathematical operations. */ public class MathUtils { diff --git a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/StringUtils.java b/material-color-utilities/src/main/java/utils/StringUtils.java similarity index 94% rename from material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/StringUtils.java rename to material-color-utilities/src/main/java/utils/StringUtils.java index c709ca09b..75aa5b1b4 100644 --- a/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/StringUtils.java +++ b/material-color-utilities/src/main/java/utils/StringUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.material_foundation.material_color_utilities.utils; +package utils; /** Utility methods for string representations of colors. */ final class StringUtils {