From 5636d4354bb481363addb743d598aaa343552ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Brey?= <alvaro.brey@nextcloud.com>
Date: Wed, 10 Aug 2022 16:54:57 +0200
Subject: [PATCH] Put material color utilities in a separate Gradle module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This avoids polluting our main sourceset and makes it easier to substitute for a proper Gradle dependency in the future

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
---
 app/build.gradle                              |  1 +
 .../nextcloud/talk/ui/theme/ServerTheme.kt    |  2 +-
 .../talk/ui/theme/ServerThemeImpl.kt          |  2 +-
 .../nextcloud/talk/ui/theme/ViewThemeUtils.kt |  2 +-
 material-color-utilities/.gitignore           |  1 +
 material-color-utilities/README.txt           |  2 ++
 material-color-utilities/build.gradle         | 33 +++++++++++++++++++
 .../blend/Blend.java                          | 10 +++---
 .../material_color_utilities}/hct/Cam16.java  |  4 +--
 .../material_color_utilities}/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                        |  6 ++--
 .../score/Score.java                          |  8 ++---
 .../utils/ColorUtils.java                     |  2 +-
 .../utils/MathUtils.java                      |  2 +-
 .../utils/StringUtils.java                    |  2 +-
 settings.gradle                               |  1 +
 28 files changed, 81 insertions(+), 43 deletions(-)
 create mode 100644 material-color-utilities/.gitignore
 create mode 100644 material-color-utilities/README.txt
 create mode 100644 material-color-utilities/build.gradle
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/blend/Blend.java (90%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/hct/Cam16.java (99%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/hct/Hct.java (96%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/hct/HctSolver.java (99%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/hct/ViewingConditions.java (96%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/palettes/CorePalette.java (91%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/palettes/TonalPalette.java (94%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/quantize/PointProvider.java (92%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/quantize/PointProviderLab.java (92%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/quantize/Quantizer.java (91%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/quantize/QuantizerCelebi.java (97%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/quantize/QuantizerMap.java (95%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/quantize/QuantizerResult.java (92%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/quantize/QuantizerWsmeans.java (99%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/quantize/QuantizerWu.java (98%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/scheme/Scheme.java (98%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/score/Score.java (96%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/utils/ColorUtils.java (99%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/utils/MathUtils.java (98%)
 rename {app/src/main/java => material-color-utilities/src/main/java/com/material_foundation/material_color_utilities}/utils/StringUtils.java (94%)

diff --git a/app/build.gradle b/app/build.gradle
index 6cfdbf526..0c81509ad 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -335,6 +335,7 @@ dependencies {
     gplayImplementation "com.google.firebase:firebase-messaging:23.0.7"
 
     // implementation 'androidx.activity:activity-ktx:1.4.0'
+    implementation project(':material-color-utilities')
 }
 
 task installGitHooks(type: Copy, group: "development") {
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 8df4aa117..b43d2d2d9 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 scheme.Scheme
+import com.material_foundation.material_color_utilities.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 63cf1f53d..8ad80117e 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 scheme.Scheme
+import com.material_foundation.material_color_utilities.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 1f411c8e4..930ab9eb0 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 scheme.Scheme
+import com.material_foundation.material_color_utilities.scheme.Scheme
 import javax.inject.Inject
 import kotlin.math.roundToInt
 
diff --git a/material-color-utilities/.gitignore b/material-color-utilities/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/material-color-utilities/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/material-color-utilities/README.txt b/material-color-utilities/README.txt
new file mode 100644
index 000000000..c010135de
--- /dev/null
+++ b/material-color-utilities/README.txt
@@ -0,0 +1,2 @@
+Imported from https://github.com/material-foundation/material-color-utilities with license APACHE-2.0,to be substituted
+with a Gradle dependency when they publish it.
diff --git a/material-color-utilities/build.gradle b/material-color-utilities/build.gradle
new file mode 100644
index 000000000..02184594b
--- /dev/null
+++ b/material-color-utilities/build.gradle
@@ -0,0 +1,33 @@
+/*
+ * Nextcloud Talk application
+ *
+ * @author Álvaro Brey
+ * Copyright (C) 2022 Álvaro Brey
+ * Copyright (C) 2022 Nextcloud GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+plugins {
+    id 'java-library'
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+}
+
+dependencies {
+    implementation 'com.google.errorprone:error_prone_annotations:2.9.0'
+}
diff --git a/app/src/main/java/blend/Blend.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/blend/Blend.java
similarity index 90%
rename from app/src/main/java/blend/Blend.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/blend/Blend.java
index 545e2ff1b..3c3cdd3ac 100644
--- a/app/src/main/java/blend/Blend.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/blend/Blend.java
@@ -16,12 +16,12 @@
 
 // This file is automatically generated. Do not modify it.
 
-package blend;
+package com.material_foundation.material_color_utilities.blend;
 
-import hct.Cam16;
-import hct.Hct;
-import utils.ColorUtils;
-import utils.MathUtils;
+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;
 
 /** Functions for blending in HCT and CAM16. */
 public class Blend {
diff --git a/app/src/main/java/hct/Cam16.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/Cam16.java
similarity index 99%
rename from app/src/main/java/hct/Cam16.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/Cam16.java
index 9dfdb09e0..0aea46f4d 100644
--- a/app/src/main/java/hct/Cam16.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/Cam16.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package hct;
+package com.material_foundation.material_color_utilities.hct;
 
 import static java.lang.Math.max;
 
-import utils.ColorUtils;
+import com.material_foundation.material_color_utilities.utils.ColorUtils;
 
 /**
  * CAM16, a color appearance model. Colors are not just defined by their hex code, but rather, a hex
diff --git a/app/src/main/java/hct/Hct.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/Hct.java
similarity index 96%
rename from app/src/main/java/hct/Hct.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/Hct.java
index 4bcdb7810..49d7202c7 100644
--- a/app/src/main/java/hct/Hct.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/Hct.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package hct;
+package com.material_foundation.material_color_utilities.hct;
 
-import utils.ColorUtils;
+import com.material_foundation.material_color_utilities.utils.ColorUtils;
 
 /**
  * A color system built using CAM16 hue and chroma, and L* from L*a*b*.
diff --git a/app/src/main/java/hct/HctSolver.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/HctSolver.java
similarity index 99%
rename from app/src/main/java/hct/HctSolver.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/HctSolver.java
index 955080c1c..c5769f000 100644
--- a/app/src/main/java/hct/HctSolver.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/HctSolver.java
@@ -16,10 +16,10 @@
 
 // This file is automatically generated. Do not modify it.
 
-package hct;
+package com.material_foundation.material_color_utilities.hct;
 
-import utils.ColorUtils;
-import utils.MathUtils;
+import com.material_foundation.material_color_utilities.utils.ColorUtils;
+import com.material_foundation.material_color_utilities.utils.MathUtils;
 
 /** A class that solves the HCT equation. */
 public class HctSolver {
diff --git a/app/src/main/java/hct/ViewingConditions.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/ViewingConditions.java
similarity index 96%
rename from app/src/main/java/hct/ViewingConditions.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/ViewingConditions.java
index 93a3a6bb5..395446c6e 100644
--- a/app/src/main/java/hct/ViewingConditions.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/hct/ViewingConditions.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package hct;
+package com.material_foundation.material_color_utilities.hct;
 
-import utils.ColorUtils;
-import utils.MathUtils;
+import com.material_foundation.material_color_utilities.utils.ColorUtils;
+import com.material_foundation.material_color_utilities.utils.MathUtils;
 
 /**
  * In traditional color spaces, a color can be identified solely by the observer's measurement of
diff --git a/app/src/main/java/palettes/CorePalette.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/palettes/CorePalette.java
similarity index 91%
rename from app/src/main/java/palettes/CorePalette.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/palettes/CorePalette.java
index 9a47ee79e..13c98cd79 100644
--- a/app/src/main/java/palettes/CorePalette.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/palettes/CorePalette.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package palettes;
+package com.material_foundation.material_color_utilities.palettes;
 
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 
-import hct.Hct;
+import com.material_foundation.material_color_utilities.hct.Hct;
 
 /**
- * An intermediate concept between the key color for a UI theme, and a full color scheme. 5 sets of
+ * 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
  * 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/app/src/main/java/palettes/TonalPalette.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/palettes/TonalPalette.java
similarity index 94%
rename from app/src/main/java/palettes/TonalPalette.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/palettes/TonalPalette.java
index fdcdd2de9..85d1e59ba 100644
--- a/app/src/main/java/palettes/TonalPalette.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/palettes/TonalPalette.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package palettes;
+package com.material_foundation.material_color_utilities.palettes;
 
-import hct.Hct;
+import com.material_foundation.material_color_utilities.hct.Hct;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/app/src/main/java/quantize/PointProvider.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/PointProvider.java
similarity index 92%
rename from app/src/main/java/quantize/PointProvider.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/PointProvider.java
index 1aa5b32bd..cebf2bdbf 100644
--- a/app/src/main/java/quantize/PointProvider.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/PointProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package quantize;
+package com.material_foundation.material_color_utilities.quantize;
 
 /** An interface to allow use of different color spaces by quantizers. */
 public interface PointProvider {
diff --git a/app/src/main/java/quantize/PointProviderLab.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/PointProviderLab.java
similarity index 92%
rename from app/src/main/java/quantize/PointProviderLab.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/PointProviderLab.java
index b990e6912..1dcd323b4 100644
--- a/app/src/main/java/quantize/PointProviderLab.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/PointProviderLab.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package quantize;
+package com.material_foundation.material_color_utilities.quantize;
 
-import utils.ColorUtils;
+import com.material_foundation.material_color_utilities.utils.ColorUtils;
 
 /**
  * Provides conversions needed for K-Means quantization. Converting input to points, and converting
diff --git a/app/src/main/java/quantize/Quantizer.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/Quantizer.java
similarity index 91%
rename from app/src/main/java/quantize/Quantizer.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/Quantizer.java
index ab2a0585b..3b4dadff3 100644
--- a/app/src/main/java/quantize/Quantizer.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/Quantizer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package quantize;
+package com.material_foundation.material_color_utilities.quantize;
 
 interface Quantizer {
   public QuantizerResult quantize(int[] pixels, int maxColors);
diff --git a/app/src/main/java/quantize/QuantizerCelebi.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerCelebi.java
similarity index 97%
rename from app/src/main/java/quantize/QuantizerCelebi.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerCelebi.java
index d0520fe2f..00daa2203 100644
--- a/app/src/main/java/quantize/QuantizerCelebi.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerCelebi.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package quantize;
+package com.material_foundation.material_color_utilities.quantize;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/app/src/main/java/quantize/QuantizerMap.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerMap.java
similarity index 95%
rename from app/src/main/java/quantize/QuantizerMap.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerMap.java
index 0af9082b3..be89d1270 100644
--- a/app/src/main/java/quantize/QuantizerMap.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerMap.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package quantize;
+package com.material_foundation.material_color_utilities.quantize;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/app/src/main/java/quantize/QuantizerResult.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerResult.java
similarity index 92%
rename from app/src/main/java/quantize/QuantizerResult.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerResult.java
index b9f009935..9630ed5fd 100644
--- a/app/src/main/java/quantize/QuantizerResult.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerResult.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package quantize;
+package com.material_foundation.material_color_utilities.quantize;
 
 import java.util.Map;
 
diff --git a/app/src/main/java/quantize/QuantizerWsmeans.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerWsmeans.java
similarity index 99%
rename from app/src/main/java/quantize/QuantizerWsmeans.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerWsmeans.java
index 15116ac1b..084f08030 100644
--- a/app/src/main/java/quantize/QuantizerWsmeans.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerWsmeans.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package quantize;
+package com.material_foundation.material_color_utilities.quantize;
 
 import static java.lang.Math.min;
 
diff --git a/app/src/main/java/quantize/QuantizerWu.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerWu.java
similarity index 98%
rename from app/src/main/java/quantize/QuantizerWu.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerWu.java
index 9cb661389..caed05c5a 100644
--- a/app/src/main/java/quantize/QuantizerWu.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/quantize/QuantizerWu.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package quantize;
+package com.material_foundation.material_color_utilities.quantize;
 
-import utils.ColorUtils;
+import com.material_foundation.material_color_utilities.utils.ColorUtils;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/app/src/main/java/scheme/Scheme.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/scheme/Scheme.java
similarity index 98%
rename from app/src/main/java/scheme/Scheme.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/scheme/Scheme.java
index 6a02d3c8a..a2743f933 100644
--- a/app/src/main/java/scheme/Scheme.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/scheme/Scheme.java
@@ -16,13 +16,13 @@
 
 // This file is automatically generated. Do not modify it.
 
-package scheme;
+package com.material_foundation.material_color_utilities.scheme;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.annotations.CheckReturnValue;
-import palettes.CorePalette;
+import com.material_foundation.material_color_utilities.palettes.CorePalette;
 
-/** Represents a Material color scheme, a mapping of color roles to colors. */
+/** Represents a Material color com.material_foundation.material_color_utilities.scheme, a mapping of color roles to colors. */
 @CheckReturnValue
 public class Scheme {
   private int primary;
diff --git a/app/src/main/java/score/Score.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/score/Score.java
similarity index 96%
rename from app/src/main/java/score/Score.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/score/Score.java
index 3483067ab..e728ba0fc 100644
--- a/app/src/main/java/score/Score.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/score/Score.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package score;
+package com.material_foundation.material_color_utilities.score;
 
-import hct.Cam16;
-import utils.ColorUtils;
-import utils.MathUtils;
+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 java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/app/src/main/java/utils/ColorUtils.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/ColorUtils.java
similarity index 99%
rename from app/src/main/java/utils/ColorUtils.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/ColorUtils.java
index bada576ee..c4860479a 100644
--- a/app/src/main/java/utils/ColorUtils.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/ColorUtils.java
@@ -16,7 +16,7 @@
 
 // This file is automatically generated. Do not modify it.
 
-package utils;
+package com.material_foundation.material_color_utilities.utils;
 
 /**
  * Color science utilities.
diff --git a/app/src/main/java/utils/MathUtils.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/MathUtils.java
similarity index 98%
rename from app/src/main/java/utils/MathUtils.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/MathUtils.java
index a1de23497..550ae3cba 100644
--- a/app/src/main/java/utils/MathUtils.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/MathUtils.java
@@ -16,7 +16,7 @@
 
 // This file is automatically generated. Do not modify it.
 
-package utils;
+package com.material_foundation.material_color_utilities.utils;
 
 /** Utility methods for mathematical operations. */
 public class MathUtils {
diff --git a/app/src/main/java/utils/StringUtils.java b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/StringUtils.java
similarity index 94%
rename from app/src/main/java/utils/StringUtils.java
rename to material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/StringUtils.java
index 75aa5b1b4..c709ca09b 100644
--- a/app/src/main/java/utils/StringUtils.java
+++ b/material-color-utilities/src/main/java/com/material_foundation/material_color_utilities/utils/StringUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package utils;
+package com.material_foundation.material_color_utilities.utils;
 
 /** Utility methods for string representations of colors. */
 final class StringUtils {
diff --git a/settings.gradle b/settings.gradle
index ba06f867c..794d972f1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -19,3 +19,4 @@
  */
 
 include ':app'
+include ':material-color-utilities'