diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d39017e2..cad930c8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,2 +1 @@ -This repo is not accepting external contributions, but feature requests and bug -reports are welcome on [Github](https://github.com/material-foundation/material-color-utilities/issues). +This repo is not accepting external contributions. diff --git a/cheat_sheet.png b/cheat_sheet.png deleted file mode 100644 index a079ac03..00000000 Binary files a/cheat_sheet.png and /dev/null differ diff --git a/concepts/color_extraction.md b/concepts/color_extraction.md deleted file mode 100644 index 7e2c5931..00000000 --- a/concepts/color_extraction.md +++ /dev/null @@ -1,59 +0,0 @@ -# Color Extraction - -## Background - -### From a wallpaper - -User-generated color comes from a user's personal wallpaper. The wallpaper is -digitally analyzed through a process called quantization, and a single color is -selected as the source color. - -![Red source color is extracted from a wallpaper](images/wallpaper_based_color.png) - -### From in-app content - -Content-based color comes from in-app content, like an album thumbnail image, -logo, or video preview. Like user-generated color, the image is digitally -analyzed through quantization, and a single color selected as the source color. - -![Blue source color is extracted from a podcast cover](images/content_based_color.png) - -## Extracting colors from an image - -### Quantize - -This is a lossy compression process to select a limited number of distinct -colors that best reproduces the original image's appearance. The recommended -quantizer is Celebi, which uses results from Wu and WSMeans. - -### Scoring - -Evaluate and rank colors based on their suitability for UI themes. It -prioritizes colors that are both visually appealing and frequently used within a -given image. The main usage of scoring is to extract a set of dominant and -vibrant colors to use as source color to generate a dynamic color scheme. - -Key metrics include: - -- **Color diversity:** The algorithm promotes visually distinct colors by - giving higher scores to hues that are well-represented in the image within a - 30-degree neighborhood on the color wheel. It also iteratively tests - different minimum hue differences to find a set that meets the desired - number of colors while maintaining good hue distribution. - -- **Vibrant chroma:** Colors closer to the target chroma of 48.0 receive - higher scores. Colors with very low chroma (close to grayscale) or those - that are extremely rare in the image will be filtered out. - -## To color themes - -Ever wonder how Pixel extracts colors from a phone wallpaper to create -accessible and beautiful UIs? The steps can be summarized as follows: - -1. Quantize to obtain a representative set of colors from the wallpaper. -1. Score to obtain suitable source colors. -1. Present theme options by pairing the resulting source colors with available - scheme variants to the user and let them pick. -1. Create tonal palettes from the user-selected theme. -1. Assign Material color roles with values from these tonal palettes. -1. Colors get applied to UIs via Material tokens. diff --git a/concepts/color_spaces.md b/concepts/color_spaces.md deleted file mode 100644 index d887191d..00000000 --- a/concepts/color_spaces.md +++ /dev/null @@ -1,262 +0,0 @@ -# Color spaces in MCU - - - -## Overview - -Color spaces are used to describe color. A color does not change when moved -between color spaces. Using different “distance spaces” like kilometers, or -miles, does not change where you are - it just changes the measure of where you -are. - -Color spaces used in design today, RGB, HSL, CMYK, etc., specify colors, but are -flawed in several fundamental ways. They describe colors, but do not do a good -job of describing the relationships between colors. As such, MCU uses multiple -**color spaces** to create a dynamic design system. Each color space is useful -in a different area and provides a way to understand colors. - -For example, sRGB is easy for machine to display but not for humans. You get the -colors but not the characteristics. HCT provides a way to define different -characteristics of the color such as hue, chroma, and tone. MCU does most of -calculation in HCT then converts the colors to sRGB for consumption. - -## Basics - -In each color space, colors are represented as points in a coordinate system. -Any point can be located by rectangular (Cartesian) or circular (polar) -coordinates. For instance, this particular color, which occurs naturally, can be -described in each each space using three numerical values. - -![Color with hex code #ff6600](images/orange.png){style="float: left; padding: 50px"} - -Color space | Coordinates ------------ | ------------------------------- -sRGB | 255, 102, 0 (hex code: #ff6600) -linear RGB | 100.00, 13.29, 0.00 -XYZ | 45.99, 30.76, 3.52 -L\*a\*b\* | 62.31, 54.99, 71.33 -Cam16-JCH | 55.16, 79.39, 42.39 -Cam16-UCS | 67.65, 28.75, 26.24 -HCT | 42.39, 79.39, 62.31 - -Most color spaces are three-dimensional is not a coincidence. Human eyes -typically possess three types of cone cells: one that is most sensitive to -shorter wavelengths (commonly referred to as blue), another that is most -sensitive to medium wavelengths (commonly referred to as green), and a third -that is most sensitive to longer wavelengths (commonly referred to as red). -Cells respond with varying strength to signals produced by lights of different -wavelengths. Hence, the human perception of any color can be described using -three numerical values. - -The range of colors that can be represented differs for each color space. Color -spaces like **XYZ** can represent any color that human eyes can see. They serve -as a helpful basis for describing colors objectively. Conversely, the **sRGB** -color space is useful for displaying colors; however, due to the shape of the -Gamut, certain colors cannot be represented using three displayable primaries, -resulting in their absence in the sRGB color space. - -## Color spaces used in MCU - -### sRGB - -RGB represents colors as a combination of red, green, and blue. This is -primarily used for display. The bit depth for each channel is usually 8, meaning -there are 2563 = 16 777 216 colors available. - -In MCU, an sRGB color usually appears as a hexadecimal number in ARGB format: -for example, `#abcdef` is `0xffabcdef`. The leading `ff` means that this is an -opaque color (alpha = `0xff`). - -### HCT - -The combination of Cam16-JCH and L*a*b* was used to introduce HCT in MCU. This -color space is crucial for creating color schemes, blending colors, and handling -disliked colors. - -Note that while HCT is infinite, it can describe colors like H26 C231 T100. -However, that color isn’t “real.” There is no such color as a red (H26) that is -*extremely* colorful (C231) and the same brightness as white (T100). When it is -converted to RGB to be displayed, HCT keeps the tone, and reduces chroma until -the color is feasible. - -### Cam16 - -CAM16 is a **color appearance model**, which accounts for **viewing -conditions**. The same red color patch will look different at noon, and at -night, and even in situations as simple as the background color being different. - -Its aim is to represent the human perception of colors accurately. The Cam16 -model uses the class `ViewingCondition` to define the environment, and employing -various `ViewingCondition` objects with the same hex code can result in distinct -"Cam16" objects. The library offers a standard default `ViewingCondition`. - -A `Cam16` object contains 9 components, and can be determined uniquely if any of -the following are given: - -- A triple consisting of one of {`j`, `q`}, one of {`chroma`, `m`, `s`}, and - `hue` -- A triple of `jstar`, `astar`, and `bstar` - -Technically speaking, Cam16 is not a single color space but encompasses multiple -color spaces. MCU uses the color spaces **Cam16-JCH** (using the components `j`, -`chroma`, `hue`) and **Cam16-UCS** (using the components `jstar`, `astar`, -`bstar`) for different purposes. - -### XYZ (CIEXYZ) - -XYZ is sometimes called a **connector space**, every color space can convert to -and from it. It is used often in conversion, but it is inappropriate for design. -It does not attempt to provide perceptually accurate attributes of colors, and -the three channels are visually interdependent. - -This linear color space closely relates to how the cone cells response to light. - -### L\*a\*b\* (CIELAB) - -A color space intended to be perceptually uniform. Used internally for image -quantization. - -L*a*b*, like RGB, is in a cube. - -- L* is the Z axis, representing lightness. -- a* is the X axis, left to right, green to red. -- b* is the Y axis, bottom to top, blue to yellow. - -### Linear RGB (`linrgb`) - -A linearization of the sRGB color space, with no restriction on bit depth. - -Used internally for the HCT Solver. - -## Conversions between color spaces - -
- -###### Dart - -* sRGB ⇌ HCT - - `Hct.fromInt(argb)` - - `Hct.from(h, c, t).toInt()` -* sRGB ⇌ XYZ - - `ColorUtils.xyzFromArgb(argb)` - - `ColorUtils.argbFromXyz(x, y, z)` -* sRGB ⇌ Cam16 - - `Cam16.fromInt(argb)` - - `cam16.toInt()` - - Constructing a Cam16 from JCH or UCS: - - `Cam16.fromJch(j, c, h)` - - `Cam16.fromUcs(jstar, astar, bstar)` -* XYZ ⇌ Cam16 - - `Cam16.fromXyzInViewingConditions(x, y, z, vc)` - - `cam16.xyzInViewingConditions(vc)` -* sRGB ⇌ L\*a\*b\* - - `ColorUtils.labFromArgb(argb)` - - `ColorUtils.argbFromLab(l, a, b)` -* linRGB → sRGB - - `ColorUtils.argbFromLinrgb(linrgb)` - -###### Java - -* sRGB ⇌ HCT - - `Hct.fromInt(argb)` - - `Hct.from(h, c, t).toInt()` -* sRGB ⇌ XYZ - - `ColorUtils.xyzFromArgb(argb)` - - `ColorUtils.argbFromXyz(x, y, z)` -* sRGB ⇌ Cam16 - - `Cam16.fromInt(argb)` - - `cam16.toInt()` - - Constructing a Cam16 from JCH or UCS: - - `Cam16.fromJch(j, c, h)` - - `Cam16.fromUcs(jstar, astar, bstar)` -* XYZ ⇌ Cam16 - - `Cam16.fromXyzInViewingConditions(x, y, z, vc)` - - `cam16.xyzInViewingConditions(vc, returnArray)` -* sRGB ⇌ L\*a\*b\* - - `ColorUtils.labFromArgb(argb)` - - `ColorUtils.argbFromLab(l, a, b)` -* linRGB → sRGB - - `ColorUtils.argbFromLinrgb(linrgb)` - -###### TypeScript - -* sRGB ⇌ HCT - - `Hct.fromInt(argb)` - - `Hct.from(h, c, t).toInt()` -* sRGB ⇌ XYZ - - `colorUtils.xyzFromArgb(argb)` - - `colorUtils.argbFromXyz(x, y, z)` -* sRGB ⇌ Cam16 - - `Cam16.fromInt(argb)` - - `cam16.toInt()` - - Constructing a Cam16 from JCH or UCS: - - `Cam16.fromJch(j, c, h)` - - `Cam16.fromUcs(jstar, astar, bstar)` -* XYZ ⇌ Cam16 - - `Cam16.fromXyzInViewingConditions(x, y, z, vc)` - - `cam16.xyzInViewingConditions(vc)` -* sRGB ⇌ L\*a\*b\* - - `colorUtils.labFromArgb(argb)` - - `colorUtils.argbFromLab(l, a, b)` -* linRGB → sRGB - - `colorUtils.argbFromLinrgb(linrgb)` - -###### C++ - -* sRGB ⇌ HCT - - `Hct::Hct(argb)` - - `Hct::ToInt()` -* sRGB ⇌ XYZ — *not provided yet* -* sRGB ⇌ Cam16 - - `CamFromInt(argb)` - - `IntFromCam(cam)` - - (*Cam16 from JCH is not available yet*) - - Constructing a Cam16 from UCS: - - `CamFromUcsAndViewingConditions(jstar, astar, bstar, vc)` -* XYZ ⇌ Cam16 - - `CamFromXyzAndViewingConditions(x, y, z, vc)` - - (*Cam16 to XYZ is not available yet*) -* sRGB ⇌ L\*a\*b\* - - `LabFromInt(argb)` - - `IntFromLab(lab)` -* linRGB → sRGB - - `ArgbFromLinrgb(linrgb)` - -###### Swift - -* sRGB ⇌ HCT - - `Hct.fromInt(argb)` - - `Hct.from(h, c, t).toInt()` -* sRGB ⇌ XYZ - - `ColorUtils.xyzFromArgb(argb)` - - `ColorUtils.argbFromXyz(x, y, z)` -* sRGB ⇌ Cam16 - - `Cam16.fromInt(argb)` - - `cam16.toInt()` - - Constructing a Cam16 from JCH or UCS: - - `Cam16.fromJch(j, c, h)` - - `Cam16.fromUcs(jstar, astar, bstar)` -* XYZ ⇌ Cam16 - - `Cam16.fromXyzInViewingConditions(x, y, z, vc)` - - `cam16.xyzInViewingConditions(vc)` -* sRGB ⇌ L\*a\*b\* - - `ColorUtils.labFromArgb(argb)` - - `ColorUtils.argbFromLab(l, a, b)` -* linRGB → sRGB - - `ColorUtils.argbFromLinrgb(linrgb)` - -
- -## References - -### Wikipedia - -- [Color space](https://en.wikipedia.org/wiki/Color_space) -- [Color model](https://en.wikipedia.org/wiki/Color_model) -- [sRGB](https://en.wikipedia.org/wiki/SRGB) - - [sRGB: Gamma](https://en.wikipedia.org/wiki/SRGB#Transfer_function_\(%22gamma%22\)) -- [Gamma correction](https://en.wikipedia.org/wiki/Gamma_correction) -- [CIE 1931 color space (CIEXYZ and others)](https://en.wikipedia.org/wiki/CIE_1931_color_space) -- [CIELAB color space (L\*a\*b\*)](https://en.wikipedia.org/wiki/CIELAB_color_space) -- [Color appearance model (CAM)](https://en.wikipedia.org/wiki/Color_appearance_model) - - [Cam16](https://en.wikipedia.org/wiki/Color_appearance_model#CAM16) diff --git a/concepts/color_terms.md b/concepts/color_terms.md deleted file mode 100644 index 9d53ae85..00000000 --- a/concepts/color_terms.md +++ /dev/null @@ -1,89 +0,0 @@ -# Color terms - -### Dynamic Color - -Dynamic Color represents a Material color role, and its value is determined by -constraints in Dynamic Scheme. - -### Material Color Roles - -[Material color roles](https://m3.material.io/styles/color/roles) are like the -"numbers" on a paint-by-number canvas. They are the connective tissue between -elements of the UI and what color goes where. Roughly speaking, MCU assigns each -color role with a value from a specific tonal palette. For example, the -`onSurface` color uses a color from the Neutral Palette with tone 30 in light -scheme. - -### Dynamic Scheme - -The Dynamic Scheme is comprised of color attributes that are combined in a -predetermined way to meet the needs of a user context or preference. It is -essentially a mapping of color roles to color at specific tone in a tonal -palette. For example, primary = *207H 80C 90T*, onPrimary = *207H 80C 40T*. - -### Scheme Variant - -Each variant is a set of design decisions on the assignment of color values from -tonal palettes to color roles. - -### Tonal Palette - -A set of colors that share hue and chroma in HCT color space and vary in tones. -From a perception perspective, we can say that they are "tones of the same -color". - -MCU produces 6 tonal palettes: primary, secondary, tertiary, neutral, neutral -variant, and error. Each comprises tones ranging from 0 to 100 that serves as -the basis for mapping specific tones to specific roles. - -### Source Color - -The single color that’s extracted to define all five key colors is called a -source color. While it may not be needed in code, it’s a useful distinction for -understanding that a dynamic color scheme has its root in one initiating color, -AKA hue, chroma, and tone. - -### Key Color - -Key colors are a concept useful to understanding dynamic color. The term -describes any color that undergoes hue and chroma transformation of a source -color. It is not an extracted color, it’s a derivation of the source color. - -Key color is a color that represents the hue and chroma of a tonal palette. -Dynamic color uses 5 key colors to generate 5 tonal palettes as a foundation for -dynamic scheme generation. - -### HCT - -HCT is an abbreviation of hue, chroma, tone. It’s the name of a new color space -that enables dynamic color. HCT is based on -[CAM16](https://onlinelibrary.wiley.com/doi/10.1002/col.22131) hue and chroma; -the L* construct for luminance from L*a*b* (CIELAB, 1976) is represented as -tone.  - -### Hue - -Examples are red, orange, yellow, green, etc. A hue can range from 0 to 359 -degrees. - -### Chroma - -Informally, chroma describes degrees of colorfulness. It’s similar to saturation -in the HSL color space, but note two distinctions: chroma in HCT is perceptually -accurate; for every combination of hue and tone there’s a different maximum -chroma. - -### Tone - -Informally, tone means degrees of lightness. T in HCT color space equals L* in -L*a*b* color space. - -### Contrast - -The difference between colors. For accessibility, contrast refers strictly to -the difference in tone. A difference of 40 in tone guarantees a WCAG contrast -ratio ≥ 3.0; a difference of 50 in tone guarantees a contrast ratio ≥ 4.5. - -## For more information - -See https://m3.material.io/foundations/glossary for more Material terms. diff --git a/concepts/contrast_for_accessibility.md b/concepts/contrast_for_accessibility.md deleted file mode 100644 index ebacb60f..00000000 --- a/concepts/contrast_for_accessibility.md +++ /dev/null @@ -1,117 +0,0 @@ -# Contrast for Accessibility - -## Contrast standards - -Google Accessibility Rating (GAR) are a set of guidelines for ensuring digital -products are accessible to people with disabilities. Color contrast is a -critical component of GAR compliance. - -For web apps, this means adhering to WCAG’s contrast ratio recommendations. -Sufficient contrast is vital in cases where we aim to make content easily -readable for all users, including those with visual impairments. This can be -achieved by using colors that provide enough contrast between the text and -background. - -### Contrast ratio - -Color contrast ratio refers to the difference in tone or lightness, without -considering the hue or chroma. A helpful way to think about a user interface -with good contrast ratios is that it remains functional even in its gray-scale -format. - -Contrast ratio is based on `Y`, a component in the CIEXYZ color space that -measures brightness. `Y` is in a one-to-one relationship with `L*` from CIELab. -Given two colors where the lighter color's `Y` is `yL` and the darker color's -`Y` is `yD`, the contrast ratio is defined as: - -``` -contrast_ratio = (yL + 5.0) / (yD + 5.0) -``` - -Examples: - -- The contrast ratio between a color and itself is 1.0. -- The contrast ratio between black and white is 21.0. -- Contrast ratios can range from 1 to 21 (commonly written 1:1 to 21:1), think - black text on a white background. - -When we say "not enough contrast", it means that the contrast ratio between the -background and foreground colors is not sufficiently high for a threshold. For -example, a difference of 40 in tone guarantees a WCAG contrast ratio ≥ 3.0; a -difference of 50 in tone guarantees a contrast ratio ≥ 4.5. Generally, text is -considered legible against a background when the two colors have a contrast -ratio of at least 4.5. - -## How MCU schemes comply GAR/WCAG - -The color schemes for default, medium and high contrast levels are designed -according to various contrast ratios specified at each level for text and -non-text elements. These contrast ratios operate in two ways: - -- **Guaranteed minimum contrast ratios**: defined based on GAR/WCAG standards. - Colors meet or exceed these ratios on the relevant UI elements. - -- **Discretionary contrast ratios**: defined based on desirable visual design. - Colors approach these ratios on the relevant UI elements. Because of the - physical limits of color, it may be impossible for those colors to reach or - exceed these ratios, which is why they operate as targets rather than - guaranteed minimums. - -#### Default contrast - -- Meets AA accessibility level - - - **Guaranteed minimum contrast ratios:** - - - 4.5:1 for all text and icons - - 3:1 for required non-text elements (GAR/WCAG standards allow certain - non-text elements to fall below 3:1 contrast based on other design - criteria) - - - **Discretionary contrast ratios:** - - - 7:1 for higher emphasis text - -#### Medium contrast - -- Exceeds AA accessibility level - - - **Guaranteed minimum contrast ratios:** - - - 4.5:1 for all text and icons - - 3:1 for all non-text elements, including those not required to meet - 3:1 - - - **Discretionary contrast ratios:** - - - 7:1 for text - - 11:1 for higher emphasis text - -#### High contrast - -- Meets AAA accessibility level - - - **Guaranteed minimum contrast ratios:** - - - 7:1 for all text and icons - - 4.5:1 for all non-text elements - - - **Discretionary contrast ratios:** - - - 11:1 for text - - 21:1 for higher emphasis text - -## How MCU derives schemes for accessibility - -MCU achieves GAR/WCAG compliance through: - -- **Color Roles:** Assigning semantic roles to colors (e.g., primary, - secondary, background) ensures accessibility. The color system is built on - accessible color pairings; MCU measures the contrast ratio between adjacent - colors or overlaid colors (foreground / background) and adjusts them - accordingly to meet the required contrast ratio. These color pairs provide - an accessible minimum of 3:1 contrast. - -- **Contrast libraries:** These libraries provide pre-defined color palettes - and algorithms to adjust tone of the of colors in the pair to reach the - target contrast ratio. diff --git a/concepts/dynamic_color_scheme.md b/concepts/dynamic_color_scheme.md deleted file mode 100644 index baa8d716..00000000 --- a/concepts/dynamic_color_scheme.md +++ /dev/null @@ -1,80 +0,0 @@ -# Dynamic Color Scheme - -## Color space in MCU - -Material uses a color spaces called HCT, which quantifies all colors using three -dimensions, Hue, Chroma, and Tone. The color space enables the system to create -and manipulate colors in flexible but predictable ways and allows designers to -identify and relate colors. - -**Hue** quantifies the perception of a color as red, yellow, blue, and so on. -Hue is quantified by a number ranging from 0 to 360 and is a circular spectrum. -That is, values 0 and 360 are the same hue. - -**Chroma** describes how colorful or neutral, gray, a color appears. Chroma is -quantified by a number ranging from 0, completely gray, to theoretically -infinite, most vibrant, though chroma values in HCT top out at roughly 120. - -**Tone** describes how light or dark a color appears. Tone is sometimes also -referred to as luminance. Tone is quantified by a number ranging from 0, pure -black, no luminance, to 100, pure white, complete luminance. For visual -accessibility, tone is crucial because it determines control contrast. Colors -with a greater difference in tone create higher contrast while those with a -smaller difference create lower contrast. - -## What is Dynamic Scheme? - -`DynamicScheme` is the most important interface for dynamic color clients. It is -a scheme that clients can use to choose what color goes to which elements of the -UI. A helpful analogy is to think of UI as a paint-by-number canvas, with color -roles representing the "numbers" and `DynamicScheme` acting as a guideline to -map from those numbers to actual colors. `DynamicScheme` abstracts away the -exact color values, and the app developers only need to choose which color role -to use at each element of the UI. - -More specifically, `DynamicScheme` comprises assignments of color values from -tonal palettes generated from user or app developer's preference to color roles. -The assignment focuses on meeting the requirements of contrast control for -visual accessibility and/or color fidelity for visual expression and trueness of -colors. The requirements comprise both hard constraints, such as accessibility -and fidelity, and soft constraints, such as visual preferences. - -## How to generate Dynamic Scheme - -Material color schemes start from a source color, a single color from which all -other scheme colors are derived. Source colors can be picked by a designer, or -if the scheme is based on an image like a user's wallpaper, they can be -extracted through a process called quantization. Quantization filters an image -down to its most representative colors. One of those colors is selected as the -source color. - -First, the color algorithm systematically manipulates the source color's hue and -chroma to create four additional visually complementary key colors. - -Next, those five key colors - the source color plus the four additional colors - -are each used to create a tonal palette. The tonal palette contains 13 tones -from black, tone 0, to white, tone 100. Lower tones are darker in luminance, and -higher tones are lighter in luminance. This full set of five tonal palettes is -the basis of a Material color scheme. Individual tones are selected from each -palette and assigned to color roles within a scheme. - -The variety of colors in each scheme provide for different needs like -accessibility and expression. For example, color roles that may be used in -pairs, like container and on container colors, are chosen to maintain accessible -visual control contrast. Colors in the primary, secondary, and tertiary groups -maintain those contrasts while providing a range of style for visual expression. -Both light and dark schemes are created from this process. - -## Applying colors to apps using design tokens - -Colors are applied using design tokens, which store values for small, repeated -design decisions such as the color that make up a design system's visual style. -A Material token consists of a meaningful code like name and its associated -value. This allows styles to be applied consistently across designs, code, -tools, and platforms. - -## For more information - -See -[How the system works](https://m3.material.io/styles/color/system/how-the-system-works) -for more information on Material color system. diff --git a/concepts/images/content_based_color.png b/concepts/images/content_based_color.png deleted file mode 100644 index e3996437..00000000 Binary files a/concepts/images/content_based_color.png and /dev/null differ diff --git a/concepts/images/fidelity_spec.png b/concepts/images/fidelity_spec.png deleted file mode 100644 index dbabca84..00000000 Binary files a/concepts/images/fidelity_spec.png and /dev/null differ diff --git a/concepts/images/hue_chroma_spec.png b/concepts/images/hue_chroma_spec.png deleted file mode 100644 index 3792b709..00000000 Binary files a/concepts/images/hue_chroma_spec.png and /dev/null differ diff --git a/concepts/images/orange.png b/concepts/images/orange.png deleted file mode 100644 index d3a6fcfb..00000000 Binary files a/concepts/images/orange.png and /dev/null differ diff --git a/concepts/images/tone_spec.png b/concepts/images/tone_spec.png deleted file mode 100644 index fec5324f..00000000 Binary files a/concepts/images/tone_spec.png and /dev/null differ diff --git a/concepts/images/wallpaper_based_color.png b/concepts/images/wallpaper_based_color.png deleted file mode 100644 index b48f22dc..00000000 Binary files a/concepts/images/wallpaper_based_color.png and /dev/null differ diff --git a/concepts/scheme_generation.md b/concepts/scheme_generation.md deleted file mode 100644 index c4df8273..00000000 --- a/concepts/scheme_generation.md +++ /dev/null @@ -1,90 +0,0 @@ -# MCU Scheme Generation - -## Requirements for Dynamic Scheme - -As described in [Dynamic Color Scheme](dynamic_color_scheme.md), `DynamicScheme` -generation aims to generate colors that satisfy constraints on visual -accessibility and visual expression and trueness of colors. - -### Hard constraints - -1. The contrast ratio between the foreground and background should fall within - a specified range. -1. Certain color roles ought to fall within a specified range of tones. -1. Tone delta between x and xContainer pairs, such as primary and - primaryContainer, should be higher than a minimum. -1. secondaryContainer prioritizes matching chroma over tone. This implies that - it may adjust tone, in a specific direction, to achieve chroma as close as - possible to the desired chroma. -1. tertiaryContainer should not be disliked, otherwise it would be lightened. - -### Soft constraints - -1. Tone should be as close to a "reference standard" as possible. -1. The distribution of tones should be even across colors. -1. The contrast level should ideally be at a certain level, but it is not - required. - -## How MCU derives Dynamic Scheme - -Above constraints are expressed as algebraic formulas and solved in the -following steps: - -### 1. Starting tone specs - -MCU assigns all colors a "starting" tone value according to design spec. All -colors are assigned one starting tone for the light theme and one for dark -theme. For example, primary uses Tone 40 (more white) in Light theme and Tone 80 -in Dark theme - -![Tone spec showing tone used for color roles](images/tone_spec.png) - -In non-fidelity schemes, the tone level for each dynamic color remains fixed. In -fidelity schemes, MCU can adjust the tones to achieve a preferred chroma as -explained in Step 3. - -### 2. Hue & chroma spec - -MCU assigns all colors their hue and chroma values according to the scheme -variant spec. - -![Hue and chroma specification](images/hue_chroma_spec.png) - -For instance, the scheme variant here sets the primary palette to use the same -hue with the source color (H270), while the tertiary palette shifts the hue by -30 (H300). - -### 3. Fidelity tone adjustments - -After the above steps (1) and (2), each color in the scheme has the necessary -HCT values to create a color. However, the resulting color may need revision -because it is visually suboptimal or "impossible", i.e. the color of the given -Hue cannot reach the assigned Chroma at the assigned Tone. - -![Fidelity adjustment spec](images/fidelity_spec.png) - -To revise such colors, MCU can adjust their tones using one of two possible -"fidelity" behaviors. - -- Source: Adjust the color's tone to match that of the source color. -- Reach Chroma: Adjust the color's tone until the color's chroma reaches that - specified by the Variant. - -### 4. Global tone constraints - -While adjusting colors' tones, MCU follows global constraints to ensure visual -hierarchy and quality. Where fidelity tone adjustments and global tone -constraints conflict, global tone constraints take priority. - -### 5. Contrast tone adjustments & requirements - -Finally, MCU adjusts tones to meet contrast requirements by assessing the -contrast ratios between colors and their assigned backgrounds. In -color/background pairings where the target contrast ratio is not met, MCU -adjusts the tone of the foreground color to reach the target ratio, according to -the contrast level that is set. - -Note that contrast ratios may not always reach the targets. For example, if a -background color is a mid-tone T50, its highest contrast on-color (white) only -reaches a contrast ratio of ~4.5:1. However, the targets will ensure that -GAR/WCAAG minimum requirements are met. diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt new file mode 100644 index 00000000..c27133a2 --- /dev/null +++ b/cpp/CMakeLists.txt @@ -0,0 +1,33 @@ +cmake_minimum_required(VERSION 3.15) +project(MyProject LANGUAGES CXX) + +# add_executable(material-colors src/main.cc) +add_library(material-colors STATIC src/mylib/mylib.cc) + +target_link_libraries(material-colors PUBLIC material_color_utilities_lib) + +set_property(TARGET material-colors PROPERTY CXX_STANDARD 17) +set_property(TARGET material-colors PROPERTY CXX_STANDARD_REQUIRED ON) +set_target_properties(material-colors PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY ../../libs +) + +add_library(material_color_utilities_lib STATIC + src/material-color-utilities/cpp/cam/hct.cc + src/material-color-utilities/cpp/cam/hct_solver.cc + src/material-color-utilities/cpp/cam/cam.cc + src/material-color-utilities/cpp/cam/viewing_conditions.cc + src/material-color-utilities/cpp/utils/utils.cc +) +set_target_properties(material_color_utilities_lib PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY ../../libs +) + +target_include_directories(material-colors PRIVATE + src/material-color-utilities + src +) + +target_include_directories(material_color_utilities_lib PRIVATE + src/material-color-utilities +) \ No newline at end of file diff --git a/cpp/blend/blend.cc b/cpp/blend/blend.cc deleted file mode 100644 index 4b8c34b5..00000000 --- a/cpp/blend/blend.cc +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/blend/blend.h" - -#include -#include - -#include "cpp/cam/cam.h" -#include "cpp/cam/hct.h" -#include "cpp/cam/viewing_conditions.h" -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -Argb BlendHarmonize(const Argb design_color, const Argb key_color) { - Hct from_hct(design_color); - Hct to_hct(key_color); - double difference_degrees = DiffDegrees(from_hct.get_hue(), to_hct.get_hue()); - double rotation_degrees = std::min(difference_degrees * 0.5, 15.0); - double output_hue = SanitizeDegreesDouble( - from_hct.get_hue() + - rotation_degrees * - RotationDirection(from_hct.get_hue(), to_hct.get_hue())); - from_hct.set_hue(output_hue); - return from_hct.ToInt(); -} - -Argb BlendHctHue(const Argb from, const Argb to, const double amount) { - int ucs = BlendCam16Ucs(from, to, amount); - Hct ucs_hct(ucs); - Hct from_hct(from); - from_hct.set_hue(ucs_hct.get_hue()); - return from_hct.ToInt(); -} - -Argb BlendCam16Ucs(const Argb from, const Argb to, const double amount) { - Cam from_cam = CamFromInt(from); - Cam to_cam = CamFromInt(to); - - const double a_j = from_cam.jstar; - const double a_a = from_cam.astar; - const double a_b = from_cam.bstar; - - const double b_j = to_cam.jstar; - const double b_a = to_cam.astar; - const double b_b = to_cam.bstar; - - const double jstar = a_j + (b_j - a_j) * amount; - const double astar = a_a + (b_a - a_a) * amount; - const double bstar = a_b + (b_b - a_b) * amount; - - const Cam blended = CamFromUcsAndViewingConditions(jstar, astar, bstar, - kDefaultViewingConditions); - return IntFromCam(blended); -} - -} // namespace material_color_utilities diff --git a/cpp/blend/blend.h b/cpp/blend/blend.h deleted file mode 100644 index ca730ae5..00000000 --- a/cpp/blend/blend.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_BLEND_BLEND_H_ -#define CPP_BLEND_BLEND_H_ - -#include - -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -Argb BlendHarmonize(const Argb design_color, const Argb key_color); -Argb BlendHctHue(const Argb from, const Argb to, const double amount); -Argb BlendCam16Ucs(const Argb from, const Argb to, const double amount); - -} // namespace material_color_utilities -#endif // CPP_BLEND_BLEND_H_ diff --git a/cpp/blend/blend_test.cc b/cpp/blend/blend_test.cc deleted file mode 100644 index 20462d25..00000000 --- a/cpp/blend/blend_test.cc +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/blend/blend.h" - -#include "testing/base/public/gunit.h" -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -namespace { -TEST(BlendTest, RedToBlue) { - int blended = BlendHctHue(0xffff0000, 0xff0000ff, 0.8); - EXPECT_EQ(HexFromArgb(blended), "ff905eff"); -} -} // namespace - -} // namespace material_color_utilities diff --git a/cpp/contrast/contrast.cc b/cpp/contrast/contrast.cc deleted file mode 100644 index c94d444e..00000000 --- a/cpp/contrast/contrast.cc +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/contrast/contrast.h" - -#include -#include - -#include "cpp/utils/utils.h" - -namespace material_color_utilities { -// Given a color and a contrast ratio to reach, the luminance of a color that -// reaches that ratio with the color can be calculated. However, that luminance -// may not contrast as desired, i.e. the contrast ratio of the input color -// and the returned luminance may not reach the contrast ratio asked for. -// -// When the desired contrast ratio and the result contrast ratio differ by -// more than this amount, an error value should be returned, or the method -// should be documented as 'unsafe', meaning, it will return a valid luminance -// but that luminance may not meet the requested contrast ratio. -// -// 0.04 selected because it ensures the resulting ratio rounds to the -// same tenth. -constexpr double CONTRAST_RATIO_EPSILON = 0.04; - -// Color spaces that measure luminance, such as Y in XYZ, L* in L*a*b*, -// or T in HCT, are known as perceptual accurate color spaces. -// -// To be displayed, they must gamut map to a "display space", one that has -// a defined limit on the number of colors. Display spaces include sRGB, -// more commonly understood as RGB/HSL/HSV/HSB. -// -// Gamut mapping is undefined and not defined by the color space. Any -// gamut mapping algorithm must choose how to sacrifice accuracy in hue, -// saturation, and/or lightness. -// -// A principled solution is to maintain lightness, thus maintaining -// contrast/a11y, maintain hue, thus maintaining aesthetic intent, and reduce -// chroma until the color is in gamut. -// -// HCT chooses this solution, but, that doesn't mean it will _exactly_ matched -// desired lightness, if only because RGB is quantized: RGB is expressed as -// a set of integers: there may be an RGB color with, for example, -// 47.892 lightness, but not 47.891. -// -// To allow for this inherent incompatibility between perceptually accurate -// color spaces and display color spaces, methods that take a contrast ratio -// and luminance, and return a luminance that reaches that contrast ratio for -// the input luminance, purposefully darken/lighten their result such that -// the desired contrast ratio will be reached even if inaccuracy is introduced. -// -// 0.4 is generous, ex. HCT requires much less delta. It was chosen because -// it provides a rough guarantee that as long as a percetual color space -// gamut maps lightness such that the resulting lightness rounds to the same -// as the requested, the desired contrast ratio will be reached. -constexpr double LUMINANCE_GAMUT_MAP_TOLERANCE = 0.4; - -double RatioOfYs(double y1, double y2) { - double lighter = y1 > y2 ? y1 : y2; - double darker = (lighter == y2) ? y1 : y2; - return (lighter + 5.0) / (darker + 5.0); -} - -double RatioOfTones(double tone_a, double tone_b) { - tone_a = std::clamp(tone_a, 0.0, 100.0); - tone_b = std::clamp(tone_b, 0.0, 100.0); - return RatioOfYs(YFromLstar(tone_a), YFromLstar(tone_b)); -} - -double Lighter(double tone, double ratio) { - if (tone < 0.0 || tone > 100.0) { - return -1.0; - } - - double dark_y = YFromLstar(tone); - double light_y = ratio * (dark_y + 5.0) - 5.0; - double real_contrast = RatioOfYs(light_y, dark_y); - double delta = abs(real_contrast - ratio); - if (real_contrast < ratio && delta > CONTRAST_RATIO_EPSILON) { - return -1; - } - - // ensure gamut mapping, which requires a 'range' on tone, will still result - // the correct ratio by darkening slightly. - double value = LstarFromY(light_y) + LUMINANCE_GAMUT_MAP_TOLERANCE; - if (value < 0 || value > 100) { - return -1; - } - return value; -} - -double Darker(double tone, double ratio) { - if (tone < 0.0 || tone > 100.0) { - return -1.0; - } - - double light_y = YFromLstar(tone); - double dark_y = ((light_y + 5.0) / ratio) - 5.0; - double real_contrast = RatioOfYs(light_y, dark_y); - - double delta = abs(real_contrast - ratio); - if (real_contrast < ratio && delta > CONTRAST_RATIO_EPSILON) { - return -1; - } - - // ensure gamut mapping, which requires a 'range' on tone, will still result - // the correct ratio by darkening slightly. - double value = LstarFromY(dark_y) - LUMINANCE_GAMUT_MAP_TOLERANCE; - if (value < 0 || value > 100) { - return -1; - } - return value; -} - -double LighterUnsafe(double tone, double ratio) { - double lighter_safe = Lighter(tone, ratio); - return (lighter_safe < 0.0) ? 100.0 : lighter_safe; -} - -double DarkerUnsafe(double tone, double ratio) { - double darker_safe = Darker(tone, ratio); - return (darker_safe < 0.0) ? 0.0 : darker_safe; -} - -} // namespace material_color_utilities diff --git a/cpp/contrast/contrast.h b/cpp/contrast/contrast.h deleted file mode 100644 index 6ff0bdec..00000000 --- a/cpp/contrast/contrast.h +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_CONTRAST_CONTRAST_H_ -#define CPP_CONTRAST_CONTRAST_H_ - -/** - * Utility methods for calculating contrast given two colors, or calculating a - * color given one color and a contrast ratio. - * - * Contrast ratio is calculated using XYZ's Y. When linearized to match human - * perception, Y becomes HCT's tone and L*a*b*'s' L*. Informally, this is the - * lightness of a color. - * - * Methods refer to tone, T in the the HCT color space. - * Tone is equivalent to L* in the L*a*b* color space, or L in the LCH color - * space. - */ -namespace material_color_utilities { -/** - * @return a contrast ratio, which ranges from 1 to 21. - * @param tone_a Tone between 0 and 100. Values outside will be clamped. - * @param tone_b Tone between 0 and 100. Values outside will be clamped. - */ -double RatioOfTones(double tone_a, double tone_b); - -/** - * @return a tone >= [tone] that ensures [ratio]. - * Return value is between 0 and 100. - * Returns -1 if [ratio] cannot be achieved with [tone]. - * - * @param tone Tone return value must contrast with. - * Range is 0 to 100. Invalid values will result in -1 being returned. - * @param ratio Contrast ratio of return value and [tone]. - * Range is 1 to 21, invalid values have undefined behavior. - */ -double Lighter(double tone, double ratio); - -/** - * @return a tone <= [tone] that ensures [ratio]. - * Return value is between 0 and 100. - * Returns -1 if [ratio] cannot be achieved with [tone]. - * - * @param tone Tone return value must contrast with. - * Range is 0 to 100. Invalid values will result in -1 being returned. - * @param ratio Contrast ratio of return value and [tone]. - * Range is 1 to 21, invalid values have undefined behavior. - */ -double Darker(double tone, double ratio); - -/** - * @return a tone >= [tone] that ensures [ratio]. - * Return value is between 0 and 100. - * Returns 100 if [ratio] cannot be achieved with [tone]. - * - * This method is unsafe because the returned value is guaranteed to be in - * bounds for tone, i.e. between 0 and 100. However, that value may not reach - * the [ratio] with [tone]. For example, there is no color lighter than T100. - * - * @param tone Tone return value must contrast with. - * Range is 0 to 100. Invalid values will result in 100 being returned. - * @param ratio Desired contrast ratio of return value and tone parameter. - * Range is 1 to 21, invalid values have undefined behavior. - */ -double LighterUnsafe(double tone, double ratio); - -/** - * @return a tone <= [tone] that ensures [ratio]. - * Return value is between 0 and 100. - * Returns 0 if [ratio] cannot be achieved with [tone]. - * - * This method is unsafe because the returned value is guaranteed to be in - * bounds for tone, i.e. between 0 and 100. However, that value may not reach - * the [ratio] with [tone]. For example, there is no color darker than T0. - * - * @param tone Tone return value must contrast with. - * Range is 0 to 100. Invalid values will result in 0 being returned. - * @param ratio Desired contrast ratio of return value and tone parameter. - * Range is 1 to 21, invalid values have undefined behavior. - */ -double DarkerUnsafe(double tone, double ratio); -} // namespace material_color_utilities - -#endif // CPP_CONTRAST_CONTRAST_H_ diff --git a/cpp/contrast/contrast_test.cc b/cpp/contrast/contrast_test.cc deleted file mode 100644 index 38a85c0c..00000000 --- a/cpp/contrast/contrast_test.cc +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/contrast/contrast.h" - -#include "testing/base/public/gunit.h" - -namespace material_color_utilities { - -namespace { -TEST(ContrastTest, RatioOfTonesOutOfBoundsInput) { - EXPECT_NEAR(RatioOfTones(-10.0, 110.0), 21.0, 0.001); -} - -TEST(ContrastTest, LighterImpossibleRatioErrors) { - EXPECT_NEAR(Lighter(90.0, 10.0), -1.0, 0.001); -} - -TEST(ContrastTest, LighterOutOfBoundsInputAboveErrors) { - EXPECT_NEAR(Lighter(110.0, 2.0), -1.0, 0.001); -} - -TEST(ContrastTest, LighterOutOfBoundsInputBelowErrors) { - EXPECT_NEAR(Lighter(-10.0, 2.0), -1.0, 0.001); -} - -TEST(ContrastTest, LighterUnsafeReturnsMaxTone) { - EXPECT_NEAR(LighterUnsafe(100.0, 2.0), 100, 0.001); -} - -TEST(ContrastTest, DarkerImpossibleRatioErrors) { - EXPECT_NEAR(Darker(10.0, 20.0), -1.0, 0.001); -} - -TEST(ContrastTest, DarkerOutOfBoundsInputAboveErrors) { - EXPECT_NEAR(Darker(110.0, 2.0), -1.0, 0.001); -} - -TEST(ContrastTest, DarkerOutOfBoundsInputBelowErrors) { - EXPECT_NEAR(Darker(-10.0, 2.0), -1.0, 0.001); -} - -TEST(ContrastTest, DarkerUnsafeReturnsMinTone) { - EXPECT_NEAR(DarkerUnsafe(0.0, 2.0), 0.0, 0.001); -} -} // namespace - -} // namespace material_color_utilities diff --git a/cpp/dislike/dislike.cc b/cpp/dislike/dislike.cc deleted file mode 100644 index a07f3607..00000000 --- a/cpp/dislike/dislike.cc +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/dislike/dislike.h" - -#include - -#include "cpp/cam/hct.h" - -namespace material_color_utilities { - -bool IsDisliked(Hct hct) { - double roundedHue = std::round(hct.get_hue()); - - bool hue_passes = roundedHue >= 90.0 && roundedHue <= 111.0; - bool chroma_passes = std::round(hct.get_chroma()) > 16.0; - bool tone_passes = std::round(hct.get_tone()) < 65.0; - - return hue_passes && chroma_passes && tone_passes; -} - -Hct FixIfDisliked(Hct hct) { - if (IsDisliked(hct)) { - return Hct(hct.get_hue(), hct.get_chroma(), 70.0); - } - - return hct; -} -} // namespace material_color_utilities diff --git a/cpp/dislike/dislike.h b/cpp/dislike/dislike.h deleted file mode 100644 index 3d09fab6..00000000 --- a/cpp/dislike/dislike.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_DISLIKE_DISLIKE_H_ -#define CPP_DISLIKE_DISLIKE_H_ - -#include "cpp/cam/hct.h" - -namespace material_color_utilities { - -/** - * Checks and/or fixes universally disliked colors. - * - * Color science studies of color preference indicate universal distaste for - * dark yellow-greens, and also show this is correlated to distate for - * biological waste and rotting food. - * - * See Palmer and Schloss, 2010 or Schloss and Palmer's Chapter 21 in Handbook - * of Color Psychology (2015). - */ - -/** - * @return whether the color is disliked. - * - * Disliked is defined as a dark yellow-green that is not neutral. - * @param hct The color to be tested. - */ -bool IsDisliked(Hct hct); - -/** - * If a color is disliked, lightens it to make it likable. - * - * The original color is not modified. - * - * @param hct The color to be tested (and fixed, if needed). - * @return The original color if it is not disliked; otherwise, the fixed - * color. - */ -Hct FixIfDisliked(Hct hct); -} // namespace material_color_utilities - -#endif // CPP_DISLIKE_DISLIKE_H_ diff --git a/cpp/dislike/dislike_test.cc b/cpp/dislike/dislike_test.cc deleted file mode 100644 index 0d2b2079..00000000 --- a/cpp/dislike/dislike_test.cc +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/dislike/dislike.h" - -#include "testing/base/public/gunit.h" -#include "cpp/cam/hct.h" - -namespace material_color_utilities { - -namespace { - -using testing::TestWithParam; -using testing::Values; -using SkinToneTest = TestWithParam; - -TEST_P(SkinToneTest, MonkSkinToneScaleColorsLiked) { - int argb = GetParam(); - - EXPECT_FALSE(IsDisliked(Hct(argb))); -} - -INSTANTIATE_TEST_SUITE_P(DislikeTest, SkinToneTest, - Values(0xfff6ede4, 0xfff3e7db, 0xfff7ead0, 0xffeadaba, - 0xffd7bd96, 0xffa07e56, 0xff825c43, 0xff604134, - 0xff3a312a, 0xff292420)); - -using BileTest = TestWithParam; - -TEST_P(BileTest, BileColorsDisliked) { - int argb = GetParam(); - - EXPECT_TRUE(IsDisliked(Hct(argb))); -} - -INSTANTIATE_TEST_SUITE_P(DislikeTest, BileTest, - Values(0xff95884B, 0xff716B40, 0xffB08E00, 0xff4C4308, - 0xff464521)); - -using BileFixingTest = TestWithParam; - -TEST_P(BileFixingTest, BileColorsFixed) { - int argb = GetParam(); - - Hct bile_color = Hct(argb); - EXPECT_TRUE(IsDisliked(bile_color)); - Hct fixed_bile_color = FixIfDisliked(bile_color); - EXPECT_FALSE(IsDisliked(fixed_bile_color)); -} - -INSTANTIATE_TEST_SUITE_P(DislikeTest, BileFixingTest, - Values(0xff95884B, 0xff716B40, 0xffB08E00, 0xff4C4308, - 0xff464521)); - - -TEST(DislikeTest, Tone67Liked) { - Hct color = Hct(100.0, 50.0, 67.0); - EXPECT_FALSE(IsDisliked(color)); - EXPECT_EQ(FixIfDisliked(color).ToInt(), color.ToInt()); -} - -} // namespace - -} // namespace material_color_utilities diff --git a/cpp/dynamiccolor/contrast_curve.h b/cpp/dynamiccolor/contrast_curve.h deleted file mode 100644 index 864e8cff..00000000 --- a/cpp/dynamiccolor/contrast_curve.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_DYNAMICCOLOR_CONTRAST_CURVE_H_ -#define CPP_DYNAMICCOLOR_CONTRAST_CURVE_H_ - -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -/** - * A class containing a value that changes with the contrast level. - * - * Usually represents the contrast requirements for a dynamic color on its - * background. The four values correspond to values for contrast levels -1.0, - * 0.0, 0.5, and 1.0, respectively. - */ -struct ContrastCurve { - double low; - double normal; - double medium; - double high; - - /** - * Creates a `ContrastCurve` object. - * - * @param low Value for contrast level -1.0 - * @param normal Value for contrast level 0.0 - * @param medium Value for contrast level 0.5 - * @param high Value for contrast level 1.0 - */ - ContrastCurve(double low, double normal, double medium, double high) - : low(low), normal(normal), medium(medium), high(high) {} - - /** - * Returns the value at a given contrast level. - * - * @param contrastLevel The contrast level. 0.0 is the default (normal); -1.0 - * is the lowest; 1.0 is the highest. - * @return The value. For contrast ratios, a number between 1.0 and 21.0. - */ - double get(double contrastLevel) { - if (contrastLevel <= -1.0) { - return low; - } else if (contrastLevel < 0.0) { - return Lerp(low, normal, (contrastLevel - (-1)) / 1); - } else if (contrastLevel < 0.5) { - return Lerp(normal, medium, (contrastLevel - 0) / 0.5); - } else if (contrastLevel < 1.0) { - return Lerp(medium, high, (contrastLevel - 0.5) / 0.5); - } else { - return high; - } - } -}; - -} // namespace material_color_utilities - -#endif // CPP_DYNAMICCOLOR_CONTRAST_CURVE_H_ diff --git a/cpp/dynamiccolor/dynamic_color.cc b/cpp/dynamiccolor/dynamic_color.cc deleted file mode 100644 index 3f4259d9..00000000 --- a/cpp/dynamiccolor/dynamic_color.cc +++ /dev/null @@ -1,306 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/dynamiccolor/dynamic_color.h" - -#include -#include -#include -#include -#include -#include - -#include "cpp/cam/hct.h" -#include "cpp/contrast/contrast.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" -#include "cpp/dynamiccolor/tone_delta_pair.h" -#include "cpp/palettes/tones.h" - -namespace material_color_utilities { - -using std::function; -using std::nullopt; -using std::optional; - -using DoubleFunction = function; - -template -optional SafeCall(optional(const T&)>> f, const T& x) { - if (f == nullopt) { - return nullopt; - } else { - return f.value()(x); - } -} - -template -optional SafeCallCleanResult(optional> f, T x) { - if (f == nullopt) { - return nullopt; - } else { - return f.value()(x); - } -} - -double ForegroundTone(double bg_tone, double ratio) { - double lighter_tone = LighterUnsafe(/*tone*/ bg_tone, /*ratio*/ ratio); - double darker_tone = DarkerUnsafe(/*tone*/ bg_tone, /*ratio*/ ratio); - double lighter_ratio = RatioOfTones(lighter_tone, bg_tone); - double darker_ratio = RatioOfTones(darker_tone, bg_tone); - double prefer_lighter = TonePrefersLightForeground(bg_tone); - - if (prefer_lighter) { - double negligible_difference = - (abs(lighter_ratio - darker_ratio) < 0.1 && lighter_ratio < ratio && - darker_ratio < ratio); - return lighter_ratio >= ratio || lighter_ratio >= darker_ratio || - negligible_difference - ? lighter_tone - : darker_tone; - } else { - return darker_ratio >= ratio || darker_ratio >= lighter_ratio - ? darker_tone - : lighter_tone; - } -} - -double EnableLightForeground(double tone) { - if (TonePrefersLightForeground(tone) && !ToneAllowsLightForeground(tone)) { - return 49.0; - } - return tone; -} - -bool TonePrefersLightForeground(double tone) { return round(tone) < 60; } - -bool ToneAllowsLightForeground(double tone) { return round(tone) <= 49; } - -/** - * Default constructor. - */ -DynamicColor::DynamicColor( - std::string name, std::function palette, - std::function tone, bool is_background, - - std::optional> background, - std::optional> - second_background, - std::optional contrast_curve, - std::optional> - tone_delta_pair) - : name_(name), - palette_(palette), - tone_(tone), - is_background_(is_background), - background_(background), - second_background_(second_background), - contrast_curve_(contrast_curve), - tone_delta_pair_(tone_delta_pair) {} - -DynamicColor DynamicColor::FromPalette( - std::string name, std::function palette, - std::function tone) { - return DynamicColor(name, palette, tone, - /*is_background=*/false, - /*background=*/nullopt, - /*second_background=*/nullopt, - /*contrast_curve=*/nullopt, - /*tone_delta_pair=*/nullopt); -} - -Argb DynamicColor::GetArgb(const DynamicScheme& scheme) { - return palette_(scheme).get(GetTone(scheme)); -} - -Hct DynamicColor::GetHct(const DynamicScheme& scheme) { - return Hct(GetArgb(scheme)); -} - -double DynamicColor::GetTone(const DynamicScheme& scheme) { - bool decreasingContrast = scheme.contrast_level < 0; - - // Case 1: dual foreground, pair of colors with delta constraint. - if (tone_delta_pair_ != std::nullopt) { - ToneDeltaPair tone_delta_pair = tone_delta_pair_.value()(scheme); - DynamicColor role_a = tone_delta_pair.role_a_; - DynamicColor role_b = tone_delta_pair.role_b_; - double delta = tone_delta_pair.delta_; - TonePolarity polarity = tone_delta_pair.polarity_; - bool stay_together = tone_delta_pair.stay_together_; - - DynamicColor bg = background_.value()(scheme); - double bg_tone = bg.GetTone(scheme); - - bool a_is_nearer = - (polarity == TonePolarity::kNearer || - (polarity == TonePolarity::kLighter && !scheme.is_dark) || - (polarity == TonePolarity::kDarker && scheme.is_dark)); - DynamicColor nearer = a_is_nearer ? role_a : role_b; - DynamicColor farther = a_is_nearer ? role_b : role_a; - bool am_nearer = this->name_ == nearer.name_; - double expansion_dir = scheme.is_dark ? 1 : -1; - - // 1st round: solve to min, each - double n_contrast = - nearer.contrast_curve_.value().get(scheme.contrast_level); - double f_contrast = - farther.contrast_curve_.value().get(scheme.contrast_level); - - // If a color is good enough, it is not adjusted. - // Initial and adjusted tones for `nearer` - double n_initial_tone = nearer.tone_(scheme); - double n_tone = RatioOfTones(bg_tone, n_initial_tone) >= n_contrast - ? n_initial_tone - : ForegroundTone(bg_tone, n_contrast); - // Initial and adjusted tones for `farther` - double f_initial_tone = farther.tone_(scheme); - double f_tone = RatioOfTones(bg_tone, f_initial_tone) >= f_contrast - ? f_initial_tone - : ForegroundTone(bg_tone, f_contrast); - - if (decreasingContrast) { - // If decreasing contrast, adjust color to the "bare minimum" - // that satisfies contrast. - n_tone = ForegroundTone(bg_tone, n_contrast); - f_tone = ForegroundTone(bg_tone, f_contrast); - } - - if ((f_tone - n_tone) * expansion_dir >= delta) { - // Good! Tones satisfy the constraint; no change needed. - } else { - // 2nd round: expand farther to match delta. - f_tone = std::clamp(n_tone + delta * expansion_dir, 0.0, 100.0); - if ((f_tone - n_tone) * expansion_dir >= delta) { - // Good! Tones now satisfy the constraint; no change needed. - } else { - // 3rd round: contract nearer to match delta. - n_tone = std::clamp(f_tone - delta * expansion_dir, 0.0, 100.0); - } - } - - // Avoids the 50-59 awkward zone. - if (50 <= n_tone && n_tone < 60) { - // If `nearer` is in the awkward zone, move it away, together with - // `farther`. - if (expansion_dir > 0) { - n_tone = 60; - f_tone = std::max(f_tone, n_tone + delta * expansion_dir); - } else { - n_tone = 49; - f_tone = std::min(f_tone, n_tone + delta * expansion_dir); - } - } else if (50 <= f_tone && f_tone < 60) { - if (stay_together) { - // Fixes both, to avoid two colors on opposite sides of the "awkward - // zone". - if (expansion_dir > 0) { - n_tone = 60; - f_tone = std::max(f_tone, n_tone + delta * expansion_dir); - } else { - n_tone = 49; - f_tone = std::min(f_tone, n_tone + delta * expansion_dir); - } - } else { - // Not required to stay together; fixes just one. - if (expansion_dir > 0) { - f_tone = 60; - } else { - f_tone = 49; - } - } - } - - // Returns `n_tone` if this color is `nearer`, otherwise `f_tone`. - return am_nearer ? n_tone : f_tone; - } else { - // Case 2: No contrast pair; just solve for itself. - double answer = tone_(scheme); - - if (background_ == std::nullopt) { - return answer; // No adjustment for colors with no background. - } - - double bg_tone = background_.value()(scheme).GetTone(scheme); - - double desired_ratio = contrast_curve_.value().get(scheme.contrast_level); - - if (RatioOfTones(bg_tone, answer) >= desired_ratio) { - // Don't "improve" what's good enough. - } else { - // Rough improvement. - answer = ForegroundTone(bg_tone, desired_ratio); - } - - if (decreasingContrast) { - answer = ForegroundTone(bg_tone, desired_ratio); - } - - if (is_background_ && 50 <= answer && answer < 60) { - // Must adjust - if (RatioOfTones(49, bg_tone) >= desired_ratio) { - answer = 49; - } else { - answer = 60; - } - } - - if (second_background_ != std::nullopt) { - // Case 3: Adjust for dual backgrounds. - - double bg_tone_1 = background_.value()(scheme).GetTone(scheme); - double bg_tone_2 = second_background_.value()(scheme).GetTone(scheme); - - double upper = std::max(bg_tone_1, bg_tone_2); - double lower = std::min(bg_tone_1, bg_tone_2); - - if (RatioOfTones(upper, answer) >= desired_ratio && - RatioOfTones(lower, answer) >= desired_ratio) { - return answer; - } - - // The darkest light tone that satisfies the desired ratio, - // or -1 if such ratio cannot be reached. - double lightOption = Lighter(upper, desired_ratio); - - // The lightest dark tone that satisfies the desired ratio, - // or -1 if such ratio cannot be reached. - double darkOption = Darker(lower, desired_ratio); - - // Tones suitable for the foreground. - std::vector availables; - if (lightOption != -1) { - availables.push_back(lightOption); - } - if (darkOption != -1) { - availables.push_back(darkOption); - } - - bool prefersLight = TonePrefersLightForeground(bg_tone_1) || - TonePrefersLightForeground(bg_tone_2); - if (prefersLight) { - return (lightOption < 0) ? 100 : lightOption; - } - if (availables.size() == 1) { - return availables[0]; - } - return (darkOption < 0) ? 0 : darkOption; - } - - return answer; - } -} - -} // namespace material_color_utilities diff --git a/cpp/dynamiccolor/dynamic_color.h b/cpp/dynamiccolor/dynamic_color.h deleted file mode 100644 index 92ad227b..00000000 --- a/cpp/dynamiccolor/dynamic_color.h +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_DYNAMICCOLOR_DYNAMIC_COLOR_H_ -#define CPP_DYNAMICCOLOR_DYNAMIC_COLOR_H_ - -#include -#include -#include - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/contrast_curve.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -struct ToneDeltaPair; - -/** - * Given a background tone, find a foreground tone, while ensuring they reach - * a contrast ratio that is as close to [ratio] as possible. - * - * [bgTone] Tone in HCT. Range is 0 to 100, undefined behavior when it falls - * outside that range. - * [ratio] The contrast ratio desired between [bgTone] and the return value. - */ -double ForegroundTone(double bg_tone, double ratio); - -/** - * Adjust a tone such that white has 4.5 contrast, if the tone is - * reasonably close to supporting it. - */ -double EnableLightForeground(double tone); - -/** - * Returns whether [tone] prefers a light foreground. - * - * People prefer white foregrounds on ~T60-70. Observed over time, and also - * by Andrew Somers during research for APCA. - * - * T60 used as to create the smallest discontinuity possible when skipping - * down to T49 in order to ensure light foregrounds. - * - * Since `tertiaryContainer` in dark monochrome scheme requires a tone of - * 60, it should not be adjusted. Therefore, 60 is excluded here. - */ -bool TonePrefersLightForeground(double tone); - -/** - * Returns whether [tone] can reach a contrast ratio of 4.5 with a lighter - * color. - */ -bool ToneAllowsLightForeground(double tone); - -/** - * @param name_ The name of the dynamic color. - * @param palette_ Function that provides a TonalPalette given - * DynamicScheme. A TonalPalette is defined by a hue and chroma, so this - * replaces the need to specify hue/chroma. By providing a tonal palette, when - * contrast adjustments are made, intended chroma can be preserved. - * @param tone_ Function that provides a tone given DynamicScheme. - * @param is_background_ Whether this dynamic color is a background, with - * some other color as the foreground. - * @param background_ The background of the dynamic color (as a function of a - * `DynamicScheme`), if it exists. - * @param second_background_ A second background of the dynamic color (as a - * function of a `DynamicScheme`), if it - * exists. - * @param contrast_curve_ A `ContrastCurve` object specifying how its contrast - * against its background should behave in various contrast levels options. - * @param tone_delta_pair_ A `ToneDeltaPair` object specifying a tone delta - * constraint between two colors. One of them must be the color being - * constructed. - */ -struct DynamicColor { - std::string name_; - std::function palette_; - std::function tone_; - bool is_background_; - - std::optional> background_; - std::optional> - second_background_; - std::optional contrast_curve_; - std::optional> - tone_delta_pair_; - - /** A convenience constructor, only requiring name, palette, and tone. */ - static DynamicColor FromPalette( - std::string name, - std::function palette, - std::function tone); - - Argb GetArgb(const DynamicScheme& scheme); - - Hct GetHct(const DynamicScheme& scheme); - - double GetTone(const DynamicScheme& scheme); - - /** The default constructor. */ - DynamicColor(std::string name, - std::function palette, - std::function tone, - bool is_background, - - std::optional> - background, - std::optional> - second_background, - std::optional contrast_curve, - std::optional> - tone_delta_pair); -}; - -} // namespace material_color_utilities - -#endif // CPP_DYNAMICCOLOR_DYNAMIC_COLOR_H_ diff --git a/cpp/dynamiccolor/dynamic_scheme.cc b/cpp/dynamiccolor/dynamic_scheme.cc deleted file mode 100644 index 170e99c5..00000000 --- a/cpp/dynamiccolor/dynamic_scheme.cc +++ /dev/null @@ -1,286 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/dynamiccolor/dynamic_scheme.h" - -#include -#include - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/material_dynamic_colors.h" -#include "cpp/dynamiccolor/variant.h" -#include "cpp/palettes/tones.h" -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -DynamicScheme::DynamicScheme(Hct source_color_hct, Variant variant, - double contrast_level, bool is_dark, - TonalPalette primary_palette, - TonalPalette secondary_palette, - TonalPalette tertiary_palette, - TonalPalette neutral_palette, - TonalPalette neutral_variant_palette, - std::optional error_palette) - : source_color_hct(source_color_hct), - variant(variant), - is_dark(is_dark), - contrast_level(contrast_level), - primary_palette(primary_palette), - secondary_palette(secondary_palette), - tertiary_palette(tertiary_palette), - neutral_palette(neutral_palette), - neutral_variant_palette(neutral_variant_palette), - error_palette(error_palette.value_or(TonalPalette(25.0, 84.0))) {} - -double DynamicScheme::GetRotatedHue(Hct source_color, std::vector hues, - std::vector rotations) { - double source_hue = source_color.get_hue(); - - if (rotations.size() == 1) { - return SanitizeDegreesDouble(source_color.get_hue() + rotations[0]); - } - int size = hues.size(); - for (int i = 0; i <= (size - 2); ++i) { - double this_hue = hues[i]; - double next_hue = hues[i + 1]; - if (this_hue < source_hue && source_hue < next_hue) { - return SanitizeDegreesDouble(source_hue + rotations[i]); - } - } - - return source_hue; -} - -Argb DynamicScheme::SourceColorArgb() const { return source_color_hct.ToInt(); } - -Argb DynamicScheme::GetPrimaryPaletteKeyColor() const { - return MaterialDynamicColors::PrimaryPaletteKeyColor().GetArgb(*this); -} - -Argb DynamicScheme::GetSecondaryPaletteKeyColor() const { - return MaterialDynamicColors::SecondaryPaletteKeyColor().GetArgb(*this); -} - -Argb DynamicScheme::GetTertiaryPaletteKeyColor() const { - return MaterialDynamicColors::TertiaryPaletteKeyColor().GetArgb(*this); -} - -Argb DynamicScheme::GetNeutralPaletteKeyColor() const { - return MaterialDynamicColors::NeutralPaletteKeyColor().GetArgb(*this); -} - -Argb DynamicScheme::GetNeutralVariantPaletteKeyColor() const { - return MaterialDynamicColors::NeutralVariantPaletteKeyColor().GetArgb(*this); -} - -Argb DynamicScheme::GetBackground() const { - return MaterialDynamicColors::Background().GetArgb(*this); -} - -Argb DynamicScheme::GetOnBackground() const { - return MaterialDynamicColors::OnBackground().GetArgb(*this); -} - -Argb DynamicScheme::GetSurface() const { - return MaterialDynamicColors::Surface().GetArgb(*this); -} - -Argb DynamicScheme::GetSurfaceDim() const { - return MaterialDynamicColors::SurfaceDim().GetArgb(*this); -} - -Argb DynamicScheme::GetSurfaceBright() const { - return MaterialDynamicColors::SurfaceBright().GetArgb(*this); -} - -Argb DynamicScheme::GetSurfaceContainerLowest() const { - return MaterialDynamicColors::SurfaceContainerLowest().GetArgb(*this); -} - -Argb DynamicScheme::GetSurfaceContainerLow() const { - return MaterialDynamicColors::SurfaceContainerLow().GetArgb(*this); -} - -Argb DynamicScheme::GetSurfaceContainer() const { - return MaterialDynamicColors::SurfaceContainer().GetArgb(*this); -} - -Argb DynamicScheme::GetSurfaceContainerHigh() const { - return MaterialDynamicColors::SurfaceContainerHigh().GetArgb(*this); -} - -Argb DynamicScheme::GetSurfaceContainerHighest() const { - return MaterialDynamicColors::SurfaceContainerHighest().GetArgb(*this); -} - -Argb DynamicScheme::GetOnSurface() const { - return MaterialDynamicColors::OnSurface().GetArgb(*this); -} - -Argb DynamicScheme::GetSurfaceVariant() const { - return MaterialDynamicColors::SurfaceVariant().GetArgb(*this); -} - -Argb DynamicScheme::GetOnSurfaceVariant() const { - return MaterialDynamicColors::OnSurfaceVariant().GetArgb(*this); -} - -Argb DynamicScheme::GetInverseSurface() const { - return MaterialDynamicColors::InverseSurface().GetArgb(*this); -} - -Argb DynamicScheme::GetInverseOnSurface() const { - return MaterialDynamicColors::InverseOnSurface().GetArgb(*this); -} - -Argb DynamicScheme::GetOutline() const { - return MaterialDynamicColors::Outline().GetArgb(*this); -} - -Argb DynamicScheme::GetOutlineVariant() const { - return MaterialDynamicColors::OutlineVariant().GetArgb(*this); -} - -Argb DynamicScheme::GetShadow() const { - return MaterialDynamicColors::Shadow().GetArgb(*this); -} - -Argb DynamicScheme::GetScrim() const { - return MaterialDynamicColors::Scrim().GetArgb(*this); -} - -Argb DynamicScheme::GetSurfaceTint() const { - return MaterialDynamicColors::SurfaceTint().GetArgb(*this); -} - -Argb DynamicScheme::GetPrimary() const { - return MaterialDynamicColors::Primary().GetArgb(*this); -} - -Argb DynamicScheme::GetOnPrimary() const { - return MaterialDynamicColors::OnPrimary().GetArgb(*this); -} - -Argb DynamicScheme::GetPrimaryContainer() const { - return MaterialDynamicColors::PrimaryContainer().GetArgb(*this); -} - -Argb DynamicScheme::GetOnPrimaryContainer() const { - return MaterialDynamicColors::OnPrimaryContainer().GetArgb(*this); -} - -Argb DynamicScheme::GetInversePrimary() const { - return MaterialDynamicColors::InversePrimary().GetArgb(*this); -} - -Argb DynamicScheme::GetSecondary() const { - return MaterialDynamicColors::Secondary().GetArgb(*this); -} - -Argb DynamicScheme::GetOnSecondary() const { - return MaterialDynamicColors::OnSecondary().GetArgb(*this); -} - -Argb DynamicScheme::GetSecondaryContainer() const { - return MaterialDynamicColors::SecondaryContainer().GetArgb(*this); -} - -Argb DynamicScheme::GetOnSecondaryContainer() const { - return MaterialDynamicColors::OnSecondaryContainer().GetArgb(*this); -} - -Argb DynamicScheme::GetTertiary() const { - return MaterialDynamicColors::Tertiary().GetArgb(*this); -} - -Argb DynamicScheme::GetOnTertiary() const { - return MaterialDynamicColors::OnTertiary().GetArgb(*this); -} - -Argb DynamicScheme::GetTertiaryContainer() const { - return MaterialDynamicColors::TertiaryContainer().GetArgb(*this); -} - -Argb DynamicScheme::GetOnTertiaryContainer() const { - return MaterialDynamicColors::OnTertiaryContainer().GetArgb(*this); -} - -Argb DynamicScheme::GetError() const { - return MaterialDynamicColors::Error().GetArgb(*this); -} - -Argb DynamicScheme::GetOnError() const { - return MaterialDynamicColors::OnError().GetArgb(*this); -} - -Argb DynamicScheme::GetErrorContainer() const { - return MaterialDynamicColors::ErrorContainer().GetArgb(*this); -} - -Argb DynamicScheme::GetOnErrorContainer() const { - return MaterialDynamicColors::OnErrorContainer().GetArgb(*this); -} - -Argb DynamicScheme::GetPrimaryFixed() const { - return MaterialDynamicColors::PrimaryFixed().GetArgb(*this); -} - -Argb DynamicScheme::GetPrimaryFixedDim() const { - return MaterialDynamicColors::PrimaryFixedDim().GetArgb(*this); -} - -Argb DynamicScheme::GetOnPrimaryFixed() const { - return MaterialDynamicColors::OnPrimaryFixed().GetArgb(*this); -} - -Argb DynamicScheme::GetOnPrimaryFixedVariant() const { - return MaterialDynamicColors::OnPrimaryFixedVariant().GetArgb(*this); -} - -Argb DynamicScheme::GetSecondaryFixed() const { - return MaterialDynamicColors::SecondaryFixed().GetArgb(*this); -} - -Argb DynamicScheme::GetSecondaryFixedDim() const { - return MaterialDynamicColors::SecondaryFixedDim().GetArgb(*this); -} - -Argb DynamicScheme::GetOnSecondaryFixed() const { - return MaterialDynamicColors::OnSecondaryFixed().GetArgb(*this); -} - -Argb DynamicScheme::GetOnSecondaryFixedVariant() const { - return MaterialDynamicColors::OnSecondaryFixedVariant().GetArgb(*this); -} - -Argb DynamicScheme::GetTertiaryFixed() const { - return MaterialDynamicColors::TertiaryFixed().GetArgb(*this); -} - -Argb DynamicScheme::GetTertiaryFixedDim() const { - return MaterialDynamicColors::TertiaryFixedDim().GetArgb(*this); -} - -Argb DynamicScheme::GetOnTertiaryFixed() const { - return MaterialDynamicColors::OnTertiaryFixed().GetArgb(*this); -} - -Argb DynamicScheme::GetOnTertiaryFixedVariant() const { - return MaterialDynamicColors::OnTertiaryFixedVariant().GetArgb(*this); -} - -} // namespace material_color_utilities diff --git a/cpp/dynamiccolor/dynamic_scheme.h b/cpp/dynamiccolor/dynamic_scheme.h deleted file mode 100644 index 473287fd..00000000 --- a/cpp/dynamiccolor/dynamic_scheme.h +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_DYNAMICCOLOR_DYNAMIC_SCHEME_H_ -#define CPP_DYNAMICCOLOR_DYNAMIC_SCHEME_H_ - -#include -#include - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/variant.h" -#include "cpp/palettes/tones.h" -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -struct DynamicScheme { - Hct source_color_hct; - Variant variant; - bool is_dark; - double contrast_level; - - TonalPalette primary_palette; - TonalPalette secondary_palette; - TonalPalette tertiary_palette; - TonalPalette neutral_palette; - TonalPalette neutral_variant_palette; - TonalPalette error_palette; - - DynamicScheme(Hct source_color_hct, Variant variant, double contrast_level, - bool is_dark, TonalPalette primary_palette, - TonalPalette secondary_palette, TonalPalette tertiary_palette, - TonalPalette neutral_palette, - TonalPalette neutral_variant_palette, - std::optional error_palette = std::nullopt); - - static double GetRotatedHue(Hct source_color, std::vector hues, - std::vector rotations); - - Argb SourceColorArgb() const; - - Argb GetPrimaryPaletteKeyColor() const; - Argb GetSecondaryPaletteKeyColor() const; - Argb GetTertiaryPaletteKeyColor() const; - Argb GetNeutralPaletteKeyColor() const; - Argb GetNeutralVariantPaletteKeyColor() const; - Argb GetBackground() const; - Argb GetOnBackground() const; - Argb GetSurface() const; - Argb GetSurfaceDim() const; - Argb GetSurfaceBright() const; - Argb GetSurfaceContainerLowest() const; - Argb GetSurfaceContainerLow() const; - Argb GetSurfaceContainer() const; - Argb GetSurfaceContainerHigh() const; - Argb GetSurfaceContainerHighest() const; - Argb GetOnSurface() const; - Argb GetSurfaceVariant() const; - Argb GetOnSurfaceVariant() const; - Argb GetInverseSurface() const; - Argb GetInverseOnSurface() const; - Argb GetOutline() const; - Argb GetOutlineVariant() const; - Argb GetShadow() const; - Argb GetScrim() const; - Argb GetSurfaceTint() const; - Argb GetPrimary() const; - Argb GetOnPrimary() const; - Argb GetPrimaryContainer() const; - Argb GetOnPrimaryContainer() const; - Argb GetInversePrimary() const; - Argb GetSecondary() const; - Argb GetOnSecondary() const; - Argb GetSecondaryContainer() const; - Argb GetOnSecondaryContainer() const; - Argb GetTertiary() const; - Argb GetOnTertiary() const; - Argb GetTertiaryContainer() const; - Argb GetOnTertiaryContainer() const; - Argb GetError() const; - Argb GetOnError() const; - Argb GetErrorContainer() const; - Argb GetOnErrorContainer() const; - Argb GetPrimaryFixed() const; - Argb GetPrimaryFixedDim() const; - Argb GetOnPrimaryFixed() const; - Argb GetOnPrimaryFixedVariant() const; - Argb GetSecondaryFixed() const; - Argb GetSecondaryFixedDim() const; - Argb GetOnSecondaryFixed() const; - Argb GetOnSecondaryFixedVariant() const; - Argb GetTertiaryFixed() const; - Argb GetTertiaryFixedDim() const; - Argb GetOnTertiaryFixed() const; - Argb GetOnTertiaryFixedVariant() const; -}; - -} // namespace material_color_utilities - -#endif // CPP_DYNAMICCOLOR_DYNAMIC_SCHEME_H_ diff --git a/cpp/dynamiccolor/material_dynamic_colors.cc b/cpp/dynamiccolor/material_dynamic_colors.cc deleted file mode 100644 index 26ddb766..00000000 --- a/cpp/dynamiccolor/material_dynamic_colors.cc +++ /dev/null @@ -1,1153 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/dynamiccolor/material_dynamic_colors.h" - -#include - -#include "cpp/cam/cam.h" -#include "cpp/cam/hct.h" -#include "cpp/dislike/dislike.h" -#include "cpp/dynamiccolor/contrast_curve.h" -#include "cpp/dynamiccolor/dynamic_color.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" -#include "cpp/dynamiccolor/tone_delta_pair.h" -#include "cpp/dynamiccolor/variant.h" -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -using std::nullopt; - -bool IsFidelity(const DynamicScheme& scheme) { - return scheme.variant == Variant::kFidelity || - scheme.variant == Variant::kContent; -} - -bool IsMonochrome(const DynamicScheme& scheme) { - return scheme.variant == Variant::kMonochrome; -} - -Vec3 XyzInViewingConditions(Cam cam, ViewingConditions viewing_conditions) { - double alpha = (cam.chroma == 0.0 || cam.j == 0.0) - ? 0.0 - : cam.chroma / sqrt(cam.j / 100.0); - - double t = pow( - alpha / pow(1.64 - pow(0.29, - viewing_conditions.background_y_to_white_point_y), - 0.73), - 1.0 / 0.9); - double h_rad = cam.hue * M_PI / 180.0; - - double e_hue = 0.25 * (cos(h_rad + 2.0) + 3.8); - double ac = - viewing_conditions.aw * - pow(cam.j / 100.0, 1.0 / viewing_conditions.c / viewing_conditions.z); - double p1 = e_hue * (50000.0 / 13.0) * viewing_conditions.n_c * - viewing_conditions.ncb; - - double p2 = (ac / viewing_conditions.nbb); - - double h_sin = sin(h_rad); - double h_cos = cos(h_rad); - - double gamma = 23.0 * (p2 + 0.305) * t / - (23.0 * p1 + 11 * t * h_cos + 108.0 * t * h_sin); - double a = gamma * h_cos; - double b = gamma * h_sin; - double r_a = (460.0 * p2 + 451.0 * a + 288.0 * b) / 1403.0; - double g_a = (460.0 * p2 - 891.0 * a - 261.0 * b) / 1403.0; - double b_a = (460.0 * p2 - 220.0 * a - 6300.0 * b) / 1403.0; - - double r_c_base = fmax(0, (27.13 * fabs(r_a)) / (400.0 - fabs(r_a))); - double r_c = - Signum(r_a) * (100.0 / viewing_conditions.fl) * pow(r_c_base, 1.0 / 0.42); - double g_c_base = fmax(0, (27.13 * fabs(g_a)) / (400.0 - fabs(g_a))); - double g_c = - Signum(g_a) * (100.0 / viewing_conditions.fl) * pow(g_c_base, 1.0 / 0.42); - double b_c_base = fmax(0, (27.13 * fabs(b_a)) / (400.0 - fabs(b_a))); - double b_c = - Signum(b_a) * (100.0 / viewing_conditions.fl) * pow(b_c_base, 1.0 / 0.42); - double r_f = r_c / viewing_conditions.rgb_d[0]; - double g_f = g_c / viewing_conditions.rgb_d[1]; - double b_f = b_c / viewing_conditions.rgb_d[2]; - - double x = 1.86206786 * r_f - 1.01125463 * g_f + 0.14918677 * b_f; - double y = 0.38752654 * r_f + 0.62144744 * g_f - 0.00897398 * b_f; - double z = -0.01584150 * r_f - 0.03412294 * g_f + 1.04996444 * b_f; - - return {x, y, z}; -} - -Hct InViewingConditions(Hct hct, ViewingConditions vc) { - // 1. Use CAM16 to find XYZ coordinates of color in specified VC. - Cam cam16 = CamFromInt(hct.ToInt()); - Vec3 viewed_in_vc = XyzInViewingConditions(cam16, vc); - - // 2. Create CAM16 of those XYZ coordinates in default VC. - Cam recast_in_vc = - CamFromXyzAndViewingConditions(viewed_in_vc.a, viewed_in_vc.b, - viewed_in_vc.c, kDefaultViewingConditions); - - // 3. Create HCT from: - // - CAM16 using default VC with XYZ coordinates in specified VC. - // - L* converted from Y in XYZ coordinates in specified VC. - Hct recast_hct = - Hct(recast_in_vc.hue, recast_in_vc.chroma, LstarFromY(viewed_in_vc.b)); - return recast_hct; -} - -double FindDesiredChromaByTone(double hue, double chroma, double tone, - bool by_decreasing_tone) { - double answer = tone; - - Hct closest_to_chroma = Hct(hue, chroma, tone); - if (closest_to_chroma.get_chroma() < chroma) { - double chroma_peak = closest_to_chroma.get_chroma(); - while (closest_to_chroma.get_chroma() < chroma) { - answer += by_decreasing_tone ? -1.0 : 1.0; - Hct potential_solution = Hct(hue, chroma, answer); - if (chroma_peak > potential_solution.get_chroma()) { - break; - } - if (abs(potential_solution.get_chroma() - chroma) < 0.4) { - break; - } - - double potential_delta = abs(potential_solution.get_chroma() - chroma); - double current_delta = abs(closest_to_chroma.get_chroma() - chroma); - if (potential_delta < current_delta) { - closest_to_chroma = potential_solution; - } - chroma_peak = fmax(chroma_peak, potential_solution.get_chroma()); - } - } - - return answer; -} - -constexpr double kContentAccentToneDelta = 15.0; -DynamicColor highestSurface(const DynamicScheme& s) { - return s.is_dark ? MaterialDynamicColors::SurfaceBright() - : MaterialDynamicColors::SurfaceDim(); -} - -// Compatibility Keys Colors for Android -DynamicColor MaterialDynamicColors::PrimaryPaletteKeyColor() { - return DynamicColor::FromPalette( - "primary_palette_key_color", - [](const DynamicScheme& s) -> TonalPalette { return s.primary_palette; }, - [](const DynamicScheme& s) -> double { - return s.primary_palette.get_key_color().get_tone(); - }); -} - -DynamicColor MaterialDynamicColors::SecondaryPaletteKeyColor() { - return DynamicColor::FromPalette( - "secondary_palette_key_color", - [](const DynamicScheme& s) -> TonalPalette { - return s.secondary_palette; - }, - [](const DynamicScheme& s) -> double { - return s.secondary_palette.get_key_color().get_tone(); - }); -} - -DynamicColor MaterialDynamicColors::TertiaryPaletteKeyColor() { - return DynamicColor::FromPalette( - "tertiary_palette_key_color", - [](const DynamicScheme& s) -> TonalPalette { return s.tertiary_palette; }, - [](const DynamicScheme& s) -> double { - return s.tertiary_palette.get_key_color().get_tone(); - }); -} - -DynamicColor MaterialDynamicColors::NeutralPaletteKeyColor() { - return DynamicColor::FromPalette( - "neutral_palette_key_color", - [](const DynamicScheme& s) -> TonalPalette { return s.neutral_palette; }, - [](const DynamicScheme& s) -> double { - return s.neutral_palette.get_key_color().get_tone(); - }); -} - -DynamicColor MaterialDynamicColors::NeutralVariantPaletteKeyColor() { - return DynamicColor::FromPalette( - "neutral_variant_palette_key_color", - [](const DynamicScheme& s) -> TonalPalette { - return s.neutral_variant_palette; - }, - [](const DynamicScheme& s) -> double { - return s.neutral_variant_palette.get_key_color().get_tone(); - }); -} - -DynamicColor MaterialDynamicColors::Background() { - return DynamicColor( - /* name= */ "background", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.neutral_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { return s.is_dark ? 6.0 : 98.0; }, - /* isBackground= */ true, - /* background= */ nullopt, - /* secondBackground= */ nullopt, - /* contrastCurve= */ nullopt, - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::OnBackground() { - return DynamicColor( - /* name= */ "on_background", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.neutral_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { return s.is_dark ? 90.0 : 10.0; }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return Background(); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(3.0, 3.0, 4.5, 7.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::Surface() { - return DynamicColor( - /* name= */ "surface", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.neutral_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { return s.is_dark ? 6.0 : 98.0; }, - /* isBackground= */ true, - /* background= */ nullopt, - /* secondBackground= */ nullopt, - /* contrastCurve= */ nullopt, - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::SurfaceDim() { - return DynamicColor( - /* name= */ "surface_dim", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.neutral_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return s.is_dark ? 6.0 - : ContrastCurve(87.0, 87.0, 80.0, 75.0) - .get(s.contrast_level); - }, - /* isBackground= */ true, - /* background= */ nullopt, - /* secondBackground= */ nullopt, - /* contrastCurve= */ nullopt, - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::SurfaceBright() { - return DynamicColor( - /* name= */ "surface_bright", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.neutral_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return s.is_dark - ? ContrastCurve(24.0, 24.0, 29.0, 34.0).get(s.contrast_level) - : 98.0; - }, - /* isBackground= */ true, - /* background= */ nullopt, - /* secondBackground= */ nullopt, - /* contrastCurve= */ nullopt, - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::SurfaceContainerLowest() { - return DynamicColor( - /* name= */ "surface_container_lowest", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.neutral_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return s.is_dark - ? ContrastCurve(4.0, 4.0, 2.0, 0.0).get(s.contrast_level) - : 100.0; - }, - /* isBackground= */ true, - /* background= */ nullopt, - /* secondBackground= */ nullopt, - /* contrastCurve= */ nullopt, - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::SurfaceContainerLow() { - return DynamicColor( - /* name= */ "surface_container_low", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.neutral_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return s.is_dark - ? ContrastCurve(10.0, 10.0, 11.0, 12.0).get(s.contrast_level) - : ContrastCurve(96.0, 96.0, 96.0, 95.0) - .get(s.contrast_level); - }, - /* isBackground= */ true, - /* background= */ nullopt, - /* secondBackground= */ nullopt, - /* contrastCurve= */ nullopt, - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::SurfaceContainer() { - return DynamicColor( - /* name= */ "surface_container", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.neutral_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return s.is_dark - ? ContrastCurve(12.0, 12.0, 16.0, 20.0).get(s.contrast_level) - : ContrastCurve(94.0, 94.0, 92.0, 90.0) - .get(s.contrast_level); - }, - /* isBackground= */ true, - /* background= */ nullopt, - /* secondBackground= */ nullopt, - /* contrastCurve= */ nullopt, - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::SurfaceContainerHigh() { - return DynamicColor( - /* name= */ "surface_container_high", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.neutral_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return s.is_dark - ? ContrastCurve(17.0, 17.0, 21.0, 25.0).get(s.contrast_level) - : ContrastCurve(92.0, 92.0, 88.0, 85.0) - .get(s.contrast_level); - }, - /* isBackground= */ true, - /* background= */ nullopt, - /* secondBackground= */ nullopt, - /* contrastCurve= */ nullopt, - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::SurfaceContainerHighest() { - return DynamicColor( - /* name= */ "surface_container_highest", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.neutral_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return s.is_dark - ? ContrastCurve(22.0, 22.0, 26.0, 30.0).get(s.contrast_level) - : ContrastCurve(90.0, 90.0, 84.0, 80.0) - .get(s.contrast_level); - }, - /* isBackground= */ true, - /* background= */ nullopt, - /* secondBackground= */ nullopt, - /* contrastCurve= */ nullopt, - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::OnSurface() { - return DynamicColor( - /* name= */ "on_surface", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.neutral_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { return s.is_dark ? 90.0 : 10.0; }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(4.5, 7.0, 11.0, 21.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::SurfaceVariant() { - return DynamicColor( - /* name= */ "surface_variant", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { - return s.neutral_variant_palette; - }, - /* tone= */ - [](const DynamicScheme& s) -> double { return s.is_dark ? 30.0 : 90.0; }, - /* isBackground= */ true, - /* background= */ nullopt, - /* secondBackground= */ nullopt, - /* contrastCurve= */ nullopt, - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::OnSurfaceVariant() { - return DynamicColor( - /* name= */ "on_surface_variant", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { - return s.neutral_variant_palette; - }, - /* tone= */ - [](const DynamicScheme& s) -> double { return s.is_dark ? 80.0 : 30.0; }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(3.0, 4.5, 7.0, 11.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::InverseSurface() { - return DynamicColor( - /* name= */ "inverse_surface", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.neutral_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { return s.is_dark ? 90.0 : 20.0; }, - /* isBackground= */ false, - /* background= */ nullopt, - /* secondBackground= */ nullopt, - /* contrastCurve= */ nullopt, - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::InverseOnSurface() { - return DynamicColor( - /* name= */ "inverse_on_surface", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.neutral_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { return s.is_dark ? 20.0 : 95.0; }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return InverseSurface(); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(4.5, 7.0, 11.0, 21.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::Outline() { - return DynamicColor( - /* name= */ "outline", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { - return s.neutral_variant_palette; - }, - /* tone= */ - [](const DynamicScheme& s) -> double { return s.is_dark ? 60.0 : 50.0; }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(1.5, 3.0, 4.5, 7.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::OutlineVariant() { - return DynamicColor( - /* name= */ "outline_variant", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { - return s.neutral_variant_palette; - }, - /* tone= */ - [](const DynamicScheme& s) -> double { return s.is_dark ? 30.0 : 80.0; }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(1.0, 1.0, 3.0, 4.5), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::Shadow() { - return DynamicColor( - /* name= */ "shadow", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.neutral_palette; }, - /* tone= */ [](const DynamicScheme& s) -> double { return 0.0; }, - /* isBackground= */ false, - /* background= */ nullopt, - /* secondBackground= */ nullopt, - /* contrastCurve= */ nullopt, - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::Scrim() { - return DynamicColor( - /* name= */ "scrim", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.neutral_palette; }, - /* tone= */ [](const DynamicScheme& s) -> double { return 0.0; }, - /* isBackground= */ false, - /* background= */ nullopt, - /* secondBackground= */ nullopt, - /* contrastCurve= */ nullopt, - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::SurfaceTint() { - return DynamicColor( - /* name= */ "surface_tint", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.primary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { return s.is_dark ? 80.0 : 40.0; }, - /* isBackground= */ true, - /* background= */ nullopt, - /* secondBackground= */ nullopt, - /* contrastCurve= */ nullopt, - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::Primary() { - return DynamicColor( - /* name= */ "primary", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.primary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - if (IsMonochrome(s)) { - return s.is_dark ? 100.0 : 0.0; - } - return s.is_dark ? 80.0 : 40.0; - }, - /* isBackground= */ true, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(3.0, 4.5, 7.0, 7.0), - /* toneDeltaPair= */ - [](const DynamicScheme& s) -> ToneDeltaPair { - return ToneDeltaPair(PrimaryContainer(), Primary(), 10.0, - TonePolarity::kNearer, false); - }); -} - -DynamicColor MaterialDynamicColors::OnPrimary() { - return DynamicColor( - /* name= */ "on_primary", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.primary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - if (IsMonochrome(s)) { - return s.is_dark ? 10.0 : 90.0; - } - return s.is_dark ? 20.0 : 100.0; - }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return Primary(); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(4.5, 7.0, 11.0, 21.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::PrimaryContainer() { - return DynamicColor( - /* name= */ "primary_container", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.primary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - if (IsFidelity(s)) { - return s.source_color_hct.get_tone(); - } - if (IsMonochrome(s)) { - return s.is_dark ? 85.0 : 25.0; - } - return s.is_dark ? 30.0 : 90.0; - }, - /* isBackground= */ true, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(1.0, 1.0, 3.0, 4.5), - /* toneDeltaPair= */ - [](const DynamicScheme& s) -> ToneDeltaPair { - return ToneDeltaPair(PrimaryContainer(), Primary(), 10.0, - TonePolarity::kNearer, false); - }); -} - -DynamicColor MaterialDynamicColors::OnPrimaryContainer() { - return DynamicColor( - /* name= */ - "on_primary_container", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.primary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - if (IsFidelity(s)) { - return ForegroundTone(PrimaryContainer().tone_(s), 4.5); - } - if (IsMonochrome(s)) { - return s.is_dark ? 0.0 : 100.0; - } - return s.is_dark ? 90.0 : 30.0; - }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return PrimaryContainer(); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(3.0, 4.5, 7.0, 11.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::InversePrimary() { - return DynamicColor( - /* name= */ "inverse_primary", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.primary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { return s.is_dark ? 40.0 : 80.0; }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return InverseSurface(); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(3.0, 4.5, 7.0, 7.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::Secondary() { - return DynamicColor( - /* name= */ "secondary", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { - return s.secondary_palette; - }, - /* tone= */ - [](const DynamicScheme& s) -> double { return s.is_dark ? 80.0 : 40.0; }, - /* isBackground= */ true, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(3.0, 4.5, 7.0, 7.0), - /* toneDeltaPair= */ - [](const DynamicScheme& s) -> ToneDeltaPair { - return ToneDeltaPair(SecondaryContainer(), Secondary(), 10.0, - TonePolarity::kNearer, false); - }); -} - -DynamicColor MaterialDynamicColors::OnSecondary() { - return DynamicColor( - /* name= */ "on_secondary", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { - return s.secondary_palette; - }, - /* tone= */ - [](const DynamicScheme& s) -> double { - if (IsMonochrome(s)) { - return s.is_dark ? 10.0 : 100.0; - } else { - return s.is_dark ? 20.0 : 100.0; - } - }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return Secondary(); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(4.5, 7.0, 11.0, 21.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::SecondaryContainer() { - return DynamicColor( - /* name= */ "secondary_container", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { - return s.secondary_palette; - }, - /* tone= */ - [](const DynamicScheme& s) -> double { - double initialTone = s.is_dark ? 30.0 : 90.0; - if (IsMonochrome(s)) { - return s.is_dark ? 30.0 : 85.0; - } - if (!IsFidelity(s)) { - return initialTone; - } - return FindDesiredChromaByTone(s.secondary_palette.get_hue(), - s.secondary_palette.get_chroma(), - initialTone, s.is_dark ? false : true); - }, - /* isBackground= */ true, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(1.0, 1.0, 3.0, 4.5), - /* toneDeltaPair= */ - [](const DynamicScheme& s) -> ToneDeltaPair { - return ToneDeltaPair(SecondaryContainer(), Secondary(), 10.0, - TonePolarity::kNearer, false); - }); -} - -DynamicColor MaterialDynamicColors::OnSecondaryContainer() { - return DynamicColor( - /* name= */ - "on_secondary_container", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { - return s.secondary_palette; - }, - /* tone= */ - [](const DynamicScheme& s) -> double { - if (IsMonochrome(s)) { - return s.is_dark ? 90.0 : 10.0; - } - if (!IsFidelity(s)) { - return s.is_dark ? 90.0 : 30.0; - } - return ForegroundTone(SecondaryContainer().tone_(s), 4.5); - }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { - return SecondaryContainer(); - }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(3.0, 4.5, 7.0, 11.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::Tertiary() { - return DynamicColor( - /* name= */ "tertiary", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.tertiary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - if (IsMonochrome(s)) { - return s.is_dark ? 90.0 : 25.0; - } - return s.is_dark ? 80.0 : 40.0; - }, - /* isBackground= */ true, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(3.0, 4.5, 7.0, 7.0), - /* toneDeltaPair= */ - [](const DynamicScheme& s) -> ToneDeltaPair { - return ToneDeltaPair(TertiaryContainer(), Tertiary(), 10.0, - TonePolarity::kNearer, false); - }); -} - -DynamicColor MaterialDynamicColors::OnTertiary() { - return DynamicColor( - /* name= */ "on_tertiary", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.tertiary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - if (IsMonochrome(s)) { - return s.is_dark ? 10.0 : 90.0; - } - return s.is_dark ? 20.0 : 100.0; - }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return Tertiary(); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(4.5, 7.0, 11.0, 21.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::TertiaryContainer() { - return DynamicColor( - /* name= */ "tertiary_container", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.tertiary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - if (IsMonochrome(s)) { - return s.is_dark ? 60.0 : 49.0; - } - if (!IsFidelity(s)) { - return s.is_dark ? 30.0 : 90.0; - } - Hct proposedHct = - Hct(s.tertiary_palette.get(s.source_color_hct.get_tone())); - return FixIfDisliked(proposedHct).get_tone(); - }, - /* isBackground= */ true, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(1.0, 1.0, 3.0, 4.5), - /* toneDeltaPair= */ - [](const DynamicScheme& s) -> ToneDeltaPair { - return ToneDeltaPair(TertiaryContainer(), Tertiary(), 10.0, - TonePolarity::kNearer, false); - }); -} - -DynamicColor MaterialDynamicColors::OnTertiaryContainer() { - return DynamicColor( - /* name= */ - "on_tertiary_container", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.tertiary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - if (IsMonochrome(s)) { - return s.is_dark ? 0.0 : 100.0; - } - if (!IsFidelity(s)) { - return s.is_dark ? 90.0 : 30.0; - } - return ForegroundTone(TertiaryContainer().tone_(s), 4.5); - }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { - return TertiaryContainer(); - }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(3.0, 4.5, 7.0, 11.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::Error() { - return DynamicColor( - /* name= */ "error", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.error_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { return s.is_dark ? 80.0 : 40.0; }, - /* isBackground= */ true, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(3.0, 4.5, 7.0, 7.0), - /* toneDeltaPair= */ - [](const DynamicScheme& s) -> ToneDeltaPair { - return ToneDeltaPair(ErrorContainer(), Error(), 10.0, - TonePolarity::kNearer, false); - }); -} - -DynamicColor MaterialDynamicColors::OnError() { - return DynamicColor( - /* name= */ "on_error", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.error_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { return s.is_dark ? 20.0 : 100.0; }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return Error(); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(4.5, 7.0, 11.0, 21.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::ErrorContainer() { - return DynamicColor( - /* name= */ "error_container", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.error_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { return s.is_dark ? 30.0 : 90.0; }, - /* isBackground= */ true, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(1.0, 1.0, 3.0, 4.5), - /* toneDeltaPair= */ - [](const DynamicScheme& s) -> ToneDeltaPair { - return ToneDeltaPair(ErrorContainer(), Error(), 10.0, - TonePolarity::kNearer, false); - }); -} - -DynamicColor MaterialDynamicColors::OnErrorContainer() { - return DynamicColor( - /* name= */ - "on_error_container", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.error_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - if (IsMonochrome(s)) { - return s.is_dark ? 90.0 : 10.0; - } - return s.is_dark ? 90.0 : 30.0; - }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return ErrorContainer(); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(3.0, 4.5, 7.0, 11.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::PrimaryFixed() { - return DynamicColor( - /* name= */ "primary_fixed", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.primary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return IsMonochrome(s) ? 40.0 : 90.0; - }, - /* isBackground= */ true, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(1.0, 1.0, 3.0, 4.5), - /* toneDeltaPair= */ - [](const DynamicScheme& s) -> ToneDeltaPair { - return ToneDeltaPair(PrimaryFixed(), PrimaryFixedDim(), 10.0, - TonePolarity::kLighter, true); - }); -} - -DynamicColor MaterialDynamicColors::PrimaryFixedDim() { - return DynamicColor( - /* name= */ "primary_fixed_dim", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.primary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return IsMonochrome(s) ? 30.0 : 80.0; - }, - /* isBackground= */ true, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(1.0, 1.0, 3.0, 4.5), - /* toneDeltaPair= */ - [](const DynamicScheme& s) -> ToneDeltaPair { - return ToneDeltaPair(PrimaryFixed(), PrimaryFixedDim(), 10.0, - TonePolarity::kLighter, true); - }); -} - -DynamicColor MaterialDynamicColors::OnPrimaryFixed() { - return DynamicColor( - /* name= */ "on_primary_fixed", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.primary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return IsMonochrome(s) ? 100.0 : 10.0; - }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return PrimaryFixedDim(); }, - /* secondBackground= */ - [](const DynamicScheme& s) -> DynamicColor { return PrimaryFixed(); }, - /* contrastCurve= */ ContrastCurve(4.5, 7.0, 11.0, 21.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::OnPrimaryFixedVariant() { - return DynamicColor( - /* name= */ "on_primary_fixed_variant", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.primary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return IsMonochrome(s) ? 90.0 : 30.0; - }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return PrimaryFixedDim(); }, - /* secondBackground= */ - [](const DynamicScheme& s) -> DynamicColor { return PrimaryFixed(); }, - /* contrastCurve= */ ContrastCurve(3.0, 4.5, 7.0, 11.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::SecondaryFixed() { - return DynamicColor( - /* name= */ "secondary_fixed", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { - return s.secondary_palette; - }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return IsMonochrome(s) ? 80.0 : 90.0; - }, - /* isBackground= */ true, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(1.0, 1.0, 3.0, 4.5), - /* toneDeltaPair= */ - [](const DynamicScheme& s) -> ToneDeltaPair { - return ToneDeltaPair(SecondaryFixed(), SecondaryFixedDim(), 10.0, - TonePolarity::kLighter, true); - }); -} - -DynamicColor MaterialDynamicColors::SecondaryFixedDim() { - return DynamicColor( - /* name= */ "secondary_fixed_dim", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { - return s.secondary_palette; - }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return IsMonochrome(s) ? 70.0 : 80.0; - }, - /* isBackground= */ true, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(1.0, 1.0, 3.0, 4.5), - /* toneDeltaPair= */ - [](const DynamicScheme& s) -> ToneDeltaPair { - return ToneDeltaPair(SecondaryFixed(), SecondaryFixedDim(), 10.0, - TonePolarity::kLighter, true); - }); -} - -DynamicColor MaterialDynamicColors::OnSecondaryFixed() { - return DynamicColor( - /* name= */ "on_secondary_fixed", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { - return s.secondary_palette; - }, - /* tone= */ [](const DynamicScheme& s) -> double { return 10.0; }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { - return SecondaryFixedDim(); - }, - /* secondBackground= */ - [](const DynamicScheme& s) -> DynamicColor { return SecondaryFixed(); }, - /* contrastCurve= */ ContrastCurve(4.5, 7.0, 11.0, 21.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::OnSecondaryFixedVariant() { - return DynamicColor( - /* name= */ "on_secondary_fixed_variant", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { - return s.secondary_palette; - }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return IsMonochrome(s) ? 25.0 : 30.0; - }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { - return SecondaryFixedDim(); - }, - /* secondBackground= */ - [](const DynamicScheme& s) -> DynamicColor { return SecondaryFixed(); }, - /* contrastCurve= */ ContrastCurve(3.0, 4.5, 7.0, 11.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::TertiaryFixed() { - return DynamicColor( - /* name= */ "tertiary_fixed", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.tertiary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return IsMonochrome(s) ? 40.0 : 90.0; - }, - /* isBackground= */ true, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(1.0, 1.0, 3.0, 4.5), - /* toneDeltaPair= */ - [](const DynamicScheme& s) -> ToneDeltaPair { - return ToneDeltaPair(TertiaryFixed(), TertiaryFixedDim(), 10.0, - TonePolarity::kLighter, true); - }); -} - -DynamicColor MaterialDynamicColors::TertiaryFixedDim() { - return DynamicColor( - /* name= */ "tertiary_fixed_dim", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.tertiary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return IsMonochrome(s) ? 30.0 : 80.0; - }, - /* isBackground= */ true, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return highestSurface(s); }, - /* secondBackground= */ nullopt, - /* contrastCurve= */ ContrastCurve(1.0, 1.0, 3.0, 4.5), - /* toneDeltaPair= */ - [](const DynamicScheme& s) -> ToneDeltaPair { - return ToneDeltaPair(TertiaryFixed(), TertiaryFixedDim(), 10.0, - TonePolarity::kLighter, true); - }); -} - -DynamicColor MaterialDynamicColors::OnTertiaryFixed() { - return DynamicColor( - /* name= */ "on_tertiary_fixed", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.tertiary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return IsMonochrome(s) ? 100.0 : 10.0; - }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return TertiaryFixedDim(); }, - /* secondBackground= */ - [](const DynamicScheme& s) -> DynamicColor { return TertiaryFixed(); }, - /* contrastCurve= */ ContrastCurve(4.5, 7.0, 11.0, 21.0), - /* toneDeltaPair= */ nullopt); -} - -DynamicColor MaterialDynamicColors::OnTertiaryFixedVariant() { - return DynamicColor( - /* name= */ "on_tertiary_fixed_variant", - /* palette= */ - [](const DynamicScheme& s) -> TonalPalette { return s.tertiary_palette; }, - /* tone= */ - [](const DynamicScheme& s) -> double { - return IsMonochrome(s) ? 90.0 : 30.0; - }, - /* isBackground= */ false, - /* background= */ - [](const DynamicScheme& s) -> DynamicColor { return TertiaryFixedDim(); }, - /* secondBackground= */ - [](const DynamicScheme& s) -> DynamicColor { return TertiaryFixed(); }, - /* contrastCurve= */ ContrastCurve(3.0, 4.5, 7.0, 11.0), - /* toneDeltaPair= */ nullopt); -} - -} // namespace material_color_utilities diff --git a/cpp/dynamiccolor/material_dynamic_colors.h b/cpp/dynamiccolor/material_dynamic_colors.h deleted file mode 100644 index 35a0af5b..00000000 --- a/cpp/dynamiccolor/material_dynamic_colors.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_DYNAMICCOLOR_MATERIAL_DYNAMIC_COLORS_H_ -#define CPP_DYNAMICCOLOR_MATERIAL_DYNAMIC_COLORS_H_ - -#include "cpp/dynamiccolor/dynamic_color.h" - -namespace material_color_utilities { - -class MaterialDynamicColors { - public: - static DynamicColor PrimaryPaletteKeyColor(); - static DynamicColor SecondaryPaletteKeyColor(); - static DynamicColor TertiaryPaletteKeyColor(); - static DynamicColor NeutralPaletteKeyColor(); - static DynamicColor NeutralVariantPaletteKeyColor(); - static DynamicColor Background(); - static DynamicColor OnBackground(); - static DynamicColor Surface(); - static DynamicColor SurfaceDim(); - static DynamicColor SurfaceBright(); - static DynamicColor SurfaceContainerLowest(); - static DynamicColor SurfaceContainerLow(); - static DynamicColor SurfaceContainer(); - static DynamicColor SurfaceContainerHigh(); - static DynamicColor SurfaceContainerHighest(); - static DynamicColor OnSurface(); - static DynamicColor SurfaceVariant(); - static DynamicColor OnSurfaceVariant(); - static DynamicColor InverseSurface(); - static DynamicColor InverseOnSurface(); - static DynamicColor Outline(); - static DynamicColor OutlineVariant(); - static DynamicColor Shadow(); - static DynamicColor Scrim(); - static DynamicColor SurfaceTint(); - static DynamicColor Primary(); - static DynamicColor OnPrimary(); - static DynamicColor PrimaryContainer(); - static DynamicColor OnPrimaryContainer(); - static DynamicColor InversePrimary(); - static DynamicColor Secondary(); - static DynamicColor OnSecondary(); - static DynamicColor SecondaryContainer(); - static DynamicColor OnSecondaryContainer(); - static DynamicColor Tertiary(); - static DynamicColor OnTertiary(); - static DynamicColor TertiaryContainer(); - static DynamicColor OnTertiaryContainer(); - static DynamicColor Error(); - static DynamicColor OnError(); - static DynamicColor ErrorContainer(); - static DynamicColor OnErrorContainer(); - static DynamicColor PrimaryFixed(); - static DynamicColor PrimaryFixedDim(); - static DynamicColor OnPrimaryFixed(); - static DynamicColor OnPrimaryFixedVariant(); - static DynamicColor SecondaryFixed(); - static DynamicColor SecondaryFixedDim(); - static DynamicColor OnSecondaryFixed(); - static DynamicColor OnSecondaryFixedVariant(); - static DynamicColor TertiaryFixed(); - static DynamicColor TertiaryFixedDim(); - static DynamicColor OnTertiaryFixed(); - static DynamicColor OnTertiaryFixedVariant(); -}; - -} // namespace material_color_utilities - -#endif // CPP_DYNAMICCOLOR_MATERIAL_DYNAMIC_COLORS_H_ diff --git a/cpp/dynamiccolor/tone_delta_pair.h b/cpp/dynamiccolor/tone_delta_pair.h deleted file mode 100644 index 1e44950c..00000000 --- a/cpp/dynamiccolor/tone_delta_pair.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_DYNAMICCOLOR_TONE_DELTA_PAIR_H_ -#define CPP_DYNAMICCOLOR_TONE_DELTA_PAIR_H_ - -#include "cpp/dynamiccolor/dynamic_color.h" - -namespace material_color_utilities { - -/** - * Describes the different in tone between colors. - */ -enum class TonePolarity { kDarker, kLighter, kNearer, kFarther }; - -/** - * Documents a constraint between two DynamicColors, in which their tones must - * have a certain distance from each other. - * - * Prefer a DynamicColor with a background, this is for special cases when - * designers want tonal distance, literally contrast, between two colors that - * don't have a background / foreground relationship or a contrast guarantee. - */ -struct ToneDeltaPair { - DynamicColor role_a_; - DynamicColor role_b_; - double delta_; - TonePolarity polarity_; - bool stay_together_; - - /** - * Documents a constraint in tone distance between two DynamicColors. - * - * The polarity is an adjective that describes "A", compared to "B". - * - * For instance, ToneDeltaPair(A, B, 15, 'darker', stayTogether) states that - * A's tone should be at least 15 darker than B's. - * - * 'nearer' and 'farther' describes closeness to the surface roles. For - * instance, ToneDeltaPair(A, B, 10, 'nearer', stayTogether) states that A - * should be 10 lighter than B in light mode, and 10 darker than B in dark - * mode. - * - * @param roleA The first role in a pair. - * @param roleB The second role in a pair. - * @param delta Required difference between tones. Absolute value, negative - * values have undefined behavior. - * @param polarity The relative relation between tones of roleA and roleB, - * as described above. - * @param stayTogether Whether these two roles should stay on the same side of - * the "awkward zone" (T50-59). This is necessary for certain cases where - * one role has two backgrounds. - */ - ToneDeltaPair(DynamicColor role_a, DynamicColor role_b, double delta, - TonePolarity polarity, bool stay_together) - : role_a_(role_a), - role_b_(role_b), - delta_(delta), - polarity_(polarity), - stay_together_(stay_together) {} -}; - -} // namespace material_color_utilities - -#endif // CPP_DYNAMICCOLOR_TONE_DELTA_PAIR_H_ diff --git a/cpp/dynamiccolor/variant.h b/cpp/dynamiccolor/variant.h deleted file mode 100644 index 2dc3dd46..00000000 --- a/cpp/dynamiccolor/variant.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_DYNAMICCOLOR_VARIANT_H_ -#define CPP_DYNAMICCOLOR_VARIANT_H_ - -namespace material_color_utilities { - -enum class Variant { - kMonochrome, - kNeutral, - kTonalSpot, - kVibrant, - kExpressive, - kFidelity, - kContent, - kRainbow, - kFruitSalad, -}; - -} // namespace material_color_utilities - -#endif // CPP_DYNAMICCOLOR_VARIANT_H_ diff --git a/cpp/palettes/core.h b/cpp/palettes/core.h deleted file mode 100644 index 66fb0303..00000000 --- a/cpp/palettes/core.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_PALETTES_CORE_H_ -#define CPP_PALETTES_CORE_H_ - -#include "cpp/palettes/tones.h" - -namespace material_color_utilities { - -/** - * Comprises foundational palettes to build a color scheme. Generated from a - * source color, these palettes will then be part of a [DynamicScheme] together - * with appearance preferences. -*/ -typedef struct { - TonalPalette primary; - TonalPalette secondary; - TonalPalette tertiary; - TonalPalette neutral; - TonalPalette neutral_variant; -} CorePalettes; - -} // namespace material_color_utilities - -#endif // CPP_PALETTES_CORE_H_ diff --git a/cpp/palettes/tones.cc b/cpp/palettes/tones.cc deleted file mode 100644 index cc5d1b93..00000000 --- a/cpp/palettes/tones.cc +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/palettes/tones.h" - -#include - -#include "cpp/cam/cam.h" -#include "cpp/cam/hct.h" - -namespace material_color_utilities { - -TonalPalette::TonalPalette(Argb argb) : key_color_(0.0, 0.0, 0.0) { - Cam cam = CamFromInt(argb); - hue_ = cam.hue; - chroma_ = cam.chroma; - key_color_ = KeyColor(cam.hue, cam.chroma).create(); -} - -TonalPalette::TonalPalette(Hct hct) - : key_color_(hct.get_hue(), hct.get_chroma(), hct.get_tone()) { - hue_ = hct.get_hue(); - chroma_ = hct.get_chroma(); -} - -TonalPalette::TonalPalette(double hue, double chroma) - : key_color_(hue, chroma, 0.0) { - hue_ = hue; - chroma_ = chroma; - key_color_ = KeyColor(hue, chroma).create(); -} - -TonalPalette::TonalPalette(double hue, double chroma, Hct key_color) - : key_color_(key_color.get_hue(), key_color.get_chroma(), - key_color.get_tone()) { - hue_ = hue; - chroma_ = chroma; -} - -Argb TonalPalette::get(double tone) const { - return IntFromHcl(hue_, chroma_, tone); -} - -KeyColor::KeyColor(double hue, double requested_chroma) - : hue_(hue), requested_chroma_(requested_chroma) {} - -Hct KeyColor::create() { - // Pivot around T50 because T50 has the most chroma available, on - // average. Thus it is most likely to have a direct answer. - const int pivot_tone = 50; - const int tone_step_size = 1; - // Epsilon to accept values slightly higher than the requested chroma. - const double epsilon = 0.01; - - // Binary search to find the tone that can provide a chroma that is closest - // to the requested chroma. - int lower_tone = 0; - int upper_tone = 100; - while (lower_tone < upper_tone) { - const int mid_tone = (lower_tone + upper_tone) / 2; - bool is_ascending = - max_chroma(mid_tone) < max_chroma(mid_tone + tone_step_size); - bool sufficient_chroma = - max_chroma(mid_tone) >= requested_chroma_ - epsilon; - - if (sufficient_chroma) { - // Either range [lower_tone, mid_tone] or [mid_tone, upper_tone] has - // the answer, so search in the range that is closer the pivot tone. - if (abs(lower_tone - pivot_tone) < abs(upper_tone - pivot_tone)) { - upper_tone = mid_tone; - } else { - if (lower_tone == mid_tone) { - return Hct(hue_, requested_chroma_, lower_tone); - } - lower_tone = mid_tone; - } - } else { - // As there's no sufficient chroma in the mid_tone, follow the direction - // to the chroma peak. - if (is_ascending) { - lower_tone = mid_tone + tone_step_size; - } else { - // Keep mid_tone for potential chroma peak. - upper_tone = mid_tone; - } - } - } - - return Hct(hue_, requested_chroma_, lower_tone); -} - -double KeyColor::max_chroma(double tone) { - auto it = chroma_cache_.find(tone); - if (it != chroma_cache_.end()) { - return it->second; - } - - double chroma = Hct(hue_, max_chroma_value_, tone).get_chroma(); - chroma_cache_[tone] = chroma; - return chroma; -}; - -} // namespace material_color_utilities diff --git a/cpp/palettes/tones.h b/cpp/palettes/tones.h deleted file mode 100644 index 2c4e64d1..00000000 --- a/cpp/palettes/tones.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_PALETTES_TONES_H_ -#define CPP_PALETTES_TONES_H_ - -#include - -#include "cpp/cam/hct.h" -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -class TonalPalette { - public: - explicit TonalPalette(Argb argb); - TonalPalette(Hct hct); - TonalPalette(double hue, double chroma); - TonalPalette(double hue, double chroma, Hct key_color); - - /** - * Returns the color for a given tone in this palette. - * - * @param tone 0.0 <= tone <= 100.0 - * @return a color as an integer, in ARGB format. - */ - Argb get(double tone) const; - - double get_hue() const { return hue_; } - double get_chroma() const { return chroma_; } - Hct get_key_color() const { return key_color_; } - - private: - double hue_; - double chroma_; - Hct key_color_; -}; - -/** - * Key color is a color that represents the hue and chroma of a tonal palette - */ -class KeyColor { - public: - KeyColor(double hue, double requested_chroma); - /** - * Creates a key color from a [hue] and a [chroma]. - * The key color is the first tone, starting from T50, matching the given hue - * and chroma. - * - * @return Key color in Hct. - */ - Hct create(); - - private: - const double max_chroma_value_ = 200.0; - double hue_; - double requested_chroma_; - // Cache that maps tone to max chroma to avoid duplicated HCT calculation. - std::unordered_map chroma_cache_; - - double max_chroma(double tone); -}; - -} // namespace material_color_utilities -#endif // CPP_PALETTES_TONES_H_ diff --git a/cpp/palettes/tones_test.cc b/cpp/palettes/tones_test.cc deleted file mode 100644 index 8da3d11f..00000000 --- a/cpp/palettes/tones_test.cc +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/palettes/tones.h" - -#include "testing/base/public/gunit.h" -#include "cpp/cam/hct.h" -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -namespace { - -TEST(TonesTest, Blue) { - Argb color = 0xff0000ff; - TonalPalette tonal_palette = TonalPalette(color); - EXPECT_EQ(HexFromArgb(tonal_palette.get(100)), "ffffffff"); - EXPECT_EQ(HexFromArgb(tonal_palette.get(95)), "fff1efff"); - EXPECT_EQ(HexFromArgb(tonal_palette.get(90)), "ffe0e0ff"); - EXPECT_EQ(HexFromArgb(tonal_palette.get(80)), "ffbec2ff"); - EXPECT_EQ(HexFromArgb(tonal_palette.get(70)), "ff9da3ff"); - EXPECT_EQ(HexFromArgb(tonal_palette.get(60)), "ff7c84ff"); - EXPECT_EQ(HexFromArgb(tonal_palette.get(50)), "ff5a64ff"); - EXPECT_EQ(HexFromArgb(tonal_palette.get(40)), "ff343dff"); - EXPECT_EQ(HexFromArgb(tonal_palette.get(30)), "ff0000ef"); - EXPECT_EQ(HexFromArgb(tonal_palette.get(20)), "ff0001ac"); - EXPECT_EQ(HexFromArgb(tonal_palette.get(10)), "ff00006e"); - EXPECT_EQ(HexFromArgb(tonal_palette.get(0)), "ff000000"); -} - -TEST(KeyColorTests, ExactChromaAvailable) { - // Requested chroma is exactly achievable at a certain tone. - TonalPalette palette = TonalPalette(50.0, 60.0); - Hct result = palette.get_key_color(); - - EXPECT_NEAR(result.get_hue(), 50.0, 10.0); - EXPECT_NEAR(result.get_chroma(), 60.0, 0.5); - // Tone might vary, but should be within the range from 0 to 100. - EXPECT_GT(result.get_tone(), 0); - EXPECT_LT(result.get_tone(), 100); -} - -TEST(KeyColorTests, UnusuallyHighChroma) { - // Requested chroma is above what is achievable. For Hue 149, chroma peak - // is 89.6 at Tone 87.9. The result key color's chroma should be close to the - // chroma peak. - TonalPalette palette = TonalPalette(149.0, 200.0); - Hct result = palette.get_key_color(); - - EXPECT_NEAR(result.get_hue(), 149.0, 10.0); - EXPECT_GT(result.get_chroma(), 89.0); - // Tone might vary, but should be within the range from 0 to 100. - EXPECT_GT(result.get_tone(), 0); - EXPECT_LT(result.get_tone(), 100); -} - -TEST(KeyColorTests, UnusuallyLowChroma) { - // By definition, the key color should be the first tone, starting from Tone - // 50, matching the given hue and chroma. When requesting a very low chroma, - // the result should be close to Tone 50, since most tones can produce a low - // chroma. - TonalPalette palette = TonalPalette(50.0, 3.0); - Hct result = palette.get_key_color(); - - // Higher error tolerance for hue when the requested chroma is unusually low. - EXPECT_NEAR(result.get_hue(), 50.0, 10.0); - EXPECT_NEAR(result.get_chroma(), 3.0, 0.5); - EXPECT_NEAR(result.get_tone(), 50.0, 0.5); -} - -} // namespace -} // namespace material_color_utilities diff --git a/cpp/quantize/celebi.cc b/cpp/quantize/celebi.cc deleted file mode 100644 index 857979e9..00000000 --- a/cpp/quantize/celebi.cc +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/quantize/celebi.h" - -#include -#include -#include -#include - -#include "cpp/quantize/wsmeans.h" -#include "cpp/quantize/wu.h" -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -QuantizerResult QuantizeCelebi(const std::vector& pixels, - uint16_t max_colors) { - if (max_colors == 0 || pixels.empty()) { - return QuantizerResult(); - } - - if (max_colors > 256) { - max_colors = 256; - } - - int pixel_count = pixels.size(); - - std::vector opaque_pixels; - opaque_pixels.reserve(pixel_count); - for (int i = 0; i < pixel_count; i++) { - int pixel = pixels[i]; - if (!IsOpaque(pixel)) { - continue; - } - opaque_pixels.push_back(pixel); - } - - std::vector wu_result = QuantizeWu(opaque_pixels, max_colors); - - QuantizerResult result = - QuantizeWsmeans(opaque_pixels, wu_result, max_colors); - - return result; -} - -} // namespace material_color_utilities diff --git a/cpp/quantize/celebi.h b/cpp/quantize/celebi.h deleted file mode 100644 index f2f9d579..00000000 --- a/cpp/quantize/celebi.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_QUANTIZE_CELEBI_H_ -#define CPP_QUANTIZE_CELEBI_H_ - -#include -#include - -#include - -#include "cpp/quantize/wsmeans.h" -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -QuantizerResult QuantizeCelebi(const std::vector& pixels, - uint16_t max_colors); - -} // namespace material_color_utilities - -#endif // CPP_QUANTIZE_CELEBI_H_ diff --git a/cpp/quantize/celebi_test.cc b/cpp/quantize/celebi_test.cc deleted file mode 100644 index 43177641..00000000 --- a/cpp/quantize/celebi_test.cc +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/quantize/celebi.h" - -#include -#include - -#include "testing/base/public/gunit.h" - -namespace material_color_utilities { - -namespace { - -TEST(CelebiTest, FullImage) { - std::vector pixels(12544); - for (size_t i = 0; i < pixels.size(); i++) { - // Creates 128 distinct colors - pixels[i] = i % 8000; - } - - int iterations = 1; - uint16_t max_colors = 128; - double sum = 0; - - for (int i = 0; i < iterations; i++) { - clock_t begin = clock(); - QuantizeCelebi(pixels, max_colors); - clock_t end = clock(); - double time_spent = static_cast(end - begin) / CLOCKS_PER_SEC; - sum += time_spent; - } -} - -TEST(CelebiTest, OneRed) { - std::vector pixels; - pixels.push_back(0xffff0000); - QuantizerResult result = QuantizeCelebi(pixels, 256); - EXPECT_EQ(result.color_to_count.size(), 1u); - EXPECT_EQ(result.color_to_count[0xffff0000], 1u); -} - -TEST(CelebiTest, OneGreen) { - std::vector pixels; - pixels.push_back(0xff00ff00); - QuantizerResult result = QuantizeCelebi(pixels, 256); - EXPECT_EQ(result.color_to_count.size(), 1u); - EXPECT_EQ(result.color_to_count[0xff00ff00], 1u); -} - -TEST(CelebiTest, OneBlue) { - std::vector pixels; - pixels.push_back(0xff0000ff); - QuantizerResult result = QuantizeCelebi(pixels, 256); - EXPECT_EQ(result.color_to_count.size(), 1u); - EXPECT_EQ(result.color_to_count[0xff0000ff], 1u); -} - -TEST(CelebiTest, FiveBlue) { - std::vector pixels; - for (int i = 0; i < 5; i++) { - pixels.push_back(0xff0000ff); - } - QuantizerResult result = QuantizeCelebi(pixels, 256); - EXPECT_EQ(result.color_to_count.size(), 1u); - EXPECT_EQ(result.color_to_count[0xff0000ff], 5u); -} - -TEST(CelebiTest, OneRedOneGreenOneBlue) { - std::vector pixels; - pixels.push_back(0xffff0000); - pixels.push_back(0xff00ff00); - pixels.push_back(0xff0000ff); - QuantizerResult result = QuantizeCelebi(pixels, 256); - EXPECT_EQ(result.color_to_count.size(), 3u); - EXPECT_EQ(result.color_to_count[0xffff0000], 1u); - EXPECT_EQ(result.color_to_count[0xff00ff00], 1u); - EXPECT_EQ(result.color_to_count[0xff0000ff], 1u); -} - -TEST(CelebiTest, TwoRedThreeGreen) { - std::vector pixels; - pixels.push_back(0xffff0000); - pixels.push_back(0xffff0000); - pixels.push_back(0xff00ff00); - pixels.push_back(0xff00ff00); - pixels.push_back(0xff00ff00); - QuantizerResult result = QuantizeCelebi(pixels, 256); - EXPECT_EQ(result.color_to_count.size(), 2u); - EXPECT_EQ(result.color_to_count[0xffff0000], 2u); - EXPECT_EQ(result.color_to_count[0xff00ff00], 3u); -} - -TEST(CelebiTest, NoColors) { - std::vector pixels; - pixels.push_back(0xFFFFFFFF); - QuantizerResult result = QuantizeCelebi(pixels, 0); - EXPECT_TRUE(result.color_to_count.empty()); - EXPECT_TRUE(result.input_pixel_to_cluster_pixel.empty()); -} - -TEST(CelebiTest, SingleTransparent) { - std::vector pixels; - pixels.push_back(0x20F93013); - QuantizerResult result = QuantizeCelebi(pixels, 1); - EXPECT_TRUE(result.color_to_count.empty()); - EXPECT_TRUE(result.input_pixel_to_cluster_pixel.empty()); -} - -TEST(CelebiTest, TooManyColors) { - std::vector pixels; - QuantizerResult result = QuantizeCelebi(pixels, 32767); - EXPECT_TRUE(result.color_to_count.empty()); - EXPECT_TRUE(result.input_pixel_to_cluster_pixel.empty()); -} - -} // namespace -} // namespace material_color_utilities diff --git a/cpp/quantize/lab.cc b/cpp/quantize/lab.cc deleted file mode 100644 index caa575b8..00000000 --- a/cpp/quantize/lab.cc +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/quantize/lab.h" - -#include - -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -Argb IntFromLab(const Lab lab) { - double e = 216.0 / 24389.0; - double kappa = 24389.0 / 27.0; - double ke = 8.0; - - double fy = (lab.l + 16.0) / 116.0; - double fx = (lab.a / 500.0) + fy; - double fz = fy - (lab.b / 200.0); - double fx3 = fx * fx * fx; - double x_normalized = (fx3 > e) ? fx3 : (116.0 * fx - 16.0) / kappa; - double y_normalized = (lab.l > ke) ? fy * fy * fy : (lab.l / kappa); - double fz3 = fz * fz * fz; - double z_normalized = (fz3 > e) ? fz3 : (116.0 * fz - 16.0) / kappa; - double x = x_normalized * kWhitePointD65[0]; - double y = y_normalized * kWhitePointD65[1]; - double z = z_normalized * kWhitePointD65[2]; - - // intFromXyz - double rL = 3.2406 * x - 1.5372 * y - 0.4986 * z; - double gL = -0.9689 * x + 1.8758 * y + 0.0415 * z; - double bL = 0.0557 * x - 0.2040 * y + 1.0570 * z; - - int red = Delinearized(rL); - int green = Delinearized(gL); - int blue = Delinearized(bL); - - return ArgbFromRgb(red, green, blue); -} - -Lab LabFromInt(const Argb argb) { - int red = (argb & 0x00ff0000) >> 16; - int green = (argb & 0x0000ff00) >> 8; - int blue = (argb & 0x000000ff); - double red_l = Linearized(red); - double green_l = Linearized(green); - double blue_l = Linearized(blue); - double x = 0.41233895 * red_l + 0.35762064 * green_l + 0.18051042 * blue_l; - double y = 0.2126 * red_l + 0.7152 * green_l + 0.0722 * blue_l; - double z = 0.01932141 * red_l + 0.11916382 * green_l + 0.95034478 * blue_l; - double y_normalized = y / kWhitePointD65[1]; - double e = 216.0 / 24389.0; - double kappa = 24389.0 / 27.0; - double fy; - if (y_normalized > e) { - fy = pow(y_normalized, 1.0 / 3.0); - } else { - fy = (kappa * y_normalized + 16) / 116; - } - - double x_normalized = x / kWhitePointD65[0]; - double fx; - if (x_normalized > e) { - fx = pow(x_normalized, 1.0 / 3.0); - } else { - fx = (kappa * x_normalized + 16) / 116; - } - - double z_normalized = z / kWhitePointD65[2]; - double fz; - if (z_normalized > e) { - fz = pow(z_normalized, 1.0 / 3.0); - } else { - fz = (kappa * z_normalized + 16) / 116; - } - - double l = 116.0 * fy - 16; - double a = 500.0 * (fx - fy); - double b = 200.0 * (fy - fz); - return {l, a, b}; -} - -} // namespace material_color_utilities diff --git a/cpp/quantize/lab.h b/cpp/quantize/lab.h deleted file mode 100644 index b983c73e..00000000 --- a/cpp/quantize/lab.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_QUANTIZE_LAB_H_ -#define CPP_QUANTIZE_LAB_H_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -struct Lab { - double l = 0.0; - double a = 0.0; - double b = 0.0; - - double DeltaE(const Lab& lab) { - double d_l = l - lab.l; - double d_a = a - lab.a; - double d_b = b - lab.b; - return (d_l * d_l) + (d_a * d_a) + (d_b * d_b); - } - - std::string ToString() { - return "Lab: L* " + std::to_string(l) + " a* " + std::to_string(a) + - " b* " + std::to_string(b); - } -}; - -Argb IntFromLab(const Lab lab); -Lab LabFromInt(const Argb argb); - -} // namespace material_color_utilities -#endif // CPP_QUANTIZE_LAB_H_ diff --git a/cpp/quantize/wsmeans.cc b/cpp/quantize/wsmeans.cc deleted file mode 100644 index f6381b78..00000000 --- a/cpp/quantize/wsmeans.cc +++ /dev/null @@ -1,266 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/quantize/wsmeans.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "absl/container/flat_hash_map.h" -#include "cpp/quantize/lab.h" - -constexpr int kMaxIterations = 100; -constexpr double kMinDeltaE = 3.0; - -namespace material_color_utilities { - -struct Swatch { - Argb argb = 0; - int population = 0; - - bool operator<(const Swatch& b) const { return population > b.population; } -}; - -struct DistanceToIndex { - double distance = 0.0; - int index = 0; - - bool operator<(const DistanceToIndex& a) const { - return distance < a.distance; - } -}; - -QuantizerResult QuantizeWsmeans(const std::vector& input_pixels, - const std::vector& starting_clusters, - uint16_t max_colors) { - if (max_colors == 0 || input_pixels.empty()) { - return QuantizerResult(); - } - - if (max_colors > 256) { - // If colors is outside the range, just set it the max. - max_colors = 256; - } - - uint32_t pixel_count = input_pixels.size(); - absl::flat_hash_map pixel_to_count; - std::vector pixels; - pixels.reserve(pixel_count); - std::vector points; - points.reserve(pixel_count); - for (Argb pixel : input_pixels) { - // tested over 1000 runs with 128 colors, 12544 (112 x 112) - // std::map 10.9 ms - // std::unordered_map 10.2 ms - // absl::btree_map 9.0 ms - // absl::flat_hash_map 8.0 ms - absl::flat_hash_map::iterator it = pixel_to_count.find(pixel); - if (it != pixel_to_count.end()) { - it->second++; - - } else { - pixels.push_back(pixel); - points.push_back(LabFromInt(pixel)); - pixel_to_count[pixel] = 1; - } - } - - int cluster_count = std::min((int)max_colors, (int)points.size()); - - if (!starting_clusters.empty()) { - cluster_count = std::min(cluster_count, (int)starting_clusters.size()); - } - - int pixel_count_sums[256] = {}; - std::vector clusters; - clusters.reserve(starting_clusters.size()); - for (int argb : starting_clusters) { - clusters.push_back(LabFromInt(argb)); - } - - srand(42688); - int additional_clusters_needed = cluster_count - clusters.size(); - if (starting_clusters.empty() && additional_clusters_needed > 0) { - for (int i = 0; i < additional_clusters_needed; i++) { - // Adds a random Lab color to clusters. - double l = rand() / (static_cast(RAND_MAX)) * (100.0) + 0.0; - double a = - rand() / (static_cast(RAND_MAX)) * (100.0 - -100.0) - 100.0; - double b = - rand() / (static_cast(RAND_MAX)) * (100.0 - -100.0) - 100.0; - clusters.push_back({l, a, b}); - } - } - - std::vector cluster_indices; - cluster_indices.reserve(points.size()); - - srand(42688); - for (size_t i = 0; i < points.size(); i++) { - cluster_indices.push_back(rand() % cluster_count); - } - - std::vector> index_matrix( - cluster_count, std::vector(cluster_count, 0)); - - std::vector> distance_to_index_matrix( - cluster_count, std::vector(cluster_count)); - - for (int iteration = 0; iteration < kMaxIterations; iteration++) { - // Calculate cluster distances - for (int i = 0; i < cluster_count; i++) { - distance_to_index_matrix[i][i].distance = 0; - distance_to_index_matrix[i][i].index = i; - for (int j = i + 1; j < cluster_count; j++) { - double distance = clusters[i].DeltaE(clusters[j]); - - distance_to_index_matrix[j][i].distance = distance; - distance_to_index_matrix[j][i].index = i; - distance_to_index_matrix[i][j].distance = distance; - distance_to_index_matrix[i][j].index = j; - } - - std::vector row = distance_to_index_matrix[i]; - std::sort(row.begin(), row.end()); - - for (int j = 0; j < cluster_count; j++) { - index_matrix[i][j] = row[j].index; - } - } - - // Reassign points - bool color_moved = false; - for (size_t i = 0; i < points.size(); i++) { - Lab point = points[i]; - - int previous_cluster_index = cluster_indices[i]; - Lab previous_cluster = clusters[previous_cluster_index]; - double previous_distance = point.DeltaE(previous_cluster); - double minimum_distance = previous_distance; - int new_cluster_index = -1; - - for (int j = 0; j < cluster_count; j++) { - if (distance_to_index_matrix[previous_cluster_index][j].distance >= - 4 * previous_distance) { - continue; - } - double distance = point.DeltaE(clusters[j]); - if (distance < minimum_distance) { - minimum_distance = distance; - new_cluster_index = j; - } - } - if (new_cluster_index != -1) { - double distanceChange = - abs(sqrt(minimum_distance) - sqrt(previous_distance)); - if (distanceChange > kMinDeltaE) { - color_moved = true; - cluster_indices[i] = new_cluster_index; - } - } - } - - if (!color_moved && (iteration != 0)) { - break; - } - - // Recalculate cluster centers - double component_a_sums[256] = {}; - double component_b_sums[256] = {}; - double component_c_sums[256] = {}; - for (int i = 0; i < cluster_count; i++) { - pixel_count_sums[i] = 0; - } - - for (size_t i = 0; i < points.size(); i++) { - int clusterIndex = cluster_indices[i]; - Lab point = points[i]; - int count = pixel_to_count[pixels[i]]; - - pixel_count_sums[clusterIndex] += count; - component_a_sums[clusterIndex] += (point.l * count); - component_b_sums[clusterIndex] += (point.a * count); - component_c_sums[clusterIndex] += (point.b * count); - } - - for (int i = 0; i < cluster_count; i++) { - int count = pixel_count_sums[i]; - if (count == 0) { - clusters[i] = {0, 0, 0}; - continue; - } - double a = component_a_sums[i] / count; - double b = component_b_sums[i] / count; - double c = component_c_sums[i] / count; - clusters[i] = {a, b, c}; - } - } - - std::vector swatches; - std::vector cluster_argbs; - std::vector all_cluster_argbs; - for (int i = 0; i < cluster_count; i++) { - Argb possible_new_cluster = IntFromLab(clusters[i]); - all_cluster_argbs.push_back(possible_new_cluster); - - int count = pixel_count_sums[i]; - if (count == 0) { - continue; - } - int use_new_cluster = 1; - for (size_t j = 0; j < swatches.size(); j++) { - if (swatches[j].argb == possible_new_cluster) { - swatches[j].population += count; - use_new_cluster = 0; - break; - } - } - - if (use_new_cluster == 0) { - continue; - } - cluster_argbs.push_back(possible_new_cluster); - swatches.push_back({possible_new_cluster, count}); - } - std::sort(swatches.begin(), swatches.end()); - - // Constructs the quantizer result to return. - - std::map color_to_count; - for (size_t i = 0; i < swatches.size(); i++) { - color_to_count[swatches[i].argb] = swatches[i].population; - } - - std::map input_pixel_to_cluster_pixel; - for (size_t i = 0; i < points.size(); i++) { - int pixel = pixels[i]; - int cluster_index = cluster_indices[i]; - int cluster_argb = all_cluster_argbs[cluster_index]; - input_pixel_to_cluster_pixel[pixel] = cluster_argb; - } - - return {color_to_count, input_pixel_to_cluster_pixel}; -} - -} // namespace material_color_utilities diff --git a/cpp/quantize/wsmeans.h b/cpp/quantize/wsmeans.h deleted file mode 100644 index 807ef723..00000000 --- a/cpp/quantize/wsmeans.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_QUANTIZE_WSMEANS_H_ -#define CPP_QUANTIZE_WSMEANS_H_ -#include - -#include -#include - -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -struct QuantizerResult { - std::map color_to_count; - std::map input_pixel_to_cluster_pixel; -}; - -QuantizerResult QuantizeWsmeans(const std::vector& input_pixels, - const std::vector& starting_clusters, - uint16_t max_colors); -} // namespace material_color_utilities - -#endif // CPP_QUANTIZE_WSMEANS_H_ diff --git a/cpp/quantize/wsmeans_test.cc b/cpp/quantize/wsmeans_test.cc deleted file mode 100644 index 083cdd44..00000000 --- a/cpp/quantize/wsmeans_test.cc +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/quantize/wsmeans.h" - -#include - -#include "testing/base/public/gunit.h" - -namespace material_color_utilities { - -namespace { -TEST(WsmeansTest, FullImage) { - std::vector pixels(12544); - for (size_t i = 0; i < pixels.size(); i++) { - // Creates 128 distinct colors - pixels[i] = i % 8000; - } - std::vector starting_clusters; - - int iterations = 1; - int max_colors = 128; - - double sum = 0; - - for (int i = 0; i < iterations; i++) { - clock_t begin = clock(); - QuantizeWsmeans(pixels, starting_clusters, max_colors); - clock_t end = clock(); - double time_spent = static_cast(end - begin) / CLOCKS_PER_SEC; - sum += time_spent; - } -} - -TEST(WsmeansTest, OneRedAndO) { - std::vector pixels; - pixels.push_back(0xff141216); - std::vector starting_clusters; - QuantizerResult result = QuantizeWsmeans(pixels, starting_clusters, 256); - EXPECT_EQ(result.color_to_count.size(), 1u); - EXPECT_EQ(result.color_to_count[0xff141216], 1u); -} - -TEST(WsmeansTest, OneRed) { - std::vector pixels; - pixels.push_back(0xffff0000); - std::vector starting_clusters; - QuantizerResult result = QuantizeWsmeans(pixels, starting_clusters, 256); - EXPECT_EQ(result.color_to_count.size(), 1u); - EXPECT_EQ(result.color_to_count[0xffff0000], 1u); -} - -TEST(WsmeansTest, OneGreen) { - std::vector pixels; - pixels.push_back(0xff00ff00); - std::vector starting_clusters; - QuantizerResult result = QuantizeWsmeans(pixels, starting_clusters, 256); - EXPECT_EQ(result.color_to_count.size(), 1u); - EXPECT_EQ(result.color_to_count[0xff00ff00], 1u); -} - -TEST(WsmeansTest, OneBlue) { - std::vector pixels; - pixels.push_back(0xff0000ff); - std::vector starting_clusters; - QuantizerResult result = QuantizeWsmeans(pixels, starting_clusters, 256); - EXPECT_EQ(result.color_to_count.size(), 1u); - EXPECT_EQ(result.color_to_count[0xff0000ff], 1u); -} - -TEST(WsmeansTest, FiveBlue) { - std::vector pixels; - for (int i = 0; i < 5; i++) { - pixels.push_back(0xff0000ff); - } - std::vector starting_clusters; - QuantizerResult result = QuantizeWsmeans(pixels, starting_clusters, 256); - EXPECT_EQ(result.color_to_count.size(), 1u); - EXPECT_EQ(result.color_to_count[0xff0000ff], 5u); -} - -} // namespace -} // namespace material_color_utilities diff --git a/cpp/quantize/wu.cc b/cpp/quantize/wu.cc deleted file mode 100644 index a1dc0df2..00000000 --- a/cpp/quantize/wu.cc +++ /dev/null @@ -1,357 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/quantize/wu.h" - -#include - -#include -#include -#include -#include - -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -struct Box { - int r0 = 0; - int r1 = 0; - int g0 = 0; - int g1 = 0; - int b0 = 0; - int b1 = 0; - int vol = 0; -}; - -enum class Direction { - kRed, - kGreen, - kBlue, -}; - -constexpr int kIndexBits = 5; -constexpr int kIndexCount = ((1 << kIndexBits) + 1); -constexpr int kTotalSize = (kIndexCount * kIndexCount * kIndexCount); -constexpr int kMaxColors = 256; - -using IntArray = std::vector; -using DoubleArray = std::vector; - -int GetIndex(int r, int g, int b) { - return (r << (kIndexBits * 2)) + (r << (kIndexBits + 1)) + (g << kIndexBits) + - r + g + b; -} - -void ConstructHistogram(const std::vector& pixels, IntArray& weights, - IntArray& m_r, IntArray& m_g, IntArray& m_b, - DoubleArray& moments) { - for (size_t i = 0; i < pixels.size(); i++) { - Argb pixel = pixels[i]; - int red = RedFromInt(pixel); - int green = GreenFromInt(pixel); - int blue = BlueFromInt(pixel); - - int bits_to_remove = 8 - kIndexBits; - int index_r = (red >> bits_to_remove) + 1; - int index_g = (green >> bits_to_remove) + 1; - int index_b = (blue >> bits_to_remove) + 1; - int index = GetIndex(index_r, index_g, index_b); - - weights[index]++; - m_r[index] += red; - m_g[index] += green; - m_b[index] += blue; - moments[index] += (red * red) + (green * green) + (blue * blue); - } -} - -void ComputeMoments(IntArray& weights, IntArray& m_r, IntArray& m_g, - IntArray& m_b, DoubleArray& moments) { - for (int r = 1; r < kIndexCount; r++) { - int64_t area[kIndexCount] = {}; - int64_t area_r[kIndexCount] = {}; - int64_t area_g[kIndexCount] = {}; - int64_t area_b[kIndexCount] = {}; - double area_2[kIndexCount] = {}; - for (int g = 1; g < kIndexCount; g++) { - int64_t line = 0; - int64_t line_r = 0; - int64_t line_g = 0; - int64_t line_b = 0; - double line_2 = 0.0; - for (int b = 1; b < kIndexCount; b++) { - int index = GetIndex(r, g, b); - line += weights[index]; - line_r += m_r[index]; - line_g += m_g[index]; - line_b += m_b[index]; - line_2 += moments[index]; - - area[b] += line; - area_r[b] += line_r; - area_g[b] += line_g; - area_b[b] += line_b; - area_2[b] += line_2; - - int previous_index = GetIndex(r - 1, g, b); - weights[index] = weights[previous_index] + area[b]; - m_r[index] = m_r[previous_index] + area_r[b]; - m_g[index] = m_g[previous_index] + area_g[b]; - m_b[index] = m_b[previous_index] + area_b[b]; - moments[index] = moments[previous_index] + area_2[b]; - } - } - } -} - -int64_t Top(const Box& cube, const Direction direction, const int position, - const IntArray& moment) { - if (direction == Direction::kRed) { - return (moment[GetIndex(position, cube.g1, cube.b1)] - - moment[GetIndex(position, cube.g1, cube.b0)] - - moment[GetIndex(position, cube.g0, cube.b1)] + - moment[GetIndex(position, cube.g0, cube.b0)]); - } else if (direction == Direction::kGreen) { - return (moment[GetIndex(cube.r1, position, cube.b1)] - - moment[GetIndex(cube.r1, position, cube.b0)] - - moment[GetIndex(cube.r0, position, cube.b1)] + - moment[GetIndex(cube.r0, position, cube.b0)]); - } else { - return (moment[GetIndex(cube.r1, cube.g1, position)] - - moment[GetIndex(cube.r1, cube.g0, position)] - - moment[GetIndex(cube.r0, cube.g1, position)] + - moment[GetIndex(cube.r0, cube.g0, position)]); - } -} - -int64_t Bottom(const Box& cube, const Direction direction, - const IntArray& moment) { - if (direction == Direction::kRed) { - return (-moment[GetIndex(cube.r0, cube.g1, cube.b1)] + - moment[GetIndex(cube.r0, cube.g1, cube.b0)] + - moment[GetIndex(cube.r0, cube.g0, cube.b1)] - - moment[GetIndex(cube.r0, cube.g0, cube.b0)]); - } else if (direction == Direction::kGreen) { - return (-moment[GetIndex(cube.r1, cube.g0, cube.b1)] + - moment[GetIndex(cube.r1, cube.g0, cube.b0)] + - moment[GetIndex(cube.r0, cube.g0, cube.b1)] - - moment[GetIndex(cube.r0, cube.g0, cube.b0)]); - } else { - return (-moment[GetIndex(cube.r1, cube.g1, cube.b0)] + - moment[GetIndex(cube.r1, cube.g0, cube.b0)] + - moment[GetIndex(cube.r0, cube.g1, cube.b0)] - - moment[GetIndex(cube.r0, cube.g0, cube.b0)]); - } -} - -int64_t Vol(const Box& cube, const IntArray& moment) { - return (moment[GetIndex(cube.r1, cube.g1, cube.b1)] - - moment[GetIndex(cube.r1, cube.g1, cube.b0)] - - moment[GetIndex(cube.r1, cube.g0, cube.b1)] + - moment[GetIndex(cube.r1, cube.g0, cube.b0)] - - moment[GetIndex(cube.r0, cube.g1, cube.b1)] + - moment[GetIndex(cube.r0, cube.g1, cube.b0)] + - moment[GetIndex(cube.r0, cube.g0, cube.b1)] - - moment[GetIndex(cube.r0, cube.g0, cube.b0)]); -} - -double Variance(const Box& cube, const IntArray& weights, const IntArray& m_r, - const IntArray& m_g, const IntArray& m_b, - const DoubleArray& moments) { - double dr = Vol(cube, m_r); - double dg = Vol(cube, m_g); - double db = Vol(cube, m_b); - double xx = moments[GetIndex(cube.r1, cube.g1, cube.b1)] - - moments[GetIndex(cube.r1, cube.g1, cube.b0)] - - moments[GetIndex(cube.r1, cube.g0, cube.b1)] + - moments[GetIndex(cube.r1, cube.g0, cube.b0)] - - moments[GetIndex(cube.r0, cube.g1, cube.b1)] + - moments[GetIndex(cube.r0, cube.g1, cube.b0)] + - moments[GetIndex(cube.r0, cube.g0, cube.b1)] - - moments[GetIndex(cube.r0, cube.g0, cube.b0)]; - double hypotenuse = dr * dr + dg * dg + db * db; - double volume = Vol(cube, weights); - return xx - hypotenuse / volume; -} - -double Maximize(const Box& cube, const Direction direction, const int first, - const int last, int* cut, const int64_t whole_w, - const int64_t whole_r, const int64_t whole_g, - const int64_t whole_b, const IntArray& weights, - const IntArray& m_r, const IntArray& m_g, const IntArray& m_b) { - int64_t bottom_r = Bottom(cube, direction, m_r); - int64_t bottom_g = Bottom(cube, direction, m_g); - int64_t bottom_b = Bottom(cube, direction, m_b); - int64_t bottom_w = Bottom(cube, direction, weights); - - double max = 0.0; - *cut = -1; - - int64_t half_r, half_g, half_b, half_w; - for (int i = first; i < last; i++) { - half_r = bottom_r + Top(cube, direction, i, m_r); - half_g = bottom_g + Top(cube, direction, i, m_g); - half_b = bottom_b + Top(cube, direction, i, m_b); - half_w = bottom_w + Top(cube, direction, i, weights); - if (half_w == 0) { - continue; - } - - double temp = (static_cast(half_r) * half_r + - static_cast(half_g) * half_g + - static_cast(half_b) * half_b) / - static_cast(half_w); - - half_r = whole_r - half_r; - half_g = whole_g - half_g; - half_b = whole_b - half_b; - half_w = whole_w - half_w; - if (half_w == 0) { - continue; - } - temp += (static_cast(half_r) * half_r + - static_cast(half_g) * half_g + - static_cast(half_b) * half_b) / - static_cast(half_w); - - if (temp > max) { - max = temp; - *cut = i; - } - } - return max; -} - -bool Cut(Box& box1, Box& box2, const IntArray& weights, const IntArray& m_r, - const IntArray& m_g, const IntArray& m_b) { - int64_t whole_r = Vol(box1, m_r); - int64_t whole_g = Vol(box1, m_g); - int64_t whole_b = Vol(box1, m_b); - int64_t whole_w = Vol(box1, weights); - - int cut_r, cut_g, cut_b; - double max_r = - Maximize(box1, Direction::kRed, box1.r0 + 1, box1.r1, &cut_r, whole_w, - whole_r, whole_g, whole_b, weights, m_r, m_g, m_b); - double max_g = - Maximize(box1, Direction::kGreen, box1.g0 + 1, box1.g1, &cut_g, whole_w, - whole_r, whole_g, whole_b, weights, m_r, m_g, m_b); - double max_b = - Maximize(box1, Direction::kBlue, box1.b0 + 1, box1.b1, &cut_b, whole_w, - whole_r, whole_g, whole_b, weights, m_r, m_g, m_b); - - Direction direction; - if (max_r >= max_g && max_r >= max_b) { - direction = Direction::kRed; - if (cut_r < 0) { - return false; - } - } else if (max_g >= max_r && max_g >= max_b) { - direction = Direction::kGreen; - } else { - direction = Direction::kBlue; - } - - box2.r1 = box1.r1; - box2.g1 = box1.g1; - box2.b1 = box1.b1; - - if (direction == Direction::kRed) { - box2.r0 = box1.r1 = cut_r; - box2.g0 = box1.g0; - box2.b0 = box1.b0; - } else if (direction == Direction::kGreen) { - box2.r0 = box1.r0; - box2.g0 = box1.g1 = cut_g; - box2.b0 = box1.b0; - } else { - box2.r0 = box1.r0; - box2.g0 = box1.g0; - box2.b0 = box1.b1 = cut_b; - } - - box1.vol = (box1.r1 - box1.r0) * (box1.g1 - box1.g0) * (box1.b1 - box1.b0); - box2.vol = (box2.r1 - box2.r0) * (box2.g1 - box2.g0) * (box2.b1 - box2.b0); - return true; -} - -std::vector QuantizeWu(const std::vector& pixels, - uint16_t max_colors) { - if (max_colors <= 0 || max_colors > 256 || pixels.empty()) { - return std::vector(); - } - - IntArray weights(kTotalSize, 0); - IntArray moments_red(kTotalSize, 0); - IntArray moments_green(kTotalSize, 0); - IntArray moments_blue(kTotalSize, 0); - DoubleArray moments(kTotalSize, 0.0); - ConstructHistogram(pixels, weights, moments_red, moments_green, moments_blue, - moments); - ComputeMoments(weights, moments_red, moments_green, moments_blue, moments); - - std::vector cubes(kMaxColors); - cubes[0].r0 = cubes[0].g0 = cubes[0].b0 = 0; - cubes[0].r1 = cubes[0].g1 = cubes[0].b1 = kIndexCount - 1; - - std::vector volume_variance(kMaxColors); - int next = 0; - for (int i = 1; i < max_colors; ++i) { - if (Cut(cubes[next], cubes[i], weights, moments_red, moments_green, - moments_blue)) { - volume_variance[next] = - cubes[next].vol > 1 ? Variance(cubes[next], weights, moments_red, - moments_green, moments_blue, moments) - : 0.0; - volume_variance[i] = cubes[i].vol > 1 - ? Variance(cubes[i], weights, moments_red, - moments_green, moments_blue, moments) - : 0.0; - } else { - volume_variance[next] = 0.0; - i--; - } - - next = 0; - double temp = volume_variance[0]; - for (int j = 1; j <= i; j++) { - if (volume_variance[j] > temp) { - temp = volume_variance[j]; - next = j; - } - } - if (temp <= 0.0) { - max_colors = i + 1; - break; - } - } - - std::vector out_colors; - for (int i = 0; i < max_colors; ++i) { - int64_t weight = Vol(cubes[i], weights); - if (weight > 0) { - int32_t red = Vol(cubes[i], moments_red) / weight; - int32_t green = Vol(cubes[i], moments_green) / weight; - int32_t blue = Vol(cubes[i], moments_blue) / weight; - uint32_t argb = ArgbFromRgb(red, green, blue); - out_colors.push_back(argb); - } - } - - return out_colors; -} -} // namespace material_color_utilities diff --git a/cpp/quantize/wu.h b/cpp/quantize/wu.h deleted file mode 100644 index 36f496bf..00000000 --- a/cpp/quantize/wu.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_QUANTIZE_WU_H_ -#define CPP_QUANTIZE_WU_H_ - -#include - -#include - -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -std::vector QuantizeWu(const std::vector& pixels, - uint16_t max_colors); -} -#endif // CPP_QUANTIZE_WU_H_ diff --git a/cpp/quantize/wu_test.cc b/cpp/quantize/wu_test.cc deleted file mode 100644 index 5341e972..00000000 --- a/cpp/quantize/wu_test.cc +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/quantize/wu.h" - -#include -#include - -#include "testing/base/public/gunit.h" - -namespace material_color_utilities { - -namespace { - -TEST(WuTest, FullImage) { - std::vector pixels(12544); - for (size_t i = 0; i < pixels.size(); i++) { - // Creates 128 distinct colors - pixels[i] = i % 8000; - } - - uint16_t max_colors = 128; - - QuantizeWu(pixels, max_colors); -} - -TEST(WuTest, TwoRedThreeGreen) { - std::vector pixels; - pixels.push_back(0xffff0000); - pixels.push_back(0xffff0000); - pixels.push_back(0xffff0000); - pixels.push_back(0xff00ff00); - pixels.push_back(0xff00ff00); - std::vector result = QuantizeWu(pixels, 256); - EXPECT_EQ(result.size(), 2u); -} - -TEST(WuTest, OneRed) { - std::vector pixels; - pixels.push_back(0xffff0000); - std::vector result = QuantizeWu(pixels, 256); - EXPECT_EQ(result.size(), 1u); - EXPECT_EQ(result[0], 0xffff0000); -} - -TEST(WuTest, OneGreen) { - std::vector pixels; - pixels.push_back(0xff00ff00); - std::vector result = QuantizeWu(pixels, 256); - EXPECT_EQ(result.size(), 1u); - EXPECT_EQ(result[0], 0xff00ff00); -} - -TEST(WuTest, OneBlue) { - std::vector pixels; - pixels.push_back(0xff0000ff); - std::vector result = QuantizeWu(pixels, 256); - EXPECT_EQ(result.size(), 1u); - EXPECT_EQ(result[0], 0xff0000ff); -} - -TEST(WuTest, FiveBlue) { - std::vector pixels; - for (int i = 0; i < 5; i++) { - pixels.push_back(0xff0000ff); - } - std::vector result = QuantizeWu(pixels, 256); - EXPECT_EQ(result.size(), 1u); - EXPECT_EQ(result[0], 0xff0000ff); -} - -TEST(WuTest, OneRedAndO) { - std::vector pixels; - pixels.push_back(0xff141216); - std::vector result = QuantizeWu(pixels, 256); - EXPECT_EQ(result.size(), 1u); - EXPECT_EQ(result[0], 0xff141216); -} - -TEST(WuTest, RedGreenBlue) { - std::vector pixels; - pixels.push_back(0xffff0000); - pixels.push_back(0xff00ff00); - pixels.push_back(0xff0000ff); - std::vector result = QuantizeWu(pixels, 256); - EXPECT_EQ(result.size(), 3u); - EXPECT_EQ(result[0], 0xff0000ff); - EXPECT_EQ(result[1], 0xffff0000); - EXPECT_EQ(result[2], 0xff00ff00); -} - -TEST(WuTest, Testonly) { - std::vector pixels; - pixels.push_back(0xff010203); - pixels.push_back(0xff665544); - pixels.push_back(0xff708090); - pixels.push_back(0xffc0ffee); - pixels.push_back(0xfffedcba); - std::vector result = QuantizeWu(pixels, 256); -} - -} // namespace -} // namespace material_color_utilities diff --git a/cpp/scheme/scheme_content.cc b/cpp/scheme/scheme_content.cc deleted file mode 100644 index 50347afc..00000000 --- a/cpp/scheme/scheme_content.cc +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/scheme/scheme_content.h" - -#include - -#include "cpp/cam/hct.h" -#include "cpp/dislike/dislike.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" -#include "cpp/dynamiccolor/variant.h" -#include "cpp/palettes/tones.h" -#include "cpp/temperature/temperature_cache.h" - -namespace material_color_utilities { - -SchemeContent::SchemeContent(Hct set_source_color_hct, bool set_is_dark, - double set_contrast_level) - : DynamicScheme( - /*set_source_color_hct:*/ set_source_color_hct, - /*variant:*/ Variant::kContent, - /*contrast_level:*/ set_contrast_level, - /*is_dark:*/ set_is_dark, - /*primary_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), - set_source_color_hct.get_chroma()), - /*secondary_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), - fmax(set_source_color_hct.get_chroma() - 32.0, - set_source_color_hct.get_chroma() * 0.5)), - /*tertiary_palette:*/ - TonalPalette(FixIfDisliked(TemperatureCache(set_source_color_hct) - .GetAnalogousColors(3, 6) - .at(2))), - /*neutral_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), - set_source_color_hct.get_chroma() / 8.0), - /*neutral_variant_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), - set_source_color_hct.get_chroma() / 8.0 + 4.0)) {} - -SchemeContent::SchemeContent(Hct set_source_color_hct, bool set_is_dark) - : SchemeContent::SchemeContent(set_source_color_hct, set_is_dark, 0.0) {} - -} // namespace material_color_utilities diff --git a/cpp/scheme/scheme_content.h b/cpp/scheme/scheme_content.h deleted file mode 100644 index 15377a0a..00000000 --- a/cpp/scheme/scheme_content.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_SCHEME_SCHEME_CONTENT_H_ -#define CPP_SCHEME_SCHEME_CONTENT_H_ - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" - -namespace material_color_utilities { - -struct SchemeContent : public DynamicScheme { - SchemeContent(Hct set_source_color_hct, bool set_is_dark, - double set_contrast_level); - SchemeContent(Hct set_source_color_hct, bool set_is_dark); -}; - -} // namespace material_color_utilities - -#endif // CPP_SCHEME_SCHEME_CONTENT_H_ diff --git a/cpp/scheme/scheme_expressive.cc b/cpp/scheme/scheme_expressive.cc deleted file mode 100644 index ecc0060f..00000000 --- a/cpp/scheme/scheme_expressive.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/scheme/scheme_expressive.h" - -#include - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" -#include "cpp/dynamiccolor/variant.h" -#include "cpp/palettes/tones.h" - -namespace material_color_utilities { - -const std::vector kHues = {0, 21, 51, 121, 151, 191, 271, 321, 360}; - -const std::vector kSecondaryRotations = {45, 95, 45, 20, 45, - 90, 45, 45, 45}; - -const std::vector kTertiaryRotations = {120, 120, 20, 45, 20, - 15, 20, 120, 120}; - -SchemeExpressive::SchemeExpressive(Hct set_source_color_hct, bool set_is_dark, - double set_contrast_level) - : DynamicScheme( - /*set_source_color_hct:*/ set_source_color_hct, - /*variant:*/ Variant::kExpressive, - /*contrast_level:*/ set_contrast_level, - /*is_dark:*/ set_is_dark, - /*primary_palette:*/ - TonalPalette(set_source_color_hct.get_hue() + 240.0, 40.0), - /*secondary_palette:*/ - TonalPalette(DynamicScheme::GetRotatedHue(set_source_color_hct, kHues, - kSecondaryRotations), - 24.0), - /*tertiary_palette:*/ - TonalPalette(DynamicScheme::GetRotatedHue(set_source_color_hct, kHues, - kTertiaryRotations), - 32.0), - /*neutral_palette:*/ - TonalPalette(set_source_color_hct.get_hue() + 15.0, 8.0), - /*neutral_variant_palette:*/ - TonalPalette(set_source_color_hct.get_hue() + 15, 12.0)) {} - -SchemeExpressive::SchemeExpressive(Hct set_source_color_hct, bool set_is_dark) - : SchemeExpressive::SchemeExpressive(set_source_color_hct, set_is_dark, - 0.0) {} - -} // namespace material_color_utilities diff --git a/cpp/scheme/scheme_expressive.h b/cpp/scheme/scheme_expressive.h deleted file mode 100644 index 92d915fe..00000000 --- a/cpp/scheme/scheme_expressive.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_SCHEME_SCHEME_EXPRESSIVE_H_ -#define CPP_SCHEME_SCHEME_EXPRESSIVE_H_ - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" - -namespace material_color_utilities { - -struct SchemeExpressive : public DynamicScheme { - SchemeExpressive(Hct source_color_hct, bool is_dark, double contrast_level); - SchemeExpressive(Hct source_color_hct, bool is_dark); -}; - -} // namespace material_color_utilities - -#endif // CPP_SCHEME_SCHEME_EXPRESSIVE_H_ diff --git a/cpp/scheme/scheme_fidelity.cc b/cpp/scheme/scheme_fidelity.cc deleted file mode 100644 index f2f2ca11..00000000 --- a/cpp/scheme/scheme_fidelity.cc +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/scheme/scheme_fidelity.h" - -#include - -#include "cpp/cam/hct.h" -#include "cpp/dislike/dislike.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" -#include "cpp/dynamiccolor/variant.h" -#include "cpp/palettes/tones.h" -#include "cpp/temperature/temperature_cache.h" - -namespace material_color_utilities { - -SchemeFidelity::SchemeFidelity(Hct set_source_color_hct, bool set_is_dark, - double set_contrast_level) - : DynamicScheme( - /*set_source_color_hct:*/ set_source_color_hct, - /*variant:*/ Variant::kFidelity, - /*contrast_level:*/ set_contrast_level, - /*is_dark:*/ set_is_dark, - /*primary_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), - set_source_color_hct.get_chroma()), - /*secondary_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), - fmax(set_source_color_hct.get_chroma() - 32.0, - set_source_color_hct.get_chroma() * 0.5)), - /*tertiary_palette:*/ - TonalPalette(FixIfDisliked( - TemperatureCache(set_source_color_hct).GetComplement())), - /*neutral_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), - set_source_color_hct.get_chroma() / 8.0), - /*neutral_variant_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), - set_source_color_hct.get_chroma() / 8.0 + 4.0)) {} - -SchemeFidelity::SchemeFidelity(Hct set_source_color_hct, bool set_is_dark) - : SchemeFidelity::SchemeFidelity(set_source_color_hct, set_is_dark, 0.0) {} - -} // namespace material_color_utilities diff --git a/cpp/scheme/scheme_fidelity.h b/cpp/scheme/scheme_fidelity.h deleted file mode 100644 index a77afc36..00000000 --- a/cpp/scheme/scheme_fidelity.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_SCHEME_SCHEME_FIDELITY_H_ -#define CPP_SCHEME_SCHEME_FIDELITY_H_ - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" - -namespace material_color_utilities { - -struct SchemeFidelity : public DynamicScheme { - SchemeFidelity(Hct set_source_color_hct, bool set_is_dark, - double set_contrast_level); - SchemeFidelity(Hct set_source_color_hct, bool set_is_dark); -}; - -} // namespace material_color_utilities - -#endif // CPP_SCHEME_SCHEME_FIDELITY_H_ diff --git a/cpp/scheme/scheme_fruit_salad.cc b/cpp/scheme/scheme_fruit_salad.cc deleted file mode 100644 index 4c112ccf..00000000 --- a/cpp/scheme/scheme_fruit_salad.cc +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/scheme/scheme_fruit_salad.h" - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" -#include "cpp/dynamiccolor/variant.h" -#include "cpp/palettes/tones.h" - -namespace material_color_utilities { - -SchemeFruitSalad::SchemeFruitSalad(Hct set_source_color_hct, bool set_is_dark, - double set_contrast_level) - : DynamicScheme( - /*set_source_color_hct:*/ set_source_color_hct, - /*variant:*/ Variant::kFruitSalad, - /*contrast_level:*/ set_contrast_level, - /*is_dark:*/ set_is_dark, - /*primary_palette:*/ - TonalPalette( - SanitizeDegreesDouble(set_source_color_hct.get_hue() - 50.0), - 48.0), - /*secondary_palette:*/ - TonalPalette( - SanitizeDegreesDouble(set_source_color_hct.get_hue() - 50.0), - 36.0), - /*tertiary_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 36.0), - /*neutral_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 10.0), - /*neutral_variant_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 16.0)) {} - -SchemeFruitSalad::SchemeFruitSalad(Hct set_source_color_hct, bool set_is_dark) - : SchemeFruitSalad::SchemeFruitSalad(set_source_color_hct, set_is_dark, - 0.0) {} - -} // namespace material_color_utilities diff --git a/cpp/scheme/scheme_fruit_salad.h b/cpp/scheme/scheme_fruit_salad.h deleted file mode 100644 index 45366f10..00000000 --- a/cpp/scheme/scheme_fruit_salad.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_SCHEME_SCHEME_FRUIT_SALAD_H_ -#define CPP_SCHEME_SCHEME_FRUIT_SALAD_H_ - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" - -namespace material_color_utilities { - -struct SchemeFruitSalad : public DynamicScheme { - SchemeFruitSalad(Hct source_color_hct, bool is_dark, double contrast_level); - SchemeFruitSalad(Hct source_color_hct, bool is_dark); -}; - -} // namespace material_color_utilities - -#endif // CPP_SCHEME_SCHEME_FRUIT_SALAD_H_ diff --git a/cpp/scheme/scheme_monochrome.cc b/cpp/scheme/scheme_monochrome.cc deleted file mode 100644 index 64b60ef0..00000000 --- a/cpp/scheme/scheme_monochrome.cc +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/scheme/scheme_monochrome.h" - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" -#include "cpp/dynamiccolor/variant.h" -#include "cpp/palettes/tones.h" - -namespace material_color_utilities { - -SchemeMonochrome::SchemeMonochrome(Hct set_source_color_hct, bool set_is_dark, - double set_contrast_level) - : DynamicScheme( - /*set_source_color_hct:*/ set_source_color_hct, - /*variant:*/ Variant::kMonochrome, - /*contrast_level:*/ set_contrast_level, - /*is_dark:*/ set_is_dark, - /*primary_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 0.0), - /*secondary_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 0.0), - /*tertiary_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 0.0), - /*neutral_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 0.0), - /*neutral_variant_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 0.0)) {} - -SchemeMonochrome::SchemeMonochrome(Hct set_source_color_hct, bool set_is_dark) - : SchemeMonochrome::SchemeMonochrome(set_source_color_hct, set_is_dark, - 0.0) {} - -} // namespace material_color_utilities diff --git a/cpp/scheme/scheme_monochrome.h b/cpp/scheme/scheme_monochrome.h deleted file mode 100644 index 96de3614..00000000 --- a/cpp/scheme/scheme_monochrome.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_SCHEME_SCHEME_MONOCHROME_H_ -#define CPP_SCHEME_SCHEME_MONOCHROME_H_ - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" - -namespace material_color_utilities { - -struct SchemeMonochrome : public DynamicScheme { - SchemeMonochrome(Hct source_color_hct, bool is_dark, double contrast_level); - SchemeMonochrome(Hct source_color_hct, bool is_dark); -}; - -} // namespace material_color_utilities - -#endif // CPP_SCHEME_SCHEME_MONOCHROME_H_ diff --git a/cpp/scheme/scheme_monochrome_test.cc b/cpp/scheme/scheme_monochrome_test.cc deleted file mode 100644 index 77a65443..00000000 --- a/cpp/scheme/scheme_monochrome_test.cc +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/scheme/scheme_monochrome.h" - -#include "testing/base/public/gunit.h" -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/material_dynamic_colors.h" - -namespace material_color_utilities { - -namespace { -TEST(SchemeMonochromeTest, darkTheme_monochromeSpec) { - SchemeMonochrome scheme = SchemeMonochrome(Hct(0xff0000ff), true, 0.0); - EXPECT_NEAR(MaterialDynamicColors::Primary().GetHct(scheme).get_tone(), 100.0, - 1.0); - EXPECT_NEAR(MaterialDynamicColors::OnPrimary().GetHct(scheme).get_tone(), - 10.0, 1.0); - EXPECT_NEAR( - MaterialDynamicColors::PrimaryContainer().GetHct(scheme).get_tone(), 85.0, - 1.0); - EXPECT_NEAR( - MaterialDynamicColors::OnPrimaryContainer().GetHct(scheme).get_tone(), - 0.0, 1.0); - EXPECT_NEAR(MaterialDynamicColors::Secondary().GetHct(scheme).get_tone(), - 80.0, 1.0); - EXPECT_NEAR(MaterialDynamicColors::OnSecondary().GetHct(scheme).get_tone(), - 10.0, 1.0); - EXPECT_NEAR( - MaterialDynamicColors::SecondaryContainer().GetHct(scheme).get_tone(), - 30.0, 1.0); - EXPECT_NEAR( - MaterialDynamicColors::OnSecondaryContainer().GetHct(scheme).get_tone(), - 90.0, 1.0); - EXPECT_NEAR(MaterialDynamicColors::Tertiary().GetHct(scheme).get_tone(), 90.0, - 1.0); - EXPECT_NEAR(MaterialDynamicColors::OnTertiary().GetHct(scheme).get_tone(), - 10.0, 1.0); - EXPECT_NEAR( - MaterialDynamicColors::TertiaryContainer().GetHct(scheme).get_tone(), - 60.0, 1.0); - EXPECT_NEAR( - MaterialDynamicColors::OnTertiaryContainer().GetHct(scheme).get_tone(), - 0.0, 1.0); -} - -TEST(SchemeMonochromeTest, lightTheme_monochromeSpec) { - SchemeMonochrome scheme = SchemeMonochrome(Hct(0xff0000ff), false, 0.0); - EXPECT_NEAR(MaterialDynamicColors::Primary().GetHct(scheme).get_tone(), 0.0, - 1.0); - EXPECT_NEAR(MaterialDynamicColors::OnPrimary().GetHct(scheme).get_tone(), - 90.0, 1.0); - EXPECT_NEAR( - MaterialDynamicColors::PrimaryContainer().GetHct(scheme).get_tone(), 25.0, - 1.0); - EXPECT_NEAR( - MaterialDynamicColors::OnPrimaryContainer().GetHct(scheme).get_tone(), - 100.0, 1.0); - EXPECT_NEAR(MaterialDynamicColors::Secondary().GetHct(scheme).get_tone(), - 40.0, 1.0); - EXPECT_NEAR(MaterialDynamicColors::OnSecondary().GetHct(scheme).get_tone(), - 100.0, 1.0); - EXPECT_NEAR( - MaterialDynamicColors::SecondaryContainer().GetHct(scheme).get_tone(), - 85.0, 1.0); - EXPECT_NEAR( - MaterialDynamicColors::OnSecondaryContainer().GetHct(scheme).get_tone(), - 10.0, 1.0); - EXPECT_NEAR(MaterialDynamicColors::Tertiary().GetHct(scheme).get_tone(), 25.0, - 1.0); - EXPECT_NEAR(MaterialDynamicColors::OnTertiary().GetHct(scheme).get_tone(), - 90.0, 1.0); - EXPECT_NEAR( - MaterialDynamicColors::TertiaryContainer().GetHct(scheme).get_tone(), - 49.0, 1.0); - EXPECT_NEAR( - MaterialDynamicColors::OnTertiaryContainer().GetHct(scheme).get_tone(), - 100.0, 1.0); -} - -} // namespace -} // namespace material_color_utilities diff --git a/cpp/scheme/scheme_neutral.cc b/cpp/scheme/scheme_neutral.cc deleted file mode 100644 index f5d37f84..00000000 --- a/cpp/scheme/scheme_neutral.cc +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/scheme/scheme_neutral.h" - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" -#include "cpp/dynamiccolor/variant.h" -#include "cpp/palettes/tones.h" - -namespace material_color_utilities { - -SchemeNeutral::SchemeNeutral(Hct set_source_color_hct, bool set_is_dark, - double set_contrast_level) - : DynamicScheme( - /*set_source_color_hct:*/ set_source_color_hct, - /*variant:*/ Variant::kNeutral, - /*contrast_level:*/ set_contrast_level, - /*is_dark:*/ set_is_dark, - /*primary_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 12.0), - /*secondary_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 8.0), - /*tertiary_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 16.0), - /*neutral_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 2.0), - /*neutral_variant_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 2.0)) {} - -SchemeNeutral::SchemeNeutral(Hct set_source_color_hct, bool set_is_dark) - : SchemeNeutral::SchemeNeutral(set_source_color_hct, set_is_dark, 0.0) {} - -} // namespace material_color_utilities diff --git a/cpp/scheme/scheme_neutral.h b/cpp/scheme/scheme_neutral.h deleted file mode 100644 index 7b44faee..00000000 --- a/cpp/scheme/scheme_neutral.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_SCHEME_SCHEME_NEUTRAL_H_ -#define CPP_SCHEME_SCHEME_NEUTRAL_H_ - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" - -namespace material_color_utilities { - -struct SchemeNeutral : public DynamicScheme { - SchemeNeutral(Hct source_color_hct, bool is_dark, double contrast_level); - SchemeNeutral(Hct source_color_hct, bool is_dark); -}; - -} // namespace material_color_utilities - -#endif // CPP_SCHEME_SCHEME_NEUTRAL_H_ diff --git a/cpp/scheme/scheme_rainbow.cc b/cpp/scheme/scheme_rainbow.cc deleted file mode 100644 index 6ac19ba5..00000000 --- a/cpp/scheme/scheme_rainbow.cc +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/scheme/scheme_rainbow.h" - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" -#include "cpp/dynamiccolor/variant.h" -#include "cpp/palettes/tones.h" - -namespace material_color_utilities { - -SchemeRainbow::SchemeRainbow(Hct set_source_color_hct, bool set_is_dark, - double set_contrast_level) - : DynamicScheme( - /*set_source_color_hct:*/ set_source_color_hct, - /*variant:*/ Variant::kRainbow, - /*contrast_level:*/ set_contrast_level, - /*is_dark:*/ set_is_dark, - /*primary_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 48.0), - /*secondary_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 16.0), - /*tertiary_palette:*/ - TonalPalette( - SanitizeDegreesDouble(set_source_color_hct.get_hue() + 60.0), - 24.0), - /*neutral_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 0.0), - /*neutral_variant_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 0.0)) {} - -SchemeRainbow::SchemeRainbow(Hct set_source_color_hct, bool set_is_dark) - : SchemeRainbow::SchemeRainbow(set_source_color_hct, set_is_dark, 0.0) {} - -} // namespace material_color_utilities diff --git a/cpp/scheme/scheme_rainbow.h b/cpp/scheme/scheme_rainbow.h deleted file mode 100644 index 39ff6988..00000000 --- a/cpp/scheme/scheme_rainbow.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_SCHEME_SCHEME_RAINBOW_H_ -#define CPP_SCHEME_SCHEME_RAINBOW_H_ - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" - -namespace material_color_utilities { - -struct SchemeRainbow : public DynamicScheme { - SchemeRainbow(Hct source_color_hct, bool is_dark, double contrast_level); - SchemeRainbow(Hct source_color_hct, bool is_dark); -}; - -} // namespace material_color_utilities - -#endif // CPP_SCHEME_SCHEME_RAINBOW_H_ diff --git a/cpp/scheme/scheme_tonal_spot.cc b/cpp/scheme/scheme_tonal_spot.cc deleted file mode 100644 index 41176f7e..00000000 --- a/cpp/scheme/scheme_tonal_spot.cc +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/scheme/scheme_tonal_spot.h" - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" -#include "cpp/dynamiccolor/variant.h" -#include "cpp/palettes/tones.h" - -namespace material_color_utilities { - -SchemeTonalSpot::SchemeTonalSpot(Hct set_source_color_hct, bool set_is_dark, - double set_contrast_level) - : DynamicScheme( - /*set_source_color_hct:*/ set_source_color_hct, - /*variant:*/ Variant::kTonalSpot, - /*contrast_level:*/ set_contrast_level, - /*is_dark:*/ set_is_dark, - /*primary_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 36.0), - /*secondary_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 16.0), - /*tertiary_palette:*/ - TonalPalette( - SanitizeDegreesDouble(set_source_color_hct.get_hue() + 60), 24.0), - /*neutral_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 6.0), - /*neutral_variant_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 8.0)) {} - -SchemeTonalSpot::SchemeTonalSpot(Hct set_source_color_hct, bool set_is_dark) - : SchemeTonalSpot::SchemeTonalSpot(set_source_color_hct, set_is_dark, 0.0) { -} - -} // namespace material_color_utilities diff --git a/cpp/scheme/scheme_tonal_spot.h b/cpp/scheme/scheme_tonal_spot.h deleted file mode 100644 index b77a38a8..00000000 --- a/cpp/scheme/scheme_tonal_spot.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_SCHEME_SCHEME_TONAL_SPOT_H_ -#define CPP_SCHEME_SCHEME_TONAL_SPOT_H_ - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" - -namespace material_color_utilities { - -struct SchemeTonalSpot : public DynamicScheme { - SchemeTonalSpot(Hct source_color_hct, bool is_dark, double contrast_level); - SchemeTonalSpot(Hct source_color_hct, bool is_dark); -}; - -} // namespace material_color_utilities - -#endif // CPP_SCHEME_SCHEME_TONAL_SPOT_H_ diff --git a/cpp/scheme/scheme_vibrant.cc b/cpp/scheme/scheme_vibrant.cc deleted file mode 100644 index 2b498e4a..00000000 --- a/cpp/scheme/scheme_vibrant.cc +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/scheme/scheme_vibrant.h" - -#include - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" -#include "cpp/dynamiccolor/variant.h" -#include "cpp/palettes/tones.h" - -namespace material_color_utilities { - -const std::vector kHues = {0, 41, 61, 101, 131, 181, 251, 301, 360}; - -const std::vector kSecondaryRotations = {18, 15, 10, 12, 15, - 18, 15, 12, 12}; - -const std::vector kTertiaryRotations = {35, 30, 20, 25, 30, - 35, 30, 25, 25}; - -SchemeVibrant::SchemeVibrant(Hct set_source_color_hct, bool set_is_dark, - double set_contrast_level) - : DynamicScheme( - /*set_source_color_hct:*/ set_source_color_hct, - /*variant:*/ Variant::kVibrant, - /*contrast_level:*/ set_contrast_level, - /*is_dark:*/ set_is_dark, - /*primary_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 200.0), - /*secondary_palette:*/ - TonalPalette(DynamicScheme::GetRotatedHue(set_source_color_hct, kHues, - kSecondaryRotations), - 24.0), - /*tertiary_palette:*/ - TonalPalette(DynamicScheme::GetRotatedHue(set_source_color_hct, kHues, - kTertiaryRotations), - 32.0), - /*neutral_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 10.0), - /*neutral_variant_palette:*/ - TonalPalette(set_source_color_hct.get_hue(), 12.0)) {} - -SchemeVibrant::SchemeVibrant(Hct set_source_color_hct, bool set_is_dark) - : SchemeVibrant::SchemeVibrant(set_source_color_hct, set_is_dark, 0.0) {} - -} // namespace material_color_utilities diff --git a/cpp/scheme/scheme_vibrant.h b/cpp/scheme/scheme_vibrant.h deleted file mode 100644 index fdc8110c..00000000 --- a/cpp/scheme/scheme_vibrant.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_SCHEME_SCHEME_VARIANT_H_ -#define CPP_SCHEME_SCHEME_VARIANT_H_ - -#include "cpp/cam/hct.h" -#include "cpp/dynamiccolor/dynamic_scheme.h" - -namespace material_color_utilities { - -struct SchemeVibrant : public DynamicScheme { - SchemeVibrant(Hct source_color_hct, bool is_dark, double contrast_level); - SchemeVibrant(Hct source_color_hct, bool is_dark); -}; - -} // namespace material_color_utilities - -#endif // CPP_SCHEME_SCHEME_VARIANT_H_ diff --git a/cpp/score/score.cc b/cpp/score/score.cc deleted file mode 100644 index c2c0278e..00000000 --- a/cpp/score/score.cc +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/score/score.h" - -#include -#include -#include -#include -#include -#include - -#include "cpp/cam/hct.h" -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -constexpr double kTargetChroma = 48.0; // A1 Chroma -constexpr double kWeightProportion = 0.7; -constexpr double kWeightChromaAbove = 0.3; -constexpr double kWeightChromaBelow = 0.1; -constexpr double kCutoffChroma = 5.0; -constexpr double kCutoffExcitedProportion = 0.01; - -bool CompareScoredHCT(const std::pair& a, - const std::pair& b) { - return a.second > b.second; -} - -std::vector RankedSuggestions( - const std::map& argb_to_population, - const ScoreOptions& options) { - // Get the HCT color for each Argb value, while finding the per hue count and - // total count. - std::vector colors_hct; - std::vector hue_population(360, 0); - double population_sum = 0; - for (const auto& [argb, population] : argb_to_population) { - Hct hct(argb); - colors_hct.push_back(hct); - int hue = floor(hct.get_hue()); - hue_population[hue] += population; - population_sum += population; - } - - // Hues with more usage in neighboring 30 degree slice get a larger number. - std::vector hue_excited_proportions(360, 0.0); - for (int hue = 0; hue < 360; hue++) { - double proportion = hue_population[hue] / population_sum; - for (int i = hue - 14; i < hue + 16; i++) { - int neighbor_hue = SanitizeDegreesInt(i); - hue_excited_proportions[neighbor_hue] += proportion; - } - } - - // Scores each HCT color based on usage and chroma, while optionally - // filtering out values that do not have enough chroma or usage. - std::vector> scored_hcts; - for (Hct hct : colors_hct) { - int hue = SanitizeDegreesInt(round(hct.get_hue())); - double proportion = hue_excited_proportions[hue]; - if (options.filter && (hct.get_chroma() < kCutoffChroma || - proportion <= kCutoffExcitedProportion)) { - continue; - } - - double proportion_score = proportion * 100.0 * kWeightProportion; - double chroma_weight = hct.get_chroma() < kTargetChroma - ? kWeightChromaBelow - : kWeightChromaAbove; - double chroma_score = (hct.get_chroma() - kTargetChroma) * chroma_weight; - double score = proportion_score + chroma_score; - scored_hcts.push_back({hct, score}); - } - // Sorted so that colors with higher scores come first. - sort(scored_hcts.begin(), scored_hcts.end(), CompareScoredHCT); - - // Iterates through potential hue differences in degrees in order to select - // the colors with the largest distribution of hues possible. Starting at - // 90 degrees(maximum difference for 4 colors) then decreasing down to a - // 15 degree minimum. - std::vector chosen_colors; - for (int difference_degrees = 90; difference_degrees >= 15; - difference_degrees--) { - chosen_colors.clear(); - for (auto entry : scored_hcts) { - Hct hct = entry.first; - auto duplicate_hue = std::find_if( - chosen_colors.begin(), chosen_colors.end(), - [&hct, difference_degrees](Hct chosen_hct) { - return DiffDegrees(hct.get_hue(), chosen_hct.get_hue()) < - difference_degrees; - }); - if (duplicate_hue == chosen_colors.end()) { - chosen_colors.push_back(hct); - if (chosen_colors.size() >= options.desired) break; - } - } - if (chosen_colors.size() >= options.desired) break; - } - std::vector colors; - if (chosen_colors.empty()) { - colors.push_back(options.fallback_color_argb); - } - for (auto chosen_hct : chosen_colors) { - colors.push_back(chosen_hct.ToInt()); - } - return colors; -} - -} // namespace material_color_utilities diff --git a/cpp/score/score.h b/cpp/score/score.h deleted file mode 100644 index 5bd2b82b..00000000 --- a/cpp/score/score.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_SCORE_SCORE_H_ -#define CPP_SCORE_SCORE_H_ - -#include -#include -#include - -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -/** - * Default options for ranking colors based on usage counts. - * `desired`: is the max count of the colors returned. - * `fallback_color_argb`: Is the default color that should be used if no - * other colors are suitable. - * `filter`: controls if the resulting colors should be filtered to not include - * hues that are not used often enough, and colors that are effectively - * grayscale. - */ -struct ScoreOptions { - size_t desired = 4; // 4 colors matches the Android wallpaper picker. - int fallback_color_argb = 0xff4285f4; // Google Blue. - bool filter = true; // Avoid unsuitable colors. -}; - -/** - * Given a map with keys of colors and values of how often the color appears, - * rank the colors based on suitability for being used for a UI theme. - * - * The list returned is of length <= [desired]. The recommended color is the - * first item, the least suitable is the last. There will always be at least - * one color returned. If all the input colors were not suitable for a theme, - * a default fallback color will be provided, Google Blue, or supplied fallback - * color. The default number of colors returned is 4, simply because that's the - * # of colors display in Android 12's wallpaper picker. - */ -std::vector RankedSuggestions( - const std::map& argb_to_population, - const ScoreOptions& options = {}); -} // namespace material_color_utilities - -#endif // CPP_SCORE_SCORE_H_ diff --git a/cpp/score/score_test.cc b/cpp/score/score_test.cc deleted file mode 100644 index 8f8100d3..00000000 --- a/cpp/score/score_test.cc +++ /dev/null @@ -1,257 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/score/score.h" - -#include -#include -#include - -#include "testing/base/public/gunit.h" -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -namespace { - -TEST(ScoreTest, PrioritizesChroma) { - std::map argb_to_population = { - {0xff000000, 1}, {0xffffffff, 1}, {0xff0000ff, 1}}; - - std::vector ranked = - RankedSuggestions(argb_to_population, {.desired = 4}); - - EXPECT_EQ(ranked.size(), 1u); - EXPECT_EQ(ranked[0], 0xff0000ff); -} - -TEST(ScoreTest, PrioritizesChromaWhenProportionsEqual) { - std::map argb_to_population = { - {0xffff0000, 1}, {0xff00ff00, 1}, {0xff0000ff, 1}}; - - std::vector ranked = - RankedSuggestions(argb_to_population, {.desired = 4}); - - EXPECT_EQ(ranked.size(), 3u); - EXPECT_EQ(ranked[0], 0xffff0000); - EXPECT_EQ(ranked[1], 0xff00ff00); - EXPECT_EQ(ranked[2], 0xff0000ff); -} - -TEST(ScoreTest, GeneratesGblueWhenNoColorsAvailable) { - std::map argb_to_population = {{0xff000000, 1}}; - - std::vector ranked = - RankedSuggestions(argb_to_population, {.desired = 4}); - - EXPECT_EQ(ranked.size(), 1u); - EXPECT_EQ(ranked[0], 0xff4285f4); -} - -TEST(ScoreTest, DedupesNearbyHues) { - std::map argb_to_population = { - {0xff008772, 1}, // H 180 C 42 T 50 - {0xff318477, 1} // H 184 C 35 T 50 - }; - - std::vector ranked = - RankedSuggestions(argb_to_population, {.desired = 4}); - - EXPECT_EQ(ranked.size(), 1u); - EXPECT_EQ(ranked[0], 0xff008772); -} - -TEST(ScoreTest, MaximizesHueDistance) { - std::map argb_to_population = { - {0xff008772, 1}, // H 180 C 42 T 50 - {0xff008587, 1}, // H 198 C 50 T 50 - {0xff007ebc, 1} // H 245 C 50 T 50 - }; - - std::vector ranked = - RankedSuggestions(argb_to_population, {.desired = 2}); - - EXPECT_EQ(ranked.size(), 2u); - EXPECT_EQ(ranked[0], 0xff007ebc); - EXPECT_EQ(ranked[1], 0xff008772); -} - -TEST(ScoreTest, GeneratedScenarioOne) { - std::map argb_to_population = { - {0xff7ea16d, 67}, - {0xffd8ccae, 67}, - {0xff835c0d, 49}, - }; - - std::vector ranked = RankedSuggestions( - argb_to_population, - {.desired = 3, .fallback_color_argb = (int)0xff8d3819, .filter = false}); - - EXPECT_EQ(ranked.size(), 3u); - EXPECT_EQ(ranked[0], 0xff7ea16d); - EXPECT_EQ(ranked[1], 0xffd8ccae); - EXPECT_EQ(ranked[2], 0xff835c0d); -} - -TEST(ScoreTest, GeneratedScenarioTwo) { - std::map argb_to_population = { - {0xffd33881, 14}, - {0xff3205cc, 77}, - {0xff0b48cf, 36}, - {0xffa08f5d, 81}, - }; - - std::vector ranked = RankedSuggestions( - argb_to_population, - {.desired = 4, .fallback_color_argb = (int)0xff7d772b, .filter = true}); - - EXPECT_EQ(ranked.size(), 3u); - EXPECT_EQ(ranked[0], 0xff3205cc); - EXPECT_EQ(ranked[1], 0xffa08f5d); - EXPECT_EQ(ranked[2], 0xffd33881); -} - -TEST(ScoreTest, GeneratedScenarioThree) { - std::map argb_to_population = { - {0xffbe94a6, 23}, - {0xffc33fd7, 42}, - {0xff899f36, 90}, - {0xff94c574, 82}, - }; - - std::vector ranked = RankedSuggestions( - argb_to_population, - {.desired = 3, .fallback_color_argb = (int)0xffaa79a4, .filter = true}); - - EXPECT_EQ(ranked.size(), 3u); - EXPECT_EQ(ranked[0], 0xff94c574); - EXPECT_EQ(ranked[1], 0xffc33fd7); - EXPECT_EQ(ranked[2], 0xffbe94a6); -} - -TEST(ScoreTest, GeneratedScenarioFour) { - std::map argb_to_population = { - {0xffdf241c, 85}, {0xff685859, 44}, {0xffd06d5f, 34}, - {0xff561c54, 27}, {0xff713090, 88}, - }; - - std::vector ranked = RankedSuggestions( - argb_to_population, - {.desired = 5, .fallback_color_argb = (int)0xff58c19c, .filter = false}); - - EXPECT_EQ(ranked.size(), 2u); - EXPECT_EQ(ranked[0], 0xffdf241c); - EXPECT_EQ(ranked[1], 0xff561c54); -} - -TEST(ScoreTest, GeneratedScenarioFive) { - std::map argb_to_population = { - {0xffbe66f8, 41}, {0xff4bbda9, 88}, {0xff80f6f9, 44}, - {0xffab8017, 43}, {0xffe89307, 65}, - }; - - std::vector ranked = RankedSuggestions( - argb_to_population, - {.desired = 3, .fallback_color_argb = (int)0xff916691, .filter = false}); - - EXPECT_EQ(ranked.size(), 3u); - EXPECT_EQ(ranked[0], 0xffab8017); - EXPECT_EQ(ranked[1], 0xff4bbda9); - EXPECT_EQ(ranked[2], 0xffbe66f8); -} - -TEST(ScoreTest, GeneratedScenarioSix) { - std::map argb_to_population = { - {0xff18ea8f, 93}, {0xff327593, 18}, {0xff066a18, 53}, - {0xfffa8a23, 74}, {0xff04ca1f, 62}, - }; - - std::vector ranked = RankedSuggestions( - argb_to_population, - {.desired = 2, .fallback_color_argb = (int)0xff4c377a, .filter = false}); - - EXPECT_EQ(ranked.size(), 2u); - EXPECT_EQ(ranked[0], 0xff18ea8f); - EXPECT_EQ(ranked[1], 0xfffa8a23); -} - -TEST(ScoreTest, GeneratedScenarioSeven) { - std::map argb_to_population = { - {0xff2e05ed, 23}, {0xff153e55, 90}, {0xff9ab220, 23}, - {0xff153379, 66}, {0xff68bcc3, 81}, - }; - - std::vector ranked = RankedSuggestions( - argb_to_population, - {.desired = 2, .fallback_color_argb = (int)0xfff588dc, .filter = true}); - - EXPECT_EQ(ranked.size(), 2u); - EXPECT_EQ(ranked[0], 0xff2e05ed); - EXPECT_EQ(ranked[1], 0xff9ab220); -} - -TEST(ScoreTest, GeneratedScenarioEight) { - std::map argb_to_population = { - {0xff816ec5, 24}, - {0xff6dcb94, 19}, - {0xff3cae91, 98}, - {0xff5b542f, 25}, - }; - - std::vector ranked = RankedSuggestions( - argb_to_population, - {.desired = 1, .fallback_color_argb = (int)0xff84b0fd, .filter = false}); - - EXPECT_EQ(ranked.size(), 1u); - EXPECT_EQ(ranked[0], 0xff3cae91); -} - -TEST(ScoreTest, GeneratedScenarioNine) { - std::map argb_to_population = { - {0xff206f86, 52}, {0xff4a620d, 96}, {0xfff51401, 85}, - {0xff2b8ebf, 3}, {0xff277766, 59}, - }; - - std::vector ranked = RankedSuggestions( - argb_to_population, - {.desired = 3, .fallback_color_argb = (int)0xff02b415, .filter = true}); - - EXPECT_EQ(ranked.size(), 3u); - EXPECT_EQ(ranked[0], 0xfff51401); - EXPECT_EQ(ranked[1], 0xff4a620d); - EXPECT_EQ(ranked[2], 0xff2b8ebf); -} - -TEST(ScoreTest, GeneratedScenarioTen) { - std::map argb_to_population = { - {0xff8b1d99, 54}, - {0xff27effe, 43}, - {0xff6f558d, 2}, - {0xff77fdf2, 78}, - }; - - std::vector ranked = RankedSuggestions( - argb_to_population, - {.desired = 4, .fallback_color_argb = (int)0xff5e7a10, .filter = true}); - - EXPECT_EQ(ranked.size(), 3u); - EXPECT_EQ(ranked[0], 0xff27effe); - EXPECT_EQ(ranked[1], 0xff8b1d99); - EXPECT_EQ(ranked[2], 0xff6f558d); -} - -} // namespace -} // namespace material_color_utilities diff --git a/cpp/cam/cam.cc b/cpp/src/material-color-utilities/cpp/cam/cam.cc similarity index 100% rename from cpp/cam/cam.cc rename to cpp/src/material-color-utilities/cpp/cam/cam.cc diff --git a/cpp/cam/cam.h b/cpp/src/material-color-utilities/cpp/cam/cam.h similarity index 100% rename from cpp/cam/cam.h rename to cpp/src/material-color-utilities/cpp/cam/cam.h diff --git a/cpp/cam/cam_test.cc b/cpp/src/material-color-utilities/cpp/cam/cam_test.cc similarity index 100% rename from cpp/cam/cam_test.cc rename to cpp/src/material-color-utilities/cpp/cam/cam_test.cc diff --git a/cpp/cam/hct.cc b/cpp/src/material-color-utilities/cpp/cam/hct.cc similarity index 100% rename from cpp/cam/hct.cc rename to cpp/src/material-color-utilities/cpp/cam/hct.cc diff --git a/cpp/cam/hct.h b/cpp/src/material-color-utilities/cpp/cam/hct.h similarity index 100% rename from cpp/cam/hct.h rename to cpp/src/material-color-utilities/cpp/cam/hct.h diff --git a/cpp/cam/hct_solver.cc b/cpp/src/material-color-utilities/cpp/cam/hct_solver.cc similarity index 100% rename from cpp/cam/hct_solver.cc rename to cpp/src/material-color-utilities/cpp/cam/hct_solver.cc diff --git a/cpp/cam/hct_solver.h b/cpp/src/material-color-utilities/cpp/cam/hct_solver.h similarity index 100% rename from cpp/cam/hct_solver.h rename to cpp/src/material-color-utilities/cpp/cam/hct_solver.h diff --git a/cpp/cam/hct_solver_test.cc b/cpp/src/material-color-utilities/cpp/cam/hct_solver_test.cc similarity index 100% rename from cpp/cam/hct_solver_test.cc rename to cpp/src/material-color-utilities/cpp/cam/hct_solver_test.cc diff --git a/cpp/cam/hct_test.cc b/cpp/src/material-color-utilities/cpp/cam/hct_test.cc similarity index 100% rename from cpp/cam/hct_test.cc rename to cpp/src/material-color-utilities/cpp/cam/hct_test.cc diff --git a/cpp/cam/viewing_conditions.cc b/cpp/src/material-color-utilities/cpp/cam/viewing_conditions.cc similarity index 100% rename from cpp/cam/viewing_conditions.cc rename to cpp/src/material-color-utilities/cpp/cam/viewing_conditions.cc diff --git a/cpp/cam/viewing_conditions.h b/cpp/src/material-color-utilities/cpp/cam/viewing_conditions.h similarity index 100% rename from cpp/cam/viewing_conditions.h rename to cpp/src/material-color-utilities/cpp/cam/viewing_conditions.h diff --git a/cpp/utils/utils.cc b/cpp/src/material-color-utilities/cpp/utils/utils.cc similarity index 95% rename from cpp/utils/utils.cc rename to cpp/src/material-color-utilities/cpp/utils/utils.cc index eaa892d4..b6a38e69 100644 --- a/cpp/utils/utils.cc +++ b/cpp/src/material-color-utilities/cpp/utils/utils.cc @@ -24,8 +24,6 @@ #include #include -#include "absl/strings/str_cat.h" - namespace material_color_utilities { int RedFromInt(const Argb argb) { return (argb & 0x00ff0000) >> 16; } @@ -137,11 +135,6 @@ double RotationDirection(const double from, const double to) { return increasing_difference <= 180.0 ? 1.0 : -1.0; } -// Converts a color in ARGB format to a hexadecimal string in lowercase. -// -// For instance: hex_from_argb(0xff012345) == "ff012345" -std::string HexFromArgb(Argb argb) { return absl::StrCat(absl::Hex(argb)); } - Argb IntFromLstar(const double lstar) { double y = YFromLstar(lstar); int component = Delinearized(y); diff --git a/cpp/utils/utils.h b/cpp/src/material-color-utilities/cpp/utils/utils.h similarity index 98% rename from cpp/utils/utils.h rename to cpp/src/material-color-utilities/cpp/utils/utils.h index c8908958..8ff46b95 100644 --- a/cpp/utils/utils.h +++ b/cpp/src/material-color-utilities/cpp/utils/utils.h @@ -124,11 +124,6 @@ double RotationDirection(const double from, const double to); */ double LstarFromArgb(const Argb argb); -/** - * Returns the hexadecimal representation of a color. - */ -std::string HexFromArgb(Argb argb); - /** * Linearizes an RGB component. * diff --git a/cpp/utils/utils_test.cc b/cpp/src/material-color-utilities/cpp/utils/utils_test.cc similarity index 99% rename from cpp/utils/utils_test.cc rename to cpp/src/material-color-utilities/cpp/utils/utils_test.cc index d84a1daa..7c7ba651 100644 --- a/cpp/utils/utils_test.cc +++ b/cpp/src/material-color-utilities/cpp/utils/utils_test.cc @@ -213,11 +213,6 @@ TEST(UtilsTest, LstarFromArgb) { EXPECT_THAT(LstarFromArgb(0xff010204), DoubleNear(0.529651, 1e-4)); } -TEST(UtilsTest, HexFromArgb) { - EXPECT_EQ(HexFromArgb(0xff89bce1), "ff89bce1"); - EXPECT_EQ(HexFromArgb(0xff010204), "ff010204"); -} - TEST(UtilsTest, IntFromLstar) { // Given an L* brightness value in [0, 100], IntFromLstar returns a greyscale // color in ARGB format with that brightness. diff --git a/cpp/src/mylib/mylib.cc b/cpp/src/mylib/mylib.cc new file mode 100644 index 00000000..649a32d6 --- /dev/null +++ b/cpp/src/mylib/mylib.cc @@ -0,0 +1,46 @@ +#include "material-color-utilities/cpp/utils/utils.h" +#include "material-color-utilities/cpp/cam/hct.h" +#include "mylib.h" + +Rgb BuildRgb(int red, int green, int blue) { + Rgb rgb; + rgb.Red = red; + rgb.Green = green; + rgb.Blue = blue; + return rgb; +} + +Hct BuildHct(double hue, double chroma, double tone) { + Hct hct; + hct.Hue = hue; + hct.Chroma = chroma; + hct.Tone = tone; + return hct; +} + +Hct RgbToHct(Rgb rgb) { + material_color_utilities::Argb argb = + material_color_utilities::ArgbFromRgb(rgb.Red, rgb.Green, rgb.Blue); + material_color_utilities::Hct hct = + material_color_utilities::Hct(argb); + Hct res; + res.Hue = hct.get_hue(); + res.Chroma = hct.get_chroma(); + res.Tone = hct.get_tone(); + return res; +} + +Rgb HctToRgb(Hct hct) { + material_color_utilities::Hct a = + material_color_utilities::Hct(hct.Hue, hct.Chroma, hct.Tone); + material_color_utilities::Argb argb = a.ToInt(); + int red = material_color_utilities::RedFromInt(argb); + int green = material_color_utilities::GreenFromInt(argb); + int blue = material_color_utilities::BlueFromInt(argb); + Rgb res; + res.Red = red; + res.Green = green; + res.Blue = blue; + return res; +} + diff --git a/cpp/src/mylib/mylib.h b/cpp/src/mylib/mylib.h new file mode 100644 index 00000000..b24d9ced --- /dev/null +++ b/cpp/src/mylib/mylib.h @@ -0,0 +1,26 @@ +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct { + int Red; + int Green; + int Blue; +} Rgb; + +typedef struct { + double Hue; + double Chroma; + double Tone; +} Hct; + +int GetPrimary(int, int, int); + +Rgb BuildRgb(int, int, int); +Hct BuildHct(double, double, double); +Hct RgbToHct(Rgb); +Rgb HctToRgb(Hct); + +#ifdef __cplusplus +} +#endif \ No newline at end of file diff --git a/cpp/temperature/temperature_cache.cc b/cpp/temperature/temperature_cache.cc deleted file mode 100644 index 4fec3a2c..00000000 --- a/cpp/temperature/temperature_cache.cc +++ /dev/null @@ -1,249 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/temperature/temperature_cache.h" - -#include -#include -#include - -#include "cpp/cam/hct.h" -#include "cpp/quantize/lab.h" -#include "cpp/utils/utils.h" - -namespace material_color_utilities { - -TemperatureCache::TemperatureCache(Hct input) : input_(input) {} - -Hct TemperatureCache::GetComplement() { - if (precomputed_complement_.has_value()) { - return precomputed_complement_.value(); - } - - double coldest_hue = GetColdest().get_hue(); - double coldest_temp = GetTempsByHct().at(GetColdest()); - - double warmest_hue = GetWarmest().get_hue(); - double warmest_temp = GetTempsByHct().at(GetWarmest()); - double range = warmest_temp - coldest_temp; - bool start_hue_is_coldest_to_warmest = - IsBetween(input_.get_hue(), coldest_hue, warmest_hue); - double start_hue = - start_hue_is_coldest_to_warmest ? warmest_hue : coldest_hue; - double end_hue = start_hue_is_coldest_to_warmest ? coldest_hue : warmest_hue; - double direction_of_rotation = 1.0; - double smallest_error = 1000.0; - Hct answer = GetHctsByHue().at((int)round(input_.get_hue())); - - double complement_relative_temp = (1.0 - GetRelativeTemperature(input_)); - // Find the color in the other section, closest to the inverse percentile - // of the input color. This is the complement. - for (double hue_addend = 0.0; hue_addend <= 360.0; hue_addend += 1.0) { - double hue = - SanitizeDegreesDouble(start_hue + direction_of_rotation * hue_addend); - if (!IsBetween(hue, start_hue, end_hue)) { - continue; - } - Hct possible_answer = GetHctsByHue().at((int)round(hue)); - double relative_temp = - (GetTempsByHct().at(possible_answer) - coldest_temp) / range; - double error = abs(complement_relative_temp - relative_temp); - if (error < smallest_error) { - smallest_error = error; - answer = possible_answer; - } - } - precomputed_complement_ = answer; - return precomputed_complement_.value(); -} - -std::vector TemperatureCache::GetAnalogousColors() { - return GetAnalogousColors(5, 12); -} - -std::vector TemperatureCache::GetAnalogousColors(int count, - int divisions) { - // The starting hue is the hue of the input color. - int start_hue = (int)round(input_.get_hue()); - Hct start_hct = GetHctsByHue().at(start_hue); - double last_temp = GetRelativeTemperature(start_hct); - - std::vector all_colors; - all_colors.push_back(start_hct); - - double absolute_total_temp_delta = 0.0; - for (int i = 0; i < 360; i++) { - int hue = SanitizeDegreesInt(start_hue + i); - Hct hct = GetHctsByHue().at(hue); - double temp = GetRelativeTemperature(hct); - double temp_delta = abs(temp - last_temp); - last_temp = temp; - absolute_total_temp_delta += temp_delta; - } - - int hue_addend = 1; - double temp_step = absolute_total_temp_delta / (double)divisions; - double total_temp_delta = 0.0; - last_temp = GetRelativeTemperature(start_hct); - while (all_colors.size() < static_cast(divisions)) { - int hue = SanitizeDegreesInt(start_hue + hue_addend); - Hct hct = GetHctsByHue().at(hue); - double temp = GetRelativeTemperature(hct); - double temp_delta = abs(temp - last_temp); - total_temp_delta += temp_delta; - - double desired_total_temp_delta_for_index = (all_colors.size() * temp_step); - bool index_satisfied = - total_temp_delta >= desired_total_temp_delta_for_index; - int index_addend = 1; - // Keep adding this hue to the answers until its temperature is - // insufficient. This ensures consistent behavior when there aren't - // `divisions` discrete steps between 0 and 360 in hue with `temp_step` - // delta in temperature between them. - // - // For example, white and black have no analogues: there are no other - // colors at T100/T0. Therefore, they should just be added to the array - // as answers. - while (index_satisfied && - all_colors.size() < static_cast(divisions)) { - all_colors.push_back(hct); - desired_total_temp_delta_for_index = - ((all_colors.size() + index_addend) * temp_step); - index_satisfied = total_temp_delta >= desired_total_temp_delta_for_index; - index_addend++; - } - last_temp = temp; - hue_addend++; - - if (hue_addend > 360) { - while (all_colors.size() < static_cast(divisions)) { - all_colors.push_back(hct); - } - break; - } - } - - std::vector answers; - answers.push_back(input_); - - int ccw_count = (int)floor(((double)count - 1.0) / 2.0); - for (int i = 1; i < (ccw_count + 1); i++) { - int index = 0 - i; - while (index < 0) { - index = all_colors.size() + index; - } - if (static_cast(index) >= all_colors.size()) { - index = index % all_colors.size(); - } - answers.insert(answers.begin(), all_colors.at(index)); - } - - int cw_count = count - ccw_count - 1; - for (int i = 1; i < (cw_count + 1); i++) { - size_t index = i; - while (index < 0) { - index = all_colors.size() + index; - } - if (index >= all_colors.size()) { - index = index % all_colors.size(); - } - answers.push_back(all_colors.at(index)); - } - - return answers; -} - -double TemperatureCache::GetRelativeTemperature(Hct hct) { - double range = - GetTempsByHct().at(GetWarmest()) - GetTempsByHct().at(GetColdest()); - double difference_from_coldest = - GetTempsByHct().at(hct) - GetTempsByHct().at(GetColdest()); - // Handle when there's no difference in temperature between warmest and - // coldest: for example, at T100, only one color is available, white. - if (range == 0.) { - return 0.5; - } - return difference_from_coldest / range; -} - -double TemperatureCache::RawTemperature(Hct color) { - Lab lab = LabFromInt(color.ToInt()); - double hue = SanitizeDegreesDouble(atan2(lab.b, lab.a) * 180.0 / kPi); - double chroma = hypot(lab.a, lab.b); - return -0.5 + 0.02 * pow(chroma, 1.07) * - cos(SanitizeDegreesDouble(hue - 50.) * kPi / 180); -} - -Hct TemperatureCache::GetColdest() { return GetHctsByTemp().at(0); } - -std::vector TemperatureCache::GetHctsByHue() { - if (precomputed_hcts_by_hue_.has_value()) { - return precomputed_hcts_by_hue_.value(); - } - std::vector hcts; - for (double hue = 0.; hue <= 360.; hue += 1.) { - Hct color_at_hue(hue, input_.get_chroma(), input_.get_tone()); - hcts.push_back(color_at_hue); - } - precomputed_hcts_by_hue_ = hcts; - return precomputed_hcts_by_hue_.value(); -} - -std::vector TemperatureCache::GetHctsByTemp() { - if (precomputed_hcts_by_temp_.has_value()) { - return precomputed_hcts_by_temp_.value(); - } - - std::vector hcts(GetHctsByHue()); - hcts.push_back(input_); - std::map temps_by_hct(GetTempsByHct()); - sort(hcts.begin(), hcts.end(), - [temps_by_hct](const Hct a, const Hct b) -> bool { - return temps_by_hct.at(a) < temps_by_hct.at(b); - }); - precomputed_hcts_by_temp_ = hcts; - return precomputed_hcts_by_temp_.value(); -} - -std::map TemperatureCache::GetTempsByHct() { - if (precomputed_temps_by_hct_.has_value()) { - return precomputed_temps_by_hct_.value(); - } - - std::vector all_hcts(GetHctsByHue()); - all_hcts.push_back(input_); - - std::map temperatures_by_hct; - for (Hct hct : all_hcts) { - temperatures_by_hct[hct] = RawTemperature(hct); - } - - precomputed_temps_by_hct_ = temperatures_by_hct; - return precomputed_temps_by_hct_.value(); -} - -Hct TemperatureCache::GetWarmest() { - return GetHctsByTemp().at(GetHctsByTemp().size() - 1); -} - -bool TemperatureCache::IsBetween(double angle, double a, double b) { - if (a < b) { - return a <= angle && angle <= b; - } - return a <= angle || angle <= b; -} - -} // namespace material_color_utilities diff --git a/cpp/temperature/temperature_cache.h b/cpp/temperature/temperature_cache.h deleted file mode 100644 index 17e7c171..00000000 --- a/cpp/temperature/temperature_cache.h +++ /dev/null @@ -1,139 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CPP_TEMPERATURE_TEMPERATURE_CACHE_H_ -#define CPP_TEMPERATURE_TEMPERATURE_CACHE_H_ - -#include -#include - -#include "cpp/cam/hct.h" - -namespace material_color_utilities { - -/** - * Design utilities using color temperature theory. - * - *

Analogous colors, complementary color, and cache to efficiently, lazily, - * generate data for calculations when needed. - */ -class TemperatureCache { - public: - /** - * Create a cache that allows calculation of ex. complementary and analogous - * colors. - * - * @param input Color to find complement/analogous colors of. Any colors will - * have the same tone, and chroma as the input color, modulo any restrictions - * due to the other hues having lower limits on chroma. - */ - explicit TemperatureCache(Hct input); - - /** - * A color that complements the input color aesthetically. - * - *

In art, this is usually described as being across the color wheel. - * History of this shows intent as a color that is just as cool-warm as the - * input color is warm-cool. - */ - Hct GetComplement(); - - /** - * 5 colors that pair well with the input color. - * - *

The colors are equidistant in temperature and adjacent in hue. - */ - std::vector GetAnalogousColors(); - - /** - * A set of colors with differing hues, equidistant in temperature. - * - *

In art, this is usually described as a set of 5 colors on a color wheel - * divided into 12 sections. This method allows provision of either of those - * values. - * - *

Behavior is undefined when count or divisions is 0. When divisions < - * count, colors repeat. - * - * @param count The number of colors to return, includes the input color. - * @param divisions The number of divisions on the color wheel. - */ - std::vector GetAnalogousColors(int count, int divisions); - - /** - * Temperature relative to all colors with the same chroma and tone. - * - * @param hct HCT to find the relative temperature of. - * @return Value on a scale from 0 to 1. - */ - double GetRelativeTemperature(Hct hct); - - /** - * Value representing cool-warm factor of a color. Values below 0 are - * considered cool, above, warm. - * - *

Color science has researched emotion and harmony, which art uses to - * select colors. Warm-cool is the foundation of analogous and complementary - * colors. See: - Li-Chen Ou's Chapter 19 in Handbook of Color Psychology - * (2015). - Josef Albers' Interaction of Color chapters 19 and 21. - * - *

Implementation of Ou, Woodcock and Wright's algorithm, which uses - * Lab/LCH color space. Return value has these properties:
- * - Values below 0 are cool, above 0 are warm.
- * - Lower bound: -9.66. Chroma is infinite. Assuming max of Lab chroma - * 130.
- * - Upper bound: 8.61. Chroma is infinite. Assuming max of Lab chroma 130. - */ - static double RawTemperature(Hct color); - - private: - Hct input_; - - std::optional precomputed_complement_; - std::optional> precomputed_hcts_by_temp_; - std::optional> precomputed_hcts_by_hue_; - std::optional> precomputed_temps_by_hct_; - - /** Coldest color with same chroma and tone as input. */ - Hct GetColdest(); - - /** Warmest color with same chroma and tone as input. */ - Hct GetWarmest(); - - /** Determines if an angle is between two other angles, rotating clockwise. */ - static bool IsBetween(double angle, double a, double b); - - /** - * HCTs for all colors with the same chroma/tone as the input. - * - *

Sorted by hue, ex. index 0 is hue 0. - */ - std::vector GetHctsByHue(); - - /** - * HCTs for all colors with the same chroma/tone as the input. - * - *

Sorted from coldest first to warmest last. - */ - std::vector GetHctsByTemp(); - - /** Keys of HCTs in GetHctsByTemp, values of raw temperature. */ - std::map GetTempsByHct(); -}; - -} // namespace material_color_utilities - -#endif // CPP_TEMPERATURE_TEMPERATURE_CACHE_H_ diff --git a/cpp/temperature/temperature_cache_test.cc b/cpp/temperature/temperature_cache_test.cc deleted file mode 100644 index f4a6f83c..00000000 --- a/cpp/temperature/temperature_cache_test.cc +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "cpp/temperature/temperature_cache.h" - -#include - -#include "testing/base/public/gunit.h" -#include "cpp/cam/hct.h" - -namespace material_color_utilities { - -namespace { - -TEST(TemperatureCacheTest, RawTemperature) { - Hct blue_hct(0xff0000ff); - double blue_temp = TemperatureCache::RawTemperature(blue_hct); - EXPECT_NEAR(-1.393, blue_temp, 0.001); - - Hct red_hct(0xffff0000); - double red_temp = TemperatureCache::RawTemperature(red_hct); - EXPECT_NEAR(2.351, red_temp, 0.001); - - Hct green_hct(0xff00ff00); - double green_temp = TemperatureCache::RawTemperature(green_hct); - EXPECT_NEAR(-0.267, green_temp, 0.001); - - Hct white_hct(0xffffffff); - double white_temp = TemperatureCache::RawTemperature(white_hct); - EXPECT_NEAR(-0.5, white_temp, 0.001); - - Hct black_hct(0xff000000); - double black_temp = TemperatureCache::RawTemperature(black_hct); - EXPECT_NEAR(-0.5, black_temp, 0.001); -} - -TEST(TemperatureCacheTest, Complement) { - unsigned int blue_complement = - TemperatureCache(Hct(0xff0000ff)).GetComplement().ToInt(); - EXPECT_EQ(0xff9d0002, blue_complement); - - unsigned int red_complement = - TemperatureCache(Hct(0xffff0000)).GetComplement().ToInt(); - EXPECT_EQ(0xff007bfc, red_complement); - - unsigned int green_complement = - TemperatureCache(Hct(0xff00ff00)).GetComplement().ToInt(); - EXPECT_EQ(0xffffd2c9, green_complement); - - unsigned int white_complement = - TemperatureCache(Hct(0xffffffff)).GetComplement().ToInt(); - EXPECT_EQ(0xffffffff, white_complement); - - unsigned int black_complement = - TemperatureCache(Hct(0xff000000)).GetComplement().ToInt(); - EXPECT_EQ(0xff000000, black_complement); -} - -TEST(TemperatureCacheTest, Analogous) { - std::vector blue_analogous = - TemperatureCache(Hct(0xff0000ff)).GetAnalogousColors(); - EXPECT_EQ(0xff00590c, blue_analogous.at(0).ToInt()); - EXPECT_EQ(0xff00564e, blue_analogous.at(1).ToInt()); - EXPECT_EQ(0xff0000ff, blue_analogous.at(2).ToInt()); - EXPECT_EQ(0xff6700cc, blue_analogous.at(3).ToInt()); - EXPECT_EQ(0xff81009f, blue_analogous.at(4).ToInt()); - - std::vector red_analogous = - TemperatureCache(Hct(0xffff0000)).GetAnalogousColors(); - EXPECT_EQ(0xfff60082, red_analogous.at(0).ToInt()); - EXPECT_EQ(0xfffc004c, red_analogous.at(1).ToInt()); - EXPECT_EQ(0xffff0000, red_analogous.at(2).ToInt()); - EXPECT_EQ(0xffd95500, red_analogous.at(3).ToInt()); - EXPECT_EQ(0xffaf7200, red_analogous.at(4).ToInt()); - - std::vector green_analogous = - TemperatureCache(Hct(0xff00ff00)).GetAnalogousColors(); - EXPECT_EQ(0xffcee900, green_analogous.at(0).ToInt()); - EXPECT_EQ(0xff92f500, green_analogous.at(1).ToInt()); - EXPECT_EQ(0xff00ff00, green_analogous.at(2).ToInt()); - EXPECT_EQ(0xff00fd6f, green_analogous.at(3).ToInt()); - EXPECT_EQ(0xff00fab3, green_analogous.at(4).ToInt()); - - std::vector black_analogous = - TemperatureCache(Hct(0xff000000)).GetAnalogousColors(); - EXPECT_EQ(0xff000000, black_analogous.at(0).ToInt()); - EXPECT_EQ(0xff000000, black_analogous.at(1).ToInt()); - EXPECT_EQ(0xff000000, black_analogous.at(2).ToInt()); - EXPECT_EQ(0xff000000, black_analogous.at(3).ToInt()); - EXPECT_EQ(0xff000000, black_analogous.at(4).ToInt()); - - std::vector white_analogous = - TemperatureCache(Hct(0xffffffff)).GetAnalogousColors(); - EXPECT_EQ(0xffffffff, white_analogous.at(0).ToInt()); - EXPECT_EQ(0xffffffff, white_analogous.at(1).ToInt()); - EXPECT_EQ(0xffffffff, white_analogous.at(2).ToInt()); - EXPECT_EQ(0xffffffff, white_analogous.at(3).ToInt()); - EXPECT_EQ(0xffffffff, white_analogous.at(4).ToInt()); -} - -} // namespace -} // namespace material_color_utilities diff --git a/dart/CHANGELOG.md b/dart/CHANGELOG.md deleted file mode 100644 index 30e12b8c..00000000 --- a/dart/CHANGELOG.md +++ /dev/null @@ -1,159 +0,0 @@ -## 0.13.0 - 2025-05-20 - -- All of the `MaterialDynamicColors` fields are now final. -- Require Dart 3.5 - -## 0.12.0 - 2024-06-06 -### Changed -- Updated `MaterialDynamicColors` to use the expressive on-colors spec. - -## 0.11.2 - 2024-04-30 -### Changed -- Updated `TonalPalette` to use new key color algorithm. - -## 0.11.1 - 2024-03-11 -### Fixed -- Fixed Apache license - -## 0.11.0 - 2024-02-20 -### Changed -- Updated `TonalPalette.fromList` so that it provides colors at any tone, not - only at `commonTones`. - -## 0.10.0 - 2023-11-27 -### Changed -- Updated `MaterialDynamicColors` to new Contrast Surfaces spec. - -## 0.9.0 - 2023-11-06 -### Added -- Added getters for `DynamicScheme`. - -### Changed -- Moved `DynamicScheme` from `scheme/` to `dynamiccolor/`. - -## 0.8.0 - 2023-06-22 -### Added -- Add fruit salad color scheme -- Add rainbow color scheme - -## 0.7.0 - 2023-06-13 -### Changed -- Updated `DynamicColor` so that it conforms to the new contrast requirements. - - API for `DynamicColor` modified. - -## 0.6.0 - 2023-05-31 -### Added -- Add key color to tonal palette. -- Add key colors to the Material dynamic colors: - - `primaryPaletteKeyColor` - - `secondaryPaletteKeyColor` - - `tertiaryPaletteKeyColor` - - `neutralPaletteKeyColor` - - `neutralVariantPaletteKeyColor` - -### Changed -- Scheme updates to align with recent Android Sys UI changes: - - `SchemeExpressive`: - - Primary hue + 240 from 120 - - Neutral hue + 15 - - Neutral variant hue + 15 - - `SchemeTonalSpot`: - - Primary chroma = 36 from 40 - - `SchemeVibrant`: - - Neutral chroma = 10 from 8 - -### Fixed -- Fixed outline when in dark mode to be tone 60. - -## 0.5.0 - 2023-05-02 -### Removed -- Removed `inverseOnPrimary`, an unfounded dynamic color - -## 0.4.0 - 2023-04-28 -### Added -- Add `label` and `description` to each `Variant` -- Add `xFixed` Material dynamic colors - -### Changed -- Update monochrome scheme to new spec - -## Fixed -- Fix `inverseSurface` tone value - -## 0.3.0 - 2023-03-10 -### Added - -- Add 4 new components: - - `contrast`: Use `Contrast` for utility methods - - `dislike`: Use `DislikeAnalyzer` for checking and fixing universally disliked colors - - `dynamiccolor`: Use `DynamicColor` and `MaterialDynamicColors` for colors from a `DynamicScheme`, that adjust based on UI state - (dark theme, style, preferences, contrast requirements, etc.) - - `temperature`: Use `TemperatureCache` for analogous & complementary colors -- `scheme`: Add `DynamicScheme` and its subclasses: - - `SchemeExpressive` - - `SchemeMonochrome` - - `SchemeNeutral` - - `SchemeTonalSpot` - - `SchemeVibrant` - - `SchemeFidelity` - - `SchemeContent` -- `hct`: Add `inViewingConditions` to `hct`, for color relativity -- `utilities`: Add `lstarFromY` method, utility to which is the inverse of `yFromLstar` - - -### Changed -- Export all public API in `material_color_utilities.dart` -- Bump minimum Flutter SDK version to `2.17.0` - -### Fixed -- Fix missing `hashCode` override for `Hct` -- Fix `TonalPalette` equality operator when different constructors are used ([#56](https://github.com/material-foundation/material-color-utilities/issues/56)) - -## 0.2.0 - 2022-08-05 -### Added -- Add support for content color -- Add `outlineVariant` and `scrim` colors - -### Changed -- Rename `CamSolver` to `HctSolver` - -### Fixed -- Correct `repository` in pubspec - -## 0.1.5 - 2022-04-25 -### Added -- Introduce `CamSolver`, a fast solver for the HCT equation. Highly performant, but a small breaking change -- Add explanation and link to `dynamic_color` packages -- Add `operator ==` and `toString` overrides to `Hct` - -### Changed -- Improve documentation for `color_utils.dart` -- Rename `HctColor` to `Hct` - -### Fixed -- Fix README import - -## 0.1.4 - 2022-01-21 -### Added -- Allow creation of `Scheme` from a `CorePalette` with `lightFromCorePalette` - and `darkFromCorePalette` - -## 0.1.3 - 2021-12-10 -### Added -- Export `Scheme` - -## 0.1.2 - 2021-12-02 -### Changed -- Update `Scheme` tonal values -- Move `matcher` to pubspec's `dev_dependencies` - -## 0.1.1 - 2021-10-28 -### Changed -- Update pubspec `description` - -### Fixed -- Fix `matcher` version incompatibility with flutter stable - -## 0.1.0 - 2021-10-28 -### Added -- Create library diff --git a/dart/LICENSE b/dart/LICENSE deleted file mode 100644 index f67fa860..00000000 --- a/dart/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2021 Google LLC - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/dart/README.md b/dart/README.md deleted file mode 100644 index 09d3df89..00000000 --- a/dart/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# material_color_utilities - -[![pub package](https://img.shields.io/pub/v/material_color_utilities.svg)](https://pub.dev/packages/material_color_utilities) - -Algorithms and utilities that power the Material Design 3 color system, -including choosing theme colors from images and creating tones of colors; all in -a new color space. - -This is a low-level package. For developers looking to adopt Material 3 features -such as dynamic color and color harmonization in their apps, please see the -[dynamic_color](https://pub.dev/packages/dynamic_color) package. - -## Getting started - -`dart pub add material_color_utilities` or `flutter pub add material_color_utilities` - -## Usage - -```dart -import 'package:material_color_utilities/material_color_utilities.dart'; -``` - -For more information, see the main [README](https://github.com/material-foundation/material-color-utilities#readme). - -## Contributing - -This repo is not accepting external contributions, but feature requests and bug -reports are welcome on -[GitHub](https://github.com/material-foundation/material-color-utilities/issues). diff --git a/dart/analysis_options.yaml b/dart/analysis_options.yaml deleted file mode 100644 index 5adf7e67..00000000 --- a/dart/analysis_options.yaml +++ /dev/null @@ -1,6 +0,0 @@ -include: package:dart_flutter_team_lints/analysis_options.yaml - -analyzer: - errors: - lines_longer_than_80_chars: ignore - deprecated_member_use_from_same_package: ignore diff --git a/dart/example/main.dart b/dart/example/main.dart deleted file mode 100644 index 421992db..00000000 --- a/dart/example/main.dart +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:material_color_utilities/material_color_utilities.dart'; - -void main() { - // Simple demonstration of HCT. - final color = Hct.fromInt(0xFF4285F4); - print('Hue: ${color.hue}'); - print('Chroma: ${color.chroma}'); - print('Tone: ${color.tone}'); -} diff --git a/dart/lib/blend/blend.dart b/dart/lib/blend/blend.dart deleted file mode 100644 index 1233eeae..00000000 --- a/dart/lib/blend/blend.dart +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This file is automatically generated. Do not modify it. - -import 'dart:math'; - -import '../hct/cam16.dart'; -import '../hct/hct.dart'; -import '../utils/color_utils.dart'; -import '../utils/math_utils.dart'; - -/// Functions for blending in HCT and CAM16. -class Blend { - /// Blend the design color's HCT hue towards the key color's HCT - /// hue, in a way that leaves the original color recognizable and - /// recognizably shifted towards the key color. - /// - /// [designColor] ARGB representation of an arbitrary color. - /// [sourceColor] ARGB representation of the main theme color. - /// Returns The design color with a hue shifted towards the - /// system's color, a slightly warmer/cooler variant of the design - /// color's hue. - static int harmonize(int designColor, int sourceColor) { - final fromHct = Hct.fromInt(designColor); - final toHct = Hct.fromInt(sourceColor); - final differenceDegrees = MathUtils.differenceDegrees( - fromHct.hue, - toHct.hue, - ); - final rotationDegrees = min(differenceDegrees * 0.5, 15.0); - final outputHue = MathUtils.sanitizeDegreesDouble( - fromHct.hue + - rotationDegrees * MathUtils.rotationDirection(fromHct.hue, toHct.hue), - ); - return Hct.from(outputHue, fromHct.chroma, fromHct.tone).toInt(); - } - - /// Blends hue from one color into another. The chroma and tone of - /// the original color are maintained. - /// - /// [from] ARGB representation of color - /// [to] ARGB representation of color - /// [amount] how much blending to perform; 0.0 >= and <= 1.0 - /// Returns from, with a hue blended towards to. Chroma and tone - /// are constant. - static int hctHue(int from, int to, double amount) { - final ucs = cam16Ucs(from, to, amount); - final ucsCam = Cam16.fromInt(ucs); - final fromCam = Cam16.fromInt(from); - final blended = Hct.from( - ucsCam.hue, - fromCam.chroma, - ColorUtils.lstarFromArgb(from), - ); - return blended.toInt(); - } - - /// Blend in CAM16-UCS space. - /// - /// [from] ARGB representation of color - /// [to] ARGB representation of color - /// [amount] how much blending to perform; 0.0 >= and <= 1.0 - /// Returns from, blended towards to. Hue, chroma, and tone will - /// change. - static int cam16Ucs(int from, int to, double amount) { - final fromCam = Cam16.fromInt(from); - final toCam = Cam16.fromInt(to); - final fromJ = fromCam.jstar; - final fromA = fromCam.astar; - final fromB = fromCam.bstar; - final toJ = toCam.jstar; - final toA = toCam.astar; - final toB = toCam.bstar; - final jstar = fromJ + (toJ - fromJ) * amount; - final astar = fromA + (toA - fromA) * amount; - final bstar = fromB + (toB - fromB) * amount; - return Cam16.fromUcs(jstar, astar, bstar).toInt(); - } -} diff --git a/dart/lib/contrast/contrast.dart b/dart/lib/contrast/contrast.dart deleted file mode 100644 index 5c88924d..00000000 --- a/dart/lib/contrast/contrast.dart +++ /dev/null @@ -1,141 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import '../utils/color_utils.dart'; -import '../utils/math_utils.dart'; - -/// Utility methods for calculating contrast given two colors, or calculating a -/// color given one color and a contrast ratio. -/// -/// Contrast ratio is calculated using XYZ's Y. When linearized to match human -/// perception, Y becomes HCT's tone and L*a*b*'s' L*. Informally, this is the -/// lightness of a color. -/// -/// Methods refer to tone, T in the the HCT color space. -/// Tone is equivalent to L* in the L*a*b* color space, or L in the LCH color -/// space. -class Contrast { - /// Returns a contrast ratio, which ranges from 1 to 21. - /// [toneA] Tone between 0 and 100. Values outside will be clamped. - /// [toneB] Tone between 0 and 100. Values outside will be clamped. - static double ratioOfTones(double toneA, double toneB) { - toneA = MathUtils.clampDouble(0.0, 100.0, toneA); - toneB = MathUtils.clampDouble(0.0, 100.0, toneB); - return _ratioOfYs( - ColorUtils.yFromLstar(toneA), - ColorUtils.yFromLstar(toneB), - ); - } - - static double _ratioOfYs(double y1, double y2) { - final lighter = y1 > y2 ? y1 : y2; - final darker = (lighter == y2) ? y1 : y2; - return (lighter + 5.0) / (darker + 5.0); - } - - /// Returns a tone >= [tone] that ensures [ratio]. - /// Return value is between 0 and 100. - /// Returns -1 if [ratio] cannot be achieved with [tone]. - /// - /// [tone] Tone return value must contrast with. - /// Range is 0 to 100. Invalid values will result in -1 being returned. - /// [ratio] Contrast ratio of return value and [tone]. - /// Range is 1 to 21, invalid values have undefined behavior. - static double lighter({required double tone, required double ratio}) { - if (tone < 0.0 || tone > 100.0) { - return -1.0; - } - - final darkY = ColorUtils.yFromLstar(tone); - final lightY = ratio * (darkY + 5.0) - 5.0; - final realContrast = _ratioOfYs(lightY, darkY); - final delta = (realContrast - ratio).abs(); - if (realContrast < ratio && delta > 0.04) { - return -1; - } - - // Ensure gamut mapping, which requires a 'range' on tone, will still result - // the correct ratio by darkening slightly. - final returnValue = ColorUtils.lstarFromY(lightY) + 0.4; - if (returnValue < 0 || returnValue > 100) { - return -1; - } - return returnValue; - } - - /// Returns a tone <= [tone] that ensures [ratio]. - /// Return value is between 0 and 100. - /// Returns -1 if [ratio] cannot be achieved with [tone]. - /// - /// [tone] Tone return value must contrast with. - /// Range is 0 to 100. Invalid values will result in -1 being returned. - /// [ratio] Contrast ratio of return value and [tone]. - /// Range is 1 to 21, invalid values have undefined behavior. - static double darker({required double tone, required double ratio}) { - if (tone < 0.0 || tone > 100.0) { - return -1.0; - } - - final lightY = ColorUtils.yFromLstar(tone); - final darkY = ((lightY + 5.0) / ratio) - 5.0; - final realContrast = _ratioOfYs(lightY, darkY); - - final delta = (realContrast - ratio).abs(); - if (realContrast < ratio && delta > 0.04) { - return -1; - } - - // Ensure gamut mapping, which requires a 'range' on tone, will still result - // the correct ratio by darkening slightly. - final returnValue = ColorUtils.lstarFromY(darkY) - 0.4; - if (returnValue < 0 || returnValue > 100) { - return -1; - } - return returnValue; - } - - /// Returns a tone >= [tone] that ensures [ratio]. - /// Return value is between 0 and 100. - /// Returns 100 if [ratio] cannot be achieved with [tone]. - /// - /// This method is unsafe because the returned value is guaranteed to be in - /// bounds for tone, i.e. between 0 and 100. However, that value may not reach - /// the [ratio] with [tone]. For example, there is no color lighter than T100. - /// - /// [tone] Tone return value must contrast with. - /// Range is 0 to 100. Invalid values will result in 100 being returned. - /// [ratio] Desired contrast ratio of return value and tone parameter. - /// Range is 1 to 21, invalid values have undefined behavior. - static double lighterUnsafe({required double tone, required double ratio}) { - final lighterSafe = lighter(tone: tone, ratio: ratio); - return (lighterSafe < 0.0) ? 100.0 : lighterSafe; - } - - /// Returns a tone <= [tone] that ensures [ratio]. - /// Return value is between 0 and 100. - /// Returns 0 if [ratio] cannot be achieved with [tone]. - /// - /// This method is unsafe because the returned value is guaranteed to be in - /// bounds for tone, i.e. between 0 and 100. However, that value may not reach - /// the [ratio] with [tone]. For example, there is no color darker than T0. - /// - /// [tone] Tone return value must contrast with. - /// Range is 0 to 100. Invalid values will result in 0 being returned. - /// [ratio] Desired contrast ratio of return value and tone parameter. - /// Range is 1 to 21, invalid values have undefined behavior. - static double darkerUnsafe({required double tone, required double ratio}) { - final darkerSafe = darker(tone: tone, ratio: ratio); - return (darkerSafe < 0.0) ? 0.0 : darkerSafe; - } -} diff --git a/dart/lib/dislike/dislike_analyzer.dart b/dart/lib/dislike/dislike_analyzer.dart deleted file mode 100644 index e0d838ea..00000000 --- a/dart/lib/dislike/dislike_analyzer.dart +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import '../hct/hct.dart'; - -/// Check and/or fix universally disliked colors. -/// -/// Color science studies of color preference indicate universal distaste for -/// dark yellow-greens, and also show this is correlated to distate for -/// biological waste and rotting food. -/// -/// See Palmer and Schloss, 2010 or Schloss and Palmer's Chapter 21 in Handbook -/// of Color Psychology (2015). -class DislikeAnalyzer { - /// Returns true if [hct] is disliked. - /// - /// Disliked is defined as a dark yellow-green that is not neutral. - static bool isDisliked(Hct hct) { - final huePasses = hct.hue.round() >= 90.0 && hct.hue.round() <= 111.0; - final chromaPasses = hct.chroma.round() > 16.0; - final tonePasses = hct.tone.round() < 65.0; - - return huePasses && chromaPasses && tonePasses; - } - - /// If [hct] is disliked, lighten it to make it likable. - static Hct fixIfDisliked(Hct hct) { - if (isDisliked(hct)) { - return Hct.from(hct.hue, hct.chroma, 70.0); - } - - return hct; - } -} diff --git a/dart/lib/dynamiccolor/dynamic_color.dart b/dart/lib/dynamiccolor/dynamic_color.dart deleted file mode 100644 index e3129eb7..00000000 --- a/dart/lib/dynamiccolor/dynamic_color.dart +++ /dev/null @@ -1,403 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'dart:math' as math; - -import '../contrast/contrast.dart'; -import '../hct/hct.dart'; -import '../palettes/tonal_palette.dart'; -import '../utils/math_utils.dart'; -import 'dynamic_scheme.dart'; -import 'src/contrast_curve.dart'; -import 'src/tone_delta_pair.dart'; - -/// A color that adjusts itself based on UI state provided by [DynamicScheme]. -/// -/// This color automatically adjusts to accommodate a desired contrast level, or -/// other adjustments such as differing in light mode versus dark mode, or what -/// the theme is, or what the color that produced the theme is, etc. -/// -/// Colors without backgrounds do not change tone when contrast changes. Colors -/// with backgrounds become closer to their background as contrast lowers, and -/// further when contrast increases. -/// -/// Prefer the static constructors. They provide a much more simple interface, -/// such as requiring just a hexcode, or just a hexcode and a background. -/// -/// Ultimately, each component necessary for calculating a color, adjusting it -/// for a desired contrast level, and ensuring it has a certain lightness/tone -/// difference from another color, is provided by a function that takes a -/// [DynamicScheme] and returns a value. This ensures ultimate flexibility, any -/// desired behavior of a color for any design system, but it usually -/// unnecessary. See the default constructor for more information. -class DynamicColor { - final String name; - final TonalPalette Function(DynamicScheme) palette; - final double Function(DynamicScheme) tone; - final bool isBackground; - final DynamicColor Function(DynamicScheme)? background; - final DynamicColor Function(DynamicScheme)? secondBackground; - final ContrastCurve? contrastCurve; - final ToneDeltaPair Function(DynamicScheme)? toneDeltaPair; - - final Map _hctCache = {}; - - /// The base (explicit) constructor for [DynamicColor]. - /// - /// [name] The name of the dynamic color. - /// [palette] Function that provides a TonalPalette given - /// DynamicScheme. A TonalPalette is defined by a hue and chroma, so this - /// replaces the need to specify hue/chroma. By providing a tonal palette, - /// when contrast adjustments are made, intended chroma can be preserved. - /// [tone] Function that provides a tone, given a DynamicScheme. - /// [isBackground] Whether this dynamic color is a background, with - /// some other color as the foreground. - /// [background] The background of the dynamic color (as a function of a - /// `DynamicScheme`), if it exists. - /// [secondBackground] A second background of the dynamic color (as a function - /// of a `DynamicScheme`), if it - /// exists. - /// [contrastCurve] A [ContrastCurve] object specifying how its contrast - /// against its background should behave in various contrast levels options. - /// [toneDeltaPair] A [ToneDeltaPair] object specifying a tone delta - /// constraint between two colors. One of them must be the color being - /// constructed. - DynamicColor({ - required this.name, - required this.palette, - required this.tone, - required this.isBackground, - required this.background, - required this.secondBackground, - required this.contrastCurve, - required this.toneDeltaPair, - }); - - /// The convenience constructor for [DynamicColor]. - /// - /// Similar to the base constructor, but all parameters other than [palette] - /// and [tone] have defaults. - /// - /// [name] The name of the dynamic color. Defaults to empty. - /// [palette] Function that provides a TonalPalette given - /// DynamicScheme. A TonalPalette is defined by a hue and chroma, so this - /// replaces the need to specify hue/chroma. By providing a tonal palette, - /// when contrast adjustments are made, intended chroma can be preserved. - /// [tone] Function that provides a tone, given a DynamicScheme. - /// [isBackground] Whether this dynamic color is a background, with - /// some other color as the foreground. Defaults to false. - /// [background] The background of the dynamic color (as a function of a - /// `DynamicScheme`), if it exists. - /// [secondBackground] A second background of the dynamic color (as a function - /// of a `DynamicScheme`), if it exists. - /// [contrastCurve] A [ContrastCurve] object specifying how its contrast - /// against its background should behave in various contrast levels options. - /// [toneDeltaPair] A [ToneDeltaPair] object specifying a tone delta - /// constraint between two colors. One of them must be the color being - /// constructed. - factory DynamicColor.fromPalette({ - String name = '', - required TonalPalette Function(DynamicScheme) palette, - required double Function(DynamicScheme) tone, - bool isBackground = false, - DynamicColor Function(DynamicScheme)? background, - DynamicColor Function(DynamicScheme)? secondBackground, - ContrastCurve? contrastCurve, - ToneDeltaPair Function(DynamicScheme)? toneDeltaPair, - }) { - return DynamicColor( - name: name, - palette: palette, - tone: tone, - isBackground: isBackground, - background: background, - secondBackground: secondBackground, - contrastCurve: contrastCurve, - toneDeltaPair: toneDeltaPair, - ); - } - - /// Return a ARGB integer (i.e. a hex code). - - /// [scheme] Defines the conditions of the user interface, for example, - /// whether or not it is dark mode or light mode, and what the desired - /// contrast level is. - int getArgb(DynamicScheme scheme) { - return getHct(scheme).toInt(); - } - - /// Return a color, expressed in the HCT color space, that this - /// [DynamicColor] is under the conditions in [scheme]. - /// - /// [scheme] Defines the conditions of the user interface, for example, - /// whether or not it is dark mode or light mode, and what the desired - /// contrast level is. - Hct getHct(DynamicScheme scheme) { - final cachedAnswer = _hctCache[scheme]; - if (cachedAnswer != null) { - return cachedAnswer; - } - final tone = getTone(scheme); - final answer = palette(scheme).getHct(tone); - if (_hctCache.length > 4) { - _hctCache.clear(); - } - _hctCache[scheme] = answer; - return answer; - } - - /// Return a tone, T in the HCT color space, that this [DynamicColor] is under - /// the conditions in [scheme]. - /// - /// [scheme] Defines the conditions of the user interface, for example, - /// whether or not it is dark mode or light mode, and what the desired - /// contrast level is. - double getTone(DynamicScheme scheme) { - final decreasingContrast = scheme.contrastLevel < 0; - - // Case 1: dual foreground, pair of colors with delta constraint. - if (toneDeltaPair != null) { - final pair = toneDeltaPair!(scheme); - final roleA = pair.roleA; - final roleB = pair.roleB; - final delta = pair.delta; - final polarity = pair.polarity; - final stayTogether = pair.stayTogether; - - final bg = background!(scheme); - final bgTone = bg.getTone(scheme); - - final aIsNearer = - polarity == TonePolarity.nearer || - (polarity == TonePolarity.lighter && !scheme.isDark) || - (polarity == TonePolarity.darker && scheme.isDark); - final nearer = aIsNearer ? roleA : roleB; - final farther = aIsNearer ? roleB : roleA; - final amNearer = name == nearer.name; - final expansionDir = scheme.isDark ? 1 : -1; - - // 1st round: solve to min, each - final nContrast = nearer.contrastCurve!.get(scheme.contrastLevel); - final fContrast = farther.contrastCurve!.get(scheme.contrastLevel); - - // If a color is good enough, it is not adjusted. - // Initial and adjusted tones for `nearer` - final nInitialTone = nearer.tone(scheme); - var nTone = - Contrast.ratioOfTones(bgTone, nInitialTone) >= nContrast - ? nInitialTone - : DynamicColor.foregroundTone(bgTone, nContrast); - // Initial and adjusted tones for `farther` - final fInitialTone = farther.tone(scheme); - var fTone = - Contrast.ratioOfTones(bgTone, fInitialTone) >= fContrast - ? fInitialTone - : DynamicColor.foregroundTone(bgTone, fContrast); - - if (decreasingContrast) { - // If decreasing contrast, adjust color to the "bare minimum" - // that satisfies contrast. - nTone = DynamicColor.foregroundTone(bgTone, nContrast); - fTone = DynamicColor.foregroundTone(bgTone, fContrast); - } - - if ((fTone - nTone) * expansionDir >= delta) { - // Good! Tones satisfy the constraint; no change needed. - } else { - // 2nd round: expand farther to match delta. - fTone = MathUtils.clampDouble(0, 100, nTone + delta * expansionDir); - if ((fTone - nTone) * expansionDir >= delta) { - // Good! Tones now satisfy the constraint; no change needed. - } else { - // 3rd round: contract nearer to match delta. - nTone = MathUtils.clampDouble(0, 100, fTone - delta * expansionDir); - } - } - - // Avoids the 50-59 awkward zone. - if (50 <= nTone && nTone < 60) { - // If `nearer` is in the awkward zone, move it away, together with - // `farther`. - if (expansionDir > 0) { - nTone = 60; - fTone = math.max(fTone, nTone + delta * expansionDir); - } else { - nTone = 49; - fTone = math.min(fTone, nTone + delta * expansionDir); - } - } else if (50 <= fTone && fTone < 60) { - if (stayTogether) { - // Fixes both, to avoid two colors on opposite sides of the "awkward - // zone". - if (expansionDir > 0) { - nTone = 60; - fTone = math.max(fTone, nTone + delta * expansionDir); - } else { - nTone = 49; - fTone = math.min(fTone, nTone + delta * expansionDir); - } - } else { - // Not required to stay together; fixes just one. - if (expansionDir > 0) { - fTone = 60; - } else { - fTone = 49; - } - } - } - - // Returns `nTone` if this color is `nearer`, otherwise `fTone`. - return amNearer ? nTone : fTone; - } else { - // Case 2: No contrast pair; just solve for itself. - var answer = tone(scheme); - - if (background == null) { - return answer; // No adjustment for colors with no background. - } - - final bgTone = background!(scheme).getTone(scheme); - - final desiredRatio = contrastCurve!.get(scheme.contrastLevel); - - if (Contrast.ratioOfTones(bgTone, answer) >= desiredRatio) { - // Don't "improve" what's good enough. - } else { - // Rough improvement. - answer = DynamicColor.foregroundTone(bgTone, desiredRatio); - } - - if (decreasingContrast) { - answer = DynamicColor.foregroundTone(bgTone, desiredRatio); - } - - if (isBackground && 50 <= answer && answer < 60) { - // Must adjust - if (Contrast.ratioOfTones(49, bgTone) >= desiredRatio) { - answer = 49; - } else { - answer = 60; - } - } - - if (secondBackground != null) { - // Case 3: Adjust for dual backgrounds. - - final bgTone1 = background!(scheme).getTone(scheme); - final bgTone2 = secondBackground!(scheme).getTone(scheme); - - final upper = math.max(bgTone1, bgTone2); - final lower = math.min(bgTone1, bgTone2); - - if (Contrast.ratioOfTones(upper, answer) >= desiredRatio && - Contrast.ratioOfTones(lower, answer) >= desiredRatio) { - return answer; - } - - // The darkest light tone that satisfies the desired ratio, - // or -1 if such ratio cannot be reached. - final lightOption = Contrast.lighter(tone: upper, ratio: desiredRatio); - - // The lightest dark tone that satisfies the desired ratio, - // or -1 if such ratio cannot be reached. - final darkOption = Contrast.darker(tone: lower, ratio: desiredRatio); - - // Tones suitable for the foreground. - final availables = []; - if (lightOption != -1) availables.add(lightOption); - if (darkOption != -1) availables.add(darkOption); - - final prefersLight = - DynamicColor.tonePrefersLightForeground(bgTone1) || - DynamicColor.tonePrefersLightForeground(bgTone2); - if (prefersLight) { - return (lightOption < 0) ? 100 : lightOption; - } - if (availables.length == 1) { - return availables[0]; - } - return (darkOption < 0) ? 0 : darkOption; - } - - return answer; - } - } - - /// Given a background tone, find a foreground tone, while ensuring they reach - /// a contrast ratio that is as close to [ratio] as possible. - /// - /// [bgTone] Tone in HCT. Range is 0 to 100, undefined behavior when it falls - /// outside that range. - /// [ratio] The contrast ratio desired between [bgTone] and the return value. - static double foregroundTone(double bgTone, double ratio) { - final lighterTone = Contrast.lighterUnsafe(tone: bgTone, ratio: ratio); - final darkerTone = Contrast.darkerUnsafe(tone: bgTone, ratio: ratio); - final lighterRatio = Contrast.ratioOfTones(lighterTone, bgTone); - final darkerRatio = Contrast.ratioOfTones(darkerTone, bgTone); - final preferLighter = tonePrefersLightForeground(bgTone); - - if (preferLighter) { - // This handles an edge case where the initial contrast ratio is high - // (ex. 13.0), and the ratio passed to the function is that high ratio, - // and both the lighter and darker ratio fails to pass that ratio. - // - // This was observed with Tonal Spot's On Primary Container turning black - // momentarily between high and max contrast in light mode. - // PC's standard tone was T90, OPC's was T10, it was light mode, and the - // contrast value was 0.6568521221032331. - final negligibleDifference = - (lighterRatio - darkerRatio).abs() < 0.1 && - lighterRatio < ratio && - darkerRatio < ratio; - return lighterRatio >= ratio || - lighterRatio >= darkerRatio || - negligibleDifference - ? lighterTone - : darkerTone; - } else { - return darkerRatio >= ratio || darkerRatio >= lighterRatio - ? darkerTone - : lighterTone; - } - } - - /// Adjust a tone such that white has 4.5 contrast, if the tone is - /// reasonably close to supporting it. - static double enableLightForeground(double tone) { - if (tonePrefersLightForeground(tone) && !toneAllowsLightForeground(tone)) { - return 49.0; - } - return tone; - } - - /// Returns whether [tone] prefers a light foreground. - /// - /// People prefer white foregrounds on ~T60-70. Observed over time, and also - /// by Andrew Somers during research for APCA. - /// - /// T60 used as to create the smallest discontinuity possible when skipping - /// down to T49 in order to ensure light foregrounds. - /// - /// Since `tertiaryContainer` in dark monochrome scheme requires a tone of - /// 60, it should not be adjusted. Therefore, 60 is excluded here. - static bool tonePrefersLightForeground(double tone) { - return tone.round() < 60; - } - - /// Returns whether [tone] can reach a contrast ratio of 4.5 with a lighter - /// color. - static bool toneAllowsLightForeground(double tone) { - return tone.round() <= 49; - } -} diff --git a/dart/lib/dynamiccolor/dynamic_scheme.dart b/dart/lib/dynamiccolor/dynamic_scheme.dart deleted file mode 100644 index cdf8e92b..00000000 --- a/dart/lib/dynamiccolor/dynamic_scheme.dart +++ /dev/null @@ -1,179 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -import '../hct/hct.dart'; -import '../palettes/tonal_palette.dart'; -import '../utils/math_utils.dart'; -import 'dynamic_color.dart'; -import 'material_dynamic_colors.dart'; -import 'variant.dart'; - -/// Constructed by a set of values representing the current UI state (such as -/// whether or not its dark theme, what the theme style is, etc.), and -/// provides a set of [TonalPalette]s that can create colors that fit in -/// with the theme style. Used by [DynamicColor] to resolve into a color. -class DynamicScheme { - /// The source color of the theme as an ARGB integer. - final int sourceColorArgb; - - /// The source color of the theme in HCT. - final Hct sourceColorHct; - - /// The variant, or style, of the theme. - final Variant variant; - - /// Whether or not the scheme is in 'dark mode' or 'light mode'. - final bool isDark; - - /// Value from -1 to 1. -1 represents minimum contrast, 0 represents - /// standard (i.e. the design as spec'd), and 1 represents maximum contrast. - final double contrastLevel; - - /// Given a tone, produces a color. Hue and chroma of the color are specified - /// in the design specification of the variant. Usually colorful. - final TonalPalette primaryPalette; - - /// Given a tone, produces a color. Hue and chroma of the color are specified - /// in the design specification of the variant. Usually less colorful. - final TonalPalette secondaryPalette; - - /// Given a tone, produces a color. Hue and chroma of the color are specified - /// in the design specification of the variant. Usually a different hue from - /// primary and colorful. - final TonalPalette tertiaryPalette; - - /// Given a tone, produces a color. Hue and chroma of the color are specified - /// in the design specification of the variant. Usually not colorful at all, - /// intended for background & surface colors. - final TonalPalette neutralPalette; - - /// Given a tone, produces a color. Hue and chroma of the color are specified - /// in the design specification of the variant. Usually not colorful, but - /// slightly more colorful than Neutral. Intended for backgrounds & surfaces. - final TonalPalette neutralVariantPalette; - - /// Given a tone, produces a reddish, colorful, color. - final TonalPalette errorPalette; - - DynamicScheme({ - required this.sourceColorHct, - required this.variant, - this.contrastLevel = 0.0, - required this.isDark, - required this.primaryPalette, - required this.secondaryPalette, - required this.tertiaryPalette, - required this.neutralPalette, - required this.neutralVariantPalette, - TonalPalette? errorPalette, - }) : sourceColorArgb = sourceColorHct.toInt(), - errorPalette = errorPalette ?? TonalPalette.of(25.0, 84.0); - - static double getRotatedHue( - Hct sourceColor, - List hues, - List rotations, - ) { - final sourceHue = sourceColor.hue; - assert(hues.length == rotations.length); - if (rotations.length == 1) { - return MathUtils.sanitizeDegreesDouble(sourceColor.hue + rotations[0]); - } - final size = hues.length; - for (var i = 0; i <= (size - 2); i++) { - final thisHue = hues[i]; - final nextHue = hues[i + 1]; - if (thisHue < sourceHue && sourceHue < nextHue) { - return MathUtils.sanitizeDegreesDouble(sourceHue + rotations[i]); - } - } - // If this statement executes, something is wrong, there should have been a rotation - // found using the arrays. - return sourceHue; - } - - Hct getHct(DynamicColor dynamicColor) => dynamicColor.getHct(this); - int getArgb(DynamicColor dynamicColor) => dynamicColor.getArgb(this); - - // Getters. - int get primaryPaletteKeyColor => - getArgb(MaterialDynamicColors.primaryPaletteKeyColor); - int get secondaryPaletteKeyColor => - getArgb(MaterialDynamicColors.secondaryPaletteKeyColor); - int get tertiaryPaletteKeyColor => - getArgb(MaterialDynamicColors.tertiaryPaletteKeyColor); - int get neutralPaletteKeyColor => - getArgb(MaterialDynamicColors.neutralPaletteKeyColor); - int get neutralVariantPaletteKeyColor => - getArgb(MaterialDynamicColors.neutralVariantPaletteKeyColor); - int get background => getArgb(MaterialDynamicColors.background); - int get onBackground => getArgb(MaterialDynamicColors.onBackground); - int get surface => getArgb(MaterialDynamicColors.surface); - int get surfaceDim => getArgb(MaterialDynamicColors.surfaceDim); - int get surfaceBright => getArgb(MaterialDynamicColors.surfaceBright); - int get surfaceContainerLowest => - getArgb(MaterialDynamicColors.surfaceContainerLowest); - int get surfaceContainerLow => - getArgb(MaterialDynamicColors.surfaceContainerLow); - int get surfaceContainer => getArgb(MaterialDynamicColors.surfaceContainer); - int get surfaceContainerHigh => - getArgb(MaterialDynamicColors.surfaceContainerHigh); - int get surfaceContainerHighest => - getArgb(MaterialDynamicColors.surfaceContainerHighest); - int get onSurface => getArgb(MaterialDynamicColors.onSurface); - int get surfaceVariant => getArgb(MaterialDynamicColors.surfaceVariant); - int get onSurfaceVariant => getArgb(MaterialDynamicColors.onSurfaceVariant); - int get inverseSurface => getArgb(MaterialDynamicColors.inverseSurface); - int get inverseOnSurface => getArgb(MaterialDynamicColors.inverseOnSurface); - int get outline => getArgb(MaterialDynamicColors.outline); - int get outlineVariant => getArgb(MaterialDynamicColors.outlineVariant); - int get shadow => getArgb(MaterialDynamicColors.shadow); - int get scrim => getArgb(MaterialDynamicColors.scrim); - int get surfaceTint => getArgb(MaterialDynamicColors.surfaceTint); - int get primary => getArgb(MaterialDynamicColors.primary); - int get onPrimary => getArgb(MaterialDynamicColors.onPrimary); - int get primaryContainer => getArgb(MaterialDynamicColors.primaryContainer); - int get onPrimaryContainer => - getArgb(MaterialDynamicColors.onPrimaryContainer); - int get inversePrimary => getArgb(MaterialDynamicColors.inversePrimary); - int get secondary => getArgb(MaterialDynamicColors.secondary); - int get onSecondary => getArgb(MaterialDynamicColors.onSecondary); - int get secondaryContainer => - getArgb(MaterialDynamicColors.secondaryContainer); - int get onSecondaryContainer => - getArgb(MaterialDynamicColors.onSecondaryContainer); - int get tertiary => getArgb(MaterialDynamicColors.tertiary); - int get onTertiary => getArgb(MaterialDynamicColors.onTertiary); - int get tertiaryContainer => getArgb(MaterialDynamicColors.tertiaryContainer); - int get onTertiaryContainer => - getArgb(MaterialDynamicColors.onTertiaryContainer); - int get error => getArgb(MaterialDynamicColors.error); - int get onError => getArgb(MaterialDynamicColors.onError); - int get errorContainer => getArgb(MaterialDynamicColors.errorContainer); - int get onErrorContainer => getArgb(MaterialDynamicColors.onErrorContainer); - int get primaryFixed => getArgb(MaterialDynamicColors.primaryFixed); - int get primaryFixedDim => getArgb(MaterialDynamicColors.primaryFixedDim); - int get onPrimaryFixed => getArgb(MaterialDynamicColors.onPrimaryFixed); - int get onPrimaryFixedVariant => - getArgb(MaterialDynamicColors.onPrimaryFixedVariant); - int get secondaryFixed => getArgb(MaterialDynamicColors.secondaryFixed); - int get secondaryFixedDim => getArgb(MaterialDynamicColors.secondaryFixedDim); - int get onSecondaryFixed => getArgb(MaterialDynamicColors.onSecondaryFixed); - int get onSecondaryFixedVariant => - getArgb(MaterialDynamicColors.onSecondaryFixedVariant); - int get tertiaryFixed => getArgb(MaterialDynamicColors.tertiaryFixed); - int get tertiaryFixedDim => getArgb(MaterialDynamicColors.tertiaryFixedDim); - int get onTertiaryFixed => getArgb(MaterialDynamicColors.onTertiaryFixed); - int get onTertiaryFixedVariant => - getArgb(MaterialDynamicColors.onTertiaryFixedVariant); -} diff --git a/dart/lib/dynamiccolor/material_dynamic_colors.dart b/dart/lib/dynamiccolor/material_dynamic_colors.dart deleted file mode 100644 index c916833b..00000000 --- a/dart/lib/dynamiccolor/material_dynamic_colors.dart +++ /dev/null @@ -1,724 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'dart:math' as math; - -import '../dislike/dislike_analyzer.dart'; -import '../hct/hct.dart'; -import 'dynamic_color.dart'; -import 'dynamic_scheme.dart'; -import 'src/contrast_curve.dart'; -import 'src/tone_delta_pair.dart'; -import 'variant.dart'; - -bool _isFidelity(DynamicScheme scheme) => - scheme.variant == Variant.fidelity || scheme.variant == Variant.content; - -bool _isMonochrome(DynamicScheme scheme) => - scheme.variant == Variant.monochrome; - -/// Tokens, or named colors, in the Material Design system. -class MaterialDynamicColors { - static const double contentAccentToneDelta = 15.0; - static DynamicColor highestSurface(DynamicScheme s) { - return s.isDark ? surfaceBright : surfaceDim; - } - - static final DynamicColor primaryPaletteKeyColor = DynamicColor.fromPalette( - name: 'primary_palette_key_color', - palette: (s) => s.primaryPalette, - tone: (s) => s.primaryPalette.keyColor.tone, - ); - - static final DynamicColor secondaryPaletteKeyColor = DynamicColor.fromPalette( - name: 'secondary_palette_key_color', - palette: (s) => s.secondaryPalette, - tone: (s) => s.secondaryPalette.keyColor.tone, - ); - - static final DynamicColor tertiaryPaletteKeyColor = DynamicColor.fromPalette( - name: 'tertiary_palette_key_color', - palette: (s) => s.tertiaryPalette, - tone: (s) => s.tertiaryPalette.keyColor.tone, - ); - - static final DynamicColor neutralPaletteKeyColor = DynamicColor.fromPalette( - name: 'neutral_palette_key_color', - palette: (s) => s.neutralPalette, - tone: (s) => s.neutralPalette.keyColor.tone, - ); - - static final DynamicColor neutralVariantPaletteKeyColor = - DynamicColor.fromPalette( - name: 'neutral_variant_palette_key_color', - palette: (s) => s.neutralVariantPalette, - tone: (s) => s.neutralVariantPalette.keyColor.tone, - ); - - static final DynamicColor background = DynamicColor.fromPalette( - name: 'background', - palette: (s) => s.neutralPalette, - tone: (s) => s.isDark ? 6 : 98, - isBackground: true, - ); - - static final DynamicColor onBackground = DynamicColor.fromPalette( - name: 'on_background', - palette: (s) => s.neutralPalette, - tone: (s) => s.isDark ? 90 : 10, - background: (s) => MaterialDynamicColors.background, - contrastCurve: ContrastCurve(3, 3, 4.5, 7), - ); - - static final DynamicColor surface = DynamicColor.fromPalette( - name: 'surface', - palette: (s) => s.neutralPalette, - tone: (s) => s.isDark ? 6 : 98, - isBackground: true, - ); - - static final DynamicColor surfaceDim = DynamicColor.fromPalette( - name: 'surface_dim', - palette: (s) => s.neutralPalette, - tone: - (s) => - s.isDark ? 6 : ContrastCurve(87, 87, 80, 75).get(s.contrastLevel), - isBackground: true, - ); - - static final DynamicColor surfaceBright = DynamicColor.fromPalette( - name: 'surface_bright', - palette: (s) => s.neutralPalette, - tone: - (s) => - s.isDark ? ContrastCurve(24, 24, 29, 34).get(s.contrastLevel) : 98, - isBackground: true, - ); - - static final DynamicColor surfaceContainerLowest = DynamicColor.fromPalette( - name: 'surface_container_lowest', - palette: (s) => s.neutralPalette, - tone: - (s) => s.isDark ? ContrastCurve(4, 4, 2, 0).get(s.contrastLevel) : 100, - isBackground: true, - ); - - static final DynamicColor surfaceContainerLow = DynamicColor.fromPalette( - name: 'surface_container_low', - palette: (s) => s.neutralPalette, - tone: - (s) => - s.isDark - ? ContrastCurve(10, 10, 11, 12).get(s.contrastLevel) - : ContrastCurve(96, 96, 96, 95).get(s.contrastLevel), - isBackground: true, - ); - - static final DynamicColor surfaceContainer = DynamicColor.fromPalette( - name: 'surface_container', - palette: (s) => s.neutralPalette, - tone: - (s) => - s.isDark - ? ContrastCurve(12, 12, 16, 20).get(s.contrastLevel) - : ContrastCurve(94, 94, 92, 90).get(s.contrastLevel), - isBackground: true, - ); - - static final DynamicColor surfaceContainerHigh = DynamicColor.fromPalette( - name: 'surface_container_high', - palette: (s) => s.neutralPalette, - tone: - (s) => - s.isDark - ? ContrastCurve(17, 17, 21, 25).get(s.contrastLevel) - : ContrastCurve(92, 92, 88, 85).get(s.contrastLevel), - isBackground: true, - ); - - static final DynamicColor surfaceContainerHighest = DynamicColor.fromPalette( - name: 'surface_container_highest', - palette: (s) => s.neutralPalette, - tone: - (s) => - s.isDark - ? ContrastCurve(22, 22, 26, 30).get(s.contrastLevel) - : ContrastCurve(90, 90, 84, 80).get(s.contrastLevel), - isBackground: true, - ); - - static final DynamicColor onSurface = DynamicColor.fromPalette( - name: 'on_surface', - palette: (s) => s.neutralPalette, - tone: (s) => s.isDark ? 90 : 10, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ); - - static final DynamicColor surfaceVariant = DynamicColor.fromPalette( - name: 'surface_variant', - palette: (s) => s.neutralVariantPalette, - tone: (s) => s.isDark ? 30 : 90, - isBackground: true, - ); - - static final DynamicColor onSurfaceVariant = DynamicColor.fromPalette( - name: 'on_surface_variant', - palette: (s) => s.neutralVariantPalette, - tone: (s) => s.isDark ? 80 : 30, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ); - - static final DynamicColor inverseSurface = DynamicColor.fromPalette( - name: 'inverse_surface', - palette: (s) => s.neutralPalette, - tone: (s) => s.isDark ? 90 : 20, - ); - - static final DynamicColor inverseOnSurface = DynamicColor.fromPalette( - name: 'inverse_on_surface', - palette: (s) => s.neutralPalette, - tone: (s) => s.isDark ? 20 : 95, - background: (s) => MaterialDynamicColors.inverseSurface, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ); - - static final DynamicColor outline = DynamicColor.fromPalette( - name: 'outline', - palette: (s) => s.neutralVariantPalette, - tone: (s) => s.isDark ? 60 : 50, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(1.5, 3, 4.5, 7), - ); - - static final DynamicColor outlineVariant = DynamicColor.fromPalette( - name: 'outline_variant', - palette: (s) => s.neutralVariantPalette, - tone: (s) => s.isDark ? 30 : 80, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(1, 1, 3, 4.5), - ); - - static final DynamicColor shadow = DynamicColor.fromPalette( - name: 'shadow', - palette: (s) => s.neutralPalette, - tone: (s) => 0, - ); - - static final DynamicColor scrim = DynamicColor.fromPalette( - name: 'scrim', - palette: (s) => s.neutralPalette, - tone: (s) => 0, - ); - - static final DynamicColor surfaceTint = DynamicColor.fromPalette( - name: 'surface_tint', - palette: (s) => s.primaryPalette, - tone: (s) => s.isDark ? 80 : 40, - isBackground: true, - ); - - static final DynamicColor primary = DynamicColor.fromPalette( - name: 'primary', - palette: (s) => s.primaryPalette, - tone: (s) { - if (_isMonochrome(s)) { - return s.isDark ? 100 : 0; - } - return s.isDark ? 80 : 40; - }, - isBackground: true, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(3, 4.5, 7, 7), - toneDeltaPair: - (s) => ToneDeltaPair( - MaterialDynamicColors.primaryContainer, - MaterialDynamicColors.primary, - 10, - TonePolarity.nearer, - false, - ), - ); - - static final DynamicColor onPrimary = DynamicColor.fromPalette( - name: 'on_primary', - palette: (s) => s.primaryPalette, - tone: (s) { - if (_isMonochrome(s)) { - return s.isDark ? 10 : 90; - } - return s.isDark ? 20 : 100; - }, - background: (s) => MaterialDynamicColors.primary, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ); - - static final DynamicColor primaryContainer = DynamicColor.fromPalette( - name: 'primary_container', - palette: (s) => s.primaryPalette, - tone: (s) { - if (_isFidelity(s)) { - return s.sourceColorHct.tone; - } - if (_isMonochrome(s)) { - return s.isDark ? 85 : 25; - } - return s.isDark ? 30 : 90; - }, - isBackground: true, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(1, 1, 3, 4.5), - toneDeltaPair: - (s) => ToneDeltaPair( - MaterialDynamicColors.primaryContainer, - MaterialDynamicColors.primary, - 10, - TonePolarity.nearer, - false, - ), - ); - - static final DynamicColor onPrimaryContainer = DynamicColor.fromPalette( - name: 'on_primary_container', - palette: (s) => s.primaryPalette, - tone: (s) { - if (_isFidelity(s)) { - return DynamicColor.foregroundTone( - MaterialDynamicColors.primaryContainer.tone(s), - 4.5, - ); - } - if (_isMonochrome(s)) { - return s.isDark ? 0 : 100; - } - return s.isDark ? 90 : 30; - }, - background: (s) => MaterialDynamicColors.primaryContainer, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ); - - static final DynamicColor inversePrimary = DynamicColor.fromPalette( - name: 'inverse_primary', - palette: (s) => s.primaryPalette, - tone: (s) => s.isDark ? 40 : 80, - background: (s) => MaterialDynamicColors.inverseSurface, - contrastCurve: ContrastCurve(3, 4.5, 7, 7), - ); - - static final DynamicColor secondary = DynamicColor.fromPalette( - name: 'secondary', - palette: (s) => s.secondaryPalette, - tone: (s) => s.isDark ? 80 : 40, - isBackground: true, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(3, 4.5, 7, 7), - toneDeltaPair: - (s) => ToneDeltaPair( - MaterialDynamicColors.secondaryContainer, - MaterialDynamicColors.secondary, - 10, - TonePolarity.nearer, - false, - ), - ); - - static final DynamicColor onSecondary = DynamicColor.fromPalette( - name: 'on_secondary', - palette: (s) => s.secondaryPalette, - tone: (s) { - if (_isMonochrome(s)) { - return s.isDark ? 10 : 100; - } else { - return s.isDark ? 20 : 100; - } - }, - background: (s) => MaterialDynamicColors.secondary, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ); - - static final DynamicColor secondaryContainer = DynamicColor.fromPalette( - name: 'secondary_container', - palette: (s) => s.secondaryPalette, - tone: (s) { - final initialTone = s.isDark ? 30.0 : 90.0; - if (_isMonochrome(s)) { - return s.isDark ? 30 : 85; - } - if (!_isFidelity(s)) { - return initialTone; - } - return _findDesiredChromaByTone( - s.secondaryPalette.hue, - s.secondaryPalette.chroma, - initialTone, - s.isDark ? false : true, - ); - }, - isBackground: true, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(1, 1, 3, 4.5), - toneDeltaPair: - (s) => ToneDeltaPair( - MaterialDynamicColors.secondaryContainer, - MaterialDynamicColors.secondary, - 10, - TonePolarity.nearer, - false, - ), - ); - - static final DynamicColor onSecondaryContainer = DynamicColor.fromPalette( - name: 'on_secondary_container', - palette: (s) => s.secondaryPalette, - tone: (s) { - if (_isMonochrome(s)) { - return s.isDark ? 90 : 10; - } - if (!_isFidelity(s)) { - return s.isDark ? 90 : 30; - } - return DynamicColor.foregroundTone( - MaterialDynamicColors.secondaryContainer.tone(s), - 4.5, - ); - }, - background: (s) => MaterialDynamicColors.secondaryContainer, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ); - - static final DynamicColor tertiary = DynamicColor.fromPalette( - name: 'tertiary', - palette: (s) => s.tertiaryPalette, - tone: (s) { - if (_isMonochrome(s)) { - return s.isDark ? 90 : 25; - } - return s.isDark ? 80 : 40; - }, - isBackground: true, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(3, 4.5, 7, 7), - toneDeltaPair: - (s) => ToneDeltaPair( - MaterialDynamicColors.tertiaryContainer, - MaterialDynamicColors.tertiary, - 10, - TonePolarity.nearer, - false, - ), - ); - - static final DynamicColor onTertiary = DynamicColor.fromPalette( - name: 'on_tertiary', - palette: (s) => s.tertiaryPalette, - tone: (s) { - if (_isMonochrome(s)) { - return s.isDark ? 10 : 90; - } - return s.isDark ? 20 : 100; - }, - background: (s) => MaterialDynamicColors.tertiary, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ); - - static final DynamicColor tertiaryContainer = DynamicColor.fromPalette( - name: 'tertiary_container', - palette: (s) => s.tertiaryPalette, - tone: (s) { - if (_isMonochrome(s)) { - return s.isDark ? 60 : 49; - } - if (!_isFidelity(s)) { - return s.isDark ? 30 : 90; - } - final proposedHct = s.tertiaryPalette.getHct(s.sourceColorHct.tone); - return DislikeAnalyzer.fixIfDisliked(proposedHct).tone; - }, - isBackground: true, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(1, 1, 3, 4.5), - toneDeltaPair: - (s) => ToneDeltaPair( - MaterialDynamicColors.tertiaryContainer, - MaterialDynamicColors.tertiary, - 10, - TonePolarity.nearer, - false, - ), - ); - - static final DynamicColor onTertiaryContainer = DynamicColor.fromPalette( - name: 'on_tertiary_container', - palette: (s) => s.tertiaryPalette, - tone: (s) { - if (_isMonochrome(s)) { - return s.isDark ? 0 : 100; - } - if (!_isFidelity(s)) { - return s.isDark ? 90 : 30; - } - return DynamicColor.foregroundTone( - MaterialDynamicColors.tertiaryContainer.tone(s), - 4.5, - ); - }, - background: (s) => MaterialDynamicColors.tertiaryContainer, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ); - - static final DynamicColor error = DynamicColor.fromPalette( - name: 'error', - palette: (s) => s.errorPalette, - tone: (s) => s.isDark ? 80 : 40, - isBackground: true, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(3, 4.5, 7, 7), - toneDeltaPair: - (s) => ToneDeltaPair( - MaterialDynamicColors.errorContainer, - MaterialDynamicColors.error, - 10, - TonePolarity.nearer, - false, - ), - ); - - static final DynamicColor onError = DynamicColor.fromPalette( - name: 'on_error', - palette: (s) => s.errorPalette, - tone: (s) => s.isDark ? 20 : 100, - background: (s) => MaterialDynamicColors.error, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ); - - static final DynamicColor errorContainer = DynamicColor.fromPalette( - name: 'error_container', - palette: (s) => s.errorPalette, - tone: (s) => s.isDark ? 30 : 90, - isBackground: true, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(1, 1, 3, 4.5), - toneDeltaPair: - (s) => ToneDeltaPair( - MaterialDynamicColors.errorContainer, - MaterialDynamicColors.error, - 10, - TonePolarity.nearer, - false, - ), - ); - - static final DynamicColor onErrorContainer = DynamicColor.fromPalette( - name: 'on_error_container', - palette: (s) => s.errorPalette, - tone: (s) { - if (_isMonochrome(s)) { - return s.isDark ? 90 : 10; - } - return s.isDark ? 90 : 30; - }, - background: (s) => MaterialDynamicColors.errorContainer, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ); - - static final DynamicColor primaryFixed = DynamicColor.fromPalette( - name: 'primary_fixed', - palette: (s) => s.primaryPalette, - tone: (s) => _isMonochrome(s) ? 40.0 : 90.0, - isBackground: true, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(1, 1, 3, 4.5), - toneDeltaPair: - (s) => ToneDeltaPair( - MaterialDynamicColors.primaryFixed, - MaterialDynamicColors.primaryFixedDim, - 10, - TonePolarity.lighter, - true, - ), - ); - - static final DynamicColor primaryFixedDim = DynamicColor.fromPalette( - name: 'primary_fixed_dim', - palette: (s) => s.primaryPalette, - tone: (s) => _isMonochrome(s) ? 30.0 : 80.0, - isBackground: true, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(1, 1, 3, 4.5), - toneDeltaPair: - (s) => ToneDeltaPair( - MaterialDynamicColors.primaryFixed, - MaterialDynamicColors.primaryFixedDim, - 10, - TonePolarity.lighter, - true, - ), - ); - - static final DynamicColor onPrimaryFixed = DynamicColor.fromPalette( - name: 'on_primary_fixed', - palette: (s) => s.primaryPalette, - tone: (s) => _isMonochrome(s) ? 100.0 : 10.0, - background: (s) => MaterialDynamicColors.primaryFixedDim, - secondBackground: (s) => MaterialDynamicColors.primaryFixed, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ); - - static final DynamicColor onPrimaryFixedVariant = DynamicColor.fromPalette( - name: 'on_primary_fixed_variant', - palette: (s) => s.primaryPalette, - tone: (s) => _isMonochrome(s) ? 90.0 : 30.0, - background: (s) => MaterialDynamicColors.primaryFixedDim, - secondBackground: (s) => MaterialDynamicColors.primaryFixed, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ); - - static final DynamicColor secondaryFixed = DynamicColor.fromPalette( - name: 'secondary_fixed', - palette: (s) => s.secondaryPalette, - tone: (s) => _isMonochrome(s) ? 80.0 : 90.0, - isBackground: true, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(1, 1, 3, 4.5), - toneDeltaPair: - (s) => ToneDeltaPair( - MaterialDynamicColors.secondaryFixed, - MaterialDynamicColors.secondaryFixedDim, - 10, - TonePolarity.lighter, - true, - ), - ); - - static final DynamicColor secondaryFixedDim = DynamicColor.fromPalette( - name: 'secondary_fixed_dim', - palette: (s) => s.secondaryPalette, - tone: (s) => _isMonochrome(s) ? 70.0 : 80.0, - isBackground: true, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(1, 1, 3, 4.5), - toneDeltaPair: - (s) => ToneDeltaPair( - MaterialDynamicColors.secondaryFixed, - MaterialDynamicColors.secondaryFixedDim, - 10, - TonePolarity.lighter, - true, - ), - ); - - static final DynamicColor onSecondaryFixed = DynamicColor.fromPalette( - name: 'on_secondary_fixed', - palette: (s) => s.secondaryPalette, - tone: (s) => 10.0, - background: (s) => MaterialDynamicColors.secondaryFixedDim, - secondBackground: (s) => MaterialDynamicColors.secondaryFixed, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ); - - static final DynamicColor onSecondaryFixedVariant = DynamicColor.fromPalette( - name: 'on_secondary_fixed_variant', - palette: (s) => s.secondaryPalette, - tone: (s) => _isMonochrome(s) ? 25.0 : 30.0, - background: (s) => MaterialDynamicColors.secondaryFixedDim, - secondBackground: (s) => MaterialDynamicColors.secondaryFixed, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ); - - static final DynamicColor tertiaryFixed = DynamicColor.fromPalette( - name: 'tertiary_fixed', - palette: (s) => s.tertiaryPalette, - tone: (s) => _isMonochrome(s) ? 40.0 : 90.0, - isBackground: true, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(1, 1, 3, 4.5), - toneDeltaPair: - (s) => ToneDeltaPair( - MaterialDynamicColors.tertiaryFixed, - MaterialDynamicColors.tertiaryFixedDim, - 10, - TonePolarity.lighter, - true, - ), - ); - - static final DynamicColor tertiaryFixedDim = DynamicColor.fromPalette( - name: 'tertiary_fixed_dim', - palette: (s) => s.tertiaryPalette, - tone: (s) => _isMonochrome(s) ? 30.0 : 80.0, - isBackground: true, - background: MaterialDynamicColors.highestSurface, - contrastCurve: ContrastCurve(1, 1, 3, 4.5), - toneDeltaPair: - (s) => ToneDeltaPair( - MaterialDynamicColors.tertiaryFixed, - MaterialDynamicColors.tertiaryFixedDim, - 10, - TonePolarity.lighter, - true, - ), - ); - - static final DynamicColor onTertiaryFixed = DynamicColor.fromPalette( - name: 'on_tertiary_fixed', - palette: (s) => s.tertiaryPalette, - tone: (s) => _isMonochrome(s) ? 100.0 : 10.0, - background: (s) => MaterialDynamicColors.tertiaryFixedDim, - secondBackground: (s) => MaterialDynamicColors.tertiaryFixed, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ); - - static final DynamicColor onTertiaryFixedVariant = DynamicColor.fromPalette( - name: 'on_tertiary_fixed_variant', - palette: (s) => s.tertiaryPalette, - tone: (s) => _isMonochrome(s) ? 90.0 : 30.0, - background: (s) => MaterialDynamicColors.tertiaryFixedDim, - secondBackground: (s) => MaterialDynamicColors.tertiaryFixed, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ); - - static double _findDesiredChromaByTone( - double hue, - double chroma, - double tone, - bool byDecreasingTone, - ) { - var answer = tone; - - var closestToChroma = Hct.from(hue, chroma, tone); - if (closestToChroma.chroma < chroma) { - var chromaPeak = closestToChroma.chroma; - while (closestToChroma.chroma < chroma) { - answer += byDecreasingTone ? -1.0 : 1.0; - final potentialSolution = Hct.from(hue, chroma, answer); - if (chromaPeak > potentialSolution.chroma) { - break; - } - if ((potentialSolution.chroma - chroma).abs() < 0.4) { - break; - } - - final potentialDelta = (potentialSolution.chroma - chroma).abs(); - final currentDelta = (closestToChroma.chroma - chroma).abs(); - if (potentialDelta < currentDelta) { - closestToChroma = potentialSolution; - } - chromaPeak = math.max(chromaPeak, potentialSolution.chroma); - } - } - - return answer; - } -} diff --git a/dart/lib/dynamiccolor/src/contrast_curve.dart b/dart/lib/dynamiccolor/src/contrast_curve.dart deleted file mode 100644 index 1ae3b999..00000000 --- a/dart/lib/dynamiccolor/src/contrast_curve.dart +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import '../../utils/math_utils.dart'; - -/// A class containing a value that changes with the contrast level. -/// -/// Usually represents the contrast requirements for a dynamic color on its -/// background. The four values correspond to values for contrast levels -/// -1.0, 0.0, 0.5, and 1.0, respectively. -class ContrastCurve { - final double low; - final double normal; - final double medium; - final double high; - - /// Creates a `ContrastCurve` object. - /// - /// [low] Value for contrast level -1.0 - /// [normal] Value for contrast level 0.0 - /// [medium] Value for contrast level 0.5 - /// [high] Value for contrast level 1.0 - ContrastCurve(this.low, this.normal, this.medium, this.high); - - /// Returns the value at a given contrast level. - /// - /// [contrastLevel] The contrast level. 0.0 is the default (normal); - /// -1.0 is the lowest; 1.0 is the highest. - /// Returns the value. For contrast ratios, a number between 1.0 and 21.0. - double get(double contrastLevel) { - if (contrastLevel <= -1.0) { - return low; - } else if (contrastLevel < 0.0) { - return MathUtils.lerp(low, normal, (contrastLevel - (-1)) / 1); - } else if (contrastLevel < 0.5) { - return MathUtils.lerp(normal, medium, (contrastLevel - 0) / 0.5); - } else if (contrastLevel < 1.0) { - return MathUtils.lerp(medium, high, (contrastLevel - 0.5) / 0.5); - } else { - return high; - } - } -} diff --git a/dart/lib/dynamiccolor/src/tone_delta_pair.dart b/dart/lib/dynamiccolor/src/tone_delta_pair.dart deleted file mode 100644 index 5b4d417f..00000000 --- a/dart/lib/dynamiccolor/src/tone_delta_pair.dart +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import '../dynamic_color.dart'; - -/// Describes the different in tone between colors. -enum TonePolarity { darker, lighter, nearer, farther } - -/// Documents a constraint between two DynamicColors, in which their tones must -/// have a certain distance from each other. -/// -/// Prefer a DynamicColor with a background, this is for special cases when -/// designers want tonal distance, literally contrast, between two colors that -/// don't have a background / foreground relationship or a contrast guarantee. -class ToneDeltaPair { - final DynamicColor roleA; - final DynamicColor roleB; - final double delta; - final TonePolarity polarity; - final bool stayTogether; - - /// Documents a constraint in tone distance between two DynamicColors. - /// - /// The polarity is an adjective that describes "A", compared to "B". - /// - /// For instance, ToneDeltaPair(A, B, 15, 'darker', stayTogether) states that - /// A's tone should be at least 15 darker than B's. - /// - /// 'nearer' and 'farther' describes closeness to the surface roles. For - /// instance, ToneDeltaPair(A, B, 10, 'nearer', stayTogether) states that A - /// should be 10 lighter than B in light mode, and 10 darker than B in dark - /// mode. - /// - /// [roleA] The first role in a pair. - /// [roleB] The second role in a pair. - /// [delta] Required difference between tones. Absolute value, negative - /// values have undefined behavior. - /// [polarity] The relative relation between tones of roleA and roleB, - /// as described above. - /// [stayTogether] Whether these two roles should stay on the same side of - /// the "awkward zone" (T50-59). This is necessary for certain cases where - /// one role has two backgrounds. - ToneDeltaPair( - this.roleA, - this.roleB, - this.delta, - this.polarity, - this.stayTogether, - ); -} diff --git a/dart/lib/dynamiccolor/variant.dart b/dart/lib/dynamiccolor/variant.dart deleted file mode 100644 index 6635545a..00000000 --- a/dart/lib/dynamiccolor/variant.dart +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/// Set of themes supported by Dynamic Color. -/// Instantiate the corresponding subclass, ex. SchemeTonalSpot, to create -/// colors corresponding to the theme. -enum Variant { - monochrome('monochrome', 'All colors are grayscale, no chroma.'), - neutral('neutral', 'Close to grayscale, a hint of chroma.'), - tonalSpot('tonal spot', - 'Pastel tokens, low chroma palettes (32).\nDefault Material You theme at 2021 launch.'), - vibrant('vibrant', - 'Pastel colors, high chroma palettes. (max).\nThe primary palette\'s chroma is at maximum.\nUse Fidelity instead if tokens should alter their tone to match the palette vibrancy.'), - expressive('expressive', - 'Pastel colors, medium chroma palettes.\nThe primary palette\'s hue is different from source color, for variety.'), - content('content', - 'Almost identical to Fidelity.\nTokens and palettes match source color.\nPrimary Container is source color, adjusted to ensure contrast with surfaces.\n\nTertiary palette is analogue of source color.\nFound by dividing color wheel by 6, then finding the 2 colors adjacent to source.\nThe one that increases hue is used.'), - fidelity('fidelity', - 'Tokens and palettes match source color.\nPrimary Container is source color, adjusted to ensure contrast with surfaces.\nFor example, if source color is black, it is lightened so it doesn\'t match surfaces in dark mode.\n\nTertiary palette is complement of source color.'), - rainbow('rainbow', - 'A playful theme - the source color\'s hue does not appear in the theme.'), - fruitSalad('fruit salad', - 'A playful theme - the source color\'s hue does not appear in the theme.'); - - final String label; - final String description; - - const Variant(this.label, this.description); -} diff --git a/dart/lib/hct/cam16.dart b/dart/lib/hct/cam16.dart deleted file mode 100644 index 7b94a29c..00000000 --- a/dart/lib/hct/cam16.dart +++ /dev/null @@ -1,381 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'dart:core'; -import 'dart:math' as math; - -import '../utils/color_utils.dart'; -import '../utils/math_utils.dart'; -import 'viewing_conditions.dart'; - -/// CAM16, a color appearance model. Colors are not just defined by their hex -/// code, but rather, a hex code and viewing conditions. -/// -/// CAM16 instances also have coordinates in the CAM16-UCS space, called J*, a*, -/// b*, or jstar, astar, bstar in code. CAM16-UCS is included in the CAM16 -/// specification, and should be used when measuring distances between colors. -/// -/// In traditional color spaces, a color can be identified solely by the -/// observer's measurement of the color. Color appearance models such as CAM16 -/// also use information about the environment where the color was -/// observed, known as the viewing conditions. -/// -/// For example, white under the traditional assumption of a midday sun white -/// point is accurately measured as a slightly chromatic blue by CAM16. -/// (roughly, hue 203, chroma 3, lightness 100) -/// CAM16, a color appearance model. Colors are not just defined by their hex -/// code, but rather, a hex code and viewing conditions. -/// -/// CAM16 instances also have coordinates in the CAM16-UCS space, called J*, a*, -/// b*, or jstar, astar, bstar in code. CAM16-UCS is included in the CAM16 -/// specification, and should be used when measuring distances between colors. -/// -/// In traditional color spaces, a color can be identified solely by the -/// observer's measurement of the color. Color appearance models such as CAM16 -/// also use information about the environment where the color was -/// observed, known as the viewing conditions. -/// -/// For example, white under the traditional assumption of a midday sun white -/// point is accurately measured as a slightly chromatic blue by CAM16. -/// (roughly, hue 203, chroma 3, lightness 100) -class Cam16 { - /// Like red, orange, yellow, green, etc. - final double hue; - - /// Informally, colorfulness / color intensity. Like saturation in HSL, - /// except perceptually accurate. - final double chroma; - - /// Lightness - final double j; - - /// Brightness; ratio of lightness to white point's lightness - final double q; - - /// Colorfulness - final double m; - - /// Saturation; ratio of chroma to white point's chroma - final double s; - - /// CAM16-UCS J coordinate - final double jstar; - - /// CAM16-UCS a coordinate - final double astar; - - /// CAM16-UCS b coordinate - final double bstar; - - /// All of the CAM16 dimensions can be calculated from 3 of the dimensions, in - /// the following combinations: - /// - {j or q} and {c, m, or s} and hue - /// - jstar, astar, bstar - /// Prefer using a static method that constructs from 3 of those dimensions. - /// This constructor is intended for those methods to use to return all - /// possible dimensions. - Cam16( - this.hue, - this.chroma, - this.j, - this.q, - this.m, - this.s, - this.jstar, - this.astar, - this.bstar, - ); - - /// CAM16 instances also have coordinates in the CAM16-UCS space, called J*, - /// a*, b*, or jstar, astar, bstar in code. CAM16-UCS is included in the CAM16 - /// specification, and should be used when measuring distances between colors. - double distance(Cam16 other) { - final dJ = jstar - other.jstar; - final dA = astar - other.astar; - final dB = bstar - other.bstar; - final dEPrime = math.sqrt(dJ * dJ + dA * dA + dB * dB); - final dE = 1.41 * math.pow(dEPrime, 0.63); - return dE; - } - - /// Convert [argb] to CAM16, assuming the color was viewed in default viewing - /// conditions. - static Cam16 fromInt(int argb) { - return fromIntInViewingConditions(argb, ViewingConditions.sRgb); - } - - /// Given [viewingConditions], convert [argb] to CAM16. - static Cam16 fromIntInViewingConditions( - int argb, - ViewingConditions viewingConditions, - ) { - // Transform ARGB int to XYZ - final xyz = ColorUtils.xyzFromArgb(argb); - final x = xyz[0]; - final y = xyz[1]; - final z = xyz[2]; - return fromXyzInViewingConditions(x, y, z, viewingConditions); - } - - /// Given color expressed in XYZ and viewed in [viewingConditions], convert to - /// CAM16. - static Cam16 fromXyzInViewingConditions( - double x, - double y, - double z, - ViewingConditions viewingConditions, - ) { - // Transform XYZ to 'cone'/'rgb' responses - - final rC = 0.401288 * x + 0.650173 * y - 0.051461 * z; - final gC = -0.250268 * x + 1.204414 * y + 0.045854 * z; - final bC = -0.002079 * x + 0.048952 * y + 0.953127 * z; - - // Discount illuminant - final rD = viewingConditions.rgbD[0] * rC; - final gD = viewingConditions.rgbD[1] * gC; - final bD = viewingConditions.rgbD[2] * bC; - - // chromatic adaptation - final rAF = - math.pow(viewingConditions.fl * rD.abs() / 100.0, 0.42).toDouble(); - final gAF = - math.pow(viewingConditions.fl * gD.abs() / 100.0, 0.42).toDouble(); - final bAF = - math.pow(viewingConditions.fl * bD.abs() / 100.0, 0.42).toDouble(); - final rA = MathUtils.signum(rD) * 400.0 * rAF / (rAF + 27.13); - final gA = MathUtils.signum(gD) * 400.0 * gAF / (gAF + 27.13); - final bA = MathUtils.signum(bD) * 400.0 * bAF / (bAF + 27.13); - - // redness-greenness - final a = (11.0 * rA + -12.0 * gA + bA) / 11.0; - // yellowness-blueness - final b = (rA + gA - 2.0 * bA) / 9.0; - - // auxiliary components - final u = (20.0 * rA + 20.0 * gA + 21.0 * bA) / 20.0; - final p2 = (40.0 * rA + 20.0 * gA + bA) / 20.0; - - // hue - final atan2 = math.atan2(b, a); - final atanDegrees = atan2 * 180.0 / math.pi; - final hue = - atanDegrees < 0 - ? atanDegrees + 360.0 - : atanDegrees >= 360 - ? atanDegrees - 360 - : atanDegrees; - final hueRadians = hue * math.pi / 180.0; - assert(hue >= 0 && hue < 360, 'hue was really $hue'); - - // achromatic response to color - final ac = p2 * viewingConditions.nbb; - - // CAM16 lightness and brightness - final J = - 100.0 * - math.pow( - ac / viewingConditions.aw, - viewingConditions.c * viewingConditions.z, - ); - final Q = - (4.0 / viewingConditions.c) * - math.sqrt(J / 100.0) * - (viewingConditions.aw + 4.0) * - (viewingConditions.fLRoot); - - final huePrime = (hue < 20.14) ? hue + 360 : hue; - final eHue = - (1.0 / 4.0) * (math.cos(huePrime * math.pi / 180.0 + 2.0) + 3.8); - final p1 = - 50000.0 / 13.0 * eHue * viewingConditions.nC * viewingConditions.ncb; - final t = p1 * math.sqrt(a * a + b * b) / (u + 0.305); - final alpha = - math.pow(t, 0.9) * - math.pow( - 1.64 - math.pow(0.29, viewingConditions.backgroundYTowhitePointY), - 0.73, - ); - // CAM16 chroma, colorfulness, chroma - final C = alpha * math.sqrt(J / 100.0); - final M = C * viewingConditions.fLRoot; - final s = - 50.0 * - math.sqrt((alpha * viewingConditions.c) / (viewingConditions.aw + 4.0)); - - // CAM16-UCS components - final jstar = (1.0 + 100.0 * 0.007) * J / (1.0 + 0.007 * J); - final mstar = math.log(1.0 + 0.0228 * M) / 0.0228; - final astar = mstar * math.cos(hueRadians); - final bstar = mstar * math.sin(hueRadians); - return Cam16(hue, C, J, Q, M, s, jstar, astar, bstar); - } - - /// Create a CAM16 color from lightness [j], chroma [c], and hue [h], - /// assuming the color was viewed in default viewing conditions. - static Cam16 fromJch(double j, double c, double h) { - return fromJchInViewingConditions(j, c, h, ViewingConditions.sRgb); - } - - /// Create a CAM16 color from lightness [j], chroma [C], and hue [h], - /// in [viewingConditions]. - static Cam16 fromJchInViewingConditions( - double J, - double C, - double h, - ViewingConditions viewingConditions, - ) { - final Q = - (4.0 / viewingConditions.c) * - math.sqrt(J / 100.0) * - (viewingConditions.aw + 4.0) * - (viewingConditions.fLRoot); - final M = C * viewingConditions.fLRoot; - final alpha = C / math.sqrt(J / 100.0); - final s = - 50.0 * - math.sqrt((alpha * viewingConditions.c) / (viewingConditions.aw + 4.0)); - - final hueRadians = h * math.pi / 180.0; - final jstar = (1.0 + 100.0 * 0.007) * J / (1.0 + 0.007 * J); - final mstar = 1.0 / 0.0228 * math.log(1.0 + 0.0228 * M); - final astar = mstar * math.cos(hueRadians); - final bstar = mstar * math.sin(hueRadians); - return Cam16(h, C, J, Q, M, s, jstar, astar, bstar); - } - - /// Create a CAM16 color from CAM16-UCS coordinates [jstar], [astar], [bstar]. - /// assuming the color was viewed in default viewing conditions. - static Cam16 fromUcs(double jstar, double astar, double bstar) { - return fromUcsInViewingConditions( - jstar, - astar, - bstar, - ViewingConditions.standard, - ); - } - - /// Create a CAM16 color from CAM16-UCS coordinates [jstar], [astar], [bstar]. - /// in [viewingConditions]. - static Cam16 fromUcsInViewingConditions( - double jstar, - double astar, - double bstar, - ViewingConditions viewingConditions, - ) { - final a = astar; - final b = bstar; - final m = math.sqrt(a * a + b * b); - final M = (math.exp(m * 0.0228) - 1.0) / 0.0228; - final c = M / viewingConditions.fLRoot; - var h = math.atan2(b, a) * (180.0 / math.pi); - if (h < 0.0) { - h += 360.0; - } - final j = jstar / (1 - (jstar - 100) * 0.007); - - return Cam16.fromJchInViewingConditions(j, c, h, viewingConditions); - } - - /// ARGB representation of color, assuming the color was viewed in default - /// viewing conditions. - int toInt() { - return viewed(ViewingConditions.sRgb); - } - - // Avoid allocations during conversion by pre-allocating an array. - final _viewedArray = [0, 0, 0]; - - /// ARGB representation of a color, given the color was viewed in - /// [viewingConditions] - int viewed(ViewingConditions viewingConditions) { - final xyz = xyzInViewingConditions(viewingConditions, array: _viewedArray); - final argb = ColorUtils.argbFromXyz(xyz[0], xyz[1], xyz[2]); - return argb; - } - - /// XYZ representation of CAM16 seen in [viewingConditions]. - List xyzInViewingConditions( - ViewingConditions viewingConditions, { - List? array, - }) { - final alpha = - (chroma == 0.0 || j == 0.0) ? 0.0 : chroma / math.sqrt(j / 100.0); - - final t = math.pow( - alpha / - math.pow( - 1.64 - math.pow(0.29, viewingConditions.backgroundYTowhitePointY), - 0.73, - ), - 1.0 / 0.9, - ); - final hRad = hue * math.pi / 180.0; - - final eHue = 0.25 * (math.cos(hRad + 2.0) + 3.8); - final ac = - viewingConditions.aw * - math.pow(j / 100.0, 1.0 / viewingConditions.c / viewingConditions.z); - final p1 = - eHue * (50000.0 / 13.0) * viewingConditions.nC * viewingConditions.ncb; - - final p2 = ac / viewingConditions.nbb; - - final hSin = math.sin(hRad); - final hCos = math.cos(hRad); - - final gamma = - 23.0 * - (p2 + 0.305) * - t / - (23.0 * p1 + 11 * t * hCos + 108.0 * t * hSin); - final a = gamma * hCos; - final b = gamma * hSin; - final rA = (460.0 * p2 + 451.0 * a + 288.0 * b) / 1403.0; - final gA = (460.0 * p2 - 891.0 * a - 261.0 * b) / 1403.0; - final bA = (460.0 * p2 - 220.0 * a - 6300.0 * b) / 1403.0; - - final rCBase = math.max(0, (27.13 * rA.abs()) / (400.0 - rA.abs())); - final rC = - MathUtils.signum(rA) * - (100.0 / viewingConditions.fl) * - math.pow(rCBase, 1.0 / 0.42); - final gCBase = math.max(0, (27.13 * gA.abs()) / (400.0 - gA.abs())); - final gC = - MathUtils.signum(gA) * - (100.0 / viewingConditions.fl) * - math.pow(gCBase, 1.0 / 0.42); - final bCBase = math.max(0, (27.13 * bA.abs()) / (400.0 - bA.abs())); - final bC = - MathUtils.signum(bA) * - (100.0 / viewingConditions.fl) * - math.pow(bCBase, 1.0 / 0.42); - final rF = rC / viewingConditions.rgbD[0]; - final gF = gC / viewingConditions.rgbD[1]; - final bF = bC / viewingConditions.rgbD[2]; - - final x = 1.86206786 * rF - 1.01125463 * gF + 0.14918677 * bF; - final y = 0.38752654 * rF + 0.62144744 * gF - 0.00897398 * bF; - final z = -0.01584150 * rF - 0.03412294 * gF + 1.04996444 * bF; - - if (array != null) { - array[0] = x; - array[1] = y; - array[2] = z; - return array; - } else { - return [x, y, z]; - } - } -} diff --git a/dart/lib/hct/hct.dart b/dart/lib/hct/hct.dart deleted file mode 100644 index d31d27fb..00000000 --- a/dart/lib/hct/hct.dart +++ /dev/null @@ -1,161 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import '../utils/color_utils.dart'; -import 'cam16.dart'; -import 'src/hct_solver.dart'; -import 'viewing_conditions.dart'; - -/// HCT, hue, chroma, and tone. A color system that provides a perceptually -/// accurate color measurement system that can also accurately render what -/// colors will appear as in different lighting environments. -class Hct { - late double _hue; - late double _chroma; - late double _tone; - late int _argb; - - /// 0 <= [hue] < 360; invalid values are corrected. - /// 0 <= [chroma] <= ?; Informally, colorfulness. The color returned may be - /// lower than the requested chroma. Chroma has a different maximum for any - /// given hue and tone. - /// 0 <= [tone] <= 100; informally, lightness. Invalid values are corrected. - static Hct from(double hue, double chroma, double tone) { - final argb = HctSolver.solveToInt(hue, chroma, tone); - return Hct._(argb); - } - - @override - bool operator ==(Object other) { - if (other is! Hct) { - return false; - } - return other._argb == _argb; - } - - @override - int get hashCode => _argb.hashCode; - - @override - String toString() { - return 'H${hue.round().toString()} C${chroma.round()} T${tone.round().toString()}'; - } - - /// HCT representation of [argb]. - static Hct fromInt(int argb) { - return Hct._(argb); - } - - int toInt() { - return _argb; - } - - /// A number, in degrees, representing ex. red, orange, yellow, etc. - /// Ranges from 0 <= [hue] < 360 - double get hue { - return _hue; - } - - /// 0 <= [newHue] < 360; invalid values are corrected. - /// After setting hue, the color is mapped from HCT to the more - /// limited sRGB gamut for display. This will change its ARGB/integer - /// representation. If the HCT color is outside of the sRGB gamut, chroma - /// will decrease until it is inside the gamut. - set hue(double newHue) { - _argb = HctSolver.solveToInt(newHue, chroma, tone); - final cam16 = Cam16.fromInt(_argb); - _hue = cam16.hue; - _chroma = cam16.chroma; - _tone = ColorUtils.lstarFromArgb(_argb); - } - - double get chroma { - return _chroma; - } - - /// 0 <= [newChroma] <= ? - /// After setting chroma, the color is mapped from HCT to the more - /// limited sRGB gamut for display. This will change its ARGB/integer - /// representation. If the HCT color is outside of the sRGB gamut, chroma - /// will decrease until it is inside the gamut. - set chroma(double newChroma) { - _argb = HctSolver.solveToInt(hue, newChroma, tone); - final cam16 = Cam16.fromInt(_argb); - _hue = cam16.hue; - _chroma = cam16.chroma; - _tone = ColorUtils.lstarFromArgb(_argb); - } - - /// Lightness. Ranges from 0 to 100. - double get tone { - return _tone; - } - - /// 0 <= [newTone] <= 100; invalid values are corrected. - /// After setting tone, the color is mapped from HCT to the more - /// limited sRGB gamut for display. This will change its ARGB/integer - /// representation. If the HCT color is outside of the sRGB gamut, chroma - /// will decrease until it is inside the gamut. - set tone(double newTone) { - _argb = HctSolver.solveToInt(hue, chroma, newTone); - final cam16 = Cam16.fromInt(_argb); - _hue = cam16.hue; - _chroma = cam16.chroma; - _tone = ColorUtils.lstarFromArgb(_argb); - } - - Hct._(int argb) { - _argb = argb; - final cam16 = Cam16.fromInt(argb); - _hue = cam16.hue; - _chroma = cam16.chroma; - _tone = ColorUtils.lstarFromArgb(_argb); - } - - /// Translate a color into different [ViewingConditions]. - /// - /// Colors change appearance. They look different with lights on versus off, - /// the same color, as in hex code, on white looks different when on black. - /// This is called color relativity, most famously explicated by Josef Albers - /// in Interaction of Color. - /// - /// In color science, color appearance models can account for this and - /// calculate the appearance of a color in different settings. HCT is based on - /// CAM16, a color appearance model, and uses it to make these calculations. - /// - /// See [ViewingConditions.make] for parameters affecting color appearance. - Hct inViewingConditions(ViewingConditions vc) { - // 1. Use CAM16 to find XYZ coordinates of color in specified VC. - final cam16 = Cam16.fromInt(toInt()); - final viewedInVc = cam16.xyzInViewingConditions(vc); - - // 2. Create CAM16 of those XYZ coordinates in default VC. - final recastInVc = Cam16.fromXyzInViewingConditions( - viewedInVc[0], - viewedInVc[1], - viewedInVc[2], - ViewingConditions.make(), - ); - - // 3. Create HCT from: - // - CAM16 using default VC with XYZ coordinates in specified VC. - // - L* converted from Y in XYZ coordinates in specified VC. - final recastHct = Hct.from( - recastInVc.hue, - recastInVc.chroma, - ColorUtils.lstarFromY(viewedInVc[1]), - ); - return recastHct; - } -} diff --git a/dart/lib/hct/src/hct_solver.dart b/dart/lib/hct/src/hct_solver.dart deleted file mode 100644 index 44761978..00000000 --- a/dart/lib/hct/src/hct_solver.dart +++ /dev/null @@ -1,655 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This file is automatically generated. Do not modify it. - -import 'dart:math'; - -import '../../utils/color_utils.dart'; -import '../../utils/math_utils.dart'; -import '../cam16.dart'; -import '../viewing_conditions.dart'; - -/// A class that solves the HCT equation. -class HctSolver { - static const _scaledDiscountFromLinrgb = [ - [0.001200833568784504, 0.002389694492170889, 0.0002795742885861124], - [0.0005891086651375999, 0.0029785502573438758, 0.0003270666104008398], - [0.00010146692491640572, 0.0005364214359186694, 0.0032979401770712076], - ]; - - static const _linrgbFromScaledDiscount = [ - [1373.2198709594231, -1100.4251190754821, -7.278681089101213], - [-271.815969077903, 559.6580465940733, -32.46047482791194], - [1.9622899599665666, -57.173814538844006, 308.7233197812385], - ]; - - static const _yFromLinrgb = [0.2126, 0.7152, 0.0722]; - - static const _criticalPlanes = [ - 0.015176349177441876, - 0.045529047532325624, - 0.07588174588720938, - 0.10623444424209313, - 0.13658714259697685, - 0.16693984095186062, - 0.19729253930674434, - 0.2276452376616281, - 0.2579979360165119, - 0.28835063437139563, - 0.3188300904430532, - 0.350925934958123, - 0.3848314933096426, - 0.42057480301049466, - 0.458183274052838, - 0.4976837250274023, - 0.5391024159806381, - 0.5824650784040898, - 0.6277969426914107, - 0.6751227633498623, - 0.7244668422128921, - 0.775853049866786, - 0.829304845476233, - 0.8848452951698498, - 0.942497089126609, - 1.0022825574869039, - 1.0642236851973577, - 1.1283421258858297, - 1.1946592148522128, - 1.2631959812511864, - 1.3339731595349034, - 1.407011200216447, - 1.4823302800086415, - 1.5599503113873272, - 1.6398909516233677, - 1.7221716113234105, - 1.8068114625156377, - 1.8938294463134073, - 1.9832442801866852, - 2.075074464868551, - 2.1693382909216234, - 2.2660538449872063, - 2.36523901573795, - 2.4669114995532007, - 2.5710888059345764, - 2.6777882626779785, - 2.7870270208169257, - 2.898822059350997, - 3.0131901897720907, - 3.1301480604002863, - 3.2497121605402226, - 3.3718988244681087, - 3.4967242352587946, - 3.624204428461639, - 3.754355295633311, - 3.887192587735158, - 4.022731918402185, - 4.160988767090289, - 4.301978482107941, - 4.445716283538092, - 4.592217266055746, - 4.741496401646282, - 4.893568542229298, - 5.048448422192488, - 5.20615066083972, - 5.3666897647573375, - 5.5300801301023865, - 5.696336044816294, - 5.865471690767354, - 6.037501145825082, - 6.212438385869475, - 6.390297286737924, - 6.571091626112461, - 6.7548350853498045, - 6.941541251256611, - 7.131223617812143, - 7.323895587840543, - 7.5195704746346665, - 7.7182615035334345, - 7.919981813454504, - 8.124744458384042, - 8.332562408825165, - 8.543448553206703, - 8.757415699253682, - 8.974476575321063, - 9.194643831691977, - 9.417930041841839, - 9.644347703669503, - 9.873909240696694, - 10.106627003236781, - 10.342513269534024, - 10.58158024687427, - 10.8238400726681, - 11.069304815507364, - 11.317986476196008, - 11.569896988756009, - 11.825048221409341, - 12.083451977536606, - 12.345119996613247, - 12.610063955123938, - 12.878295467455942, - 13.149826086772048, - 13.42466730586372, - 13.702830557985108, - 13.984327217668513, - 14.269168601521828, - 14.55736596900856, - 14.848930523210871, - 15.143873411576273, - 15.44220572664832, - 15.743938506781891, - 16.04908273684337, - 16.35764934889634, - 16.66964922287304, - 16.985093187232053, - 17.30399201960269, - 17.62635644741625, - 17.95219714852476, - 18.281524751807332, - 18.614349837764564, - 18.95068293910138, - 19.290534541298456, - 19.633915083172692, - 19.98083495742689, - 20.331304511189067, - 20.685334046541502, - 21.042933821039977, - 21.404114048223256, - 21.76888489811322, - 22.137256497705877, - 22.50923893145328, - 22.884842241736916, - 23.264076429332462, - 23.6469514538663, - 24.033477234264016, - 24.42366364919083, - 24.817520537484558, - 25.21505769858089, - 25.61628489293138, - 26.021211842414342, - 26.429848230738664, - 26.842203703840827, - 27.258287870275353, - 27.678110301598522, - 28.10168053274597, - 28.529008062403893, - 28.96010235337422, - 29.39497283293396, - 29.83362889318845, - 30.276079891419332, - 30.722335150426627, - 31.172403958865512, - 31.62629557157785, - 32.08401920991837, - 32.54558406207592, - 33.010999283389665, - 33.4802739966603, - 33.953417292456834, - 34.430438229418264, - 34.911345834551085, - 35.39614910352207, - 35.88485700094671, - 36.37747846067349, - 36.87402238606382, - 37.37449765026789, - 37.87891309649659, - 38.38727753828926, - 38.89959975977785, - 39.41588851594697, - 39.93615253289054, - 40.460400508064545, - 40.98864111053629, - 41.520882981230194, - 42.05713473317016, - 42.597404951718396, - 43.141702194811224, - 43.6900349931913, - 44.24241185063697, - 44.798841244188324, - 45.35933162437017, - 45.92389141541209, - 46.49252901546552, - 47.065252796817916, - 47.64207110610409, - 48.22299226451468, - 48.808024568002054, - 49.3971762874833, - 49.9904556690408, - 50.587870934119984, - 51.189430279724725, - 51.79514187861014, - 52.40501387947288, - 53.0190544071392, - 53.637271562750364, - 54.259673423945976, - 54.88626804504493, - 55.517063457223934, - 56.15206766869424, - 56.79128866487574, - 57.43473440856916, - 58.08241284012621, - 58.734331877617365, - 59.39049941699807, - 60.05092333227251, - 60.715611475655585, - 61.38457167773311, - 62.057811747619894, - 62.7353394731159, - 63.417162620860914, - 64.10328893648692, - 64.79372614476921, - 65.48848194977529, - 66.18756403501224, - 66.89098006357258, - 67.59873767827808, - 68.31084450182222, - 69.02730813691093, - 69.74813616640164, - 70.47333615344107, - 71.20291564160104, - 71.93688215501312, - 72.67524319850172, - 73.41800625771542, - 74.16517879925733, - 74.9167682708136, - 75.67278210128072, - 76.43322770089146, - 77.1981124613393, - 77.96744375590167, - 78.74122893956174, - 79.51947534912904, - 80.30219030335869, - 81.08938110306934, - 81.88105503125999, - 82.67721935322541, - 83.4778813166706, - 84.28304815182372, - 85.09272707154808, - 85.90692527145302, - 86.72564993000343, - 87.54890820862819, - 88.3767072518277, - 89.2090541872801, - 90.04595612594655, - 90.88742016217518, - 91.73345337380438, - 92.58406282226491, - 93.43925555268066, - 94.29903859396902, - 95.16341895893969, - 96.03240364439274, - 96.9059996312159, - 97.78421388448044, - 98.6670533535366, - 99.55452497210776, - ]; - - /// Sanitizes a small enough angle in radians. - /// - /// [angle] An angle in radians; must not deviate too much from 0. - /// Returns A coterminal angle between 0 and 2pi. - static double _sanitizeRadians(double angle) { - return (angle + pi * 8) % (pi * 2); - } - - /// Delinearizes an RGB component, returning a floating-point - /// number. - /// - /// 0.0 <= [rgbComponent] <= 100.0 represents linear R/G/B channel. - /// 0.0 <= output <= 255.0, color channel converted to regular RGB - /// space. - static double _trueDelinearized(double rgbComponent) { - final normalized = rgbComponent / 100.0; - var delinearized = 0.0; - if (normalized <= 0.0031308) { - delinearized = normalized * 12.92; - } else { - delinearized = 1.055 * pow(normalized, 1.0 / 2.4).toDouble() - 0.055; - } - return delinearized * 255.0; - } - - static double _chromaticAdaptation(double component) { - final af = pow(component.abs(), 0.42).toDouble(); - return MathUtils.signum(component) * 400.0 * af / (af + 27.13); - } - - /// Returns the hue of [linrgb], a linear RGB color, in CAM16, in - /// radians. - static double _hueOf(List linrgb) { - final scaledDiscount = MathUtils.matrixMultiply( - linrgb, - _scaledDiscountFromLinrgb, - ); - final rA = _chromaticAdaptation(scaledDiscount[0]); - final gA = _chromaticAdaptation(scaledDiscount[1]); - final bA = _chromaticAdaptation(scaledDiscount[2]); - // redness-greenness - final a = (11.0 * rA + -12.0 * gA + bA) / 11.0; - // yellowness-blueness - final b = (rA + gA - 2.0 * bA) / 9.0; - return atan2(b, a); - } - - static bool _areInCyclicOrder(double a, double b, double c) { - final deltaAB = _sanitizeRadians(b - a); - final deltaAC = _sanitizeRadians(c - a); - return deltaAB < deltaAC; - } - - /// Solves the lerp equation. - /// - /// Returns a number t such that lerp([source], [target], t) = - /// [mid]. - static double _intercept(double source, double mid, double target) { - return (mid - source) / (target - source); - } - - static List _lerpPoint( - List source, - double t, - List target, - ) { - return [ - source[0] + (target[0] - source[0]) * t, - source[1] + (target[1] - source[1]) * t, - source[2] + (target[2] - source[2]) * t, - ]; - } - - /// Intersects a segment with a plane. - /// - /// Returns the intersection point of: - /// - the segment with [source] and [target] as its endpoints, and - /// - the plane - /// ... R = [coordinate] if [axis] == 0 - /// ... G = [coordinate] if [axis] == 1 - /// ... B = [coordinate] if [axis] == 2 - static List _setCoordinate( - List source, - double coordinate, - List target, - int axis, - ) { - final t = _intercept(source[axis], coordinate, target[axis]); - return _lerpPoint(source, t, target); - } - - static bool _isBounded(double x) { - return 0.0 <= x && x <= 100.0; - } - - /// Returns the nth possible vertex of the polygonal intersection. - /// - /// Given a plane Y = [y] and an zero-based index [n] such that 0 - /// <= [n] <= 11, returns the nth possible vertex of the polygonal - /// intersection of the plane and the RGB cube, in linear RGB - /// coordinates, if it exists. - /// If this possible vertex lies outside of the cube, [-1.0, -1.0, - /// -1.0] is returned. - static List _nthVertex(double y, int n) { - final kR = _yFromLinrgb[0]; - final kG = _yFromLinrgb[1]; - final kB = _yFromLinrgb[2]; - final coordA = n % 4 <= 1 ? 0.0 : 100.0; - final coordB = n.isEven ? 0.0 : 100.0; - if (n < 4) { - final g = coordA; - final b = coordB; - final r = (y - g * kG - b * kB) / kR; - if (_isBounded(r)) { - return [r, g, b]; - } else { - return [-1.0, -1.0, -1.0]; - } - } else if (n < 8) { - final b = coordA; - final r = coordB; - final g = (y - r * kR - b * kB) / kG; - if (_isBounded(g)) { - return [r, g, b]; - } else { - return [-1.0, -1.0, -1.0]; - } - } else { - final r = coordA; - final g = coordB; - final b = (y - r * kR - g * kG) / kB; - if (_isBounded(b)) { - return [r, g, b]; - } else { - return [-1.0, -1.0, -1.0]; - } - } - } - - /// Finds the segment containing the desired color. - /// - /// Given a plane Y = [y] and a desired [targetHue], returns the - /// segment containing the desired color, represented as an array of - /// its two endpoints. - static List> _bisectToSegment(double y, double targetHue) { - var left = [-1.0, -1.0, -1.0]; - var right = left; - var leftHue = 0.0; - var rightHue = 0.0; - var initialized = false; - var uncut = true; - for (var n = 0; n < 12; n++) { - final mid = _nthVertex(y, n); - if (mid[0] < 0) { - continue; - } - final midHue = _hueOf(mid); - if (!initialized) { - left = mid; - right = mid; - leftHue = midHue; - rightHue = midHue; - initialized = true; - continue; - } - if (uncut || _areInCyclicOrder(leftHue, midHue, rightHue)) { - uncut = false; - if (_areInCyclicOrder(leftHue, targetHue, midHue)) { - right = mid; - rightHue = midHue; - } else { - left = mid; - leftHue = midHue; - } - } - } - return [left, right]; - } - - static List _midpoint(List a, List b) { - return [(a[0] + b[0]) / 2, (a[1] + b[1]) / 2, (a[2] + b[2]) / 2]; - } - - static int _criticalPlaneBelow(double x) { - return (x - 0.5).floor(); - } - - static int _criticalPlaneAbove(double x) { - return (x - 0.5).ceil(); - } - - /// Finds a color with the given Y and hue on the boundary of the - /// cube. - /// - /// Returns the color with the desired Y value [y] and hue - /// [targetHue], in linear RGB coordinates. - static List _bisectToLimit(double y, double targetHue) { - final segment = _bisectToSegment(y, targetHue); - var left = segment[0]; - var leftHue = _hueOf(left); - var right = segment[1]; - for (var axis = 0; axis < 3; axis++) { - if (left[axis] != right[axis]) { - var lPlane = -1; - var rPlane = 255; - if (left[axis] < right[axis]) { - lPlane = _criticalPlaneBelow(_trueDelinearized(left[axis])); - rPlane = _criticalPlaneAbove(_trueDelinearized(right[axis])); - } else { - lPlane = _criticalPlaneAbove(_trueDelinearized(left[axis])); - rPlane = _criticalPlaneBelow(_trueDelinearized(right[axis])); - } - for (var i = 0; i < 8; i++) { - if ((rPlane - lPlane).abs() <= 1) { - break; - } else { - final mPlane = ((lPlane + rPlane) / 2.0).floor(); - final midPlaneCoordinate = _criticalPlanes[mPlane]; - final mid = _setCoordinate(left, midPlaneCoordinate, right, axis); - final midHue = _hueOf(mid); - if (_areInCyclicOrder(leftHue, targetHue, midHue)) { - right = mid; - rPlane = mPlane; - } else { - left = mid; - leftHue = midHue; - lPlane = mPlane; - } - } - } - } - } - return _midpoint(left, right); - } - - static double _inverseChromaticAdaptation(double adapted) { - final adaptedAbs = adapted.abs(); - final base = max(0, 27.13 * adaptedAbs / (400.0 - adaptedAbs)); - return MathUtils.signum(adapted) * pow(base, 1.0 / 0.42).toDouble(); - } - - /// Finds a color with the given hue, chroma, and Y. - /// - /// Returns a color with the desired [hueRadians], [chroma], and - /// [y] as a hexadecimal integer, if found; and returns 0 otherwise. - static int _findResultByJ(double hueRadians, double chroma, double y) { - // Initial estimate of j. - var j = sqrt(y) * 11.0; - // =========================================================== - // Operations inlined from Cam16 to avoid repeated calculation - // =========================================================== - final viewingConditions = ViewingConditions.standard; - final tInnerCoeff = - 1 / - pow( - 1.64 - - pow(0.29, viewingConditions.backgroundYTowhitePointY).toDouble(), - 0.73, - ).toDouble(); - final eHue = 0.25 * (cos(hueRadians + 2.0) + 3.8); - final p1 = - eHue * (50000.0 / 13.0) * viewingConditions.nC * viewingConditions.ncb; - final hSin = sin(hueRadians); - final hCos = cos(hueRadians); - for (var iterationRound = 0; iterationRound < 5; iterationRound++) { - // =========================================================== - // Operations inlined from Cam16 to avoid repeated calculation - // =========================================================== - final jNormalized = j / 100.0; - final alpha = - chroma == 0.0 || j == 0.0 ? 0.0 : chroma / sqrt(jNormalized); - final t = pow(alpha * tInnerCoeff, 1.0 / 0.9).toDouble(); - final ac = - viewingConditions.aw * - pow( - jNormalized, - 1.0 / viewingConditions.c / viewingConditions.z, - ).toDouble(); - final p2 = ac / viewingConditions.nbb; - final gamma = - 23.0 * - (p2 + 0.305) * - t / - (23.0 * p1 + 11 * t * hCos + 108.0 * t * hSin); - final a = gamma * hCos; - final b = gamma * hSin; - final rA = (460.0 * p2 + 451.0 * a + 288.0 * b) / 1403.0; - final gA = (460.0 * p2 - 891.0 * a - 261.0 * b) / 1403.0; - final bA = (460.0 * p2 - 220.0 * a - 6300.0 * b) / 1403.0; - final rCScaled = _inverseChromaticAdaptation(rA); - final gCScaled = _inverseChromaticAdaptation(gA); - final bCScaled = _inverseChromaticAdaptation(bA); - final linrgb = MathUtils.matrixMultiply([ - rCScaled, - gCScaled, - bCScaled, - ], _linrgbFromScaledDiscount); - // =========================================================== - // Operations inlined from Cam16 to avoid repeated calculation - // =========================================================== - if (linrgb[0] < 0 || linrgb[1] < 0 || linrgb[2] < 0) { - return 0; - } - final kR = _yFromLinrgb[0]; - final kG = _yFromLinrgb[1]; - final kB = _yFromLinrgb[2]; - final fnj = kR * linrgb[0] + kG * linrgb[1] + kB * linrgb[2]; - if (fnj <= 0) { - return 0; - } - if (iterationRound == 4 || (fnj - y).abs() < 0.002) { - if (linrgb[0] > 100.01 || linrgb[1] > 100.01 || linrgb[2] > 100.01) { - return 0; - } - return ColorUtils.argbFromLinrgb(linrgb); - } - // Iterates with Newton method, - // Using 2 * fn(j) / j as the approximation of fn'(j) - j = j - (fnj - y) * j / (2 * fnj); - } - return 0; - } - - /// Finds an sRGB color with the given hue, chroma, and L*, if - /// possible. - /// - /// Returns a hexadecimal representing a sRGB color with its hue, - /// chroma, and L* sufficiently close to [hueDegrees], [chroma], and - /// [lstar], respectively. If it is impossible to satisfy all three - /// constraints, the hue and L* will be sufficiently close, and the - /// chroma will be maximized. - static int solveToInt(double hueDegrees, double chroma, double lstar) { - if (chroma < 0.0001 || lstar < 0.0001 || lstar > 99.9999) { - return ColorUtils.argbFromLstar(lstar); - } - hueDegrees = MathUtils.sanitizeDegreesDouble(hueDegrees); - final hueRadians = hueDegrees / 180 * pi; - final y = ColorUtils.yFromLstar(lstar); - final exactAnswer = _findResultByJ(hueRadians, chroma, y); - if (exactAnswer != 0) { - return exactAnswer; - } - final linrgb = _bisectToLimit(y, hueRadians); - return ColorUtils.argbFromLinrgb(linrgb); - } - - /// Finds a CAM16 object with the given hue, chroma, and L*, if - /// possible. - /// - /// Returns a CAM16 object representing a sRGB color with its hue, - /// chroma, and L* sufficiently close to [hueDegrees], [chroma], and - /// [lstar], respectively. If it is impossible to satisfy all three - /// constraints, the hue and L* will be sufficiently close, and the - /// chroma will be maximized. - static Cam16 solveToCam(double hueDegrees, double chroma, double lstar) { - return Cam16.fromInt(solveToInt(hueDegrees, chroma, lstar)); - } -} diff --git a/dart/lib/hct/viewing_conditions.dart b/dart/lib/hct/viewing_conditions.dart deleted file mode 100644 index 51f2bb5e..00000000 --- a/dart/lib/hct/viewing_conditions.dart +++ /dev/null @@ -1,199 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'dart:math' as math; - -import '../utils/color_utils.dart'; -import '../utils/math_utils.dart'; - -/// In traditional color spaces, a color can be identified solely by the -/// observer's measurement of the color. Color appearance models such as CAM16 -/// also use information about the environment where the color was -/// observed, known as the viewing conditions. -/// -/// For example, white under the traditional assumption of a midday sun white -/// point is accurately measured as a slightly chromatic blue by CAM16. -/// (roughly, hue 203, chroma 3, lightness 100) -/// -/// This class caches intermediate values of the CAM16 conversion process that -/// depend only on viewing conditions, enabling speed ups. -class ViewingConditions { - static final standard = sRgb; - static final sRgb = ViewingConditions.make(); - - final List whitePoint; - final double adaptingLuminance; - final double backgroundLstar; - final double surround; - final bool discountingIlluminant; - - final double backgroundYTowhitePointY; - final double aw; - final double nbb; - final double ncb; - final double c; - final double nC; - final List drgbInverse; - final List rgbD; - final double fl; - final double fLRoot; - final double z; - - const ViewingConditions({ - required this.whitePoint, - required this.adaptingLuminance, - required this.backgroundLstar, - required this.surround, - required this.discountingIlluminant, - required this.backgroundYTowhitePointY, - required this.aw, - required this.nbb, - required this.ncb, - required this.c, - required this.nC, - required this.drgbInverse, - required this.rgbD, - required this.fl, - required this.fLRoot, - required this.z, - }); - - /// Convenience constructor for [ViewingConditions]. - /// - /// Parameters affecting color appearance include: - /// [whitePoint]: coordinates of white in XYZ color space. - /// [adaptingLuminance]: light strength, in lux. - /// [backgroundLstar]: average luminance of 10 degrees around color. - /// [surround]: brightness of the entire environment. - /// [discountingIlluminant]: whether eyes have adjusted to lighting. - factory ViewingConditions.make({ - List? whitePoint, - double adaptingLuminance = -1.0, - double backgroundLstar = 50.0, - double surround = 2.0, - bool discountingIlluminant = false, - }) { - whitePoint ??= ColorUtils.whitePointD65(); - - adaptingLuminance = - (adaptingLuminance > 0.0) - ? adaptingLuminance - : (200.0 / math.pi * ColorUtils.yFromLstar(50.0) / 100.0); - // A background of pure black is non-physical and leads to infinities that - // represent the idea that any color viewed in pure black can't be seen. - backgroundLstar = math.max(0.1, backgroundLstar); - // Transform test illuminant white in XYZ to 'cone'/'rgb' responses - final xyz = whitePoint; - final rW = xyz[0] * 0.401288 + xyz[1] * 0.650173 + xyz[2] * -0.051461; - final gW = xyz[0] * -0.250268 + xyz[1] * 1.204414 + xyz[2] * 0.045854; - final bW = xyz[0] * -0.002079 + xyz[1] * 0.048952 + xyz[2] * 0.953127; - - // Scale input surround, domain (0, 2), to CAM16 surround, domain (0.8, 1.0) - assert(surround >= 0.0 && surround <= 2.0); - final f = 0.8 + (surround / 10.0); - // "Exponential non-linearity" - final c = - (f >= 0.9) - ? MathUtils.lerp(0.59, 0.69, (f - 0.9) * 10.0) - : MathUtils.lerp(0.525, 0.59, (f - 0.8) * 10.0); - // Calculate degree of adaptation to illuminant - var d = - discountingIlluminant - ? 1.0 - : f * - (1.0 - - ((1.0 / 3.6) * - math.exp((-adaptingLuminance - 42.0) / 92.0))); - // Per Li et al, if D is greater than 1 or less than 0, set it to 1 or 0. - d = - (d > 1.0) - ? 1.0 - : (d < 0.0) - ? 0.0 - : d; - // chromatic induction factor - final nc = f; - - // Cone responses to the whitePoint, r/g/b/W, adjusted for discounting. - // - // Why use 100.0 instead of the white point's relative luminance? - // - // Some papers and implementations, for both CAM02 and CAM16, use the Y - // value of the reference white instead of 100. Fairchild's Color Appearance - // Models (3rd edition) notes that this is in error: it was included in the - // CIE 2004a report on CIECAM02, but, later parts of the conversion process - // account for scaling of appearance relative to the white point relative - // luminance. This part should simply use 100 as luminance. - final rgbD = [ - d * (100.0 / rW) + 1.0 - d, - d * (100.0 / gW) + 1.0 - d, - d * (100.0 / bW) + 1.0 - d, - ]; - - // Factor used in calculating meaningful factors - final k = 1.0 / (5.0 * adaptingLuminance + 1.0); - final k4 = k * k * k * k; - final k4F = 1.0 - k4; - - // Luminance-level adaptation factor - final fl = - (k4 * adaptingLuminance) + - (0.1 * k4F * k4F * math.pow(5.0 * adaptingLuminance, 1.0 / 3.0)); - // Intermediate factor, ratio of background relative luminance to white relative luminance - final n = ColorUtils.yFromLstar(backgroundLstar) / whitePoint[1]; - - // Base exponential nonlinearity - // note Schlomer 2018 has a typo and uses 1.58, the correct factor is 1.48 - final z = 1.48 + math.sqrt(n); - - // Luminance-level induction factors - final nbb = 0.725 / math.pow(n, 0.2); - final ncb = nbb; - - // Discounted cone responses to the white point, adjusted for post-saturationtic - // adaptation perceptual nonlinearities. - final rgbAFactors = [ - math.pow(fl * rgbD[0] * rW / 100.0, 0.42), - math.pow(fl * rgbD[1] * gW / 100.0, 0.42), - math.pow(fl * rgbD[2] * bW / 100.0, 0.42), - ]; - - final rgbA = [ - (400.0 * rgbAFactors[0]) / (rgbAFactors[0] + 27.13), - (400.0 * rgbAFactors[1]) / (rgbAFactors[1] + 27.13), - (400.0 * rgbAFactors[2]) / (rgbAFactors[2] + 27.13), - ]; - - final aw = (40.0 * rgbA[0] + 20.0 * rgbA[1] + rgbA[2]) / 20.0 * nbb; - - return ViewingConditions( - whitePoint: whitePoint, - adaptingLuminance: adaptingLuminance, - backgroundLstar: backgroundLstar, - surround: surround, - discountingIlluminant: discountingIlluminant, - backgroundYTowhitePointY: n, - aw: aw, - nbb: nbb, - ncb: ncb, - c: c, - nC: nc, - drgbInverse: [0.0, 0.0, 0.0], - rgbD: rgbD, - fl: fl, - fLRoot: math.pow(fl, 0.25).toDouble(), - z: z, - ); - } -} diff --git a/dart/lib/material_color_utilities.dart b/dart/lib/material_color_utilities.dart deleted file mode 100644 index f7d4c251..00000000 --- a/dart/lib/material_color_utilities.dart +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - - -export 'blend/blend.dart'; -export 'contrast/contrast.dart'; -export 'dislike/dislike_analyzer.dart'; -export 'dynamiccolor/dynamic_color.dart'; -export 'dynamiccolor/dynamic_scheme.dart'; -export 'dynamiccolor/material_dynamic_colors.dart'; -export 'dynamiccolor/variant.dart'; -export 'hct/cam16.dart'; -export 'hct/hct.dart'; -export 'hct/viewing_conditions.dart'; -export 'palettes/core_palette.dart'; -export 'palettes/tonal_palette.dart'; -export 'quantize/quantizer.dart'; -export 'quantize/quantizer_celebi.dart'; -export 'quantize/quantizer_map.dart'; -export 'quantize/quantizer_wsmeans.dart'; -export 'quantize/quantizer_wu.dart'; -export 'scheme/scheme.dart'; -export 'scheme/scheme_content.dart'; -export 'scheme/scheme_expressive.dart'; -export 'scheme/scheme_fidelity.dart'; -export 'scheme/scheme_fruit_salad.dart'; -export 'scheme/scheme_monochrome.dart'; -export 'scheme/scheme_neutral.dart'; -export 'scheme/scheme_rainbow.dart'; -export 'scheme/scheme_tonal_spot.dart'; -export 'scheme/scheme_vibrant.dart'; -export 'score/score.dart'; -export 'temperature/temperature_cache.dart'; -export 'utils/color_utils.dart'; -export 'utils/math_utils.dart'; -export 'utils/string_utils.dart'; diff --git a/dart/lib/palettes/core_palette.dart b/dart/lib/palettes/core_palette.dart deleted file mode 100644 index 0a783d6f..00000000 --- a/dart/lib/palettes/core_palette.dart +++ /dev/null @@ -1,158 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'dart:math' as math; - -import '../hct/cam16.dart'; -import 'tonal_palette.dart'; - -/// An intermediate concept between the key color for a UI theme, and a full -/// color scheme. 5 tonal palettes are generated, all except one use the same -/// hue as the key color, and all vary in chroma. -@Deprecated( - 'Use [DynamicScheme] for color scheme generation.' - 'Use [CorePalettes] for core palettes container class.', -) -class CorePalette { - /// The number of generated tonal palettes. - static const size = 5; - - final TonalPalette primary; - final TonalPalette secondary; - final TonalPalette tertiary; - final TonalPalette neutral; - final TonalPalette neutralVariant; - final TonalPalette error = TonalPalette.of(25, 84); - - /// Create a [CorePalette] from a source ARGB color. - @Deprecated( - 'Use [DynamicScheme] for color scheme generation.' - 'Use [CorePalettes] for core palettes container class.', - ) - static CorePalette of(int argb) { - final cam = Cam16.fromInt(argb); - return CorePalette._(cam.hue, cam.chroma); - } - - @Deprecated( - 'Use [DynamicScheme] for color scheme generation.' - 'Use [CorePalettes] for core palettes container class.', - ) - CorePalette._(double hue, double chroma) - : primary = TonalPalette.of(hue, math.max(48, chroma)), - secondary = TonalPalette.of(hue, 16), - tertiary = TonalPalette.of(hue + 60, 24), - neutral = TonalPalette.of(hue, 4), - neutralVariant = TonalPalette.of(hue, 8); - - /// Create a content [CorePalette] from a source ARGB color. - static CorePalette contentOf(int argb) { - final cam = Cam16.fromInt(argb); - return CorePalette._contentOf(cam.hue, cam.chroma); - } - - @Deprecated( - 'Use [DynamicScheme] for color scheme generation.' - 'Use [CorePalettes] for core palettes container class.', - ) - CorePalette._contentOf(double hue, double chroma) - : primary = TonalPalette.of(hue, chroma), - secondary = TonalPalette.of(hue, chroma / 3), - tertiary = TonalPalette.of(hue + 60, chroma / 2), - neutral = TonalPalette.of(hue, math.min(chroma / 12, 4)), - neutralVariant = TonalPalette.of(hue, math.min(chroma / 6, 8)); - - /// Create a [CorePalette] from a fixed-size list of ARGB color ints - /// representing concatenated tonal palettes. - /// - /// Inverse of [asList]. - @Deprecated( - 'Use [DynamicScheme] for color scheme generation.' - 'Use [CorePalettes] for core palettes container class.', - ) - CorePalette.fromList(List colors) - : assert(colors.length == size * TonalPalette.commonSize), - primary = TonalPalette.fromList( - _getPartition(colors, 0, TonalPalette.commonSize), - ), - secondary = TonalPalette.fromList( - _getPartition(colors, 1, TonalPalette.commonSize), - ), - tertiary = TonalPalette.fromList( - _getPartition(colors, 2, TonalPalette.commonSize), - ), - neutral = TonalPalette.fromList( - _getPartition(colors, 3, TonalPalette.commonSize), - ), - neutralVariant = TonalPalette.fromList( - _getPartition(colors, 4, TonalPalette.commonSize), - ); - - /// Returns a list of ARGB color [int]s from concatenated tonal palettes. - /// - /// Inverse of [CorePalette.fromList]. - @Deprecated( - 'Use [DynamicScheme] for color scheme generation.' - 'Use [CorePalettes] for core palettes container class.', - ) - List asList() => [ - ...primary.asList, - ...secondary.asList, - ...tertiary.asList, - ...neutral.asList, - ...neutralVariant.asList, - ]; - - @override - bool operator ==(Object other) => - other is CorePalette && - primary == other.primary && - secondary == other.secondary && - tertiary == other.tertiary && - neutral == other.neutral && - neutralVariant == other.neutralVariant && - error == other.error; - - @override - int get hashCode => - Object.hash(primary, secondary, tertiary, neutral, neutralVariant, error); - - @override - String toString() { - return 'primary: $primary\n' - 'secondary: $secondary\n' - 'tertiary: $tertiary\n' - 'neutral: $neutral\n' - 'neutralVariant: $neutralVariant\n' - 'error: $error\n'; - } -} - -// Returns a partition from a list. -// -// For example, given a list with 2 partitions of size 3. -// range = [1, 2, 3, 4, 5, 6]; -// -// range.getPartition(0, 3) // [1, 2, 3] -// range.getPartition(1, 3) // [4, 5, 6] -List _getPartition( - List list, - int partitionNumber, - int partitionSize, -) { - return list.sublist( - partitionNumber * partitionSize, - (partitionNumber + 1) * partitionSize, - ); -} diff --git a/dart/lib/palettes/core_palettes.dart b/dart/lib/palettes/core_palettes.dart deleted file mode 100644 index ed92bb59..00000000 --- a/dart/lib/palettes/core_palettes.dart +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2024 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import 'tonal_palette.dart'; - -/// Comprises foundational palettes to build a color scheme. Generated from a -/// source color, these palettes will then be part of a [DynamicScheme] together -/// with appearance preferences. -class CorePalettes { - final TonalPalette primary; - final TonalPalette secondary; - final TonalPalette tertiary; - final TonalPalette neutral; - final TonalPalette neutralVariant; - CorePalettes( - this.primary, - this.secondary, - this.tertiary, - this.neutral, - this.neutralVariant, - ); -} diff --git a/dart/lib/palettes/tonal_palette.dart b/dart/lib/palettes/tonal_palette.dart deleted file mode 100644 index 33bdee5e..00000000 --- a/dart/lib/palettes/tonal_palette.dart +++ /dev/null @@ -1,255 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:collection/collection.dart' show ListEquality; - -import '../hct/hct.dart'; - -/// A convenience class for retrieving colors that are constant in hue and -/// chroma, but vary in tone. -/// -/// This class can be instantiated in two ways: -/// 1. [of] From hue and chroma. (preferred) -/// 2. [fromList] From a fixed-size ([TonalPalette.commonSize]) list of ints -/// representing ARBG colors. Correctness (constant hue and chroma) of the input -/// is not enforced. [get] will only return the input colors, corresponding to -/// [commonTones]. This also initializes the key color to black. -class TonalPalette { - /// Commonly-used tone values. - static const List commonTones = [ - 0, - 10, - 20, - 30, - 40, - 50, - 60, - 70, - 80, - 90, - 95, - 99, - 100, - ]; - - static final commonSize = commonTones.length; - - final double hue; - final double chroma; - final Hct keyColor; - - /// A cache containing keys-value pairs where: - /// - keys are integers that represent tones, and - /// - values are colors in ARGB format. - final Map _cache; - final bool _isFromCache; - - TonalPalette._fromHct(Hct hct) - : _cache = {}, - hue = hct.hue, - chroma = hct.chroma, - keyColor = hct, - _isFromCache = false; - - TonalPalette._fromHueAndChroma(this.hue, this.chroma) - : _cache = {}, - keyColor = KeyColor(hue, chroma).create(), - _isFromCache = false; - - TonalPalette._fromCache(Map cache, this.hue, this.chroma) - : _cache = cache, - keyColor = KeyColor(hue, chroma).create(), - _isFromCache = true; - - /// Create colors using [hue] and [chroma]. - static TonalPalette of(double hue, double chroma) { - return TonalPalette._fromHueAndChroma(hue, chroma); - } - - /// Create a Tonal Palette from hue and chroma of [hct]. - static TonalPalette fromHct(Hct hct) { - return TonalPalette._fromHct(hct); - } - - /// Create colors from a fixed-size list of ARGB color ints. - /// - /// Inverse of [TonalPalette.asList]. - static TonalPalette fromList(List colors) { - assert(colors.length == commonSize); - var cache = {}; - commonTones.asMap().forEach( - (int index, int toneValue) => cache[toneValue] = colors[index], - ); - - // Approximately deduces the original hue and chroma that generated this - // list of colors. - // Uses the hue and chroma of the provided color with the highest chroma. - - var bestHue = 0.0, bestChroma = 0.0; - for (final argb in colors) { - final hct = Hct.fromInt(argb); - - // If the color is too close to white, its chroma may have been - // affected by a known issue, so we ignore it. - // https://github.com/material-foundation/material-color-utilities/issues/140 - - if (hct.tone > 98.0) continue; - - if (hct.chroma > bestChroma) { - bestHue = hct.hue; - bestChroma = hct.chroma; - } - } - - return TonalPalette._fromCache(cache, bestHue, bestChroma); - } - - /// Returns a fixed-size list of ARGB color ints for common tone values. - /// - /// Inverse of [fromList]. - List get asList => commonTones.map(get).toList(); - - /// Returns the ARGB representation of an HCT color at the given [tone]. - /// - /// If the palette is constructed from a list of colors - /// (i.e. using [fromList]), the color provided at construction is returned - /// if possible; otherwise the result is generated from the deduced - /// [hue] and [chroma]. - /// - /// If the palette is constructed from a hue and chroma (i.e. using [of] or - /// [fromHct]), the result is generated from the given [hue] and [chroma]. - int get(int tone) { - return _cache.putIfAbsent( - tone, - () => Hct.from(hue, chroma, tone.toDouble()).toInt(), - ); - } - - /// Returns the HCT color at the given [tone]. - /// - /// If the palette is constructed from a list of colors - /// (i.e. using [fromList]), the color provided at construction is returned - /// if possible; otherwise the result is generated from the deduced - /// [hue] and [chroma]. - /// - /// If the palette is constructed from a hue and chroma (i.e. using [of] or - /// [fromHct]), the result is generated from the given [hue] and [chroma]. - Hct getHct(double tone) { - if (_cache.containsKey(tone)) { - return Hct.fromInt(_cache[tone]!); - } else { - return Hct.from(hue, chroma, tone); - } - } - - @override - bool operator ==(Object other) { - if (other is TonalPalette) { - if (!_isFromCache && !other._isFromCache) { - // Both created with .of or .fromHct - return hue == other.hue && chroma == other.chroma; - } else { - return const ListEquality().equals(asList, other.asList); - } - } - return false; - } - - @override - int get hashCode { - if (!_isFromCache) { - return Object.hash(hue, chroma); - } else { - return Object.hashAll(asList); - } - } - - @override - String toString() { - if (!_isFromCache) { - return 'TonalPalette.of($hue, $chroma)'; - } else { - return 'TonalPalette.fromList($asList)'; - } - } -} - -/// Key color is a color that represents the hue and chroma of a tonal palette. -class KeyColor { - final double hue; - final double requestedChroma; - - /// Cache that maps (hue, tone) to max chroma to avoid duplicated HCT - /// calculation. - final Map _chromaCache = {}; - final double _maxChromaValue = 200.0; - - KeyColor(this.hue, this.requestedChroma); - - /// Creates a key color from a [hue] and a [requestedChroma]. - /// The key color is the first tone, starting from T50, matching the given hue - /// and chroma. - /// - /// @return Key color [Hct] - Hct create() { - // Pivot around T50 because T50 has the most chroma available, on - // average. Thus it is most likely to have a direct answer. - const pivotTone = 50; - const toneStepSize = 1; - // Epsilon to accept values slightly higher than the requested chroma. - const epsilon = 0.01; - - // Binary search to find the tone that can provide a chroma that is closest - // to the requested chroma. - var lowerTone = 0; - var upperTone = 100; - while (lowerTone < upperTone) { - final midTone = (lowerTone + upperTone) ~/ 2; - final isAscending = - _maxChroma(midTone) < _maxChroma(midTone + toneStepSize); - final sufficientChroma = _maxChroma(midTone) >= requestedChroma - epsilon; - - if (sufficientChroma) { - // Either range [lowerTone, midTone] or [midTone, upperTone] has - // the answer, so search in the range that is closer the pivot tone. - if ((lowerTone - pivotTone).abs() < (upperTone - pivotTone).abs()) { - upperTone = midTone; - } else { - if (lowerTone == midTone) { - return Hct.from(hue, requestedChroma, lowerTone.toDouble()); - } - lowerTone = midTone; - } - } else { - // As there is no sufficient chroma in the midTone, follow the direction - // to the chroma peak. - if (isAscending) { - lowerTone = midTone + toneStepSize; - } else { - // Keep midTone for potential chroma peak. - upperTone = midTone; - } - } - } - - return Hct.from(hue, requestedChroma, lowerTone.toDouble()); - } - - // Find the maximum chroma for a given tone - double _maxChroma(int tone) { - return _chromaCache.putIfAbsent(tone, () { - return Hct.from(hue, _maxChromaValue, tone.toDouble()).chroma; - }); - } -} diff --git a/dart/lib/quantize/quantizer.dart b/dart/lib/quantize/quantizer.dart deleted file mode 100644 index 756e4fbf..00000000 --- a/dart/lib/quantize/quantizer.dart +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -abstract class Quantizer { - Future quantize(List pixels, int maxColors); -} - -class QuantizerResult { - final Map colorToCount; - - final Map inputPixelToClusterPixel; - const QuantizerResult(this.colorToCount, - {this.inputPixelToClusterPixel = const {}}); -} diff --git a/dart/lib/quantize/quantizer_celebi.dart b/dart/lib/quantize/quantizer_celebi.dart deleted file mode 100644 index c70f6726..00000000 --- a/dart/lib/quantize/quantizer_celebi.dart +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'quantizer.dart'; -import 'quantizer_wsmeans.dart'; -import 'quantizer_wu.dart'; -import 'src/point_provider_lab.dart'; - -class QuantizerCelebi implements Quantizer { - @override - Future quantize( - Iterable pixels, - int maxColors, { - bool returnInputPixelToClusterPixel = false, - }) async { - final wu = QuantizerWu(); - final wuResult = await wu.quantize(pixels, maxColors); - final wsmeansResult = QuantizerWsmeans.quantize( - pixels, - maxColors, - startingClusters: wuResult.colorToCount.keys.toList(), - pointProvider: const PointProviderLab(), - returnInputPixelToClusterPixel: returnInputPixelToClusterPixel, - ); - return wsmeansResult; - } -} diff --git a/dart/lib/quantize/quantizer_map.dart b/dart/lib/quantize/quantizer_map.dart deleted file mode 100644 index d7bd2e60..00000000 --- a/dart/lib/quantize/quantizer_map.dart +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import '../utils/color_utils.dart'; -import 'quantizer.dart'; - -class QuantizerMap implements Quantizer { - @override - Future quantize(Iterable pixels, int maxColors) async { - final countByColor = {}; - for (final pixel in pixels) { - final alpha = ColorUtils.alphaFromArgb(pixel); - if (alpha < 255) { - continue; - } - countByColor[pixel] = (countByColor[pixel] ?? 0) + 1; - } - return QuantizerResult(countByColor); - } -} diff --git a/dart/lib/quantize/quantizer_wsmeans.dart b/dart/lib/quantize/quantizer_wsmeans.dart deleted file mode 100644 index 2acceed7..00000000 --- a/dart/lib/quantize/quantizer_wsmeans.dart +++ /dev/null @@ -1,272 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'dart:math' as math show Random, min; - -import 'quantizer.dart'; -import 'src/point_provider.dart'; -import 'src/point_provider_lab.dart'; - -class DistanceAndIndex implements Comparable { - double distance; - int index; - - DistanceAndIndex(this.distance, this.index); - - @override - int compareTo(DistanceAndIndex other) { - if (distance < other.distance) { - return -1; - } else if (distance > other.distance) { - return 1; - } else { - return 0; - } - } -} - -class QuantizerWsmeans { - static const debug = false; - - static void debugLog(String log) { - if (debug) { - print(log); - } - } - - static QuantizerResult quantize( - Iterable inputPixels, - int maxColors, { - List startingClusters = const [], - PointProvider pointProvider = const PointProviderLab(), - int maxIterations = 5, - bool returnInputPixelToClusterPixel = false, - }) { - final pixelToCount = {}; - final points = >[]; - final pixels = []; - var pointCount = 0; - for (var inputPixel in inputPixels) { - final pixelCount = pixelToCount.update( - inputPixel, - (value) => value + 1, - ifAbsent: () => 1, - ); - if (pixelCount == 1) { - pointCount++; - points.add(pointProvider.fromInt(inputPixel)); - pixels.add(inputPixel); - } - } - - final counts = List.filled(pointCount, 0); - for (var i = 0; i < pointCount; i++) { - final pixel = pixels[i]; - final count = pixelToCount[pixel]!; - counts[i] = count; - } - - var clusterCount = math.min(maxColors, pointCount); - - final clusters = - startingClusters.map((e) => pointProvider.fromInt(e)).toList(); - final additionalClustersNeeded = clusterCount - clusters.length; - if (additionalClustersNeeded > 0) { - final random = math.Random(0x42688); - final indices = []; - for (var i = 0; i < additionalClustersNeeded; i++) { - // Use existing points rather than generating random centroids. - // - // KMeans is extremely sensitive to initial clusters. This quantizer - // is meant to be used with a Wu quantizer that provides initial - // centroids, but Wu is very slow on unscaled images and when extracting - // more than 256 colors. - // - // Here, we can safely assume that more than 256 colors were requested - // for extraction. Generating random centroids tends to lead to many - // "empty" centroids, as the random centroids are nowhere near any pixels - // in the image, and the centroids from Wu are very refined and close - // to pixels in the image. - // - // Rather than generate random centroids, we'll pick centroids that - // are actual pixels in the image, and avoid duplicating centroids. - - var index = random.nextInt(points.length); - while (indices.contains(index)) { - index = random.nextInt(points.length); - } - indices.add(index); - } - - for (var index in indices) { - clusters.add(points[index]); - } - } - debugLog( - 'have ${clusters.length} starting clusters, ${points.length} points', - ); - final clusterIndices = List.generate( - pointCount, - (index) => index % clusterCount, - ); - final indexMatrix = List>.generate( - clusterCount, - (_) => List.filled(clusterCount, 0), - ); - - final distanceToIndexMatrix = List>.generate( - clusterCount, - (index) => List.generate( - clusterCount, - (index) => DistanceAndIndex(0, index), - ), - ); - - final pixelCountSums = List.filled(clusterCount, 0); - for (var iteration = 0; iteration < maxIterations; iteration++) { - if (debug) { - for (var i = 0; i < clusterCount; i++) { - pixelCountSums[i] = 0; - } - for (var i = 0; i < pointCount; i++) { - final clusterIndex = clusterIndices[i]; - final count = counts[i]; - pixelCountSums[clusterIndex] += count; - } - var emptyClusters = 0; - for (var cluster = 0; cluster < clusterCount; cluster++) { - if (pixelCountSums[cluster] == 0) { - emptyClusters++; - } - } - debugLog( - 'starting iteration ${iteration + 1}; $emptyClusters clusters are empty of $clusterCount', - ); - } - - var pointsMoved = 0; - for (var i = 0; i < clusterCount; i++) { - for (var j = i + 1; j < clusterCount; j++) { - final distance = pointProvider.distance(clusters[i], clusters[j]); - distanceToIndexMatrix[j][i].distance = distance; - distanceToIndexMatrix[j][i].index = i; - distanceToIndexMatrix[i][j].distance = distance; - distanceToIndexMatrix[i][j].index = j; - } - distanceToIndexMatrix[i].sort(); - for (var j = 0; j < clusterCount; j++) { - indexMatrix[i][j] = distanceToIndexMatrix[i][j].index; - } - } - - for (var i = 0; i < pointCount; i++) { - final point = points[i]; - final previousClusterIndex = clusterIndices[i]; - final previousCluster = clusters[previousClusterIndex]; - final previousDistance = pointProvider.distance(point, previousCluster); - var minimumDistance = previousDistance; - var newClusterIndex = -1; - for (var j = 0; j < clusterCount; j++) { - if (distanceToIndexMatrix[previousClusterIndex][j].distance >= - 4 * previousDistance) { - continue; - } - final distance = pointProvider.distance(point, clusters[j]); - if (distance < minimumDistance) { - minimumDistance = distance; - newClusterIndex = j; - } - } - if (newClusterIndex != -1) { - pointsMoved++; - clusterIndices[i] = newClusterIndex; - } - } - - if (pointsMoved == 0 && iteration > 0) { - debugLog('terminated after $iteration k-means iterations'); - break; - } - - debugLog('iteration ${iteration + 1} moved $pointsMoved'); - final componentASums = List.filled(clusterCount, 0); - final componentBSums = List.filled(clusterCount, 0); - final componentCSums = List.filled(clusterCount, 0); - - for (var i = 0; i < clusterCount; i++) { - pixelCountSums[i] = 0; - } - for (var i = 0; i < pointCount; i++) { - final clusterIndex = clusterIndices[i]; - final point = points[i]; - final count = counts[i]; - pixelCountSums[clusterIndex] += count; - componentASums[clusterIndex] += point[0] * count; - componentBSums[clusterIndex] += point[1] * count; - componentCSums[clusterIndex] += point[2] * count; - } - for (var i = 0; i < clusterCount; i++) { - final count = pixelCountSums[i]; - if (count == 0) { - clusters[i] = [0.0, 0.0, 0.0]; - continue; - } - final a = componentASums[i] / count; - final b = componentBSums[i] / count; - final c = componentCSums[i] / count; - clusters[i] = [a, b, c]; - } - } - - final clusterArgbs = []; - final clusterPopulations = []; - for (var i = 0; i < clusterCount; i++) { - final count = pixelCountSums[i]; - if (count == 0) { - continue; - } - - final possibleNewCluster = pointProvider.toInt(clusters[i]); - if (clusterArgbs.contains(possibleNewCluster)) { - continue; - } - - clusterArgbs.add(possibleNewCluster); - clusterPopulations.add(count); - } - debugLog( - 'kmeans finished and generated ${clusterArgbs.length} clusters; $clusterCount were requested', - ); - - final inputPixelToClusterPixel = {}; - if (returnInputPixelToClusterPixel) { - final stopwatch = Stopwatch()..start(); - for (var i = 0; i < pixels.length; i++) { - final inputPixel = pixels[i]; - final clusterIndex = clusterIndices[i]; - final cluster = clusters[clusterIndex]; - final clusterPixel = pointProvider.toInt(cluster); - inputPixelToClusterPixel[inputPixel] = clusterPixel; - } - debugLog( - 'took ${stopwatch.elapsedMilliseconds} ms to create input to cluster map', - ); - } - - return QuantizerResult( - Map.fromIterables(clusterArgbs, clusterPopulations), - inputPixelToClusterPixel: inputPixelToClusterPixel, - ); - } -} diff --git a/dart/lib/quantize/quantizer_wu.dart b/dart/lib/quantize/quantizer_wu.dart deleted file mode 100644 index c95e10f1..00000000 --- a/dart/lib/quantize/quantizer_wu.dart +++ /dev/null @@ -1,440 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// ignore_for_file: omit_local_variable_types -// rationale: This library relies heavily on numeric computation, and a key -// requirement is that it is 'the same' as implementations in different -// languages. Including variable types, though sometimes unnecessary, is a -// powerful help to verification and avoiding hard-to-debug issues. - -import '../utils/color_utils.dart'; -import 'quantizer.dart'; -import 'quantizer_map.dart'; - -class QuantizerWu implements Quantizer { - List weights = []; - List momentsR = []; - List momentsG = []; - List momentsB = []; - List moments = []; - List cubes = []; - - // A histogram of all the input colors is constructed. It has the shape of a - // cube. The cube would be too large if it contained all 16 million colors: - // historical best practice is to use 5 bits of the 8 in each channel, - // reducing the histogram to a volume of ~32,000. - static const indexBits = 5; - static final maxIndex = 32; - static final sideLength = 33; - static final totalSize = 35937; - - @override - Future quantize(Iterable pixels, int colorCount) async { - final result = await QuantizerMap().quantize(pixels, colorCount); - constructHistogram(result.colorToCount); - computeMoments(); - final createBoxesResult = createBoxes(colorCount); - final results = createResult(createBoxesResult.resultCount); - return QuantizerResult(Map.fromEntries(results.map((e) => MapEntry(e, 0)))); - } - - static int getIndex(int r, int g, int b) { - return (r << (indexBits * 2)) + - (r << (indexBits + 1)) + - (g << indexBits) + - r + - g + - b; - } - - void constructHistogram(Map pixels) { - weights = List.filled(totalSize, 0, growable: false); - momentsR = List.filled(totalSize, 0, growable: false); - momentsG = List.filled(totalSize, 0, growable: false); - momentsB = List.filled(totalSize, 0, growable: false); - moments = List.filled(totalSize, 0, growable: false); - for (var entry in pixels.entries) { - final pixel = entry.key; - final count = entry.value; - final red = ColorUtils.redFromArgb(pixel); - final green = ColorUtils.greenFromArgb(pixel); - final blue = ColorUtils.blueFromArgb(pixel); - final bitsToRemove = 8 - indexBits; - final iR = (red >> bitsToRemove) + 1; - final iG = (green >> bitsToRemove) + 1; - final iB = (blue >> bitsToRemove) + 1; - final index = getIndex(iR, iG, iB); - weights[index] += count; - momentsR[index] += red * count; - momentsG[index] += green * count; - momentsB[index] += blue * count; - moments[index] += count * ((red * red) + (green * green) + (blue * blue)); - } - } - - void computeMoments() { - for (var r = 1; r < sideLength; ++r) { - List area = List.filled(sideLength, 0, growable: false); - List areaR = List.filled(sideLength, 0, growable: false); - List areaG = List.filled(sideLength, 0, growable: false); - List areaB = List.filled(sideLength, 0, growable: false); - List area2 = List.filled(sideLength, 0.0, growable: false); - for (var g = 1; g < sideLength; g++) { - int line = 0; - int lineR = 0; - int lineG = 0; - int lineB = 0; - double line2 = 0.0; - for (var b = 1; b < sideLength; b++) { - int index = getIndex(r, g, b); - line += weights[index]; - lineR += momentsR[index]; - lineG += momentsG[index]; - lineB += momentsB[index]; - line2 += moments[index]; - - area[b] += line; - areaR[b] += lineR; - areaG[b] += lineG; - areaB[b] += lineB; - area2[b] += line2; - - int previousIndex = getIndex(r - 1, g, b); - weights[index] = weights[previousIndex] + area[b]; - momentsR[index] = momentsR[previousIndex] + areaR[b]; - momentsG[index] = momentsG[previousIndex] + areaG[b]; - momentsB[index] = momentsB[previousIndex] + areaB[b]; - moments[index] = moments[previousIndex] + area2[b]; - } - } - } - } - - CreateBoxesResult createBoxes(int maxColorCount) { - cubes = List.generate(maxColorCount, (index) => Box()); - cubes[0] = Box( - r0: 0, - r1: maxIndex, - g0: 0, - g1: maxIndex, - b0: 0, - b1: maxIndex, - vol: 0, - ); - - List volumeVariance = List.filled( - maxColorCount, - 0.0, - growable: false, - ); - int next = 0; - int generatedColorCount = maxColorCount; - for (int i = 1; i < maxColorCount; i++) { - if (cut(cubes[next], cubes[i])) { - volumeVariance[next] = - (cubes[next].vol > 1) ? variance(cubes[next]) : 0.0; - volumeVariance[i] = (cubes[i].vol > 1) ? variance(cubes[i]) : 0.0; - } else { - volumeVariance[next] = 0.0; - i--; - } - - next = 0; - double temp = volumeVariance[0]; - for (var j = 1; j <= i; j++) { - if (volumeVariance[j] > temp) { - temp = volumeVariance[j]; - next = j; - } - } - if (temp <= 0.0) { - generatedColorCount = i + 1; - break; - } - } - - return CreateBoxesResult( - requestedCount: maxColorCount, - resultCount: generatedColorCount, - ); - } - - List createResult(int colorCount) { - List colors = []; - for (int i = 0; i < colorCount; ++i) { - final cube = cubes[i]; - int weight = volume(cube, weights); - if (weight > 0) { - int r = (volume(cube, momentsR) / weight).round(); - int g = (volume(cube, momentsG) / weight).round(); - int b = (volume(cube, momentsB) / weight).round(); - int color = ColorUtils.argbFromRgb(r, g, b); - colors.add(color); - } - } - return colors; - } - - double variance(Box cube) { - final dr = volume(cube, momentsR); - final dg = volume(cube, momentsG); - final db = volume(cube, momentsB); - final xx = - moments[getIndex(cube.r1, cube.g1, cube.b1)] - - moments[getIndex(cube.r1, cube.g1, cube.b0)] - - moments[getIndex(cube.r1, cube.g0, cube.b1)] + - moments[getIndex(cube.r1, cube.g0, cube.b0)] - - moments[getIndex(cube.r0, cube.g1, cube.b1)] + - moments[getIndex(cube.r0, cube.g1, cube.b0)] + - moments[getIndex(cube.r0, cube.g0, cube.b1)] - - moments[getIndex(cube.r0, cube.g0, cube.b0)]; - - final hypotenuse = dr * dr + dg * dg + db * db; - final volume_ = volume(cube, weights); - return xx - hypotenuse / volume_; - } - - bool cut(Box one, Box two) { - final wholeR = volume(one, momentsR); - final wholeG = volume(one, momentsG); - final wholeB = volume(one, momentsB); - final wholeW = volume(one, weights); - - final maxRResult = maximize( - one, - Direction.red, - one.r0 + 1, - one.r1, - wholeR, - wholeG, - wholeB, - wholeW, - ); - final maxGResult = maximize( - one, - Direction.green, - one.g0 + 1, - one.g1, - wholeR, - wholeG, - wholeB, - wholeW, - ); - final maxBResult = maximize( - one, - Direction.blue, - one.b0 + 1, - one.b1, - wholeR, - wholeG, - wholeB, - wholeW, - ); - - Direction cutDirection; - final maxR = maxRResult.maximum; - final maxG = maxGResult.maximum; - final maxB = maxBResult.maximum; - if (maxR >= maxG && maxR >= maxB) { - cutDirection = Direction.red; - if (maxRResult.cutLocation < 0) { - return false; - } - } else if (maxG >= maxR && maxG >= maxB) { - cutDirection = Direction.green; - } else { - cutDirection = Direction.blue; - } - - two.r1 = one.r1; - two.g1 = one.g1; - two.b1 = one.b1; - - switch (cutDirection) { - case Direction.red: - one.r1 = maxRResult.cutLocation; - two.r0 = one.r1; - two.g0 = one.g0; - two.b0 = one.b0; - break; - case Direction.green: - one.g1 = maxGResult.cutLocation; - two.r0 = one.r0; - two.g0 = one.g1; - two.b0 = one.b0; - break; - case Direction.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); - two.vol = (two.r1 - two.r0) * (two.g1 - two.g0) * (two.b1 - two.b0); - return true; - } - - MaximizeResult maximize( - Box cube, - Direction direction, - int first, - int last, - int wholeR, - int wholeG, - int wholeB, - int wholeW, - ) { - int bottomR = bottom(cube, direction, momentsR); - int bottomG = bottom(cube, direction, momentsG); - int bottomB = bottom(cube, direction, momentsB); - int bottomW = bottom(cube, direction, weights); - - double max = 0.0; - int cut = -1; - - for (int i = first; i < last; i++) { - int halfR = bottomR + top(cube, direction, i, momentsR); - int halfG = bottomG + top(cube, direction, i, momentsG); - int halfB = bottomB + top(cube, direction, i, momentsB); - int halfW = bottomW + top(cube, direction, i, weights); - - if (halfW == 0) { - continue; - } - - double tempNumerator = - ((halfR * halfR) + (halfG * halfG) + (halfB * halfB)).toDouble(); - double tempDenominator = halfW.toDouble(); - double temp = tempNumerator / tempDenominator; - - halfR = wholeR - halfR; - halfG = wholeG - halfG; - halfB = wholeB - halfB; - halfW = wholeW - halfW; - if (halfW == 0) { - continue; - } - tempNumerator = - ((halfR * halfR) + (halfG * halfG) + (halfB * halfB)).toDouble(); - tempDenominator = halfW.toDouble(); - temp += tempNumerator / tempDenominator; - - if (temp > max) { - max = temp; - cut = i; - } - } - return MaximizeResult(cutLocation: cut, maximum: max); - } - - static int volume(Box cube, List moment) { - return moment[getIndex(cube.r1, cube.g1, cube.b1)] - - moment[getIndex(cube.r1, cube.g1, cube.b0)] - - moment[getIndex(cube.r1, cube.g0, cube.b1)] + - moment[getIndex(cube.r1, cube.g0, cube.b0)] - - moment[getIndex(cube.r0, cube.g1, cube.b1)] + - moment[getIndex(cube.r0, cube.g1, cube.b0)] + - moment[getIndex(cube.r0, cube.g0, cube.b1)] - - moment[getIndex(cube.r0, cube.g0, cube.b0)]; - } - - static int bottom(Box cube, Direction direction, List moment) { - return switch (direction) { - Direction.red => - -moment[getIndex(cube.r0, cube.g1, cube.b1)] + - moment[getIndex(cube.r0, cube.g1, cube.b0)] + - moment[getIndex(cube.r0, cube.g0, cube.b1)] - - moment[getIndex(cube.r0, cube.g0, cube.b0)], - Direction.green => - -moment[getIndex(cube.r1, cube.g0, cube.b1)] + - moment[getIndex(cube.r1, cube.g0, cube.b0)] + - moment[getIndex(cube.r0, cube.g0, cube.b1)] - - moment[getIndex(cube.r0, cube.g0, cube.b0)], - Direction.blue => - -moment[getIndex(cube.r1, cube.g1, cube.b0)] + - moment[getIndex(cube.r1, cube.g0, cube.b0)] + - moment[getIndex(cube.r0, cube.g1, cube.b0)] - - moment[getIndex(cube.r0, cube.g0, cube.b0)], - }; - } - - static int top( - Box cube, - Direction direction, - int position, - List moment, - ) { - return switch (direction) { - Direction.red => - moment[getIndex(position, cube.g1, cube.b1)] - - moment[getIndex(position, cube.g1, cube.b0)] - - moment[getIndex(position, cube.g0, cube.b1)] + - moment[getIndex(position, cube.g0, cube.b0)], - Direction.green => - moment[getIndex(cube.r1, position, cube.b1)] - - moment[getIndex(cube.r1, position, cube.b0)] - - moment[getIndex(cube.r0, position, cube.b1)] + - moment[getIndex(cube.r0, position, cube.b0)], - Direction.blue => - moment[getIndex(cube.r1, cube.g1, position)] - - moment[getIndex(cube.r1, cube.g0, position)] - - moment[getIndex(cube.r0, cube.g1, position)] + - moment[getIndex(cube.r0, cube.g0, position)], - }; - } -} - -enum Direction { red, green, blue } - -class MaximizeResult { - // < 0 if cut impossible - int cutLocation; - double maximum; - - MaximizeResult({required this.cutLocation, required this.maximum}); -} - -class CreateBoxesResult { - int requestedCount; - int resultCount; - - CreateBoxesResult({required this.requestedCount, required this.resultCount}); -} - -class Box { - int r0; - int r1; - int g0; - int g1; - int b0; - int b1; - int vol; - - Box({ - this.r0 = 0, - this.r1 = 0, - this.g0 = 0, - this.g1 = 0, - this.b0 = 0, - this.b1 = 0, - this.vol = 0, - }); - - @override - String toString() { - return 'Box: R $r0 -> $r1 G $g0 -> $g1 B $b0 -> $b1 VOL = $vol'; - } -} diff --git a/dart/lib/quantize/src/point_provider.dart b/dart/lib/quantize/src/point_provider.dart deleted file mode 100644 index 91a3dce6..00000000 --- a/dart/lib/quantize/src/point_provider.dart +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -abstract class PointProvider { - List fromInt(int argb); - int toInt(List point); - double distance(List a, List b); -} diff --git a/dart/lib/quantize/src/point_provider_lab.dart b/dart/lib/quantize/src/point_provider_lab.dart deleted file mode 100644 index 548a7d82..00000000 --- a/dart/lib/quantize/src/point_provider_lab.dart +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import '../../utils/color_utils.dart'; -import 'point_provider.dart'; - -class PointProviderLab implements PointProvider { - const PointProviderLab(); - - @override - List fromInt(int argb) { - return ColorUtils.labFromArgb(argb); - } - - @override - int toInt(List lab) { - return ColorUtils.argbFromLab(lab[0], lab[1], lab[2]); - } - - @override - double distance(List one, List two) { - final dL = one[0] - two[0]; - final dA = one[1] - two[1]; - final dB = one[2] - two[2]; - // Standard CIE 1976 delta E formula also takes the square root, unneeded - // here. This method is used by quantization algorithms to compare distance, - // and the relative ordering is the same, with or without a square root. - - // This relatively minor optimization is helpful because this method is - // called at least once for each pixel in an image. - return dL * dL + dA * dA + dB * dB; - } -} diff --git a/dart/lib/scheme/scheme.dart b/dart/lib/scheme/scheme.dart deleted file mode 100644 index c038a2fe..00000000 --- a/dart/lib/scheme/scheme.dart +++ /dev/null @@ -1,165 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This file is automatically generated. Do not modify it. - -/// @docImport '../dynamiccolor/dynamic_scheme.dart'; -library; - -import '../palettes/core_palette.dart'; - -/// Prefer [DynamicScheme]. This class is the same concept as Flutter's -/// ColorScheme class, inlined to ensure parity across languages. -@Deprecated( - 'The `Scheme` class is deprecated in favor of `DynamicScheme`.\n' - 'Please see https://github.com/material-foundation/material-color-utilities/blob/main/make_schemes.md' - 'for migration guidance.', -) -class Scheme { - final int primary; - final int onPrimary; - final int primaryContainer; - final int onPrimaryContainer; - final int secondary; - final int onSecondary; - final int secondaryContainer; - final int onSecondaryContainer; - final int tertiary; - final int onTertiary; - final int tertiaryContainer; - final int onTertiaryContainer; - final int error; - final int onError; - final int errorContainer; - final int onErrorContainer; - final int background; - final int onBackground; - final int surface; - final int onSurface; - final int surfaceVariant; - final int onSurfaceVariant; - final int outline; - final int outlineVariant; - final int shadow; - final int scrim; - final int inverseSurface; - final int inverseOnSurface; - final int inversePrimary; - - const Scheme({ - required this.primary, - required this.onPrimary, - required this.primaryContainer, - required this.onPrimaryContainer, - required this.secondary, - required this.onSecondary, - required this.secondaryContainer, - required this.onSecondaryContainer, - required this.tertiary, - required this.onTertiary, - required this.tertiaryContainer, - required this.onTertiaryContainer, - required this.error, - required this.onError, - required this.errorContainer, - required this.onErrorContainer, - required this.background, - required this.onBackground, - required this.surface, - required this.onSurface, - required this.surfaceVariant, - required this.onSurfaceVariant, - required this.outline, - required this.outlineVariant, - required this.shadow, - required this.scrim, - required this.inverseSurface, - required this.inverseOnSurface, - required this.inversePrimary, - }); - - static Scheme light(int color) => lightFromCorePalette(CorePalette.of(color)); - - static Scheme dark(int color) => darkFromCorePalette(CorePalette.of(color)); - - static Scheme lightContent(int color) => - lightFromCorePalette(CorePalette.contentOf(color)); - - static Scheme darkContent(int color) => - darkFromCorePalette(CorePalette.contentOf(color)); - - static Scheme lightFromCorePalette(CorePalette palette) => Scheme( - primary: palette.primary.get(40), - onPrimary: palette.primary.get(100), - primaryContainer: palette.primary.get(90), - onPrimaryContainer: palette.primary.get(10), - secondary: palette.secondary.get(40), - onSecondary: palette.secondary.get(100), - secondaryContainer: palette.secondary.get(90), - onSecondaryContainer: palette.secondary.get(10), - tertiary: palette.tertiary.get(40), - onTertiary: palette.tertiary.get(100), - tertiaryContainer: palette.tertiary.get(90), - onTertiaryContainer: palette.tertiary.get(10), - error: palette.error.get(40), - onError: palette.error.get(100), - errorContainer: palette.error.get(90), - onErrorContainer: palette.error.get(10), - background: palette.neutral.get(99), - onBackground: palette.neutral.get(10), - surface: palette.neutral.get(99), - onSurface: palette.neutral.get(10), - surfaceVariant: palette.neutralVariant.get(90), - onSurfaceVariant: palette.neutralVariant.get(30), - outline: palette.neutralVariant.get(50), - outlineVariant: palette.neutralVariant.get(80), - shadow: palette.neutral.get(0), - scrim: palette.neutral.get(0), - inverseSurface: palette.neutral.get(20), - inverseOnSurface: palette.neutral.get(95), - inversePrimary: palette.primary.get(80), - ); - - static Scheme darkFromCorePalette(CorePalette palette) => Scheme( - primary: palette.primary.get(80), - onPrimary: palette.primary.get(20), - primaryContainer: palette.primary.get(30), - onPrimaryContainer: palette.primary.get(90), - secondary: palette.secondary.get(80), - onSecondary: palette.secondary.get(20), - secondaryContainer: palette.secondary.get(30), - onSecondaryContainer: palette.secondary.get(90), - tertiary: palette.tertiary.get(80), - onTertiary: palette.tertiary.get(20), - tertiaryContainer: palette.tertiary.get(30), - onTertiaryContainer: palette.tertiary.get(90), - error: palette.error.get(80), - onError: palette.error.get(20), - errorContainer: palette.error.get(30), - onErrorContainer: palette.error.get(80), - background: palette.neutral.get(10), - onBackground: palette.neutral.get(90), - surface: palette.neutral.get(10), - onSurface: palette.neutral.get(90), - surfaceVariant: palette.neutralVariant.get(30), - onSurfaceVariant: palette.neutralVariant.get(80), - outline: palette.neutralVariant.get(60), - outlineVariant: palette.neutralVariant.get(30), - shadow: palette.neutral.get(0), - scrim: palette.neutral.get(0), - inverseSurface: palette.neutral.get(90), - inverseOnSurface: palette.neutral.get(20), - inversePrimary: palette.primary.get(40), - ); -} diff --git a/dart/lib/scheme/scheme_content.dart b/dart/lib/scheme/scheme_content.dart deleted file mode 100644 index 7ff88121..00000000 --- a/dart/lib/scheme/scheme_content.dart +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/// @docImport 'scheme.dart'; -library; - -import 'dart:math' as math; - -import '../dislike/dislike_analyzer.dart'; -import '../dynamiccolor/dynamic_scheme.dart'; -import '../dynamiccolor/variant.dart'; -import '../palettes/tonal_palette.dart'; -import '../temperature/temperature_cache.dart'; - -/// A scheme that places the source color in [Scheme.primaryContainer]. -/// -/// Primary Container is the source color, adjusted for color relativity. -/// It maintains constant appearance in light mode and dark mode. -/// This adds ~5 tone in light mode, and subtracts ~5 tone in dark mode. -/// -/// Tertiary Container is an analogous color, specifically, the analog of a -/// color wheel divided into 6, and the precise analog is the one found by -/// increasing hue. It also maintains constant appearance. -class SchemeContent extends DynamicScheme { - SchemeContent({ - required super.sourceColorHct, - required super.isDark, - required super.contrastLevel, - }) : super( - variant: Variant.content, - primaryPalette: TonalPalette.of( - sourceColorHct.hue, - sourceColorHct.chroma, - ), - secondaryPalette: TonalPalette.of( - sourceColorHct.hue, - math.max(sourceColorHct.chroma - 32.0, sourceColorHct.chroma * 0.5), - ), - tertiaryPalette: TonalPalette.fromHct( - DislikeAnalyzer.fixIfDisliked( - TemperatureCache( - sourceColorHct, - ).analogous(count: 3, divisions: 6).last, - ), - ), - neutralPalette: TonalPalette.of( - sourceColorHct.hue, - sourceColorHct.chroma / 8.0, - ), - neutralVariantPalette: TonalPalette.of( - sourceColorHct.hue, - (sourceColorHct.chroma / 8.0) + 4.0, - ), - ); -} diff --git a/dart/lib/scheme/scheme_expressive.dart b/dart/lib/scheme/scheme_expressive.dart deleted file mode 100644 index 3be47ba0..00000000 --- a/dart/lib/scheme/scheme_expressive.dart +++ /dev/null @@ -1,85 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -import '../dynamiccolor/dynamic_scheme.dart'; -import '../dynamiccolor/variant.dart'; -import '../palettes/tonal_palette.dart'; -import '../utils/math_utils.dart'; - -/// A Dynamic Color theme that is intentionally detached from the input color. -class SchemeExpressive extends DynamicScheme { - /// Hues used at breakpoints such that designers can specify a hue rotation - /// that occurs at a given break point. - static const _hues = [0, 21, 51, 121, 151, 191, 271, 321, 360]; - - /// Hue rotations of the Secondary [TonalPalette], corresponding to the - /// breakpoints in [_hues]. - static const _secondaryRotations = [ - 45, - 95, - 45, - 20, - 45, - 90, - 45, - 45, - 45, - ]; - - /// Hue rotations of the Tertiary [TonalPalette], corresponding to the - /// breakpoints in [_hues]. - static const _tertiaryRotations = [ - 120, - 120, - 20, - 45, - 20, - 15, - 20, - 120, - 120, - ]; - - SchemeExpressive({ - required super.sourceColorHct, - required super.isDark, - required super.contrastLevel, - }) : super( - variant: Variant.expressive, - primaryPalette: TonalPalette.of( - MathUtils.sanitizeDegreesDouble(sourceColorHct.hue + 240.0), - 40.0, - ), - secondaryPalette: TonalPalette.of( - DynamicScheme.getRotatedHue( - sourceColorHct, - _hues, - _secondaryRotations, - ), - 24.0, - ), - tertiaryPalette: TonalPalette.of( - DynamicScheme.getRotatedHue( - sourceColorHct, - _hues, - _tertiaryRotations, - ), - 32.0, - ), - neutralPalette: TonalPalette.of(sourceColorHct.hue + 15.0, 8.0), - neutralVariantPalette: TonalPalette.of( - sourceColorHct.hue + 15.0, - 12.0, - ), - ); -} diff --git a/dart/lib/scheme/scheme_fidelity.dart b/dart/lib/scheme/scheme_fidelity.dart deleted file mode 100644 index 99845d7b..00000000 --- a/dart/lib/scheme/scheme_fidelity.dart +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/// @docImport 'scheme.dart'; -library; - -import 'dart:math' as math; - -import '../dislike/dislike_analyzer.dart'; -import '../dynamiccolor/dynamic_scheme.dart'; -import '../dynamiccolor/variant.dart'; -import '../palettes/tonal_palette.dart'; -import '../temperature/temperature_cache.dart'; - -/// A scheme that places the source color in [Scheme.primaryContainer]. -/// -/// Primary Container is the source color, adjusted for color relativity. -/// It maintains constant appearance in light mode and dark mode. -/// This adds ~5 tone in light mode, and subtracts ~5 tone in dark mode. -/// -/// Tertiary Container is the complement to the source color, using -/// [TemperatureCache]. It also maintains constant appearance. -class SchemeFidelity extends DynamicScheme { - SchemeFidelity({ - required super.sourceColorHct, - required super.isDark, - required super.contrastLevel, - }) : super( - variant: Variant.fidelity, - primaryPalette: TonalPalette.of( - sourceColorHct.hue, - sourceColorHct.chroma, - ), - secondaryPalette: TonalPalette.of( - sourceColorHct.hue, - math.max(sourceColorHct.chroma - 32.0, sourceColorHct.chroma * 0.5), - ), - tertiaryPalette: TonalPalette.fromHct( - DislikeAnalyzer.fixIfDisliked( - TemperatureCache(sourceColorHct).complement, - ), - ), - neutralPalette: TonalPalette.of( - sourceColorHct.hue, - sourceColorHct.chroma / 8.0, - ), - neutralVariantPalette: TonalPalette.of( - sourceColorHct.hue, - (sourceColorHct.chroma / 8.0) + 4.0, - ), - ); -} diff --git a/dart/lib/scheme/scheme_fruit_salad.dart b/dart/lib/scheme/scheme_fruit_salad.dart deleted file mode 100644 index daf3c427..00000000 --- a/dart/lib/scheme/scheme_fruit_salad.dart +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import '../dynamiccolor/dynamic_scheme.dart'; -import '../dynamiccolor/variant.dart'; -import '../palettes/tonal_palette.dart'; -import '../utils/math_utils.dart'; - -/// A playful theme - the source color's hue does not appear in the theme. -class SchemeFruitSalad extends DynamicScheme { - SchemeFruitSalad({ - required super.sourceColorHct, - required super.isDark, - required super.contrastLevel, - }) : super( - variant: Variant.fruitSalad, - primaryPalette: TonalPalette.of( - MathUtils.sanitizeDegreesDouble(sourceColorHct.hue - 50.0), - 48.0, - ), - secondaryPalette: TonalPalette.of( - MathUtils.sanitizeDegreesDouble(sourceColorHct.hue - 50.0), - 36.0, - ), - tertiaryPalette: TonalPalette.of(sourceColorHct.hue, 36.0), - neutralPalette: TonalPalette.of(sourceColorHct.hue, 10.0), - neutralVariantPalette: TonalPalette.of(sourceColorHct.hue, 16.0), - ); -} diff --git a/dart/lib/scheme/scheme_monochrome.dart b/dart/lib/scheme/scheme_monochrome.dart deleted file mode 100644 index 3c55a4a9..00000000 --- a/dart/lib/scheme/scheme_monochrome.dart +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -import '../dynamiccolor/dynamic_scheme.dart'; -import '../dynamiccolor/variant.dart'; -import '../palettes/tonal_palette.dart'; - -/// A Dynamic Color theme that is grayscale. -class SchemeMonochrome extends DynamicScheme { - SchemeMonochrome({ - required super.sourceColorHct, - required super.isDark, - required super.contrastLevel, - }) : super( - variant: Variant.monochrome, - primaryPalette: TonalPalette.of(sourceColorHct.hue, 0.0), - secondaryPalette: TonalPalette.of(sourceColorHct.hue, 0.0), - tertiaryPalette: TonalPalette.of(sourceColorHct.hue, 0.0), - neutralPalette: TonalPalette.of(sourceColorHct.hue, 0.0), - neutralVariantPalette: TonalPalette.of(sourceColorHct.hue, 0.0), - ); -} diff --git a/dart/lib/scheme/scheme_neutral.dart b/dart/lib/scheme/scheme_neutral.dart deleted file mode 100644 index 41fc60d4..00000000 --- a/dart/lib/scheme/scheme_neutral.dart +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -import '../dynamiccolor/dynamic_scheme.dart'; -import '../dynamiccolor/variant.dart'; -import '../palettes/tonal_palette.dart'; - -/// A Dynamic Color theme that is near grayscale. -class SchemeNeutral extends DynamicScheme { - SchemeNeutral({ - required super.sourceColorHct, - required super.isDark, - required super.contrastLevel, - }) : super( - variant: Variant.neutral, - primaryPalette: TonalPalette.of(sourceColorHct.hue, 12.0), - secondaryPalette: TonalPalette.of(sourceColorHct.hue, 8.0), - tertiaryPalette: TonalPalette.of(sourceColorHct.hue, 16.0), - neutralPalette: TonalPalette.of(sourceColorHct.hue, 2.0), - neutralVariantPalette: TonalPalette.of(sourceColorHct.hue, 2.0), - ); -} diff --git a/dart/lib/scheme/scheme_rainbow.dart b/dart/lib/scheme/scheme_rainbow.dart deleted file mode 100644 index 6049d416..00000000 --- a/dart/lib/scheme/scheme_rainbow.dart +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import '../dynamiccolor/dynamic_scheme.dart'; -import '../dynamiccolor/variant.dart'; -import '../palettes/tonal_palette.dart'; -import '../utils/math_utils.dart'; - -/// A playful theme - the source color's hue does not appear in the theme. -class SchemeRainbow extends DynamicScheme { - SchemeRainbow({ - required super.sourceColorHct, - required super.isDark, - required super.contrastLevel, - }) : super( - variant: Variant.rainbow, - primaryPalette: TonalPalette.of(sourceColorHct.hue, 48.0), - secondaryPalette: TonalPalette.of(sourceColorHct.hue, 16.0), - tertiaryPalette: TonalPalette.of( - MathUtils.sanitizeDegreesDouble(sourceColorHct.hue + 60.0), - 24.0, - ), - neutralPalette: TonalPalette.of(sourceColorHct.hue, 0.0), - neutralVariantPalette: TonalPalette.of(sourceColorHct.hue, 0.0), - ); -} diff --git a/dart/lib/scheme/scheme_tonal_spot.dart b/dart/lib/scheme/scheme_tonal_spot.dart deleted file mode 100644 index c698f33a..00000000 --- a/dart/lib/scheme/scheme_tonal_spot.dart +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -import '../dynamiccolor/dynamic_scheme.dart'; -import '../dynamiccolor/variant.dart'; -import '../palettes/tonal_palette.dart'; -import '../utils/math_utils.dart'; - -/// A Dynamic Color theme with low to medium colorfulness and a Tertiary -/// [TonalPalette] with a hue related to the source color. The default -/// Material You theme on Android 12 and 13. -class SchemeTonalSpot extends DynamicScheme { - SchemeTonalSpot({ - required super.sourceColorHct, - required super.isDark, - required super.contrastLevel, - }) : super( - variant: Variant.tonalSpot, - primaryPalette: TonalPalette.of(sourceColorHct.hue, 36.0), - secondaryPalette: TonalPalette.of(sourceColorHct.hue, 16.0), - tertiaryPalette: TonalPalette.of( - MathUtils.sanitizeDegreesDouble(sourceColorHct.hue + 60.0), - 24.0, - ), - neutralPalette: TonalPalette.of(sourceColorHct.hue, 6.0), - neutralVariantPalette: TonalPalette.of(sourceColorHct.hue, 8.0), - ); -} diff --git a/dart/lib/scheme/scheme_vibrant.dart b/dart/lib/scheme/scheme_vibrant.dart deleted file mode 100644 index f5b983c8..00000000 --- a/dart/lib/scheme/scheme_vibrant.dart +++ /dev/null @@ -1,79 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -import '../dynamiccolor/dynamic_scheme.dart'; -import '../dynamiccolor/variant.dart'; -import '../palettes/tonal_palette.dart'; - -/// A Dynamic Color theme that maxes out colorfulness at each position in the -/// Primary [TonalPalette]. -class SchemeVibrant extends DynamicScheme { - /// Hues used at breakpoints such that designers can specify a hue rotation - /// that occurs at a given break point. - static const _hues = [0, 41, 61, 101, 131, 181, 251, 301, 360]; - - /// Hue rotations of the Secondary [TonalPalette], corresponding to the - /// breakpoints in [_hues]. - static const _secondaryRotations = [ - 18, - 15, - 10, - 12, - 15, - 18, - 15, - 12, - 12, - ]; - - /// Hue rotations of the Tertiary [TonalPalette], corresponding to the - /// breakpoints in [_hues]. - static const _tertiaryRotations = [ - 35, - 30, - 20, - 25, - 30, - 35, - 30, - 25, - 25, - ]; - - SchemeVibrant({ - required super.sourceColorHct, - required super.isDark, - required super.contrastLevel, - }) : super( - variant: Variant.vibrant, - primaryPalette: TonalPalette.of(sourceColorHct.hue, 200.0), - secondaryPalette: TonalPalette.of( - DynamicScheme.getRotatedHue( - sourceColorHct, - _hues, - _secondaryRotations, - ), - 24.0, - ), - tertiaryPalette: TonalPalette.of( - DynamicScheme.getRotatedHue( - sourceColorHct, - _hues, - _tertiaryRotations, - ), - 32.0, - ), - neutralPalette: TonalPalette.of(sourceColorHct.hue, 10.0), - neutralVariantPalette: TonalPalette.of(sourceColorHct.hue, 12.0), - ); -} diff --git a/dart/lib/score/score.dart b/dart/lib/score/score.dart deleted file mode 100644 index bb98a898..00000000 --- a/dart/lib/score/score.dart +++ /dev/null @@ -1,154 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:collection/collection.dart'; - -import '../hct/hct.dart'; -import '../utils/math_utils.dart'; - -class _ScoredHCT implements Comparable<_ScoredHCT> { - Hct hct; - double score; - - _ScoredHCT(this.hct, this.score); - - @override - int compareTo(_ScoredHCT other) { - if (score > other.score) { - return -1; - } else if (score == other.score) { - return 0; - } else { - return 1; - } - } -} - -/// Given a large set of colors, remove colors that are unsuitable for a UI -/// theme, and rank the rest based on suitability. -/// -/// Enables use of a high cluster count for image quantization, thus ensuring -/// colors aren't muddied, while curating the high cluster count to a much -/// smaller number of appropriate choices. -class Score { - static const _targetChroma = 48.0; // A1 Chroma - static const _weightProportion = 0.7; - static const _weightChromaAbove = 0.3; - static const _weightChromaBelow = 0.1; - static const _cutoffChroma = 5.0; - static const _cutoffExcitedProportion = 0.01; - - /// Given a map with keys of colors and values of how often the color appears, - /// rank the colors based on suitability for being used for a UI theme. - /// - /// [colorsToPopulation] is a map with keys of colors and values of often the - /// color appears, usually from a source image. - /// [desired] max count of colors to be returned in the list. - /// [fallbackColorARGB] color to be returned if no other options available. - /// [filter] whether to filter out undesireable combinations. - /// - /// The list returned is of length <= [desired]. The recommended color is the - /// first item, the least suitable is the last. There will always be at least - /// one color returned. If all the input colors were not suitable for a theme, - /// a default fallback color will be provided, Google Blue. The default - /// number of colors returned is 4, simply because thats the # of colors - /// display in Android 12's wallpaper picker. - static List score( - Map colorsToPopulation, { - int desired = 4, - int fallbackColorARGB = 0xff4285F4, - bool filter = true, - }) { - // Get the HCT color for each Argb value, while finding the per hue count and - // total count. - final colorsHct = []; - final huePopulation = List.filled(360, 0); - var populationSum = 0; - for (var entry in colorsToPopulation.entries) { - final argb = entry.key; - final population = entry.value; - final hct = Hct.fromInt(argb); - colorsHct.add(hct); - final hue = hct.hue.floor(); - huePopulation[hue] += population; - populationSum += population; - } - - // Hues with more usage in neighboring 30 degree slice get a larger number. - final hueExcitedProportions = List.filled(360, 0.0); - for (var hue = 0; hue < 360; hue++) { - final proportion = huePopulation[hue] / populationSum; - for (var i = hue - 14; i < hue + 16; i++) { - final neighborHue = MathUtils.sanitizeDegreesInt(i); - hueExcitedProportions[neighborHue] += proportion; - } - } - - // Scores each HCT color based on usage and chroma, while optionally - // filtering out values that do not have enough chroma or usage. - final scoredHcts = <_ScoredHCT>[]; - for (final hct in colorsHct) { - final hue = MathUtils.sanitizeDegreesInt(hct.hue.round()); - final proportion = hueExcitedProportions[hue]; - if (filter && - (hct.chroma < _cutoffChroma || - proportion <= _cutoffExcitedProportion)) { - continue; - } - - final proportionScore = proportion * 100.0 * _weightProportion; - final chromaWeight = - hct.chroma < _targetChroma ? _weightChromaBelow : _weightChromaAbove; - final chromaScore = (hct.chroma - _targetChroma) * chromaWeight; - final score = proportionScore + chromaScore; - scoredHcts.add(_ScoredHCT(hct, score)); - } - // Sorted so that colors with higher scores come first. - scoredHcts.sort(); - - // Iterates through potential hue differences in degrees in order to select - // the colors with the largest distribution of hues possible. Starting at - // 90 degrees(maximum difference for 4 colors) then decreasing down to a - // 15 degree minimum. - final chosenColors = []; - for ( - var differenceDegrees = 90; - differenceDegrees >= 15; - differenceDegrees-- - ) { - chosenColors.clear(); - for (final entry in scoredHcts) { - final hct = entry.hct; - final duplicateHue = chosenColors.firstWhereOrNull( - (chosenHct) => - MathUtils.differenceDegrees(hct.hue, chosenHct.hue) < - differenceDegrees, - ); - if (duplicateHue == null) { - chosenColors.add(hct); - } - if (chosenColors.length >= desired) break; - } - if (chosenColors.length >= desired) break; - } - final colors = []; - if (chosenColors.isEmpty) { - colors.add(fallbackColorARGB); - } - for (final chosenHct in chosenColors) { - colors.add(chosenHct.toInt()); - } - return colors; - } -} diff --git a/dart/lib/temperature/temperature_cache.dart b/dart/lib/temperature/temperature_cache.dart deleted file mode 100644 index bc87ec5d..00000000 --- a/dart/lib/temperature/temperature_cache.dart +++ /dev/null @@ -1,300 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'dart:math' as math; - -import '../hct/hct.dart'; -import '../utils/color_utils.dart'; -import '../utils/math_utils.dart'; - -/// Design utilities using color temperature theory. -/// -/// Analogous colors, complementary color, and cache to efficiently, lazily, -/// generate data for calculations when needed. -class TemperatureCache { - final Hct input; - - List _hctsByTemp = []; - List _hctsByHue = []; - Map _tempsByHct = {}; - double _inputRelativeTemperature = -1.0; - Hct? _complement; - - TemperatureCache(this.input); - - Hct get warmest => hctsByTemp.last; - - Hct get coldest => hctsByTemp.first; - - /// A set of colors with differing hues, equidistant in temperature. - /// - /// In art, this is usually described as a set of 5 colors on a color wheel - /// divided into 12 sections. This method allows provision of either of those - /// values. - /// - /// Behavior is undefined when [count] or [divisions] is 0. - /// When divisions < count, colors repeat. - /// - /// [count] The number of colors to return, includes the input color. - /// [divisions] The number of divisions on the color wheel. - List analogous({int count = 5, int divisions = 12}) { - final startHue = input.hue.round(); - final startHct = hctsByHue[startHue]; - var lastTemp = relativeTemperature(startHct); - var allColors = [startHct]; - - var absoluteTotalTempDelta = 0.0; - for (var i = 0; i < 360; i++) { - final hue = MathUtils.sanitizeDegreesInt(startHue + i); - final hct = hctsByHue[hue]; - final temp = relativeTemperature(hct); - final tempDelta = (temp - lastTemp).abs(); - lastTemp = temp; - absoluteTotalTempDelta += tempDelta; - } - var hueAddend = 1; - final tempStep = absoluteTotalTempDelta / divisions; - var totalTempDelta = 0.0; - lastTemp = relativeTemperature(startHct); - while (allColors.length < divisions) { - final hue = MathUtils.sanitizeDegreesInt(startHue + hueAddend); - final hct = hctsByHue[hue]; - final temp = relativeTemperature(hct); - final tempDelta = (temp - lastTemp).abs(); - totalTempDelta += tempDelta; - - final desiredTotalTempDeltaForIndex = allColors.length * tempStep; - var indexSatisfied = totalTempDelta >= desiredTotalTempDeltaForIndex; - var indexAddend = 1; - // Keep adding this hue to the answers until its temperature is - // insufficient. This ensures consistent behavior when there aren't - // [divisions] discrete steps between 0 and 360 in hue with [tempStep] - // delta in temperature between them. - // - // For example, white and black have no analogues: there are no other - // colors at T100/T0. Therefore, they should just be added to the array - // as answers. - while (indexSatisfied && allColors.length < divisions) { - allColors.add(hct); - final desiredTotalTempDeltaForIndex = - (allColors.length + indexAddend) * tempStep; - indexSatisfied = totalTempDelta >= desiredTotalTempDeltaForIndex; - indexAddend++; - } - lastTemp = temp; - hueAddend++; - if (hueAddend > 360) { - while (allColors.length < divisions) { - allColors.add(hct); - } - break; - } - } - - final answers = [input]; - - // First, generate analogues from rotating counter-clockwise. - final increaseHueCount = ((count - 1) / 2.0).floor(); - for (var i = 1; i < (increaseHueCount + 1); i++) { - var index = 0 - i; - while (index < 0) { - index = allColors.length + index; - } - if (index >= allColors.length) { - index = index % allColors.length; - } - answers.insert(0, allColors[index]); - } - - // Second, generate analogues from rotating clockwise. - final decreaseHueCount = count - increaseHueCount - 1; - for (var i = 1; i < (decreaseHueCount + 1); i++) { - var index = i; - while (index < 0) { - index = allColors.length + index; - } - if (index >= allColors.length) { - index = index % allColors.length; - } - answers.add(allColors[index]); - } - - return answers; - } - - /// A color that complements the input color aesthetically. - /// - /// In art, this is usually described as being across the color wheel. - /// History of this shows intent as a color that is just as cool-warm as the - /// input color is warm-cool. - Hct get complement { - if (_complement != null) { - return _complement!; - } - - final coldestHue = coldest.hue; - final coldestTemp = tempsByHct[coldest]!; - - final warmestHue = warmest.hue; - final warmestTemp = tempsByHct[warmest]!; - final range = warmestTemp - coldestTemp; - final startHueIsColdestToWarmest = isBetween( - angle: input.hue, - a: coldestHue, - b: warmestHue, - ); - final startHue = startHueIsColdestToWarmest ? warmestHue : coldestHue; - final endHue = startHueIsColdestToWarmest ? coldestHue : warmestHue; - const directionOfRotation = 1.0; - var smallestError = 1000.0; - var answer = hctsByHue[input.hue.round()]; - - final complementRelativeTemp = 1.0 - inputRelativeTemperature; - // Find the color in the other section, closest to the inverse percentile - // of the input color. This is the complement. - for (var hueAddend = 0.0; hueAddend <= 360.0; hueAddend += 1.0) { - final hue = MathUtils.sanitizeDegreesDouble( - startHue + directionOfRotation * hueAddend, - ); - if (!isBetween(angle: hue, a: startHue, b: endHue)) { - continue; - } - final possibleAnswer = hctsByHue[hue.round()]; - final relativeTemp = (_tempsByHct[possibleAnswer]! - coldestTemp) / range; - final error = (complementRelativeTemp - relativeTemp).abs(); - if (error < smallestError) { - smallestError = error; - answer = possibleAnswer; - } - } - _complement = answer; - return _complement!; - } - - /// Temperature relative to all colors with the same chroma and tone. - /// Value on a scale from 0 to 1. - double relativeTemperature(Hct hct) { - final range = tempsByHct[warmest]! - tempsByHct[coldest]!; - final differenceFromColdest = tempsByHct[hct]! - tempsByHct[coldest]!; - // Handle when there's no difference in temperature between warmest and - // coldest: for example, at T100, only one color is available, white. - if (range == 0.0) { - return 0.5; - } - return differenceFromColdest / range; - } - - /// Relative temperature of the input color. See [relativeTemperature]. - double get inputRelativeTemperature { - if (_inputRelativeTemperature >= 0.0) { - return _inputRelativeTemperature; - } - - final coldestTemp = tempsByHct[coldest]!; - - final range = tempsByHct[warmest]! - coldestTemp; - final differenceFromColdest = tempsByHct[input]! - coldestTemp; - final inputRelativeTemp = - (range == 0.0) ? 0.5 : differenceFromColdest / range; - - _inputRelativeTemperature = inputRelativeTemp; - return _inputRelativeTemperature; - } - - /// HCTs for all hues, with the same chroma/tone as the input. - /// Sorted from coldest first to warmest last. - List get hctsByTemp { - if (_hctsByTemp.isNotEmpty) { - return _hctsByTemp; - } - - final hcts = List.from(hctsByHue, growable: true); - hcts.add(input); - final temperaturesByHct = tempsByHct; - hcts.sort((a, b) => temperaturesByHct[a]!.compareTo(temperaturesByHct[b]!)); - _hctsByTemp = hcts; - return _hctsByTemp; - } - - /// A Map with keys of HCTs in [hctsByTemp], values of raw temperature. - Map get tempsByHct { - if (_tempsByHct.isNotEmpty) { - return _tempsByHct; - } - final allHcts = List.from(hctsByHue)..add(input); - final temperaturesByHct = {for (var e in allHcts) e: rawTemperature(e)}; - _tempsByHct = temperaturesByHct; - return _tempsByHct; - } - - /// HCTs for all hues, with the same chroma/tone as the input. - /// Sorted ascending, hue 0 to 360. - List get hctsByHue { - if (_hctsByHue.isNotEmpty) { - return _hctsByHue; - } - final hcts = []; - for (var hue = 0.0; hue <= 360.0; hue += 1.0) { - final colorAtHue = Hct.from(hue, input.chroma, input.tone); - hcts.add(colorAtHue); - } - _hctsByHue = List.from(hcts, growable: false); - return _hctsByHue; - } - - /// Determines if an angle is between two other angles, rotating clockwise. - static bool isBetween({ - required double angle, - required double a, - required double b, - }) { - if (a < b) { - return a <= angle && angle <= b; - } - return a <= angle || angle <= b; - } - - /// Value representing cool-warm factor of a color. - /// Values below 0 are considered cool, above, warm. - /// - /// Color science has researched emotion and harmony, which art uses to select - /// colors. Warm-cool is the foundation of analogous and complementary colors. - /// See: - /// - Li-Chen Ou's Chapter 19 in Handbook of Color Psychology (2015). - /// - Josef Albers' Interaction of Color chapters 19 and 21. - /// - /// Implementation of Ou, Woodcock and Wright's algorithm, which uses - /// L*a*b*/LCH color space. - /// Return value has these properties: - /// - Values below 0 are cool, above 0 are warm. - /// - Lower bound: -0.52 - (chroma ^ 1.07 / 20). L*a*b* chroma is infinite. - /// Assuming max of 130 chroma, -9.66. - /// - Upper bound: -0.52 + (chroma ^ 1.07 / 20). L*a*b* chroma is infinite. - /// Assuming max of 130 chroma, 8.61. - static double rawTemperature(Hct color) { - final lab = ColorUtils.labFromArgb(color.toInt()); - final hue = MathUtils.sanitizeDegreesDouble( - math.atan2(lab[2], lab[1]) * 180.0 / math.pi, - ); - final chroma = math.sqrt((lab[1] * lab[1]) + (lab[2] * lab[2])); - final temperature = - -0.5 + - 0.02 * - math.pow(chroma, 1.07) * - math.cos( - MathUtils.sanitizeDegreesDouble(hue - 50.0) * math.pi / 180.0, - ); - return temperature; - } -} diff --git a/dart/lib/utils/color_utils.dart b/dart/lib/utils/color_utils.dart deleted file mode 100644 index 4e4cc6af..00000000 --- a/dart/lib/utils/color_utils.dart +++ /dev/null @@ -1,254 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This file is automatically generated. Do not modify it. - -import 'dart:math'; - -import 'math_utils.dart'; - -/// Color science utilities. -/// -/// Utility methods for color science constants and color space -/// conversions that aren't HCT or CAM16. -class ColorUtils { - static const _srgbToXyz = [ - [0.41233895, 0.35762064, 0.18051042], - [0.2126, 0.7152, 0.0722], - [0.01932141, 0.11916382, 0.95034478], - ]; - - static const _xyzToSrgb = [ - [3.2413774792388685, -1.5376652402851851, -0.49885366846268053], - [-0.9691452513005321, 1.8758853451067872, 0.04156585616912061], - [0.05562093689691305, -0.20395524564742123, 1.0571799111220335], - ]; - - static const _whitePointD65 = [95.047, 100.0, 108.883]; - - /// Converts a color from RGB components to ARGB format. - static int argbFromRgb(int red, int green, int blue) { - return 255 << 24 | (red & 255) << 16 | (green & 255) << 8 | blue & 255; - } - - /// Converts a color from linear RGB components to ARGB format. - static int argbFromLinrgb(List linrgb) { - final r = delinearized(linrgb[0]); - final g = delinearized(linrgb[1]); - final b = delinearized(linrgb[2]); - return argbFromRgb(r, g, b); - } - - /// Returns the alpha component of a color in ARGB format. - static int alphaFromArgb(int argb) { - return argb >> 24 & 255; - } - - /// Returns the red component of a color in ARGB format. - static int redFromArgb(int argb) { - return argb >> 16 & 255; - } - - /// Returns the green component of a color in ARGB format. - static int greenFromArgb(int argb) { - return argb >> 8 & 255; - } - - /// Returns the blue component of a color in ARGB format. - static int blueFromArgb(int argb) { - return argb & 255; - } - - /// Returns whether a color in ARGB format is opaque. - static bool isOpaque(int argb) { - return alphaFromArgb(argb) >= 255; - } - - /// Converts a color from ARGB to XYZ. - static int argbFromXyz(double x, double y, double z) { - final matrix = _xyzToSrgb; - final linearR = matrix[0][0] * x + matrix[0][1] * y + matrix[0][2] * z; - final linearG = matrix[1][0] * x + matrix[1][1] * y + matrix[1][2] * z; - final linearB = matrix[2][0] * x + matrix[2][1] * y + matrix[2][2] * z; - final r = delinearized(linearR); - final g = delinearized(linearG); - final b = delinearized(linearB); - return argbFromRgb(r, g, b); - } - - /// Converts a color from XYZ to ARGB. - static List xyzFromArgb(int argb) { - final r = linearized(redFromArgb(argb)); - final g = linearized(greenFromArgb(argb)); - final b = linearized(blueFromArgb(argb)); - return MathUtils.matrixMultiply([r, g, b], _srgbToXyz); - } - - /// Converts a color represented in Lab color space into an ARGB - /// integer. - static int argbFromLab(double l, double a, double b) { - final whitePoint = _whitePointD65; - final fy = (l + 16.0) / 116.0; - final fx = a / 500.0 + fy; - final fz = fy - b / 200.0; - final xNormalized = _labInvf(fx); - final yNormalized = _labInvf(fy); - final zNormalized = _labInvf(fz); - final x = xNormalized * whitePoint[0]; - final y = yNormalized * whitePoint[1]; - final z = zNormalized * whitePoint[2]; - return argbFromXyz(x, y, z); - } - - /// Converts a color from ARGB representation to L*a*b* - /// representation. - /// - /// [argb] the ARGB representation of a color - /// Returns a Lab object representing the color - static List labFromArgb(int argb) { - final linearR = linearized(redFromArgb(argb)); - final linearG = linearized(greenFromArgb(argb)); - final linearB = linearized(blueFromArgb(argb)); - final matrix = _srgbToXyz; - final x = - matrix[0][0] * linearR + - matrix[0][1] * linearG + - matrix[0][2] * linearB; - final y = - matrix[1][0] * linearR + - matrix[1][1] * linearG + - matrix[1][2] * linearB; - final z = - matrix[2][0] * linearR + - matrix[2][1] * linearG + - matrix[2][2] * linearB; - final whitePoint = _whitePointD65; - final xNormalized = x / whitePoint[0]; - final yNormalized = y / whitePoint[1]; - final zNormalized = z / whitePoint[2]; - final fx = _labF(xNormalized); - final fy = _labF(yNormalized); - final fz = _labF(zNormalized); - final l = 116.0 * fy - 16; - final a = 500.0 * (fx - fy); - final b = 200.0 * (fy - fz); - return [l, a, b]; - } - - /// Converts an L* value to an ARGB representation. - /// - /// [lstar] L* in L*a*b* - /// Returns ARGB representation of grayscale color with lightness - /// matching L* - static int argbFromLstar(double lstar) { - final y = yFromLstar(lstar); - final component = delinearized(y); - return argbFromRgb(component, component, component); - } - - /// Computes the L* value of a color in ARGB representation. - /// - /// [argb] ARGB representation of a color - /// Returns L*, from L*a*b*, coordinate of the color - static double lstarFromArgb(int argb) { - final y = xyzFromArgb(argb)[1]; - return 116.0 * _labF(y / 100.0) - 16.0; - } - - /// Converts an L* value to a Y value. - /// - /// L* in L*a*b* and Y in XYZ measure the same quantity, luminance. - /// - /// L* measures perceptual luminance, a linear scale. Y in XYZ - /// measures relative luminance, a logarithmic scale. - /// - /// [lstar] L* in L*a*b* - /// Returns Y in XYZ - static double yFromLstar(double lstar) { - return 100.0 * _labInvf((lstar + 16.0) / 116.0); - } - - /// Converts a Y value to an L* value. - /// - /// L* in L*a*b* and Y in XYZ measure the same quantity, luminance. - /// - /// L* measures perceptual luminance, a linear scale. Y in XYZ - /// measures relative luminance, a logarithmic scale. - /// - /// [y] Y in XYZ - /// Returns L* in L*a*b* - static double lstarFromY(double y) { - return _labF(y / 100.0) * 116.0 - 16.0; - } - - /// Linearizes an RGB component. - /// - /// [rgbComponent] 0 <= rgb_component <= 255, represents R/G/B - /// channel - /// Returns 0.0 <= output <= 100.0, color channel converted to - /// linear RGB space - static double linearized(int rgbComponent) { - final normalized = rgbComponent / 255.0; - if (normalized <= 0.040449936) { - return normalized / 12.92 * 100.0; - } else { - return pow((normalized + 0.055) / 1.055, 2.4).toDouble() * 100.0; - } - } - - /// Delinearizes an RGB component. - /// - /// [rgbComponent] 0.0 <= rgb_component <= 100.0, represents linear - /// R/G/B channel - /// Returns 0 <= output <= 255, color channel converted to regular - /// RGB space - static int delinearized(double rgbComponent) { - final normalized = rgbComponent / 100.0; - var delinearized = 0.0; - if (normalized <= 0.0031308) { - delinearized = normalized * 12.92; - } else { - delinearized = 1.055 * pow(normalized, 1.0 / 2.4).toDouble() - 0.055; - } - return MathUtils.clampInt(0, 255, (delinearized * 255.0).round()); - } - - /// Returns the standard white point; white on a sunny day. - /// - /// Returns The white point - static List whitePointD65() { - return _whitePointD65; - } - - static double _labF(double t) { - final e = 216.0 / 24389.0; - final kappa = 24389.0 / 27.0; - if (t > e) { - return pow(t, 1.0 / 3.0).toDouble(); - } else { - return (kappa * t + 16) / 116; - } - } - - static double _labInvf(double ft) { - final e = 216.0 / 24389.0; - final kappa = 24389.0 / 27.0; - final ft3 = ft * ft * ft; - if (ft3 > e) { - return ft3; - } else { - return (116 * ft - 16) / kappa; - } - } -} diff --git a/dart/lib/utils/math_utils.dart b/dart/lib/utils/math_utils.dart deleted file mode 100644 index df4238af..00000000 --- a/dart/lib/utils/math_utils.dart +++ /dev/null @@ -1,124 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This file is automatically generated. Do not modify it. - -/// Utility methods for mathematical operations. -class MathUtils { - /// The signum function. - /// - /// Returns 1 if num > 0, -1 if num < 0, and 0 if num = 0 - static int signum(double num) { - if (num < 0) { - return -1; - } else if (num == 0) { - return 0; - } else { - return 1; - } - } - - /// The linear interpolation function. - /// - /// Returns start if amount = 0 and stop if amount = 1 - static double lerp(double start, double stop, double amount) { - return (1.0 - amount) * start + amount * stop; - } - - /// Clamps an integer between two integers. - /// - /// Returns input when min <= input <= max, and either min or max - /// otherwise. - static int clampInt(int min, int max, int input) { - if (input < min) { - return min; - } else if (input > max) { - return max; - } - - return input; - } - - /// Clamps an integer between two floating-point numbers. - /// - /// Returns input when min <= input <= max, and either min or max - /// otherwise. - static double clampDouble(double min, double max, double input) { - if (input < min) { - return min; - } else if (input > max) { - return max; - } - - return input; - } - - /// Sanitizes a degree measure as an integer. - /// - /// Returns a degree measure between 0 (inclusive) and 360 - /// (exclusive). - static int sanitizeDegreesInt(int degrees) { - degrees = degrees % 360; - if (degrees < 0) { - degrees = degrees + 360; - } - return degrees; - } - - /// Sanitizes a degree measure as a floating-point number. - /// - /// Returns a degree measure between 0.0 (inclusive) and 360.0 - /// (exclusive). - static double sanitizeDegreesDouble(double degrees) { - degrees = degrees % 360.0; - if (degrees < 0) { - degrees = degrees + 360.0; - } - return degrees; - } - - /// Sign of direction change needed to travel from one angle to - /// another. - /// - /// For angles that are 180 degrees apart from each other, both - /// directions have the same travel distance, so either direction is - /// shortest. The value 1.0 is returned in this case. - /// - /// [from] The angle travel starts from, in degrees. - /// [to] The angle travel ends at, in degrees. - /// Returns -1 if decreasing from leads to the shortest travel - /// distance, 1 if increasing from leads to the shortest travel - /// distance. - static double rotationDirection(double from, double to) { - final increasingDifference = sanitizeDegreesDouble(to - from); - return increasingDifference <= 180.0 ? 1.0 : -1.0; - } - - /// Distance of two points on a circle, represented using degrees. - static double differenceDegrees(double a, double b) { - return 180.0 - ((a - b).abs() - 180.0).abs(); - } - - /// Multiplies a 1x3 row vector with a 3x3 matrix. - static List matrixMultiply( - List row, List> matrix) { - final a = - row[0] * matrix[0][0] + row[1] * matrix[0][1] + row[2] * matrix[0][2]; - final b = - row[0] * matrix[1][0] + row[1] * matrix[1][1] + row[2] * matrix[1][2]; - final c = - row[0] * matrix[2][0] + row[1] * matrix[2][1] + row[2] * matrix[2][2]; - return [a, b, c]; - } -} diff --git a/dart/lib/utils/string_utils.dart b/dart/lib/utils/string_utils.dart deleted file mode 100644 index 776fe091..00000000 --- a/dart/lib/utils/string_utils.dart +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'color_utils.dart'; - -class StringUtils { - static String hexFromArgb(int argb, {bool leadingHashSign = true}) { - final red = ColorUtils.redFromArgb(argb); - final green = ColorUtils.greenFromArgb(argb); - final blue = ColorUtils.blueFromArgb(argb); - return '${leadingHashSign ? '#' : ''}' - '${red.toRadixString(16).padLeft(2, '0').toUpperCase()}' - '${green.toRadixString(16).padLeft(2, '0').toUpperCase()}' - '${blue.toRadixString(16).padLeft(2, '0').toUpperCase()}'; - } - - static int? argbFromHex(String hex) { - return int.tryParse(hex.replaceAll('#', ''), radix: 16); - } -} diff --git a/dart/pubspec.yaml b/dart/pubspec.yaml deleted file mode 100644 index 3bd8c994..00000000 --- a/dart/pubspec.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2021 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -name: material_color_utilities -description: Algorithms and utilities that power the Material Design 3 color system, including choosing theme colors from images and creating tones of colors; all in a new color space. -version: 0.13.0 -repository: https://github.com/material-foundation/material-color-utilities/tree/main/dart -issue_tracker: https://github.com/material-foundation/material-color-utilities/issues -screenshots: - - description: "App showing the Material You color system." - path: screenshots/material_you_1.png - - description: "App showing the Material You color system." - path: screenshots/material_you_2.png - - description: "App showing the Material You color system." - path: screenshots/material_you_3.png - - description: "App showing the Material You color system." - path: screenshots/material_you_4.png - -environment: - sdk: ^3.5.0 - -dependencies: - collection: ^1.15.0 # used by tonal_palette.dart - -dev_dependencies: - dart_flutter_team_lints: ^3.0.0 - matcher: ^0.12.0 # used by color_matcher.dart - test: ^1.16.0 diff --git a/dart/screenshots/material_you_1.png b/dart/screenshots/material_you_1.png deleted file mode 100644 index b98b28d5..00000000 Binary files a/dart/screenshots/material_you_1.png and /dev/null differ diff --git a/dart/screenshots/material_you_2.png b/dart/screenshots/material_you_2.png deleted file mode 100644 index 8fc22c7b..00000000 Binary files a/dart/screenshots/material_you_2.png and /dev/null differ diff --git a/dart/screenshots/material_you_3.png b/dart/screenshots/material_you_3.png deleted file mode 100644 index 094926ee..00000000 Binary files a/dart/screenshots/material_you_3.png and /dev/null differ diff --git a/dart/screenshots/material_you_4.png b/dart/screenshots/material_you_4.png deleted file mode 100644 index 17672969..00000000 Binary files a/dart/screenshots/material_you_4.png and /dev/null differ diff --git a/dart/test/blend_test.dart b/dart/test/blend_test.dart deleted file mode 100644 index a33cff81..00000000 --- a/dart/test/blend_test.dart +++ /dev/null @@ -1,86 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:material_color_utilities/blend/blend.dart'; -import 'package:test/test.dart'; - -import './utils/color_matcher.dart'; - -const red = 0xffff0000; -const blue = 0xff0000ff; -const green = 0xff00ff00; -const yellow = 0xffffff00; -void main() { - group('Harmonize', () { - test('redToBlue', () { - final answer = Blend.harmonize(red, blue); - expect(answer, isColor(0xffFB0057)); - }); - - test('redToGreen', () { - final answer = Blend.harmonize(red, green); - expect(answer, isColor(0xffD85600)); - }); - - test('redToYellow', () { - final answer = Blend.harmonize(red, yellow); - expect(answer, isColor(0xffD85600)); - }); - - test('blueToGreen', () { - final answer = Blend.harmonize(blue, green); - expect(answer, isColor(0xff0047A3)); - }); - - test('blueToRed', () { - final answer = Blend.harmonize(blue, red); - expect(answer, isColor(0xff5700DC)); - }); - - test('blueToYellow', () { - final answer = Blend.harmonize(blue, yellow); - expect(answer, isColor(0xff0047A3)); - }); - - test('greenToBlue', () { - final answer = Blend.harmonize(green, blue); - expect(answer, isColor(0xff00FC94)); - }); - - test('greenToRed', () { - final answer = Blend.harmonize(green, red); - expect(answer, isColor(0xffB1F000)); - }); - - test('greenToYellow', () { - final answer = Blend.harmonize(green, yellow); - expect(answer, isColor(0xffB1F000)); - }); - - test('yellowToBlue', () { - final answer = Blend.harmonize(yellow, blue); - expect(answer, isColor(0xffEBFFBA)); - }); - - test('yellowToGreen', () { - final answer = Blend.harmonize(yellow, green); - expect(answer, isColor(0xffEBFFBA)); - }); - - test('yellowToRed', () { - final answer = Blend.harmonize(yellow, red); - expect(answer, isColor(0xffFFF6E3)); - }); - }); -} diff --git a/dart/test/color_utils_test.dart b/dart/test/color_utils_test.dart deleted file mode 100644 index a843e9b5..00000000 --- a/dart/test/color_utils_test.dart +++ /dev/null @@ -1,212 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:material_color_utilities/utils/color_utils.dart'; -import 'package:test/test.dart'; - -List _range(double start, double stop, int caseCount) { - var stepSize = (stop - start) / (caseCount - 1); - return List.generate(caseCount, (index) => start + stepSize * index); -} - -List get rgbRange => - _range(0.0, 255.0, 8).map((element) => element.round()).toList(); - -List get fullRgbRange => List.generate(256, (index) => index); - -void main() { - test('range_integrity', () { - final range = _range(3.0, 9999.0, 1234); - for (var i = 0; i < 1234; i++) { - expect(range[i], closeTo(3 + 8.1070559611 * i, 1e-5)); - } - }); - - group('argbFromRgb', () { - test('returns correct value for black', () { - expect(ColorUtils.argbFromRgb(0, 0, 0), 0xff000000); - expect(ColorUtils.argbFromRgb(0, 0, 0), 4278190080); - }); - - test('returns correct value for white', () { - expect(ColorUtils.argbFromRgb(255, 255, 255), 0xffffffff); - expect(ColorUtils.argbFromRgb(255, 255, 255), 4294967295); - }); - - test('returns correct value for random color', () { - expect(ColorUtils.argbFromRgb(50, 150, 250), 0xff3296fa); - expect(ColorUtils.argbFromRgb(50, 150, 250), 4281505530); - }); - }); - - test('y_to_lstar_to_y', () { - for (final y in _range(0, 100, 1001)) { - expect(ColorUtils.yFromLstar(ColorUtils.lstarFromY(y)), closeTo(y, 1e-5)); - } - }); - - test('lstar_to_y_to_lstar', () { - for (final lstar in _range(0, 100, 1001)) { - expect( - ColorUtils.lstarFromY(ColorUtils.yFromLstar(lstar)), - closeTo(lstar, 1e-5), - ); - } - }); - - test('yFromLstar', () { - expect(ColorUtils.yFromLstar(0.0), closeTo(0.0, 1e-5)); - expect(ColorUtils.yFromLstar(0.1), closeTo(0.0110705, 1e-5)); - expect(ColorUtils.yFromLstar(0.2), closeTo(0.0221411, 1e-5)); - expect(ColorUtils.yFromLstar(0.3), closeTo(0.0332116, 1e-5)); - expect(ColorUtils.yFromLstar(0.4), closeTo(0.0442822, 1e-5)); - expect(ColorUtils.yFromLstar(0.5), closeTo(0.0553528, 1e-5)); - expect(ColorUtils.yFromLstar(1.0), closeTo(0.1107056, 1e-5)); - expect(ColorUtils.yFromLstar(2.0), closeTo(0.2214112, 1e-5)); - expect(ColorUtils.yFromLstar(3.0), closeTo(0.3321169, 1e-5)); - expect(ColorUtils.yFromLstar(4.0), closeTo(0.4428225, 1e-5)); - expect(ColorUtils.yFromLstar(5.0), closeTo(0.5535282, 1e-5)); - expect(ColorUtils.yFromLstar(8.0), closeTo(0.8856451, 1e-5)); - expect(ColorUtils.yFromLstar(10.0), closeTo(1.1260199, 1e-5)); - expect(ColorUtils.yFromLstar(15.0), closeTo(1.9085832, 1e-5)); - expect(ColorUtils.yFromLstar(20.0), closeTo(2.9890524, 1e-5)); - expect(ColorUtils.yFromLstar(25.0), closeTo(4.4154767, 1e-5)); - expect(ColorUtils.yFromLstar(30.0), closeTo(6.2359055, 1e-5)); - expect(ColorUtils.yFromLstar(40.0), closeTo(11.2509737, 1e-5)); - expect(ColorUtils.yFromLstar(50.0), closeTo(18.4186518, 1e-5)); - expect(ColorUtils.yFromLstar(60.0), closeTo(28.1233342, 1e-5)); - expect(ColorUtils.yFromLstar(70.0), closeTo(40.7494157, 1e-5)); - expect(ColorUtils.yFromLstar(80.0), closeTo(56.6812907, 1e-5)); - expect(ColorUtils.yFromLstar(90.0), closeTo(76.3033539, 1e-5)); - expect(ColorUtils.yFromLstar(95.0), closeTo(87.6183294, 1e-5)); - expect(ColorUtils.yFromLstar(99.0), closeTo(97.4360239, 1e-5)); - expect(ColorUtils.yFromLstar(100.0), closeTo(100.0, 1e-5)); - }); - - test('lstarFromY', () { - expect(ColorUtils.lstarFromY(0.0), closeTo(0.0, 1e-5)); - expect(ColorUtils.lstarFromY(0.1), closeTo(0.9032962, 1e-5)); - expect(ColorUtils.lstarFromY(0.2), closeTo(1.8065925, 1e-5)); - expect(ColorUtils.lstarFromY(0.3), closeTo(2.7098888, 1e-5)); - expect(ColorUtils.lstarFromY(0.4), closeTo(3.6131851, 1e-5)); - expect(ColorUtils.lstarFromY(0.5), closeTo(4.5164814, 1e-5)); - expect(ColorUtils.lstarFromY(0.8856451), closeTo(8.0, 1e-5)); - expect(ColorUtils.lstarFromY(1.0), closeTo(8.9914424, 1e-5)); - expect(ColorUtils.lstarFromY(2.0), closeTo(15.4872443, 1e-5)); - expect(ColorUtils.lstarFromY(3.0), closeTo(20.0438970, 1e-5)); - expect(ColorUtils.lstarFromY(4.0), closeTo(23.6714419, 1e-5)); - expect(ColorUtils.lstarFromY(5.0), closeTo(26.7347653, 1e-5)); - expect(ColorUtils.lstarFromY(10.0), closeTo(37.8424304, 1e-5)); - expect(ColorUtils.lstarFromY(15.0), closeTo(45.6341970, 1e-5)); - expect(ColorUtils.lstarFromY(20.0), closeTo(51.8372115, 1e-5)); - expect(ColorUtils.lstarFromY(25.0), closeTo(57.0754208, 1e-5)); - expect(ColorUtils.lstarFromY(30.0), closeTo(61.6542222, 1e-5)); - expect(ColorUtils.lstarFromY(40.0), closeTo(69.4695307, 1e-5)); - expect(ColorUtils.lstarFromY(50.0), closeTo(76.0692610, 1e-5)); - expect(ColorUtils.lstarFromY(60.0), closeTo(81.8381891, 1e-5)); - expect(ColorUtils.lstarFromY(70.0), closeTo(86.9968642, 1e-5)); - expect(ColorUtils.lstarFromY(80.0), closeTo(91.6848609, 1e-5)); - expect(ColorUtils.lstarFromY(90.0), closeTo(95.9967686, 1e-5)); - expect(ColorUtils.lstarFromY(95.0), closeTo(98.0335184, 1e-5)); - expect(ColorUtils.lstarFromY(99.0), closeTo(99.6120372, 1e-5)); - expect(ColorUtils.lstarFromY(100.0), closeTo(100.0, 1e-5)); - }); - - test('y_continuity', () { - final epsilon = 1e-6; - final delta = 1e-8; - final left = 8.0 - delta; - final mid = 8.0; - final right = 8.0 + delta; - expect( - ColorUtils.yFromLstar(left), - closeTo(ColorUtils.yFromLstar(mid), epsilon), - ); - expect( - ColorUtils.yFromLstar(right), - closeTo(ColorUtils.yFromLstar(mid), epsilon), - ); - }); - - test('rgb_to_xyz_to_rgb', () { - for (final r in rgbRange) { - for (final g in rgbRange) { - for (final b in rgbRange) { - final argb = ColorUtils.argbFromRgb(r, g, b); - final xyz = ColorUtils.xyzFromArgb(argb); - final converted = ColorUtils.argbFromXyz(xyz[0], xyz[1], xyz[2]); - expect(ColorUtils.redFromArgb(converted), closeTo(r, 1.5)); - expect(ColorUtils.greenFromArgb(converted), closeTo(g, 1.5)); - expect(ColorUtils.blueFromArgb(converted), closeTo(b, 1.5)); - } - } - } - }); - - test('rgb_to_lab_to_rgb', () { - for (final r in rgbRange) { - for (final g in rgbRange) { - for (final b in rgbRange) { - final argb = ColorUtils.argbFromRgb(r, g, b); - final lab = ColorUtils.labFromArgb(argb); - final converted = ColorUtils.argbFromLab(lab[0], lab[1], lab[2]); - expect(ColorUtils.redFromArgb(converted), closeTo(r, 1.5)); - expect(ColorUtils.greenFromArgb(converted), closeTo(g, 1.5)); - expect(ColorUtils.blueFromArgb(converted), closeTo(b, 1.5)); - } - } - } - }); - - test('rgb_to_lstar_to_rgb', () { - for (final component in fullRgbRange) { - final argb = ColorUtils.argbFromRgb(component, component, component); - final lstar = ColorUtils.lstarFromArgb(argb); - final converted = ColorUtils.argbFromLstar(lstar); - expect(converted, argb); - } - }); - - test('rgb_to_lstar_to_y_commutes', () { - for (final r in rgbRange) { - for (final g in rgbRange) { - for (final b in rgbRange) { - final argb = ColorUtils.argbFromRgb(r, g, b); - final lstar = ColorUtils.lstarFromArgb(argb); - final y = ColorUtils.yFromLstar(lstar); - final y2 = ColorUtils.xyzFromArgb(argb)[1]; - expect(y, closeTo(y2, 1e-5)); - } - } - } - }); - - test('lstar_to_rgb_to_y_commutes', () { - for (final lstar in _range(0, 100, 1001)) { - final argb = ColorUtils.argbFromLstar(lstar); - final y = ColorUtils.xyzFromArgb(argb)[1]; - final y2 = ColorUtils.yFromLstar(lstar); - expect(y, closeTo(y2, 1)); - } - }); - - test('linearize_delinearize', () { - for (final rgbComponent in fullRgbRange) { - final converted = ColorUtils.delinearized( - ColorUtils.linearized(rgbComponent), - ); - expect(converted, rgbComponent); - } - }); -} diff --git a/dart/test/contrast_test.dart b/dart/test/contrast_test.dart deleted file mode 100644 index c72a2df2..00000000 --- a/dart/test/contrast_test.dart +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -import 'package:material_color_utilities/contrast/contrast.dart'; -import 'package:test/test.dart'; - -void main() { - test('ratioOfTones_outOfBoundsInput', () { - expect(21.0, closeTo(Contrast.ratioOfTones(-10.0, 110.0), 0.001)); - }); - - test('lighter_impossibleRatioErrors', () { - expect(-1.0, closeTo(Contrast.lighter(tone: 90.0, ratio: 10.0), 0.001)); - }); - - test('lighter_outOfBoundsInputAboveErrors', () { - expect(-1.0, closeTo(Contrast.lighter(tone: 110.0, ratio: 2.0), 0.001)); - }); - - test('lighter_outOfBoundsInputBelowErrors', () { - expect(-1.0, closeTo(Contrast.lighter(tone: -10.0, ratio: 2.0), 0.001)); - }); - - test('lighterUnsafe_returnsMaxTone', () { - expect( - 100, closeTo(Contrast.lighterUnsafe(tone: 100.0, ratio: 2.0), 0.001)); - }); - - test('darker_impossibleRatioErrors', () { - expect(-1.0, closeTo(Contrast.darker(tone: 10.0, ratio: 20.0), 0.001)); - }); - - test('darker_outOfBoundsInputAboveErrors', () { - expect(-1.0, closeTo(Contrast.darker(tone: 110.0, ratio: 2.0), 0.001)); - }); - - test('darker_outOfBoundsInputBelowErrors', () { - expect(-1.0, closeTo(Contrast.darker(tone: -10.0, ratio: 2.0), 0.001)); - }); - - test('darkerUnsafe_returnsMinTone', () { - expect(0.0, closeTo(Contrast.darkerUnsafe(tone: 0.0, ratio: 2.0), 0.001)); - }); -} diff --git a/dart/test/dislike_analyzer_test.dart b/dart/test/dislike_analyzer_test.dart deleted file mode 100644 index d6211194..00000000 --- a/dart/test/dislike_analyzer_test.dart +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:material_color_utilities/dislike/dislike_analyzer.dart'; -import 'package:material_color_utilities/hct/hct.dart'; -import 'package:test/test.dart'; - -void main() { - group(DislikeAnalyzer, () { - test('Monk Skin Tone Scale colors liked', () { - // From https://skintone.google#/get-started - final monkSkinToneScaleColors = [ - 0xfff6ede4, - 0xfff3e7db, - 0xfff7ead0, - 0xffeadaba, - 0xffd7bd96, - 0xffa07e56, - 0xff825c43, - 0xff604134, - 0xff3a312a, - 0xff292420, - ]; - for (var color in monkSkinToneScaleColors) { - expect(DislikeAnalyzer.isDisliked(Hct.fromInt(color)), false); - } - }); - - test('bile colors disliked', () { - final unlikable = [ - 0xff95884B, - 0xff716B40, - 0xffB08E00, - 0xff4C4308, - 0xff464521, - ]; - for (var color in unlikable) { - expect(DislikeAnalyzer.isDisliked(Hct.fromInt(color)), true, - reason: '$color was likable'); - } - }); - - test('bile colors became likable', () { - final unlikable = [ - 0xff95884B, - 0xff716B40, - 0xffB08E00, - 0xff4C4308, - 0xff464521, - ]; - for (var color in unlikable) { - final hct = Hct.fromInt(color); - expect(DislikeAnalyzer.isDisliked(hct), true); - final likable = DislikeAnalyzer.fixIfDisliked(hct); - expect(DislikeAnalyzer.isDisliked(likable), false); - } - }); - - test('tone 67 not disliked', () { - final color = Hct.from(100.0, 50.0, 67.0); - expect(DislikeAnalyzer.isDisliked(color), false); - expect(DislikeAnalyzer.fixIfDisliked(color).toInt(), color.toInt()); - }); - }); -} diff --git a/dart/test/dynamic_color_test.dart b/dart/test/dynamic_color_test.dart deleted file mode 100644 index 32f282bd..00000000 --- a/dart/test/dynamic_color_test.dart +++ /dev/null @@ -1,370 +0,0 @@ -// Copyright 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:material_color_utilities/contrast/contrast.dart'; -import 'package:material_color_utilities/dynamiccolor/dynamic_color.dart'; -import 'package:material_color_utilities/dynamiccolor/material_dynamic_colors.dart'; -import 'package:material_color_utilities/hct/hct.dart'; -import 'package:material_color_utilities/scheme/scheme_content.dart'; -import 'package:material_color_utilities/scheme/scheme_fidelity.dart'; -import 'package:material_color_utilities/scheme/scheme_monochrome.dart'; -import 'package:material_color_utilities/scheme/scheme_tonal_spot.dart'; -import 'package:test/test.dart'; - -final seedColors = [ - Hct.fromInt(0xFFFF0000), - Hct.fromInt(0xFFFFFF00), - Hct.fromInt(0xFF00FF00), - Hct.fromInt(0xFF0000FF), -]; - -final contrastLevels = [-1.0, -0.5, 0.0, 0.5, 1.0]; - -class _Pair { - final String fgName; - final String bgName; - - _Pair(this.fgName, this.bgName); -} - -final _colors = { - 'background': MaterialDynamicColors.background, - 'on_background': MaterialDynamicColors.onBackground, - 'surface': MaterialDynamicColors.surface, - 'surface_dim': MaterialDynamicColors.surfaceDim, - 'surface_bright': MaterialDynamicColors.surfaceBright, - 'surface_container_lowest': MaterialDynamicColors.surfaceContainerLowest, - 'surface_container_low': MaterialDynamicColors.surfaceContainerLow, - 'surface_container': MaterialDynamicColors.surfaceContainer, - 'surface_container_high': MaterialDynamicColors.surfaceContainerHigh, - 'surface_container_highest': MaterialDynamicColors.surfaceContainerHighest, - 'on_surface': MaterialDynamicColors.onSurface, - 'surface_variant': MaterialDynamicColors.surfaceVariant, - 'on_surface_variant': MaterialDynamicColors.onSurfaceVariant, - 'inverse_surface': MaterialDynamicColors.inverseSurface, - 'inverse_on_surface': MaterialDynamicColors.inverseOnSurface, - 'outline': MaterialDynamicColors.outline, - 'outline_variant': MaterialDynamicColors.outlineVariant, - 'shadow': MaterialDynamicColors.shadow, - 'scrim': MaterialDynamicColors.scrim, - 'surface_tint': MaterialDynamicColors.surfaceTint, - 'primary': MaterialDynamicColors.primary, - 'on_primary': MaterialDynamicColors.onPrimary, - 'primary_container': MaterialDynamicColors.primaryContainer, - 'on_primary_container': MaterialDynamicColors.onPrimaryContainer, - 'inverse_primary': MaterialDynamicColors.inversePrimary, - 'secondary': MaterialDynamicColors.secondary, - 'on_secondary': MaterialDynamicColors.onSecondary, - 'secondary_container': MaterialDynamicColors.secondaryContainer, - 'on_secondary_container': MaterialDynamicColors.onSecondaryContainer, - 'tertiary': MaterialDynamicColors.tertiary, - 'on_tertiary': MaterialDynamicColors.onTertiary, - 'tertiary_container': MaterialDynamicColors.tertiaryContainer, - 'on_tertiary_container': MaterialDynamicColors.onTertiaryContainer, - 'error': MaterialDynamicColors.error, - 'on_error': MaterialDynamicColors.onError, - 'error_container': MaterialDynamicColors.errorContainer, - 'on_error_container': MaterialDynamicColors.onErrorContainer, -}; - -final _textSurfacePairs = [ - _Pair('on_primary', 'primary'), - _Pair('on_primary_container', 'primary_container'), - _Pair('on_secondary', 'secondary'), - _Pair('on_secondary_container', 'secondary_container'), - _Pair('on_tertiary', 'tertiary'), - _Pair('on_tertiary_container', 'tertiary_container'), - _Pair('on_error', 'error'), - _Pair('on_error_container', 'error_container'), - _Pair('on_background', 'background'), - _Pair('on_surface_variant', 'surface_bright'), - _Pair('on_surface_variant', 'surface_dim'), - _Pair('inverse_on_surface', 'inverse_surface'), -]; - -void main() { - test('Values are correct', () { - expect( - MaterialDynamicColors.onPrimaryContainer.getArgb(SchemeFidelity( - sourceColorHct: Hct.fromInt(0xFFFF0000), - isDark: false, - contrastLevel: 0.5, - )), - equals(0xFFFFFFFF), - ); - expect( - MaterialDynamicColors.onSecondaryContainer.getArgb(SchemeContent( - sourceColorHct: Hct.fromInt(0xFF0000FF), - isDark: false, - contrastLevel: 0.5, - )), - equals(0xFFFFFFFF), - ); - expect( - MaterialDynamicColors.onTertiaryContainer.getArgb(SchemeContent( - sourceColorHct: Hct.fromInt(0xFFFFFF00), - isDark: true, - contrastLevel: -0.5, - )), - equals(0xff959b1a), - ); - expect( - MaterialDynamicColors.inverseSurface.getArgb(SchemeContent( - sourceColorHct: Hct.fromInt(0xFF0000FF), - isDark: false, - contrastLevel: 0.0)), - equals(0xFF2F2F3B), - ); - expect( - MaterialDynamicColors.inversePrimary.getArgb(SchemeContent( - sourceColorHct: Hct.fromInt(0xFFFF0000), - isDark: false, - contrastLevel: -0.5)), - equals(0xffff422f), - ); - expect( - MaterialDynamicColors.outlineVariant.getArgb(SchemeContent( - sourceColorHct: Hct.fromInt(0xFFFFFF00), - isDark: true, - contrastLevel: 0.0)), - equals(0xFF484831), - ); - }); - - // Parametric test, ensuring that dynamic schemes respect contrast - // between text-surface pairs. - - for (final color in seedColors) { - for (final contrastLevel in contrastLevels) { - for (final isDark in [false, true]) { - for (final scheme in [ - SchemeContent( - sourceColorHct: color, - isDark: isDark, - contrastLevel: contrastLevel), - SchemeMonochrome( - sourceColorHct: color, - isDark: isDark, - contrastLevel: contrastLevel), - SchemeTonalSpot( - sourceColorHct: color, - isDark: isDark, - contrastLevel: contrastLevel), - SchemeFidelity( - sourceColorHct: color, - isDark: isDark, - contrastLevel: contrastLevel), - ]) { - test( - 'Scheme: $scheme; Seed color: $color; ' - 'Contrast level: $contrastLevel; Dark: $isDark', () { - for (final pair in _textSurfacePairs) { - // Expect that each text-surface pair has a - // minimum contrast of 4.5 (unreduced contrast), or 3.0 - // (reduced contrast). - final fgName = pair.fgName; - final bgName = pair.bgName; - final foregroundTone = _colors[fgName]!.getHct(scheme).tone; - final backgroundTone = _colors[bgName]!.getHct(scheme).tone; - final contrast = - Contrast.ratioOfTones(foregroundTone, backgroundTone); - - final minimumRequirement = contrastLevel >= 0.0 ? 4.5 : 3.0; - - expect( - contrast, - greaterThanOrEqualTo(minimumRequirement), - reason: 'Contrast $contrast is too low between ' - 'foreground ($fgName; $foregroundTone) and ' - 'background ($bgName; $backgroundTone)', - ); - } - }); - } - } - } - } - - // Tests for fixed colors. - test('fixed colors in non-monochrome schemes', () { - final scheme = SchemeTonalSpot( - sourceColorHct: Hct.fromInt(0xFFFF0000), - isDark: true, - contrastLevel: 0.0, - ); - - expect( - MaterialDynamicColors.primaryFixed.getHct(scheme).tone, - closeTo(90.0, 1.0), - ); - expect( - MaterialDynamicColors.primaryFixedDim.getHct(scheme).tone, - closeTo(80.0, 1.0), - ); - expect( - MaterialDynamicColors.onPrimaryFixed.getHct(scheme).tone, - closeTo(10.0, 1.0), - ); - expect( - MaterialDynamicColors.onPrimaryFixedVariant.getHct(scheme).tone, - closeTo(30.0, 1.0), - ); - expect( - MaterialDynamicColors.secondaryFixed.getHct(scheme).tone, - closeTo(90.0, 1.0), - ); - expect( - MaterialDynamicColors.secondaryFixedDim.getHct(scheme).tone, - closeTo(80.0, 1.0), - ); - expect( - MaterialDynamicColors.onSecondaryFixed.getHct(scheme).tone, - closeTo(10.0, 1.0), - ); - expect( - MaterialDynamicColors.onSecondaryFixedVariant.getHct(scheme).tone, - closeTo(30.0, 1.0), - ); - expect( - MaterialDynamicColors.tertiaryFixed.getHct(scheme).tone, - closeTo(90.0, 1.0), - ); - expect( - MaterialDynamicColors.tertiaryFixedDim.getHct(scheme).tone, - closeTo(80.0, 1.0), - ); - expect( - MaterialDynamicColors.onTertiaryFixed.getHct(scheme).tone, - closeTo(10.0, 1.0), - ); - expect( - MaterialDynamicColors.onTertiaryFixedVariant.getHct(scheme).tone, - closeTo(30.0, 1.0), - ); - }); - - test('fixed colors in light monochrome schemes', () { - final scheme = SchemeMonochrome( - sourceColorHct: Hct.fromInt(0xFFFF0000), - isDark: false, - contrastLevel: 0.0, - ); - - expect( - MaterialDynamicColors.primaryFixed.getHct(scheme).tone, - closeTo(40.0, 1.0), - ); - expect( - MaterialDynamicColors.primaryFixedDim.getHct(scheme).tone, - closeTo(30.0, 1.0), - ); - expect( - MaterialDynamicColors.onPrimaryFixed.getHct(scheme).tone, - closeTo(100.0, 1.0), - ); - expect( - MaterialDynamicColors.onPrimaryFixedVariant.getHct(scheme).tone, - closeTo(90.0, 1.0), - ); - expect( - MaterialDynamicColors.secondaryFixed.getHct(scheme).tone, - closeTo(80.0, 1.0), - ); - expect( - MaterialDynamicColors.secondaryFixedDim.getHct(scheme).tone, - closeTo(70.0, 1.0), - ); - expect( - MaterialDynamicColors.onSecondaryFixed.getHct(scheme).tone, - closeTo(10.0, 1.0), - ); - expect( - MaterialDynamicColors.onSecondaryFixedVariant.getHct(scheme).tone, - closeTo(25.0, 1.0), - ); - expect( - MaterialDynamicColors.tertiaryFixed.getHct(scheme).tone, - closeTo(40.0, 1.0), - ); - expect( - MaterialDynamicColors.tertiaryFixedDim.getHct(scheme).tone, - closeTo(30.0, 1.0), - ); - expect( - MaterialDynamicColors.onTertiaryFixed.getHct(scheme).tone, - closeTo(100.0, 1.0), - ); - expect( - MaterialDynamicColors.onTertiaryFixedVariant.getHct(scheme).tone, - closeTo(90.0, 1.0), - ); - }); - - test('fixed colors in dark monochrome schemes', () { - final scheme = SchemeMonochrome( - sourceColorHct: Hct.fromInt(0xFFFF0000), - isDark: true, - contrastLevel: 0.0, - ); - - expect( - MaterialDynamicColors.primaryFixed.getHct(scheme).tone, - closeTo(40.0, 1.0), - ); - expect( - MaterialDynamicColors.primaryFixedDim.getHct(scheme).tone, - closeTo(30.0, 1.0), - ); - expect( - MaterialDynamicColors.onPrimaryFixed.getHct(scheme).tone, - closeTo(100.0, 1.0), - ); - expect( - MaterialDynamicColors.onPrimaryFixedVariant.getHct(scheme).tone, - closeTo(90.0, 1.0), - ); - expect( - MaterialDynamicColors.secondaryFixed.getHct(scheme).tone, - closeTo(80.0, 1.0), - ); - expect( - MaterialDynamicColors.secondaryFixedDim.getHct(scheme).tone, - closeTo(70.0, 1.0), - ); - expect( - MaterialDynamicColors.onSecondaryFixed.getHct(scheme).tone, - closeTo(10.0, 1.0), - ); - expect( - MaterialDynamicColors.onSecondaryFixedVariant.getHct(scheme).tone, - closeTo(25.0, 1.0), - ); - expect( - MaterialDynamicColors.tertiaryFixed.getHct(scheme).tone, - closeTo(40.0, 1.0), - ); - expect( - MaterialDynamicColors.tertiaryFixedDim.getHct(scheme).tone, - closeTo(30.0, 1.0), - ); - expect( - MaterialDynamicColors.onTertiaryFixed.getHct(scheme).tone, - closeTo(100.0, 1.0), - ); - expect( - MaterialDynamicColors.onTertiaryFixedVariant.getHct(scheme).tone, - closeTo(90.0, 1.0), - ); - }); -} diff --git a/dart/test/dynamic_scheme_test.dart b/dart/test/dynamic_scheme_test.dart deleted file mode 100644 index 54e909bc..00000000 --- a/dart/test/dynamic_scheme_test.dart +++ /dev/null @@ -1,53 +0,0 @@ -import 'package:material_color_utilities/dynamiccolor/dynamic_scheme.dart'; -import 'package:material_color_utilities/hct/hct.dart'; -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:test/test.dart'; - -void main() { - test('0 length input', () { - final hue = DynamicScheme.getRotatedHue(Hct.from(43, 16, 16), [], []); - expect(hue, closeTo(43, 1.0)); - }); - - test('1 length input no rotation', () { - final hue = DynamicScheme.getRotatedHue(Hct.from(43, 16, 16), [0], [0]); - expect(hue, closeTo(43, 1.0)); - }); - - test('input length mismatch asserts', () { - expect(() { - DynamicScheme.getRotatedHue(Hct.from(43, 16, 16), [0, 1], [0]); - }, throwsA(const TypeMatcher())); - }); - - test('on boundary rotation correct', () { - final hue = DynamicScheme.getRotatedHue( - Hct.from(43, 16, 16), - [0, 42, 360], - [0, 15, 0], - ); - expect(hue, closeTo(43 + 15, 1.0)); - }); - - test('rotation result larger than 360 degrees wraps', () { - final hue = DynamicScheme.getRotatedHue( - Hct.from(43, 16, 16), - [0, 42, 360], - [0, 480, 0], - ); - expect(hue, closeTo(163, 1.0)); - }); -} diff --git a/dart/test/hct_round_trip_test.dart b/dart/test/hct_round_trip_test.dart deleted file mode 100644 index befa7bfb..00000000 --- a/dart/test/hct_round_trip_test.dart +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:material_color_utilities/hct/hct.dart'; -import 'package:test/test.dart'; - -import './utils/color_matcher.dart'; - -void main() { - // Estimated test time: 3 ~ 4 minutes. - test('hct_preserves_original_color', () { - for (var argb = 0xFF000000; argb <= 0xFFFFFFFF; argb++) { - final hct = Hct.fromInt(argb); - final reconstructedArgb = Hct.from(hct.hue, hct.chroma, hct.tone).toInt(); - - expect(reconstructedArgb, isColor(argb)); - } - }); -} diff --git a/dart/test/hct_test.dart b/dart/test/hct_test.dart deleted file mode 100644 index 33f9aee1..00000000 --- a/dart/test/hct_test.dart +++ /dev/null @@ -1,353 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:material_color_utilities/hct/cam16.dart'; -import 'package:material_color_utilities/hct/hct.dart'; -import 'package:material_color_utilities/hct/viewing_conditions.dart'; -import 'package:material_color_utilities/utils/color_utils.dart'; -import 'package:material_color_utilities/utils/string_utils.dart'; -import 'package:test/test.dart'; - -import './utils/color_matcher.dart'; - -const black = 0xff000000; -const white = 0xffffffff; -const red = 0xffff0000; -const green = 0xff00ff00; -const blue = 0xff0000ff; -const midgray = 0xff777777; - -bool _colorIsOnBoundary(int argb) { - return ColorUtils.redFromArgb(argb) == 0 || - ColorUtils.redFromArgb(argb) == 255 || - ColorUtils.greenFromArgb(argb) == 0 || - ColorUtils.greenFromArgb(argb) == 255 || - ColorUtils.blueFromArgb(argb) == 0 || - ColorUtils.blueFromArgb(argb) == 255; -} - -void main() { - test('==, hashCode basics', () { - expect(Hct.fromInt(123), Hct.fromInt(123)); - expect(Hct.fromInt(123).hashCode, Hct.fromInt(123).hashCode); - }); - - test('conversions_areReflexive', () { - final cam = Cam16.fromInt(red); - final color = cam.viewed(ViewingConditions.standard); - expect(color, equals(red)); - }); - - test('y_midgray', () { - expect(18.418, closeTo(ColorUtils.yFromLstar(50.0), 0.001)); - }); - - test('y_black', () { - expect(0.0, closeTo(ColorUtils.yFromLstar(0.0), 0.001)); - }); - - test('y_white', () { - expect(100.0, closeTo(ColorUtils.yFromLstar(100.0), 0.001)); - }); - - test('cam_red', () { - final cam = Cam16.fromInt(red); - expect(46.445, closeTo(cam.j, 0.001)); - expect(113.357, closeTo(cam.chroma, 0.001)); - expect(27.408, closeTo(cam.hue, 0.001)); - expect(89.494, closeTo(cam.m, 0.001)); - expect(91.889, closeTo(cam.s, 0.001)); - expect(105.988, closeTo(cam.q, 0.001)); - }); - - test('cam_green', () { - final cam = Cam16.fromInt(green); - expect(79.331, closeTo(cam.j, 0.001)); - expect(108.410, closeTo(cam.chroma, 0.001)); - expect(142.139, closeTo(cam.hue, 0.001)); - expect(85.587, closeTo(cam.m, 0.001)); - expect(78.604, closeTo(cam.s, 0.001)); - expect(138.520, closeTo(cam.q, 0.001)); - }); - - test('cam_blue', () { - final cam = Cam16.fromInt(blue); - expect(25.465, closeTo(cam.j, 0.001)); - expect(87.230, closeTo(cam.chroma, 0.001)); - expect(282.788, closeTo(cam.hue, 0.001)); - expect(68.867, closeTo(cam.m, 0.001)); - expect(93.674, closeTo(cam.s, 0.001)); - expect(78.481, closeTo(cam.q, 0.001)); - }); - - test('cam_black', () { - final cam = Cam16.fromInt(black); - expect(0.0, closeTo(cam.j, 0.001)); - expect(0.0, closeTo(cam.chroma, 0.001)); - expect(0.0, closeTo(cam.hue, 0.001)); - expect(0.0, closeTo(cam.m, 0.001)); - expect(0.0, closeTo(cam.s, 0.001)); - expect(0.0, closeTo(cam.q, 0.001)); - }); - - test('cam_white', () { - final cam = Cam16.fromInt(white); - expect(100.0, closeTo(cam.j, 0.001)); - expect(2.869, closeTo(cam.chroma, 0.001)); - expect(209.492, closeTo(cam.hue, 0.001)); - expect(2.265, closeTo(cam.m, 0.001)); - expect(12.068, closeTo(cam.s, 0.001)); - expect(155.521, closeTo(cam.q, 0.001)); - }); - - test('gamutMap_red', () { - final colorToTest = red; - final cam = Cam16.fromInt(colorToTest); - final color = - Hct.from(cam.hue, cam.chroma, ColorUtils.lstarFromArgb(colorToTest)) - .toInt(); - expect(colorToTest, equals(color)); - }); - - test('gamutMap_green', () { - final colorToTest = green; - final cam = Cam16.fromInt(colorToTest); - final color = - Hct.from(cam.hue, cam.chroma, ColorUtils.lstarFromArgb(colorToTest)) - .toInt(); - expect(colorToTest, equals(color)); - }); - - test('gamutMap_blue', () { - final colorToTest = blue; - final cam = Cam16.fromInt(colorToTest); - final color = - Hct.from(cam.hue, cam.chroma, ColorUtils.lstarFromArgb(colorToTest)) - .toInt(); - expect(colorToTest, equals(color)); - }); - - test('gamutMap_white', () { - final colorToTest = white; - final cam = Cam16.fromInt(colorToTest); - final color = - Hct.from(cam.hue, cam.chroma, ColorUtils.lstarFromArgb(colorToTest)) - .toInt(); - expect(colorToTest, equals(color)); - }); - - test('gamutMap_midgray', () { - final colorToTest = green; - final cam = Cam16.fromInt(colorToTest); - final color = - Hct.from(cam.hue, cam.chroma, ColorUtils.lstarFromArgb(colorToTest)) - .toInt(); - expect(colorToTest, equals(color)); - }); - - test('HCT returns a sufficiently close color', () { - for (var hue = 15; hue < 360; hue += 30) { - for (var chroma = 0; chroma <= 100; chroma += 10) { - for (var tone = 20; tone <= 80; tone += 10) { - final hctRequestDescription = 'H$hue C$chroma T$tone'; - final hctColor = Hct.from( - hue.toDouble(), - chroma.toDouble(), - tone.toDouble(), - ); - - if (chroma > 0) { - expect( - hctColor.hue, - closeTo(hue, 4.0), - reason: 'Hue should be close for $hctRequestDescription', - ); - } - - expect( - hctColor.chroma, - inInclusiveRange(0.0, chroma + 2.5), - reason: 'Chroma should be close or less for $hctRequestDescription', - ); - - if (hctColor.chroma < chroma - 2.5) { - expect( - _colorIsOnBoundary(hctColor.toInt()), - true, - reason: 'HCT request for non-sRGB color should return ' - 'a color on the boundary of the sRGB cube ' - 'for $hctRequestDescription, but got ' - '${StringUtils.hexFromArgb(hctColor.toInt())} instead', - ); - } - - expect( - hctColor.tone, - closeTo(tone, 0.5), - reason: 'Tone should be close for $hctRequestDescription', - ); - } - } - } - }); - - group('CAM16 to XYZ', () { - test('without array', () { - final colorToTest = red; - final cam = Cam16.fromInt(colorToTest); - final xyz = cam.xyzInViewingConditions(ViewingConditions.sRgb); - expect(xyz[0], closeTo(41.23, 0.01)); - expect(xyz[1], closeTo(21.26, 0.01)); - expect(xyz[2], closeTo(1.93, 0.01)); - }); - - test('with array', () { - final colorToTest = red; - final cam = Cam16.fromInt(colorToTest); - final xyz = - cam.xyzInViewingConditions(ViewingConditions.sRgb, array: [0, 0, 0]); - expect(xyz[0], closeTo(41.23, 0.01)); - expect(xyz[1], closeTo(21.26, 0.01)); - expect(xyz[2], closeTo(1.93, 0.01)); - }); - }); - - group('Color Relativity', () { - test('red in black', () { - final colorToTest = red; - final hct = Hct.fromInt(colorToTest); - expect( - hct - .inViewingConditions(ViewingConditions.make(backgroundLstar: 0.0)) - .toInt(), - isColor(0xff9F5C51)); - }); - - test('red in white', () { - final colorToTest = red; - final hct = Hct.fromInt(colorToTest); - expect( - hct - .inViewingConditions( - ViewingConditions.make(backgroundLstar: 100.0)) - .toInt(), - isColor(0xffFF5D48)); - }); - - test('green in black', () { - final colorToTest = green; - final hct = Hct.fromInt(colorToTest); - expect( - hct - .inViewingConditions(ViewingConditions.make(backgroundLstar: 0.0)) - .toInt(), - isColor(0xffACD69D)); - }); - - test('green in white', () { - final colorToTest = green; - final hct = Hct.fromInt(colorToTest); - expect( - hct - .inViewingConditions( - ViewingConditions.make(backgroundLstar: 100.0)) - .toInt(), - isColor(0xff8EFF77)); - }); - - test('blue in black', () { - final colorToTest = blue; - final hct = Hct.fromInt(colorToTest); - expect( - hct - .inViewingConditions(ViewingConditions.make(backgroundLstar: 0.0)) - .toInt(), - isColor(0xff343654)); - }); - - test('blue in white', () { - final colorToTest = blue; - final hct = Hct.fromInt(colorToTest); - expect( - hct - .inViewingConditions( - ViewingConditions.make(backgroundLstar: 100.0)) - .toInt(), - isColor(0xff3F49FF)); - }); - - test('white in black', () { - final colorToTest = white; - final hct = Hct.fromInt(colorToTest); - expect( - hct - .inViewingConditions(ViewingConditions.make(backgroundLstar: 0.0)) - .toInt(), - isColor(0xffFFFFFF)); - }); - - test('white in white', () { - final colorToTest = white; - final hct = Hct.fromInt(colorToTest); - expect( - hct - .inViewingConditions( - ViewingConditions.make(backgroundLstar: 100.0)) - .toInt(), - isColor(0xffFFFFFF)); - }); - - test('midgray in black', () { - final colorToTest = midgray; - final hct = Hct.fromInt(colorToTest); - expect( - hct - .inViewingConditions(ViewingConditions.make(backgroundLstar: 0.0)) - .toInt(), - isColor(0xff605F5F)); - }); - - test('midgray in white', () { - final colorToTest = midgray; - final hct = Hct.fromInt(colorToTest); - expect( - hct - .inViewingConditions( - ViewingConditions.make(backgroundLstar: 100.0)) - .toInt(), - isColor(0xff8E8E8E)); - }); - - test('black in black', () { - final colorToTest = black; - final hct = Hct.fromInt(colorToTest); - expect( - hct - .inViewingConditions(ViewingConditions.make(backgroundLstar: 0.0)) - .toInt(), - isColor(0xff000000)); - }); - - test('black in white', () { - final colorToTest = black; - final hct = Hct.fromInt(colorToTest); - expect( - hct - .inViewingConditions( - ViewingConditions.make(backgroundLstar: 100.0)) - .toInt(), - isColor(0xff000000)); - }); - }); -} diff --git a/dart/test/math_utils_test.dart b/dart/test/math_utils_test.dart deleted file mode 100644 index a8a12514..00000000 --- a/dart/test/math_utils_test.dart +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:material_color_utilities/utils/math_utils.dart'; -import 'package:test/test.dart'; - -// Original implementation for MathUtils.rotationDirection. -// Included here to test equivalence with new implementation. -double _rotationDirection(double from, double to) { - final a = to - from; - final b = to - from + 360.0; - final c = to - from - 360.0; - final aAbs = a.abs(); - final bAbs = b.abs(); - final cAbs = c.abs(); - if (aAbs <= bAbs && aAbs <= cAbs) { - return a >= 0.0 ? 1.0 : -1.0; - } else if (bAbs <= aAbs && bAbs <= cAbs) { - return b >= 0.0 ? 1.0 : -1.0; - } else { - return c >= 0.0 ? 1.0 : -1.0; - } -} - -void main() { - test('rotationDirection behaves correctly', () { - for (var from = 0.0; from < 360.0; from += 15.0) { - for (var to = 7.5; to < 360.0; to += 15.0) { - var expectedAnswer = _rotationDirection(from, to); - var actualAnswer = MathUtils.rotationDirection(from, to); - expect( - actualAnswer, - expectedAnswer, - reason: 'should be $expectedAnswer from $from to $to', - ); - expect( - actualAnswer.abs(), - 1.0, - reason: - 'should be either +1.0 or -1.0' - 'from $from to $to (got $actualAnswer)', - ); - } - } - }); -} diff --git a/dart/test/palettes_test.dart b/dart/test/palettes_test.dart deleted file mode 100644 index 869d5ba0..00000000 --- a/dart/test/palettes_test.dart +++ /dev/null @@ -1,359 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:material_color_utilities/hct/hct.dart'; -import 'package:material_color_utilities/palettes/core_palette.dart'; -import 'package:material_color_utilities/palettes/tonal_palette.dart'; -import 'package:test/test.dart'; - -import './utils/color_matcher.dart'; - -void main() { - group('TonalPalette', () { - group('[.of and .fromList constructors]', () { - // Regression test for https://github.com/material-foundation/material-color-utilities/issues/56 - test('operator ==', () { - final a1 = TonalPalette.of(1, 1); - final a2 = TonalPalette.of(1, 1); - final b1 = TonalPalette.fromList( - TonalPalette.commonTones.map((e) => 0xDEADBEEF).toList()); - final b2 = TonalPalette.fromList( - TonalPalette.commonTones.map((e) => 0xDEADBEEF).toList()); - expect(a1 == b1, isFalse); - expect(b1 == a1, isFalse); - expect(a1 != b1, isTrue); - expect(b1 != a1, isTrue); - expect(a1 == a2, isTrue); - expect(b1 == b2, isTrue); - - final c1 = TonalPalette.fromList( - TonalPalette.commonTones.map((e) => 123).toList()); - - final c2 = TonalPalette.fromList( - TonalPalette.commonTones.map((e) => e < 15 ? 456 : 123).toList()); - - expect(c1.get(50), c2.get(50)); - expect(c1 == c2, isFalse); - }); - }); - - group('[.of constructor]', () { - test('tones of blue', () async { - final hct = Hct.fromInt(0xff0000ff); - final tones = TonalPalette.of(hct.hue, hct.chroma); - - expect(tones.get(0), 0xff000000); - expect(tones.get(10), 0xff00006e); - expect(tones.get(20), 0xff0001ac); - expect(tones.get(30), 0xff0000ef); - expect(tones.get(40), 0xff343dff); - expect(tones.get(50), 0xff5a64ff); - expect(tones.get(60), 0xff7c84ff); - expect(tones.get(70), 0xff9da3ff); - expect(tones.get(80), 0xffbec2ff); - expect(tones.get(90), 0xffe0e0ff); - expect(tones.get(95), 0xfff1efff); - expect(tones.get(99), 0xfffffbff); - expect(tones.get(100), 0xffffffff); - - /// Tone not in [TonalPalette.commonTones] - expect(tones.get(3), 0xff00003c); - }); - - test('asList', () { - final hct = Hct.fromInt(0xff0000ff); - final tones = TonalPalette.of(hct.hue, hct.chroma); - - expect(tones.asList, [ - 0xff000000, - 0xff00006e, - 0xff0001ac, - 0xff0000ef, - 0xff343dff, - 0xff5a64ff, - 0xff7c84ff, - 0xff9da3ff, - 0xffbec2ff, - 0xffe0e0ff, - 0xfff1efff, - 0xfffffbff, - 0xffffffff, - ]); - }); - - test('operator == and hashCode', () { - final hctAB = Hct.fromInt(0xff0000ff); - final tonesA = TonalPalette.of(hctAB.hue, hctAB.chroma); - final tonesB = TonalPalette.of(hctAB.hue, hctAB.chroma); - final hctC = Hct.fromInt(0xff123456); - final tonesC = TonalPalette.of(hctC.hue, hctC.chroma); - - expect(tonesA, tonesB); - expect(tonesB, isNot(tonesC)); - - expect(tonesA.hashCode, tonesB.hashCode); - expect(tonesB.hashCode, isNot(tonesC.hashCode)); - }); - }); - - group('[.fromList constructor]', () { - final hueChromaPalette = TonalPalette.of(270, 36); - final cachedPalette = - TonalPalette.commonTones.map(hueChromaPalette.get).toList(); - final brokenPalette = [ - cachedPalette[0], - cachedPalette[1], - Hct.from(180, 24, 20).toInt(), - cachedPalette[3], - cachedPalette[4], - cachedPalette[5], - cachedPalette[6], - cachedPalette[7], - cachedPalette[8], - Hct.from(0, 12, 90).toInt(), - cachedPalette[10], - cachedPalette[11], - cachedPalette[12], - ]; - - final rebuiltPalette = TonalPalette.fromList(brokenPalette); - - test('correctly deduces original hue and chroma', () { - expect(rebuiltPalette.hue, closeTo(270, 1)); - expect(rebuiltPalette.chroma, closeTo(36, 1)); - }); - - test('low-chroma noise does not affect the hue and chroma deduced', () { - final rebuiltCleanPalette = TonalPalette.fromList(cachedPalette); - - expect(rebuiltPalette.hue, rebuiltCleanPalette.hue); - expect(rebuiltPalette.chroma, rebuiltCleanPalette.chroma); - }); - - test('returns cached colors when possible', () { - expect(rebuiltPalette.get(20), isColor(brokenPalette[2])); - expect(rebuiltPalette.get(50), isColor(brokenPalette[5])); - expect(rebuiltPalette.get(90), isColor(brokenPalette[9])); - expect(rebuiltPalette.get(99), isColor(brokenPalette[11])); - }); - - test('correctly deduces colors at other tones', () { - expect( - rebuiltPalette.get(15), - isCloseToColor(hueChromaPalette.get(15)), - ); - expect( - rebuiltPalette.get(53), - isCloseToColor(hueChromaPalette.get(53)), - ); - expect( - rebuiltPalette.get(78), - isCloseToColor(hueChromaPalette.get(78)), - ); - }); - - test('deduced colors have correct tone', () { - expect(rebuiltPalette.getHct(15).tone, closeTo(15, 1)); - expect(rebuiltPalette.getHct(53).tone, closeTo(53, 1)); - expect(rebuiltPalette.getHct(78).tone, closeTo(78, 1)); - }); - - test('asList', () { - final ints = List.generate(TonalPalette.commonSize, (i) => i); - final tones = TonalPalette.fromList(ints); - expect(tones.asList, ints); - }); - - test('operator == and hashCode', () { - // This test confirms that `==` and `hashCode` behave the way they are - // expected to behave. By defining five palettes, three from hue and - // chroma, and two from lists, we expect their `hashCode` to be - // distinct, and that their equality should satisfy the following grid: - // - // ==? 1 2 3 4 5 - // 1 YES - - YES - - // 2 - YES - - - - // 3 - - YES - - - // 4 YES - - YES - - // 5 - - - - YES - - final palette1 = TonalPalette.of(270, 36); - final palette2 = TonalPalette.of(180, 36); - final palette3 = TonalPalette.of(270, 12); - - final palette4 = TonalPalette.fromList(palette1.asList); - final brokenList = [...palette1.asList]; - brokenList[2] = Hct.from(180, 24, 20).toInt(); - brokenList[9] = Hct.from(0, 12, 90).toInt(); - final palette5 = TonalPalette.fromList(brokenList); - - expect(palette1, palette1); - expect(palette1, isNot(palette2)); - expect(palette1, isNot(palette3)); - expect(palette1, palette4); - expect(palette1, isNot(palette5)); - - expect(palette2, isNot(palette1)); - expect(palette2, palette2); - expect(palette2, isNot(palette3)); - expect(palette2, isNot(palette4)); - expect(palette2, isNot(palette5)); - - expect(palette3, isNot(palette1)); - expect(palette3, isNot(palette2)); - expect(palette3, palette3); - expect(palette3, isNot(palette4)); - expect(palette3, isNot(palette5)); - - expect(palette4, palette1); - expect(palette4, isNot(palette2)); - expect(palette4, isNot(palette3)); - expect(palette4, palette4); - expect(palette4, isNot(palette5)); - - expect(palette5, isNot(palette1)); - expect(palette5, isNot(palette2)); - expect(palette5, isNot(palette3)); - expect(palette5, isNot(palette4)); - expect(palette5, palette5); - - // They should have five distinct hash codes (ignoring hash collision). - final hashCodes = [palette1, palette2, palette3, palette4, palette5] - .map((x) => x.hashCode) - .toSet() - .toList(); - expect(hashCodes, hasLength(5)); - }); - }); - }); - - group('CorePalette', () { - test('asList', () { - final ints = - List.generate(CorePalette.size * TonalPalette.commonSize, (i) => i); - final corePalette = CorePalette.fromList(ints); - expect(corePalette.asList(), ints); - }); - - test('operator == and hashCode', () { - final corePaletteA = CorePalette.of(0xff0000ff); - final corePaletteB = CorePalette.of(0xff0000ff); - final corePaletteC = CorePalette.of(0xff123456); - - expect(corePaletteA, corePaletteB); - expect(corePaletteB, isNot(corePaletteC)); - - expect(corePaletteA.hashCode, corePaletteB.hashCode); - expect(corePaletteB.hashCode, isNot(corePaletteC.hashCode)); - }); - - test('of blue', () { - final core = CorePalette.of(0xff0000ff); - - expect(core.primary.get(100), 0xffffffff); - expect(core.primary.get(95), 0xfff1efff); - expect(core.primary.get(90), 0xffe0e0ff); - expect(core.primary.get(80), 0xffbec2ff); - expect(core.primary.get(70), 0xff9da3ff); - expect(core.primary.get(60), 0xff7c84ff); - expect(core.primary.get(50), 0xff5a64ff); - expect(core.primary.get(40), 0xff343dff); - expect(core.primary.get(30), 0xff0000ef); - expect(core.primary.get(20), 0xff0001ac); - expect(core.primary.get(10), 0xff00006e); - expect(core.primary.get(0), 0xff000000); - expect(core.secondary.get(100), 0xffffffff); - expect(core.secondary.get(95), 0xfff1efff); - expect(core.secondary.get(90), 0xffe1e0f9); - expect(core.secondary.get(80), 0xffc5c4dd); - expect(core.secondary.get(70), 0xffa9a9c1); - expect(core.secondary.get(60), 0xff8f8fa6); - expect(core.secondary.get(50), 0xff75758b); - expect(core.secondary.get(40), 0xff5c5d72); - expect(core.secondary.get(30), 0xff444559); - expect(core.secondary.get(20), 0xff2e2f42); - expect(core.secondary.get(10), 0xff191a2c); - expect(core.secondary.get(0), 0xff000000); - }); - - test('content of blue', () { - final core = CorePalette.contentOf(0xff0000ff); - - expect(core.primary.get(100), 0xffffffff); - expect(core.primary.get(95), 0xfff1efff); - expect(core.primary.get(90), 0xffe0e0ff); - expect(core.primary.get(80), 0xffbec2ff); - expect(core.primary.get(70), 0xff9da3ff); - expect(core.primary.get(60), 0xff7c84ff); - expect(core.primary.get(50), 0xff5a64ff); - expect(core.primary.get(40), 0xff343dff); - expect(core.primary.get(30), 0xff0000ef); - expect(core.primary.get(20), 0xff0001ac); - expect(core.primary.get(10), 0xff00006e); - expect(core.primary.get(0), 0xff000000); - expect(core.secondary.get(100), 0xffffffff); - expect(core.secondary.get(95), 0xfff1efff); - expect(core.secondary.get(90), 0xffe0e0ff); - expect(core.secondary.get(80), 0xffc1c3f4); - expect(core.secondary.get(70), 0xffa5a7d7); - expect(core.secondary.get(60), 0xff8b8dbb); - expect(core.secondary.get(50), 0xff7173a0); - expect(core.secondary.get(40), 0xff585b86); - expect(core.secondary.get(30), 0xff40436d); - expect(core.secondary.get(20), 0xff2a2d55); - expect(core.secondary.get(10), 0xff14173f); - expect(core.secondary.get(0), 0xff000000); - }); - }); - - group('KeyColor', () { - test('exact chroma is available', () { - // Requested chroma is exactly achievable at a certain tone. - final palette = TonalPalette.of(50.0, 60.0); - final result = palette.keyColor; - - expect(result.hue, closeTo(50.0, 10.0)); - expect(result.chroma, closeTo(60.0, 0.5)); - // Tone might vary, but should be within the range from 0 to 100. - expect(result.tone, greaterThan(0)); - expect(result.tone, lessThan(100)); - }); - - test('requesting unusually high chroma', () { - // Requested chroma is above what is achievable. For Hue 149, chroma peak is 89.6 at Tone 87.9. - // The result key color's chroma should be close to the chroma peak. - final palette = TonalPalette.of(149.0, 200.0); - final result = palette.keyColor; - - expect(result.hue, closeTo(149.0, 10.0)); - expect(result.chroma, greaterThan(89.0)); - // Tone might vary, but should be within the range from 0 to 100. - expect(result.tone, greaterThan(0)); - expect(result.tone, lessThan(100)); - }); - - test('requesting unusually low chroma', () { - // By definition, the key color should be the first tone, starting from Tone 50, matching the - // given hue and chroma. When requesting a very low chroma, the result should be close to Tone - // 50, since most tones can produce a low chroma. - final palette = TonalPalette.of(50.0, 3.0); - final result = palette.keyColor; - - // Higher error tolerance for hue when the requested chroma is unusually low. - expect(result.hue, closeTo(50.0, 10.0)); - expect(result.chroma, closeTo(3.0, 0.5)); - expect(result.tone, closeTo(50.0, 0.5)); - }); - }); -} diff --git a/dart/test/quantizer_celebi_test.dart b/dart/test/quantizer_celebi_test.dart deleted file mode 100644 index acc088d0..00000000 --- a/dart/test/quantizer_celebi_test.dart +++ /dev/null @@ -1,88 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:material_color_utilities/quantize/quantizer_celebi.dart'; -import 'package:test/test.dart'; - -const red = 0xffff0000; -const green = 0xff00ff00; -const blue = 0xff0000ff; -const maxColors = 256; - -void main() { - test('1R', () async { - final celebi = QuantizerCelebi(); - final result = await celebi.quantize([red], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(colors, hasLength(1)); - expect(colors[0], equals(red)); - }); - test('1G', () async { - final celebi = QuantizerCelebi(); - final result = await celebi.quantize([green], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(colors, hasLength(1)); - expect(colors[0], equals(green)); - }); - test('1B', () async { - final celebi = QuantizerCelebi(); - final result = await celebi.quantize([blue], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(colors, hasLength(1)); - expect(colors[0], equals(blue)); - }); - - test('5B', () async { - final celebi = QuantizerCelebi(); - final result = await celebi.quantize([ - blue, - blue, - blue, - blue, - blue, - ], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(colors, hasLength(1)); - expect(colors[0], equals(blue)); - }); - - test('1R 1G 1B', () async { - final celebi = QuantizerCelebi(); - final result = await celebi.quantize([red, green, blue], maxColors); - final colors = result.colorToCount.keys.toList(); - print('1r 1g 1b colors: $colors'); - - expect(Set.of(colors), hasLength(3)); - expect(colors[0], blue); - expect(colors[1], red); - expect(colors[2], green); - }); - - test('2R 3G', () async { - final celebi = QuantizerCelebi(); - final result = await celebi.quantize([ - red, - red, - green, - green, - green, - ], maxColors); - final colors = result.colorToCount.keys.toList(); - print('2r 3g colors: $colors'); - expect(Set.of(colors), hasLength(2)); - - expect(colors[0], green); - expect(colors[1], red); - }); -} diff --git a/dart/test/quantizer_wsmeans_test.dart b/dart/test/quantizer_wsmeans_test.dart deleted file mode 100644 index ff0d4134..00000000 --- a/dart/test/quantizer_wsmeans_test.dart +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:material_color_utilities/quantize/quantizer_wsmeans.dart'; -import 'package:test/test.dart'; - -const red = 0xffff0000; -const green = 0xff00ff00; -const blue = 0xff0000ff; -const maxColors = 256; - -void main() { - test('1Rando', () { - final result = QuantizerWsmeans.quantize([0xff141216], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(colors, hasLength(1)); - expect(colors[0], equals(0xff141216)); - }); - - test('1R', () { - final result = QuantizerWsmeans.quantize([red], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(colors, hasLength(1)); - }); - test('1R', () { - final result = QuantizerWsmeans.quantize([red], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(colors, hasLength(1)); - expect(colors[0], equals(red)); - }); - test('1G', () { - final result = QuantizerWsmeans.quantize([green], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(colors, hasLength(1)); - expect(colors[0], equals(green)); - }); - test('1B', () { - final result = QuantizerWsmeans.quantize([blue], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(colors, hasLength(1)); - expect(colors[0], equals(blue)); - }); - - test('5B', () { - final result = QuantizerWsmeans.quantize([ - blue, - blue, - blue, - blue, - blue, - ], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(colors, hasLength(1)); - expect(colors[0], equals(blue)); - }); -} diff --git a/dart/test/quantizer_wu_test.dart b/dart/test/quantizer_wu_test.dart deleted file mode 100644 index bf7d6824..00000000 --- a/dart/test/quantizer_wu_test.dart +++ /dev/null @@ -1,97 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:material_color_utilities/quantize/quantizer_wu.dart'; -import 'package:test/test.dart'; - -const red = 0xffff0000; -const green = 0xff00ff00; -const blue = 0xff0000ff; -const maxColors = 256; - -void main() { - test('1R', () async { - final wu = QuantizerWu(); - final result = await wu.quantize([red], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(colors, hasLength(1)); - }); - test('1Rando', () async { - final wu = QuantizerWu(); - final result = await wu.quantize([0xff141216], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(colors, hasLength(1)); - expect(colors[0], equals(0xff141216)); - }); - test('1R', () async { - final wu = QuantizerWu(); - final result = await wu.quantize([red], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(colors, hasLength(1)); - expect(colors[0], equals(red)); - }); - test('1G', () async { - final wu = QuantizerWu(); - final result = await wu.quantize([green], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(colors, hasLength(1)); - expect(colors[0], equals(green)); - }); - test('1B', () async { - final wu = QuantizerWu(); - final result = await wu.quantize([blue], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(colors, hasLength(1)); - expect(colors[0], equals(blue)); - }); - - test('5B', () async { - final wu = QuantizerWu(); - final result = await wu.quantize([ - blue, - blue, - blue, - blue, - blue, - ], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(colors, hasLength(1)); - expect(colors[0], equals(blue)); - }); - - test('2R 3G', () async { - final wu = QuantizerWu(); - final result = await wu.quantize([ - red, - red, - green, - green, - green, - ], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(Set.of(colors), hasLength(2)); - expect(colors[0], green); - expect(colors[1], red); - }); - - test('1R 1G 1B', () async { - final wu = QuantizerWu(); - final result = await wu.quantize([red, green, blue], maxColors); - final colors = result.colorToCount.keys.toList(); - expect(Set.of(colors), hasLength(3)); - expect(colors[0], blue); - expect(colors[1], red); - expect(colors[2], green); - }); -} diff --git a/dart/test/scheme_correctness_test.dart b/dart/test/scheme_correctness_test.dart deleted file mode 100644 index a1c54e76..00000000 --- a/dart/test/scheme_correctness_test.dart +++ /dev/null @@ -1,571 +0,0 @@ -// Copyright 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:material_color_utilities/contrast/contrast.dart'; -import 'package:material_color_utilities/dynamiccolor/dynamic_color.dart'; -import 'package:material_color_utilities/dynamiccolor/dynamic_scheme.dart'; -import 'package:material_color_utilities/dynamiccolor/material_dynamic_colors.dart' - show MaterialDynamicColors; -import 'package:material_color_utilities/dynamiccolor/src/contrast_curve.dart'; -import 'package:material_color_utilities/dynamiccolor/src/tone_delta_pair.dart'; -import 'package:material_color_utilities/dynamiccolor/variant.dart'; -import 'package:material_color_utilities/hct/hct.dart'; -import 'package:test/test.dart'; - -import 'utils/scheme_from_variant.dart'; - -abstract class _Constraint { - /// Tests this constraint against [scheme], failing if constraint not met. - void testAgainst(DynamicScheme scheme); -} - -class _ContrastConstraint extends _Constraint { - _ContrastConstraint( - this.foreground, - this.background, { - required this.contrastCurve, - }); - final DynamicColor foreground; - final DynamicColor background; - final ContrastCurve contrastCurve; - static const _contrastTolerance = 0.05; - - @override - void testAgainst(DynamicScheme scheme) { - final foregroundColor = foreground.getHct(scheme); - final backgroundColor = background.getHct(scheme); - final actualContrast = Contrast.ratioOfTones( - foregroundColor.tone, - backgroundColor.tone, - ); - final desiredContrast = contrastCurve.get(scheme.contrastLevel); - - if (desiredContrast <= 4.5) { - // A requirement of <= 4.5 must be met (with tolerance) - if (actualContrast < desiredContrast - _contrastTolerance) { - fail( - 'Dynamic scheme $scheme fails contrast constraint:\n' - '${foreground.name} should have contrast at least $desiredContrast ' - 'against ${background.name}, but has $actualContrast\n\n' - 'Foreground: ${foreground.name}\n' - 'Background: ${background.name}\n' - 'Scheme parameters:\n' - ' Variant: ${scheme.variant}\n' - ' Source color: ${scheme.sourceColorHct}\n' - ' Brightness: ${scheme.isDark ? "dark" : "light"}\n' - ' Contrast level: ${scheme.contrastLevel}\n' - 'Desired contrast: $desiredContrast\n' - 'Actual contrast: $actualContrast', - ); - } - } else { - if (actualContrast < 4.5 - _contrastTolerance) { - fail( - 'Dynamic scheme $scheme fails contrast constraint:\n' - '${foreground.name} should have contrast at least 4.5 ' - 'against ${background.name}, but has $actualContrast\n\n' - 'Foreground: ${foreground.name}\n' - 'Background: ${background.name}\n' - 'Scheme parameters:\n' - ' Variant: ${scheme.variant}\n' - ' Source color: ${scheme.sourceColorHct}\n' - ' Brightness: ${scheme.isDark ? "dark" : "light"}\n' - ' Contrast level: ${scheme.contrastLevel}\n' - 'Desired contrast: $desiredContrast\n' - 'Actual contrast: $actualContrast', - ); - } else if (actualContrast < desiredContrast - _contrastTolerance && - foregroundColor.tone != 100.0 && - foregroundColor.tone != 0.0) { - fail( - 'Dynamic scheme $scheme fails contrast constraint:\n' - '${foreground.name} should have contrast at least $desiredContrast ' - 'against ${background.name}, but has $actualContrast, and no color ' - 'has a tone of 0 or 100\n\n' - 'Foreground: ${foreground.name}\n' - 'Background: ${background.name}\n' - 'Scheme parameters:\n' - ' Variant: ${scheme.variant}\n' - ' Source color: ${scheme.sourceColorHct}\n' - ' Brightness: ${scheme.isDark ? "dark" : "light"}\n' - ' Contrast level: ${scheme.contrastLevel}\n' - 'Desired contrast: $desiredContrast\n' - 'Actual contrast: $actualContrast', - ); - } - } - } -} - -class _DeltaConstraint extends _Constraint { - _DeltaConstraint( - this.roleA, - this.roleB, { - required this.delta, - required this.polarity, - }); - final DynamicColor roleA; - final DynamicColor roleB; - final double delta; - final TonePolarity polarity; - static const _deltaTolerance = 0.5; - - @override - void testAgainst(DynamicScheme scheme) { - final roleAColor = roleA.getHct(scheme); - final roleBColor = roleB.getHct(scheme); - final roleAShouldBeLighter = - (polarity == TonePolarity.lighter) || - (polarity == TonePolarity.nearer && !scheme.isDark) || - (polarity == TonePolarity.farther && scheme.isDark); - final lighterOrDarker = roleAShouldBeLighter ? 'lighter' : 'darker'; - - final actualDelta = - roleAShouldBeLighter - ? roleAColor.tone - roleBColor.tone - : roleBColor.tone - roleAColor.tone; - if (actualDelta < delta - _deltaTolerance) { - fail( - 'Dynamic scheme $scheme fails delta constraint:\n' - '${roleA.name} should be $delta $lighterOrDarker than ${roleB.name}, ' - 'but they have tones ${roleAColor.tone} and ${roleBColor.tone}, respectively\n\n' - 'Role A: ${roleA.name}\n' - 'Role B: ${roleB.name}\n' - 'Scheme parameters:\n' - ' Variant: ${scheme.variant}\n' - ' Source color: ${scheme.sourceColorHct}\n' - ' Brightness: ${scheme.isDark ? "dark" : "light"}\n' - ' Contrast level: ${scheme.contrastLevel}\n' - 'Desired delta: $delta\n' - 'Actual delta: $actualDelta', - ); - } - } -} - -class _BackgroundConstraint extends _Constraint { - _BackgroundConstraint(this.background); - final DynamicColor background; - - @override - void testAgainst(DynamicScheme scheme) { - final color = background.getHct(scheme); - if (color.tone >= 50.5 && color.tone < 59.5) { - fail( - 'Dynamic scheme $scheme fails background constraint:\n' - '${background.name} has tone ${color.tone} which is in the ' - 'forbidden zone 50.5 <= tone < 59.5\n\n' - 'Background: ${background.name}\n' - 'Scheme parameters:\n' - ' Variant: ${scheme.variant}\n' - ' Source color: ${scheme.sourceColorHct}\n' - ' Brightness: ${scheme.isDark ? "dark" : "light"}\n' - ' Contrast level: ${scheme.contrastLevel}\n' - 'Actual tone: ${color.tone}', - ); - } - } -} - -final constraints = [ - _ContrastConstraint( - MaterialDynamicColors.onSurface, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ), - _ContrastConstraint( - MaterialDynamicColors.onSurface, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ), - _ContrastConstraint( - MaterialDynamicColors.primary, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(3, 4.5, 7, 7), - ), - _ContrastConstraint( - MaterialDynamicColors.primary, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(3, 4.5, 7, 7), - ), - _ContrastConstraint( - MaterialDynamicColors.secondary, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(3, 4.5, 7, 7), - ), - _ContrastConstraint( - MaterialDynamicColors.secondary, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(3, 4.5, 7, 7), - ), - _ContrastConstraint( - MaterialDynamicColors.tertiary, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(3, 4.5, 7, 7), - ), - _ContrastConstraint( - MaterialDynamicColors.tertiary, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(3, 4.5, 7, 7), - ), - _ContrastConstraint( - MaterialDynamicColors.error, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(3, 4.5, 7, 7), - ), - _ContrastConstraint( - MaterialDynamicColors.error, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(3, 4.5, 7, 7), - ), - _ContrastConstraint( - MaterialDynamicColors.onSurfaceVariant, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ), - _ContrastConstraint( - MaterialDynamicColors.onSurfaceVariant, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ), - _ContrastConstraint( - MaterialDynamicColors.outline, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(1.5, 3, 4.5, 7), - ), - _ContrastConstraint( - MaterialDynamicColors.outline, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(1.5, 3, 4.5, 7), - ), - _ContrastConstraint( - MaterialDynamicColors.primaryContainer, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.primaryContainer, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.primaryFixed, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.primaryFixed, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.primaryFixedDim, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.primaryFixedDim, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.secondaryContainer, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.secondaryContainer, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.secondaryFixed, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.secondaryFixed, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.secondaryFixedDim, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.secondaryFixedDim, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.tertiaryContainer, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.tertiaryContainer, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.tertiaryFixed, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.tertiaryFixed, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.tertiaryFixedDim, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.tertiaryFixedDim, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.errorContainer, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.errorContainer, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.outlineVariant, - MaterialDynamicColors.surfaceDim, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.outlineVariant, - MaterialDynamicColors.surfaceBright, - contrastCurve: ContrastCurve(0, 0, 3, 4.5), - ), - _ContrastConstraint( - MaterialDynamicColors.inverseOnSurface, - MaterialDynamicColors.inverseSurface, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ), - _ContrastConstraint( - MaterialDynamicColors.inversePrimary, - MaterialDynamicColors.inverseSurface, - contrastCurve: ContrastCurve(3, 4.5, 7, 7), - ), - _ContrastConstraint( - MaterialDynamicColors.onPrimary, - MaterialDynamicColors.primary, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ), - _ContrastConstraint( - MaterialDynamicColors.onSecondary, - MaterialDynamicColors.secondary, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ), - _ContrastConstraint( - MaterialDynamicColors.onTertiary, - MaterialDynamicColors.tertiary, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ), - _ContrastConstraint( - MaterialDynamicColors.onError, - MaterialDynamicColors.error, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ), - _ContrastConstraint( - MaterialDynamicColors.onPrimaryContainer, - MaterialDynamicColors.primaryContainer, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ), - _ContrastConstraint( - MaterialDynamicColors.onSecondaryContainer, - MaterialDynamicColors.secondaryContainer, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ), - _ContrastConstraint( - MaterialDynamicColors.onTertiaryContainer, - MaterialDynamicColors.tertiaryContainer, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ), - _ContrastConstraint( - MaterialDynamicColors.onErrorContainer, - MaterialDynamicColors.errorContainer, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ), - _ContrastConstraint( - MaterialDynamicColors.onPrimaryFixed, - MaterialDynamicColors.primaryFixed, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ), - _ContrastConstraint( - MaterialDynamicColors.onPrimaryFixed, - MaterialDynamicColors.primaryFixedDim, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ), - _ContrastConstraint( - MaterialDynamicColors.onSecondaryFixed, - MaterialDynamicColors.secondaryFixed, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ), - _ContrastConstraint( - MaterialDynamicColors.onSecondaryFixed, - MaterialDynamicColors.secondaryFixedDim, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ), - _ContrastConstraint( - MaterialDynamicColors.onTertiaryFixed, - MaterialDynamicColors.tertiaryFixed, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ), - _ContrastConstraint( - MaterialDynamicColors.onTertiaryFixed, - MaterialDynamicColors.tertiaryFixedDim, - contrastCurve: ContrastCurve(4.5, 7, 11, 21), - ), - _ContrastConstraint( - MaterialDynamicColors.onPrimaryFixedVariant, - MaterialDynamicColors.primaryFixed, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ), - _ContrastConstraint( - MaterialDynamicColors.onPrimaryFixedVariant, - MaterialDynamicColors.primaryFixedDim, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ), - _ContrastConstraint( - MaterialDynamicColors.onSecondaryFixedVariant, - MaterialDynamicColors.secondaryFixed, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ), - _ContrastConstraint( - MaterialDynamicColors.onSecondaryFixedVariant, - MaterialDynamicColors.secondaryFixedDim, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ), - _ContrastConstraint( - MaterialDynamicColors.onTertiaryFixedVariant, - MaterialDynamicColors.tertiaryFixed, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ), - _ContrastConstraint( - MaterialDynamicColors.onTertiaryFixedVariant, - MaterialDynamicColors.tertiaryFixedDim, - contrastCurve: ContrastCurve(3, 4.5, 7, 11), - ), - _DeltaConstraint( - MaterialDynamicColors.primary, - MaterialDynamicColors.primaryContainer, - delta: 10, - polarity: TonePolarity.farther, - ), - _DeltaConstraint( - MaterialDynamicColors.secondary, - MaterialDynamicColors.secondaryContainer, - delta: 10, - polarity: TonePolarity.farther, - ), - _DeltaConstraint( - MaterialDynamicColors.tertiary, - MaterialDynamicColors.tertiaryContainer, - delta: 10, - polarity: TonePolarity.farther, - ), - _DeltaConstraint( - MaterialDynamicColors.error, - MaterialDynamicColors.errorContainer, - delta: 10, - polarity: TonePolarity.farther, - ), - _DeltaConstraint( - MaterialDynamicColors.primaryFixedDim, - MaterialDynamicColors.primaryFixed, - delta: 10, - polarity: TonePolarity.darker, - ), - _DeltaConstraint( - MaterialDynamicColors.secondaryFixedDim, - MaterialDynamicColors.secondaryFixed, - delta: 10, - polarity: TonePolarity.darker, - ), - _DeltaConstraint( - MaterialDynamicColors.tertiaryFixedDim, - MaterialDynamicColors.tertiaryFixed, - delta: 10, - polarity: TonePolarity.darker, - ), - _BackgroundConstraint(MaterialDynamicColors.background), - _BackgroundConstraint(MaterialDynamicColors.error), - _BackgroundConstraint(MaterialDynamicColors.errorContainer), - _BackgroundConstraint(MaterialDynamicColors.primary), - _BackgroundConstraint(MaterialDynamicColors.primaryContainer), - _BackgroundConstraint(MaterialDynamicColors.primaryFixed), - _BackgroundConstraint(MaterialDynamicColors.primaryFixedDim), - _BackgroundConstraint(MaterialDynamicColors.secondary), - _BackgroundConstraint(MaterialDynamicColors.secondaryContainer), - _BackgroundConstraint(MaterialDynamicColors.secondaryFixed), - _BackgroundConstraint(MaterialDynamicColors.secondaryFixedDim), - _BackgroundConstraint(MaterialDynamicColors.surface), - _BackgroundConstraint(MaterialDynamicColors.surfaceBright), - _BackgroundConstraint(MaterialDynamicColors.surfaceContainer), - _BackgroundConstraint(MaterialDynamicColors.surfaceContainerHigh), - _BackgroundConstraint(MaterialDynamicColors.surfaceContainerHighest), - _BackgroundConstraint(MaterialDynamicColors.surfaceContainerLow), - _BackgroundConstraint(MaterialDynamicColors.surfaceContainerLowest), - _BackgroundConstraint(MaterialDynamicColors.surfaceDim), - _BackgroundConstraint(MaterialDynamicColors.surfaceTint), - _BackgroundConstraint(MaterialDynamicColors.surfaceVariant), - _BackgroundConstraint(MaterialDynamicColors.tertiary), - _BackgroundConstraint(MaterialDynamicColors.tertiaryContainer), - _BackgroundConstraint(MaterialDynamicColors.tertiaryFixed), - _BackgroundConstraint(MaterialDynamicColors.tertiaryFixedDim), -]; - -void main() { - group('scheme_correctness_test', () { - for (final variant in Variant.values) { - for (final contrastLevel in [-1.0, 0.0, 0.5, 1.0]) { - // For each variant-contrast combination, tests across four - // seed colors as well as two brightnesses. - test('${variant.label}, $contrastLevel', () { - for (final sourceColorArgb in [ - 0xFF0000FF, - 0xFF00FF00, - 0xFFFFFF00, - 0xFFFF0000, - ]) { - for (final isDark in [false, true]) { - var s = schemeFromVariant( - variant: variant, - sourceColorHct: Hct.fromInt(sourceColorArgb), - isDark: isDark, - contrastLevel: contrastLevel, - ); - // Ensures all constraints are satisfied. - for (final constraint in constraints) { - constraint.testAgainst(s); - } - } - } - }); - } - } - }); -} diff --git a/dart/test/scheme_monochrome_test.dart b/dart/test/scheme_monochrome_test.dart deleted file mode 100644 index db8a5c7c..00000000 --- a/dart/test/scheme_monochrome_test.dart +++ /dev/null @@ -1,131 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -import 'package:material_color_utilities/dynamiccolor/material_dynamic_colors.dart'; -import 'package:material_color_utilities/hct/hct.dart'; -import 'package:material_color_utilities/scheme/scheme_monochrome.dart'; -import 'package:test/test.dart'; - -void main() { - test('darkTheme_monochromeSpec', () { - final scheme = SchemeMonochrome( - sourceColorHct: Hct.fromInt(0xff0000ff), - isDark: true, - contrastLevel: 0.0, - ); - expect( - MaterialDynamicColors.primary.getHct(scheme).tone, - closeTo(100, 1), - ); - expect( - MaterialDynamicColors.onPrimary.getHct(scheme).tone, - closeTo(10, 1), - ); - expect( - MaterialDynamicColors.primaryContainer.getHct(scheme).tone, - closeTo(85, 1), - ); - expect( - MaterialDynamicColors.onPrimaryContainer.getHct(scheme).tone, - closeTo(0, 1), - ); - expect( - MaterialDynamicColors.secondary.getHct(scheme).tone, - closeTo(80, 1), - ); - expect( - MaterialDynamicColors.onSecondary.getHct(scheme).tone, - closeTo(10, 1), - ); - expect( - MaterialDynamicColors.secondaryContainer.getHct(scheme).tone, - closeTo(30, 1), - ); - expect( - MaterialDynamicColors.onSecondaryContainer.getHct(scheme).tone, - closeTo(90, 1), - ); - expect( - MaterialDynamicColors.tertiary.getHct(scheme).tone, - closeTo(90, 1), - ); - expect( - MaterialDynamicColors.onTertiary.getHct(scheme).tone, - closeTo(10, 1), - ); - expect( - MaterialDynamicColors.tertiaryContainer.getHct(scheme).tone, - closeTo(60, 1), - ); - expect( - MaterialDynamicColors.onTertiaryContainer.getHct(scheme).tone, - closeTo(0, 1), - ); - }); - - test('lightTheme_monochromeSpec', () { - final scheme = SchemeMonochrome( - sourceColorHct: Hct.fromInt(0xff0000ff), - isDark: false, - contrastLevel: 0.0, - ); - expect( - MaterialDynamicColors.primary.getHct(scheme).tone, - closeTo(0, 1), - ); - expect( - MaterialDynamicColors.onPrimary.getHct(scheme).tone, - closeTo(90, 1), - ); - expect( - MaterialDynamicColors.primaryContainer.getHct(scheme).tone, - closeTo(25, 1), - ); - expect( - MaterialDynamicColors.onPrimaryContainer.getHct(scheme).tone, - closeTo(100, 1), - ); - expect( - MaterialDynamicColors.secondary.getHct(scheme).tone, - closeTo(40, 1), - ); - expect( - MaterialDynamicColors.onSecondary.getHct(scheme).tone, - closeTo(100, 1), - ); - expect( - MaterialDynamicColors.secondaryContainer.getHct(scheme).tone, - closeTo(85, 1), - ); - expect( - MaterialDynamicColors.onSecondaryContainer.getHct(scheme).tone, - closeTo(10, 1), - ); - expect( - MaterialDynamicColors.tertiary.getHct(scheme).tone, - closeTo(25, 1), - ); - expect( - MaterialDynamicColors.onTertiary.getHct(scheme).tone, - closeTo(90, 1), - ); - expect( - MaterialDynamicColors.tertiaryContainer.getHct(scheme).tone, - closeTo(49, 1), - ); - expect( - MaterialDynamicColors.onTertiaryContainer.getHct(scheme).tone, - closeTo(100, 1), - ); - }); -} diff --git a/dart/test/score_test.dart b/dart/test/score_test.dart deleted file mode 100644 index d84023fa..00000000 --- a/dart/test/score_test.dart +++ /dev/null @@ -1,286 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:material_color_utilities/score/score.dart'; -import 'package:test/test.dart'; - -import './utils/color_matcher.dart'; - -void main() { - test('prioritizes chroma', () async { - final colorsToPopulation = { - 0xff000000: 1, - 0xffffffff: 1, - 0xff0000ff: 1, - }; - final ranked = Score.score(colorsToPopulation, desired: 4); - - expect(ranked, hasLength(1)); - expect(ranked[0], isColor(0xff0000ff)); - }); - - test('prioritizes chroma when proportions equal', () async { - final colorsToPopulation = { - 0xffff0000: 1, - 0xff00ff00: 1, - 0xff0000ff: 1, - }; - final ranked = Score.score(colorsToPopulation, desired: 4); - - expect(ranked, hasLength(3)); - expect(ranked[0], isColor(0xffff0000)); - expect(ranked[1], isColor(0xff00ff00)); - expect(ranked[2], isColor(0xff0000ff)); - }); - - test('generates gBlue when no colors available', () async { - final colorsToPopulation = {0xff000000: 1}; - final ranked = Score.score(colorsToPopulation, desired: 4); - - expect(ranked, hasLength(1)); - expect(ranked[0], isColor(0xff4285f4)); - }); - - test('dedupes nearby hues', () async { - final colorsToPopulation = { - 0xff008772: 1, // H 180 C 42 T 50 - 0xff318477: 1, // H 184 C 35 T 50 - }; - final ranked = Score.score(colorsToPopulation, desired: 4); - - expect(ranked, hasLength(1)); - expect(ranked[0], isColor(0xff008772)); - }); - - test('maximizes hue distance', () async { - final colorsToPopulation = { - 0xff008772: 1, // H 180 C 42 T 50 - 0xff008587: 1, // H 198 C 50 T 50 - 0xff007ebc: 1, // H 245 C 50 T 50 - }; - final ranked = Score.score(colorsToPopulation, desired: 2); - expect(ranked, hasLength(2)); - expect(ranked[0], isColor(0xff007ebc)); - expect(ranked[1], isColor(0xff008772)); - }); - - test('passes generated scenario one', () async { - final colorsToPopulation = { - 0xff7ea16d: 67, - 0xffd8ccae: 67, - 0xff835c0d: 49, - }; - - final ranked = Score.score( - colorsToPopulation, - desired: 3, - fallbackColorARGB: 0xff8d3819, - filter: false, - ); - - expect(ranked, hasLength(3)); - expect(ranked[0], isColor(0xff7ea16d)); - expect(ranked[1], isColor(0xffd8ccae)); - expect(ranked[2], isColor(0xff835c0d)); - }); - - test('passes generated scenario two', () async { - final colorsToPopulation = { - 0xffd33881: 14, - 0xff3205cc: 77, - 0xff0b48cf: 36, - 0xffa08f5d: 81, - }; - - final ranked = Score.score( - colorsToPopulation, - desired: 4, - fallbackColorARGB: 0xff7d772b, - filter: true, - ); - - expect(ranked, hasLength(3)); - expect(ranked[0], isColor(0xff3205cc)); - expect(ranked[1], isColor(0xffa08f5d)); - expect(ranked[2], isColor(0xffd33881)); - }); - - test('passes generated scenario three', () async { - final colorsToPopulation = { - 0xffbe94a6: 23, - 0xffc33fd7: 42, - 0xff899f36: 90, - 0xff94c574: 82, - }; - - final ranked = Score.score( - colorsToPopulation, - desired: 3, - fallbackColorARGB: 0xffaa79a4, - filter: true, - ); - - expect(ranked, hasLength(3)); - expect(ranked[0], isColor(0xff94c574)); - expect(ranked[1], isColor(0xffc33fd7)); - expect(ranked[2], isColor(0xffbe94a6)); - }); - - test('passes generated scenario four', () async { - final colorsToPopulation = { - 0xffdf241c: 85, - 0xff685859: 44, - 0xffd06d5f: 34, - 0xff561c54: 27, - 0xff713090: 88, - }; - - final ranked = Score.score( - colorsToPopulation, - desired: 5, - fallbackColorARGB: 0xff58c19c, - filter: false, - ); - - expect(ranked, hasLength(2)); - expect(ranked[0], isColor(0xffdf241c)); - expect(ranked[1], isColor(0xff561c54)); - }); - - test('passes generated scenario five', () async { - final colorsToPopulation = { - 0xffbe66f8: 41, - 0xff4bbda9: 88, - 0xff80f6f9: 44, - 0xffab8017: 43, - 0xffe89307: 65, - }; - - final ranked = Score.score( - colorsToPopulation, - desired: 3, - fallbackColorARGB: 0xff916691, - filter: false, - ); - - expect(ranked, hasLength(3)); - expect(ranked[0], isColor(0xffab8017)); - expect(ranked[1], isColor(0xff4bbda9)); - expect(ranked[2], isColor(0xffbe66f8)); - }); - - test('passes generated scenario six', () async { - final colorsToPopulation = { - 0xff18ea8f: 93, - 0xff327593: 18, - 0xff066a18: 53, - 0xfffa8a23: 74, - 0xff04ca1f: 62, - }; - - final ranked = Score.score( - colorsToPopulation, - desired: 2, - fallbackColorARGB: 0xff4c377a, - filter: false, - ); - - expect(ranked, hasLength(2)); - expect(ranked[0], isColor(0xff18ea8f)); - expect(ranked[1], isColor(0xfffa8a23)); - }); - - test('passes generated scenario seven', () async { - final colorsToPopulation = { - 0xff2e05ed: 23, - 0xff153e55: 90, - 0xff9ab220: 23, - 0xff153379: 66, - 0xff68bcc3: 81, - }; - - final ranked = Score.score( - colorsToPopulation, - desired: 2, - fallbackColorARGB: 0xfff588dc, - filter: true, - ); - - expect(ranked, hasLength(2)); - expect(ranked[0], isColor(0xff2e05ed)); - expect(ranked[1], isColor(0xff9ab220)); - }); - - test('passes generated scenario eight', () async { - final colorsToPopulation = { - 0xff816ec5: 24, - 0xff6dcb94: 19, - 0xff3cae91: 98, - 0xff5b542f: 25, - }; - - final ranked = Score.score( - colorsToPopulation, - desired: 1, - fallbackColorARGB: 0xff84b0fd, - filter: false, - ); - - expect(ranked, hasLength(1)); - expect(ranked[0], isColor(0xff3cae91)); - }); - - test('passes generated scenario nine', () async { - final colorsToPopulation = { - 0xff206f86: 52, - 0xff4a620d: 96, - 0xfff51401: 85, - 0xff2b8ebf: 3, - 0xff277766: 59, - }; - - final ranked = Score.score( - colorsToPopulation, - desired: 3, - fallbackColorARGB: 0xff02b415, - filter: true, - ); - - expect(ranked, hasLength(3)); - expect(ranked[0], isColor(0xfff51401)); - expect(ranked[1], isColor(0xff4a620d)); - expect(ranked[2], isColor(0xff2b8ebf)); - }); - - test('passes generated scenario ten', () async { - final colorsToPopulation = { - 0xff8b1d99: 54, - 0xff27effe: 43, - 0xff6f558d: 2, - 0xff77fdf2: 78, - }; - - final ranked = Score.score( - colorsToPopulation, - desired: 4, - fallbackColorARGB: 0xff5e7a10, - filter: true, - ); - - expect(ranked, hasLength(3)); - expect(ranked[0], isColor(0xff27effe)); - expect(ranked[1], isColor(0xff8b1d99)); - expect(ranked[2], isColor(0xff6f558d)); - }); -} diff --git a/dart/test/temperature_cache_test.dart b/dart/test/temperature_cache_test.dart deleted file mode 100644 index 022f5be9..00000000 --- a/dart/test/temperature_cache_test.dart +++ /dev/null @@ -1,139 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:material_color_utilities/hct/hct.dart'; - -import 'package:material_color_utilities/temperature/temperature_cache.dart'; -import 'package:test/test.dart'; -import './utils/color_matcher.dart'; - -void main() { - group(TemperatureCache, () { - test('raw temperature', () { - final blueTemp = TemperatureCache.rawTemperature(Hct.fromInt(0xff0000ff)); - expect(blueTemp, closeTo(-1.393, 0.001)); - - final redTemp = TemperatureCache.rawTemperature(Hct.fromInt(0xffff0000)); - expect(redTemp, closeTo(2.351, 0.001)); - - final greenTemp = - TemperatureCache.rawTemperature(Hct.fromInt(0xff00ff00)); - expect(greenTemp, closeTo(-0.267, 0.001)); - - final whiteTemp = - TemperatureCache.rawTemperature(Hct.fromInt(0xffffffff)); - expect(whiteTemp, closeTo(-0.5, 0.001)); - - final blackTemp = - TemperatureCache.rawTemperature(Hct.fromInt(0xff000000)); - expect(blackTemp, closeTo(-0.5, 0.001)); - }); - - test('relative temperature', () { - final blueTemp = - TemperatureCache(Hct.fromInt(0xff0000ff)).inputRelativeTemperature; - expect(blueTemp, closeTo(0.0, 0.001)); - - final redTemp = - TemperatureCache(Hct.fromInt(0xffff0000)).inputRelativeTemperature; - expect(redTemp, closeTo(1.0, 0.001)); - - final greenTemp = - TemperatureCache(Hct.fromInt(0xff00ff00)).inputRelativeTemperature; - expect(greenTemp, closeTo(0.467, 0.001)); - - final whiteTemp = - TemperatureCache(Hct.fromInt(0xffffffff)).inputRelativeTemperature; - expect(whiteTemp, closeTo(0.5, 0.001)); - - final blackTemp = - TemperatureCache(Hct.fromInt(0xff000000)).inputRelativeTemperature; - expect(blackTemp, closeTo(0.5, 0.001)); - }); - - test('complement', () { - final blueComplement = - TemperatureCache(Hct.fromInt(0xff0000ff)).complement.toInt(); - expect(blueComplement, isColor(0xff9d0002)); - - final redComplement = - TemperatureCache(Hct.fromInt(0xffff0000)).complement.toInt(); - expect(redComplement, isColor(0xff007bfc)); - - final greenComplement = - TemperatureCache(Hct.fromInt(0xff00ff00)).complement.toInt(); - expect(greenComplement, isColor(0xffffd2c9)); - - final whiteComplement = - TemperatureCache(Hct.fromInt(0xffffffff)).complement.toInt(); - expect(whiteComplement, isColor(0xffffffff)); - - final blackComplement = - TemperatureCache(Hct.fromInt(0xff000000)).complement.toInt(); - expect(blackComplement, isColor(0xff000000)); - }); - - test('analogous', () { - final blueAnalogous = TemperatureCache(Hct.fromInt(0xff0000ff)) - .analogous() - .map((e) => e.toInt()) - .toList(); - expect(blueAnalogous[0], isColor(0xff00590c)); - expect(blueAnalogous[1], isColor(0xff00564e)); - expect(blueAnalogous[2], isColor(0xff0000ff)); - expect(blueAnalogous[3], isColor(0xff6700cc)); - expect(blueAnalogous[4], isColor(0xff81009f)); - - final redAnalogous = TemperatureCache(Hct.fromInt(0xffff0000)) - .analogous() - .map((e) => e.toInt()) - .toList(); - expect(redAnalogous[0], isColor(0xfff60082)); - expect(redAnalogous[1], isColor(0xfffc004c)); - expect(redAnalogous[2], isColor(0xffff0000)); - expect(redAnalogous[3], isColor(0xffd95500)); - expect(redAnalogous[4], isColor(0xffaf7200)); - - final greenAnalogous = TemperatureCache(Hct.fromInt(0xff00ff00)) - .analogous() - .map((e) => e.toInt()) - .toList(); - expect(greenAnalogous[0], isColor(0xffcee900)); - expect(greenAnalogous[1], isColor(0xff92f500)); - expect(greenAnalogous[2], isColor(0xff00ff00)); - expect(greenAnalogous[3], isColor(0xff00fd6f)); - expect(greenAnalogous[4], isColor(0xff00fab3)); - - final blackAnalogous = TemperatureCache(Hct.fromInt(0xff000000)) - .analogous() - .map((e) => e.toInt()) - .toList(); - expect(blackAnalogous[0], isColor(0xff000000)); - expect(blackAnalogous[1], isColor(0xff000000)); - expect(blackAnalogous[2], isColor(0xff000000)); - expect(blackAnalogous[3], isColor(0xff000000)); - expect(blackAnalogous[4], isColor(0xff000000)); - - final whiteAnalogous = TemperatureCache(Hct.fromInt(0xffffffff)) - .analogous() - .map((e) => e.toInt()) - .toList(); - expect(whiteAnalogous[0], isColor(0xffffffff)); - expect(whiteAnalogous[1], isColor(0xffffffff)); - expect(whiteAnalogous[2], isColor(0xffffffff)); - expect(whiteAnalogous[3], isColor(0xffffffff)); - expect(whiteAnalogous[4], isColor(0xffffffff)); - }); - }); -} diff --git a/dart/test/utils/color_matcher.dart b/dart/test/utils/color_matcher.dart deleted file mode 100644 index 7d018618..00000000 --- a/dart/test/utils/color_matcher.dart +++ /dev/null @@ -1,90 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:matcher/matcher.dart'; -import 'package:material_color_utilities/hct/cam16.dart'; -import 'package:material_color_utilities/utils/string_utils.dart'; - -Matcher isColor(int color) => _ColorMatcher(color); -Matcher isCloseToColor(int color) => _ColorMatcherApproximate(color); - -class _ColorMatcher extends Matcher { - _ColorMatcher(this._argb); - - final int _argb; - - @override - bool matches(dynamic object, Map matchState) { - if (object is! int) { - return false; - } - return object == _argb; - } - - @override - Description describe(Description description) { - return description.add('color equals ${StringUtils.hexFromArgb(_argb)}'); - } - - @override - Description describeMismatch( - dynamic item, - Description mismatchDescription, - Map matchState, - bool verbose, - ) { - return mismatchDescription - .add('expected hex code\n ') - .add(StringUtils.hexFromArgb(_argb)) - .add('\nbut got\n ') - .add(StringUtils.hexFromArgb(item as int)); - } -} - -class _ColorMatcherApproximate extends Matcher { - _ColorMatcherApproximate(this._argb); - - final int _argb; - - @override - bool matches(dynamic object, Map matchState) { - if (object is! int) { - return false; - } - // Succeeds if the two colors are fairly indistinguishable to the human eye, - // using the value 5 as a threshold. - return Cam16.fromInt(object).distance(Cam16.fromInt(_argb)) <= 5; - } - - @override - Description describe(Description description) { - return description.add( - 'color is close to ${StringUtils.hexFromArgb(_argb)}', - ); - } - - @override - Description describeMismatch( - dynamic item, - Description mismatchDescription, - Map matchState, - bool verbose, - ) { - return mismatchDescription - .add('expected close to hex code\n ') - .add(StringUtils.hexFromArgb(_argb)) - .add('\nbut got\n ') - .add(StringUtils.hexFromArgb(item as int)); - } -} diff --git a/dart/test/utils/scheme_from_variant.dart b/dart/test/utils/scheme_from_variant.dart deleted file mode 100644 index d1eafd44..00000000 --- a/dart/test/utils/scheme_from_variant.dart +++ /dev/null @@ -1,81 +0,0 @@ -// Copyright 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'package:material_color_utilities/dynamiccolor/dynamic_scheme.dart'; -import 'package:material_color_utilities/dynamiccolor/variant.dart'; -import 'package:material_color_utilities/hct/hct.dart'; -import 'package:material_color_utilities/scheme/scheme_content.dart'; -import 'package:material_color_utilities/scheme/scheme_expressive.dart'; -import 'package:material_color_utilities/scheme/scheme_fidelity.dart'; -import 'package:material_color_utilities/scheme/scheme_fruit_salad.dart'; -import 'package:material_color_utilities/scheme/scheme_monochrome.dart'; -import 'package:material_color_utilities/scheme/scheme_neutral.dart'; -import 'package:material_color_utilities/scheme/scheme_rainbow.dart'; -import 'package:material_color_utilities/scheme/scheme_tonal_spot.dart'; -import 'package:material_color_utilities/scheme/scheme_vibrant.dart'; - -DynamicScheme schemeFromVariant({ - required Variant variant, - required Hct sourceColorHct, - required bool isDark, - required double contrastLevel, -}) { - return switch (variant) { - Variant.content => SchemeContent( - sourceColorHct: sourceColorHct, - isDark: isDark, - contrastLevel: contrastLevel, - ), - Variant.expressive => SchemeExpressive( - sourceColorHct: sourceColorHct, - isDark: isDark, - contrastLevel: contrastLevel, - ), - Variant.fidelity => SchemeFidelity( - sourceColorHct: sourceColorHct, - isDark: isDark, - contrastLevel: contrastLevel, - ), - Variant.fruitSalad => SchemeFruitSalad( - sourceColorHct: sourceColorHct, - isDark: isDark, - contrastLevel: contrastLevel, - ), - Variant.monochrome => SchemeMonochrome( - sourceColorHct: sourceColorHct, - isDark: isDark, - contrastLevel: contrastLevel, - ), - Variant.neutral => SchemeNeutral( - sourceColorHct: sourceColorHct, - isDark: isDark, - contrastLevel: contrastLevel, - ), - Variant.rainbow => SchemeRainbow( - sourceColorHct: sourceColorHct, - isDark: isDark, - contrastLevel: contrastLevel, - ), - Variant.tonalSpot => SchemeTonalSpot( - sourceColorHct: sourceColorHct, - isDark: isDark, - contrastLevel: contrastLevel, - ), - Variant.vibrant => SchemeVibrant( - sourceColorHct: sourceColorHct, - isDark: isDark, - contrastLevel: contrastLevel, - ), - }; -} diff --git a/dev_guide/creating_color_scheme.md b/dev_guide/creating_color_scheme.md deleted file mode 100644 index 6ec29a5b..00000000 --- a/dev_guide/creating_color_scheme.md +++ /dev/null @@ -1,327 +0,0 @@ -# Creating a Color Scheme - -See [Dynamic Color Scheme](../concepts/dynamic_color_scheme.md) for a conceptual -overview. - -## Getting colors for theming - -To get color values for styling your UIs, the first step is to initialize -`DynamicScheme` with the below parameters: - -1. A source color (formerly called seed color). - - It can be in ARGB format, `sourceColorArgb`, or HCT format, - `sourceColorHct`. -1. Scheme variant, `variant`. -1. Whether the scheme is in light mode or dark mode, `isDark`. -1. Contrast level, `contrastLevel` typed `Double`. The recommended levels are: - - `0.0` for default contrast. - - `0.5` for higher contrast. - - `1.0` for highest contrast. - - `-1.0` for reduced contrast. -1. Tonal palettes: - * `primaryPalette` - * `secondaryPalette` - * `tertiaryPalette` - * `neutralPalette` - * `neutralVariantPalette` - * `errorPalette` - -We provide various scheme variants, such as `SchemeTonalSpot`, `SchemeContent`, -etc, which inherit `DynamicScheme` and come with pre-defined tonal palettes. -This means you only need to specify the source color, theme mode, and contrast -level to create a scheme. - -The `DynamicScheme` object does not store the ARGB or HCT values of specific -color roles. Instead, these values are generated upon demand, and you can get -them with the `DynamicColor` class. We provide color role APIs like -`DynamicScheme.primary` to make it easier to get a specific color. - -## Step-by-Steps Instructions - -### 1. Generating a scheme - -#### Method 1 — Using a variant - -The recommended way to generate a scheme from a source color is to use a scheme -variant constructor, such as `SchemeTonalSpot`. The following example generates -a `SchemeTonalSpot` scheme in light mode and default contrast from `hct` as -source color in HCT format. - -

- -###### Dart - -```dart -final scheme = SchemeTonalSpot(sourceColorHct: hct, isDark: false, contrastLevel: 0.0); -``` - -###### Java - -```java -DynamicScheme scheme = new SchemeTonalSpot(hct, false, 0.0); -``` - -###### TypeScript - -```typescript -const scheme = new SchemeTonalSpot(hct, false, 0.0); -``` - -###### C++ - -```cpp -DynamicScheme scheme = SchemeTonalSpot(hct, false, 0.0); -``` - -###### Swift - -```swift -let scheme = SchemeTonalSpot( - sourceColorHct: hct, - isDark: false, - contrastLevel: 0.0) -``` - -
- -We provide the below variants: - -* Content -* Expressive -* Fidelity -* Fruit salad -* Monochrome -* Neutral -* Rainbow -* Tonal spot -* Vibrant - -#### Method 2 — Specifying palettes - -
- -###### Dart - -```dart -final scheme = DynamicScheme( - sourceColorArgb: 0xFFEB0057, - variant: Variant.vibrant, - isDark: false, - contrastLevel: 0.0, - primaryPalette: TonalPalette.fromHct(Hct.fromInt(0xFFEB0057)), - secondaryPalette: TonalPalette.fromHct(Hct.fromInt(0xFFF46B00)), - tertiaryPalette: TonalPalette.fromHct(Hct.fromInt(0xFF00AB46)), - neutralPalette: TonalPalette.fromHct(Hct.fromInt(0xFF949494)), - neutralVariantPalette: TonalPalette.fromHct(Hct.fromInt(0xFFBC8877)), -); -``` - -###### Java - -```java -DynamicScheme scheme = new DynamicScheme( - /*sourceColorHct=*/ Hct.fromInt(0xFFEB0057), - /*variant=*/ Variant.VIBRANT, - /*isDark=*/ false, - /*contrastLevel=*/ 0.0, - /*primaryPalette=*/ TonalPalette.fromInt(0xFFEB0057), - /*secondaryPalette=*/ TonalPalette.fromInt(0xFFF46B00), - /*tertiaryPalette=*/ TonalPalette.fromInt(0xFF00AB46), - /*neutralPalette=*/ TonalPalette.fromInt(0xFF949494), - /*neutralVariantPalette=*/ TonalPalette.fromInt(0xFFBC8877)); -``` - -###### TypeScript - -```typescript -const scheme = new DynamicScheme({ - sourceColorArgb: 0xFFEB0057, - variant: Variant.VIBRANT, - isDark: false, - contrastLevel: 0.0, - primaryPalette: TonalPalette.fromInt(0xFFEB0057), - secondaryPalette: TonalPalette.fromInt(0xFFF46B00), - tertiaryPalette: TonalPalette.fromInt(0xFF00AB46), - neutralPalette: TonalPalette.fromInt(0xFF949494), - neutralVariantPalette: TonalPalette.fromInt(0xFFBC8877) -}); -``` - -###### C++ - -```cpp -DynamicScheme scheme = DynamicScheme( - /*source_color_argb=*/ 0xFFEB0057, - /*variant=*/ Variant::kVibrant, - /*contrast_level=*/ 0.0, - /*is_dark=*/ false, - /*primary_palette=*/ TonalPalette(0xFFEB0057), - /*secondary_palette=*/ TonalPalette(0xFFF46B00), - /*tertiary_palette=*/ TonalPalette(0xFF00AB46), - /*neutral_palette=*/ TonalPalette(0xFF949494), - /*neutral_variant_palette=*/ TonalPalette(0xFFBC8877)); -``` - -###### Swift - -```swift -let scheme = DynamicScheme( - sourceColorArgb: 0xFFEB0057, - variant: Variant.vibrant, - isDark: false, - contrastLevel: 0.0, - primaryPalette: TonalPalette.fromHct(Hct(0xFFEB0057)), - secondaryPalette: TonalPalette.fromHct(Hct(0xFFF46B00)), - tertiaryPalette: TonalPalette.fromHct(Hct(0xFF00AB46)), - neutralPalette: TonalPalette.fromHct(Hct(0xFF949494)), - neutralVariantPalette: TonalPalette.fromHct(Hct(0xFFBC8877))) -``` - -
- -### 2. Obtaining colors - -Colors can be in either ARGB or HCT. Below shows how you may obtain the -`primary` color. - -
- -###### Dart - -```dart -final argb = scheme.primary; -``` - -Alternatively, - -```dart -final argb = MaterialDynamicColors.primary.getArgb(scheme); -final hct = MaterialDynamicColors.primary.getHct(scheme); -``` - -###### Java - -```java -int argb = scheme.getPrimary(); -``` - -Alternatively, - -```java -MaterialDynamicColors materialDynamicColors = new MaterialDynamicColors(); -int argb = materialDynamicColors.primary().getArgb(scheme); -Hct hct = materialDynamicColors.primary().getHct(scheme); -``` - -###### TypeScript - -```typescript -const argb = scheme.primary; -``` - -Alternatively, - -```typescript -const argb = MaterialDynamicColors.primary.getArgb(scheme); -const hct = MaterialDynamicColors.primary.getHct(scheme); -``` - -###### C++ - -```cpp -Argb argb = MaterialDynamicColors::Primary().GetArgb(s); -Hct hct = MaterialDynamicColors::Primary().GetHct(s); -``` - -###### Swift - -```swift -let argb = scheme.primary -``` - -Alternatively, - -```swift -let argb = MaterialDynamicColors.primary.getArgb(scheme) -let hct = MaterialDynamicColors.primary.getHct(scheme) -``` - -
- -## For existing library users using `Scheme`, - -The `Scheme` class will be deprecated soon, as it does not support different -contrast levels. The functionality of `Scheme` is fully replicated by -`SchemeTonalSpot` and `SchemeContent`. - -
- - - -###### Dart - -| Instead of … | Use … | -| ---------------------------- | ----------------------------------- | -| `Scheme.light(color)` | `SchemeTonalSpot(sourceColorHct: Hct.fromInt(color), isDark: false, contrastLevel: 0.0)` | -| `Scheme.dark(color)` | `SchemeTonalSpot(sourceColorHct: Hct.fromInt(color), isDark: true, contrastLevel: 0.0)` | -| `Scheme.lightContent(color)` | `SchemeContent(sourceColorHct: Hct.fromInt(color), isDark: false, contrastLevel: 0.0)` | -| `Scheme.darkContent(color)` | `SchemeContent(sourceColorHct: Hct.fromInt(color), isDark: true, contrastLevel: 0.0)` | - -###### Java - -| Instead of … | Use … | -| ---------------------------- | --------------------------------------------- | -| `Scheme.light(color)` | `new SchemeTonalSpot(Hct.fromInt(color), false, 0.0)` | -| `Scheme.dark(color)` | `new SchemeTonalSpot(Hct.fromInt(color), true, 0.0)` | -| `Scheme.lightContent(color)` | `new SchemeContent(Hct.fromInt(color), false, 0.0)` | -| `Scheme.darkContent(color)` | `new SchemeContent(Hct.fromInt(color), true, 0.0)` | - -###### TypeScript - -| Instead of … | Use … | -| ---------------------------- | --------------------------------------------- | -| `Scheme.light(color)` | `new SchemeTonalSpot(Hct.fromInt(color), false, 0.0)` | -| `Scheme.dark(color)` | `new SchemeTonalSpot(Hct.fromInt(color), true, 0.0)` | -| `Scheme.lightContent(color)` | `new SchemeContent(Hct.fromInt(color), false, 0.0)` | -| `Scheme.darkContent(color)` | `new SchemeContent(Hct.fromInt(color), true, 0.0)` | - -###### C++ - -| Instead of … | Use … | -| ---------------------------------------- | --------------------------------- | -| `MaterialLightColorScheme(color)` | `SchemeTonalSpot(Hct(color), false, 0.0)` | -| `MaterialDarkColorScheme(color)` | `SchemeTonalSpot(Hct(color), true, 0.0)` | -| `MaterialLightContentColorScheme(color)` | `SchemeContent(Hct(color), false, 0.0)` | -| `MaterialDarkContentColorScheme(color)` | `SchemeContent(Hct(color), true, 0.0)` | - -###### Swift - -| Instead of … | Use … | -| ---------------------------- | ----------------------------------- | -| `Scheme.light(color)` | `SchemeTonalSpot(sourceColorHct: Hct.fromInt(color), isDark: false, contrastLevel: 0.0)` | -| `Scheme.dark(color)` | `SchemeTonalSpot(sourceColorHct: Hct.fromInt(color), isDark: true, contrastLevel: 0.0)` | -| `Scheme.lightContent(color)` | `SchemeContent(sourceColorHct: Hct.fromInt(color), isDark: false, contrastLevel: 0.0)` | -| `Scheme.darkContent(color)` | `SchemeContent(sourceColorHct: Hct.fromInt(color), isDark: true, contrastLevel: 0.0)` | - - - -
- -For `Scheme.lightFromCorePalette` and `Scheme.darkFromCorePalette` -(`MaterialLightColorSchemeFromPalette` and `MaterialDarkColorSchemeFromPalette` -in C++), please use the `DynamicScheme` constructor instead. - -Please see **Step 2 — Obtaining colors** to obtain colors from a -`DynamicScheme`. - -Due to an update in the specification, the values of many color roles have -changed between `Scheme`, and the new dynamic schemes `SchemeTonalSpot` and -`SchemeContent`. After migrating, you may need to update your tests. - -For `SchemeTonalSpot`, color roles using the "primary" and "neutral" palettes, -such as `onPrimary` and `outline`, may be affected. Also, the roles `background` -and `surface` have updated tones. - -For `SchemeContent`, all colors may have been affected, because `SchemeContent` -is a fidelity scheme: the tones of color roles may depend on the tone of the -seed color. diff --git a/dev_guide/extracting_colors.md b/dev_guide/extracting_colors.md deleted file mode 100644 index 8da78394..00000000 --- a/dev_guide/extracting_colors.md +++ /dev/null @@ -1,110 +0,0 @@ -# Extracting colors from an image - -See [Color Extraction](../concepts/color_extraction.md) for a conceptual -overview. - -## Step 1 — Image to Pixels - -The first step is to convert an image into **an array of pixels in ARGB -format**. Prior to that, please resize it to 128 × 128 dimensions for faster -processing. - -MCU does not provide this feature, so you’ll have to rely on the idiomatic -method in your programming language. For example, in Java, one may use the -`BufferedImage.getRGB` method: - -```java -import java.awt.image.BufferedImage; - -class ImageUtils { - // ... - - public static int[] imageToPixels(BufferedImage image) { - int width = image.getWidth(); - int height = image.getHeight(); - BufferedImage outputImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); - return image.getRGB(0, 0, width, height, null, 0, width); - } -} -``` - -## Step 2 — Pixels to Prominent Colors - -Once you have the array of pixels, pass it into `QuantizerCelebi.quantize` -provided by the `quantize` library. - -
- -###### Dart - -```dart -final quantizerResult = await QuantizerCelebi.quantize(pixels, maxColors); -``` - -###### Java - -```java -QuantizerResult quantizerResult = QuantizerCelebi.quantize(pixels, maxColors); -``` - -###### TypeScript - -```typescript -const quantizerResult = QuantizerCelebi.quantize(pixels, maxColors); -``` - -###### C++ - -```cpp -QuantizerResult quantizer_result = QuantizeCelebi(pixels, max_colors); -``` - -###### Swift - -```swift -let quantizerResult = QuantizerCelebi().quantize(pixels, maxColors) -``` - -
- -The parameter `maxColors` is a limit on the number of colors returned by the -quantizer. A reasonable default is 128. - -## Step 3 — Prominent Colors to Source Colors - -Use the `Score.score` method provided by the `score` library to extract colors -that are suitable as seeds for color schemes, ranked by decreasing suitability. - -
- -###### Dart - -```dart -final colors = Score.score(quantizerResult.colorToCount); -``` - -###### Java - -```java -List colors = Score.score(quantizerResult); -``` - -###### TypeScript - -```typescript -final colors = Score.score(quantizerResult); -``` - -###### C++ - -```cpp -std::vector colors = RankedSuggestions(quantizer_result.color_to_count); -``` - -###### Swift - -```swift -let colors = Score.score(quantizerResult.colorToCount) -``` - -
diff --git a/dev_guide/refining_contrast.md b/dev_guide/refining_contrast.md deleted file mode 100644 index a0661fe2..00000000 --- a/dev_guide/refining_contrast.md +++ /dev/null @@ -1,179 +0,0 @@ -# Refining Contrast - -In this guide, you will learn how to manually refine color contrast using the -MCU contrast library. For optimal color contrast, we recommend using the -`DynamicColor` and `DynamicScheme` features in your production. - -See [Contrast for Accessibility](../concepts/contrast_for_accessibility.md) for -a conceptual overview. - -## Calculating contrast ratio - -To measure the contrast of two colors, use the `ratioOfTones` method on the -tones (`L*`) of the two colors. - -The tone of an HCT color is the `tone` component. The tone of an ARGB color can -be obtained by `ColorUtils.lstarFromArgb` method. - -
- -###### Dart - -```dart -final contrastRatio = Contrast.ratioOfTones(hct1.tone, hct2.tone); -``` - -```dart -final tone1 = ColorUtils.lstarFromArgb(argb1); -final tone2 = ColorUtils.lstarFromArgb(argb2); -final contrastRatio = Contrast.ratioOfTones(tone1, tone2); -``` - -###### Java - -```java -double contrastRatio = Contrast.ratioOfTones(hct1.getTone(), hct2.getTone()); -``` - -```java -double tone1 = ColorUtils.lstarFromArgb(argb1); -double tone2 = ColorUtils.lstarFromArgb(argb2); -double contrastRatio = Contrast.ratioOfTones(tone1, tone2); -``` - -###### TypeScript - -```typescript -const contrastRatio = Contrast.ratioOfTones(hct1.tone, hct2.tone); -``` - -```typescript -const tone1 = ColorUtils.lstarFromArgb(argb1); -const tone2 = ColorUtils.lstarFromArgb(argb2); -const contrastRatio = Contrast.ratioOfTones(tone1, tone2); -``` - -###### C++ - -```cpp -double contrast_ratio = RatioOfTones(hct1.get_tone(), hct2.get_tone()); -``` - -```cpp -double tone1 = LstarFromArgb(argb1); -double tone2 = LstarFromArgb(argb2); -double contrast_ratio = RatioOfTones(tone1, tone2); -``` - -###### Swift - -```swift -let contrastRatio = Contrast.ratioOfTones(hct1.tone, hct2.tone) -``` - -```swift -let tone1 = ColorUtils.lstarFromArgb(argb1) -let tone2 = ColorUtils.lstarFromArgb(argb2) -let contrastRatio = Contrast.ratioOfTones(tone1, tone2) -``` - -
- -## Obtaining well-contrasting colors - -The functions `darker` and `lighter` (and their variants `darkerUnsafe` and -`lighterUnsafe`) allow one to obtain **tones** that contrast well against the -**tone** of a given color. - -The functions `darker` and `lighter` will return `-1` if the required contrast -cannot be reached, whereas `darkerUnsafe` and `lighterUnsafe` will return `0` -(tone of black) and `100` (tone of white), respectively, making the contrast -ratio as high as possible. - -The word "unsafe" in the names means they may return a color without -guaranteeing contrast ratio. These functions do not crash but their output -colors may not meet accessibility standards. - -
- -###### Dart - -```dart -final original = ColorUtils.lstarFromArgb(0xFF00AA00); // 60.56 - -final darker = Contrast.darker(original, 3.0); // 29.63 -final lighter = Contrast.lighter(original, 3.0); // 98.93 -final darkerUnsafe = Contrast.darkerUnsafe(original, 3.0); // 29.63 -final lighterUnsafe = Contrast.lighterUnsafe(original, 3.0); // 98.93 - -final darker = Contrast.darker(original, 7.0); // -1.0 -final lighter = Contrast.lighter(original, 7.0); // -1.0 -final darkerUnsafe = Contrast.darkerUnsafe(original, 7.0); // 0.0 -final lighterUnsafe = Contrast.lighterUnsafe(original, 7.0); // 100.0 -``` - -###### Java - -```java -double original = ColorUtils.lstarFromArgb(0xFF00AA00); // 60.56 - -double darker = Contrast.darker(original, 3.0); // 29.63 -double lighter = Contrast.lighter(original, 3.0); // 98.93 -double darkerUnsafe = Contrast.darkerUnsafe(original, 3.0); // 29.63 -double lighterUnsafe = Contrast.lighterUnsafe(original, 3.0); // 98.93 - -double darker = Contrast.darker(original, 7.0); // -1.0 -double lighter = Contrast.lighter(original, 7.0); // -1.0 -double darkerUnsafe = Contrast.darkerUnsafe(original, 7.0); // 0.0 -double lighterUnsafe = Contrast.lighterUnsafe(original, 7.0); // 100.0 -``` - -###### TypeScript - -```typescript -const original = ColorUtils.lstarFromArgb(0xFF00AA00); // 60.56 - -const darker = Contrast.darker(original, 3.0); // 29.63 -const lighter = Contrast.lighter(original, 3.0); // 98.93 -const darkerUnsafe = Contrast.darkerUnsafe(original, 3.0); // 29.63 -const lighterUnsafe = Contrast.lighterUnsafe(original, 3.0); // 98.93 - -const darker = Contrast.darker(original, 7.0); // -1.0 -const lighter = Contrast.lighter(original, 7.0); // -1.0 -const darkerUnsafe = Contrast.darkerUnsafe(original, 7.0); // 0.0 -const lighterUnsafe = Contrast.lighterUnsafe(original, 7.0); // 100.0 -``` - -###### C++ - -```cpp -double original = LstarFromArgb(0xFF00AA00); // 60.56 - -double darker = Darker(original, 3.0); // 29.63 -double lighter = Lighter(original, 3.0); // 98.93 -double darker_unsafe = DarkerUnsafe(original, 3.0); // 29.63 -double lighter_unsafe = LighterUnsafe(original, 3.0); // 98.93 - -double darker = Darker(original, 7.0); // -1.0 -double lighter = Lighter(original, 7.0); // -1.0 -double darker_unsafe = DarkerUnsafe(original, 7.0); // 0.0 -double lighter_unsafe = LighterUnsafe(original, 7.0); // 100.0 -``` - -###### Swift - -```swift -let original = ColorUtils.lstarFromArgb(0xFF00AA00) // 60.56 - -let darker = Contrast.darker(tone: original, ratio: 3.0) // 29.63 -let lighter = Contrast.lighter(tone: original, ratio: 3.0) // 98.93 -let darkerUnsafe = Contrast.darkerUnsafe(tone: original, ratio: 3.0) // 29.63 -let lighterUnsafe = Contrast.lighterUnsafe(tone: original, ratio: 3.0) // 98.93 - -let darker = Contrast.darker(tone: original, ratio: 7.0) // -1.0 -let lighter = Contrast.lighter(tone: original, ratio: 7.0) // -1.0 -let darkerUnsafe = Contrast.darkerUnsafe(tone: original, ratio: 7.0) // 0.0 -let lighterUnsafe = Contrast.lighterUnsafe(tone: original, ratio: 7.0) // 100.0 -``` - -
diff --git a/go.mod b/go.mod new file mode 100644 index 00000000..8c274b84 --- /dev/null +++ b/go.mod @@ -0,0 +1,3 @@ +module github.com/jcc620/hct-converter-go + +go 1.25.3 diff --git a/hctconverter.go b/hctconverter.go new file mode 100644 index 00000000..5824dd62 --- /dev/null +++ b/hctconverter.go @@ -0,0 +1,28 @@ +// Package hctconverter provides functions for converting between RGB and HCT +// color encodings. +package hctconverter + +/* +#cgo LDFLAGS: -L libs -lmaterial-colors -lmaterial_color_utilities_lib -lm +#include "cpp/src/mylib/mylib.h" +*/ +import "C" + +import "math" + +// HCTToRGB converts a HCT-encoded color to an RGB-encoded one. +func HCTToRGB(hue, chroma, tone int) (red, green, blue int) { + cHCT := C.BuildHct(C.double(hue), C.double(chroma), C.double(tone)) + cRGB := C.HctToRgb(cHCT) + return int(cRGB.Red), int(cRGB.Green), int(cRGB.Blue) +} + +// RGBToHCT converts an RGB-encoded color to a HCT-encoded one. +func RGBToHCT(red, green, blue int) (hue, chroma, tone int) { + cRGB := C.BuildRgb(C.int(red), C.int(green), C.int(blue)) + cHCT := C.RgbToHct(cRGB) + hue = int(math.Round(float64(cHCT.Hue))) + chroma = int(math.Round(float64(cHCT.Chroma))) + tone = int(math.Round(float64(cHCT.Tone))) + return +} diff --git a/java/LICENSE b/java/LICENSE deleted file mode 100644 index c3df629a..00000000 --- a/java/LICENSE +++ /dev/null @@ -1,191 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - Copyright 2021 Google LLC - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file diff --git a/java/blend/Blend.java b/java/blend/Blend.java deleted file mode 100644 index 545e2ff1..00000000 --- a/java/blend/Blend.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright 2021 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// This file is automatically generated. Do not modify it. - -package blend; - -import hct.Cam16; -import hct.Hct; -import utils.ColorUtils; -import utils.MathUtils; - -/** Functions for blending in HCT and CAM16. */ -public class Blend { - private Blend() {} - - /** - * Blend the design color's HCT hue towards the key color's HCT hue, in a way that leaves the - * original color recognizable and recognizably shifted towards the key color. - * - * @param designColor ARGB representation of an arbitrary color. - * @param sourceColor ARGB representation of the main theme color. - * @return The design color with a hue shifted towards the system's color, a slightly - * warmer/cooler variant of the design color's hue. - */ - public static int harmonize(int designColor, int sourceColor) { - Hct fromHct = Hct.fromInt(designColor); - Hct toHct = Hct.fromInt(sourceColor); - double differenceDegrees = MathUtils.differenceDegrees(fromHct.getHue(), toHct.getHue()); - double rotationDegrees = Math.min(differenceDegrees * 0.5, 15.0); - double outputHue = - MathUtils.sanitizeDegreesDouble( - fromHct.getHue() - + rotationDegrees * MathUtils.rotationDirection(fromHct.getHue(), toHct.getHue())); - return Hct.from(outputHue, fromHct.getChroma(), fromHct.getTone()).toInt(); - } - - /** - * Blends hue from one color into another. The chroma and tone of the original color are - * maintained. - * - * @param from ARGB representation of color - * @param to ARGB representation of color - * @param amount how much blending to perform; 0.0 >= and <= 1.0 - * @return from, with a hue blended towards to. Chroma and tone are constant. - */ - public static int hctHue(int from, int to, double amount) { - int ucs = cam16Ucs(from, to, amount); - Cam16 ucsCam = Cam16.fromInt(ucs); - Cam16 fromCam = Cam16.fromInt(from); - Hct blended = Hct.from(ucsCam.getHue(), fromCam.getChroma(), ColorUtils.lstarFromArgb(from)); - return blended.toInt(); - } - - /** - * Blend in CAM16-UCS space. - * - * @param from ARGB representation of color - * @param to ARGB representation of color - * @param amount how much blending to perform; 0.0 >= and <= 1.0 - * @return from, blended towards to. Hue, chroma, and tone will change. - */ - 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; - return Cam16.fromUcs(jstar, astar, bstar).toInt(); - } -} - diff --git a/java/contrast/Contrast.java b/java/contrast/Contrast.java deleted file mode 100644 index 29cf0768..00000000 --- a/java/contrast/Contrast.java +++ /dev/null @@ -1,208 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package contrast; - -import static java.lang.Math.max; - -import utils.ColorUtils; - -/** - * Color science for contrast utilities. - * - *

Utility methods for calculating contrast given two colors, or calculating a color given one - * color and a contrast ratio. - * - *

Contrast ratio is calculated using XYZ's Y. When linearized to match human perception, Y - * becomes HCT's tone and L*a*b*'s' L*. - */ -public final class Contrast { - // The minimum contrast ratio of two colors. - // Contrast ratio equation = lighter + 5 / darker + 5, if lighter == darker, ratio == 1. - public static final double RATIO_MIN = 1.0; - - // The maximum contrast ratio of two colors. - // Contrast ratio equation = lighter + 5 / darker + 5. Lighter and darker scale from 0 to 100. - // If lighter == 100, darker = 0, ratio == 21. - public static final double RATIO_MAX = 21.0; - public static final double RATIO_30 = 3.0; - public static final double RATIO_45 = 4.5; - public static final double RATIO_70 = 7.0; - - // Given a color and a contrast ratio to reach, the luminance of a color that reaches that ratio - // with the color can be calculated. However, that luminance may not contrast as desired, i.e. the - // contrast ratio of the input color and the returned luminance may not reach the contrast ratio - // asked for. - // - // When the desired contrast ratio and the result contrast ratio differ by more than this amount, - // an error value should be returned, or the method should be documented as 'unsafe', meaning, - // it will return a valid luminance but that luminance may not meet the requested contrast ratio. - // - // 0.04 selected because it ensures the resulting ratio rounds to the same tenth. - private static final double CONTRAST_RATIO_EPSILON = 0.04; - - // Color spaces that measure luminance, such as Y in XYZ, L* in L*a*b*, or T in HCT, are known as - // perceptually accurate color spaces. - // - // To be displayed, they must gamut map to a "display space", one that has a defined limit on the - // number of colors. Display spaces include sRGB, more commonly understood as RGB/HSL/HSV/HSB. - // Gamut mapping is undefined and not defined by the color space. Any gamut mapping algorithm must - // choose how to sacrifice accuracy in hue, saturation, and/or lightness. - // - // A principled solution is to maintain lightness, thus maintaining contrast/a11y, maintain hue, - // thus maintaining aesthetic intent, and reduce chroma until the color is in gamut. - // - // HCT chooses this solution, but, that doesn't mean it will _exactly_ matched desired lightness, - // if only because RGB is quantized: RGB is expressed as a set of integers: there may be an RGB - // color with, for example, 47.892 lightness, but not 47.891. - // - // To allow for this inherent incompatibility between perceptually accurate color spaces and - // display color spaces, methods that take a contrast ratio and luminance, and return a luminance - // that reaches that contrast ratio for the input luminance, purposefully darken/lighten their - // result such that the desired contrast ratio will be reached even if inaccuracy is introduced. - // - // 0.4 is generous, ex. HCT requires much less delta. It was chosen because it provides a rough - // guarantee that as long as a perceptual color space gamut maps lightness such that the resulting - // lightness rounds to the same as the requested, the desired contrast ratio will be reached. - private static final double LUMINANCE_GAMUT_MAP_TOLERANCE = 0.4; - - private Contrast() {} - - /** - * Contrast ratio is a measure of legibility, its used to compare the lightness of two colors. - * This method is used commonly in industry due to its use by WCAG. - * - *

To compare lightness, the colors are expressed in the XYZ color space, where Y is lightness, - * also known as relative luminance. - * - *

The equation is ratio = lighter Y + 5 / darker Y + 5. - */ - public static double ratioOfYs(double y1, double y2) { - final double lighter = max(y1, y2); - final double darker = (lighter == y2) ? y1 : y2; - return (lighter + 5.0) / (darker + 5.0); - } - - /** - * Contrast ratio of two tones. T in HCT, L* in L*a*b*. Also known as luminance or perpectual - * luminance. - * - *

Contrast ratio is defined using Y in XYZ, relative luminance. However, relative luminance is - * linear to number of photons, not to perception of lightness. Perceptual luminance, L* in - * L*a*b*, T in HCT, is. Designers prefer color spaces with perceptual luminance since they're - * accurate to the eye. - * - *

Y and L* are pure functions of each other, so it possible to use perceptually accurate color - * spaces, and measure contrast, and measure contrast in a much more understandable way: instead - * of a ratio, a linear difference. This allows a designer to determine what they need to adjust a - * color's lightness to in order to reach their desired contrast, instead of guessing & checking - * with hex codes. - */ - public static double ratioOfTones(double t1, double t2) { - return ratioOfYs(ColorUtils.yFromLstar(t1), ColorUtils.yFromLstar(t2)); - } - - /** - * Returns T in HCT, L* in L*a*b* >= tone parameter that ensures ratio with input T/L*. Returns -1 - * if ratio cannot be achieved. - * - * @param tone Tone return value must contrast with. - * @param ratio Desired contrast ratio of return value and tone parameter. - */ - public static double lighter(double tone, double ratio) { - if (tone < 0.0 || tone > 100.0) { - return -1.0; - } - // Invert the contrast ratio equation to determine lighter Y given a ratio and darker Y. - final double darkY = ColorUtils.yFromLstar(tone); - final double lightY = ratio * (darkY + 5.0) - 5.0; - if (lightY < 0.0 || lightY > 100.0) { - return -1.0; - } - final double realContrast = ratioOfYs(lightY, darkY); - final double delta = Math.abs(realContrast - ratio); - if (realContrast < ratio && delta > CONTRAST_RATIO_EPSILON) { - return -1.0; - } - - final double returnValue = ColorUtils.lstarFromY(lightY) + LUMINANCE_GAMUT_MAP_TOLERANCE; - // NOMUTANTS--important validation step; functions it is calling may change implementation. - if (returnValue < 0 || returnValue > 100) { - return -1.0; - } - return returnValue; - } - - /** - * Tone >= tone parameter that ensures ratio. 100 if ratio cannot be achieved. - * - *

This method is unsafe because the returned value is guaranteed to be in bounds, but, the in - * bounds return value may not reach the desired ratio. - * - * @param tone Tone return value must contrast with. - * @param ratio Desired contrast ratio of return value and tone parameter. - */ - public static double lighterUnsafe(double tone, double ratio) { - double lighterSafe = lighter(tone, ratio); - return lighterSafe < 0.0 ? 100.0 : lighterSafe; - } - - /** - * Returns T in HCT, L* in L*a*b* <= tone parameter that ensures ratio with input T/L*. Returns -1 - * if ratio cannot be achieved. - * - * @param tone Tone return value must contrast with. - * @param ratio Desired contrast ratio of return value and tone parameter. - */ - public static double darker(double tone, double ratio) { - if (tone < 0.0 || tone > 100.0) { - return -1.0; - } - // Invert the contrast ratio equation to determine darker Y given a ratio and lighter Y. - final double lightY = ColorUtils.yFromLstar(tone); - final double darkY = ((lightY + 5.0) / ratio) - 5.0; - if (darkY < 0.0 || darkY > 100.0) { - return -1.0; - } - final double realContrast = ratioOfYs(lightY, darkY); - final double delta = Math.abs(realContrast - ratio); - if (realContrast < ratio && delta > CONTRAST_RATIO_EPSILON) { - return -1.0; - } - - // For information on 0.4 constant, see comment in lighter(tone, ratio). - final double returnValue = ColorUtils.lstarFromY(darkY) - LUMINANCE_GAMUT_MAP_TOLERANCE; - // NOMUTANTS--important validation step; functions it is calling may change implementation. - if (returnValue < 0 || returnValue > 100) { - return -1.0; - } - return returnValue; - } - - /** - * Tone <= tone parameter that ensures ratio. 0 if ratio cannot be achieved. - * - *

This method is unsafe because the returned value is guaranteed to be in bounds, but, the in - * bounds return value may not reach the desired ratio. - * - * @param tone Tone return value must contrast with. - * @param ratio Desired contrast ratio of return value and tone parameter. - */ - public static double darkerUnsafe(double tone, double ratio) { - double darkerSafe = darker(tone, ratio); - return max(0.0, darkerSafe); - } -} diff --git a/java/dislike/DislikeAnalyzer.java b/java/dislike/DislikeAnalyzer.java deleted file mode 100644 index 96d0578d..00000000 --- a/java/dislike/DislikeAnalyzer.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dislike; - -import hct.Hct; - -/** - * Check and/or fix universally disliked colors. - * - *

Color science studies of color preference indicate universal distaste for dark yellow-greens, - * and also show this is correlated to distate for biological waste and rotting food. - * - *

See Palmer and Schloss, 2010 or Schloss and Palmer's Chapter 21 in Handbook of Color - * Psychology (2015). - */ -public final class DislikeAnalyzer { - - private DislikeAnalyzer() { - throw new UnsupportedOperationException(); - } - - /** - * Returns true if color is disliked. - * - *

Disliked is defined as a dark yellow-green that is not neutral. - */ - public static boolean isDisliked(Hct hct) { - final boolean huePasses = Math.round(hct.getHue()) >= 90.0 && Math.round(hct.getHue()) <= 111.0; - final boolean chromaPasses = Math.round(hct.getChroma()) > 16.0; - final boolean tonePasses = Math.round(hct.getTone()) < 65.0; - - return huePasses && chromaPasses && tonePasses; - } - - /** If color is disliked, lighten it to make it likable. */ - public static Hct fixIfDisliked(Hct hct) { - if (isDisliked(hct)) { - return Hct.from(hct.getHue(), hct.getChroma(), 70.0); - } - - return hct; - } -} diff --git a/java/dynamiccolor/ColorSpec.java b/java/dynamiccolor/ColorSpec.java deleted file mode 100644 index 79dc227d..00000000 --- a/java/dynamiccolor/ColorSpec.java +++ /dev/null @@ -1,318 +0,0 @@ -/* - * Copyright 2025 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dynamiccolor; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import dynamiccolor.DynamicScheme.Platform; -import hct.Hct; -import palettes.TonalPalette; -import java.util.Optional; - -/** An interface defining all the necessary methods that could be different between specs. */ -public interface ColorSpec { - - /** All available spec versions. */ - public enum SpecVersion { - SPEC_2021, - SPEC_2025, - } - - //////////////////////////////////////////////////////////////// - // Main Palettes // - //////////////////////////////////////////////////////////////// - - @NonNull - public DynamicColor primaryPaletteKeyColor(); - - @NonNull - public DynamicColor secondaryPaletteKeyColor(); - - @NonNull - public DynamicColor tertiaryPaletteKeyColor(); - - @NonNull - public DynamicColor neutralPaletteKeyColor(); - - @NonNull - public DynamicColor neutralVariantPaletteKeyColor(); - - @NonNull - public DynamicColor errorPaletteKeyColor(); - - //////////////////////////////////////////////////////////////// - // Surfaces [S] // - //////////////////////////////////////////////////////////////// - - @NonNull - public DynamicColor background(); - - @NonNull - public DynamicColor onBackground(); - - @NonNull - public DynamicColor surface(); - - @NonNull - public DynamicColor surfaceDim(); - - @NonNull - public DynamicColor surfaceBright(); - - @NonNull - public DynamicColor surfaceContainerLowest(); - - @NonNull - public DynamicColor surfaceContainerLow(); - - @NonNull - public DynamicColor surfaceContainer(); - - @NonNull - public DynamicColor surfaceContainerHigh(); - - @NonNull - public DynamicColor surfaceContainerHighest(); - - @NonNull - public DynamicColor onSurface(); - - @NonNull - public DynamicColor surfaceVariant(); - - @NonNull - public DynamicColor onSurfaceVariant(); - - @NonNull - public DynamicColor inverseSurface(); - - @NonNull - public DynamicColor inverseOnSurface(); - - @NonNull - public DynamicColor outline(); - - @NonNull - public DynamicColor outlineVariant(); - - @NonNull - public DynamicColor shadow(); - - @NonNull - public DynamicColor scrim(); - - @NonNull - public DynamicColor surfaceTint(); - - //////////////////////////////////////////////////////////////// - // Primaries [P] // - //////////////////////////////////////////////////////////////// - - @NonNull - public DynamicColor primary(); - - @Nullable - public DynamicColor primaryDim(); - - @NonNull - public DynamicColor onPrimary(); - - @NonNull - public DynamicColor primaryContainer(); - - @NonNull - public DynamicColor onPrimaryContainer(); - - @NonNull - public DynamicColor inversePrimary(); - - //////////////////////////////////////////////////////////////// - // Secondaries [Q] // - //////////////////////////////////////////////////////////////// - - @NonNull - public DynamicColor secondary(); - - @Nullable - public DynamicColor secondaryDim(); - - @NonNull - public DynamicColor onSecondary(); - - @NonNull - public DynamicColor secondaryContainer(); - - @NonNull - public DynamicColor onSecondaryContainer(); - - //////////////////////////////////////////////////////////////// - // Tertiaries [T] // - //////////////////////////////////////////////////////////////// - - @NonNull - public DynamicColor tertiary(); - - @Nullable - public DynamicColor tertiaryDim(); - - @NonNull - public DynamicColor onTertiary(); - - @NonNull - public DynamicColor tertiaryContainer(); - - @NonNull - public DynamicColor onTertiaryContainer(); - - //////////////////////////////////////////////////////////////// - // Errors [E] // - //////////////////////////////////////////////////////////////// - - @NonNull - public DynamicColor error(); - - @Nullable - public DynamicColor errorDim(); - - @NonNull - public DynamicColor onError(); - - @NonNull - public DynamicColor errorContainer(); - - @NonNull - public DynamicColor onErrorContainer(); - - //////////////////////////////////////////////////////////////// - // Primary Fixed Colors [PF] // - //////////////////////////////////////////////////////////////// - - @NonNull - public DynamicColor primaryFixed(); - - @NonNull - public DynamicColor primaryFixedDim(); - - @NonNull - public DynamicColor onPrimaryFixed(); - - @NonNull - public DynamicColor onPrimaryFixedVariant(); - - //////////////////////////////////////////////////////////////// - // Secondary Fixed Colors [QF] // - //////////////////////////////////////////////////////////////// - - @NonNull - public DynamicColor secondaryFixed(); - - @NonNull - public DynamicColor secondaryFixedDim(); - - @NonNull - public DynamicColor onSecondaryFixed(); - - @NonNull - public DynamicColor onSecondaryFixedVariant(); - - //////////////////////////////////////////////////////////////// - // Tertiary Fixed Colors [TF] // - //////////////////////////////////////////////////////////////// - - @NonNull - public DynamicColor tertiaryFixed(); - - @NonNull - public DynamicColor tertiaryFixedDim(); - - @NonNull - public DynamicColor onTertiaryFixed(); - - @NonNull - public DynamicColor onTertiaryFixedVariant(); - - ////////////////////////////////////////////////////////////////// - // Android-only Colors // - ////////////////////////////////////////////////////////////////// - - @NonNull - public DynamicColor controlActivated(); - - @NonNull - public DynamicColor controlNormal(); - - @NonNull - public DynamicColor controlHighlight(); - - @NonNull - public DynamicColor textPrimaryInverse(); - - @NonNull - public DynamicColor textSecondaryAndTertiaryInverse(); - - @NonNull - public DynamicColor textPrimaryInverseDisableOnly(); - - @NonNull - public DynamicColor textSecondaryAndTertiaryInverseDisabled(); - - @NonNull - public DynamicColor textHintInverse(); - - //////////////////////////////////////////////////////////////// - // Other // - //////////////////////////////////////////////////////////////// - - @NonNull - public DynamicColor highestSurface(@NonNull DynamicScheme s); - - ///////////////////////////////////////////////////////////////// - // Color value calculations // - ///////////////////////////////////////////////////////////////// - - Hct getHct(DynamicScheme scheme, DynamicColor color); - - double getTone(DynamicScheme scheme, DynamicColor color); - - ////////////////////////////////////////////////////////////////// - // Scheme Palettes // - ////////////////////////////////////////////////////////////////// - - @NonNull - public TonalPalette getPrimaryPalette( - Variant variant, Hct sourceColorHct, boolean isDark, Platform platform, double contrastLevel); - - @NonNull - public TonalPalette getSecondaryPalette( - Variant variant, Hct sourceColorHct, boolean isDark, Platform platform, double contrastLevel); - - @NonNull - public TonalPalette getTertiaryPalette( - Variant variant, Hct sourceColorHct, boolean isDark, Platform platform, double contrastLevel); - - @NonNull - public TonalPalette getNeutralPalette( - Variant variant, Hct sourceColorHct, boolean isDark, Platform platform, double contrastLevel); - - @NonNull - public TonalPalette getNeutralVariantPalette( - Variant variant, Hct sourceColorHct, boolean isDark, Platform platform, double contrastLevel); - - @NonNull - public Optional getErrorPalette( - Variant variant, Hct sourceColorHct, boolean isDark, Platform platform, double contrastLevel); -} diff --git a/java/dynamiccolor/ColorSpec2021.java b/java/dynamiccolor/ColorSpec2021.java deleted file mode 100644 index a20e6061..00000000 --- a/java/dynamiccolor/ColorSpec2021.java +++ /dev/null @@ -1,1455 +0,0 @@ -/* - * Copyright 2025 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dynamiccolor; - -import static java.lang.Math.max; -import static java.lang.Math.min; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import com.google.errorprone.annotations.Var; -import contrast.Contrast; -import dislike.DislikeAnalyzer; -import dynamiccolor.DynamicScheme.Platform; -import hct.Hct; -import palettes.TonalPalette; -import temperature.TemperatureCache; -import utils.MathUtils; -import java.util.ArrayList; -import java.util.Optional; - -/** {@link ColorSpec} implementation for the 2021 spec. */ -class ColorSpec2021 implements ColorSpec { - - //////////////////////////////////////////////////////////////// - // Main Palettes // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor primaryPaletteKeyColor() { - return new DynamicColor.Builder() - .setName("primary_palette_key_color") - .setPalette((s) -> s.primaryPalette) - .setTone((s) -> s.primaryPalette.getKeyColor().getTone()) - .build(); - } - - @NonNull - @Override - public DynamicColor secondaryPaletteKeyColor() { - return new DynamicColor.Builder() - .setName("secondary_palette_key_color") - .setPalette((s) -> s.secondaryPalette) - .setTone((s) -> s.secondaryPalette.getKeyColor().getTone()) - .build(); - } - - @NonNull - @Override - public DynamicColor tertiaryPaletteKeyColor() { - return new DynamicColor.Builder() - .setName("tertiary_palette_key_color") - .setPalette((s) -> s.tertiaryPalette) - .setTone((s) -> s.tertiaryPalette.getKeyColor().getTone()) - .build(); - } - - @NonNull - @Override - public DynamicColor neutralPaletteKeyColor() { - return new DynamicColor.Builder() - .setName("neutral_palette_key_color") - .setPalette((s) -> s.neutralPalette) - .setTone((s) -> s.neutralPalette.getKeyColor().getTone()) - .build(); - } - - @NonNull - @Override - public DynamicColor neutralVariantPaletteKeyColor() { - return new DynamicColor.Builder() - .setName("neutral_variant_palette_key_color") - .setPalette((s) -> s.neutralVariantPalette) - .setTone((s) -> s.neutralVariantPalette.getKeyColor().getTone()) - .build(); - } - - @NonNull - @Override - public DynamicColor errorPaletteKeyColor() { - return new DynamicColor.Builder() - .setName("error_palette_key_color") - .setPalette((s) -> s.errorPalette) - .setTone((s) -> s.errorPalette.getKeyColor().getTone()) - .build(); - } - - //////////////////////////////////////////////////////////////// - // Surfaces [S] // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor background() { - return new DynamicColor.Builder() - .setName("background") - .setPalette((s) -> s.neutralPalette) - .setTone((s) -> s.isDark ? 6.0 : 98.0) - .setIsBackground(true) - .build(); - } - - @NonNull - @Override - public DynamicColor onBackground() { - return new DynamicColor.Builder() - .setName("on_background") - .setPalette((s) -> s.neutralPalette) - .setTone((s) -> s.isDark ? 90.0 : 10.0) - .setBackground((s) -> background()) - .setContrastCurve((s) -> new ContrastCurve(3.0, 3.0, 4.5, 7.0)) - .build(); - } - - @NonNull - @Override - public DynamicColor surface() { - return new DynamicColor.Builder() - .setName("surface") - .setPalette((s) -> s.neutralPalette) - .setTone((s) -> s.isDark ? 6.0 : 98.0) - .setIsBackground(true) - .build(); - } - - @NonNull - @Override - public DynamicColor surfaceDim() { - return new DynamicColor.Builder() - .setName("surface_dim") - .setPalette((s) -> s.neutralPalette) - .setTone( - (s) -> s.isDark ? 6.0 : new ContrastCurve(87.0, 87.0, 80.0, 75.0).get(s.contrastLevel)) - .setIsBackground(true) - .build(); - } - - @NonNull - @Override - public DynamicColor surfaceBright() { - return new DynamicColor.Builder() - .setName("surface_bright") - .setPalette((s) -> s.neutralPalette) - .setTone( - (s) -> s.isDark ? new ContrastCurve(24.0, 24.0, 29.0, 34.0).get(s.contrastLevel) : 98.0) - .setIsBackground(true) - .build(); - } - - @NonNull - @Override - public DynamicColor surfaceContainerLowest() { - return new DynamicColor.Builder() - .setName("surface_container_lowest") - .setPalette((s) -> s.neutralPalette) - .setTone( - (s) -> s.isDark ? new ContrastCurve(4.0, 4.0, 2.0, 0.0).get(s.contrastLevel) : 100.0) - .setIsBackground(true) - .build(); - } - - @NonNull - @Override - public DynamicColor surfaceContainerLow() { - return new DynamicColor.Builder() - .setName("surface_container_low") - .setPalette((s) -> s.neutralPalette) - .setTone( - (s) -> - s.isDark - ? new ContrastCurve(10.0, 10.0, 11.0, 12.0).get(s.contrastLevel) - : new ContrastCurve(96.0, 96.0, 96.0, 95.0).get(s.contrastLevel)) - .setIsBackground(true) - .build(); - } - - @NonNull - @Override - public DynamicColor surfaceContainer() { - return new DynamicColor.Builder() - .setName("surface_container") - .setPalette((s) -> s.neutralPalette) - .setTone( - (s) -> - s.isDark - ? new ContrastCurve(12.0, 12.0, 16.0, 20.0).get(s.contrastLevel) - : new ContrastCurve(94.0, 94.0, 92.0, 90.0).get(s.contrastLevel)) - .setIsBackground(true) - .build(); - } - - @NonNull - @Override - public DynamicColor surfaceContainerHigh() { - return new DynamicColor.Builder() - .setName("surface_container_high") - .setPalette((s) -> s.neutralPalette) - .setTone( - (s) -> - s.isDark - ? new ContrastCurve(17.0, 17.0, 21.0, 25.0).get(s.contrastLevel) - : new ContrastCurve(92.0, 92.0, 88.0, 85.0).get(s.contrastLevel)) - .setIsBackground(true) - .build(); - } - - @NonNull - @Override - public DynamicColor surfaceContainerHighest() { - return new DynamicColor.Builder() - .setName("surface_container_highest") - .setPalette((s) -> s.neutralPalette) - .setTone( - (s) -> - s.isDark - ? new ContrastCurve(22.0, 22.0, 26.0, 30.0).get(s.contrastLevel) - : new ContrastCurve(90.0, 90.0, 84.0, 80.0).get(s.contrastLevel)) - .setIsBackground(true) - .build(); - } - - @NonNull - @Override - public DynamicColor onSurface() { - return new DynamicColor.Builder() - .setName("on_surface") - .setPalette((s) -> s.neutralPalette) - .setTone((s) -> s.isDark ? 90.0 : 10.0) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(4.5, 7.0, 11.0, 21.0)) - .build(); - } - - @NonNull - @Override - public DynamicColor surfaceVariant() { - return new DynamicColor.Builder() - .setName("surface_variant") - .setPalette((s) -> s.neutralVariantPalette) - .setTone((s) -> s.isDark ? 30.0 : 90.0) - .setIsBackground(true) - .build(); - } - - @NonNull - @Override - public DynamicColor onSurfaceVariant() { - return new DynamicColor.Builder() - .setName("on_surface_variant") - .setPalette((s) -> s.neutralVariantPalette) - .setTone((s) -> s.isDark ? 80.0 : 30.0) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(3.0, 4.5, 7.0, 11.0)) - .build(); - } - - @NonNull - @Override - public DynamicColor inverseSurface() { - return new DynamicColor.Builder() - .setName("inverse_surface") - .setPalette((s) -> s.neutralPalette) - .setTone((s) -> s.isDark ? 90.0 : 20.0) - .setIsBackground(true) - .build(); - } - - @NonNull - @Override - public DynamicColor inverseOnSurface() { - return new DynamicColor.Builder() - .setName("inverse_on_surface") - .setPalette((s) -> s.neutralPalette) - .setTone((s) -> s.isDark ? 20.0 : 95.0) - .setBackground((s) -> inverseSurface()) - .setContrastCurve((s) -> new ContrastCurve(4.5, 7.0, 11.0, 21.0)) - .build(); - } - - @NonNull - @Override - public DynamicColor outline() { - return new DynamicColor.Builder() - .setName("outline") - .setPalette((s) -> s.neutralVariantPalette) - .setTone((s) -> s.isDark ? 60.0 : 50.0) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(1.5, 3.0, 4.5, 7.0)) - .build(); - } - - @NonNull - @Override - public DynamicColor outlineVariant() { - return new DynamicColor.Builder() - .setName("outline_variant") - .setPalette((s) -> s.neutralVariantPalette) - .setTone((s) -> s.isDark ? 30.0 : 80.0) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(1.0, 1.0, 3.0, 4.5)) - .build(); - } - - @NonNull - @Override - public DynamicColor shadow() { - return new DynamicColor.Builder() - .setName("shadow") - .setPalette((s) -> s.neutralPalette) - .setTone((s) -> 0.0) - .build(); - } - - @NonNull - @Override - public DynamicColor scrim() { - return new DynamicColor.Builder() - .setName("scrim") - .setPalette((s) -> s.neutralPalette) - .setTone((s) -> 0.0) - .build(); - } - - @NonNull - @Override - public DynamicColor surfaceTint() { - return new DynamicColor.Builder() - .setName("surface_tint") - .setPalette((s) -> s.primaryPalette) - .setTone((s) -> s.isDark ? 80.0 : 40.0) - .setIsBackground(true) - .build(); - } - - //////////////////////////////////////////////////////////////// - // Primaries [P] // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor primary() { - return new DynamicColor.Builder() - .setName("primary") - .setPalette((s) -> s.primaryPalette) - .setTone( - (s) -> { - if (isMonochrome(s)) { - return s.isDark ? 100.0 : 0.0; - } - return s.isDark ? 80.0 : 40.0; - }) - .setIsBackground(true) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(3.0, 4.5, 7.0, 7.0)) - .setToneDeltaPair( - (s) -> - new ToneDeltaPair(primaryContainer(), primary(), 10.0, TonePolarity.NEARER, false)) - .build(); - } - - @Nullable - @Override - public DynamicColor primaryDim() { - return null; - } - - @NonNull - @Override - public DynamicColor onPrimary() { - return new DynamicColor.Builder() - .setName("on_primary") - .setPalette((s) -> s.primaryPalette) - .setTone( - (s) -> { - if (isMonochrome(s)) { - return s.isDark ? 10.0 : 90.0; - } - return s.isDark ? 20.0 : 100.0; - }) - .setBackground((s) -> primary()) - .setContrastCurve((s) -> new ContrastCurve(4.5, 7.0, 11.0, 21.0)) - .build(); - } - - @NonNull - @Override - public DynamicColor primaryContainer() { - return new DynamicColor.Builder() - .setName("primary_container") - .setPalette((s) -> s.primaryPalette) - .setTone( - (s) -> { - if (isFidelity(s)) { - return s.sourceColorHct.getTone(); - } - if (isMonochrome(s)) { - return s.isDark ? 85.0 : 25.0; - } - return s.isDark ? 30.0 : 90.0; - }) - .setIsBackground(true) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(1.0, 1.0, 3.0, 4.5)) - .setToneDeltaPair( - (s) -> - new ToneDeltaPair(primaryContainer(), primary(), 10.0, TonePolarity.NEARER, false)) - .build(); - } - - @NonNull - @Override - public DynamicColor onPrimaryContainer() { - return new DynamicColor.Builder() - .setName("on_primary_container") - .setPalette((s) -> s.primaryPalette) - .setTone( - (s) -> { - if (isFidelity(s)) { - return DynamicColor.foregroundTone(primaryContainer().tone.apply(s), 4.5); - } - if (isMonochrome(s)) { - return s.isDark ? 0.0 : 100.0; - } - return s.isDark ? 90.0 : 30.0; - }) - .setBackground((s) -> primaryContainer()) - .setContrastCurve((s) -> new ContrastCurve(3.0, 4.5, 7.0, 11.0)) - .build(); - } - - @NonNull - @Override - public DynamicColor inversePrimary() { - return new DynamicColor.Builder() - .setName("inverse_primary") - .setPalette((s) -> s.primaryPalette) - .setTone((s) -> s.isDark ? 40.0 : 80.0) - .setBackground((s) -> inverseSurface()) - .setContrastCurve((s) -> new ContrastCurve(3.0, 4.5, 7.0, 7.0)) - .build(); - } - - //////////////////////////////////////////////////////////////// - // Secondaries [Q] // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor secondary() { - return new DynamicColor.Builder() - .setName("secondary") - .setPalette((s) -> s.secondaryPalette) - .setTone((s) -> s.isDark ? 80.0 : 40.0) - .setIsBackground(true) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(3.0, 4.5, 7.0, 7.0)) - .setToneDeltaPair( - (s) -> - new ToneDeltaPair( - secondaryContainer(), secondary(), 10.0, TonePolarity.NEARER, false)) - .build(); - } - - @Nullable - @Override - public DynamicColor secondaryDim() { - return null; - } - - @NonNull - @Override - public DynamicColor onSecondary() { - return new DynamicColor.Builder() - .setName("on_secondary") - .setPalette((s) -> s.secondaryPalette) - .setTone( - (s) -> { - if (isMonochrome(s)) { - return s.isDark ? 10.0 : 100.0; - } - return s.isDark ? 20.0 : 100.0; - }) - .setBackground((s) -> secondary()) - .setContrastCurve((s) -> new ContrastCurve(4.5, 7.0, 11.0, 21.0)) - .build(); - } - - @NonNull - @Override - public DynamicColor secondaryContainer() { - return new DynamicColor.Builder() - .setName("secondary_container") - .setPalette((s) -> s.secondaryPalette) - .setTone( - (s) -> { - final double initialTone = s.isDark ? 30.0 : 90.0; - if (isMonochrome(s)) { - return s.isDark ? 30.0 : 85.0; - } - if (!isFidelity(s)) { - return initialTone; - } - return findDesiredChromaByTone( - s.secondaryPalette.getHue(), - s.secondaryPalette.getChroma(), - initialTone, - !s.isDark); - }) - .setIsBackground(true) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(1.0, 1.0, 3.0, 4.5)) - .setToneDeltaPair( - (s) -> - new ToneDeltaPair( - secondaryContainer(), secondary(), 10.0, TonePolarity.NEARER, false)) - .build(); - } - - @NonNull - @Override - public DynamicColor onSecondaryContainer() { - return new DynamicColor.Builder() - .setName("on_secondary_container") - .setPalette((s) -> s.secondaryPalette) - .setTone( - (s) -> { - if (isMonochrome(s)) { - return s.isDark ? 90.0 : 10.0; - } - if (!isFidelity(s)) { - return s.isDark ? 90.0 : 30.0; - } - return DynamicColor.foregroundTone(secondaryContainer().tone.apply(s), 4.5); - }) - .setBackground((s) -> secondaryContainer()) - .setContrastCurve((s) -> new ContrastCurve(3.0, 4.5, 7.0, 11.0)) - .build(); - } - - //////////////////////////////////////////////////////////////// - // Tertiaries [T] // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor tertiary() { - return new DynamicColor.Builder() - .setName("tertiary") - .setPalette((s) -> s.tertiaryPalette) - .setTone( - (s) -> { - if (isMonochrome(s)) { - return s.isDark ? 90.0 : 25.0; - } - return s.isDark ? 80.0 : 40.0; - }) - .setIsBackground(true) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(3.0, 4.5, 7.0, 7.0)) - .setToneDeltaPair( - (s) -> - new ToneDeltaPair( - tertiaryContainer(), tertiary(), 10.0, TonePolarity.NEARER, false)) - .build(); - } - - @Nullable - @Override - public DynamicColor tertiaryDim() { - return null; - } - - @NonNull - @Override - public DynamicColor onTertiary() { - return new DynamicColor.Builder() - .setName("on_tertiary") - .setPalette((s) -> s.tertiaryPalette) - .setTone( - (s) -> { - if (isMonochrome(s)) { - return s.isDark ? 10.0 : 90.0; - } - return s.isDark ? 20.0 : 100.0; - }) - .setBackground((s) -> tertiary()) - .setContrastCurve((s) -> new ContrastCurve(4.5, 7.0, 11.0, 21.0)) - .build(); - } - - @NonNull - @Override - public DynamicColor tertiaryContainer() { - return new DynamicColor.Builder() - .setName("tertiary_container") - .setPalette((s) -> s.tertiaryPalette) - .setTone( - (s) -> { - if (isMonochrome(s)) { - return s.isDark ? 60.0 : 49.0; - } - if (!isFidelity(s)) { - return s.isDark ? 30.0 : 90.0; - } - final Hct proposedHct = s.tertiaryPalette.getHct(s.sourceColorHct.getTone()); - return DislikeAnalyzer.fixIfDisliked(proposedHct).getTone(); - }) - .setIsBackground(true) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(1.0, 1.0, 3.0, 4.5)) - .setToneDeltaPair( - (s) -> - new ToneDeltaPair( - tertiaryContainer(), tertiary(), 10.0, TonePolarity.NEARER, false)) - .build(); - } - - @NonNull - @Override - public DynamicColor onTertiaryContainer() { - return new DynamicColor.Builder() - .setName("on_tertiary_container") - .setPalette((s) -> s.tertiaryPalette) - .setTone( - (s) -> { - if (isMonochrome(s)) { - return s.isDark ? 0.0 : 100.0; - } - if (!isFidelity(s)) { - return s.isDark ? 90.0 : 30.0; - } - return DynamicColor.foregroundTone(tertiaryContainer().tone.apply(s), 4.5); - }) - .setBackground((s) -> tertiaryContainer()) - .setContrastCurve((s) -> new ContrastCurve(3.0, 4.5, 7.0, 11.0)) - .build(); - } - - //////////////////////////////////////////////////////////////// - // Errors [E] // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor error() { - return new DynamicColor.Builder() - .setName("error") - .setPalette((s) -> s.errorPalette) - .setTone((s) -> s.isDark ? 80.0 : 40.0) - .setIsBackground(true) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(3.0, 4.5, 7.0, 7.0)) - .setToneDeltaPair( - (s) -> new ToneDeltaPair(errorContainer(), error(), 10.0, TonePolarity.NEARER, false)) - .build(); - } - - @Nullable - @Override - public DynamicColor errorDim() { - return null; - } - - @NonNull - @Override - public DynamicColor onError() { - return new DynamicColor.Builder() - .setName("on_error") - .setPalette((s) -> s.errorPalette) - .setTone((s) -> s.isDark ? 20.0 : 100.0) - .setBackground((s) -> error()) - .setContrastCurve((s) -> new ContrastCurve(4.5, 7.0, 11.0, 21.0)) - .build(); - } - - @NonNull - @Override - public DynamicColor errorContainer() { - return new DynamicColor.Builder() - .setName("error_container") - .setPalette((s) -> s.errorPalette) - .setTone((s) -> s.isDark ? 30.0 : 90.0) - .setIsBackground(true) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(1.0, 1.0, 3.0, 4.5)) - .setToneDeltaPair( - (s) -> new ToneDeltaPair(errorContainer(), error(), 10.0, TonePolarity.NEARER, false)) - .build(); - } - - @NonNull - @Override - public DynamicColor onErrorContainer() { - return new DynamicColor.Builder() - .setName("on_error_container") - .setPalette((s) -> s.errorPalette) - .setTone( - (s) -> { - if (isMonochrome(s)) { - return s.isDark ? 90.0 : 10.0; - } - return s.isDark ? 90.0 : 30.0; - }) - .setBackground((s) -> errorContainer()) - .setContrastCurve((s) -> new ContrastCurve(3.0, 4.5, 7.0, 11.0)) - .build(); - } - - //////////////////////////////////////////////////////////////// - // Primary Fixed Colors [PF] // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor primaryFixed() { - return new DynamicColor.Builder() - .setName("primary_fixed") - .setPalette((s) -> s.primaryPalette) - .setTone((s) -> isMonochrome(s) ? 40.0 : 90.0) - .setIsBackground(true) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(1.0, 1.0, 3.0, 4.5)) - .setToneDeltaPair( - (s) -> - new ToneDeltaPair( - this.primaryFixed(), this.primaryFixedDim(), 10.0, TonePolarity.LIGHTER, true)) - .build(); - } - - @NonNull - @Override - public DynamicColor primaryFixedDim() { - return new DynamicColor.Builder() - .setName("primary_fixed_dim") - .setPalette((s) -> s.primaryPalette) - .setTone((s) -> isMonochrome(s) ? 30.0 : 80.0) - .setIsBackground(true) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(1.0, 1.0, 3.0, 4.5)) - .setToneDeltaPair( - (s) -> - new ToneDeltaPair( - primaryFixed(), primaryFixedDim(), 10.0, TonePolarity.LIGHTER, true)) - .build(); - } - - @NonNull - @Override - public DynamicColor onPrimaryFixed() { - return new DynamicColor.Builder() - .setName("on_primary_fixed") - .setPalette((s) -> s.primaryPalette) - .setTone((s) -> isMonochrome(s) ? 100.0 : 10.0) - .setBackground((s) -> primaryFixedDim()) - .setSecondBackground((s) -> primaryFixed()) - .setContrastCurve((s) -> new ContrastCurve(4.5, 7.0, 11.0, 21.0)) - .build(); - } - - @NonNull - @Override - public DynamicColor onPrimaryFixedVariant() { - return new DynamicColor.Builder() - .setName("on_primary_fixed_variant") - .setPalette((s) -> s.primaryPalette) - .setTone((s) -> isMonochrome(s) ? 90.0 : 30.0) - .setBackground((s) -> primaryFixedDim()) - .setSecondBackground((s) -> primaryFixed()) - .setContrastCurve((s) -> new ContrastCurve(3.0, 4.5, 7.0, 11.0)) - .build(); - } - - //////////////////////////////////////////////////////////////// - // Secondary Fixed Colors [QF] // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor secondaryFixed() { - return new DynamicColor.Builder() - .setName("secondary_fixed") - .setPalette((s) -> s.secondaryPalette) - .setTone((s) -> isMonochrome(s) ? 80.0 : 90.0) - .setIsBackground(true) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(1.0, 1.0, 3.0, 4.5)) - .setToneDeltaPair( - (s) -> - new ToneDeltaPair( - secondaryFixed(), secondaryFixedDim(), 10.0, TonePolarity.LIGHTER, true)) - .build(); - } - - @NonNull - @Override - public DynamicColor secondaryFixedDim() { - return new DynamicColor.Builder() - .setName("secondary_fixed_dim") - .setPalette((s) -> s.secondaryPalette) - .setTone((s) -> isMonochrome(s) ? 70.0 : 80.0) - .setIsBackground(true) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(1.0, 1.0, 3.0, 4.5)) - .setToneDeltaPair( - (s) -> - new ToneDeltaPair( - secondaryFixed(), secondaryFixedDim(), 10.0, TonePolarity.LIGHTER, true)) - .build(); - } - - @NonNull - @Override - public DynamicColor onSecondaryFixed() { - return new DynamicColor.Builder() - .setName("on_secondary_fixed") - .setPalette((s) -> s.secondaryPalette) - .setTone((s) -> 10.0) - .setBackground((s) -> secondaryFixedDim()) - .setSecondBackground((s) -> secondaryFixed()) - .setContrastCurve((s) -> new ContrastCurve(4.5, 7.0, 11.0, 21.0)) - .build(); - } - - @NonNull - @Override - public DynamicColor onSecondaryFixedVariant() { - return new DynamicColor.Builder() - .setName("on_secondary_fixed_variant") - .setPalette((s) -> s.secondaryPalette) - .setTone((s) -> isMonochrome(s) ? 25.0 : 30.0) - .setBackground((s) -> secondaryFixedDim()) - .setSecondBackground((s) -> secondaryFixed()) - .setContrastCurve((s) -> new ContrastCurve(3.0, 4.5, 7.0, 11.0)) - .build(); - } - - //////////////////////////////////////////////////////////////// - // Tertiary Fixed Colors [TF] // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor tertiaryFixed() { - return new DynamicColor.Builder() - .setName("tertiary_fixed") - .setPalette((s) -> s.tertiaryPalette) - .setTone((s) -> isMonochrome(s) ? 40.0 : 90.0) - .setIsBackground(true) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(1.0, 1.0, 3.0, 4.5)) - .setToneDeltaPair( - (s) -> - new ToneDeltaPair( - tertiaryFixed(), tertiaryFixedDim(), 10.0, TonePolarity.LIGHTER, true)) - .build(); - } - - @NonNull - @Override - public DynamicColor tertiaryFixedDim() { - return new DynamicColor.Builder() - .setName("tertiary_fixed_dim") - .setPalette((s) -> s.tertiaryPalette) - .setTone((s) -> isMonochrome(s) ? 30.0 : 80.0) - .setIsBackground(true) - .setBackground(this::highestSurface) - .setContrastCurve((s) -> new ContrastCurve(1.0, 1.0, 3.0, 4.5)) - .setToneDeltaPair( - (s) -> - new ToneDeltaPair( - tertiaryFixed(), tertiaryFixedDim(), 10.0, TonePolarity.LIGHTER, true)) - .build(); - } - - @NonNull - @Override - public DynamicColor onTertiaryFixed() { - return new DynamicColor.Builder() - .setName("on_tertiary_fixed") - .setPalette((s) -> s.tertiaryPalette) - .setTone((s) -> isMonochrome(s) ? 100.0 : 10.0) - .setBackground((s) -> tertiaryFixedDim()) - .setSecondBackground((s) -> tertiaryFixed()) - .setContrastCurve((s) -> new ContrastCurve(4.5, 7.0, 11.0, 21.0)) - .build(); - } - - @NonNull - @Override - public DynamicColor onTertiaryFixedVariant() { - return new DynamicColor.Builder() - .setName("on_tertiary_fixed_variant") - .setPalette((s) -> s.tertiaryPalette) - .setTone((s) -> isMonochrome(s) ? 90.0 : 30.0) - .setBackground((s) -> tertiaryFixedDim()) - .setSecondBackground((s) -> tertiaryFixed()) - .setContrastCurve((s) -> new ContrastCurve(3.0, 4.5, 7.0, 11.0)) - .build(); - } - - ////////////////////////////////////////////////////////////////// - // Android-only Colors // - ////////////////////////////////////////////////////////////////// - - /** - * These colors were present in Android framework before Android U, and used by MDC controls. They - * should be avoided, if possible. It's unclear if they're used on multiple backgrounds, and if - * they are, they can't be adjusted for contrast.* For now, they will be set with no background, - * and those won't adjust for contrast, avoiding issues. - * - *

* For example, if the same color is on a white background _and_ black background, there's no - * way to increase contrast with either without losing contrast with the other. - */ - // colorControlActivated documented as colorAccent in M3 & GM3. - // colorAccent documented as colorSecondary in M3 and colorPrimary in GM3. - // Android used Material's Container as Primary/Secondary/Tertiary at launch. - // Therefore, this is a duplicated version of Primary Container. - @NonNull - @Override - public DynamicColor controlActivated() { - return new DynamicColor.Builder() - .setName("control_activated") - .setPalette((s) -> s.primaryPalette) - .setTone((s) -> s.isDark ? 30.0 : 90.0) - .setIsBackground(true) - .build(); - } - - // colorControlNormal documented as textColorSecondary in M3 & GM3. - // In Material, textColorSecondary points to onSurfaceVariant in the non-disabled state, - // which is Neutral Variant T30/80 in light/dark. - @NonNull - @Override - public DynamicColor controlNormal() { - return new DynamicColor.Builder() - .setName("control_normal") - .setPalette((s) -> s.neutralVariantPalette) - .setTone((s) -> s.isDark ? 80.0 : 30.0) - .build(); - } - - // colorControlHighlight documented, in both M3 & GM3: - // Light mode: #1f000000 dark mode: #33ffffff. - // These are black and white with some alpha. - // 1F hex = 31 decimal; 31 / 255 = 12% alpha. - // 33 hex = 51 decimal; 51 / 255 = 20% alpha. - // DynamicColors do not support alpha currently, and _may_ not need it for this use case, - // depending on how MDC resolved alpha for the other cases. - // Returning black in dark mode, white in light mode. - @NonNull - @Override - public DynamicColor controlHighlight() { - return new DynamicColor.Builder() - .setName("control_highlight") - .setPalette((s) -> s.neutralPalette) - .setTone((s) -> s.isDark ? 100.0 : 0.0) - .setOpacity((s) -> s.isDark ? 0.20 : 0.12) - .build(); - } - - // textColorPrimaryInverse documented, in both M3 & GM3, documented as N10/N90. - @NonNull - @Override - public DynamicColor textPrimaryInverse() { - return new DynamicColor.Builder() - .setName("text_primary_inverse") - .setPalette((s) -> s.neutralPalette) - .setTone((s) -> s.isDark ? 10.0 : 90.0) - .build(); - } - - // textColorSecondaryInverse and textColorTertiaryInverse both documented, in both M3 & GM3, as - // NV30/NV80 - @NonNull - @Override - public DynamicColor textSecondaryAndTertiaryInverse() { - return new DynamicColor.Builder() - .setName("text_secondary_and_tertiary_inverse") - .setPalette((s) -> s.neutralVariantPalette) - .setTone((s) -> s.isDark ? 30.0 : 80.0) - .build(); - } - - // textColorPrimaryInverseDisableOnly documented, in both M3 & GM3, as N10/N90 - @NonNull - @Override - public DynamicColor textPrimaryInverseDisableOnly() { - return new DynamicColor.Builder() - .setName("text_primary_inverse_disable_only") - .setPalette((s) -> s.neutralPalette) - .setTone((s) -> s.isDark ? 10.0 : 90.0) - .build(); - } - - // textColorSecondaryInverse and textColorTertiaryInverse in disabled state both documented, - // in both M3 & GM3, as N10/N90 - @NonNull - @Override - public DynamicColor textSecondaryAndTertiaryInverseDisabled() { - return new DynamicColor.Builder() - .setName("text_secondary_and_tertiary_inverse_disabled") - .setPalette((s) -> s.neutralPalette) - .setTone((s) -> s.isDark ? 10.0 : 90.0) - .build(); - } - - // textColorHintInverse documented, in both M3 & GM3, as N10/N90 - @NonNull - @Override - public DynamicColor textHintInverse() { - return new DynamicColor.Builder() - .setName("text_hint_inverse") - .setPalette((s) -> s.neutralPalette) - .setTone((s) -> s.isDark ? 10.0 : 90.0) - .build(); - } - - //////////////////////////////////////////////////////////////// - // Other // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor highestSurface(@NonNull DynamicScheme s) { - return s.isDark ? surfaceBright() : surfaceDim(); - } - - private boolean isFidelity(DynamicScheme scheme) { - return scheme.variant == Variant.FIDELITY || scheme.variant == Variant.CONTENT; - } - - private static boolean isMonochrome(DynamicScheme scheme) { - return scheme.variant == Variant.MONOCHROME; - } - - private static double findDesiredChromaByTone( - double hue, double chroma, double tone, boolean byDecreasingTone) { - double answer = tone; - - Hct closestToChroma = Hct.from(hue, chroma, tone); - if (closestToChroma.getChroma() < chroma) { - double chromaPeak = closestToChroma.getChroma(); - while (closestToChroma.getChroma() < chroma) { - answer += byDecreasingTone ? -1.0 : 1.0; - Hct potentialSolution = Hct.from(hue, chroma, answer); - if (chromaPeak > potentialSolution.getChroma()) { - break; - } - if (Math.abs(potentialSolution.getChroma() - chroma) < 0.4) { - break; - } - - double potentialDelta = Math.abs(potentialSolution.getChroma() - chroma); - double currentDelta = Math.abs(closestToChroma.getChroma() - chroma); - if (potentialDelta < currentDelta) { - closestToChroma = potentialSolution; - } - chromaPeak = Math.max(chromaPeak, potentialSolution.getChroma()); - } - } - - return answer; - } - - ///////////////////////////////////////////////////////////////// - // Color value calculations // - ///////////////////////////////////////////////////////////////// - - @NonNull - @Override - public Hct getHct(DynamicScheme scheme, DynamicColor color) { - // This is crucial for aesthetics: we aren't simply the taking the standard color - // and changing its tone for contrast. Rather, we find the tone for contrast, then - // use the specified chroma from the palette to construct a new color. - // - // For example, this enables colors with standard tone of T90, which has limited chroma, to - // "recover" intended chroma as contrast increases. - double tone = getTone(scheme, color); - return color.palette.apply(scheme).getHct(tone); - } - - @Override - public double getTone(DynamicScheme scheme, DynamicColor color) { - boolean decreasingContrast = scheme.contrastLevel < 0; - ToneDeltaPair toneDeltaPair = - color.toneDeltaPair == null ? null : color.toneDeltaPair.apply(scheme); - - // Case 1: dual foreground, pair of colors with delta constraint. - if (toneDeltaPair != null) { - DynamicColor roleA = toneDeltaPair.getRoleA(); - DynamicColor roleB = toneDeltaPair.getRoleB(); - double delta = toneDeltaPair.getDelta(); - TonePolarity polarity = toneDeltaPair.getPolarity(); - boolean stayTogether = toneDeltaPair.getStayTogether(); - - boolean aIsNearer = - (polarity == TonePolarity.NEARER - || (polarity == TonePolarity.LIGHTER && !scheme.isDark) - || (polarity == TonePolarity.DARKER && !scheme.isDark)); - DynamicColor nearer = aIsNearer ? roleA : roleB; - DynamicColor farther = aIsNearer ? roleB : roleA; - boolean amNearer = color.name.equals(nearer.name); - double expansionDir = scheme.isDark ? 1 : -1; - @Var double nTone = nearer.tone.apply(scheme); - @Var double fTone = farther.tone.apply(scheme); - - // 1st round: solve to min, each - if (color.background != null - && nearer.contrastCurve != null - && farther.contrastCurve != null) { - DynamicColor bg = color.background.apply(scheme); - ContrastCurve nContrastCurve = nearer.contrastCurve.apply(scheme); - ContrastCurve fContrastCurve = farther.contrastCurve.apply(scheme); - if (bg != null && nContrastCurve != null && fContrastCurve != null) { - double nContrast = nContrastCurve.get(scheme.contrastLevel); - double fContrast = fContrastCurve.get(scheme.contrastLevel); - double bgTone = bg.getTone(scheme); - - // If a color is good enough, it is not adjusted. - // Initial and adjusted tones for `nearer` - if (Contrast.ratioOfTones(bgTone, nTone) < nContrast) { - nTone = DynamicColor.foregroundTone(bgTone, nContrast); - } - // Initial and adjusted tones for `farther` - if (Contrast.ratioOfTones(bgTone, fTone) < fContrast) { - fTone = DynamicColor.foregroundTone(bgTone, fContrast); - } - - if (decreasingContrast) { - // If decreasing contrast, adjust color to the "bare minimum" - // that satisfies contrast. - nTone = DynamicColor.foregroundTone(bgTone, nContrast); - fTone = DynamicColor.foregroundTone(bgTone, fContrast); - } - } - } - - // If constraint is not satisfied, try another round. - if ((fTone - nTone) * expansionDir < delta) { - // 2nd round: expand farther to match delta. - fTone = MathUtils.clampDouble(0, 100, nTone + delta * expansionDir); - // If constraint is not satisfied, try another round. - if ((fTone - nTone) * expansionDir < delta) { - // 3rd round: contract nearer to match delta. - nTone = MathUtils.clampDouble(0, 100, fTone - delta * expansionDir); - } - } - - // Avoids the 50-59 awkward zone. - if (50 <= nTone && nTone < 60) { - // If `nearer` is in the awkward zone, move it away, together with - // `farther`. - if (expansionDir > 0) { - nTone = 60; - fTone = max(fTone, nTone + delta * expansionDir); - } else { - nTone = 49; - fTone = min(fTone, nTone + delta * expansionDir); - } - } else if (50 <= fTone && fTone < 60) { - if (stayTogether) { - // Fixes both, to avoid two colors on opposite sides of the "awkward - // zone". - if (expansionDir > 0) { - nTone = 60; - fTone = max(fTone, nTone + delta * expansionDir); - } else { - nTone = 49; - fTone = min(fTone, nTone + delta * expansionDir); - } - } else { - // Not required to stay together; fixes just one. - if (expansionDir > 0) { - fTone = 60; - } else { - fTone = 49; - } - } - } - - // Returns `nTone` if this color is `nearer`, otherwise `fTone`. - return amNearer ? nTone : fTone; - } else { - // Case 2: No contrast pair; just solve for itself. - @Var double answer = color.tone.apply(scheme); - - if (color.background == null - || color.background.apply(scheme) == null - || color.contrastCurve == null - || color.contrastCurve.apply(scheme) == null) { - return answer; // No adjustment for colors with no background. - } - - double bgTone = color.background.apply(scheme).getTone(scheme); - double desiredRatio = color.contrastCurve.apply(scheme).get(scheme.contrastLevel); - - if (Contrast.ratioOfTones(bgTone, answer) >= desiredRatio) { - // Don't "improve" what's good enough. - } else { - // Rough improvement. - answer = DynamicColor.foregroundTone(bgTone, desiredRatio); - } - - if (decreasingContrast) { - answer = DynamicColor.foregroundTone(bgTone, desiredRatio); - } - - if (color.isBackground && 50 <= answer && answer < 60) { - // Must adjust - if (Contrast.ratioOfTones(49, bgTone) >= desiredRatio) { - answer = 49; - } else { - answer = 60; - } - } - - if (color.secondBackground == null || color.secondBackground.apply(scheme) == null) { - return answer; - } - - // Case 3: Adjust for dual backgrounds. - double bgTone1 = color.background.apply(scheme).getTone(scheme); - double bgTone2 = color.secondBackground.apply(scheme).getTone(scheme); - - double upper = max(bgTone1, bgTone2); - double lower = min(bgTone1, bgTone2); - - if (Contrast.ratioOfTones(upper, answer) >= desiredRatio - && Contrast.ratioOfTones(lower, answer) >= desiredRatio) { - return answer; - } - - // The darkest light tone that satisfies the desired ratio, - // or -1 if such ratio cannot be reached. - double lightOption = Contrast.lighter(upper, desiredRatio); - - // The lightest dark tone that satisfies the desired ratio, - // or -1 if such ratio cannot be reached. - double darkOption = Contrast.darker(lower, desiredRatio); - - // Tones suitable for the foreground. - ArrayList availables = new ArrayList<>(); - if (lightOption != -1) { - availables.add(lightOption); - } - if (darkOption != -1) { - availables.add(darkOption); - } - - boolean prefersLight = - DynamicColor.tonePrefersLightForeground(bgTone1) - || DynamicColor.tonePrefersLightForeground(bgTone2); - if (prefersLight) { - return (lightOption == -1) ? 100 : lightOption; - } - if (availables.size() == 1) { - return availables.get(0); - } - return (darkOption == -1) ? 0 : darkOption; - } - } - - ////////////////////////////////////////////////////////////////// - // Scheme Palettes // - ////////////////////////////////////////////////////////////////// - - @NonNull - @Override - public TonalPalette getPrimaryPalette( - Variant variant, - Hct sourceColorHct, - boolean isDark, - Platform platform, - double contrastLevel) { - return switch (variant) { - case CONTENT, FIDELITY -> - TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), sourceColorHct.getChroma()); - case FRUIT_SALAD -> - TonalPalette.fromHueAndChroma( - MathUtils.sanitizeDegreesDouble(sourceColorHct.getHue() - 50.0), 48.0); - case MONOCHROME -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 0.0); - case NEUTRAL -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 12.0); - case RAINBOW -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 48.0); - case TONAL_SPOT -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 36.0); - case EXPRESSIVE -> - TonalPalette.fromHueAndChroma( - MathUtils.sanitizeDegreesDouble(sourceColorHct.getHue() + 240), 40); - case VIBRANT -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 200.0); - }; - } - - @NonNull - @Override - public TonalPalette getSecondaryPalette( - Variant variant, - Hct sourceColorHct, - boolean isDark, - Platform platform, - double contrastLevel) { - return switch (variant) { - case CONTENT, FIDELITY -> - TonalPalette.fromHueAndChroma( - sourceColorHct.getHue(), - max(sourceColorHct.getChroma() - 32.0, sourceColorHct.getChroma() * 0.5)); - case FRUIT_SALAD -> - TonalPalette.fromHueAndChroma( - MathUtils.sanitizeDegreesDouble(sourceColorHct.getHue() - 50.0), 36.0); - case MONOCHROME -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 0.0); - case NEUTRAL -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 8.0); - case RAINBOW -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 16.0); - case TONAL_SPOT -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 16.0); - case EXPRESSIVE -> - TonalPalette.fromHueAndChroma( - DynamicScheme.getRotatedHue( - sourceColorHct, - new double[] {0, 21, 51, 121, 151, 191, 271, 321, 360}, - new double[] {45, 95, 45, 20, 45, 90, 45, 45, 45}), - 24.0); - case VIBRANT -> - TonalPalette.fromHueAndChroma( - DynamicScheme.getRotatedHue( - sourceColorHct, - new double[] {0, 41, 61, 101, 131, 181, 251, 301, 360}, - new double[] {18, 15, 10, 12, 15, 18, 15, 12, 12}), - 24.0); - }; - } - - @NonNull - @Override - public TonalPalette getTertiaryPalette( - Variant variant, - Hct sourceColorHct, - boolean isDark, - Platform platform, - double contrastLevel) { - return switch (variant) { - case CONTENT -> - TonalPalette.fromHct( - DislikeAnalyzer.fixIfDisliked( - new TemperatureCache(sourceColorHct) - .getAnalogousColors(/* count= */ 3, /* divisions= */ 6) - .get(2))); - case FIDELITY -> - TonalPalette.fromHct( - DislikeAnalyzer.fixIfDisliked(new TemperatureCache(sourceColorHct).getComplement())); - case FRUIT_SALAD -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 36.0); - case MONOCHROME -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 0.0); - case NEUTRAL -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 16.0); - case RAINBOW, TONAL_SPOT -> - TonalPalette.fromHueAndChroma( - MathUtils.sanitizeDegreesDouble(sourceColorHct.getHue() + 60.0), 24.0); - case EXPRESSIVE -> - TonalPalette.fromHueAndChroma( - DynamicScheme.getRotatedHue( - sourceColorHct, - new double[] {0, 21, 51, 121, 151, 191, 271, 321, 360}, - new double[] {120, 120, 20, 45, 20, 15, 20, 120, 120}), - 32.0); - case VIBRANT -> - TonalPalette.fromHueAndChroma( - DynamicScheme.getRotatedHue( - sourceColorHct, - new double[] {0, 41, 61, 101, 131, 181, 251, 301, 360}, - new double[] {35, 30, 20, 25, 30, 35, 30, 25, 25}), - 32.0); - }; - } - - @NonNull - @Override - public TonalPalette getNeutralPalette( - Variant variant, - Hct sourceColorHct, - boolean isDark, - Platform platform, - double contrastLevel) { - return switch (variant) { - case CONTENT, FIDELITY -> - TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), sourceColorHct.getChroma() / 8.0); - case FRUIT_SALAD -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 10.0); - case MONOCHROME -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 0.0); - case NEUTRAL -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 2.0); - case RAINBOW -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 0.0); - case TONAL_SPOT -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 6.0); - case EXPRESSIVE -> - TonalPalette.fromHueAndChroma( - MathUtils.sanitizeDegreesDouble(sourceColorHct.getHue() + 15), 8); - case VIBRANT -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 10); - }; - } - - @NonNull - @Override - public TonalPalette getNeutralVariantPalette( - Variant variant, - Hct sourceColorHct, - boolean isDark, - Platform platform, - double contrastLevel) { - return switch (variant) { - case CONTENT -> - TonalPalette.fromHueAndChroma( - sourceColorHct.getHue(), (sourceColorHct.getChroma() / 8.0) + 4.0); - case FIDELITY -> - TonalPalette.fromHueAndChroma( - sourceColorHct.getHue(), (sourceColorHct.getChroma() / 8.0) + 4.0); - case FRUIT_SALAD -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 16.0); - case MONOCHROME -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 0.0); - case NEUTRAL -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 2.0); - case RAINBOW -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 0.0); - case TONAL_SPOT -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 8.0); - case EXPRESSIVE -> - TonalPalette.fromHueAndChroma( - MathUtils.sanitizeDegreesDouble(sourceColorHct.getHue() + 15), 12); - case VIBRANT -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 12); - }; - } - - @NonNull - @Override - public Optional getErrorPalette( - Variant variant, - Hct sourceColorHct, - boolean isDark, - Platform platform, - double contrastLevel) { - return switch (variant) { - case CONTENT, - FIDELITY, - FRUIT_SALAD, - MONOCHROME, - NEUTRAL, - RAINBOW, - TONAL_SPOT, - EXPRESSIVE, - VIBRANT -> - Optional.empty(); - }; - } -} diff --git a/java/dynamiccolor/ColorSpec2025.java b/java/dynamiccolor/ColorSpec2025.java deleted file mode 100644 index 1ba3cece..00000000 --- a/java/dynamiccolor/ColorSpec2025.java +++ /dev/null @@ -1,1948 +0,0 @@ -/* - * Copyright 2025 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dynamiccolor; - -import static dynamiccolor.DynamicScheme.Platform.PHONE; -import static dynamiccolor.DynamicScheme.Platform.WATCH; -import static dynamiccolor.ToneDeltaPair.DeltaConstraint.EXACT; -import static dynamiccolor.ToneDeltaPair.DeltaConstraint.FARTHER; -import static dynamiccolor.TonePolarity.DARKER; -import static dynamiccolor.TonePolarity.RELATIVE_LIGHTER; -import static dynamiccolor.Variant.EXPRESSIVE; -import static dynamiccolor.Variant.NEUTRAL; -import static dynamiccolor.Variant.TONAL_SPOT; -import static dynamiccolor.Variant.VIBRANT; -import static java.lang.Math.max; -import static java.lang.Math.min; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import contrast.Contrast; -import dynamiccolor.DynamicScheme.Platform; -import dynamiccolor.ToneDeltaPair.DeltaConstraint; -import hct.Hct; -import palettes.TonalPalette; -import utils.MathUtils; -import java.util.ArrayList; -import java.util.Optional; - -/** {@link ColorSpec} implementation for the 2025 spec. */ -final class ColorSpec2025 extends ColorSpec2021 { - - //////////////////////////////////////////////////////////////// - // Surfaces [S] // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor background() { - // Remapped to surface for 2025 spec. - DynamicColor color2025 = surface().toBuilder().setName("background").build(); - return super.background().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor onBackground() { - // Remapped to onSurface for 2025 spec. - 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, color2025Builder.build()) - .build(); - } - - @NonNull - @Override - public DynamicColor surface() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("surface") - .setPalette((s) -> s.neutralPalette) - .setTone( - (s) -> { - if (s.platform == PHONE) { - if (s.isDark) { - return 4.0; - } else { - if (Hct.isYellow(s.neutralPalette.getHue())) { - return 99.0; - } else if (s.variant == VIBRANT) { - return 97.0; - } else { - return 98.0; - } - } - } else { - return 0.0; - } - }) - .setIsBackground(true) - .build(); - return super.surface().toBuilder().extendSpecVersion(SpecVersion.SPEC_2025, color2025).build(); - } - - @NonNull - @Override - public DynamicColor surfaceDim() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("surface_dim") - .setPalette((s) -> s.neutralPalette) - .setTone( - (s) -> { - if (s.isDark) { - return 4.0; - } else { - if (Hct.isYellow(s.neutralPalette.getHue())) { - return 90.0; - } else if (s.variant == VIBRANT) { - return 85.0; - } else { - return 87.0; - } - } - }) - .setIsBackground(true) - .setChromaMultiplier( - (s) -> { - if (!s.isDark) { - if (s.variant == NEUTRAL) { - return 2.5; - } else if (s.variant == TONAL_SPOT) { - return 1.7; - } else if (s.variant == EXPRESSIVE) { - return Hct.isYellow(s.neutralPalette.getHue()) ? 2.7 : 1.75; - } else if (s.variant == VIBRANT) { - return 1.36; - } - } - return 1.0; - }) - .build(); - return super.surfaceDim().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor surfaceBright() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("surface_bright") - .setPalette((s) -> s.neutralPalette) - .setTone( - (s) -> { - if (s.isDark) { - return 18.0; - } else { - if (Hct.isYellow(s.neutralPalette.getHue())) { - return 99.0; - } else if (s.variant == VIBRANT) { - return 97.0; - } else { - return 98.0; - } - } - }) - .setIsBackground(true) - .setChromaMultiplier( - (s) -> { - if (s.isDark) { - if (s.variant == NEUTRAL) { - return 2.5; - } else if (s.variant == TONAL_SPOT) { - return 1.7; - } else if (s.variant == EXPRESSIVE) { - return Hct.isYellow(s.neutralPalette.getHue()) ? 2.7 : 1.75; - } else if (s.variant == VIBRANT) { - return 1.36; - } - } - return 1.0; - }) - .build(); - return super.surfaceBright().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor surfaceContainerLowest() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("surface_container_lowest") - .setPalette((s) -> s.neutralPalette) - .setTone((s) -> s.isDark ? 0.0 : 100.0) - .setIsBackground(true) - .build(); - return super.surfaceContainerLowest().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor surfaceContainerLow() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("surface_container_low") - .setPalette((s) -> s.neutralPalette) - .setTone( - (s) -> { - if (s.platform == PHONE) { - if (s.isDark) { - return 6.0; - } else { - if (Hct.isYellow(s.neutralPalette.getHue())) { - return 98.0; - } else if (s.variant == VIBRANT) { - return 95.0; - } else { - return 96.0; - } - } - } else { - return 15.0; - } - }) - .setIsBackground(true) - .setChromaMultiplier( - (s) -> { - if (s.platform == PHONE) { - if (s.variant == NEUTRAL) { - return 1.3; - } else if (s.variant == TONAL_SPOT) { - return 1.25; - } else if (s.variant == EXPRESSIVE) { - return Hct.isYellow(s.neutralPalette.getHue()) ? 1.3 : 1.15; - } else if (s.variant == VIBRANT) { - return 1.08; - } - } - return 1.0; - }) - .build(); - return super.surfaceContainerLow().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor surfaceContainer() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("surface_container") - .setPalette((s) -> s.neutralPalette) - .setTone( - (s) -> { - if (s.platform == PHONE) { - if (s.isDark) { - return 9.0; - } else { - if (Hct.isYellow(s.neutralPalette.getHue())) { - return 96.0; - } else if (s.variant == VIBRANT) { - return 92.0; - } else { - return 94.0; - } - } - } else { - return 20.0; - } - }) - .setIsBackground(true) - .setChromaMultiplier( - (s) -> { - if (s.platform == PHONE) { - if (s.variant == NEUTRAL) { - return 1.6; - } else if (s.variant == TONAL_SPOT) { - return 1.4; - } else if (s.variant == EXPRESSIVE) { - return Hct.isYellow(s.neutralPalette.getHue()) ? 1.6 : 1.3; - } else if (s.variant == VIBRANT) { - return 1.15; - } - } - return 1.0; - }) - .build(); - return super.surfaceContainer().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor surfaceContainerHigh() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("surface_container_high") - .setPalette((s) -> s.neutralPalette) - .setTone( - (s) -> { - if (s.platform == PHONE) { - if (s.isDark) { - return 12.0; - } else { - if (Hct.isYellow(s.neutralPalette.getHue())) { - return 94.0; - } else if (s.variant == VIBRANT) { - return 90.0; - } else { - return 92.0; - } - } - } else { - return 25.0; - } - }) - .setIsBackground(true) - .setChromaMultiplier( - (s) -> { - if (s.platform == PHONE) { - if (s.variant == NEUTRAL) { - return 1.9; - } else if (s.variant == TONAL_SPOT) { - return 1.5; - } else if (s.variant == EXPRESSIVE) { - return Hct.isYellow(s.neutralPalette.getHue()) ? 1.95 : 1.45; - } else if (s.variant == VIBRANT) { - return 1.22; - } - } - return 1.0; - }) - .build(); - return super.surfaceContainerHigh().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor surfaceContainerHighest() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("surface_container_highest") - .setPalette((s) -> s.neutralPalette) - .setTone( - (s) -> { - if (s.isDark) { - return 15.0; - } else { - if (Hct.isYellow(s.neutralPalette.getHue())) { - return 92.0; - } else if (s.variant == VIBRANT) { - return 88.0; - } else { - return 90.0; - } - } - }) - .setIsBackground(true) - .setChromaMultiplier( - (s) -> { - if (s.variant == NEUTRAL) { - return 2.2; - } else if (s.variant == TONAL_SPOT) { - return 1.7; - } else if (s.variant == EXPRESSIVE) { - return Hct.isYellow(s.neutralPalette.getHue()) ? 2.3 : 1.6; - } else if (s.variant == VIBRANT) { - return 1.29; - } - return 1.0; - }) - .build(); - return super.surfaceContainerHighest().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor onSurface() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("on_surface") - .setPalette((s) -> s.neutralPalette) - .setTone( - (s) -> { - if (s.variant == Variant.VIBRANT) { - return tMaxC(s.neutralPalette, 0, 100, 1.1); - } else { - return DynamicColor.getInitialToneFromBackground( - (scheme) -> { - if (scheme.platform == PHONE) { - return scheme.isDark ? surfaceBright() : surfaceDim(); - } else { - return surfaceContainerHigh(); - } - }) - .apply(s); - } - }) - .setChromaMultiplier( - (s) -> { - if (s.platform == PHONE) { - if (s.variant == NEUTRAL) { - return 2.2; - } else if (s.variant == TONAL_SPOT) { - return 1.7; - } else if (s.variant == EXPRESSIVE) { - return Hct.isYellow(s.neutralPalette.getHue()) ? (s.isDark ? 3.0 : 2.3) : 1.6; - } - } - return 1.0; - }) - .setBackground( - (s) -> { - if (s.platform == PHONE) { - return s.isDark ? surfaceBright() : surfaceDim(); - } else { - return surfaceContainerHigh(); - } - }) - .setContrastCurve((s) -> s.isDark ? getContrastCurve(11) : getContrastCurve(9)) - .build(); - return super.onSurface().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor surfaceVariant() { - // Remapped to surfaceContainerHighest for 2025 spec. - DynamicColor color2025 = - surfaceContainerHighest().toBuilder().setName("surface_variant").build(); - return super.surfaceVariant().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor onSurfaceVariant() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("on_surface_variant") - .setPalette((s) -> s.neutralPalette) - .setChromaMultiplier( - (s) -> { - if (s.platform == PHONE) { - if (s.variant == NEUTRAL) { - return 2.2; - } else if (s.variant == TONAL_SPOT) { - return 1.7; - } else if (s.variant == EXPRESSIVE) { - return Hct.isYellow(s.neutralPalette.getHue()) ? (s.isDark ? 3.0 : 2.3) : 1.6; - } - } - return 1.0; - }) - .setBackground( - (s) -> { - if (s.platform == PHONE) { - return s.isDark ? surfaceBright() : surfaceDim(); - } else { - return surfaceContainerHigh(); - } - }) - .setContrastCurve( - (s) -> - s.platform == PHONE - ? (s.isDark ? getContrastCurve(6) : getContrastCurve(4.5)) - : getContrastCurve(7)) - .build(); - return super.onSurfaceVariant().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor inverseSurface() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("inverse_surface") - .setPalette((s) -> s.neutralPalette) - .setTone((s) -> s.isDark ? 98.0 : 4.0) - .setIsBackground(true) - .build(); - return super.inverseSurface().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor inverseOnSurface() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("inverse_on_surface") - .setPalette((s) -> s.neutralPalette) - .setBackground((s) -> inverseSurface()) - .setContrastCurve((s) -> getContrastCurve(7)) - .build(); - return super.inverseOnSurface().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor outline() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("outline") - .setPalette((s) -> s.neutralPalette) - .setChromaMultiplier( - (s) -> { - if (s.platform == PHONE) { - if (s.variant == NEUTRAL) { - return 2.2; - } else if (s.variant == TONAL_SPOT) { - return 1.7; - } else if (s.variant == EXPRESSIVE) { - return Hct.isYellow(s.neutralPalette.getHue()) ? (s.isDark ? 3.0 : 2.3) : 1.6; - } - } - return 1.0; - }) - .setBackground( - (s) -> { - if (s.platform == PHONE) { - return s.isDark ? surfaceBright() : surfaceDim(); - } else { - return surfaceContainerHigh(); - } - }) - .setContrastCurve( - (s) -> s.platform == PHONE ? getContrastCurve(3) : getContrastCurve(4.5)) - .build(); - return super.outline().toBuilder().extendSpecVersion(SpecVersion.SPEC_2025, color2025).build(); - } - - @NonNull - @Override - public DynamicColor outlineVariant() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("outline_variant") - .setPalette((s) -> s.neutralPalette) - .setChromaMultiplier( - (s) -> { - if (s.platform == PHONE) { - if (s.variant == NEUTRAL) { - return 2.2; - } else if (s.variant == TONAL_SPOT) { - return 1.7; - } else if (s.variant == EXPRESSIVE) { - return Hct.isYellow(s.neutralPalette.getHue()) ? (s.isDark ? 3.0 : 2.3) : 1.6; - } - } - return 1.0; - }) - .setBackground( - (s) -> { - if (s.platform == PHONE) { - return s.isDark ? surfaceBright() : surfaceDim(); - } else { - return surfaceContainerHigh(); - } - }) - .setContrastCurve( - (s) -> s.platform == PHONE ? getContrastCurve(1.5) : getContrastCurve(3)) - .build(); - return super.outlineVariant().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor surfaceTint() { - // Remapped to primary for 2025 spec. - DynamicColor color2025 = primary().toBuilder().setName("surface_tint").build(); - return super.surfaceTint().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - //////////////////////////////////////////////////////////////// - // Primaries [P] // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor primary() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("primary") - .setPalette((s) -> s.primaryPalette) - .setTone( - (s) -> { - if (s.variant == NEUTRAL) { - if (s.platform == PHONE) { - return s.isDark ? 80.0 : 40.0; - } else { - return 90.0; - } - } else if (s.variant == TONAL_SPOT) { - if (s.platform == PHONE) { - if (s.isDark) { - return 80.0; - } else { - return tMaxC(s.primaryPalette); - } - } else { - 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); - } else { // VIBRANT - return tMaxC( - s.primaryPalette, 0, Hct.isCyan(s.primaryPalette.getHue()) ? 88 : 98); - } - }) - .setIsBackground(true) - .setBackground( - (s) -> { - if (s.platform == PHONE) { - return s.isDark ? surfaceBright() : surfaceDim(); - } else { - return surfaceContainerHigh(); - } - }) - .setContrastCurve( - (s) -> s.platform == PHONE ? getContrastCurve(4.5) : getContrastCurve(7)) - .setToneDeltaPair( - (s) -> - s.platform == PHONE - ? new ToneDeltaPair( - primaryContainer(), primary(), 5.0, RELATIVE_LIGHTER, FARTHER) - : null) - .build(); - return super.primary().toBuilder().extendSpecVersion(SpecVersion.SPEC_2025, color2025).build(); - } - - @NonNull - @Override - public DynamicColor primaryDim() { - return new DynamicColor.Builder() - .setName("primary_dim") - .setPalette((s) -> s.primaryPalette) - .setTone( - (s) -> { - if (s.variant == NEUTRAL) { - return 85.0; - } else if (s.variant == TONAL_SPOT) { - return tMaxC(s.primaryPalette, 0, 90); - } else { - return tMaxC(s.primaryPalette); - } - }) - .setIsBackground(true) - .setBackground((s) -> surfaceContainerHigh()) - .setContrastCurve((s) -> getContrastCurve(4.5)) - .setToneDeltaPair((s) -> new ToneDeltaPair(primaryDim(), primary(), 5.0, DARKER, FARTHER)) - .build(); - } - - @NonNull - @Override - public DynamicColor onPrimary() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("on_primary") - .setPalette((s) -> s.primaryPalette) - .setBackground((s) -> s.platform == PHONE ? primary() : primaryDim()) - .setContrastCurve( - (s) -> s.platform == PHONE ? getContrastCurve(6) : getContrastCurve(7)) - .build(); - return super.onPrimary().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor primaryContainer() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("primary_container") - .setPalette((s) -> s.primaryPalette) - .setTone( - (s) -> { - if (s.platform == WATCH) { - return 30.0; - } else if (s.variant == NEUTRAL) { - return s.isDark ? 30.0 : 90.0; - } else if (s.variant == TONAL_SPOT) { - return s.isDark - ? tMinC(s.primaryPalette, 35, 93) - : tMaxC(s.primaryPalette, 0, 90); - } else if (s.variant == EXPRESSIVE) { - return s.isDark - ? tMaxC(s.primaryPalette, 30, 93) - : tMaxC( - s.primaryPalette, 78, Hct.isCyan(s.primaryPalette.getHue()) ? 88 : 90); - } else { // VIBRANT - return s.isDark - ? tMinC(s.primaryPalette, 66, 93) - : tMaxC( - s.primaryPalette, 66, Hct.isCyan(s.primaryPalette.getHue()) ? 88 : 93); - } - }) - .setIsBackground(true) - .setBackground( - (s) -> { - if (s.platform == PHONE) { - return s.isDark ? surfaceBright() : surfaceDim(); - } else { - return null; - } - }) - .setToneDeltaPair( - (s) -> - s.platform == WATCH - ? new ToneDeltaPair(primaryContainer(), primaryDim(), 10.0, DARKER, FARTHER) - : null) - .setContrastCurve( - (s) -> s.platform == PHONE && s.contrastLevel > 0 ? getContrastCurve(1.5) : null) - .build(); - return super.primaryContainer().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor onPrimaryContainer() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("on_primary_container") - .setPalette((s) -> s.primaryPalette) - .setBackground((s) -> primaryContainer()) - .setContrastCurve( - (s) -> s.platform == PHONE ? getContrastCurve(6) : getContrastCurve(7)) - .build(); - return super.onPrimaryContainer().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor inversePrimary() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("inverse_primary") - .setPalette((s) -> s.primaryPalette) - .setTone((s) -> tMaxC(s.primaryPalette)) - .setBackground((s) -> inverseSurface()) - .setContrastCurve( - (s) -> s.platform == PHONE ? getContrastCurve(6) : getContrastCurve(7)) - .build(); - return super.inversePrimary().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - //////////////////////////////////////////////////////////////// - // Secondaries [Q] // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor secondary() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("secondary") - .setPalette((s) -> s.secondaryPalette) - .setTone( - (s) -> { - if (s.platform == WATCH) { - return s.variant == NEUTRAL ? 90.0 : tMaxC(s.secondaryPalette, 0, 90); - } else if (s.variant == NEUTRAL) { - return s.isDark ? tMinC(s.secondaryPalette, 0, 98) : tMaxC(s.secondaryPalette); - } else if (s.variant == VIBRANT) { - return tMaxC(s.secondaryPalette, 0, s.isDark ? 90 : 98); - } else { // EXPRESSIVE and TONAL_SPOT - return s.isDark ? 80.0 : tMaxC(s.secondaryPalette); - } - }) - .setIsBackground(true) - .setBackground( - (s) -> { - if (s.platform == PHONE) { - return s.isDark ? surfaceBright() : surfaceDim(); - } else { - return surfaceContainerHigh(); - } - }) - .setContrastCurve( - (s) -> s.platform == PHONE ? getContrastCurve(4.5) : getContrastCurve(7)) - .setToneDeltaPair( - (s) -> - s.platform == PHONE - ? new ToneDeltaPair( - secondaryContainer(), secondary(), 5.0, RELATIVE_LIGHTER, FARTHER) - : null) - .build(); - return super.secondary().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @Nullable - @Override - public DynamicColor secondaryDim() { - return new DynamicColor.Builder() - .setName("secondary_dim") - .setPalette((s) -> s.secondaryPalette) - .setTone( - (s) -> { - if (s.variant == NEUTRAL) { - return 85.0; - } else { - return tMaxC(s.secondaryPalette, 0, 90); - } - }) - .setIsBackground(true) - .setBackground((s) -> surfaceContainerHigh()) - .setContrastCurve((s) -> getContrastCurve(4.5)) - .setToneDeltaPair( - (s) -> new ToneDeltaPair(secondaryDim(), secondary(), 5.0, DARKER, FARTHER)) - .build(); - } - - @NonNull - @Override - public DynamicColor onSecondary() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("on_secondary") - .setPalette((s) -> s.secondaryPalette) - .setBackground((s) -> s.platform == PHONE ? secondary() : secondaryDim()) - .setContrastCurve( - (s) -> s.platform == PHONE ? getContrastCurve(6) : getContrastCurve(7)) - .build(); - return super.onSecondary().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor secondaryContainer() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("secondary_container") - .setPalette((s) -> s.secondaryPalette) - .setTone( - (s) -> { - if (s.platform == WATCH) { - return 30.0; - } else if (s.variant == VIBRANT) { - return s.isDark - ? tMinC(s.secondaryPalette, 30, 40) - : tMaxC(s.secondaryPalette, 84, 90); - } else if (s.variant == EXPRESSIVE) { - return s.isDark ? 15.0 : tMaxC(s.secondaryPalette, 90, 95); - } else { - return s.isDark ? 25.0 : 90.0; - } - }) - .setIsBackground(true) - .setBackground( - (s) -> { - if (s.platform == PHONE) { - return s.isDark ? surfaceBright() : surfaceDim(); - } else { - return null; - } - }) - .setToneDeltaPair( - (s) -> - s.platform == WATCH - ? new ToneDeltaPair( - secondaryContainer(), secondaryDim(), 10.0, DARKER, FARTHER) - : null) - .setContrastCurve( - (s) -> s.platform == PHONE && s.contrastLevel > 0 ? getContrastCurve(1.5) : null) - .build(); - return super.secondaryContainer().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor onSecondaryContainer() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("on_secondary_container") - .setPalette((s) -> s.secondaryPalette) - .setBackground((s) -> secondaryContainer()) - .setContrastCurve( - (s) -> s.platform == PHONE ? getContrastCurve(6) : getContrastCurve(7)) - .build(); - return super.onSecondaryContainer().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - //////////////////////////////////////////////////////////////// - // Tertiaries [T] // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor tertiary() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("tertiary") - .setPalette((s) -> s.tertiaryPalette) - .setTone( - (s) -> { - if (s.platform == WATCH) { - return s.variant == TONAL_SPOT - ? tMaxC(s.tertiaryPalette, 0, 90) - : tMaxC(s.tertiaryPalette); - } else if (s.variant == EXPRESSIVE || s.variant == VIBRANT) { - return tMaxC( - s.tertiaryPalette, - /* lowerBound= */ 0, - /* upperBound= */ Hct.isCyan(s.tertiaryPalette.getHue()) - ? 88 - : (s.isDark ? 98 : 100)); - } else { // NEUTRAL and TONAL_SPOT - return s.isDark ? tMaxC(s.tertiaryPalette, 0, 98) : tMaxC(s.tertiaryPalette); - } - }) - .setIsBackground(true) - .setBackground( - (s) -> { - if (s.platform == PHONE) { - return s.isDark ? surfaceBright() : surfaceDim(); - } else { - return surfaceContainerHigh(); - } - }) - .setContrastCurve( - (s) -> s.platform == PHONE ? getContrastCurve(4.5) : getContrastCurve(7)) - .setToneDeltaPair( - (s) -> - s.platform == PHONE - ? new ToneDeltaPair( - tertiaryContainer(), tertiary(), 5.0, RELATIVE_LIGHTER, FARTHER) - : null) - .build(); - return super.tertiary().toBuilder().extendSpecVersion(SpecVersion.SPEC_2025, color2025).build(); - } - - @Nullable - @Override - public DynamicColor tertiaryDim() { - return new DynamicColor.Builder() - .setName("tertiary_dim") - .setPalette((s) -> s.tertiaryPalette) - .setTone( - (s) -> { - if (s.variant == TONAL_SPOT) { - return tMaxC(s.tertiaryPalette, 0, 90); - } else { - return tMaxC(s.tertiaryPalette); - } - }) - .setIsBackground(true) - .setBackground((s) -> surfaceContainerHigh()) - .setContrastCurve((s) -> getContrastCurve(4.5)) - .setToneDeltaPair((s) -> new ToneDeltaPair(tertiaryDim(), tertiary(), 5.0, DARKER, FARTHER)) - .build(); - } - - @NonNull - @Override - public DynamicColor onTertiary() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("on_tertiary") - .setPalette((s) -> s.tertiaryPalette) - .setBackground((s) -> s.platform == PHONE ? tertiary() : tertiaryDim()) - .setContrastCurve( - (s) -> s.platform == PHONE ? getContrastCurve(6) : getContrastCurve(7)) - .build(); - return super.onTertiary().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor tertiaryContainer() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("tertiary_container") - .setPalette((s) -> s.tertiaryPalette) - .setTone( - (s) -> { - if (s.platform == WATCH) { - return s.variant == TONAL_SPOT - ? tMaxC(s.tertiaryPalette, 0, 90) - : tMaxC(s.tertiaryPalette); - } else { - if (s.variant == NEUTRAL) { - return s.isDark - ? tMaxC(s.tertiaryPalette, 0, 93) - : tMaxC(s.tertiaryPalette, 0, 96); - } else if (s.variant == TONAL_SPOT) { - return tMaxC(s.tertiaryPalette, 0, s.isDark ? 93 : 100); - } else if (s.variant == EXPRESSIVE) { - return tMaxC( - s.tertiaryPalette, - /* lowerBound= */ 75, - /* upperBound= */ Hct.isCyan(s.tertiaryPalette.getHue()) - ? 88 - : (s.isDark ? 93 : 100)); - } else { // VIBRANT - return s.isDark - ? tMaxC(s.tertiaryPalette, 0, 93) - : tMaxC(s.tertiaryPalette, 72, 100); - } - } - }) - .setIsBackground(true) - .setBackground( - (s) -> { - if (s.platform == PHONE) { - return s.isDark ? surfaceBright() : surfaceDim(); - } else { - return null; - } - }) - .setToneDeltaPair( - (s) -> - s.platform == WATCH - ? new ToneDeltaPair( - tertiaryContainer(), tertiaryDim(), 10.0, DARKER, FARTHER) - : null) - .setContrastCurve( - (s) -> s.platform == PHONE && s.contrastLevel > 0 ? getContrastCurve(1.5) : null) - .build(); - return super.tertiaryContainer().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor onTertiaryContainer() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("on_tertiary_container") - .setPalette((s) -> s.tertiaryPalette) - .setBackground((s) -> tertiaryContainer()) - .setContrastCurve( - (s) -> s.platform == PHONE ? getContrastCurve(6) : getContrastCurve(7)) - .build(); - return super.onTertiaryContainer().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - //////////////////////////////////////////////////////////////// - // Errors [E] // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor error() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("error") - .setPalette((s) -> s.errorPalette) - .setTone( - (s) -> { - if (s.platform == PHONE) { - return s.isDark ? tMinC(s.errorPalette, 0, 98) : tMaxC(s.errorPalette); - } else { - return tMinC(s.errorPalette); - } - }) - .setIsBackground(true) - .setBackground( - (s) -> { - if (s.platform == PHONE) { - return s.isDark ? surfaceBright() : surfaceDim(); - } else { - return surfaceContainerHigh(); - } - }) - .setContrastCurve( - (s) -> s.platform == PHONE ? getContrastCurve(4.5) : getContrastCurve(7)) - .setToneDeltaPair( - (s) -> - s.platform == PHONE - ? new ToneDeltaPair( - errorContainer(), error(), 5.0, RELATIVE_LIGHTER, FARTHER) - : null) - .build(); - return super.error().toBuilder().extendSpecVersion(SpecVersion.SPEC_2025, color2025).build(); - } - - @Nullable - @Override - public DynamicColor errorDim() { - return new DynamicColor.Builder() - .setName("error_dim") - .setPalette((s) -> s.errorPalette) - .setTone((s) -> tMinC(s.errorPalette)) - .setIsBackground(true) - .setBackground((s) -> surfaceContainerHigh()) - .setContrastCurve((s) -> getContrastCurve(4.5)) - .setToneDeltaPair((s) -> new ToneDeltaPair(errorDim(), error(), 5.0, DARKER, FARTHER)) - .build(); - } - - @NonNull - @Override - public DynamicColor onError() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("on_error") - .setPalette((s) -> s.errorPalette) - .setBackground((s) -> s.platform == PHONE ? error() : errorDim()) - .setContrastCurve( - (s) -> s.platform == PHONE ? getContrastCurve(6) : getContrastCurve(7)) - .build(); - return super.onError().toBuilder().extendSpecVersion(SpecVersion.SPEC_2025, color2025).build(); - } - - @NonNull - @Override - public DynamicColor errorContainer() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("error_container") - .setPalette((s) -> s.errorPalette) - .setTone( - (s) -> { - if (s.platform == WATCH) { - return 30.0; - } else { - return s.isDark ? tMinC(s.errorPalette, 30, 93) : tMaxC(s.errorPalette, 0, 90); - } - }) - .setIsBackground(true) - .setBackground( - (s) -> { - if (s.platform == PHONE) { - return s.isDark ? surfaceBright() : surfaceDim(); - } else { - return null; - } - }) - .setToneDeltaPair( - (s) -> - s.platform == WATCH - ? new ToneDeltaPair(errorContainer(), errorDim(), 10.0, DARKER, FARTHER) - : null) - .setContrastCurve( - (s) -> s.platform == PHONE && s.contrastLevel > 0 ? getContrastCurve(1.5) : null) - .build(); - return super.errorContainer().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor onErrorContainer() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("on_error_container") - .setPalette((s) -> s.errorPalette) - .setBackground((s) -> errorContainer()) - .setContrastCurve( - (s) -> s.platform == PHONE ? getContrastCurve(4.5) : getContrastCurve(7)) - .build(); - return super.onErrorContainer().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - //////////////////////////////////////////////////////////////// - // Primary Fixed Colors [PF] // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor primaryFixed() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("primary_fixed") - .setPalette((s) -> s.primaryPalette) - .setTone( - (s) -> { - DynamicScheme tempS = - DynamicScheme.from(s, /* isDark= */ false, /* contrastLevel= */ 0.0); - return primaryContainer().getTone(tempS); - }) - .setIsBackground(true) - .setBackground( - (s) -> { - if (s.platform == PHONE) { - return s.isDark ? surfaceBright() : surfaceDim(); - } else { - return null; - } - }) - .setContrastCurve( - (s) -> s.platform == PHONE && s.contrastLevel > 0 ? getContrastCurve(1.5) : null) - .build(); - return super.primaryFixed().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor primaryFixedDim() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("primary_fixed_dim") - .setPalette((s) -> s.primaryPalette) - .setTone((s) -> primaryFixed().getTone(s)) - .setIsBackground(true) - .setToneDeltaPair( - (s) -> new ToneDeltaPair(primaryFixedDim(), primaryFixed(), 5.0, DARKER, EXACT)) - .build(); - return super.primaryFixedDim().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor onPrimaryFixed() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("on_primary_fixed") - .setPalette((s) -> s.primaryPalette) - .setBackground((s) -> primaryFixedDim()) - .setContrastCurve((s) -> getContrastCurve(7)) - .build(); - return super.onPrimaryFixed().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor onPrimaryFixedVariant() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("on_primary_fixed_variant") - .setPalette((s) -> s.primaryPalette) - .setBackground((s) -> primaryFixedDim()) - .setContrastCurve((s) -> getContrastCurve(4.5)) - .build(); - return super.onPrimaryFixedVariant().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - //////////////////////////////////////////////////////////////// - // Secondary Fixed Colors [QF] // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor secondaryFixed() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("secondary_fixed") - .setPalette((s) -> s.secondaryPalette) - .setTone( - (s) -> { - DynamicScheme tempS = - DynamicScheme.from(s, /* isDark= */ false, /* contrastLevel= */ 0.0); - return secondaryContainer().getTone(tempS); - }) - .setIsBackground(true) - .setBackground( - (s) -> { - if (s.platform == PHONE) { - return s.isDark ? surfaceBright() : surfaceDim(); - } else { - return null; - } - }) - .setContrastCurve( - (s) -> s.platform == PHONE && s.contrastLevel > 0 ? getContrastCurve(1.5) : null) - .build(); - return super.secondaryFixed().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor secondaryFixedDim() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("secondary_fixed_dim") - .setPalette((s) -> s.secondaryPalette) - .setTone((s) -> secondaryFixed().getTone(s)) - .setIsBackground(true) - .setToneDeltaPair( - (s) -> new ToneDeltaPair(secondaryFixedDim(), secondaryFixed(), 5.0, DARKER, EXACT)) - .build(); - return super.secondaryFixedDim().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor onSecondaryFixed() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("on_secondary_fixed") - .setPalette((s) -> s.secondaryPalette) - .setBackground((s) -> secondaryFixedDim()) - .setContrastCurve((s) -> getContrastCurve(7)) - .build(); - return super.onSecondaryFixed().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor onSecondaryFixedVariant() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("on_secondary_fixed_variant") - .setPalette((s) -> s.secondaryPalette) - .setBackground((s) -> secondaryFixedDim()) - .setContrastCurve((s) -> getContrastCurve(4.5)) - .build(); - return super.onSecondaryFixedVariant().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - //////////////////////////////////////////////////////////////// - // Tertiary Fixed Colors [TF] // - //////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor tertiaryFixed() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("tertiary_fixed") - .setPalette((s) -> s.tertiaryPalette) - .setTone( - (s) -> { - DynamicScheme tempS = - DynamicScheme.from(s, /* isDark= */ false, /* contrastLevel= */ 0.0); - return tertiaryContainer().getTone(tempS); - }) - .setIsBackground(true) - .setBackground( - (s) -> { - if (s.platform == PHONE) { - return s.isDark ? surfaceBright() : surfaceDim(); - } else { - return null; - } - }) - .setContrastCurve( - (s) -> s.platform == PHONE && s.contrastLevel > 0 ? getContrastCurve(1.5) : null) - .build(); - return super.tertiaryFixed().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor tertiaryFixedDim() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("tertiary_fixed_dim") - .setPalette((s) -> s.tertiaryPalette) - .setTone((s) -> tertiaryFixed().getTone(s)) - .setIsBackground(true) - .setToneDeltaPair( - (s) -> new ToneDeltaPair(tertiaryFixedDim(), tertiaryFixed(), 5.0, DARKER, EXACT)) - .build(); - return super.tertiaryFixedDim().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor onTertiaryFixed() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("on_tertiary_fixed") - .setPalette((s) -> s.tertiaryPalette) - .setBackground((s) -> tertiaryFixedDim()) - .setContrastCurve((s) -> getContrastCurve(7)) - .build(); - return super.onTertiaryFixed().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor onTertiaryFixedVariant() { - DynamicColor color2025 = - new DynamicColor.Builder() - .setName("on_tertiary_fixed_variant") - .setPalette((s) -> s.tertiaryPalette) - .setBackground((s) -> tertiaryFixedDim()) - .setContrastCurve((s) -> getContrastCurve(4.5)) - .build(); - return super.onTertiaryFixedVariant().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - ////////////////////////////////////////////////////////////////// - // Android-only Colors // - ////////////////////////////////////////////////////////////////// - - @NonNull - @Override - public DynamicColor controlActivated() { - // Remapped to primaryContainer for 2025 spec. - DynamicColor color2025 = primaryContainer().toBuilder().setName("control_activated").build(); - return super.controlActivated().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor controlNormal() { - // Remapped to onSurfaceVariant for 2025 spec. - DynamicColor color2025 = onSurfaceVariant().toBuilder().setName("control_normal").build(); - return super.controlNormal().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - @NonNull - @Override - public DynamicColor textPrimaryInverse() { - // Remapped to inverseOnSurface for 2025 spec. - DynamicColor color2025 = inverseOnSurface().toBuilder().setName("text_primary_inverse").build(); - return super.textPrimaryInverse().toBuilder() - .extendSpecVersion(SpecVersion.SPEC_2025, color2025) - .build(); - } - - //////////////////////////////////////////////////////////////// - // Other // - //////////////////////////////////////////////////////////////// - - private static double findBestToneForChroma( - double hue, double chroma, double tone, boolean byDecreasingTone) { - double answer = tone; - Hct bestCandidate = Hct.from(hue, chroma, answer); - while (bestCandidate.getChroma() < chroma) { - if (tone < 0 || tone > 100) { - break; - } - tone += byDecreasingTone ? -1.0 : 1.0; - Hct newCandidate = Hct.from(hue, chroma, tone); - if (bestCandidate.getChroma() < newCandidate.getChroma()) { - bestCandidate = newCandidate; - answer = tone; - } - } - return answer; - } - - private static double tMaxC(TonalPalette palette) { - return tMaxC(palette, 0, 100); - } - - private static double tMaxC(TonalPalette palette, double lowerBound, double upperBound) { - return tMaxC(palette, lowerBound, upperBound, 1); - } - - private static double tMaxC( - TonalPalette palette, double lowerBound, double upperBound, double chromaMultiplier) { - double answer = - findBestToneForChroma(palette.getHue(), palette.getChroma() * chromaMultiplier, 100, true); - return MathUtils.clampDouble(lowerBound, upperBound, answer); - } - - private static double tMinC(TonalPalette palette) { - return tMinC(palette, 0, 100); - } - - private static double tMinC(TonalPalette palette, double lowerBound, double upperBound) { - double answer = findBestToneForChroma(palette.getHue(), palette.getChroma(), 0, false); - return MathUtils.clampDouble(lowerBound, upperBound, answer); - } - - private static ContrastCurve getContrastCurve(double defaultContrast) { - if (defaultContrast == 1.5) { - return new ContrastCurve(1.5, 1.5, 3, 4.5); - } else if (defaultContrast == 3) { - return new ContrastCurve(3, 3, 4.5, 7); - } else if (defaultContrast == 4.5) { - return new ContrastCurve(4.5, 4.5, 7, 11); - } else if (defaultContrast == 6) { - return new ContrastCurve(6, 6, 7, 11); - } else if (defaultContrast == 7) { - return new ContrastCurve(7, 7, 11, 21); - } else if (defaultContrast == 9) { - return new ContrastCurve(9, 9, 11, 21); - } else if (defaultContrast == 11) { - return new ContrastCurve(11, 11, 21, 21); - } else if (defaultContrast == 21) { - return new ContrastCurve(21, 21, 21, 21); - } else { - // Shouldn't happen. - return new ContrastCurve(defaultContrast, defaultContrast, 7, 21); - } - } - - ///////////////////////////////////////////////////////////////// - // Color value calculations // - ///////////////////////////////////////////////////////////////// - - @NonNull - @Override - public Hct getHct(DynamicScheme scheme, DynamicColor color) { - // This is crucial for aesthetics: we aren't simply the taking the standard color - // and changing its tone for contrast. Rather, we find the tone for contrast, then - // use the specified chroma from the palette to construct a new color. - // - // For example, this enables colors with standard tone of T90, which has limited chroma, to - // "recover" intended chroma as contrast increases. - TonalPalette palette = color.palette.apply(scheme); - double tone = getTone(scheme, color); - double hue = palette.getHue(); - double chromaMultiplier = - color.chromaMultiplier == null ? 1 : color.chromaMultiplier.apply(scheme); - double chroma = palette.getChroma() * chromaMultiplier; - - return Hct.from(hue, chroma, tone); - } - - @Override - public double getTone(DynamicScheme scheme, DynamicColor color) { - ToneDeltaPair toneDeltaPair = - color.toneDeltaPair == null ? null : color.toneDeltaPair.apply(scheme); - - // Case 0: tone delta pair. - if (toneDeltaPair != null) { - DynamicColor roleA = toneDeltaPair.getRoleA(); - DynamicColor roleB = toneDeltaPair.getRoleB(); - TonePolarity polarity = toneDeltaPair.getPolarity(); - DeltaConstraint constraint = toneDeltaPair.getConstraint(); - double absoluteDelta = - polarity == TonePolarity.DARKER - || (polarity == TonePolarity.RELATIVE_LIGHTER && scheme.isDark) - || (polarity == TonePolarity.RELATIVE_DARKER && !scheme.isDark) - ? -toneDeltaPair.getDelta() - : toneDeltaPair.getDelta(); - - boolean amRoleA = color.name.equals(roleA.name); - DynamicColor selfRole = amRoleA ? roleA : roleB; - DynamicColor referenceRole = amRoleA ? roleB : roleA; - double selfTone = selfRole.tone.apply(scheme); - double referenceTone = referenceRole.getTone(scheme); - double relativeDelta = absoluteDelta * (amRoleA ? 1 : -1); - - switch (constraint) { - case EXACT -> selfTone = MathUtils.clampDouble(0, 100, referenceTone + relativeDelta); - case NEARER -> { - if (relativeDelta > 0) { - selfTone = - MathUtils.clampDouble( - 0, - 100, - MathUtils.clampDouble(referenceTone, referenceTone + relativeDelta, selfTone)); - } else { - selfTone = - MathUtils.clampDouble( - 0, - 100, - MathUtils.clampDouble(referenceTone + relativeDelta, referenceTone, selfTone)); - } - } - case FARTHER -> { - if (relativeDelta > 0) { - selfTone = MathUtils.clampDouble(referenceTone + relativeDelta, 100, selfTone); - } else { - selfTone = MathUtils.clampDouble(0, referenceTone + relativeDelta, selfTone); - } - } - } - - if (color.background != null && color.contrastCurve != null) { - DynamicColor background = color.background.apply(scheme); - ContrastCurve contrastCurve = color.contrastCurve.apply(scheme); - if (background != null && contrastCurve != null) { - double bgTone = background.getTone(scheme); - double selfContrast = contrastCurve.get(scheme.contrastLevel); - selfTone = - Contrast.ratioOfTones(bgTone, selfTone) >= selfContrast && scheme.contrastLevel >= 0 - ? selfTone - : DynamicColor.foregroundTone(bgTone, selfContrast); - } - } - - // This can avoid the awkward tones for background colors including the access fixed colors. - // Accent fixed dim colors should not be adjusted. - if (color.isBackground && !color.name.endsWith("_fixed_dim")) { - if (selfTone >= 57) { - selfTone = MathUtils.clampDouble(65, 100, selfTone); - } else { - selfTone = MathUtils.clampDouble(0, 49, selfTone); - } - } - - return selfTone; - } else { - // Case 1: No tone delta pair; just solve for itself. - double answer = color.tone.apply(scheme); - - if (color.background == null - || color.background.apply(scheme) == null - || color.contrastCurve == null - || color.contrastCurve.apply(scheme) == null) { - return answer; // No adjustment for colors with no background. - } - - double bgTone = color.background.apply(scheme).getTone(scheme); - double desiredRatio = color.contrastCurve.apply(scheme).get(scheme.contrastLevel); - - // Recalculate the tone from desired contrast ratio if the current - // contrast ratio is not enough or desired contrast level is decreasing - // (<0). - answer = - Contrast.ratioOfTones(bgTone, answer) >= desiredRatio && scheme.contrastLevel >= 0 - ? answer - : DynamicColor.foregroundTone(bgTone, desiredRatio); - - // This can avoid the awkward tones for background colors including the access fixed colors. - // Accent fixed dim colors should not be adjusted. - if (color.isBackground && !color.name.endsWith("_fixed_dim")) { - if (answer >= 57) { - answer = MathUtils.clampDouble(65, 100, answer); - } else { - answer = MathUtils.clampDouble(0, 49, answer); - } - } - - if (color.secondBackground == null || color.secondBackground.apply(scheme) == null) { - return answer; - } - - // Case 2: Adjust for dual backgrounds. - double bgTone1 = color.background.apply(scheme).getTone(scheme); - double bgTone2 = color.secondBackground.apply(scheme).getTone(scheme); - double upper = max(bgTone1, bgTone2); - double lower = min(bgTone1, bgTone2); - - if (Contrast.ratioOfTones(upper, answer) >= desiredRatio - && Contrast.ratioOfTones(lower, answer) >= desiredRatio) { - return answer; - } - - // The darkest light tone that satisfies the desired ratio, - // or -1 if such ratio cannot be reached. - double lightOption = Contrast.lighter(upper, desiredRatio); - - // The lightest dark tone that satisfies the desired ratio, - // or -1 if such ratio cannot be reached. - double darkOption = Contrast.darker(lower, desiredRatio); - - // Tones suitable for the foreground. - ArrayList availables = new ArrayList<>(); - if (lightOption != -1) { - availables.add(lightOption); - } - if (darkOption != -1) { - availables.add(darkOption); - } - - boolean prefersLight = - DynamicColor.tonePrefersLightForeground(bgTone1) - || DynamicColor.tonePrefersLightForeground(bgTone2); - if (prefersLight) { - return (lightOption < 0) ? 100 : lightOption; - } - if (availables.size() == 1) { - return availables.get(0); - } - return (darkOption < 0) ? 0 : darkOption; - } - } - - ////////////////////////////////////////////////////////////////// - // Scheme Palettes // - ////////////////////////////////////////////////////////////////// - - @NonNull - @Override - public TonalPalette getPrimaryPalette( - Variant variant, - Hct sourceColorHct, - boolean isDark, - Platform platform, - double contrastLevel) { - return switch (variant) { - case NEUTRAL -> - TonalPalette.fromHueAndChroma( - sourceColorHct.getHue(), - platform == PHONE - ? (Hct.isBlue(sourceColorHct.getHue()) ? 12 : 8) - : (Hct.isBlue(sourceColorHct.getHue()) ? 16 : 12)); - case TONAL_SPOT -> - TonalPalette.fromHueAndChroma( - sourceColorHct.getHue(), platform == PHONE && isDark ? 26 : 32); - case EXPRESSIVE -> - TonalPalette.fromHueAndChroma( - sourceColorHct.getHue(), platform == PHONE ? (isDark ? 36 : 48) : 40); - case VIBRANT -> - TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), platform == PHONE ? 74 : 56); - default -> super.getPrimaryPalette(variant, sourceColorHct, isDark, platform, contrastLevel); - }; - } - - @NonNull - @Override - public TonalPalette getSecondaryPalette( - Variant variant, - Hct sourceColorHct, - boolean isDark, - Platform platform, - double contrastLevel) { - return switch (variant) { - case NEUTRAL -> - TonalPalette.fromHueAndChroma( - sourceColorHct.getHue(), - platform == PHONE - ? (Hct.isBlue(sourceColorHct.getHue()) ? 6 : 4) - : (Hct.isBlue(sourceColorHct.getHue()) ? 10 : 6)); - case TONAL_SPOT -> TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), 16); - case EXPRESSIVE -> - TonalPalette.fromHueAndChroma( - DynamicScheme.getRotatedHue( - sourceColorHct, - new double[] {0, 105, 140, 204, 253, 278, 300, 333, 360}, - new double[] {-160, 155, -100, 96, -96, -156, -165, -160}), - platform == PHONE ? (isDark ? 16 : 24) : 24); - case VIBRANT -> - TonalPalette.fromHueAndChroma( - DynamicScheme.getRotatedHue( - sourceColorHct, - new double[] {0, 38, 105, 140, 333, 360}, - new double[] {-14, 10, -14, 10, -14}), - platform == PHONE ? 56 : 36); - default -> - super.getSecondaryPalette(variant, sourceColorHct, isDark, platform, contrastLevel); - }; - } - - @NonNull - @Override - public TonalPalette getTertiaryPalette( - Variant variant, - Hct sourceColorHct, - boolean isDark, - Platform platform, - double contrastLevel) { - return switch (variant) { - case NEUTRAL -> - TonalPalette.fromHueAndChroma( - DynamicScheme.getRotatedHue( - sourceColorHct, - new double[] {0, 38, 105, 161, 204, 278, 333, 360}, - new double[] {-32, 26, 10, -39, 24, -15, -32}), - platform == PHONE ? 20 : 36); - case TONAL_SPOT -> - TonalPalette.fromHueAndChroma( - DynamicScheme.getRotatedHue( - sourceColorHct, - new double[] {0, 20, 71, 161, 333, 360}, - new double[] {-40, 48, -32, 40, -32}), - platform == PHONE ? 28 : 32); - case EXPRESSIVE -> - TonalPalette.fromHueAndChroma( - DynamicScheme.getRotatedHue( - sourceColorHct, - new double[] {0, 105, 140, 204, 253, 278, 300, 333, 360}, - new double[] {-165, 160, -105, 101, -101, -160, -170, -165}), - 48); - case VIBRANT -> - TonalPalette.fromHueAndChroma( - DynamicScheme.getRotatedHue( - sourceColorHct, - new double[] {0, 38, 71, 105, 140, 161, 253, 333, 360}, - new double[] {-72, 35, 24, -24, 62, 50, 62, -72}), - 56); - default -> super.getTertiaryPalette(variant, sourceColorHct, isDark, platform, contrastLevel); - }; - } - - @NonNull - @Override - public TonalPalette getNeutralPalette( - Variant variant, - Hct sourceColorHct, - boolean isDark, - Platform platform, - double contrastLevel) { - return switch (variant) { - case NEUTRAL -> - TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), platform == PHONE ? 1.4 : 6); - case TONAL_SPOT -> - TonalPalette.fromHueAndChroma(sourceColorHct.getHue(), platform == PHONE ? 5 : 10); - case EXPRESSIVE -> - TonalPalette.fromHueAndChroma( - getExpressiveNeutralHue(sourceColorHct), - getExpressiveNeutralChroma(sourceColorHct, isDark, platform)); - case VIBRANT -> - TonalPalette.fromHueAndChroma( - getVibrantNeutralHue(sourceColorHct), - getVibrantNeutralChroma(sourceColorHct, platform)); - default -> super.getNeutralPalette(variant, sourceColorHct, isDark, platform, contrastLevel); - }; - } - - @NonNull - @Override - public TonalPalette getNeutralVariantPalette( - Variant variant, - Hct sourceColorHct, - boolean isDark, - Platform platform, - double contrastLevel) { - switch (variant) { - case NEUTRAL -> { - return TonalPalette.fromHueAndChroma( - sourceColorHct.getHue(), (platform == PHONE ? 1.4 : 6) * 2.2); - } - case TONAL_SPOT -> { - return TonalPalette.fromHueAndChroma( - sourceColorHct.getHue(), (platform == PHONE ? 5 : 10) * 1.7); - } - case EXPRESSIVE -> { - double expressiveNeutralHue = getExpressiveNeutralHue(sourceColorHct); - double expressiveNeutralChroma = - getExpressiveNeutralChroma(sourceColorHct, isDark, platform); - return TonalPalette.fromHueAndChroma( - expressiveNeutralHue, - expressiveNeutralChroma - * (expressiveNeutralHue >= 105 && expressiveNeutralHue < 125 ? 1.6 : 2.3)); - } - case VIBRANT -> { - double vibrantNeutralHue = getVibrantNeutralHue(sourceColorHct); - double vibrantNeutralChroma = getVibrantNeutralChroma(sourceColorHct, platform); - return TonalPalette.fromHueAndChroma(vibrantNeutralHue, vibrantNeutralChroma * 1.29); - } - default -> { - return super.getNeutralVariantPalette( - variant, sourceColorHct, isDark, platform, contrastLevel); - } - } - } - - @NonNull - @Override - public Optional getErrorPalette( - Variant variant, - Hct sourceColorHct, - boolean isDark, - Platform platform, - double contrastLevel) { - double errorHue = - DynamicScheme.getPiecewiseValue( - sourceColorHct, - new double[] {0, 3, 13, 23, 33, 43, 153, 273, 360}, - new double[] {12, 22, 32, 12, 22, 32, 22, 12}); - return switch (variant) { - case NEUTRAL -> - Optional.of(TonalPalette.fromHueAndChroma(errorHue, platform == PHONE ? 50 : 40)); - case TONAL_SPOT -> - Optional.of(TonalPalette.fromHueAndChroma(errorHue, platform == PHONE ? 60 : 48)); - case EXPRESSIVE -> - Optional.of(TonalPalette.fromHueAndChroma(errorHue, platform == PHONE ? 64 : 48)); - case VIBRANT -> - Optional.of(TonalPalette.fromHueAndChroma(errorHue, platform == PHONE ? 80 : 60)); - default -> super.getErrorPalette(variant, sourceColorHct, isDark, platform, contrastLevel); - }; - } - - private static double getExpressiveNeutralHue(Hct sourceColorHct) { - return DynamicScheme.getRotatedHue( - sourceColorHct, - new double[] {0, 71, 124, 253, 278, 300, 360}, - new double[] {10, 0, 10, 0, 10, 0}); - } - - private static double getExpressiveNeutralChroma( - Hct sourceColorHct, boolean isDark, Platform platform) { - double neutralHue = getExpressiveNeutralHue(sourceColorHct); - return platform == PHONE ? (isDark ? (Hct.isYellow(neutralHue) ? 6 : 14) : 18) : 12; - } - - private static double getVibrantNeutralHue(Hct sourceColorHct) { - return DynamicScheme.getRotatedHue( - sourceColorHct, - new double[] {0, 38, 105, 140, 333, 360}, - new double[] {-14, 10, -14, 10, -14}); - } - - private static double getVibrantNeutralChroma(Hct sourceColorHct, Platform platform) { - double neutralHue = getVibrantNeutralHue(sourceColorHct); - return platform == PHONE ? 28 : (Hct.isBlue(neutralHue) ? 28 : 20); - } -} diff --git a/java/dynamiccolor/ColorSpecs.java b/java/dynamiccolor/ColorSpecs.java deleted file mode 100644 index f8c41485..00000000 --- a/java/dynamiccolor/ColorSpecs.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2025 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dynamiccolor; - -import dynamiccolor.ColorSpec.SpecVersion; - -/** A utility class to get the correct color spec for a given spec version. */ -public final class ColorSpecs { - - private static final ColorSpec SPEC_2021 = new ColorSpec2021(); - private static final ColorSpec SPEC_2025 = new ColorSpec2025(); - - public static final ColorSpec get() { - return get(SpecVersion.SPEC_2021); - } - - public static final ColorSpec get(SpecVersion specVersion) { - return get(specVersion, false); - } - - public static final ColorSpec get(SpecVersion specVersion, boolean isExtendedFidelity) { - return specVersion == SpecVersion.SPEC_2025 ? SPEC_2025 : SPEC_2021; - } - - private ColorSpecs() {} -} diff --git a/java/dynamiccolor/ContrastCurve.java b/java/dynamiccolor/ContrastCurve.java deleted file mode 100644 index 42a8813e..00000000 --- a/java/dynamiccolor/ContrastCurve.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dynamiccolor; - -import utils.MathUtils; - -/** - * A class containing a value that changes with the contrast level. - * - *

Usually represents the contrast requirements for a dynamic color on its background. The four - * values correspond to values for contrast levels -1.0, 0.0, 0.5, and 1.0, respectively. - */ -public final class ContrastCurve { - /** Value for contrast level -1.0 */ - private final double low; - - /** Value for contrast level 0.0 */ - private final double normal; - - /** Value for contrast level 0.5 */ - private final double medium; - - /** Value for contrast level 1.0 */ - private final double high; - - /** - * Creates a `ContrastCurve` object. - * - * @param low Value for contrast level -1.0 - * @param normal Value for contrast level 0.0 - * @param medium Value for contrast level 0.5 - * @param high Value for contrast level 1.0 - */ - public ContrastCurve(double low, double normal, double medium, double high) { - this.low = low; - this.normal = normal; - this.medium = medium; - this.high = high; - } - - /** - * Returns the value at a given contrast level. - * - * @param contrastLevel The contrast level. 0.0 is the default (normal); -1.0 is the lowest; 1.0 - * is the highest. - * @return The value. For contrast ratios, a number between 1.0 and 21.0. - */ - public double get(double contrastLevel) { - if (contrastLevel <= -1.0) { - return this.low; - } else if (contrastLevel < 0.0) { - return MathUtils.lerp(this.low, this.normal, (contrastLevel - -1) / 1); - } else if (contrastLevel < 0.5) { - return MathUtils.lerp(this.normal, this.medium, (contrastLevel - 0) / 0.5); - } else if (contrastLevel < 1.0) { - return MathUtils.lerp(this.medium, this.high, (contrastLevel - 0.5) / 0.5); - } else { - return this.high; - } - } -} diff --git a/java/dynamiccolor/DynamicColor.java b/java/dynamiccolor/DynamicColor.java deleted file mode 100644 index 754fb23a..00000000 --- a/java/dynamiccolor/DynamicColor.java +++ /dev/null @@ -1,603 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dynamiccolor; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import com.google.errorprone.annotations.CanIgnoreReturnValue; -import contrast.Contrast; -import dynamiccolor.ColorSpec.SpecVersion; -import hct.Hct; -import palettes.TonalPalette; -import utils.MathUtils; -import java.util.HashMap; -import java.util.function.Function; - -/** - * A color that adjusts itself based on UI state, represented by DynamicScheme. - * - *

This color automatically adjusts to accommodate a desired contrast level, or other adjustments - * such as differing in light mode versus dark mode, or what the theme is, or what the color that - * produced the theme is, etc. - * - *

Colors without backgrounds do not change tone when contrast changes. Colors with backgrounds - * become closer to their background as contrast lowers, and further when contrast increases. - * - *

Prefer the static constructors. They provide a much more simple interface, such as requiring - * just a hexcode, or just a hexcode and a background. - * - *

Ultimately, each component necessary for calculating a color, adjusting it for a desired - * contrast level, and ensuring it has a certain lightness/tone difference from another color, is - * provided by a function that takes a DynamicScheme and returns a value. This ensures ultimate - * 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 palette; - public final Function tone; - public final boolean isBackground; - public final Function chromaMultiplier; - public final Function background; - public final Function secondBackground; - public final Function contrastCurve; - public final Function toneDeltaPair; - - public final Function opacity; - - private final HashMap hctCache = new HashMap<>(); - - /** - * A constructor for DynamicColor. - * - *

_Strongly_ prefer using one of the convenience constructors. This class is arguably too - * flexible to ensure it can support any scenario. Functional arguments allow overriding without - * risks that come with subclasses. - * - *

For example, the default behavior of adjust tone at max contrast to be at a 7.0 ratio with - * its background is principled and matches accessibility guidance. That does not mean it's the - * desired approach for _every_ design system, and every color pairing, always, in every case. - * - *

For opaque colors (colors with alpha = 100%). - * - * @param name The name of the dynamic color. - * @param palette Function that provides a TonalPalette given DynamicScheme. A TonalPalette is - * defined by a hue and chroma, so this replaces the need to specify hue/chroma. By providing - * a tonal palette, when contrast adjustments are made, intended chroma can be preserved. - * @param tone Function that provides a tone, given a DynamicScheme. - * @param isBackground Whether this dynamic color is a background, with some other color as the - * foreground. - * @param background The background of the dynamic color (as a function of a `DynamicScheme`), if - * it exists. - * @param secondBackground A second background of the dynamic color (as a function of a - * `DynamicScheme`), if it exists. - * @param contrastCurve A `ContrastCurve` object specifying how its contrast against its - * background should behave in various contrast levels options. - * @param toneDeltaPair A `ToneDeltaPair` object specifying a tone delta constraint between two - * colors. One of them must be the color being constructed. - */ - public DynamicColor( - @NonNull String name, - @NonNull Function palette, - @NonNull Function tone, - boolean isBackground, - @Nullable Function background, - @Nullable Function secondBackground, - @Nullable ContrastCurve contrastCurve, - @Nullable Function toneDeltaPair) { - this( - name, - palette, - tone, - isBackground, - background, - secondBackground, - contrastCurve, - toneDeltaPair, - /* opacity= */ null); - } - - /** - * A constructor for DynamicColor. - * - *

_Strongly_ prefer using one of the convenience constructors. This class is arguably too - * flexible to ensure it can support any scenario. Functional arguments allow overriding without - * risks that come with subclasses. - * - *

For example, the default behavior of adjust tone at max contrast to be at a 7.0 ratio with - * its background is principled and matches accessibility guidance. That does not mean it's the - * desired approach for _every_ design system, and every color pairing, always, in every case. - * - *

For opaque colors (colors with alpha = 100%). - * - * @param name The name of the dynamic color. - * @param palette Function that provides a TonalPalette given DynamicScheme. A TonalPalette is - * defined by a hue and chroma, so this replaces the need to specify hue/chroma. By providing - * a tonal palette, when contrast adjustments are made, intended chroma can be preserved. - * @param tone Function that provides a tone, given a DynamicScheme. - * @param isBackground Whether this dynamic color is a background, with some other color as the - * foreground. - * @param background The background of the dynamic color (as a function of a `DynamicScheme`), if - * it exists. - * @param secondBackground A second background of the dynamic color (as a function of a - * `DynamicScheme`), if it exists. - * @param contrastCurve A `ContrastCurve` object specifying how its contrast against its - * background should behave in various contrast levels options. - * @param toneDeltaPair A `ToneDeltaPair` object specifying a tone delta constraint between two - * colors. One of them must be the color being constructed. - * @param opacity A function returning the opacity of a color, as a number between 0 and 1. - */ - public DynamicColor( - @NonNull String name, - @NonNull Function palette, - @NonNull Function tone, - boolean isBackground, - @Nullable Function background, - @Nullable Function secondBackground, - @Nullable ContrastCurve contrastCurve, - @Nullable Function toneDeltaPair, - @Nullable Function opacity) { - this( - name, - palette, - tone, - isBackground, - null, - background, - secondBackground, - (s) -> contrastCurve, - toneDeltaPair, - opacity); - } - - public DynamicColor( - @NonNull String name, - @NonNull Function palette, - @NonNull Function tone, - boolean isBackground, - @Nullable Function chromaMultiplier, - @Nullable Function background, - @Nullable Function secondBackground, - @Nullable Function contrastCurve, - @Nullable Function toneDeltaPair, - @Nullable Function opacity) { - this.name = name; - this.palette = palette; - this.tone = tone; - this.isBackground = isBackground; - this.chromaMultiplier = chromaMultiplier; - this.background = background; - this.secondBackground = secondBackground; - this.contrastCurve = contrastCurve; - this.toneDeltaPair = toneDeltaPair; - this.opacity = opacity; - } - - /** - * A convenience constructor for DynamicColor. - * - *

_Strongly_ prefer using one of the convenience constructors. This class is arguably too - * flexible to ensure it can support any scenario. Functional arguments allow overriding without - * risks that come with subclasses. - * - *

For example, the default behavior of adjust tone at max contrast to be at a 7.0 ratio with - * its background is principled and matches accessibility guidance. That does not mean it's the - * desired approach for _every_ design system, and every color pairing, always, in every case. - * - *

For opaque colors (colors with alpha = 100%). - * - *

For colors that are not backgrounds, and do not have backgrounds. - * - * @param name The name of the dynamic color. - * @param palette Function that provides a TonalPalette given DynamicScheme. A TonalPalette is - * defined by a hue and chroma, so this replaces the need to specify hue/chroma. By providing - * a tonal palette, when contrast adjustments are made, intended chroma can be preserved. - * @param tone Function that provides a tone, given a DynamicScheme. - */ - @NonNull - public static DynamicColor fromPalette( - @NonNull String name, - @NonNull Function palette, - @NonNull Function tone) { - return new DynamicColor( - name, - palette, - tone, - /* isBackground= */ false, - /* background= */ null, - /* secondBackground= */ null, - /* contrastCurve= */ null, - /* toneDeltaPair= */ null); - } - - /** - * A convenience constructor for DynamicColor. - * - *

_Strongly_ prefer using one of the convenience constructors. This class is arguably too - * flexible to ensure it can support any scenario. Functional arguments allow overriding without - * risks that come with subclasses. - * - *

For example, the default behavior of adjust tone at max contrast to be at a 7.0 ratio with - * its background is principled and matches accessibility guidance. That does not mean it's the - * desired approach for _every_ design system, and every color pairing, always, in every case. - * - *

For opaque colors (colors with alpha = 100%). - * - *

For colors that do not have backgrounds. - * - * @param name The name of the dynamic color. - * @param palette Function that provides a TonalPalette given DynamicScheme. A TonalPalette is - * defined by a hue and chroma, so this replaces the need to specify hue/chroma. By providing - * a tonal palette, when contrast adjustments are made, intended chroma can be preserved. - * @param tone Function that provides a tone, given a DynamicScheme. - * @param isBackground Whether this dynamic color is a background, with some other color as the - * foreground. - */ - @NonNull - public static DynamicColor fromPalette( - @NonNull String name, - @NonNull Function palette, - @NonNull Function tone, - boolean isBackground) { - return new DynamicColor( - name, - palette, - tone, - isBackground, - /* background= */ null, - /* secondBackground= */ null, - /* contrastCurve= */ null, - /* toneDeltaPair= */ null); - } - - /** - * Create a DynamicColor from a hex code. - * - *

Result has no background; thus no support for increasing/decreasing contrast for a11y. - * - * @param name The name of the dynamic color. - * @param argb The source color from which to extract the hue and chroma. - */ - @NonNull - public static DynamicColor fromArgb(@NonNull String name, int argb) { - Hct hct = Hct.fromInt(argb); - TonalPalette palette = TonalPalette.fromInt(argb); - return DynamicColor.fromPalette(name, (s) -> palette, (s) -> hct.getTone()); - } - - /** - * Returns an ARGB integer (i.e. a hex code). - * - * @param scheme Defines the conditions of the user interface, for example, whether or not it is - * dark mode or light mode, and what the desired contrast level is. - */ - public int getArgb(@NonNull DynamicScheme scheme) { - int argb = getHct(scheme).toInt(); - if (opacity == null || opacity.apply(scheme) == null) { - return argb; - } - double percentage = opacity.apply(scheme); - int alpha = MathUtils.clampInt(0, 255, (int) Math.round(percentage * 255)); - return (argb & 0x00ffffff) | (alpha << 24); - } - - /** - * Returns an HCT object. - * - * @param scheme Defines the conditions of the user interface, for example, whether or not it is - * dark mode or light mode, and what the desired contrast level is. - */ - @NonNull - public Hct getHct(@NonNull DynamicScheme scheme) { - Hct cachedAnswer = hctCache.get(scheme); - if (cachedAnswer != null) { - return cachedAnswer; - } - - Hct answer = ColorSpecs.get(scheme.specVersion).getHct(scheme, this); - // NOMUTANTS--trivial test with onerous dependency injection requirement. - if (hctCache.size() > 4) { - hctCache.clear(); - } - // NOMUTANTS--trivial test with onerous dependency injection requirement. - hctCache.put(scheme, answer); - return answer; - } - - /** Returns the tone in HCT, ranging from 0 to 100, of the resolved color given scheme. */ - public double getTone(@NonNull DynamicScheme scheme) { - return ColorSpecs.get(scheme.specVersion).getTone(scheme, this); - } - - /** - * Given a background tone, find a foreground tone, while ensuring they reach a contrast ratio - * that is as close to ratio as possible. - */ - public static double foregroundTone(double bgTone, double ratio) { - double lighterTone = Contrast.lighterUnsafe(bgTone, ratio); - double darkerTone = Contrast.darkerUnsafe(bgTone, ratio); - double lighterRatio = Contrast.ratioOfTones(lighterTone, bgTone); - double darkerRatio = Contrast.ratioOfTones(darkerTone, bgTone); - boolean preferLighter = tonePrefersLightForeground(bgTone); - - if (preferLighter) { - // "Neglible difference" handles an edge case where the initial contrast ratio is high - // (ex. 13.0), and the ratio passed to the function is that high ratio, and both the lighter - // and darker ratio fails to pass that ratio. - // - // This was observed with Tonal Spot's On Primary Container turning black momentarily between - // high and max contrast in light mode. PC's standard tone was T90, OPC's was T10, it was - // light mode, and the contrast level was 0.6568521221032331. - boolean negligibleDifference = - Math.abs(lighterRatio - darkerRatio) < 0.1 && lighterRatio < ratio && darkerRatio < ratio; - if (lighterRatio >= ratio || lighterRatio >= darkerRatio || negligibleDifference) { - return lighterTone; - } else { - return darkerTone; - } - } else { - return darkerRatio >= ratio || darkerRatio >= lighterRatio ? darkerTone : lighterTone; - } - } - - /** - * Adjust a tone down such that white has 4.5 contrast, if the tone is reasonably close to - * supporting it. - */ - public static double enableLightForeground(double tone) { - if (tonePrefersLightForeground(tone) && !toneAllowsLightForeground(tone)) { - return 49.0; - } - return tone; - } - - /** - * People prefer white foregrounds on ~T60-70. Observed over time, and also by Andrew Somers - * during research for APCA. - * - *

T60 used as to create the smallest discontinuity possible when skipping down to T49 in order - * to ensure light foregrounds. - * - *

Since `tertiaryContainer` in dark monochrome scheme requires a tone of 60, it should not be - * adjusted. Therefore, 60 is excluded here. - */ - public static boolean tonePrefersLightForeground(double tone) { - return Math.round(tone) < 60; - } - - /** Tones less than ~T50 always permit white at 4.5 contrast. */ - public static boolean toneAllowsLightForeground(double tone) { - return Math.round(tone) <= 49; - } - - public static Function getInitialToneFromBackground( - @Nullable Function background) { - if (background == null) { - return (s) -> 50.0; - } - return (s) -> background.apply(s) != null ? background.apply(s).getTone(s) : 50.0; - } - - public Builder toBuilder() { - return new Builder() - .setName(this.name) - .setPalette(this.palette) - .setTone(this.tone) - .setIsBackground(this.isBackground) - .setChromaMultiplier(this.chromaMultiplier) - .setBackground(this.background) - .setSecondBackground(this.secondBackground) - .setContrastCurve(this.contrastCurve) - .setToneDeltaPair(this.toneDeltaPair) - .setOpacity(this.opacity); - } - - /** Builder for {@link DynamicColor}. */ - public static class Builder { - private String name; - private Function palette; - private Function tone; - private boolean isBackground; - private Function chromaMultiplier; - private Function background; - private Function secondBackground; - private Function contrastCurve; - private Function toneDeltaPair; - private Function opacity; - - @CanIgnoreReturnValue - public Builder setName(@NonNull String name) { - this.name = name; - return this; - } - - @CanIgnoreReturnValue - public Builder setPalette(@NonNull Function palette) { - this.palette = palette; - return this; - } - - @CanIgnoreReturnValue - public Builder setTone(@NonNull Function tone) { - this.tone = tone; - return this; - } - - @CanIgnoreReturnValue - public Builder setIsBackground(boolean isBackground) { - this.isBackground = isBackground; - return this; - } - - @CanIgnoreReturnValue - public Builder setChromaMultiplier(@NonNull Function chromaMultiplier) { - this.chromaMultiplier = chromaMultiplier; - return this; - } - - @CanIgnoreReturnValue - public Builder setBackground(@NonNull Function background) { - this.background = background; - return this; - } - - @CanIgnoreReturnValue - public Builder setSecondBackground( - @NonNull Function secondBackground) { - this.secondBackground = secondBackground; - return this; - } - - @CanIgnoreReturnValue - public Builder setContrastCurve(@NonNull Function contrastCurve) { - this.contrastCurve = contrastCurve; - return this; - } - - @CanIgnoreReturnValue - public Builder setToneDeltaPair(@NonNull Function toneDeltaPair) { - this.toneDeltaPair = toneDeltaPair; - return this; - } - - @CanIgnoreReturnValue - public Builder setOpacity(@NonNull Function opacity) { - this.opacity = opacity; - return this; - } - - @CanIgnoreReturnValue - Builder extendSpecVersion(SpecVersion specVersion, DynamicColor extendedColor) { - validateExtendedColor(specVersion, extendedColor); - - return new Builder() - .setName(this.name) - .setIsBackground(this.isBackground) - .setPalette( - (s) -> { - Function palette = - s.specVersion == specVersion ? extendedColor.palette : this.palette; - return palette != null ? palette.apply(s) : null; - }) - .setTone( - (s) -> { - Function tone = - s.specVersion == specVersion ? extendedColor.tone : this.tone; - return tone != null ? tone.apply(s) : null; - }) - .setChromaMultiplier( - (s) -> { - Function chromaMultiplier = - s.specVersion == specVersion - ? extendedColor.chromaMultiplier - : this.chromaMultiplier; - return chromaMultiplier != null ? chromaMultiplier.apply(s) : 1.0; - }) - .setBackground( - (s) -> { - Function background = - s.specVersion == specVersion ? extendedColor.background : this.background; - return background != null ? background.apply(s) : null; - }) - .setSecondBackground( - (s) -> { - Function secondBackground = - s.specVersion == specVersion - ? extendedColor.secondBackground - : this.secondBackground; - return secondBackground != null ? secondBackground.apply(s) : null; - }) - .setContrastCurve( - (s) -> { - Function contrastCurve = - s.specVersion == specVersion ? extendedColor.contrastCurve : this.contrastCurve; - return contrastCurve != null ? contrastCurve.apply(s) : null; - }) - .setToneDeltaPair( - (s) -> { - Function toneDeltaPair = - s.specVersion == specVersion ? extendedColor.toneDeltaPair : this.toneDeltaPair; - return toneDeltaPair != null ? toneDeltaPair.apply(s) : null; - }) - .setOpacity( - (s) -> { - Function opacity = - s.specVersion == specVersion ? extendedColor.opacity : this.opacity; - return opacity != null ? opacity.apply(s) : null; - }); - } - - public DynamicColor build() { - if (this.background == null && this.secondBackground != null) { - throw new IllegalArgumentException( - "Color " + name + " has secondBackground defined, but background is not defined."); - } - if (this.background == null && this.contrastCurve != null) { - throw new IllegalArgumentException( - "Color " + name + " has contrastCurve defined, but background is not defined."); - } - if (this.background != null && this.contrastCurve == null) { - throw new IllegalArgumentException( - "Color " + name + " has background defined, but contrastCurve is not defined."); - } - return new DynamicColor( - this.name, - this.palette, - this.tone == null ? getInitialToneFromBackground(this.background) : this.tone, - this.isBackground, - this.chromaMultiplier, - this.background, - this.secondBackground, - this.contrastCurve, - this.toneDeltaPair, - this.opacity); - } - - private void validateExtendedColor(SpecVersion specVersion, DynamicColor extendedColor) { - if (!this.name.equals(extendedColor.name)) { - throw new IllegalArgumentException( - "Attempting to extend color " - + this.name - + " with color " - + extendedColor.name - + " of different name for spec version " - + specVersion - + "."); - } - if (this.isBackground != extendedColor.isBackground) { - throw new IllegalArgumentException( - "Attempting to extend color " - + this.name - + " as a " - + (this.isBackground ? "background" : "foreground") - + " with color " - + extendedColor.name - + " as a " - + (extendedColor.isBackground ? "background" : "foreground") - + " for spec version " - + specVersion - + "."); - } - } - } -} diff --git a/java/dynamiccolor/DynamicScheme.java b/java/dynamiccolor/DynamicScheme.java deleted file mode 100644 index db43e126..00000000 --- a/java/dynamiccolor/DynamicScheme.java +++ /dev/null @@ -1,515 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dynamiccolor; - -import static java.lang.Math.min; - -import dynamiccolor.ColorSpec.SpecVersion; -import hct.Hct; -import palettes.TonalPalette; -import utils.MathUtils; -import java.text.DecimalFormat; -import java.util.Locale; -import java.util.Optional; - -/** - * Provides important settings for creating colors dynamically, and 6 color palettes. Requires: 1. A - * color. (source color) 2. A theme. (Variant) 3. Whether or not its dark mode. 4. Contrast level. - * (-1 to 1, currently contrast ratio 3.0 and 7.0) - */ -public class DynamicScheme { - - public static final SpecVersion DEFAULT_SPEC_VERSION = SpecVersion.SPEC_2021; - public static final Platform DEFAULT_PLATFORM = Platform.PHONE; - - /** The platform on which this scheme is intended to be used. */ - public enum Platform { - PHONE, - WATCH - } - - /** The source color of the scheme in ARGB format. */ - public final int sourceColorArgb; - - /** The source color of the scheme in HCT format. */ - public final Hct sourceColorHct; - - /** The variant of the scheme. */ - public final Variant variant; - - /** Whether or not the scheme is dark mode. */ - public final boolean isDark; - - /** The platform on which this scheme is intended to be used. */ - public final Platform platform; - - /** - * Value from -1 to 1. -1 represents minimum contrast. 0 represents standard (i.e. the design as - * spec'd), and 1 represents maximum contrast. - */ - public final double contrastLevel; - - /** The spec version of the scheme. */ - public final SpecVersion specVersion; - - public final TonalPalette primaryPalette; - public final TonalPalette secondaryPalette; - public final TonalPalette tertiaryPalette; - public final TonalPalette neutralPalette; - public final TonalPalette neutralVariantPalette; - public final TonalPalette errorPalette; - - public DynamicScheme( - Hct sourceColorHct, - Variant variant, - boolean isDark, - double contrastLevel, - TonalPalette primaryPalette, - TonalPalette secondaryPalette, - TonalPalette tertiaryPalette, - TonalPalette neutralPalette, - TonalPalette neutralVariantPalette) { - this( - sourceColorHct, - variant, - isDark, - contrastLevel, - primaryPalette, - secondaryPalette, - tertiaryPalette, - neutralPalette, - neutralVariantPalette, - Optional.empty()); - } - - public DynamicScheme( - Hct sourceColorHct, - Variant variant, - boolean isDark, - double contrastLevel, - TonalPalette primaryPalette, - TonalPalette secondaryPalette, - TonalPalette tertiaryPalette, - TonalPalette neutralPalette, - TonalPalette neutralVariantPalette, - Optional errorPalette) { - this( - sourceColorHct, - variant, - isDark, - contrastLevel, - Platform.PHONE, - SpecVersion.SPEC_2021, - primaryPalette, - secondaryPalette, - tertiaryPalette, - neutralPalette, - neutralVariantPalette, - errorPalette); - } - - public DynamicScheme( - Hct sourceColorHct, - Variant variant, - boolean isDark, - double contrastLevel, - Platform platform, - SpecVersion specVersion, - TonalPalette primaryPalette, - TonalPalette secondaryPalette, - TonalPalette tertiaryPalette, - TonalPalette neutralPalette, - TonalPalette neutralVariantPalette, - Optional errorPalette) { - this.sourceColorArgb = sourceColorHct.toInt(); - this.sourceColorHct = sourceColorHct; - this.variant = variant; - this.isDark = isDark; - this.contrastLevel = contrastLevel; - this.platform = platform; - this.specVersion = specVersion; - - this.primaryPalette = primaryPalette; - this.secondaryPalette = secondaryPalette; - this.tertiaryPalette = tertiaryPalette; - this.neutralPalette = neutralPalette; - this.neutralVariantPalette = neutralVariantPalette; - this.errorPalette = errorPalette.orElse(TonalPalette.fromHueAndChroma(25.0, 84.0)); - } - - public static DynamicScheme from(DynamicScheme other, boolean isDark) { - return from(other, isDark, other.contrastLevel); - } - - public static DynamicScheme from(DynamicScheme other, boolean isDark, double contrastLevel) { - return new DynamicScheme( - other.sourceColorHct, - other.variant, - isDark, - contrastLevel, - other.platform, - other.specVersion, - other.primaryPalette, - other.secondaryPalette, - other.tertiaryPalette, - other.neutralPalette, - other.neutralVariantPalette, - Optional.of(other.errorPalette)); - } - - /** - * Returns a new hue based on a piecewise function and input color hue. - * - *

For example, for the following function: - * - * 

-   * result = 26, if 0 <= hue < 101;
-   * result = 39, if 101 <= hue < 210;
-   * result = 28, if 210 <= hue < 360.
-   *
- * - *

call the function as: - * - * 

-   * double[] hueBreakpoints = {0, 101, 210, 360};
-   * double[] hues = {26, 39, 28};
-   * double result = scheme.piecewise(sourceColor, hueBreakpoints, hues);
-   *
- * - * @param sourceColorHct The input value. - * @param hueBreakpoints The breakpoints, in sorted order. No default lower or upper bounds are - * assumed. - * @param hues The hues that should be applied when source color's hue is >= the same index in - * hueBreakpoints array, and < the hue at the next index in hueBreakpoints array. Otherwise, - * the source color's hue is returned. - */ - public static double getPiecewiseValue( - Hct sourceColorHct, double[] hueBreakpoints, double[] hues) { - int size = min(hueBreakpoints.length - 1, hues.length); - double sourceHue = sourceColorHct.getHue(); - for (int i = 0; i < size; i++) { - if (sourceHue >= hueBreakpoints[i] && sourceHue < hueBreakpoints[i + 1]) { - return MathUtils.sanitizeDegreesDouble(hues[i]); - } - } - // No condition matched, return the source value. - return sourceHue; - } - - /** - * Returns a shifted hue based on a piecewise function and input color hue. - * - *

For example, for the following function: - * - * 

-   * result = hue + 26, if 0 <= hue < 101;
-   * result = hue - 39, if 101 <= hue < 210;
-   * result = hue + 28, if 210 <= hue < 360.
-   *
- * - *

call the function as: - * - * 

-   * double[] hueBreakpoints = {0, 101, 210, 360};
-   * double[] rotations = {26, -39, 28};
-   * double result = scheme.getRotatedHue(sourceColor, hueBreakpoints, rotations);
-   *
-   * @param sourceColorHct the source color of the theme, in HCT.
-   * @param hueBreakpoints The "breakpoints", i.e. the hues at which a rotation should be apply. No
-   * default lower or upper bounds are assumed.
-   * @param rotations The rotation that should be applied when source color's hue is >= the same
-   *     index in hues array, and < the hue at the next index in hues array. Otherwise, the source
-   *     color's hue is returned.
-   */
-  public static double getRotatedHue(
-      Hct sourceColorHct, double[] hueBreakpoints, double[] rotations) {
-    double rotation = getPiecewiseValue(sourceColorHct, hueBreakpoints, rotations);
-    if (min(hueBreakpoints.length - 1, rotations.length) <= 0) {
-      // No condition matched, return the source hue.
-      rotation = 0;
-    }
-    return MathUtils.sanitizeDegreesDouble(sourceColorHct.getHue() + rotation);
-  }
-
-  public Hct getHct(DynamicColor dynamicColor) {
-    return dynamicColor.getHct(this);
-  }
-
-  public int getArgb(DynamicColor dynamicColor) {
-    return dynamicColor.getArgb(this);
-  }
-
-  @Override
-  public String toString() {
-    return String.format(
-        "Scheme: variant=%s, mode=%s, platform=%s, contrastLevel=%s, seed=%s, specVersion=%s",
-        variant.name(),
-        isDark ? "dark" : "light",
-        platform.name().toLowerCase(Locale.ENGLISH),
-        new DecimalFormat("0.0").format(contrastLevel),
-        sourceColorHct,
-        specVersion);
-  }
-
-  public int getPrimaryPaletteKeyColor() {
-    return getArgb(new MaterialDynamicColors().primaryPaletteKeyColor());
-  }
-
-  public int getSecondaryPaletteKeyColor() {
-    return getArgb(new MaterialDynamicColors().secondaryPaletteKeyColor());
-  }
-
-  public int getTertiaryPaletteKeyColor() {
-    return getArgb(new MaterialDynamicColors().tertiaryPaletteKeyColor());
-  }
-
-  public int getNeutralPaletteKeyColor() {
-    return getArgb(new MaterialDynamicColors().neutralPaletteKeyColor());
-  }
-
-  public int getNeutralVariantPaletteKeyColor() {
-    return getArgb(new MaterialDynamicColors().neutralVariantPaletteKeyColor());
-  }
-
-  public int getBackground() {
-    return getArgb(new MaterialDynamicColors().background());
-  }
-
-  public int getOnBackground() {
-    return getArgb(new MaterialDynamicColors().onBackground());
-  }
-
-  public int getSurface() {
-    return getArgb(new MaterialDynamicColors().surface());
-  }
-
-  public int getSurfaceDim() {
-    return getArgb(new MaterialDynamicColors().surfaceDim());
-  }
-
-  public int getSurfaceBright() {
-    return getArgb(new MaterialDynamicColors().surfaceBright());
-  }
-
-  public int getSurfaceContainerLowest() {
-    return getArgb(new MaterialDynamicColors().surfaceContainerLowest());
-  }
-
-  public int getSurfaceContainerLow() {
-    return getArgb(new MaterialDynamicColors().surfaceContainerLow());
-  }
-
-  public int getSurfaceContainer() {
-    return getArgb(new MaterialDynamicColors().surfaceContainer());
-  }
-
-  public int getSurfaceContainerHigh() {
-    return getArgb(new MaterialDynamicColors().surfaceContainerHigh());
-  }
-
-  public int getSurfaceContainerHighest() {
-    return getArgb(new MaterialDynamicColors().surfaceContainerHighest());
-  }
-
-  public int getOnSurface() {
-    return getArgb(new MaterialDynamicColors().onSurface());
-  }
-
-  public int getSurfaceVariant() {
-    return getArgb(new MaterialDynamicColors().surfaceVariant());
-  }
-
-  public int getOnSurfaceVariant() {
-    return getArgb(new MaterialDynamicColors().onSurfaceVariant());
-  }
-
-  public int getInverseSurface() {
-    return getArgb(new MaterialDynamicColors().inverseSurface());
-  }
-
-  public int getInverseOnSurface() {
-    return getArgb(new MaterialDynamicColors().inverseOnSurface());
-  }
-
-  public int getOutline() {
-    return getArgb(new MaterialDynamicColors().outline());
-  }
-
-  public int getOutlineVariant() {
-    return getArgb(new MaterialDynamicColors().outlineVariant());
-  }
-
-  public int getShadow() {
-    return getArgb(new MaterialDynamicColors().shadow());
-  }
-
-  public int getScrim() {
-    return getArgb(new MaterialDynamicColors().scrim());
-  }
-
-  public int getSurfaceTint() {
-    return getArgb(new MaterialDynamicColors().surfaceTint());
-  }
-
-  public int getPrimary() {
-    return getArgb(new MaterialDynamicColors().primary());
-  }
-
-  public int getOnPrimary() {
-    return getArgb(new MaterialDynamicColors().onPrimary());
-  }
-
-  public int getPrimaryContainer() {
-    return getArgb(new MaterialDynamicColors().primaryContainer());
-  }
-
-  public int getOnPrimaryContainer() {
-    return getArgb(new MaterialDynamicColors().onPrimaryContainer());
-  }
-
-  public int getInversePrimary() {
-    return getArgb(new MaterialDynamicColors().inversePrimary());
-  }
-
-  public int getSecondary() {
-    return getArgb(new MaterialDynamicColors().secondary());
-  }
-
-  public int getOnSecondary() {
-    return getArgb(new MaterialDynamicColors().onSecondary());
-  }
-
-  public int getSecondaryContainer() {
-    return getArgb(new MaterialDynamicColors().secondaryContainer());
-  }
-
-  public int getOnSecondaryContainer() {
-    return getArgb(new MaterialDynamicColors().onSecondaryContainer());
-  }
-
-  public int getTertiary() {
-    return getArgb(new MaterialDynamicColors().tertiary());
-  }
-
-  public int getOnTertiary() {
-    return getArgb(new MaterialDynamicColors().onTertiary());
-  }
-
-  public int getTertiaryContainer() {
-    return getArgb(new MaterialDynamicColors().tertiaryContainer());
-  }
-
-  public int getOnTertiaryContainer() {
-    return getArgb(new MaterialDynamicColors().onTertiaryContainer());
-  }
-
-  public int getError() {
-    return getArgb(new MaterialDynamicColors().error());
-  }
-
-  public int getOnError() {
-    return getArgb(new MaterialDynamicColors().onError());
-  }
-
-  public int getErrorContainer() {
-    return getArgb(new MaterialDynamicColors().errorContainer());
-  }
-
-  public int getOnErrorContainer() {
-    return getArgb(new MaterialDynamicColors().onErrorContainer());
-  }
-
-  public int getPrimaryFixed() {
-    return getArgb(new MaterialDynamicColors().primaryFixed());
-  }
-
-  public int getPrimaryFixedDim() {
-    return getArgb(new MaterialDynamicColors().primaryFixedDim());
-  }
-
-  public int getOnPrimaryFixed() {
-    return getArgb(new MaterialDynamicColors().onPrimaryFixed());
-  }
-
-  public int getOnPrimaryFixedVariant() {
-    return getArgb(new MaterialDynamicColors().onPrimaryFixedVariant());
-  }
-
-  public int getSecondaryFixed() {
-    return getArgb(new MaterialDynamicColors().secondaryFixed());
-  }
-
-  public int getSecondaryFixedDim() {
-    return getArgb(new MaterialDynamicColors().secondaryFixedDim());
-  }
-
-  public int getOnSecondaryFixed() {
-    return getArgb(new MaterialDynamicColors().onSecondaryFixed());
-  }
-
-  public int getOnSecondaryFixedVariant() {
-    return getArgb(new MaterialDynamicColors().onSecondaryFixedVariant());
-  }
-
-  public int getTertiaryFixed() {
-    return getArgb(new MaterialDynamicColors().tertiaryFixed());
-  }
-
-  public int getTertiaryFixedDim() {
-    return getArgb(new MaterialDynamicColors().tertiaryFixedDim());
-  }
-
-  public int getOnTertiaryFixed() {
-    return getArgb(new MaterialDynamicColors().onTertiaryFixed());
-  }
-
-  public int getOnTertiaryFixedVariant() {
-    return getArgb(new MaterialDynamicColors().onTertiaryFixedVariant());
-  }
-
-  public int getControlActivated() {
-    return getArgb(new MaterialDynamicColors().controlActivated());
-  }
-
-  public int getControlNormal() {
-    return getArgb(new MaterialDynamicColors().controlNormal());
-  }
-
-  public int getControlHighlight() {
-    return getArgb(new MaterialDynamicColors().controlHighlight());
-  }
-
-  public int getTextPrimaryInverse() {
-    return getArgb(new MaterialDynamicColors().textPrimaryInverse());
-  }
-
-  public int getTextSecondaryAndTertiaryInverse() {
-    return getArgb(new MaterialDynamicColors().textSecondaryAndTertiaryInverse());
-  }
-
-  public int getTextPrimaryInverseDisableOnly() {
-    return getArgb(new MaterialDynamicColors().textPrimaryInverseDisableOnly());
-  }
-
-  public int getTextSecondaryAndTertiaryInverseDisabled() {
-    return getArgb(new MaterialDynamicColors().textSecondaryAndTertiaryInverseDisabled());
-  }
-
-  public int getTextHintInverse() {
-    return getArgb(new MaterialDynamicColors().textHintInverse());
-  }
-}
diff --git a/java/dynamiccolor/MaterialDynamicColors.java b/java/dynamiccolor/MaterialDynamicColors.java
deleted file mode 100644
index 934734eb..00000000
--- a/java/dynamiccolor/MaterialDynamicColors.java
+++ /dev/null
@@ -1,523 +0,0 @@
-/*
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dynamiccolor;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-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).
-// "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();
-
-  @NonNull
-  public DynamicColor highestSurface(@NonNull DynamicScheme s) {
-    return colorSpec.highestSurface(s);
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Main Palettes                                              //
-  ////////////////////////////////////////////////////////////////
-
-  @NonNull
-  public DynamicColor primaryPaletteKeyColor() {
-    return colorSpec.primaryPaletteKeyColor();
-  }
-
-  @NonNull
-  public DynamicColor secondaryPaletteKeyColor() {
-    return colorSpec.secondaryPaletteKeyColor();
-  }
-
-  @NonNull
-  public DynamicColor tertiaryPaletteKeyColor() {
-    return colorSpec.tertiaryPaletteKeyColor();
-  }
-
-  @NonNull
-  public DynamicColor neutralPaletteKeyColor() {
-    return colorSpec.neutralPaletteKeyColor();
-  }
-
-  @NonNull
-  public DynamicColor neutralVariantPaletteKeyColor() {
-    return colorSpec.neutralVariantPaletteKeyColor();
-  }
-
-  @NonNull
-  public DynamicColor errorPaletteKeyColor() {
-    return colorSpec.errorPaletteKeyColor();
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Surfaces [S]                                               //
-  ////////////////////////////////////////////////////////////////
-
-  @NonNull
-  public DynamicColor background() {
-    return colorSpec.background();
-  }
-
-  @NonNull
-  public DynamicColor onBackground() {
-    return colorSpec.onBackground();
-  }
-
-  @NonNull
-  public DynamicColor surface() {
-    return colorSpec.surface();
-  }
-
-  @NonNull
-  public DynamicColor surfaceDim() {
-    return colorSpec.surfaceDim();
-  }
-
-  @NonNull
-  public DynamicColor surfaceBright() {
-    return colorSpec.surfaceBright();
-  }
-
-  @NonNull
-  public DynamicColor surfaceContainerLowest() {
-    return colorSpec.surfaceContainerLowest();
-  }
-
-  @NonNull
-  public DynamicColor surfaceContainerLow() {
-    return colorSpec.surfaceContainerLow();
-  }
-
-  @NonNull
-  public DynamicColor surfaceContainer() {
-    return colorSpec.surfaceContainer();
-  }
-
-  @NonNull
-  public DynamicColor surfaceContainerHigh() {
-    return colorSpec.surfaceContainerHigh();
-  }
-
-  @NonNull
-  public DynamicColor surfaceContainerHighest() {
-    return colorSpec.surfaceContainerHighest();
-  }
-
-  @NonNull
-  public DynamicColor onSurface() {
-    return colorSpec.onSurface();
-  }
-
-  @NonNull
-  public DynamicColor surfaceVariant() {
-    return colorSpec.surfaceVariant();
-  }
-
-  @NonNull
-  public DynamicColor onSurfaceVariant() {
-    return colorSpec.onSurfaceVariant();
-  }
-
-  @NonNull
-  public DynamicColor inverseSurface() {
-    return colorSpec.inverseSurface();
-  }
-
-  @NonNull
-  public DynamicColor inverseOnSurface() {
-    return colorSpec.inverseOnSurface();
-  }
-
-  @NonNull
-  public DynamicColor outline() {
-    return colorSpec.outline();
-  }
-
-  @NonNull
-  public DynamicColor outlineVariant() {
-    return colorSpec.outlineVariant();
-  }
-
-  @NonNull
-  public DynamicColor shadow() {
-    return colorSpec.shadow();
-  }
-
-  @NonNull
-  public DynamicColor scrim() {
-    return colorSpec.scrim();
-  }
-
-  @NonNull
-  public DynamicColor surfaceTint() {
-    return colorSpec.surfaceTint();
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Primaries [P]                                              //
-  ////////////////////////////////////////////////////////////////
-
-  @NonNull
-  public DynamicColor primary() {
-    return colorSpec.primary();
-  }
-
-  @Nullable
-  public DynamicColor primaryDim() {
-    return colorSpec.primaryDim();
-  }
-
-  @NonNull
-  public DynamicColor onPrimary() {
-    return colorSpec.onPrimary();
-  }
-
-  @NonNull
-  public DynamicColor primaryContainer() {
-    return colorSpec.primaryContainer();
-  }
-
-  @NonNull
-  public DynamicColor onPrimaryContainer() {
-    return colorSpec.onPrimaryContainer();
-  }
-
-  @NonNull
-  public DynamicColor inversePrimary() {
-    return colorSpec.inversePrimary();
-  }
-
-  /////////////////////////////////////////////////////////////////
-  // Primary Fixed Colors [PF]                                   //
-  /////////////////////////////////////////////////////////////////
-
-  @NonNull
-  public DynamicColor primaryFixed() {
-    return colorSpec.primaryFixed();
-  }
-
-  @NonNull
-  public DynamicColor primaryFixedDim() {
-    return colorSpec.primaryFixedDim();
-  }
-
-  @NonNull
-  public DynamicColor onPrimaryFixed() {
-    return colorSpec.onPrimaryFixed();
-  }
-
-  @NonNull
-  public DynamicColor onPrimaryFixedVariant() {
-    return colorSpec.onPrimaryFixedVariant();
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Secondaries [Q]                                            //
-  ////////////////////////////////////////////////////////////////
-
-  @NonNull
-  public DynamicColor secondary() {
-    return colorSpec.secondary();
-  }
-
-  @Nullable
-  public DynamicColor secondaryDim() {
-    return colorSpec.secondaryDim();
-  }
-
-  @NonNull
-  public DynamicColor onSecondary() {
-    return colorSpec.onSecondary();
-  }
-
-  @NonNull
-  public DynamicColor secondaryContainer() {
-    return colorSpec.secondaryContainer();
-  }
-
-  @NonNull
-  public DynamicColor onSecondaryContainer() {
-    return colorSpec.onSecondaryContainer();
-  }
-
-  /////////////////////////////////////////////////////////////////
-  // Secondary Fixed Colors [QF]                                 //
-  /////////////////////////////////////////////////////////////////
-
-  @NonNull
-  public DynamicColor secondaryFixed() {
-    return colorSpec.secondaryFixed();
-  }
-
-  @NonNull
-  public DynamicColor secondaryFixedDim() {
-    return colorSpec.secondaryFixedDim();
-  }
-
-  @NonNull
-  public DynamicColor onSecondaryFixed() {
-    return colorSpec.onSecondaryFixed();
-  }
-
-  @NonNull
-  public DynamicColor onSecondaryFixedVariant() {
-    return colorSpec.onSecondaryFixedVariant();
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Tertiaries [T]                                             //
-  ////////////////////////////////////////////////////////////////
-
-  @NonNull
-  public DynamicColor tertiary() {
-    return colorSpec.tertiary();
-  }
-
-  @Nullable
-  public DynamicColor tertiaryDim() {
-    return colorSpec.tertiaryDim();
-  }
-
-  @NonNull
-  public DynamicColor onTertiary() {
-    return colorSpec.onTertiary();
-  }
-
-  @NonNull
-  public DynamicColor tertiaryContainer() {
-    return colorSpec.tertiaryContainer();
-  }
-
-  @NonNull
-  public DynamicColor onTertiaryContainer() {
-    return colorSpec.onTertiaryContainer();
-  }
-
-  /////////////////////////////////////////////////////////////////
-  // Tertiary Fixed Colors [TF]                                  //
-  /////////////////////////////////////////////////////////////////
-
-  @NonNull
-  public DynamicColor tertiaryFixed() {
-    return colorSpec.tertiaryFixed();
-  }
-
-  @NonNull
-  public DynamicColor tertiaryFixedDim() {
-    return colorSpec.tertiaryFixedDim();
-  }
-
-  @NonNull
-  public DynamicColor onTertiaryFixed() {
-    return colorSpec.onTertiaryFixed();
-  }
-
-  @NonNull
-  public DynamicColor onTertiaryFixedVariant() {
-    return colorSpec.onTertiaryFixedVariant();
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Errors [E]                                                 //
-  ////////////////////////////////////////////////////////////////
-
-  @NonNull
-  public DynamicColor error() {
-    return colorSpec.error();
-  }
-
-  @Nullable
-  public DynamicColor errorDim() {
-    return colorSpec.errorDim();
-  }
-
-  @NonNull
-  public DynamicColor onError() {
-    return colorSpec.onError();
-  }
-
-  @NonNull
-  public DynamicColor errorContainer() {
-    return colorSpec.errorContainer();
-  }
-
-  @NonNull
-  public DynamicColor onErrorContainer() {
-    return colorSpec.onErrorContainer();
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Android-only colors                                        //
-  ////////////////////////////////////////////////////////////////
-
-  /**
-   * These colors were present in Android framework before Android U, and used by MDC controls. They
-   * should be avoided, if possible. It's unclear if they're used on multiple backgrounds, and if
-   * they are, they can't be adjusted for contrast.* For now, they will be set with no background,
-   * and those won't adjust for contrast, avoiding issues.
-   *
-   * 
* For example, if the same color is on a white background _and_ black background, there's no
-   * way to increase contrast with either without losing contrast with the other.
-   */
-
-  // colorControlActivated documented as colorAccent in M3 & GM3.
-  // colorAccent documented as colorSecondary in M3 and colorPrimary in GM3.
-  // Android used Material's Container as Primary/Secondary/Tertiary at launch.
-  // Therefore, this is a duplicated version of Primary Container.
-  @NonNull
-  public DynamicColor controlActivated() {
-    return colorSpec.controlActivated();
-  }
-
-  // colorControlNormal documented as textColorSecondary in M3 & GM3.
-  // In Material, textColorSecondary points to onSurfaceVariant in the non-disabled state,
-  // which is Neutral Variant T30/80 in light/dark.
-  @NonNull
-  public DynamicColor controlNormal() {
-    return colorSpec.controlNormal();
-  }
-
-  // colorControlHighlight documented, in both M3 & GM3:
-  // Light mode: #1f000000 dark mode: #33ffffff.
-  // These are black and white with some alpha.
-  // 1F hex = 31 decimal; 31 / 255 = 12% alpha.
-  // 33 hex = 51 decimal; 51 / 255 = 20% alpha.
-  // DynamicColors do not support alpha currently, and _may_ not need it for this use case,
-  // depending on how MDC resolved alpha for the other cases.
-  // Returning black in dark mode, white in light mode.
-  @NonNull
-  public DynamicColor controlHighlight() {
-    return colorSpec.controlHighlight();
-  }
-
-  // textColorPrimaryInverse documented, in both M3 & GM3, documented as N10/N90.
-  @NonNull
-  public DynamicColor textPrimaryInverse() {
-    return colorSpec.textPrimaryInverse();
-  }
-
-  // textColorSecondaryInverse and textColorTertiaryInverse both documented, in both M3 & GM3, as
-  // NV30/NV80
-  @NonNull
-  public DynamicColor textSecondaryAndTertiaryInverse() {
-    return colorSpec.textSecondaryAndTertiaryInverse();
-  }
-
-  // textColorPrimaryInverseDisableOnly documented, in both M3 & GM3, as N10/N90
-  @NonNull
-  public DynamicColor textPrimaryInverseDisableOnly() {
-    return colorSpec.textPrimaryInverseDisableOnly();
-  }
-
-  // textColorSecondaryInverse and textColorTertiaryInverse in disabled state both documented,
-  // in both M3 & GM3, as N10/N90
-  @NonNull
-  public DynamicColor textSecondaryAndTertiaryInverseDisabled() {
-    return colorSpec.textSecondaryAndTertiaryInverseDisabled();
-  }
-
-  // textColorHintInverse documented, in both M3 & GM3, as N10/N90
-  @NonNull
-  public DynamicColor textHintInverse() {
-    return colorSpec.textHintInverse();
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // All Colors                                                 //
-  ////////////////////////////////////////////////////////////////
-
-  /** All dynamic colors in Material Design system. */
-  public final List> allDynamicColors() {
-    return Arrays.asList(
-        this::primaryPaletteKeyColor,
-        this::secondaryPaletteKeyColor,
-        this::tertiaryPaletteKeyColor,
-        this::neutralPaletteKeyColor,
-        this::neutralVariantPaletteKeyColor,
-        this::errorPaletteKeyColor,
-        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::outline,
-        this::outlineVariant,
-        this::inverseSurface,
-        this::inverseOnSurface,
-        this::shadow,
-        this::scrim,
-        this::surfaceTint,
-        this::primary,
-        this::primaryDim,
-        this::onPrimary,
-        this::primaryContainer,
-        this::onPrimaryContainer,
-        this::primaryFixed,
-        this::primaryFixedDim,
-        this::onPrimaryFixed,
-        this::onPrimaryFixedVariant,
-        this::inversePrimary,
-        this::secondary,
-        this::secondaryDim,
-        this::onSecondary,
-        this::secondaryContainer,
-        this::onSecondaryContainer,
-        this::secondaryFixed,
-        this::secondaryFixedDim,
-        this::onSecondaryFixed,
-        this::onSecondaryFixedVariant,
-        this::tertiary,
-        this::tertiaryDim,
-        this::onTertiary,
-        this::tertiaryContainer,
-        this::onTertiaryContainer,
-        this::tertiaryFixed,
-        this::tertiaryFixedDim,
-        this::onTertiaryFixed,
-        this::onTertiaryFixedVariant,
-        this::error,
-        this::errorDim,
-        this::onError,
-        this::errorContainer,
-        this::onErrorContainer,
-        this::controlActivated,
-        this::controlNormal,
-        this::controlHighlight,
-        this::textPrimaryInverse,
-        this::textSecondaryAndTertiaryInverse,
-        this::textPrimaryInverseDisableOnly,
-        this::textSecondaryAndTertiaryInverseDisabled,
-        this::textHintInverse);
-  }
-}
diff --git a/java/dynamiccolor/ToneDeltaPair.java b/java/dynamiccolor/ToneDeltaPair.java
deleted file mode 100644
index 57da5b89..00000000
--- a/java/dynamiccolor/ToneDeltaPair.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dynamiccolor;
-
-import androidx.annotation.NonNull;
-
-/**
- * Documents a constraint between two DynamicColors, in which their tones must have a certain
- * distance from each other.
- *
- * 
Prefer a DynamicColor with a background, this is for special cases when designers want tonal
- * distance, literally contrast, between two colors that don't have a background / foreground
- * relationship or a contrast guarantee.
- */
-public final class ToneDeltaPair {
-  /** Describes how to fulfill a tone delta pair constraint. */
-  public enum DeltaConstraint {
-    EXACT,
-    NEARER,
-    FARTHER
-  }
-
-  /** The first role in a pair. */
-  private final DynamicColor roleA;
-
-  /** The second role in a pair. */
-  private final DynamicColor roleB;
-
-  /** Required difference between tones. Absolute value, negative values have undefined behavior. */
-  private final double delta;
-
-  /** The relative relation between tones of roleA and roleB, as described above. */
-  private final TonePolarity polarity;
-
-  /**
-   * Whether these two roles should stay on the same side of the "awkward zone" (T50-59). This is
-   * necessary for certain cases where one role has two backgrounds.
-   */
-  private final boolean stayTogether;
-
-  /** How to fulfill the tone delta pair constraint. */
-  private final DeltaConstraint constraint;
-
-  /**
-   * Documents a constraint in tone distance between two DynamicColors.
-   *
-   * 
The polarity is an adjective that describes "A", compared to "B".
-   *
-   * 
For instance, ToneDeltaPair(A, B, 15, 'darker', stayTogether) states that A's tone should be
-   * at least 15 darker than B's.
-   *
-   * 
'relative_darker' and 'relative_lighter' describes the tone adjustment relative to the
-   * surface color trend (white in light mode; black in dark mode). For instance, ToneDeltaPair(A,
-   * B, 10, 'relative_lighter', 'farther') states that A should be at least 10 lighter than B in
-   * light mode, and at least 10 darker than B in dark mode.
-   *
-   * @param roleA The first role in a pair.
-   * @param roleB The second role in a pair.
-   * @param delta Required difference between tones. Absolute value, negative values have undefined
-   *     behavior.
-   * @param polarity The relative relation between tones of roleA and roleB, as described above.
-   * @param stayTogether Whether these two roles should stay on the same side of the "awkward zone"
-   *     (T50-59). This is necessary for certain cases where one role has two backgrounds.
-   */
-  public ToneDeltaPair(
-      DynamicColor roleA,
-      DynamicColor roleB,
-      double delta,
-      TonePolarity polarity,
-      boolean stayTogether) {
-    this.roleA = roleA;
-    this.roleB = roleB;
-    this.delta = delta;
-    this.polarity = polarity;
-    this.stayTogether = stayTogether;
-    this.constraint = DeltaConstraint.EXACT;
-  }
-
-  /**
-   * Documents a constraint in tone distance between two DynamicColors.
-   *
-   * @see #ToneDeltaPair(DynamicColor, DynamicColor, double, TonePolarity, boolean)
-   * @param roleA The first role in a pair.
-   * @param roleB The second role in a pair.
-   * @param delta Required difference between tones. Absolute value, negative values have undefined
-   *     behavior.
-   * @param polarity The relative relation between tones of roleA and roleB, as described above.
-   * @param constraint How to fulfill the tone delta pair constraint.
-   */
-  public ToneDeltaPair(
-      DynamicColor roleA,
-      DynamicColor roleB,
-      double delta,
-      TonePolarity polarity,
-      DeltaConstraint constraint) {
-    this.roleA = roleA;
-    this.roleB = roleB;
-    this.delta = delta;
-    this.polarity = polarity;
-    this.stayTogether = true;
-    this.constraint = constraint;
-  }
-
-  @NonNull
-  public DynamicColor getRoleA() {
-    return roleA;
-  }
-
-  @NonNull
-  public DynamicColor getRoleB() {
-    return roleB;
-  }
-
-  public double getDelta() {
-    return delta;
-  }
-
-  @NonNull
-  public TonePolarity getPolarity() {
-    return polarity;
-  }
-
-  public boolean getStayTogether() {
-    return stayTogether;
-  }
-
-  @NonNull
-  public DeltaConstraint getConstraint() {
-    return constraint;
-  }
-}
diff --git a/java/dynamiccolor/TonePolarity.java b/java/dynamiccolor/TonePolarity.java
deleted file mode 100644
index a7c964ef..00000000
--- a/java/dynamiccolor/TonePolarity.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dynamiccolor;
-
-/**
- * Describes the relationship in lightness between two colors.
- *
- * 
'relative_darker' and 'relative_lighter' describes the tone adjustment relative to the surface
- * color trend (white in light mode; black in dark mode). For instance, ToneDeltaPair(A, B, 10,
- * 'relative_lighter', 'farther') states that A should be at least 10 lighter than B in light mode,
- * and at least 10 darker than B in dark mode.
- *
- * 
See `ToneDeltaPair` for details.
- */
-public enum TonePolarity {
-  DARKER,
-  LIGHTER,
-  RELATIVE_DARKER,
-  RELATIVE_LIGHTER,
-  /**
-   * @deprecated Use {@link ToneDeltaPair.DeltaConstraint} instead.
-   */
-  @Deprecated
-  NEARER,
-  /**
-   * @deprecated Use {@link ToneDeltaPair.DeltaConstraint} instead.
-   */
-  @Deprecated
-  FARTHER;
-}
diff --git a/java/dynamiccolor/Variant.java b/java/dynamiccolor/Variant.java
deleted file mode 100644
index 5df90d8b..00000000
--- a/java/dynamiccolor/Variant.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dynamiccolor;
-
-/** Themes for Dynamic Color. */
-public enum Variant {
-  MONOCHROME,
-  NEUTRAL,
-  TONAL_SPOT,
-  VIBRANT,
-  EXPRESSIVE,
-  FIDELITY,
-  CONTENT,
-  RAINBOW,
-  FRUIT_SALAD
-}
diff --git a/java/hct/Cam16.java b/java/hct/Cam16.java
deleted file mode 100644
index a23b0b7d..00000000
--- a/java/hct/Cam16.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package hct;
-
-import static java.lang.Math.max;
-
-import utils.ColorUtils;
-
-/**
- * CAM16, a color appearance model. Colors are not just defined by their hex code, but rather, a hex
- * code and viewing conditions.
- *
- * 
CAM16 instances also have coordinates in the CAM16-UCS space, called J*, a*, b*, or jstar,
- * astar, bstar in code. CAM16-UCS is included in the CAM16 specification, and should be used when
- * measuring distances between colors.
- *
- * 
In traditional color spaces, a color can be identified solely by the observer's measurement of
- * the color. Color appearance models such as CAM16 also use information about the environment where
- * the color was observed, known as the viewing conditions.
- *
- * 
For example, white under the traditional assumption of a midday sun white point is accurately
- * measured as a slightly chromatic blue by CAM16. (roughly, hue 203, chroma 3, lightness 100)
- */
-public final class Cam16 {
-  // Transforms XYZ color space coordinates to 'cone'/'RGB' responses in CAM16.
-  static final double[][] XYZ_TO_CAM16RGB = {
-    {0.401288, 0.650173, -0.051461},
-    {-0.250268, 1.204414, 0.045854},
-    {-0.002079, 0.048952, 0.953127}
-  };
-
-  // Transforms 'cone'/'RGB' responses in CAM16 to XYZ color space coordinates.
-  static final double[][] CAM16RGB_TO_XYZ = {
-    {1.8620678, -1.0112547, 0.14918678},
-    {0.38752654, 0.62144744, -0.00897398},
-    {-0.01584150, -0.03412294, 1.0499644}
-  };
-
-  // CAM16 color dimensions, see getters for documentation.
-  private final double hue;
-  private final double chroma;
-  private final double j;
-  private final double q;
-  private final double m;
-  private final double s;
-
-  // Coordinates in UCS space. Used to determine color distance, like delta E equations in L*a*b*.
-  private final double jstar;
-  private final double astar;
-  private final double bstar;
-
-  // Avoid allocations during conversion by pre-allocating an array.
-  private final double[] tempArray = new double[] {0.0, 0.0, 0.0};
-
-  /**
-   * CAM16 instances also have coordinates in the CAM16-UCS space, called J*, a*, b*, or jstar,
-   * astar, bstar in code. CAM16-UCS is included in the CAM16 specification, and is used to measure
-   * distances between colors.
-   */
-  public double distance(Cam16 other) {
-    double dJ = getJstar() - other.getJstar();
-    double dA = getAstar() - other.getAstar();
-    double dB = getBstar() - other.getBstar();
-    double dEPrime = Math.sqrt(dJ * dJ + dA * dA + dB * dB);
-    double dE = 1.41 * Math.pow(dEPrime, 0.63);
-    return dE;
-  }
-
-  /** Hue in CAM16 */
-  public double getHue() {
-    return hue;
-  }
-
-  /** Chroma in CAM16 */
-  public double getChroma() {
-    return chroma;
-  }
-
-  /** Lightness in CAM16 */
-  public double getJ() {
-    return j;
-  }
-
-  /**
-   * Brightness in CAM16.
-   *
-   * 
Prefer lightness, brightness is an absolute quantity. For example, a sheet of white paper is
-   * much brighter viewed in sunlight than in indoor light, but it is the lightest object under any
-   * lighting.
-   */
-  public double getQ() {
-    return q;
-  }
-
-  /**
-   * Colorfulness in CAM16.
-   *
-   * 
Prefer chroma, colorfulness is an absolute quantity. For example, a yellow toy car is much
-   * more colorful outside than inside, but it has the same chroma in both environments.
-   */
-  public double getM() {
-    return m;
-  }
-
-  /**
-   * Saturation in CAM16.
-   *
-   * 
Colorfulness in proportion to brightness. Prefer chroma, saturation measures colorfulness
-   * relative to the color's own brightness, where chroma is colorfulness relative to white.
-   */
-  public double getS() {
-    return s;
-  }
-
-  /** Lightness coordinate in CAM16-UCS */
-  public double getJstar() {
-    return jstar;
-  }
-
-  /** a* coordinate in CAM16-UCS */
-  public double getAstar() {
-    return astar;
-  }
-
-  /** b* coordinate in CAM16-UCS */
-  public double getBstar() {
-    return bstar;
-  }
-
-  /**
-   * All of the CAM16 dimensions can be calculated from 3 of the dimensions, in the following
-   * combinations: - {j or q} and {c, m, or s} and hue - jstar, astar, bstar Prefer using a static
-   * method that constructs from 3 of those dimensions. This constructor is intended for those
-   * methods to use to return all possible dimensions.
-   *
-   * @param hue for example, red, orange, yellow, green, etc.
-   * @param chroma informally, colorfulness / color intensity. like saturation in HSL, except
-   *     perceptually accurate.
-   * @param j lightness
-   * @param q brightness; ratio of lightness to white point's lightness
-   * @param m colorfulness
-   * @param s saturation; ratio of chroma to white point's chroma
-   * @param jstar CAM16-UCS J coordinate
-   * @param astar CAM16-UCS a coordinate
-   * @param bstar CAM16-UCS b coordinate
-   */
-  private Cam16(
-      double hue,
-      double chroma,
-      double j,
-      double q,
-      double m,
-      double s,
-      double jstar,
-      double astar,
-      double bstar) {
-    this.hue = hue;
-    this.chroma = chroma;
-    this.j = j;
-    this.q = q;
-    this.m = m;
-    this.s = s;
-    this.jstar = jstar;
-    this.astar = astar;
-    this.bstar = bstar;
-  }
-
-  /**
-   * Create a CAM16 color from a color, assuming the color was viewed in default viewing conditions.
-   *
-   * @param argb ARGB representation of a color.
-   */
-  public static Cam16 fromInt(int argb) {
-    return fromIntInViewingConditions(argb, ViewingConditions.DEFAULT);
-  }
-
-  /**
-   * Create a CAM16 color from a color in defined viewing conditions.
-   *
-   * @param argb ARGB representation of a color.
-   * @param viewingConditions Information about the environment where the color was observed.
-   */
-  // The RGB => XYZ conversion matrix elements are derived scientific constants. While the values
-  // may differ at runtime due to floating point imprecision, keeping the values the same, and
-  // accurate, across implementations takes precedence.
-  @SuppressWarnings("FloatingPointLiteralPrecision")
-  static Cam16 fromIntInViewingConditions(int argb, ViewingConditions viewingConditions) {
-    // Transform ARGB int to XYZ
-    int red = (argb & 0x00ff0000) >> 16;
-    int green = (argb & 0x0000ff00) >> 8;
-    int blue = (argb & 0x000000ff);
-    double redL = ColorUtils.linearized(red);
-    double greenL = ColorUtils.linearized(green);
-    double blueL = ColorUtils.linearized(blue);
-    double x = 0.41233895 * redL + 0.35762064 * greenL + 0.18051042 * blueL;
-    double y = 0.2126 * redL + 0.7152 * greenL + 0.0722 * blueL;
-    double z = 0.01932141 * redL + 0.11916382 * greenL + 0.95034478 * blueL;
-
-    return fromXyzInViewingConditions(x, y, z, viewingConditions);
-  }
-
-  static Cam16 fromXyzInViewingConditions(
-      double x, double y, double z, ViewingConditions viewingConditions) {
-    // Transform XYZ to 'cone'/'rgb' responses
-    double[][] matrix = XYZ_TO_CAM16RGB;
-    double rT = (x * matrix[0][0]) + (y * matrix[0][1]) + (z * matrix[0][2]);
-    double gT = (x * matrix[1][0]) + (y * matrix[1][1]) + (z * matrix[1][2]);
-    double bT = (x * matrix[2][0]) + (y * matrix[2][1]) + (z * matrix[2][2]);
-
-    // Discount illuminant
-    double rD = viewingConditions.getRgbD()[0] * rT;
-    double gD = viewingConditions.getRgbD()[1] * gT;
-    double bD = viewingConditions.getRgbD()[2] * bT;
-
-    // Chromatic adaptation
-    double rAF = Math.pow(viewingConditions.getFl() * Math.abs(rD) / 100.0, 0.42);
-    double gAF = Math.pow(viewingConditions.getFl() * Math.abs(gD) / 100.0, 0.42);
-    double bAF = Math.pow(viewingConditions.getFl() * Math.abs(bD) / 100.0, 0.42);
-    double rA = Math.signum(rD) * 400.0 * rAF / (rAF + 27.13);
-    double gA = Math.signum(gD) * 400.0 * gAF / (gAF + 27.13);
-    double bA = Math.signum(bD) * 400.0 * bAF / (bAF + 27.13);
-
-    // redness-greenness
-    double a = (11.0 * rA + -12.0 * gA + bA) / 11.0;
-    // yellowness-blueness
-    double b = (rA + gA - 2.0 * bA) / 9.0;
-
-    // auxiliary components
-    double u = (20.0 * rA + 20.0 * gA + 21.0 * bA) / 20.0;
-    double p2 = (40.0 * rA + 20.0 * gA + bA) / 20.0;
-
-    // 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 hueRadians = Math.toRadians(hue);
-
-    // achromatic response to color
-    double ac = p2 * viewingConditions.getNbb();
-
-    // CAM16 lightness and brightness
-    double j =
-        100.0
-            * Math.pow(
-                ac / viewingConditions.getAw(),
-                viewingConditions.getC() * viewingConditions.getZ());
-    double q =
-        4.0
-            / viewingConditions.getC()
-            * Math.sqrt(j / 100.0)
-            * (viewingConditions.getAw() + 4.0)
-            * viewingConditions.getFlRoot();
-
-    // CAM16 chroma, colorfulness, and saturation.
-    double huePrime = (hue < 20.14) ? hue + 360 : hue;
-    double eHue = 0.25 * (Math.cos(Math.toRadians(huePrime) + 2.0) + 3.8);
-    double p1 = 50000.0 / 13.0 * eHue * viewingConditions.getNc() * viewingConditions.getNcb();
-    double t = p1 * Math.hypot(a, b) / (u + 0.305);
-    double alpha =
-        Math.pow(1.64 - Math.pow(0.29, viewingConditions.getN()), 0.73) * Math.pow(t, 0.9);
-    // CAM16 chroma, colorfulness, saturation
-    double c = alpha * Math.sqrt(j / 100.0);
-    double m = c * viewingConditions.getFlRoot();
-    double s =
-        50.0 * Math.sqrt((alpha * viewingConditions.getC()) / (viewingConditions.getAw() + 4.0));
-
-    // CAM16-UCS components
-    double jstar = (1.0 + 100.0 * 0.007) * j / (1.0 + 0.007 * j);
-    double mstar = 1.0 / 0.0228 * Math.log1p(0.0228 * m);
-    double astar = mstar * Math.cos(hueRadians);
-    double bstar = mstar * Math.sin(hueRadians);
-
-    return new Cam16(hue, c, j, q, m, s, jstar, astar, bstar);
-  }
-
-  /**
-   * @param j CAM16 lightness
-   * @param c CAM16 chroma
-   * @param h CAM16 hue
-   */
-  static Cam16 fromJch(double j, double c, double h) {
-    return fromJchInViewingConditions(j, c, h, ViewingConditions.DEFAULT);
-  }
-
-  /**
-   * @param j CAM16 lightness
-   * @param c CAM16 chroma
-   * @param h CAM16 hue
-   * @param viewingConditions Information about the environment where the color was observed.
-   */
-  private static Cam16 fromJchInViewingConditions(
-      double j, double c, double h, ViewingConditions viewingConditions) {
-    double q =
-        4.0
-            / viewingConditions.getC()
-            * Math.sqrt(j / 100.0)
-            * (viewingConditions.getAw() + 4.0)
-            * viewingConditions.getFlRoot();
-    double m = c * viewingConditions.getFlRoot();
-    double alpha = c / Math.sqrt(j / 100.0);
-    double s =
-        50.0 * Math.sqrt((alpha * viewingConditions.getC()) / (viewingConditions.getAw() + 4.0));
-
-    double hueRadians = Math.toRadians(h);
-    double jstar = (1.0 + 100.0 * 0.007) * j / (1.0 + 0.007 * j);
-    double mstar = 1.0 / 0.0228 * Math.log1p(0.0228 * m);
-    double astar = mstar * Math.cos(hueRadians);
-    double bstar = mstar * Math.sin(hueRadians);
-    return new Cam16(h, c, j, q, m, s, jstar, astar, bstar);
-  }
-
-  /**
-   * Create a CAM16 color from CAM16-UCS coordinates.
-   *
-   * @param jstar CAM16-UCS lightness.
-   * @param astar CAM16-UCS a dimension. Like a* in L*a*b*, it is a Cartesian coordinate on the Y
-   *     axis.
-   * @param bstar CAM16-UCS b dimension. Like a* in L*a*b*, it is a Cartesian coordinate on the X
-   *     axis.
-   */
-  public static Cam16 fromUcs(double jstar, double astar, double bstar) {
-
-    return fromUcsInViewingConditions(jstar, astar, bstar, ViewingConditions.DEFAULT);
-  }
-
-  /**
-   * Create a CAM16 color from CAM16-UCS coordinates in defined viewing conditions.
-   *
-   * @param jstar CAM16-UCS lightness.
-   * @param astar CAM16-UCS a dimension. Like a* in L*a*b*, it is a Cartesian coordinate on the Y
-   *     axis.
-   * @param bstar CAM16-UCS b dimension. Like a* in L*a*b*, it is a Cartesian coordinate on the X
-   *     axis.
-   * @param viewingConditions Information about the environment where the color was observed.
-   */
-  public static Cam16 fromUcsInViewingConditions(
-      double jstar, double astar, double bstar, ViewingConditions viewingConditions) {
-
-    double m = Math.hypot(astar, bstar);
-    double m2 = Math.expm1(m * 0.0228) / 0.0228;
-    double c = m2 / viewingConditions.getFlRoot();
-    double h = Math.atan2(bstar, astar) * (180.0 / Math.PI);
-    if (h < 0.0) {
-      h += 360.0;
-    }
-    double j = jstar / (1. - (jstar - 100.) * 0.007);
-    return fromJchInViewingConditions(j, c, h, viewingConditions);
-  }
-
-  /**
-   * ARGB representation of the color. Assumes the color was viewed in default viewing conditions,
-   * which are near-identical to the default viewing conditions for sRGB.
-   */
-  public int toInt() {
-    return viewed(ViewingConditions.DEFAULT);
-  }
-
-  /**
-   * ARGB representation of the color, in defined viewing conditions.
-   *
-   * @param viewingConditions Information about the environment where the color will be viewed.
-   * @return ARGB representation of color
-   */
-  int viewed(ViewingConditions viewingConditions) {
-    double[] xyz = xyzInViewingConditions(viewingConditions, tempArray);
-    return ColorUtils.argbFromXyz(xyz[0], xyz[1], xyz[2]);
-  }
-
-  double[] xyzInViewingConditions(ViewingConditions viewingConditions, double[] returnArray) {
-    double alpha =
-        (getChroma() == 0.0 || getJ() == 0.0) ? 0.0 : getChroma() / Math.sqrt(getJ() / 100.0);
-
-    double t =
-        Math.pow(
-            alpha / Math.pow(1.64 - Math.pow(0.29, viewingConditions.getN()), 0.73), 1.0 / 0.9);
-    double hRad = Math.toRadians(getHue());
-
-    double eHue = 0.25 * (Math.cos(hRad + 2.0) + 3.8);
-    double ac =
-        viewingConditions.getAw()
-            * Math.pow(getJ() / 100.0, 1.0 / viewingConditions.getC() / viewingConditions.getZ());
-    double p1 = eHue * (50000.0 / 13.0) * viewingConditions.getNc() * viewingConditions.getNcb();
-    double p2 = (ac / viewingConditions.getNbb());
-
-    double hSin = Math.sin(hRad);
-    double hCos = Math.cos(hRad);
-
-    double gamma = 23.0 * (p2 + 0.305) * t / (23.0 * p1 + 11.0 * t * hCos + 108.0 * t * hSin);
-    double a = gamma * hCos;
-    double b = gamma * hSin;
-    double rA = (460.0 * p2 + 451.0 * a + 288.0 * b) / 1403.0;
-    double gA = (460.0 * p2 - 891.0 * a - 261.0 * b) / 1403.0;
-    double bA = (460.0 * p2 - 220.0 * a - 6300.0 * b) / 1403.0;
-
-    double rCBase = max(0, (27.13 * Math.abs(rA)) / (400.0 - Math.abs(rA)));
-    double rC =
-        Math.signum(rA) * (100.0 / viewingConditions.getFl()) * Math.pow(rCBase, 1.0 / 0.42);
-    double gCBase = max(0, (27.13 * Math.abs(gA)) / (400.0 - Math.abs(gA)));
-    double gC =
-        Math.signum(gA) * (100.0 / viewingConditions.getFl()) * Math.pow(gCBase, 1.0 / 0.42);
-    double bCBase = max(0, (27.13 * Math.abs(bA)) / (400.0 - Math.abs(bA)));
-    double bC =
-        Math.signum(bA) * (100.0 / viewingConditions.getFl()) * Math.pow(bCBase, 1.0 / 0.42);
-    double rF = rC / viewingConditions.getRgbD()[0];
-    double gF = gC / viewingConditions.getRgbD()[1];
-    double bF = bC / viewingConditions.getRgbD()[2];
-
-    double[][] matrix = CAM16RGB_TO_XYZ;
-    double x = (rF * matrix[0][0]) + (gF * matrix[0][1]) + (bF * matrix[0][2]);
-    double y = (rF * matrix[1][0]) + (gF * matrix[1][1]) + (bF * matrix[1][2]);
-    double z = (rF * matrix[2][0]) + (gF * matrix[2][1]) + (bF * matrix[2][2]);
-
-    if (returnArray != null) {
-      returnArray[0] = x;
-      returnArray[1] = y;
-      returnArray[2] = z;
-      return returnArray;
-    } else {
-      return new double[] {x, y, z};
-    }
-  }
-}
diff --git a/java/hct/Hct.java b/java/hct/Hct.java
deleted file mode 100644
index 60b2b57e..00000000
--- a/java/hct/Hct.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package hct;
-
-import utils.ColorUtils;
-
-/**
- * A color system built using CAM16 hue and chroma, and L* from L*a*b*.
- *
- * 
Using L* creates a link between the color system, contrast, and thus accessibility. Contrast
- * ratio depends on relative luminance, or Y in the XYZ color space. L*, or perceptual luminance can
- * be calculated from Y.
- *
- * 
Unlike Y, L* is linear to human perception, allowing trivial creation of accurate color tones.
- *
- * 
Unlike contrast ratio, measuring contrast in L* is linear, and simple to calculate. A
- * difference of 40 in HCT tone guarantees a contrast ratio >= 3.0, and a difference of 50
- * guarantees a contrast ratio >= 4.5.
- */
-
-/**
- * HCT, hue, chroma, and tone. A color system that provides a perceptually accurate color
- * measurement system that can also accurately render what colors will appear as in different
- * lighting environments.
- */
-public final class Hct {
-  private double hue;
-  private double chroma;
-  private double tone;
-  private int argb;
-
-  /**
-   * Create an HCT color from hue, chroma, and tone.
-   *
-   * @param hue 0 <= hue < 360; invalid values are corrected.
-   * @param chroma 0 <= chroma < ?; Informally, colorfulness. The color returned may be lower than
-   *     the requested chroma. Chroma has a different maximum for any given hue and tone.
-   * @param tone 0 <= tone <= 100; invalid values are corrected.
-   * @return HCT representation of a color in default viewing conditions.
-   */
-  public static Hct from(double hue, double chroma, double tone) {
-    int argb = HctSolver.solveToInt(hue, chroma, tone);
-    return new Hct(argb);
-  }
-
-  /**
-   * Create an HCT color from a color.
-   *
-   * @param argb ARGB representation of a color.
-   * @return HCT representation of a color in default viewing conditions
-   */
-  public static Hct fromInt(int argb) {
-    return new Hct(argb);
-  }
-
-  private Hct(int argb) {
-    setInternalState(argb);
-  }
-
-  public double getHue() {
-    return hue;
-  }
-
-  public double getChroma() {
-    return chroma;
-  }
-
-  public double getTone() {
-    return tone;
-  }
-
-  public int toInt() {
-    return argb;
-  }
-
-  /**
-   * Set the hue of this color. Chroma may decrease because chroma has a different maximum for any
-   * given hue and tone.
-   *
-   * @param newHue 0 <= newHue < 360; invalid values are corrected.
-   */
-  public void setHue(double newHue) {
-    setInternalState(HctSolver.solveToInt(newHue, chroma, tone));
-  }
-
-  /**
-   * Set the chroma of this color. Chroma may decrease because chroma has a different maximum for
-   * any given hue and tone.
-   *
-   * @param newChroma 0 <= newChroma < ?
-   */
-  public void setChroma(double newChroma) {
-    setInternalState(HctSolver.solveToInt(hue, newChroma, tone));
-  }
-
-  /**
-   * Set the tone of this color. Chroma may decrease because chroma has a different maximum for any
-   * given hue and tone.
-   *
-   * @param newTone 0 <= newTone <= 100; invalid valids are corrected.
-   */
-  public void setTone(double newTone) {
-    setInternalState(HctSolver.solveToInt(hue, chroma, newTone));
-  }
-
-  @Override
-  public String toString() {
-    return "HCT("
-        + (int) Math.round(hue)
-        + ", "
-        + (int) Math.round(chroma)
-        + ", "
-        + (int) Math.round(tone)
-        + ")";
-  }
-
-  public static boolean isBlue(double hue) {
-    return hue >= 250 && hue < 270;
-  }
-
-  public static boolean isYellow(double hue) {
-    return hue >= 105 && hue < 125;
-  }
-
-  public static boolean isCyan(double hue) {
-    return hue >= 170 && hue < 207;
-  }
-
-  /**
-   * Translate a color into different ViewingConditions.
-   *
-   * 
Colors change appearance. They look different with lights on versus off, the same color, as
-   * in hex code, on white looks different when on black. This is called color relativity, most
-   * famously explicated by Josef Albers in Interaction of Color.
-   *
-   * 
In color science, color appearance models can account for this and calculate the appearance
-   * of a color in different settings. HCT is based on CAM16, a color appearance model, and uses it
-   * to make these calculations.
-   *
-   * 
See ViewingConditions.make for parameters affecting color appearance.
-   */
-  public Hct inViewingConditions(ViewingConditions vc) {
-    // 1. Use CAM16 to find XYZ coordinates of color in specified VC.
-    Cam16 cam16 = Cam16.fromInt(toInt());
-    double[] viewedInVc = cam16.xyzInViewingConditions(vc, null);
-
-    // 2. Create CAM16 of those XYZ coordinates in default VC.
-    Cam16 recastInVc =
-        Cam16.fromXyzInViewingConditions(
-            viewedInVc[0], viewedInVc[1], viewedInVc[2], ViewingConditions.DEFAULT);
-
-    // 3. Create HCT from:
-    // - CAM16 using default VC with XYZ coordinates in specified VC.
-    // - L* converted from Y in XYZ coordinates in specified VC.
-    return Hct.from(
-        recastInVc.getHue(), recastInVc.getChroma(), ColorUtils.lstarFromY(viewedInVc[1]));
-  }
-
-  private void setInternalState(int argb) {
-    this.argb = argb;
-    Cam16 cam = Cam16.fromInt(argb);
-    hue = cam.getHue();
-    chroma = cam.getChroma();
-    this.tone = ColorUtils.lstarFromArgb(argb);
-  }
-}
diff --git a/java/hct/HctSolver.java b/java/hct/HctSolver.java
deleted file mode 100644
index 98d6bffc..00000000
--- a/java/hct/HctSolver.java
+++ /dev/null
@@ -1,672 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// This file is automatically generated. Do not modify it.
-
-package hct;
-
-import utils.ColorUtils;
-import utils.MathUtils;
-
-/** A class that solves the HCT equation. */
-public class HctSolver {
-  private HctSolver() {}
-
-  static final double[][] SCALED_DISCOUNT_FROM_LINRGB =
-      new double[][] {
-        new double[] {
-          0.001200833568784504, 0.002389694492170889, 0.0002795742885861124,
-        },
-        new double[] {
-          0.0005891086651375999, 0.0029785502573438758, 0.0003270666104008398,
-        },
-        new double[] {
-          0.00010146692491640572, 0.0005364214359186694, 0.0032979401770712076,
-        },
-      };
-
-  static final double[][] LINRGB_FROM_SCALED_DISCOUNT =
-      new double[][] {
-        new double[] {
-          1373.2198709594231, -1100.4251190754821, -7.278681089101213,
-        },
-        new double[] {
-          -271.815969077903, 559.6580465940733, -32.46047482791194,
-        },
-        new double[] {
-          1.9622899599665666, -57.173814538844006, 308.7233197812385,
-        },
-      };
-
-  static final double[] Y_FROM_LINRGB = new double[] {0.2126, 0.7152, 0.0722};
-
-  static final double[] CRITICAL_PLANES =
-      new double[] {
-        0.015176349177441876,
-        0.045529047532325624,
-        0.07588174588720938,
-        0.10623444424209313,
-        0.13658714259697685,
-        0.16693984095186062,
-        0.19729253930674434,
-        0.2276452376616281,
-        0.2579979360165119,
-        0.28835063437139563,
-        0.3188300904430532,
-        0.350925934958123,
-        0.3848314933096426,
-        0.42057480301049466,
-        0.458183274052838,
-        0.4976837250274023,
-        0.5391024159806381,
-        0.5824650784040898,
-        0.6277969426914107,
-        0.6751227633498623,
-        0.7244668422128921,
-        0.775853049866786,
-        0.829304845476233,
-        0.8848452951698498,
-        0.942497089126609,
-        1.0022825574869039,
-        1.0642236851973577,
-        1.1283421258858297,
-        1.1946592148522128,
-        1.2631959812511864,
-        1.3339731595349034,
-        1.407011200216447,
-        1.4823302800086415,
-        1.5599503113873272,
-        1.6398909516233677,
-        1.7221716113234105,
-        1.8068114625156377,
-        1.8938294463134073,
-        1.9832442801866852,
-        2.075074464868551,
-        2.1693382909216234,
-        2.2660538449872063,
-        2.36523901573795,
-        2.4669114995532007,
-        2.5710888059345764,
-        2.6777882626779785,
-        2.7870270208169257,
-        2.898822059350997,
-        3.0131901897720907,
-        3.1301480604002863,
-        3.2497121605402226,
-        3.3718988244681087,
-        3.4967242352587946,
-        3.624204428461639,
-        3.754355295633311,
-        3.887192587735158,
-        4.022731918402185,
-        4.160988767090289,
-        4.301978482107941,
-        4.445716283538092,
-        4.592217266055746,
-        4.741496401646282,
-        4.893568542229298,
-        5.048448422192488,
-        5.20615066083972,
-        5.3666897647573375,
-        5.5300801301023865,
-        5.696336044816294,
-        5.865471690767354,
-        6.037501145825082,
-        6.212438385869475,
-        6.390297286737924,
-        6.571091626112461,
-        6.7548350853498045,
-        6.941541251256611,
-        7.131223617812143,
-        7.323895587840543,
-        7.5195704746346665,
-        7.7182615035334345,
-        7.919981813454504,
-        8.124744458384042,
-        8.332562408825165,
-        8.543448553206703,
-        8.757415699253682,
-        8.974476575321063,
-        9.194643831691977,
-        9.417930041841839,
-        9.644347703669503,
-        9.873909240696694,
-        10.106627003236781,
-        10.342513269534024,
-        10.58158024687427,
-        10.8238400726681,
-        11.069304815507364,
-        11.317986476196008,
-        11.569896988756009,
-        11.825048221409341,
-        12.083451977536606,
-        12.345119996613247,
-        12.610063955123938,
-        12.878295467455942,
-        13.149826086772048,
-        13.42466730586372,
-        13.702830557985108,
-        13.984327217668513,
-        14.269168601521828,
-        14.55736596900856,
-        14.848930523210871,
-        15.143873411576273,
-        15.44220572664832,
-        15.743938506781891,
-        16.04908273684337,
-        16.35764934889634,
-        16.66964922287304,
-        16.985093187232053,
-        17.30399201960269,
-        17.62635644741625,
-        17.95219714852476,
-        18.281524751807332,
-        18.614349837764564,
-        18.95068293910138,
-        19.290534541298456,
-        19.633915083172692,
-        19.98083495742689,
-        20.331304511189067,
-        20.685334046541502,
-        21.042933821039977,
-        21.404114048223256,
-        21.76888489811322,
-        22.137256497705877,
-        22.50923893145328,
-        22.884842241736916,
-        23.264076429332462,
-        23.6469514538663,
-        24.033477234264016,
-        24.42366364919083,
-        24.817520537484558,
-        25.21505769858089,
-        25.61628489293138,
-        26.021211842414342,
-        26.429848230738664,
-        26.842203703840827,
-        27.258287870275353,
-        27.678110301598522,
-        28.10168053274597,
-        28.529008062403893,
-        28.96010235337422,
-        29.39497283293396,
-        29.83362889318845,
-        30.276079891419332,
-        30.722335150426627,
-        31.172403958865512,
-        31.62629557157785,
-        32.08401920991837,
-        32.54558406207592,
-        33.010999283389665,
-        33.4802739966603,
-        33.953417292456834,
-        34.430438229418264,
-        34.911345834551085,
-        35.39614910352207,
-        35.88485700094671,
-        36.37747846067349,
-        36.87402238606382,
-        37.37449765026789,
-        37.87891309649659,
-        38.38727753828926,
-        38.89959975977785,
-        39.41588851594697,
-        39.93615253289054,
-        40.460400508064545,
-        40.98864111053629,
-        41.520882981230194,
-        42.05713473317016,
-        42.597404951718396,
-        43.141702194811224,
-        43.6900349931913,
-        44.24241185063697,
-        44.798841244188324,
-        45.35933162437017,
-        45.92389141541209,
-        46.49252901546552,
-        47.065252796817916,
-        47.64207110610409,
-        48.22299226451468,
-        48.808024568002054,
-        49.3971762874833,
-        49.9904556690408,
-        50.587870934119984,
-        51.189430279724725,
-        51.79514187861014,
-        52.40501387947288,
-        53.0190544071392,
-        53.637271562750364,
-        54.259673423945976,
-        54.88626804504493,
-        55.517063457223934,
-        56.15206766869424,
-        56.79128866487574,
-        57.43473440856916,
-        58.08241284012621,
-        58.734331877617365,
-        59.39049941699807,
-        60.05092333227251,
-        60.715611475655585,
-        61.38457167773311,
-        62.057811747619894,
-        62.7353394731159,
-        63.417162620860914,
-        64.10328893648692,
-        64.79372614476921,
-        65.48848194977529,
-        66.18756403501224,
-        66.89098006357258,
-        67.59873767827808,
-        68.31084450182222,
-        69.02730813691093,
-        69.74813616640164,
-        70.47333615344107,
-        71.20291564160104,
-        71.93688215501312,
-        72.67524319850172,
-        73.41800625771542,
-        74.16517879925733,
-        74.9167682708136,
-        75.67278210128072,
-        76.43322770089146,
-        77.1981124613393,
-        77.96744375590167,
-        78.74122893956174,
-        79.51947534912904,
-        80.30219030335869,
-        81.08938110306934,
-        81.88105503125999,
-        82.67721935322541,
-        83.4778813166706,
-        84.28304815182372,
-        85.09272707154808,
-        85.90692527145302,
-        86.72564993000343,
-        87.54890820862819,
-        88.3767072518277,
-        89.2090541872801,
-        90.04595612594655,
-        90.88742016217518,
-        91.73345337380438,
-        92.58406282226491,
-        93.43925555268066,
-        94.29903859396902,
-        95.16341895893969,
-        96.03240364439274,
-        96.9059996312159,
-        97.78421388448044,
-        98.6670533535366,
-        99.55452497210776,
-      };
-
-  /**
-   * Sanitizes a small enough angle in radians.
-   *
-   * @param angle An angle in radians; must not deviate too much from 0.
-   * @return A coterminal angle between 0 and 2pi.
-   */
-  static double sanitizeRadians(double angle) {
-    return (angle + Math.PI * 8) % (Math.PI * 2);
-  }
-
-  /**
-   * Delinearizes an RGB component, returning a floating-point number.
-   *
-   * @param rgbComponent 0.0 <= rgb_component <= 100.0, represents linear R/G/B channel
-   * @return 0.0 <= output <= 255.0, color channel converted to regular RGB space
-   */
-  static double trueDelinearized(double rgbComponent) {
-    double normalized = rgbComponent / 100.0;
-    double delinearized = 0.0;
-    if (normalized <= 0.0031308) {
-      delinearized = normalized * 12.92;
-    } else {
-      delinearized = 1.055 * Math.pow(normalized, 1.0 / 2.4) - 0.055;
-    }
-    return delinearized * 255.0;
-  }
-
-  static double chromaticAdaptation(double component) {
-    double af = Math.pow(Math.abs(component), 0.42);
-    return MathUtils.signum(component) * 400.0 * af / (af + 27.13);
-  }
-
-  /**
-   * Returns the hue of a linear RGB color in CAM16.
-   *
-   * @param linrgb The linear RGB coordinates of a color.
-   * @return The hue of the color in CAM16, in radians.
-   */
-  static double hueOf(double[] linrgb) {
-    double[] scaledDiscount = MathUtils.matrixMultiply(linrgb, SCALED_DISCOUNT_FROM_LINRGB);
-    double rA = chromaticAdaptation(scaledDiscount[0]);
-    double gA = chromaticAdaptation(scaledDiscount[1]);
-    double bA = chromaticAdaptation(scaledDiscount[2]);
-    // redness-greenness
-    double a = (11.0 * rA + -12.0 * gA + bA) / 11.0;
-    // yellowness-blueness
-    double b = (rA + gA - 2.0 * bA) / 9.0;
-    return Math.atan2(b, a);
-  }
-
-  static boolean areInCyclicOrder(double a, double b, double c) {
-    double deltaAB = sanitizeRadians(b - a);
-    double deltaAC = sanitizeRadians(c - a);
-    return deltaAB < deltaAC;
-  }
-
-  /**
-   * Solves the lerp equation.
-   *
-   * @param source The starting number.
-   * @param mid The number in the middle.
-   * @param target The ending number.
-   * @return A number t such that lerp(source, target, t) = mid.
-   */
-  static double intercept(double source, double mid, double target) {
-    return (mid - source) / (target - source);
-  }
-
-  static double[] lerpPoint(double[] source, double t, double[] target) {
-    return new double[] {
-      source[0] + (target[0] - source[0]) * t,
-      source[1] + (target[1] - source[1]) * t,
-      source[2] + (target[2] - source[2]) * t,
-    };
-  }
-
-  /**
-   * Intersects a segment with a plane.
-   *
-   * @param source The coordinates of point A.
-   * @param coordinate The R-, G-, or B-coordinate of the plane.
-   * @param target The coordinates of point B.
-   * @param axis The axis the plane is perpendicular with. (0: R, 1: G, 2: B)
-   * @return The intersection point of the segment AB with the plane R=coordinate, G=coordinate, or
-   *     B=coordinate
-   */
-  static double[] setCoordinate(double[] source, double coordinate, double[] target, int axis) {
-    double t = intercept(source[axis], coordinate, target[axis]);
-    return lerpPoint(source, t, target);
-  }
-
-  static boolean isBounded(double x) {
-    return 0.0 <= x && x <= 100.0;
-  }
-
-  /**
-   * Returns the nth possible vertex of the polygonal intersection.
-   *
-   * @param y The Y value of the plane.
-   * @param n The zero-based index of the point. 0 <= n <= 11.
-   * @return The nth possible vertex of the polygonal intersection of the y plane and the RGB cube,
-   *     in linear RGB coordinates, if it exists. If this possible vertex lies outside of the cube,
-   *     [-1.0, -1.0, -1.0] is returned.
-   */
-  static double[] nthVertex(double y, int n) {
-    double kR = Y_FROM_LINRGB[0];
-    double kG = Y_FROM_LINRGB[1];
-    double kB = Y_FROM_LINRGB[2];
-    double coordA = n % 4 <= 1 ? 0.0 : 100.0;
-    double coordB = n % 2 == 0 ? 0.0 : 100.0;
-    if (n < 4) {
-      double g = coordA;
-      double b = coordB;
-      double r = (y - g * kG - b * kB) / kR;
-      if (isBounded(r)) {
-        return new double[] {r, g, b};
-      } else {
-        return new double[] {-1.0, -1.0, -1.0};
-      }
-    } else if (n < 8) {
-      double b = coordA;
-      double r = coordB;
-      double g = (y - r * kR - b * kB) / kG;
-      if (isBounded(g)) {
-        return new double[] {r, g, b};
-      } else {
-        return new double[] {-1.0, -1.0, -1.0};
-      }
-    } else {
-      double r = coordA;
-      double g = coordB;
-      double b = (y - r * kR - g * kG) / kB;
-      if (isBounded(b)) {
-        return new double[] {r, g, b};
-      } else {
-        return new double[] {-1.0, -1.0, -1.0};
-      }
-    }
-  }
-
-  /**
-   * Finds the segment containing the desired color.
-   *
-   * @param y The Y value of the color.
-   * @param targetHue The hue of the color.
-   * @return A list of two sets of linear RGB coordinates, each corresponding to an endpoint of the
-   *     segment containing the desired color.
-   */
-  static double[][] bisectToSegment(double y, double targetHue) {
-    double[] left = new double[] {-1.0, -1.0, -1.0};
-    double[] right = left;
-    double leftHue = 0.0;
-    double rightHue = 0.0;
-    boolean initialized = false;
-    boolean uncut = true;
-    for (int n = 0; n < 12; n++) {
-      double[] mid = nthVertex(y, n);
-      if (mid[0] < 0) {
-        continue;
-      }
-      double midHue = hueOf(mid);
-      if (!initialized) {
-        left = mid;
-        right = mid;
-        leftHue = midHue;
-        rightHue = midHue;
-        initialized = true;
-        continue;
-      }
-      if (uncut || areInCyclicOrder(leftHue, midHue, rightHue)) {
-        uncut = false;
-        if (areInCyclicOrder(leftHue, targetHue, midHue)) {
-          right = mid;
-          rightHue = midHue;
-        } else {
-          left = mid;
-          leftHue = midHue;
-        }
-      }
-    }
-    return new double[][] {left, right};
-  }
-
-  static double[] midpoint(double[] a, double[] b) {
-    return new double[] {
-      (a[0] + b[0]) / 2, (a[1] + b[1]) / 2, (a[2] + b[2]) / 2,
-    };
-  }
-
-  static int criticalPlaneBelow(double x) {
-    return (int) Math.floor(x - 0.5);
-  }
-
-  static int criticalPlaneAbove(double x) {
-    return (int) Math.ceil(x - 0.5);
-  }
-
-  /**
-   * Finds a color with the given Y and hue on the boundary of the cube.
-   *
-   * @param y The Y value of the color.
-   * @param targetHue The hue of the color.
-   * @return The desired color, in linear RGB coordinates.
-   */
-  static double[] bisectToLimit(double y, double targetHue) {
-    double[][] segment = bisectToSegment(y, targetHue);
-    double[] left = segment[0];
-    double leftHue = hueOf(left);
-    double[] right = segment[1];
-    for (int axis = 0; axis < 3; axis++) {
-      if (left[axis] != right[axis]) {
-        int lPlane = -1;
-        int rPlane = 255;
-        if (left[axis] < right[axis]) {
-          lPlane = criticalPlaneBelow(trueDelinearized(left[axis]));
-          rPlane = criticalPlaneAbove(trueDelinearized(right[axis]));
-        } else {
-          lPlane = criticalPlaneAbove(trueDelinearized(left[axis]));
-          rPlane = criticalPlaneBelow(trueDelinearized(right[axis]));
-        }
-        for (int i = 0; i < 8; i++) {
-          if (Math.abs(rPlane - lPlane) <= 1) {
-            break;
-          } else {
-            int mPlane = (int) Math.floor((lPlane + rPlane) / 2.0);
-            double midPlaneCoordinate = CRITICAL_PLANES[mPlane];
-            double[] mid = setCoordinate(left, midPlaneCoordinate, right, axis);
-            double midHue = hueOf(mid);
-            if (areInCyclicOrder(leftHue, targetHue, midHue)) {
-              right = mid;
-              rPlane = mPlane;
-            } else {
-              left = mid;
-              leftHue = midHue;
-              lPlane = mPlane;
-            }
-          }
-        }
-      }
-    }
-    return midpoint(left, right);
-  }
-
-  static double inverseChromaticAdaptation(double adapted) {
-    double adaptedAbs = Math.abs(adapted);
-    double base = Math.max(0, 27.13 * adaptedAbs / (400.0 - adaptedAbs));
-    return MathUtils.signum(adapted) * Math.pow(base, 1.0 / 0.42);
-  }
-
-  /**
-   * Finds a color with the given hue, chroma, and Y.
-   *
-   * @param hueRadians The desired hue in radians.
-   * @param chroma The desired chroma.
-   * @param y The desired Y.
-   * @return The desired color as a hexadecimal integer, if found; 0 otherwise.
-   */
-  static int findResultByJ(double hueRadians, double chroma, double y) {
-    // Initial estimate of j.
-    double j = Math.sqrt(y) * 11.0;
-    // ===========================================================
-    // Operations inlined from Cam16 to avoid repeated calculation
-    // ===========================================================
-    ViewingConditions viewingConditions = ViewingConditions.DEFAULT;
-    double tInnerCoeff = 1 / Math.pow(1.64 - Math.pow(0.29, viewingConditions.getN()), 0.73);
-    double eHue = 0.25 * (Math.cos(hueRadians + 2.0) + 3.8);
-    double p1 = eHue * (50000.0 / 13.0) * viewingConditions.getNc() * viewingConditions.getNcb();
-    double hSin = Math.sin(hueRadians);
-    double hCos = Math.cos(hueRadians);
-    for (int iterationRound = 0; iterationRound < 5; iterationRound++) {
-      // ===========================================================
-      // Operations inlined from Cam16 to avoid repeated calculation
-      // ===========================================================
-      double jNormalized = j / 100.0;
-      double alpha = chroma == 0.0 || j == 0.0 ? 0.0 : chroma / Math.sqrt(jNormalized);
-      double t = Math.pow(alpha * tInnerCoeff, 1.0 / 0.9);
-      double ac =
-          viewingConditions.getAw()
-              * Math.pow(jNormalized, 1.0 / viewingConditions.getC() / viewingConditions.getZ());
-      double p2 = ac / viewingConditions.getNbb();
-      double gamma = 23.0 * (p2 + 0.305) * t / (23.0 * p1 + 11 * t * hCos + 108.0 * t * hSin);
-      double a = gamma * hCos;
-      double b = gamma * hSin;
-      double rA = (460.0 * p2 + 451.0 * a + 288.0 * b) / 1403.0;
-      double gA = (460.0 * p2 - 891.0 * a - 261.0 * b) / 1403.0;
-      double bA = (460.0 * p2 - 220.0 * a - 6300.0 * b) / 1403.0;
-      double rCScaled = inverseChromaticAdaptation(rA);
-      double gCScaled = inverseChromaticAdaptation(gA);
-      double bCScaled = inverseChromaticAdaptation(bA);
-      double[] linrgb =
-          MathUtils.matrixMultiply(
-              new double[] {rCScaled, gCScaled, bCScaled}, LINRGB_FROM_SCALED_DISCOUNT);
-      // ===========================================================
-      // Operations inlined from Cam16 to avoid repeated calculation
-      // ===========================================================
-      if (linrgb[0] < 0 || linrgb[1] < 0 || linrgb[2] < 0) {
-        return 0;
-      }
-      double kR = Y_FROM_LINRGB[0];
-      double kG = Y_FROM_LINRGB[1];
-      double kB = Y_FROM_LINRGB[2];
-      double fnj = kR * linrgb[0] + kG * linrgb[1] + kB * linrgb[2];
-      if (fnj <= 0) {
-        return 0;
-      }
-      if (iterationRound == 4 || Math.abs(fnj - y) < 0.002) {
-        if (linrgb[0] > 100.01 || linrgb[1] > 100.01 || linrgb[2] > 100.01) {
-          return 0;
-        }
-        return ColorUtils.argbFromLinrgb(linrgb);
-      }
-      // Iterates with Newton method,
-      // Using 2 * fn(j) / j as the approximation of fn'(j)
-      j = j - (fnj - y) * j / (2 * fnj);
-    }
-    return 0;
-  }
-
-  /**
-   * Finds an sRGB color with the given hue, chroma, and L*, if possible.
-   *
-   * @param hueDegrees The desired hue, in degrees.
-   * @param chroma The desired chroma.
-   * @param lstar The desired L*.
-   * @return A hexadecimal representing the sRGB color. The color has sufficiently close hue,
-   *     chroma, and L* to the desired values, if possible; otherwise, the hue and L* will be
-   *     sufficiently close, and chroma will be maximized.
-   */
-  public static int solveToInt(double hueDegrees, double chroma, double lstar) {
-    if (chroma < 0.0001 || lstar < 0.0001 || lstar > 99.9999) {
-      return ColorUtils.argbFromLstar(lstar);
-    }
-    hueDegrees = MathUtils.sanitizeDegreesDouble(hueDegrees);
-    double hueRadians = hueDegrees / 180 * Math.PI;
-    double y = ColorUtils.yFromLstar(lstar);
-    int exactAnswer = findResultByJ(hueRadians, chroma, y);
-    if (exactAnswer != 0) {
-      return exactAnswer;
-    }
-    double[] linrgb = bisectToLimit(y, hueRadians);
-    return ColorUtils.argbFromLinrgb(linrgb);
-  }
-
-  /**
-   * Finds an sRGB color with the given hue, chroma, and L*, if possible.
-   *
-   * @param hueDegrees The desired hue, in degrees.
-   * @param chroma The desired chroma.
-   * @param lstar The desired L*.
-   * @return A CAM16 object representing the sRGB color. The color has sufficiently close hue,
-   *     chroma, and L* to the desired values, if possible; otherwise, the hue and L* will be
-   *     sufficiently close, and chroma will be maximized.
-   */
-  public static Cam16 solveToCam(double hueDegrees, double chroma, double lstar) {
-    return Cam16.fromInt(solveToInt(hueDegrees, chroma, lstar));
-  }
-}
-
diff --git a/java/hct/ViewingConditions.java b/java/hct/ViewingConditions.java
deleted file mode 100644
index 3e452de0..00000000
--- a/java/hct/ViewingConditions.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package hct;
-
-import utils.ColorUtils;
-import utils.MathUtils;
-
-/**
- * In traditional color spaces, a color can be identified solely by the observer's measurement of
- * the color. Color appearance models such as CAM16 also use information about the environment where
- * the color was observed, known as the viewing conditions.
- *
- * 
For example, white under the traditional assumption of a midday sun white point is accurately
- * measured as a slightly chromatic blue by CAM16. (roughly, hue 203, chroma 3, lightness 100)
- *
- * 
This class caches intermediate values of the CAM16 conversion process that depend only on
- * viewing conditions, enabling speed ups.
- */
-public final class ViewingConditions {
-  /** sRGB-like viewing conditions. */
-  public static final ViewingConditions DEFAULT =
-      ViewingConditions.defaultWithBackgroundLstar(50.0);
-
-  private final double aw;
-  private final double nbb;
-  private final double ncb;
-  private final double c;
-  private final double nc;
-  private final double n;
-  private final double[] rgbD;
-  private final double fl;
-  private final double flRoot;
-  private final double z;
-
-  public double getAw() {
-    return aw;
-  }
-
-  public double getN() {
-    return n;
-  }
-
-  public double getNbb() {
-    return nbb;
-  }
-
-  double getNcb() {
-    return ncb;
-  }
-
-  double getC() {
-    return c;
-  }
-
-  double getNc() {
-    return nc;
-  }
-
-  public double[] getRgbD() {
-    return rgbD;
-  }
-
-  double getFl() {
-    return fl;
-  }
-
-  public double getFlRoot() {
-    return flRoot;
-  }
-
-  double getZ() {
-    return z;
-  }
-
-  /**
-   * Create ViewingConditions from a simple, physically relevant, set of parameters.
-   *
-   * @param whitePoint White point, measured in the XYZ color space. default = D65, or sunny day
-   *     afternoon
-   * @param adaptingLuminance The luminance of the adapting field. Informally, how bright it is in
-   *     the room where the color is viewed. Can be calculated from lux by multiplying lux by
-   *     0.0586. default = 11.72, or 200 lux.
-   * @param backgroundLstar The lightness of the area surrounding the color. measured by L* in
-   *     L*a*b*. default = 50.0
-   * @param surround A general description of the lighting surrounding the color. 0 is pitch dark,
-   *     like watching a movie in a theater. 1.0 is a dimly light room, like watching TV at home at
-   *     night. 2.0 means there is no difference between the lighting on the color and around it.
-   *     default = 2.0
-   * @param discountingIlluminant Whether the eye accounts for the tint of the ambient lighting,
-   *     such as knowing an apple is still red in green light. default = false, the eye does not
-   *     perform this process on self-luminous objects like displays.
-   */
-  public static ViewingConditions make(
-      double[] whitePoint,
-      double adaptingLuminance,
-      double backgroundLstar,
-      double surround,
-      boolean discountingIlluminant) {
-    // A background of pure black is non-physical and leads to infinities that represent the idea
-    // that any color viewed in pure black can't be seen.
-    backgroundLstar = Math.max(0.1, backgroundLstar);
-    // Transform white point XYZ to 'cone'/'rgb' responses
-    double[][] matrix = Cam16.XYZ_TO_CAM16RGB;
-    double[] xyz = whitePoint;
-    double rW = (xyz[0] * matrix[0][0]) + (xyz[1] * matrix[0][1]) + (xyz[2] * matrix[0][2]);
-    double gW = (xyz[0] * matrix[1][0]) + (xyz[1] * matrix[1][1]) + (xyz[2] * matrix[1][2]);
-    double bW = (xyz[0] * matrix[2][0]) + (xyz[1] * matrix[2][1]) + (xyz[2] * matrix[2][2]);
-    double f = 0.8 + (surround / 10.0);
-    double c =
-        (f >= 0.9)
-            ? MathUtils.lerp(0.59, 0.69, ((f - 0.9) * 10.0))
-            : MathUtils.lerp(0.525, 0.59, ((f - 0.8) * 10.0));
-    double d =
-        discountingIlluminant
-            ? 1.0
-            : f * (1.0 - ((1.0 / 3.6) * Math.exp((-adaptingLuminance - 42.0) / 92.0)));
-    d = MathUtils.clampDouble(0.0, 1.0, d);
-    double nc = f;
-    double[] rgbD =
-        new double[] {
-          d * (100.0 / rW) + 1.0 - d, d * (100.0 / gW) + 1.0 - d, d * (100.0 / bW) + 1.0 - d
-        };
-    double k = 1.0 / (5.0 * adaptingLuminance + 1.0);
-    double k4 = k * k * k * k;
-    double k4F = 1.0 - k4;
-    double fl = (k4 * adaptingLuminance) + (0.1 * k4F * k4F * Math.cbrt(5.0 * adaptingLuminance));
-    double n = (ColorUtils.yFromLstar(backgroundLstar) / whitePoint[1]);
-    double z = 1.48 + Math.sqrt(n);
-    double nbb = 0.725 / Math.pow(n, 0.2);
-    double ncb = nbb;
-    double[] rgbAFactors =
-        new double[] {
-          Math.pow(fl * rgbD[0] * rW / 100.0, 0.42),
-          Math.pow(fl * rgbD[1] * gW / 100.0, 0.42),
-          Math.pow(fl * rgbD[2] * bW / 100.0, 0.42)
-        };
-
-    double[] rgbA =
-        new double[] {
-          (400.0 * rgbAFactors[0]) / (rgbAFactors[0] + 27.13),
-          (400.0 * rgbAFactors[1]) / (rgbAFactors[1] + 27.13),
-          (400.0 * rgbAFactors[2]) / (rgbAFactors[2] + 27.13)
-        };
-
-    double aw = ((2.0 * rgbA[0]) + rgbA[1] + (0.05 * rgbA[2])) * nbb;
-    return new ViewingConditions(n, aw, nbb, ncb, c, nc, rgbD, fl, Math.pow(fl, 0.25), z);
-  }
-
-  /**
-   * Create sRGB-like viewing conditions with a custom background lstar.
-   *
-   * 
Default viewing conditions have a lstar of 50, midgray.
-   */
-  public static ViewingConditions defaultWithBackgroundLstar(double lstar) {
-    return ViewingConditions.make(
-        ColorUtils.whitePointD65(),
-        (200.0 / Math.PI * ColorUtils.yFromLstar(50.0) / 100.f),
-        lstar,
-        2.0,
-        false);
-  }
-
-  /**
-   * Parameters are intermediate values of the CAM16 conversion process. Their names are shorthand
-   * for technical color science terminology, this class would not benefit from documenting them
-   * individually. A brief overview is available in the CAM16 specification, and a complete overview
-   * requires a color science textbook, such as Fairchild's Color Appearance Models.
-   */
-  private ViewingConditions(
-      double n,
-      double aw,
-      double nbb,
-      double ncb,
-      double c,
-      double nc,
-      double[] rgbD,
-      double fl,
-      double flRoot,
-      double z) {
-    this.n = n;
-    this.aw = aw;
-    this.nbb = nbb;
-    this.ncb = ncb;
-    this.c = c;
-    this.nc = nc;
-    this.rgbD = rgbD;
-    this.fl = fl;
-    this.flRoot = flRoot;
-    this.z = z;
-  }
-}
diff --git a/java/palettes/CorePalette.java b/java/palettes/CorePalette.java
deleted file mode 100644
index bedf603f..00000000
--- a/java/palettes/CorePalette.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package palettes;
-
-import static java.lang.Math.max;
-import static java.lang.Math.min;
-
-import hct.Hct;
-
-/**
- * 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.
- *
- * @deprecated Use {@link dynamiccolor.DynamicScheme} for color
- *     scheme generation. Use {@link palettes.CorePalettes} for core
- *     palettes container class.
- */
-@Deprecated
-public final class CorePalette {
-  public TonalPalette a1;
-  public TonalPalette a2;
-  public TonalPalette a3;
-  public TonalPalette n1;
-  public TonalPalette n2;
-  public TonalPalette error;
-
-  /**
-   * Create key tones from a color.
-   *
-   * @param argb ARGB representation of a color
-   * @deprecated Use {@link dynamiccolor.DynamicScheme} for color
-   *     scheme generation. Use {@link palettes.CorePalettes} for
-   *     core palettes container class.
-   */
-  @Deprecated
-  public static CorePalette of(int argb) {
-    return new CorePalette(argb, false);
-  }
-
-  /**
-   * Create content key tones from a color.
-   *
-   * @param argb ARGB representation of a color
-   * @deprecated Use {@link dynamiccolor.DynamicScheme} for color
-   *     scheme generation. Use {@link palettes.CorePalettes} for
-   *     core palettes container class.
-   */
-  @Deprecated
-  public static CorePalette contentOf(int argb) {
-    return new CorePalette(argb, true);
-  }
-
-  private CorePalette(int argb, boolean isContent) {
-    Hct hct = Hct.fromInt(argb);
-    double hue = hct.getHue();
-    double chroma = hct.getChroma();
-    if (isContent) {
-      this.a1 = TonalPalette.fromHueAndChroma(hue, chroma);
-      this.a2 = TonalPalette.fromHueAndChroma(hue, chroma / 3.);
-      this.a3 = TonalPalette.fromHueAndChroma(hue + 60., chroma / 2.);
-      this.n1 = TonalPalette.fromHueAndChroma(hue, min(chroma / 12., 4.));
-      this.n2 = TonalPalette.fromHueAndChroma(hue, min(chroma / 6., 8.));
-    } else {
-      this.a1 = TonalPalette.fromHueAndChroma(hue, max(48., chroma));
-      this.a2 = TonalPalette.fromHueAndChroma(hue, 16.);
-      this.a3 = TonalPalette.fromHueAndChroma(hue + 60., 24.);
-      this.n1 = TonalPalette.fromHueAndChroma(hue, 4.);
-      this.n2 = TonalPalette.fromHueAndChroma(hue, 8.);
-    }
-    this.error = TonalPalette.fromHueAndChroma(25, 84.);
-  }
-}
diff --git a/java/palettes/CorePalettes.java b/java/palettes/CorePalettes.java
deleted file mode 100644
index 8dfab7b5..00000000
--- a/java/palettes/CorePalettes.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2024 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package palettes;
-
-/**
- * Comprises foundational palettes to build a color scheme.
- *
- * 
Generated from a source color, these palettes will then be part of a [DynamicScheme] together
- * with appearance preferences.
- */
-public final class CorePalettes {
-  public TonalPalette primary;
-  public TonalPalette secondary;
-  public TonalPalette tertiary;
-  public TonalPalette neutral;
-  public TonalPalette neutralVariant;
-
-  /** Creates a new CorePalettes. */
-  public CorePalettes(
-      TonalPalette primary,
-      TonalPalette secondary,
-      TonalPalette tertiary,
-      TonalPalette neutral,
-      TonalPalette neutralVariant) {
-    this.primary = primary;
-    this.secondary = secondary;
-    this.tertiary = tertiary;
-    this.neutral = neutral;
-    this.neutralVariant = neutralVariant;
-  }
-}
diff --git a/java/palettes/TonalPalette.java b/java/palettes/TonalPalette.java
deleted file mode 100644
index 804bc94b..00000000
--- a/java/palettes/TonalPalette.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package palettes;
-
-import hct.Hct;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A convenience class for retrieving colors that are constant in hue and chroma, but vary in tone.
- *
- * 
TonalPalette is intended for use in a single thread due to its stateful caching.
- */
-public final class TonalPalette {
-  Map cache;
-  Hct keyColor;
-  double hue;
-  double chroma;
-
-  /**
-   * Create tones using the HCT hue and chroma from a color.
-   *
-   * @param argb ARGB representation of a color
-   * @return Tones matching that color's hue and chroma.
-   */
-  public static TonalPalette fromInt(int argb) {
-    return fromHct(Hct.fromInt(argb));
-  }
-
-  /**
-   * Create tones using a HCT color.
-   *
-   * @param hct HCT representation of a color.
-   * @return Tones matching that color's hue and chroma.
-   */
-  public static TonalPalette fromHct(Hct hct) {
-    return new TonalPalette(hct.getHue(), hct.getChroma(), hct);
-  }
-
-  /**
-   * Create tones from a defined HCT hue and chroma.
-   *
-   * @param hue HCT hue
-   * @param chroma HCT chroma
-   * @return Tones matching hue and chroma.
-   */
-  public static TonalPalette fromHueAndChroma(double hue, double chroma) {
-    final Hct keyColor = new KeyColor(hue, chroma).create();
-    return new TonalPalette(hue, chroma, keyColor);
-  }
-
-  private TonalPalette(double hue, double chroma, Hct keyColor) {
-    cache = new HashMap<>();
-    this.hue = hue;
-    this.chroma = chroma;
-    this.keyColor = keyColor;
-  }
-
-  /**
-   * Create an ARGB color with HCT hue and chroma of this Tones instance, and the provided HCT tone.
-   *
-   * @param tone HCT tone, measured from 0 to 100.
-   * @return ARGB representation of a color with that tone.
-   */
-  public int tone(int tone) {
-    Integer color = cache.get(tone);
-    if (color == null) {
-      if (tone == 99 && Hct.isYellow(this.hue)) {
-        color = averageArgb(this.tone(98), this.tone(100));
-      } else {
-        color = Hct.from(this.hue, this.chroma, tone).toInt();
-      }
-      cache.put(tone, color);
-    }
-    return color;
-  }
-
-  /** Given a tone, use hue and chroma of palette to create a color, and return it as HCT. */
-  public Hct getHct(double tone) {
-    return Hct.from(this.hue, this.chroma, tone);
-  }
-
-  /** The chroma of the Tonal Palette, in HCT. Ranges from 0 to ~130 (for sRGB gamut). */
-  public double getChroma() {
-    return this.chroma;
-  }
-
-  /** The hue of the Tonal Palette, in HCT. Ranges from 0 to 360. */
-  public double getHue() {
-    return this.hue;
-  }
-
-  /** The key color is the first tone, starting from T50, that matches the palette's chroma. */
-  public Hct getKeyColor() {
-    return this.keyColor;
-  }
-
-  private int averageArgb(int argb1, int argb2) {
-    int red1 = (argb1 >>> 16) & 0xff;
-    int green1 = (argb1 >>> 8) & 0xff;
-    int blue1 = argb1 & 0xff;
-    int red2 = (argb2 >>> 16) & 0xff;
-    int green2 = (argb2 >>> 8) & 0xff;
-    int blue2 = argb2 & 0xff;
-    int red = Math.round((red1 + red2) / 2f);
-    int green = Math.round((green1 + green2) / 2f);
-    int blue = Math.round((blue1 + blue2) / 2f);
-    return (255 << 24 | (red & 255) << 16 | (green & 255) << 8 | (blue & 255)) >>> 0;
-  }
-
-  /** Key color is a color that represents the hue and chroma of a tonal palette. */
-  private static final class KeyColor {
-    private final double hue;
-    private final double requestedChroma;
-
-    // Cache that maps tone to max chroma to avoid duplicated HCT calculation.
-    private final Map chromaCache = new HashMap<>();
-    private static final double MAX_CHROMA_VALUE = 200.0;
-
-    /** Key color is a color that represents the hue and chroma of a tonal palette */
-    public KeyColor(double hue, double requestedChroma) {
-      this.hue = hue;
-      this.requestedChroma = requestedChroma;
-    }
-
-    /**
-     * Creates a key color from a [hue] and a [chroma]. The key color is the first tone, starting
-     * from T50, matching the given hue and chroma.
-     *
-     * @return Key color [Hct]
-     */
-    public Hct create() {
-      // Pivot around T50 because T50 has the most chroma available, on
-      // average. Thus it is most likely to have a direct answer.
-      final int pivotTone = 50;
-      final int toneStepSize = 1;
-      // Epsilon to accept values slightly higher than the requested chroma.
-      final double epsilon = 0.01;
-
-      // Binary search to find the tone that can provide a chroma that is closest
-      // to the requested chroma.
-      int lowerTone = 0;
-      int upperTone = 100;
-      while (lowerTone < upperTone) {
-        final int midTone = (lowerTone + upperTone) / 2;
-        boolean isAscending = maxChroma(midTone) < maxChroma(midTone + toneStepSize);
-        boolean sufficientChroma = maxChroma(midTone) >= requestedChroma - epsilon;
-
-        if (sufficientChroma) {
-          // Either range [lowerTone, midTone] or [midTone, upperTone] has
-          // the answer, so search in the range that is closer the pivot tone.
-          if (Math.abs(lowerTone - pivotTone) < Math.abs(upperTone - pivotTone)) {
-            upperTone = midTone;
-          } else {
-            if (lowerTone == midTone) {
-              return Hct.from(this.hue, this.requestedChroma, lowerTone);
-            }
-            lowerTone = midTone;
-          }
-        } else {
-          // As there is no sufficient chroma in the midTone, follow the direction to the chroma
-          // peak.
-          if (isAscending) {
-            lowerTone = midTone + toneStepSize;
-          } else {
-            // Keep midTone for potential chroma peak.
-            upperTone = midTone;
-          }
-        }
-      }
-
-      return Hct.from(this.hue, this.requestedChroma, lowerTone);
-    }
-
-    // Find the maximum chroma for a given tone
-    private double maxChroma(int tone) {
-      if (chromaCache.get(tone) == null) {
-        Double newChroma = Hct.from(hue, MAX_CHROMA_VALUE, tone).getChroma();
-        if (newChroma != null) {
-          chromaCache.put(tone, newChroma);
-        }
-      }
-      return chromaCache.get(tone);
-    }
-  }
-}
diff --git a/java/quantize/PointProvider.java b/java/quantize/PointProvider.java
deleted file mode 100644
index 3b4df945..00000000
--- a/java/quantize/PointProvider.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package quantize;
-
-/** An interface to allow use of different color spaces by quantizers. */
-public interface PointProvider {
-  /** The four components in the color space of an sRGB color. */
-  public double[] fromInt(int argb);
-
-  /** The ARGB (i.e. hex code) representation of this color. */
-  public int toInt(double[] point);
-
-  /**
-   * Squared distance between two colors. Distance is defined by scientific color spaces and
-   * referred to as delta E.
-   */
-  public double distance(double[] a, double[] b);
-}
diff --git a/java/quantize/PointProviderLab.java b/java/quantize/PointProviderLab.java
deleted file mode 100644
index b990e691..00000000
--- a/java/quantize/PointProviderLab.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package quantize;
-
-import utils.ColorUtils;
-
-/**
- * Provides conversions needed for K-Means quantization. Converting input to points, and converting
- * the final state of the K-Means algorithm to colors.
- */
-public final class PointProviderLab implements PointProvider {
-  /**
-   * Convert a color represented in ARGB to a 3-element array of L*a*b* coordinates of the color.
-   */
-  @Override
-  public double[] fromInt(int argb) {
-    double[] lab = ColorUtils.labFromArgb(argb);
-    return new double[] {lab[0], lab[1], lab[2]};
-  }
-
-  /** Convert a 3-element array to a color represented in ARGB. */
-  @Override
-  public int toInt(double[] lab) {
-    return ColorUtils.argbFromLab(lab[0], lab[1], lab[2]);
-  }
-
-  /**
-   * Standard CIE 1976 delta E formula also takes the square root, unneeded here. This method is
-   * used by quantization algorithms to compare distance, and the relative ordering is the same,
-   * with or without a square root.
-   *
-   * 
This relatively minor optimization is helpful because this method is called at least once
-   * for each pixel in an image.
-   */
-  @Override
-  public double distance(double[] one, double[] two) {
-    double dL = (one[0] - two[0]);
-    double dA = (one[1] - two[1]);
-    double dB = (one[2] - two[2]);
-    return (dL * dL + dA * dA + dB * dB);
-  }
-}
diff --git a/java/quantize/Quantizer.java b/java/quantize/Quantizer.java
deleted file mode 100644
index ab2a0585..00000000
--- a/java/quantize/Quantizer.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package quantize;
-
-interface Quantizer {
-  public QuantizerResult quantize(int[] pixels, int maxColors);
-}
diff --git a/java/quantize/QuantizerCelebi.java b/java/quantize/QuantizerCelebi.java
deleted file mode 100644
index d0520fe2..00000000
--- a/java/quantize/QuantizerCelebi.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package quantize;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
- * An image quantizer that improves on the quality of a standard K-Means algorithm by setting the
- * K-Means initial state to the output of a Wu quantizer, instead of random centroids. Improves on
- * speed by several optimizations, as implemented in Wsmeans, or Weighted Square Means, K-Means with
- * those optimizations.
- *
- * 
This algorithm was designed by M. Emre Celebi, and was found in their 2011 paper, Improving
- * the Performance of K-Means for Color Quantization. https://arxiv.org/abs/1101.0395
- */
-public final class QuantizerCelebi {
-  private QuantizerCelebi() {}
-
-  /**
-   * Reduce the number of colors needed to represented the input, minimizing the difference between
-   * the original image and the recolored image.
-   *
-   * @param pixels Colors in ARGB format.
-   * @param maxColors The number of colors to divide the image into. A lower number of colors may be
-   *     returned.
-   * @return Map with keys of colors in ARGB format, and values of number of pixels in the original
-   *     image that correspond to the color in the quantized image.
-   */
-  public static Map quantize(int[] pixels, int maxColors) {
-    QuantizerWu wu = new QuantizerWu();
-    QuantizerResult wuResult = wu.quantize(pixels, maxColors);
-
-    Set wuClustersAsObjects = wuResult.colorToCount.keySet();
-    int index = 0;
-    int[] wuClusters = new int[wuClustersAsObjects.size()];
-    for (Integer argb : wuClustersAsObjects) {
-      wuClusters[index++] = argb;
-    }
-
-    return QuantizerWsmeans.quantize(pixels, wuClusters, maxColors);
-  }
-}
diff --git a/java/quantize/QuantizerMap.java b/java/quantize/QuantizerMap.java
deleted file mode 100644
index b2396ccd..00000000
--- a/java/quantize/QuantizerMap.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package quantize;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/** Creates a dictionary with keys of colors, and values of count of the color */
-public final class QuantizerMap implements Quantizer {
-  Map colorToCount;
-
-  @Override
-  public QuantizerResult quantize(int[] pixels, int colorCount) {
-    final Map pixelByCount = new LinkedHashMap<>();
-    for (int pixel : pixels) {
-      final Integer currentPixelCount = pixelByCount.get(pixel);
-      final int newPixelCount = currentPixelCount == null ? 1 : currentPixelCount + 1;
-      pixelByCount.put(pixel, newPixelCount);
-    }
-    colorToCount = pixelByCount;
-    return new QuantizerResult(pixelByCount);
-  }
-
-  public Map getColorToCount() {
-    return colorToCount;
-  }
-}
diff --git a/java/quantize/QuantizerResult.java b/java/quantize/QuantizerResult.java
deleted file mode 100644
index b9f00993..00000000
--- a/java/quantize/QuantizerResult.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package quantize;
-
-import java.util.Map;
-
-/** Represents result of a quantizer run */
-public final class QuantizerResult {
-  public final Map colorToCount;
-
-  QuantizerResult(Map colorToCount) {
-    this.colorToCount = colorToCount;
-  }
-}
diff --git a/java/quantize/QuantizerWsmeans.java b/java/quantize/QuantizerWsmeans.java
deleted file mode 100644
index ce8705ab..00000000
--- a/java/quantize/QuantizerWsmeans.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package quantize;
-
-import static java.lang.Math.min;
-
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Random;
-
-/**
- * An image quantizer that improves on the speed of a standard K-Means algorithm by implementing
- * several optimizations, including deduping identical pixels and a triangle inequality rule that
- * reduces the number of comparisons needed to identify which cluster a point should be moved to.
- *
- * 
Wsmeans stands for Weighted Square Means.
- *
- * 
This algorithm was designed by M. Emre Celebi, and was found in their 2011 paper, Improving
- * the Performance of K-Means for Color Quantization. https://arxiv.org/abs/1101.0395
- */
-public final class QuantizerWsmeans {
-  private QuantizerWsmeans() {}
-
-  private static final class Distance implements Comparable {
-    int index;
-    double distance;
-
-    Distance() {
-      this.index = -1;
-      this.distance = -1;
-    }
-
-    @Override
-    public int compareTo(Distance other) {
-      return ((Double) this.distance).compareTo(other.distance);
-    }
-  }
-
-  private static final int MAX_ITERATIONS = 10;
-  private static final double MIN_MOVEMENT_DISTANCE = 3.0;
-
-  /**
-   * Reduce the number of colors needed to represented the input, minimizing the difference between
-   * the original image and the recolored image.
-   *
-   * @param inputPixels Colors in ARGB format.
-   * @param startingClusters Defines the initial state of the quantizer. Passing an empty array is
-   *     fine, the implementation will create its own initial state that leads to reproducible
-   *     results for the same inputs. Passing an array that is the result of Wu quantization leads
-   *     to higher quality results.
-   * @param maxColors The number of colors to divide the image into. A lower number of colors may be
-   *     returned.
-   * @return Map with keys of colors in ARGB format, values of how many of the input pixels belong
-   *     to the color.
-   */
-  public static Map quantize(
-      int[] inputPixels, int[] startingClusters, int maxColors) {
-    // Uses a seeded random number generator to ensure consistent results.
-    Random random = new Random(0x42688);
-
-    Map pixelToCount = new LinkedHashMap<>();
-    double[][] points = new double[inputPixels.length][];
-    int[] pixels = new int[inputPixels.length];
-    PointProvider pointProvider = new PointProviderLab();
-
-    int pointCount = 0;
-    for (int i = 0; i < inputPixels.length; i++) {
-      int inputPixel = inputPixels[i];
-      Integer pixelCount = pixelToCount.get(inputPixel);
-      if (pixelCount == null) {
-        points[pointCount] = pointProvider.fromInt(inputPixel);
-        pixels[pointCount] = inputPixel;
-        pointCount++;
-
-        pixelToCount.put(inputPixel, 1);
-      } else {
-        pixelToCount.put(inputPixel, pixelCount + 1);
-      }
-    }
-
-    int[] counts = new int[pointCount];
-    for (int i = 0; i < pointCount; i++) {
-      int pixel = pixels[i];
-      int count = pixelToCount.get(pixel);
-      counts[i] = count;
-    }
-
-    int clusterCount = min(maxColors, pointCount);
-    if (startingClusters.length != 0) {
-      clusterCount = min(clusterCount, startingClusters.length);
-    }
-
-    double[][] clusters = new double[clusterCount][];
-    int clustersCreated = 0;
-    for (int i = 0; i < startingClusters.length; i++) {
-      clusters[i] = pointProvider.fromInt(startingClusters[i]);
-      clustersCreated++;
-    }
-
-    int additionalClustersNeeded = clusterCount - clustersCreated;
-    if (additionalClustersNeeded > 0) {
-      for (int i = 0; i < additionalClustersNeeded; i++) {}
-    }
-
-    int[] clusterIndices = new int[pointCount];
-    for (int i = 0; i < pointCount; i++) {
-      clusterIndices[i] = random.nextInt(clusterCount);
-    }
-
-    int[][] indexMatrix = new int[clusterCount][];
-    for (int i = 0; i < clusterCount; i++) {
-      indexMatrix[i] = new int[clusterCount];
-    }
-
-    Distance[][] distanceToIndexMatrix = new Distance[clusterCount][];
-    for (int i = 0; i < clusterCount; i++) {
-      distanceToIndexMatrix[i] = new Distance[clusterCount];
-      for (int j = 0; j < clusterCount; j++) {
-        distanceToIndexMatrix[i][j] = new Distance();
-      }
-    }
-
-    int[] pixelCountSums = new int[clusterCount];
-    for (int iteration = 0; iteration < MAX_ITERATIONS; iteration++) {
-      for (int i = 0; i < clusterCount; i++) {
-        for (int j = i + 1; j < clusterCount; j++) {
-          double distance = pointProvider.distance(clusters[i], clusters[j]);
-          distanceToIndexMatrix[j][i].distance = distance;
-          distanceToIndexMatrix[j][i].index = i;
-          distanceToIndexMatrix[i][j].distance = distance;
-          distanceToIndexMatrix[i][j].index = j;
-        }
-        Arrays.sort(distanceToIndexMatrix[i]);
-        for (int j = 0; j < clusterCount; j++) {
-          indexMatrix[i][j] = distanceToIndexMatrix[i][j].index;
-        }
-      }
-
-      int pointsMoved = 0;
-      for (int i = 0; i < pointCount; i++) {
-        double[] point = points[i];
-        int previousClusterIndex = clusterIndices[i];
-        double[] previousCluster = clusters[previousClusterIndex];
-        double previousDistance = pointProvider.distance(point, previousCluster);
-
-        double minimumDistance = previousDistance;
-        int newClusterIndex = -1;
-        for (int j = 0; j < clusterCount; j++) {
-          if (distanceToIndexMatrix[previousClusterIndex][j].distance >= 4 * previousDistance) {
-            continue;
-          }
-          double distance = pointProvider.distance(point, clusters[j]);
-          if (distance < minimumDistance) {
-            minimumDistance = distance;
-            newClusterIndex = j;
-          }
-        }
-        if (newClusterIndex != -1) {
-          double distanceChange =
-              Math.abs(Math.sqrt(minimumDistance) - Math.sqrt(previousDistance));
-          if (distanceChange > MIN_MOVEMENT_DISTANCE) {
-            pointsMoved++;
-            clusterIndices[i] = newClusterIndex;
-          }
-        }
-      }
-
-      if (pointsMoved == 0 && iteration != 0) {
-        break;
-      }
-
-      double[] componentASums = new double[clusterCount];
-      double[] componentBSums = new double[clusterCount];
-      double[] componentCSums = new double[clusterCount];
-      Arrays.fill(pixelCountSums, 0);
-      for (int i = 0; i < pointCount; i++) {
-        int clusterIndex = clusterIndices[i];
-        double[] point = points[i];
-        int count = counts[i];
-        pixelCountSums[clusterIndex] += count;
-        componentASums[clusterIndex] += (point[0] * count);
-        componentBSums[clusterIndex] += (point[1] * count);
-        componentCSums[clusterIndex] += (point[2] * count);
-      }
-
-      for (int i = 0; i < clusterCount; i++) {
-        int count = pixelCountSums[i];
-        if (count == 0) {
-          clusters[i] = new double[] {0., 0., 0.};
-          continue;
-        }
-        double a = componentASums[i] / count;
-        double b = componentBSums[i] / count;
-        double c = componentCSums[i] / count;
-        clusters[i][0] = a;
-        clusters[i][1] = b;
-        clusters[i][2] = c;
-      }
-    }
-
-    Map argbToPopulation = new LinkedHashMap<>();
-    for (int i = 0; i < clusterCount; i++) {
-      int count = pixelCountSums[i];
-      if (count == 0) {
-        continue;
-      }
-
-      int possibleNewCluster = pointProvider.toInt(clusters[i]);
-      if (argbToPopulation.containsKey(possibleNewCluster)) {
-        continue;
-      }
-
-      argbToPopulation.put(possibleNewCluster, count);
-    }
-
-    return argbToPopulation;
-  }
-}
diff --git a/java/quantize/QuantizerWu.java b/java/quantize/QuantizerWu.java
deleted file mode 100644
index e7c3cc65..00000000
--- a/java/quantize/QuantizerWu.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package quantize;
-
-import utils.ColorUtils;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * An image quantizer that divides the image's pixels into clusters by recursively cutting an RGB
- * cube, based on the weight of pixels in each area of the cube.
- *
- * 
The algorithm was described by Xiaolin Wu in Graphic Gems II, published in 1991.
- */
-public final class QuantizerWu implements Quantizer {
-  int[] weights;
-  int[] momentsR;
-  int[] momentsG;
-  int[] momentsB;
-  double[] moments;
-  Box[] cubes;
-
-  // A histogram of all the input colors is constructed. It has the shape of a
-  // cube. The cube would be too large if it contained all 16 million colors:
-  // historical best practice is to use 5 bits  of the 8 in each channel,
-  // reducing the histogram to a volume of ~32,000.
-  private static final int INDEX_BITS = 5;
-  private static final int INDEX_COUNT = 33; // ((1 << INDEX_BITS) + 1)
-  private static final int TOTAL_SIZE = 35937; // INDEX_COUNT * INDEX_COUNT * INDEX_COUNT
-
-  @Override
-  public QuantizerResult quantize(int[] pixels, int colorCount) {
-    QuantizerResult mapResult = new QuantizerMap().quantize(pixels, colorCount);
-    constructHistogram(mapResult.colorToCount);
-    createMoments();
-    CreateBoxesResult createBoxesResult = createBoxes(colorCount);
-    List colors = createResult(createBoxesResult.resultCount);
-    Map resultMap = new LinkedHashMap<>();
-    for (int color : colors) {
-      resultMap.put(color, 0);
-    }
-    return new QuantizerResult(resultMap);
-  }
-
-  static int getIndex(int r, int g, int b) {
-    return (r << (INDEX_BITS * 2)) + (r << (INDEX_BITS + 1)) + r + (g << INDEX_BITS) + g + b;
-  }
-
-  void constructHistogram(Map pixels) {
-    weights = new int[TOTAL_SIZE];
-    momentsR = new int[TOTAL_SIZE];
-    momentsG = new int[TOTAL_SIZE];
-    momentsB = new int[TOTAL_SIZE];
-    moments = new double[TOTAL_SIZE];
-
-    for (Map.Entry pair : pixels.entrySet()) {
-      int pixel = pair.getKey();
-      int count = pair.getValue();
-      int red = ColorUtils.redFromArgb(pixel);
-      int green = ColorUtils.greenFromArgb(pixel);
-      int blue = ColorUtils.blueFromArgb(pixel);
-      int bitsToRemove = 8 - INDEX_BITS;
-      int iR = (red >> bitsToRemove) + 1;
-      int iG = (green >> bitsToRemove) + 1;
-      int iB = (blue >> bitsToRemove) + 1;
-      int index = getIndex(iR, iG, iB);
-      weights[index] += count;
-      momentsR[index] += (red * count);
-      momentsG[index] += (green * count);
-      momentsB[index] += (blue * count);
-      moments[index] += (count * ((red * red) + (green * green) + (blue * blue)));
-    }
-  }
-
-  void createMoments() {
-    for (int r = 1; r < INDEX_COUNT; ++r) {
-      int[] area = new int[INDEX_COUNT];
-      int[] areaR = new int[INDEX_COUNT];
-      int[] areaG = new int[INDEX_COUNT];
-      int[] areaB = new int[INDEX_COUNT];
-      double[] area2 = new double[INDEX_COUNT];
-
-      for (int g = 1; g < INDEX_COUNT; ++g) {
-        int line = 0;
-        int lineR = 0;
-        int lineG = 0;
-        int lineB = 0;
-        double line2 = 0.0;
-        for (int b = 1; b < INDEX_COUNT; ++b) {
-          int index = getIndex(r, g, b);
-          line += weights[index];
-          lineR += momentsR[index];
-          lineG += momentsG[index];
-          lineB += momentsB[index];
-          line2 += moments[index];
-
-          area[b] += line;
-          areaR[b] += lineR;
-          areaG[b] += lineG;
-          areaB[b] += lineB;
-          area2[b] += line2;
-
-          int previousIndex = getIndex(r - 1, g, b);
-          weights[index] = weights[previousIndex] + area[b];
-          momentsR[index] = momentsR[previousIndex] + areaR[b];
-          momentsG[index] = momentsG[previousIndex] + areaG[b];
-          momentsB[index] = momentsB[previousIndex] + areaB[b];
-          moments[index] = moments[previousIndex] + area2[b];
-        }
-      }
-    }
-  }
-
-  CreateBoxesResult createBoxes(int maxColorCount) {
-    cubes = new Box[maxColorCount];
-    for (int i = 0; i < maxColorCount; i++) {
-      cubes[i] = new Box();
-    }
-    double[] volumeVariance = new double[maxColorCount];
-    Box firstBox = cubes[0];
-    firstBox.r1 = INDEX_COUNT - 1;
-    firstBox.g1 = INDEX_COUNT - 1;
-    firstBox.b1 = INDEX_COUNT - 1;
-
-    int generatedColorCount = maxColorCount;
-    int next = 0;
-    for (int i = 1; i < maxColorCount; i++) {
-      if (cut(cubes[next], cubes[i])) {
-        volumeVariance[next] = (cubes[next].vol > 1) ? variance(cubes[next]) : 0.0;
-        volumeVariance[i] = (cubes[i].vol > 1) ? variance(cubes[i]) : 0.0;
-      } else {
-        volumeVariance[next] = 0.0;
-        i--;
-      }
-
-      next = 0;
-
-      double temp = volumeVariance[0];
-      for (int j = 1; j <= i; j++) {
-        if (volumeVariance[j] > temp) {
-          temp = volumeVariance[j];
-          next = j;
-        }
-      }
-      if (temp <= 0.0) {
-        generatedColorCount = i + 1;
-        break;
-      }
-    }
-
-    return new CreateBoxesResult(maxColorCount, generatedColorCount);
-  }
-
-  List createResult(int colorCount) {
-    List colors = new ArrayList<>();
-    for (int i = 0; i < colorCount; ++i) {
-      Box cube = cubes[i];
-      int weight = volume(cube, weights);
-      if (weight > 0) {
-        int r = volume(cube, momentsR) / weight;
-        int g = volume(cube, momentsG) / weight;
-        int b = volume(cube, momentsB) / weight;
-        int color = (255 << 24) | ((r & 0x0ff) << 16) | ((g & 0x0ff) << 8) | (b & 0x0ff);
-        colors.add(color);
-      }
-    }
-    return colors;
-  }
-
-  double variance(Box cube) {
-    int dr = volume(cube, momentsR);
-    int dg = volume(cube, momentsG);
-    int db = volume(cube, momentsB);
-    double xx =
-        moments[getIndex(cube.r1, cube.g1, cube.b1)]
-            - moments[getIndex(cube.r1, cube.g1, cube.b0)]
-            - moments[getIndex(cube.r1, cube.g0, cube.b1)]
-            + moments[getIndex(cube.r1, cube.g0, cube.b0)]
-            - moments[getIndex(cube.r0, cube.g1, cube.b1)]
-            + moments[getIndex(cube.r0, cube.g1, cube.b0)]
-            + moments[getIndex(cube.r0, cube.g0, cube.b1)]
-            - moments[getIndex(cube.r0, cube.g0, cube.b0)];
-
-    int hypotenuse = dr * dr + dg * dg + db * db;
-    int volume = volume(cube, weights);
-    return xx - hypotenuse / ((double) volume);
-  }
-
-  Boolean cut(Box one, Box two) {
-    int wholeR = volume(one, momentsR);
-    int wholeG = volume(one, momentsG);
-    int wholeB = volume(one, momentsB);
-    int wholeW = volume(one, weights);
-
-    MaximizeResult maxRResult =
-        maximize(one, Direction.RED, one.r0 + 1, one.r1, wholeR, wholeG, wholeB, wholeW);
-    MaximizeResult maxGResult =
-        maximize(one, Direction.GREEN, one.g0 + 1, one.g1, wholeR, wholeG, wholeB, wholeW);
-    MaximizeResult maxBResult =
-        maximize(one, Direction.BLUE, one.b0 + 1, one.b1, wholeR, wholeG, wholeB, wholeW);
-    Direction cutDirection;
-    double maxR = maxRResult.maximum;
-    double maxG = maxGResult.maximum;
-    double maxB = maxBResult.maximum;
-    if (maxR >= maxG && maxR >= maxB) {
-      if (maxRResult.cutLocation < 0) {
-        return false;
-      }
-      cutDirection = Direction.RED;
-    } else if (maxG >= maxR && maxG >= maxB) {
-      cutDirection = Direction.GREEN;
-    } else {
-      cutDirection = Direction.BLUE;
-    }
-
-    two.r1 = one.r1;
-    two.g1 = one.g1;
-    two.b1 = one.b1;
-
-    switch (cutDirection) {
-      case RED -> {
-        one.r1 = maxRResult.cutLocation;
-        two.r0 = one.r1;
-        two.g0 = one.g0;
-        two.b0 = one.b0;
-      }
-      case GREEN -> {
-        one.g1 = maxGResult.cutLocation;
-        two.r0 = one.r0;
-        two.g0 = one.g1;
-        two.b0 = one.b0;
-      }
-      case BLUE -> {
-        one.b1 = maxBResult.cutLocation;
-        two.r0 = one.r0;
-        two.g0 = one.g0;
-        two.b0 = one.b1;
-      }
-    }
-
-    one.vol = (one.r1 - one.r0) * (one.g1 - one.g0) * (one.b1 - one.b0);
-    two.vol = (two.r1 - two.r0) * (two.g1 - two.g0) * (two.b1 - two.b0);
-
-    return true;
-  }
-
-  MaximizeResult maximize(
-      Box cube,
-      Direction direction,
-      int first,
-      int last,
-      int wholeR,
-      int wholeG,
-      int wholeB,
-      int wholeW) {
-    int bottomR = bottom(cube, direction, momentsR);
-    int bottomG = bottom(cube, direction, momentsG);
-    int bottomB = bottom(cube, direction, momentsB);
-    int bottomW = bottom(cube, direction, weights);
-
-    double max = 0.0;
-    int cut = -1;
-
-    int halfR = 0;
-    int halfG = 0;
-    int halfB = 0;
-    int halfW = 0;
-    for (int i = first; i < last; i++) {
-      halfR = bottomR + top(cube, direction, i, momentsR);
-      halfG = bottomG + top(cube, direction, i, momentsG);
-      halfB = bottomB + top(cube, direction, i, momentsB);
-      halfW = bottomW + top(cube, direction, i, weights);
-      if (halfW == 0) {
-        continue;
-      }
-
-      double tempNumerator = halfR * halfR + halfG * halfG + halfB * halfB;
-      double tempDenominator = halfW;
-      double temp = tempNumerator / tempDenominator;
-
-      halfR = wholeR - halfR;
-      halfG = wholeG - halfG;
-      halfB = wholeB - halfB;
-      halfW = wholeW - halfW;
-      if (halfW == 0) {
-        continue;
-      }
-
-      tempNumerator = halfR * halfR + halfG * halfG + halfB * halfB;
-      tempDenominator = halfW;
-      temp += (tempNumerator / tempDenominator);
-
-      if (temp > max) {
-        max = temp;
-        cut = i;
-      }
-    }
-    return new MaximizeResult(cut, max);
-  }
-
-  static int volume(Box cube, int[] moment) {
-    return (moment[getIndex(cube.r1, cube.g1, cube.b1)]
-        - moment[getIndex(cube.r1, cube.g1, cube.b0)]
-        - moment[getIndex(cube.r1, cube.g0, cube.b1)]
-        + moment[getIndex(cube.r1, cube.g0, cube.b0)]
-        - moment[getIndex(cube.r0, cube.g1, cube.b1)]
-        + moment[getIndex(cube.r0, cube.g1, cube.b0)]
-        + moment[getIndex(cube.r0, cube.g0, cube.b1)]
-        - moment[getIndex(cube.r0, cube.g0, cube.b0)]);
-  }
-
-  static int bottom(Box cube, Direction direction, int[] moment) {
-    return switch (direction) {
-      case RED ->
-          -moment[getIndex(cube.r0, cube.g1, cube.b1)]
-              + moment[getIndex(cube.r0, cube.g1, cube.b0)]
-              + moment[getIndex(cube.r0, cube.g0, cube.b1)]
-              - moment[getIndex(cube.r0, cube.g0, cube.b0)];
-      case GREEN ->
-          -moment[getIndex(cube.r1, cube.g0, cube.b1)]
-              + moment[getIndex(cube.r1, cube.g0, cube.b0)]
-              + moment[getIndex(cube.r0, cube.g0, cube.b1)]
-              - moment[getIndex(cube.r0, cube.g0, cube.b0)];
-      case BLUE ->
-          -moment[getIndex(cube.r1, cube.g1, cube.b0)]
-              + moment[getIndex(cube.r1, cube.g0, cube.b0)]
-              + moment[getIndex(cube.r0, cube.g1, cube.b0)]
-              - moment[getIndex(cube.r0, cube.g0, cube.b0)];
-    };
-  }
-
-  static int top(Box cube, Direction direction, int position, int[] moment) {
-    return switch (direction) {
-      case RED ->
-          (moment[getIndex(position, cube.g1, cube.b1)]
-              - moment[getIndex(position, cube.g1, cube.b0)]
-              - moment[getIndex(position, cube.g0, cube.b1)]
-              + moment[getIndex(position, cube.g0, cube.b0)]);
-      case GREEN ->
-          (moment[getIndex(cube.r1, position, cube.b1)]
-              - moment[getIndex(cube.r1, position, cube.b0)]
-              - moment[getIndex(cube.r0, position, cube.b1)]
-              + moment[getIndex(cube.r0, position, cube.b0)]);
-      case BLUE ->
-          (moment[getIndex(cube.r1, cube.g1, position)]
-              - moment[getIndex(cube.r1, cube.g0, position)]
-              - moment[getIndex(cube.r0, cube.g1, position)]
-              + moment[getIndex(cube.r0, cube.g0, position)]);
-    };
-  }
-
-  private static enum Direction {
-    RED,
-    GREEN,
-    BLUE
-  }
-
-  private static final class MaximizeResult {
-    // < 0 if cut impossible
-    int cutLocation;
-    double maximum;
-
-    MaximizeResult(int cut, double max) {
-      this.cutLocation = cut;
-      this.maximum = max;
-    }
-  }
-
-  private static final class CreateBoxesResult {
-    int requestedCount;
-    int resultCount;
-
-    CreateBoxesResult(int requestedCount, int resultCount) {
-      this.requestedCount = requestedCount;
-      this.resultCount = resultCount;
-    }
-  }
-
-  private static final class Box {
-    int r0 = 0;
-    int r1 = 0;
-    int g0 = 0;
-    int g1 = 0;
-    int b0 = 0;
-    int b1 = 0;
-    int vol = 0;
-  }
-}
diff --git a/java/scheme/Scheme.java b/java/scheme/Scheme.java
deleted file mode 100644
index 1a6380ba..00000000
--- a/java/scheme/Scheme.java
+++ /dev/null
@@ -1,821 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// This file is automatically generated. Do not modify it.
-
-package scheme;
-
-import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.errorprone.annotations.CheckReturnValue;
-import palettes.CorePalette;
-
-/**
- * Represents a Material color scheme, a mapping of color roles to colors.
- *
- * @deprecated Please use dynamiccolor.DynamicScheme instead. Refer
- *     to https://github.com/material-foundation/material-color-utilities/blob/main/make_schemes.md
- *     for migration guidance.
- */
-@Deprecated
-@CheckReturnValue
-public class Scheme {
-  private int primary;
-  private int onPrimary;
-  private int primaryContainer;
-  private int onPrimaryContainer;
-  private int secondary;
-  private int onSecondary;
-  private int secondaryContainer;
-  private int onSecondaryContainer;
-  private int tertiary;
-  private int onTertiary;
-  private int tertiaryContainer;
-  private int onTertiaryContainer;
-  private int error;
-  private int onError;
-  private int errorContainer;
-  private int onErrorContainer;
-  private int background;
-  private int onBackground;
-  private int surface;
-  private int onSurface;
-  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;
-
-  public Scheme() {}
-
-  public Scheme(
-      int primary,
-      int onPrimary,
-      int primaryContainer,
-      int onPrimaryContainer,
-      int secondary,
-      int onSecondary,
-      int secondaryContainer,
-      int onSecondaryContainer,
-      int tertiary,
-      int onTertiary,
-      int tertiaryContainer,
-      int onTertiaryContainer,
-      int error,
-      int onError,
-      int errorContainer,
-      int onErrorContainer,
-      int background,
-      int onBackground,
-      int surface,
-      int onSurface,
-      int surfaceVariant,
-      int onSurfaceVariant,
-      int outline,
-      int outlineVariant,
-      int shadow,
-      int scrim,
-      int inverseSurface,
-      int inverseOnSurface,
-      int inversePrimary) {
-    super();
-    this.primary = primary;
-    this.onPrimary = onPrimary;
-    this.primaryContainer = primaryContainer;
-    this.onPrimaryContainer = onPrimaryContainer;
-    this.secondary = secondary;
-    this.onSecondary = onSecondary;
-    this.secondaryContainer = secondaryContainer;
-    this.onSecondaryContainer = onSecondaryContainer;
-    this.tertiary = tertiary;
-    this.onTertiary = onTertiary;
-    this.tertiaryContainer = tertiaryContainer;
-    this.onTertiaryContainer = onTertiaryContainer;
-    this.error = error;
-    this.onError = onError;
-    this.errorContainer = errorContainer;
-    this.onErrorContainer = onErrorContainer;
-    this.background = background;
-    this.onBackground = onBackground;
-    this.surface = surface;
-    this.onSurface = onSurface;
-    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;
-  }
-
-  /** Creates a light theme Scheme from a source color in ARGB, i.e. a hex code. */
-  public static Scheme light(int argb) {
-    return lightFromCorePalette(CorePalette.of(argb));
-  }
-
-  /** Creates a dark theme Scheme from a source color in ARGB, i.e. a hex code. */
-  public static Scheme dark(int argb) {
-    return darkFromCorePalette(CorePalette.of(argb));
-  }
-
-  /** Creates a light theme content-based Scheme from a source color in ARGB, i.e. a hex code. */
-  public static Scheme lightContent(int argb) {
-    return lightFromCorePalette(CorePalette.contentOf(argb));
-  }
-
-  /** Creates a dark theme content-based Scheme from a source color in ARGB, i.e. a hex code. */
-  public static Scheme darkContent(int argb) {
-    return darkFromCorePalette(CorePalette.contentOf(argb));
-  }
-
-  private static Scheme lightFromCorePalette(CorePalette core) {
-    return new Scheme()
-        .withPrimary(core.a1.tone(40))
-        .withOnPrimary(core.a1.tone(100))
-        .withPrimaryContainer(core.a1.tone(90))
-        .withOnPrimaryContainer(core.a1.tone(10))
-        .withSecondary(core.a2.tone(40))
-        .withOnSecondary(core.a2.tone(100))
-        .withSecondaryContainer(core.a2.tone(90))
-        .withOnSecondaryContainer(core.a2.tone(10))
-        .withTertiary(core.a3.tone(40))
-        .withOnTertiary(core.a3.tone(100))
-        .withTertiaryContainer(core.a3.tone(90))
-        .withOnTertiaryContainer(core.a3.tone(10))
-        .withError(core.error.tone(40))
-        .withOnError(core.error.tone(100))
-        .withErrorContainer(core.error.tone(90))
-        .withOnErrorContainer(core.error.tone(10))
-        .withBackground(core.n1.tone(99))
-        .withOnBackground(core.n1.tone(10))
-        .withSurface(core.n1.tone(99))
-        .withOnSurface(core.n1.tone(10))
-        .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));
-  }
-
-  private static Scheme darkFromCorePalette(CorePalette core) {
-    return new Scheme()
-        .withPrimary(core.a1.tone(80))
-        .withOnPrimary(core.a1.tone(20))
-        .withPrimaryContainer(core.a1.tone(30))
-        .withOnPrimaryContainer(core.a1.tone(90))
-        .withSecondary(core.a2.tone(80))
-        .withOnSecondary(core.a2.tone(20))
-        .withSecondaryContainer(core.a2.tone(30))
-        .withOnSecondaryContainer(core.a2.tone(90))
-        .withTertiary(core.a3.tone(80))
-        .withOnTertiary(core.a3.tone(20))
-        .withTertiaryContainer(core.a3.tone(30))
-        .withOnTertiaryContainer(core.a3.tone(90))
-        .withError(core.error.tone(80))
-        .withOnError(core.error.tone(20))
-        .withErrorContainer(core.error.tone(30))
-        .withOnErrorContainer(core.error.tone(80))
-        .withBackground(core.n1.tone(10))
-        .withOnBackground(core.n1.tone(90))
-        .withSurface(core.n1.tone(10))
-        .withOnSurface(core.n1.tone(90))
-        .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));
-  }
-
-  public int getPrimary() {
-    return primary;
-  }
-
-  public void setPrimary(int primary) {
-    this.primary = primary;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withPrimary(int primary) {
-    this.primary = primary;
-    return this;
-  }
-
-  public int getOnPrimary() {
-    return onPrimary;
-  }
-
-  public void setOnPrimary(int onPrimary) {
-    this.onPrimary = onPrimary;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withOnPrimary(int onPrimary) {
-    this.onPrimary = onPrimary;
-    return this;
-  }
-
-  public int getPrimaryContainer() {
-    return primaryContainer;
-  }
-
-  public void setPrimaryContainer(int primaryContainer) {
-    this.primaryContainer = primaryContainer;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withPrimaryContainer(int primaryContainer) {
-    this.primaryContainer = primaryContainer;
-    return this;
-  }
-
-  public int getOnPrimaryContainer() {
-    return onPrimaryContainer;
-  }
-
-  public void setOnPrimaryContainer(int onPrimaryContainer) {
-    this.onPrimaryContainer = onPrimaryContainer;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withOnPrimaryContainer(int onPrimaryContainer) {
-    this.onPrimaryContainer = onPrimaryContainer;
-    return this;
-  }
-
-  public int getSecondary() {
-    return secondary;
-  }
-
-  public void setSecondary(int secondary) {
-    this.secondary = secondary;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withSecondary(int secondary) {
-    this.secondary = secondary;
-    return this;
-  }
-
-  public int getOnSecondary() {
-    return onSecondary;
-  }
-
-  public void setOnSecondary(int onSecondary) {
-    this.onSecondary = onSecondary;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withOnSecondary(int onSecondary) {
-    this.onSecondary = onSecondary;
-    return this;
-  }
-
-  public int getSecondaryContainer() {
-    return secondaryContainer;
-  }
-
-  public void setSecondaryContainer(int secondaryContainer) {
-    this.secondaryContainer = secondaryContainer;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withSecondaryContainer(int secondaryContainer) {
-    this.secondaryContainer = secondaryContainer;
-    return this;
-  }
-
-  public int getOnSecondaryContainer() {
-    return onSecondaryContainer;
-  }
-
-  public void setOnSecondaryContainer(int onSecondaryContainer) {
-    this.onSecondaryContainer = onSecondaryContainer;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withOnSecondaryContainer(int onSecondaryContainer) {
-    this.onSecondaryContainer = onSecondaryContainer;
-    return this;
-  }
-
-  public int getTertiary() {
-    return tertiary;
-  }
-
-  public void setTertiary(int tertiary) {
-    this.tertiary = tertiary;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withTertiary(int tertiary) {
-    this.tertiary = tertiary;
-    return this;
-  }
-
-  public int getOnTertiary() {
-    return onTertiary;
-  }
-
-  public void setOnTertiary(int onTertiary) {
-    this.onTertiary = onTertiary;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withOnTertiary(int onTertiary) {
-    this.onTertiary = onTertiary;
-    return this;
-  }
-
-  public int getTertiaryContainer() {
-    return tertiaryContainer;
-  }
-
-  public void setTertiaryContainer(int tertiaryContainer) {
-    this.tertiaryContainer = tertiaryContainer;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withTertiaryContainer(int tertiaryContainer) {
-    this.tertiaryContainer = tertiaryContainer;
-    return this;
-  }
-
-  public int getOnTertiaryContainer() {
-    return onTertiaryContainer;
-  }
-
-  public void setOnTertiaryContainer(int onTertiaryContainer) {
-    this.onTertiaryContainer = onTertiaryContainer;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withOnTertiaryContainer(int onTertiaryContainer) {
-    this.onTertiaryContainer = onTertiaryContainer;
-    return this;
-  }
-
-  public int getError() {
-    return error;
-  }
-
-  public void setError(int error) {
-    this.error = error;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withError(int error) {
-    this.error = error;
-    return this;
-  }
-
-  public int getOnError() {
-    return onError;
-  }
-
-  public void setOnError(int onError) {
-    this.onError = onError;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withOnError(int onError) {
-    this.onError = onError;
-    return this;
-  }
-
-  public int getErrorContainer() {
-    return errorContainer;
-  }
-
-  public void setErrorContainer(int errorContainer) {
-    this.errorContainer = errorContainer;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withErrorContainer(int errorContainer) {
-    this.errorContainer = errorContainer;
-    return this;
-  }
-
-  public int getOnErrorContainer() {
-    return onErrorContainer;
-  }
-
-  public void setOnErrorContainer(int onErrorContainer) {
-    this.onErrorContainer = onErrorContainer;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withOnErrorContainer(int onErrorContainer) {
-    this.onErrorContainer = onErrorContainer;
-    return this;
-  }
-
-  public int getBackground() {
-    return background;
-  }
-
-  public void setBackground(int background) {
-    this.background = background;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withBackground(int background) {
-    this.background = background;
-    return this;
-  }
-
-  public int getOnBackground() {
-    return onBackground;
-  }
-
-  public void setOnBackground(int onBackground) {
-    this.onBackground = onBackground;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withOnBackground(int onBackground) {
-    this.onBackground = onBackground;
-    return this;
-  }
-
-  public int getSurface() {
-    return surface;
-  }
-
-  public void setSurface(int surface) {
-    this.surface = surface;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withSurface(int surface) {
-    this.surface = surface;
-    return this;
-  }
-
-  public int getOnSurface() {
-    return onSurface;
-  }
-
-  public void setOnSurface(int onSurface) {
-    this.onSurface = onSurface;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withOnSurface(int onSurface) {
-    this.onSurface = onSurface;
-    return this;
-  }
-
-  public int getSurfaceVariant() {
-    return surfaceVariant;
-  }
-
-  public void setSurfaceVariant(int surfaceVariant) {
-    this.surfaceVariant = surfaceVariant;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withSurfaceVariant(int surfaceVariant) {
-    this.surfaceVariant = surfaceVariant;
-    return this;
-  }
-
-  public int getOnSurfaceVariant() {
-    return onSurfaceVariant;
-  }
-
-  public void setOnSurfaceVariant(int onSurfaceVariant) {
-    this.onSurfaceVariant = onSurfaceVariant;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withOnSurfaceVariant(int onSurfaceVariant) {
-    this.onSurfaceVariant = onSurfaceVariant;
-    return this;
-  }
-
-  public int getOutline() {
-    return outline;
-  }
-
-  public void setOutline(int outline) {
-    this.outline = outline;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withOutline(int outline) {
-    this.outline = outline;
-    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;
-  }
-
-  public void setShadow(int shadow) {
-    this.shadow = shadow;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withShadow(int shadow) {
-    this.shadow = shadow;
-    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;
-  }
-
-  public void setInverseSurface(int inverseSurface) {
-    this.inverseSurface = inverseSurface;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withInverseSurface(int inverseSurface) {
-    this.inverseSurface = inverseSurface;
-    return this;
-  }
-
-  public int getInverseOnSurface() {
-    return inverseOnSurface;
-  }
-
-  public void setInverseOnSurface(int inverseOnSurface) {
-    this.inverseOnSurface = inverseOnSurface;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withInverseOnSurface(int inverseOnSurface) {
-    this.inverseOnSurface = inverseOnSurface;
-    return this;
-  }
-
-  public int getInversePrimary() {
-    return inversePrimary;
-  }
-
-  public void setInversePrimary(int inversePrimary) {
-    this.inversePrimary = inversePrimary;
-  }
-
-  @CanIgnoreReturnValue
-  public Scheme withInversePrimary(int inversePrimary) {
-    this.inversePrimary = inversePrimary;
-    return this;
-  }
-
-  @Override
-  public String toString() {
-    return "Scheme{"
-        + "primary="
-        + primary
-        + ", onPrimary="
-        + onPrimary
-        + ", primaryContainer="
-        + primaryContainer
-        + ", onPrimaryContainer="
-        + onPrimaryContainer
-        + ", secondary="
-        + secondary
-        + ", onSecondary="
-        + onSecondary
-        + ", secondaryContainer="
-        + secondaryContainer
-        + ", onSecondaryContainer="
-        + onSecondaryContainer
-        + ", tertiary="
-        + tertiary
-        + ", onTertiary="
-        + onTertiary
-        + ", tertiaryContainer="
-        + tertiaryContainer
-        + ", onTertiaryContainer="
-        + onTertiaryContainer
-        + ", error="
-        + error
-        + ", onError="
-        + onError
-        + ", errorContainer="
-        + errorContainer
-        + ", onErrorContainer="
-        + onErrorContainer
-        + ", background="
-        + background
-        + ", onBackground="
-        + onBackground
-        + ", surface="
-        + surface
-        + ", onSurface="
-        + onSurface
-        + ", surfaceVariant="
-        + surfaceVariant
-        + ", onSurfaceVariant="
-        + onSurfaceVariant
-        + ", outline="
-        + outline
-        + ", outlineVariant="
-        + outlineVariant
-        + ", shadow="
-        + shadow
-        + ", scrim="
-        + scrim
-        + ", inverseSurface="
-        + inverseSurface
-        + ", inverseOnSurface="
-        + inverseOnSurface
-        + ", inversePrimary="
-        + inversePrimary
-        + '}';
-  }
-
-  @Override
-  public boolean equals(Object object) {
-    if (this == object) {
-      return true;
-    }
-    if (!(object instanceof Scheme)) {
-      return false;
-    }
-
-    Scheme scheme = (Scheme) object;
-
-    if (primary != scheme.primary) {
-      return false;
-    }
-    if (onPrimary != scheme.onPrimary) {
-      return false;
-    }
-    if (primaryContainer != scheme.primaryContainer) {
-      return false;
-    }
-    if (onPrimaryContainer != scheme.onPrimaryContainer) {
-      return false;
-    }
-    if (secondary != scheme.secondary) {
-      return false;
-    }
-    if (onSecondary != scheme.onSecondary) {
-      return false;
-    }
-    if (secondaryContainer != scheme.secondaryContainer) {
-      return false;
-    }
-    if (onSecondaryContainer != scheme.onSecondaryContainer) {
-      return false;
-    }
-    if (tertiary != scheme.tertiary) {
-      return false;
-    }
-    if (onTertiary != scheme.onTertiary) {
-      return false;
-    }
-    if (tertiaryContainer != scheme.tertiaryContainer) {
-      return false;
-    }
-    if (onTertiaryContainer != scheme.onTertiaryContainer) {
-      return false;
-    }
-    if (error != scheme.error) {
-      return false;
-    }
-    if (onError != scheme.onError) {
-      return false;
-    }
-    if (errorContainer != scheme.errorContainer) {
-      return false;
-    }
-    if (onErrorContainer != scheme.onErrorContainer) {
-      return false;
-    }
-    if (background != scheme.background) {
-      return false;
-    }
-    if (onBackground != scheme.onBackground) {
-      return false;
-    }
-    if (surface != scheme.surface) {
-      return false;
-    }
-    if (onSurface != scheme.onSurface) {
-      return false;
-    }
-    if (surfaceVariant != scheme.surfaceVariant) {
-      return false;
-    }
-    if (onSurfaceVariant != scheme.onSurfaceVariant) {
-      return false;
-    }
-    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;
-    }
-    if (inverseOnSurface != scheme.inverseOnSurface) {
-      return false;
-    }
-    if (inversePrimary != scheme.inversePrimary) {
-      return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    int result = System.identityHashCode(this);
-    result = 31 * result + primary;
-    result = 31 * result + onPrimary;
-    result = 31 * result + primaryContainer;
-    result = 31 * result + onPrimaryContainer;
-    result = 31 * result + secondary;
-    result = 31 * result + onSecondary;
-    result = 31 * result + secondaryContainer;
-    result = 31 * result + onSecondaryContainer;
-    result = 31 * result + tertiary;
-    result = 31 * result + onTertiary;
-    result = 31 * result + tertiaryContainer;
-    result = 31 * result + onTertiaryContainer;
-    result = 31 * result + error;
-    result = 31 * result + onError;
-    result = 31 * result + errorContainer;
-    result = 31 * result + onErrorContainer;
-    result = 31 * result + background;
-    result = 31 * result + onBackground;
-    result = 31 * result + surface;
-    result = 31 * result + onSurface;
-    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;
-    return result;
-  }
-}
diff --git a/java/scheme/SchemeContent.java b/java/scheme/SchemeContent.java
deleted file mode 100644
index 302fb552..00000000
--- a/java/scheme/SchemeContent.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package scheme;
-
-import dynamiccolor.ColorSpec.SpecVersion;
-import dynamiccolor.ColorSpecs;
-import dynamiccolor.DynamicScheme;
-import dynamiccolor.Variant;
-import hct.Hct;
-
-/**
- * A scheme that places the source color in Scheme.primaryContainer.
- *
- * 
Primary Container is the source color, adjusted for color relativity. It maintains constant
- * appearance in light mode and dark mode. This adds ~5 tone in light mode, and subtracts ~5 tone in
- * dark mode.
- *
- * 
Tertiary Container is an analogous color, specifically, the analog of a color wheel divided
- * into 6, and the precise analog is the one found by increasing hue. This is a scientifically
- * grounded equivalent to rotating hue clockwise by 60 degrees. It also maintains constant
- * appearance.
- */
-public class SchemeContent extends DynamicScheme {
-
-  public SchemeContent(Hct sourceColorHct, boolean isDark, double contrastLevel) {
-    this(sourceColorHct, isDark, contrastLevel, DEFAULT_SPEC_VERSION, DEFAULT_PLATFORM);
-  }
-
-  public SchemeContent(
-      Hct sourceColorHct,
-      boolean isDark,
-      double contrastLevel,
-      SpecVersion specVersion,
-      Platform platform) {
-    super(
-        sourceColorHct,
-        Variant.CONTENT,
-        isDark,
-        contrastLevel,
-        platform,
-        specVersion,
-        ColorSpecs.get(specVersion)
-            .getPrimaryPalette(Variant.CONTENT, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getSecondaryPalette(Variant.CONTENT, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getTertiaryPalette(Variant.CONTENT, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralPalette(Variant.CONTENT, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralVariantPalette(
-                Variant.CONTENT, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getErrorPalette(Variant.CONTENT, sourceColorHct, isDark, platform, contrastLevel));
-  }
-}
-
diff --git a/java/scheme/SchemeExpressive.java b/java/scheme/SchemeExpressive.java
deleted file mode 100644
index d092c191..00000000
--- a/java/scheme/SchemeExpressive.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package scheme;
-
-import dynamiccolor.ColorSpec.SpecVersion;
-import dynamiccolor.ColorSpecs;
-import dynamiccolor.DynamicScheme;
-import dynamiccolor.Variant;
-import hct.Hct;
-
-/** A playful theme - the source color's hue does not appear in the theme. */
-public class SchemeExpressive extends DynamicScheme {
-
-  public SchemeExpressive(Hct sourceColorHct, boolean isDark, double contrastLevel) {
-    this(sourceColorHct, isDark, contrastLevel, DEFAULT_SPEC_VERSION, DEFAULT_PLATFORM);
-  }
-
-  public SchemeExpressive(
-      Hct sourceColorHct,
-      boolean isDark,
-      double contrastLevel,
-      SpecVersion specVersion,
-      Platform platform) {
-    super(
-        sourceColorHct,
-        Variant.EXPRESSIVE,
-        isDark,
-        contrastLevel,
-        platform,
-        specVersion,
-        ColorSpecs.get(specVersion)
-            .getPrimaryPalette(Variant.EXPRESSIVE, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getSecondaryPalette(
-                Variant.EXPRESSIVE, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getTertiaryPalette(
-                Variant.EXPRESSIVE, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralPalette(Variant.EXPRESSIVE, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralVariantPalette(
-                Variant.EXPRESSIVE, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getErrorPalette(Variant.EXPRESSIVE, sourceColorHct, isDark, platform, contrastLevel));
-  }
-}
diff --git a/java/scheme/SchemeFidelity.java b/java/scheme/SchemeFidelity.java
deleted file mode 100644
index 7f429a9f..00000000
--- a/java/scheme/SchemeFidelity.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package scheme;
-
-import dynamiccolor.ColorSpec.SpecVersion;
-import dynamiccolor.ColorSpecs;
-import dynamiccolor.DynamicScheme;
-import dynamiccolor.Variant;
-import hct.Hct;
-
-/**
- * A scheme that places the source color in Scheme.primaryContainer.
- *
- * 
Primary Container is the source color, adjusted for color relativity. It maintains constant
- * appearance in light mode and dark mode. This adds ~5 tone in light mode, and subtracts ~5 tone in
- * dark mode.
- *
- * 
Tertiary Container is the complement to the source color, using TemperatureCache. It also
- * maintains constant appearance.
- */
-public class SchemeFidelity extends DynamicScheme {
-
-  public SchemeFidelity(Hct sourceColorHct, boolean isDark, double contrastLevel) {
-    this(sourceColorHct, isDark, contrastLevel, DEFAULT_SPEC_VERSION, DEFAULT_PLATFORM);
-  }
-
-  public SchemeFidelity(
-      Hct sourceColorHct,
-      boolean isDark,
-      double contrastLevel,
-      SpecVersion specVersion,
-      Platform platform) {
-    super(
-        sourceColorHct,
-        Variant.FIDELITY,
-        isDark,
-        contrastLevel,
-        platform,
-        specVersion,
-        ColorSpecs.get(specVersion)
-            .getPrimaryPalette(Variant.FIDELITY, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getSecondaryPalette(Variant.FIDELITY, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getTertiaryPalette(Variant.FIDELITY, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralPalette(Variant.FIDELITY, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralVariantPalette(
-                Variant.FIDELITY, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getErrorPalette(Variant.FIDELITY, sourceColorHct, isDark, platform, contrastLevel));
-  }
-}
diff --git a/java/scheme/SchemeFruitSalad.java b/java/scheme/SchemeFruitSalad.java
deleted file mode 100644
index 60d43ea8..00000000
--- a/java/scheme/SchemeFruitSalad.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package scheme;
-
-import dynamiccolor.ColorSpec.SpecVersion;
-import dynamiccolor.ColorSpecs;
-import dynamiccolor.DynamicScheme;
-import dynamiccolor.Variant;
-import hct.Hct;
-
-/** A playful theme - the source color's hue does not appear in the theme. */
-public class SchemeFruitSalad extends DynamicScheme {
-
-  public SchemeFruitSalad(Hct sourceColorHct, boolean isDark, double contrastLevel) {
-    this(sourceColorHct, isDark, contrastLevel, DEFAULT_SPEC_VERSION, DEFAULT_PLATFORM);
-  }
-
-  public SchemeFruitSalad(
-      Hct sourceColorHct,
-      boolean isDark,
-      double contrastLevel,
-      SpecVersion specVersion,
-      Platform platform) {
-    super(
-        sourceColorHct,
-        Variant.FRUIT_SALAD,
-        isDark,
-        contrastLevel,
-        platform,
-        specVersion,
-        ColorSpecs.get(specVersion)
-            .getPrimaryPalette(
-                Variant.FRUIT_SALAD, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getSecondaryPalette(
-                Variant.FRUIT_SALAD, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getTertiaryPalette(
-                Variant.FRUIT_SALAD, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralPalette(
-                Variant.FRUIT_SALAD, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralVariantPalette(
-                Variant.FRUIT_SALAD, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getErrorPalette(Variant.FRUIT_SALAD, sourceColorHct, isDark, platform, contrastLevel));
-  }
-}
diff --git a/java/scheme/SchemeMonochrome.java b/java/scheme/SchemeMonochrome.java
deleted file mode 100644
index 6286037a..00000000
--- a/java/scheme/SchemeMonochrome.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package scheme;
-
-import dynamiccolor.ColorSpec.SpecVersion;
-import dynamiccolor.ColorSpecs;
-import dynamiccolor.DynamicScheme;
-import dynamiccolor.Variant;
-import hct.Hct;
-
-/** A monochrome theme, colors are purely black / white / gray. */
-public class SchemeMonochrome extends DynamicScheme {
-
-  public SchemeMonochrome(Hct sourceColorHct, boolean isDark, double contrastLevel) {
-    this(sourceColorHct, isDark, contrastLevel, DEFAULT_SPEC_VERSION, DEFAULT_PLATFORM);
-  }
-
-  public SchemeMonochrome(
-      Hct sourceColorHct,
-      boolean isDark,
-      double contrastLevel,
-      SpecVersion specVersion,
-      Platform platform) {
-    super(
-        sourceColorHct,
-        Variant.MONOCHROME,
-        isDark,
-        contrastLevel,
-        platform,
-        specVersion,
-        ColorSpecs.get(specVersion)
-            .getPrimaryPalette(Variant.MONOCHROME, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getSecondaryPalette(
-                Variant.MONOCHROME, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getTertiaryPalette(
-                Variant.MONOCHROME, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralPalette(Variant.MONOCHROME, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralVariantPalette(
-                Variant.MONOCHROME, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getErrorPalette(Variant.MONOCHROME, sourceColorHct, isDark, platform, contrastLevel));
-  }
-}
diff --git a/java/scheme/SchemeNeutral.java b/java/scheme/SchemeNeutral.java
deleted file mode 100644
index 2490b626..00000000
--- a/java/scheme/SchemeNeutral.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package scheme;
-
-import dynamiccolor.ColorSpec.SpecVersion;
-import dynamiccolor.ColorSpecs;
-import dynamiccolor.DynamicScheme;
-import dynamiccolor.Variant;
-import hct.Hct;
-
-/** A theme that's slightly more chromatic than monochrome, which is purely black / white / gray. */
-public class SchemeNeutral extends DynamicScheme {
-
-  public SchemeNeutral(Hct sourceColorHct, boolean isDark, double contrastLevel) {
-    this(sourceColorHct, isDark, contrastLevel, DEFAULT_SPEC_VERSION, DEFAULT_PLATFORM);
-  }
-
-  public SchemeNeutral(
-      Hct sourceColorHct,
-      boolean isDark,
-      double contrastLevel,
-      SpecVersion specVersion,
-      Platform platform) {
-    super(
-        sourceColorHct,
-        Variant.NEUTRAL,
-        isDark,
-        contrastLevel,
-        platform,
-        specVersion,
-        ColorSpecs.get(specVersion)
-            .getPrimaryPalette(Variant.NEUTRAL, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getSecondaryPalette(Variant.NEUTRAL, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getTertiaryPalette(Variant.NEUTRAL, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralPalette(Variant.NEUTRAL, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralVariantPalette(
-                Variant.NEUTRAL, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getErrorPalette(Variant.NEUTRAL, sourceColorHct, isDark, platform, contrastLevel));
-  }
-}
diff --git a/java/scheme/SchemeRainbow.java b/java/scheme/SchemeRainbow.java
deleted file mode 100644
index 9862d5b7..00000000
--- a/java/scheme/SchemeRainbow.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package scheme;
-
-import dynamiccolor.ColorSpec.SpecVersion;
-import dynamiccolor.ColorSpecs;
-import dynamiccolor.DynamicScheme;
-import dynamiccolor.Variant;
-import hct.Hct;
-
-/** A playful theme - the source color's hue does not appear in the theme. */
-public class SchemeRainbow extends DynamicScheme {
-
-  public SchemeRainbow(Hct sourceColorHct, boolean isDark, double contrastLevel) {
-    this(sourceColorHct, isDark, contrastLevel, DEFAULT_SPEC_VERSION, DEFAULT_PLATFORM);
-  }
-
-  public SchemeRainbow(
-      Hct sourceColorHct,
-      boolean isDark,
-      double contrastLevel,
-      SpecVersion specVersion,
-      Platform platform) {
-    super(
-        sourceColorHct,
-        Variant.RAINBOW,
-        isDark,
-        contrastLevel,
-        platform,
-        specVersion,
-        ColorSpecs.get(specVersion)
-            .getPrimaryPalette(Variant.RAINBOW, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getSecondaryPalette(Variant.RAINBOW, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getTertiaryPalette(Variant.RAINBOW, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralPalette(Variant.RAINBOW, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralVariantPalette(
-                Variant.RAINBOW, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getErrorPalette(Variant.RAINBOW, sourceColorHct, isDark, platform, contrastLevel));
-  }
-}
diff --git a/java/scheme/SchemeTonalSpot.java b/java/scheme/SchemeTonalSpot.java
deleted file mode 100644
index 4895f7dc..00000000
--- a/java/scheme/SchemeTonalSpot.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package scheme;
-
-import dynamiccolor.ColorSpec.SpecVersion;
-import dynamiccolor.ColorSpecs;
-import dynamiccolor.DynamicScheme;
-import dynamiccolor.Variant;
-import hct.Hct;
-
-/** A calm theme, sedated colors that aren't particularly chromatic. */
-public class SchemeTonalSpot extends DynamicScheme {
-
-  public SchemeTonalSpot(Hct sourceColorHct, boolean isDark, double contrastLevel) {
-    this(sourceColorHct, isDark, contrastLevel, DEFAULT_SPEC_VERSION, DEFAULT_PLATFORM);
-  }
-
-  public SchemeTonalSpot(
-      Hct sourceColorHct,
-      boolean isDark,
-      double contrastLevel,
-      SpecVersion specVersion,
-      Platform platform) {
-    super(
-        sourceColorHct,
-        Variant.TONAL_SPOT,
-        isDark,
-        contrastLevel,
-        platform,
-        specVersion,
-        ColorSpecs.get(specVersion)
-            .getPrimaryPalette(Variant.TONAL_SPOT, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getSecondaryPalette(
-                Variant.TONAL_SPOT, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getTertiaryPalette(
-                Variant.TONAL_SPOT, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralPalette(Variant.TONAL_SPOT, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralVariantPalette(
-                Variant.TONAL_SPOT, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getErrorPalette(Variant.TONAL_SPOT, sourceColorHct, isDark, platform, contrastLevel));
-  }
-}
diff --git a/java/scheme/SchemeVibrant.java b/java/scheme/SchemeVibrant.java
deleted file mode 100644
index d4ed3dd7..00000000
--- a/java/scheme/SchemeVibrant.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package scheme;
-
-import dynamiccolor.ColorSpec.SpecVersion;
-import dynamiccolor.ColorSpecs;
-import dynamiccolor.DynamicScheme;
-import dynamiccolor.Variant;
-import hct.Hct;
-
-/** A loud theme, colorfulness is maximum for Primary palette, increased for others. */
-public class SchemeVibrant extends DynamicScheme {
-
-  public SchemeVibrant(Hct sourceColorHct, boolean isDark, double contrastLevel) {
-    this(sourceColorHct, isDark, contrastLevel, DEFAULT_SPEC_VERSION, DEFAULT_PLATFORM);
-  }
-
-  public SchemeVibrant(
-      Hct sourceColorHct,
-      boolean isDark,
-      double contrastLevel,
-      SpecVersion specVersion,
-      Platform platform) {
-    super(
-        sourceColorHct,
-        Variant.VIBRANT,
-        isDark,
-        contrastLevel,
-        platform,
-        specVersion,
-        ColorSpecs.get(specVersion)
-            .getPrimaryPalette(Variant.VIBRANT, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getSecondaryPalette(Variant.VIBRANT, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getTertiaryPalette(Variant.VIBRANT, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralPalette(Variant.VIBRANT, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getNeutralVariantPalette(
-                Variant.VIBRANT, sourceColorHct, isDark, platform, contrastLevel),
-        ColorSpecs.get(specVersion)
-            .getErrorPalette(Variant.VIBRANT, sourceColorHct, isDark, platform, contrastLevel));
-  }
-}
diff --git a/java/score/Score.java b/java/score/Score.java
deleted file mode 100644
index f0776c9d..00000000
--- a/java/score/Score.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package score;
-
-import hct.Hct;
-import utils.MathUtils;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Given a large set of colors, remove colors that are unsuitable for a UI theme, and rank the rest
- * based on suitability.
- *
- * 
Enables use of a high cluster count for image quantization, thus ensuring colors aren't
- * muddied, while curating the high cluster count to a much smaller number of appropriate choices.
- */
-public final class Score {
-  private static final double TARGET_CHROMA = 48.; // A1 Chroma
-  private static final double WEIGHT_PROPORTION = 0.7;
-  private static final double WEIGHT_CHROMA_ABOVE = 0.3;
-  private static final double WEIGHT_CHROMA_BELOW = 0.1;
-  private static final double CUTOFF_CHROMA = 5.;
-  private static final double CUTOFF_EXCITED_PROPORTION = 0.01;
-
-  private Score() {}
-
-  public static List score(Map colorsToPopulation) {
-    // Fallback color is Google Blue.
-    return score(colorsToPopulation, 4, 0xff4285f4, true);
-  }
-
-  public static List score(Map colorsToPopulation, int desired) {
-    return score(colorsToPopulation, desired, 0xff4285f4, true);
-  }
-
-  public static List score(
-      Map colorsToPopulation, int desired, int fallbackColorArgb) {
-    return score(colorsToPopulation, desired, fallbackColorArgb, true);
-  }
-
-  /**
-   * Given a map with keys of colors and values of how often the color appears, rank the colors
-   * based on suitability for being used for a UI theme.
-   *
-   * @param colorsToPopulation map with keys of colors and values of how often the color appears,
-   *     usually from a source image.
-   * @param desired max count of colors to be returned in the list.
-   * @param fallbackColorArgb color to be returned if no other options available.
-   * @param filter whether to filter out undesireable combinations.
-   * @return Colors sorted by suitability for a UI theme. The most suitable color is the first item,
-   *     the least suitable is the last. There will always be at least one color returned. If all
-   *     the input colors were not suitable for a theme, a default fallback color will be provided,
-   *     Google Blue.
-   */
-  public static List score(
-      Map colorsToPopulation,
-      int desired,
-      int fallbackColorArgb,
-      boolean filter) {
-
-    // Get the HCT color for each Argb value, while finding the per hue count and
-    // total count.
-    List colorsHct = new ArrayList<>();
-    int[] huePopulation = new int[360];
-    double populationSum = 0.;
-    for (Map.Entry entry : colorsToPopulation.entrySet()) {
-      Hct hct = Hct.fromInt(entry.getKey());
-      colorsHct.add(hct);
-      int hue = (int) Math.floor(hct.getHue());
-      huePopulation[hue] += entry.getValue();
-      populationSum += entry.getValue();
-    }
-
-    // Hues with more usage in neighboring 30 degree slice get a larger number.
-    double[] hueExcitedProportions = new double[360];
-    for (int hue = 0; hue < 360; hue++) {
-      double proportion = huePopulation[hue] / populationSum;
-      for (int i = hue - 14; i < hue + 16; i++) {
-        int neighborHue = MathUtils.sanitizeDegreesInt(i);
-        hueExcitedProportions[neighborHue] += proportion;
-      }
-    }
-
-    // Scores each HCT color based on usage and chroma, while optionally
-    // filtering out values that do not have enough chroma or usage.
-    List scoredHcts = new ArrayList<>();
-    for (Hct hct : colorsHct) {
-      int hue = MathUtils.sanitizeDegreesInt((int) Math.round(hct.getHue()));
-      double proportion = hueExcitedProportions[hue];
-      if (filter && (hct.getChroma() < CUTOFF_CHROMA || proportion <= CUTOFF_EXCITED_PROPORTION)) {
-        continue;
-      }
-
-      double proportionScore = proportion * 100.0 * WEIGHT_PROPORTION;
-      double chromaWeight =
-          hct.getChroma() < TARGET_CHROMA ? WEIGHT_CHROMA_BELOW : WEIGHT_CHROMA_ABOVE;
-      double chromaScore = (hct.getChroma() - TARGET_CHROMA) * chromaWeight;
-      double score = proportionScore + chromaScore;
-      scoredHcts.add(new ScoredHCT(hct, score));
-    }
-    // Sorted so that colors with higher scores come first.
-    Collections.sort(scoredHcts, new ScoredComparator());
-
-    // Iterates through potential hue differences in degrees in order to select
-    // the colors with the largest distribution of hues possible. Starting at
-    // 90 degrees(maximum difference for 4 colors) then decreasing down to a
-    // 15 degree minimum.
-    List chosenColors = new ArrayList<>();
-    for (int differenceDegrees = 90; differenceDegrees >= 15; differenceDegrees--) {
-      chosenColors.clear();
-      for (ScoredHCT entry : scoredHcts) {
-        Hct hct = entry.hct;
-        boolean hasDuplicateHue = false;
-        for (Hct chosenHct : chosenColors) {
-          if (MathUtils.differenceDegrees(hct.getHue(), chosenHct.getHue()) < differenceDegrees) {
-            hasDuplicateHue = true;
-            break;
-          }
-        }
-        if (!hasDuplicateHue) {
-          chosenColors.add(hct);
-        }
-        if (chosenColors.size() >= desired) {
-          break;
-        }
-      }
-      if (chosenColors.size() >= desired) {
-        break;
-      }
-    }
-    List colors = new ArrayList<>();
-    if (chosenColors.isEmpty()) {
-      colors.add(fallbackColorArgb);
-    }
-    for (Hct chosenHct : chosenColors) {
-      colors.add(chosenHct.toInt());
-    }
-    return colors;
-  }
-
-  private static class ScoredHCT {
-    public final Hct hct;
-    public final double score;
-
-    public ScoredHCT(Hct hct, double score) {
-      this.hct = hct;
-      this.score = score;
-    }
-  }
-
-  private static class ScoredComparator implements Comparator {
-    public ScoredComparator() {}
-
-    @Override
-    public int compare(ScoredHCT entry1, ScoredHCT entry2) {
-      return Double.compare(entry2.score, entry1.score);
-    }
-  }
-}
diff --git a/java/temperature/TemperatureCache.java b/java/temperature/TemperatureCache.java
deleted file mode 100644
index 57e0e804..00000000
--- a/java/temperature/TemperatureCache.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package temperature;
-
-import hct.Hct;
-import utils.ColorUtils;
-import utils.MathUtils;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Design utilities using color temperature theory.
- *
- * 
Analogous colors, complementary color, and cache to efficiently, lazily, generate data for
- * calculations when needed.
- */
-public final class TemperatureCache {
-  private final Hct input;
-
-  private Hct precomputedComplement;
-  private List precomputedHctsByTemp;
-  private List precomputedHctsByHue;
-  private Map precomputedTempsByHct;
-
-  private TemperatureCache() {
-    throw new UnsupportedOperationException();
-  }
-
-  /**
-   * Create a cache that allows calculation of ex. complementary and analogous colors.
-   *
-   * @param input Color to find complement/analogous colors of. Any colors will have the same tone,
-   *     and chroma as the input color, modulo any restrictions due to the other hues having lower
-   *     limits on chroma.
-   */
-  public TemperatureCache(Hct input) {
-    this.input = input;
-  }
-
-  /**
-   * A color that complements the input color aesthetically.
-   *
-   * 
In art, this is usually described as being across the color wheel. History of this shows
-   * intent as a color that is just as cool-warm as the input color is warm-cool.
-   */
-  public Hct getComplement() {
-    if (precomputedComplement != null) {
-      return precomputedComplement;
-    }
-
-    double coldestHue = getColdest().getHue();
-    double coldestTemp = getTempsByHct().get(getColdest());
-
-    double warmestHue = getWarmest().getHue();
-    double warmestTemp = getTempsByHct().get(getWarmest());
-    double range = warmestTemp - coldestTemp;
-    boolean startHueIsColdestToWarmest = isBetween(input.getHue(), coldestHue, warmestHue);
-    double startHue = startHueIsColdestToWarmest ? warmestHue : coldestHue;
-    double endHue = startHueIsColdestToWarmest ? coldestHue : warmestHue;
-    double directionOfRotation = 1.;
-    double smallestError = 1000.;
-    Hct answer = getHctsByHue().get((int) Math.round(input.getHue()));
-
-    double complementRelativeTemp = (1. - getRelativeTemperature(input));
-    // Find the color in the other section, closest to the inverse percentile
-    // of the input color. This is the complement.
-    for (double hueAddend = 0.; hueAddend <= 360.; hueAddend += 1.) {
-      double hue = MathUtils.sanitizeDegreesDouble(startHue + directionOfRotation * hueAddend);
-      if (!isBetween(hue, startHue, endHue)) {
-        continue;
-      }
-      Hct possibleAnswer = getHctsByHue().get((int) Math.round(hue));
-      double relativeTemp = (getTempsByHct().get(possibleAnswer) - coldestTemp) / range;
-      double error = Math.abs(complementRelativeTemp - relativeTemp);
-      if (error < smallestError) {
-        smallestError = error;
-        answer = possibleAnswer;
-      }
-    }
-    precomputedComplement = answer;
-    return precomputedComplement;
-  }
-
-  /**
-   * 5 colors that pair well with the input color.
-   *
-   * 
The colors are equidistant in temperature and adjacent in hue.
-   */
-  public List getAnalogousColors() {
-    return getAnalogousColors(5, 12);
-  }
-
-  /**
-   * A set of colors with differing hues, equidistant in temperature.
-   *
-   * 
In art, this is usually described as a set of 5 colors on a color wheel divided into 12
-   * sections. This method allows provision of either of those values.
-   *
-   * 
Behavior is undefined when count or divisions is 0. When divisions < count, colors repeat.
-   *
-   * @param count The number of colors to return, includes the input color.
-   * @param divisions The number of divisions on the color wheel.
-   */
-  public List getAnalogousColors(int count, int divisions) {
-    // The starting hue is the hue of the input color.
-    int startHue = (int) Math.round(input.getHue());
-    Hct startHct = getHctsByHue().get(startHue);
-    double lastTemp = getRelativeTemperature(startHct);
-
-    List allColors = new ArrayList<>();
-    allColors.add(startHct);
-
-    double absoluteTotalTempDelta = 0.f;
-    for (int i = 0; i < 360; i++) {
-      int hue = MathUtils.sanitizeDegreesInt(startHue + i);
-      Hct hct = getHctsByHue().get(hue);
-      double temp = getRelativeTemperature(hct);
-      double tempDelta = Math.abs(temp - lastTemp);
-      lastTemp = temp;
-      absoluteTotalTempDelta += tempDelta;
-    }
-
-    int hueAddend = 1;
-    double tempStep = absoluteTotalTempDelta / (double) divisions;
-    double totalTempDelta = 0.0;
-    lastTemp = getRelativeTemperature(startHct);
-    while (allColors.size() < divisions) {
-      int hue = MathUtils.sanitizeDegreesInt(startHue + hueAddend);
-      Hct hct = getHctsByHue().get(hue);
-      double temp = getRelativeTemperature(hct);
-      double tempDelta = Math.abs(temp - lastTemp);
-      totalTempDelta += tempDelta;
-
-      double desiredTotalTempDeltaForIndex = (allColors.size() * tempStep);
-      boolean indexSatisfied = totalTempDelta >= desiredTotalTempDeltaForIndex;
-      int indexAddend = 1;
-      // Keep adding this hue to the answers until its temperature is
-      // insufficient. This ensures consistent behavior when there aren't
-      // `divisions` discrete steps between 0 and 360 in hue with `tempStep`
-      // delta in temperature between them.
-      //
-      // For example, white and black have no analogues: there are no other
-      // colors at T100/T0. Therefore, they should just be added to the array
-      // as answers.
-      while (indexSatisfied && allColors.size() < divisions) {
-        allColors.add(hct);
-        desiredTotalTempDeltaForIndex = ((allColors.size() + indexAddend) * tempStep);
-        indexSatisfied = totalTempDelta >= desiredTotalTempDeltaForIndex;
-        indexAddend++;
-      }
-      lastTemp = temp;
-      hueAddend++;
-
-      if (hueAddend > 360) {
-        while (allColors.size() < divisions) {
-          allColors.add(hct);
-        }
-        break;
-      }
-    }
-
-    List answers = new ArrayList<>();
-    answers.add(input);
-
-    int ccwCount = (int) Math.floor(((double) count - 1.0) / 2.0);
-    for (int i = 1; i < (ccwCount + 1); i++) {
-      int index = 0 - i;
-      while (index < 0) {
-        index = allColors.size() + index;
-      }
-      if (index >= allColors.size()) {
-        index = index % allColors.size();
-      }
-      answers.add(0, allColors.get(index));
-    }
-
-    int cwCount = count - ccwCount - 1;
-    for (int i = 1; i < (cwCount + 1); i++) {
-      int index = i;
-      while (index < 0) {
-        index = allColors.size() + index;
-      }
-      if (index >= allColors.size()) {
-        index = index % allColors.size();
-      }
-      answers.add(allColors.get(index));
-    }
-
-    return answers;
-  }
-
-  /**
-   * Temperature relative to all colors with the same chroma and tone.
-   *
-   * @param hct HCT to find the relative temperature of.
-   * @return Value on a scale from 0 to 1.
-   */
-  public double getRelativeTemperature(Hct hct) {
-    double range = getTempsByHct().get(getWarmest()) - getTempsByHct().get(getColdest());
-    double differenceFromColdest = getTempsByHct().get(hct) - getTempsByHct().get(getColdest());
-    // Handle when there's no difference in temperature between warmest and
-    // coldest: for example, at T100, only one color is available, white.
-    if (range == 0.) {
-      return 0.5;
-    }
-    return differenceFromColdest / range;
-  }
-
-  /**
-   * Value representing cool-warm factor of a color. Values below 0 are considered cool, above,
-   * warm.
-   *
-   * 
Color science has researched emotion and harmony, which art uses to select colors. Warm-cool
-   * is the foundation of analogous and complementary colors. See: - Li-Chen Ou's Chapter 19 in
-   * Handbook of Color Psychology (2015). - Josef Albers' Interaction of Color chapters 19 and 21.
-   *
-   * 
Implementation of Ou, Woodcock and Wright's algorithm, which uses Lab/LCH color space.
-   * Return value has these properties:

-   * - Values below 0 are cool, above 0 are warm.

-   * - Lower bound: -9.66. Chroma is infinite. Assuming max of Lab chroma 130.

-   * - Upper bound: 8.61. Chroma is infinite. Assuming max of Lab chroma 130.
-   */
-  public static double rawTemperature(Hct color) {
-    double[] lab = ColorUtils.labFromArgb(color.toInt());
-    double hue = MathUtils.sanitizeDegreesDouble(Math.toDegrees(Math.atan2(lab[2], lab[1])));
-    double chroma = Math.hypot(lab[1], lab[2]);
-    return -0.5
-        + 0.02
-            * Math.pow(chroma, 1.07)
-            * Math.cos(Math.toRadians(MathUtils.sanitizeDegreesDouble(hue - 50.)));
-  }
-
-  /** Coldest color with same chroma and tone as input. */
-  private Hct getColdest() {
-    return getHctsByTemp().get(0);
-  }
-
-  /**
-   * HCTs for all colors with the same chroma/tone as the input.
-   *
-   * 
Sorted by hue, ex. index 0 is hue 0.
-   */
-  private List getHctsByHue() {
-    if (precomputedHctsByHue != null) {
-      return precomputedHctsByHue;
-    }
-    List hcts = new ArrayList<>();
-    for (double hue = 0.; hue <= 360.; hue += 1.) {
-      Hct colorAtHue = Hct.from(hue, input.getChroma(), input.getTone());
-      hcts.add(colorAtHue);
-    }
-    precomputedHctsByHue = Collections.unmodifiableList(hcts);
-    return precomputedHctsByHue;
-  }
-
-  /**
-   * HCTs for all colors with the same chroma/tone as the input.
-   *
-   * 
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 getHctsByTemp() {
-    if (precomputedHctsByTemp != null) {
-      return precomputedHctsByTemp;
-    }
-
-    List hcts = new ArrayList<>(getHctsByHue());
-    hcts.add(input);
-    Comparator temperaturesComparator =
-        Comparator.comparing((Hct arg) -> getTempsByHct().get(arg), Double::compareTo);
-    Collections.sort(hcts, temperaturesComparator);
-    precomputedHctsByTemp = hcts;
-    return precomputedHctsByTemp;
-  }
-
-  /** Keys of HCTs in getHctsByTemp, values of raw temperature. */
-  private Map getTempsByHct() {
-    if (precomputedTempsByHct != null) {
-      return precomputedTempsByHct;
-    }
-
-    List allHcts = new ArrayList<>(getHctsByHue());
-    allHcts.add(input);
-
-    Map temperaturesByHct = new HashMap<>();
-    for (Hct hct : allHcts) {
-      temperaturesByHct.put(hct, rawTemperature(hct));
-    }
-
-    precomputedTempsByHct = temperaturesByHct;
-    return precomputedTempsByHct;
-  }
-
-  /** Warmest color with same chroma and tone as input. */
-  private Hct getWarmest() {
-    return getHctsByTemp().get(getHctsByTemp().size() - 1);
-  }
-
-  /** Determines if an angle is between two other angles, rotating clockwise. */
-  private static boolean isBetween(double angle, double a, double b) {
-    if (a < b) {
-      return a <= angle && angle <= b;
-    }
-    return a <= angle || angle <= b;
-  }
-}
diff --git a/java/utils/ColorUtils.java b/java/utils/ColorUtils.java
deleted file mode 100644
index 27430ad8..00000000
--- a/java/utils/ColorUtils.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// This file is automatically generated. Do not modify it.
-
-package utils;
-
-/**
- * Color science utilities.
- *
- * 
Utility methods for color science constants and color space conversions that aren't HCT or
- * CAM16.
- */
-public class ColorUtils {
-  private ColorUtils() {}
-
-  static final double[][] SRGB_TO_XYZ =
-      new double[][] {
-        new double[] {0.41233895, 0.35762064, 0.18051042},
-        new double[] {0.2126, 0.7152, 0.0722},
-        new double[] {0.01932141, 0.11916382, 0.95034478},
-      };
-
-  static final double[][] XYZ_TO_SRGB =
-      new double[][] {
-        new double[] {
-          3.2413774792388685, -1.5376652402851851, -0.49885366846268053,
-        },
-        new double[] {
-          -0.9691452513005321, 1.8758853451067872, 0.04156585616912061,
-        },
-        new double[] {
-          0.05562093689691305, -0.20395524564742123, 1.0571799111220335,
-        },
-      };
-
-  static final double[] WHITE_POINT_D65 = new double[] {95.047, 100.0, 108.883};
-
-  /** Converts a color from RGB components to ARGB format. */
-  public static int argbFromRgb(int red, int green, int blue) {
-    return (255 << 24) | ((red & 255) << 16) | ((green & 255) << 8) | (blue & 255);
-  }
-
-  /** Converts a color from linear RGB components to ARGB format. */
-  public static int argbFromLinrgb(double[] linrgb) {
-    int r = delinearized(linrgb[0]);
-    int g = delinearized(linrgb[1]);
-    int b = delinearized(linrgb[2]);
-    return argbFromRgb(r, g, b);
-  }
-
-  /** Returns the alpha component of a color in ARGB format. */
-  public static int alphaFromArgb(int argb) {
-    return (argb >> 24) & 255;
-  }
-
-  /** Returns the red component of a color in ARGB format. */
-  public static int redFromArgb(int argb) {
-    return (argb >> 16) & 255;
-  }
-
-  /** Returns the green component of a color in ARGB format. */
-  public static int greenFromArgb(int argb) {
-    return (argb >> 8) & 255;
-  }
-
-  /** Returns the blue component of a color in ARGB format. */
-  public static int blueFromArgb(int argb) {
-    return argb & 255;
-  }
-
-  /** Returns whether a color in ARGB format is opaque. */
-  public static boolean isOpaque(int argb) {
-    return alphaFromArgb(argb) >= 255;
-  }
-
-  /** Converts a color from ARGB to XYZ. */
-  public static int argbFromXyz(double x, double y, double z) {
-    double[][] matrix = XYZ_TO_SRGB;
-    double linearR = matrix[0][0] * x + matrix[0][1] * y + matrix[0][2] * z;
-    double linearG = matrix[1][0] * x + matrix[1][1] * y + matrix[1][2] * z;
-    double linearB = matrix[2][0] * x + matrix[2][1] * y + matrix[2][2] * z;
-    int r = delinearized(linearR);
-    int g = delinearized(linearG);
-    int b = delinearized(linearB);
-    return argbFromRgb(r, g, b);
-  }
-
-  /** Converts a color from XYZ to ARGB. */
-  public static double[] xyzFromArgb(int argb) {
-    double r = linearized(redFromArgb(argb));
-    double g = linearized(greenFromArgb(argb));
-    double b = linearized(blueFromArgb(argb));
-    return MathUtils.matrixMultiply(new double[] {r, g, b}, SRGB_TO_XYZ);
-  }
-
-  /** Converts a color represented in Lab color space into an ARGB integer. */
-  public static int argbFromLab(double l, double a, double b) {
-    double[] whitePoint = WHITE_POINT_D65;
-    double fy = (l + 16.0) / 116.0;
-    double fx = a / 500.0 + fy;
-    double fz = fy - b / 200.0;
-    double xNormalized = labInvf(fx);
-    double yNormalized = labInvf(fy);
-    double zNormalized = labInvf(fz);
-    double x = xNormalized * whitePoint[0];
-    double y = yNormalized * whitePoint[1];
-    double z = zNormalized * whitePoint[2];
-    return argbFromXyz(x, y, z);
-  }
-
-  /**
-   * Converts a color from ARGB representation to L*a*b* representation.
-   *
-   * @param argb the ARGB representation of a color
-   * @return a Lab object representing the color
-   */
-  public static double[] labFromArgb(int argb) {
-    double linearR = linearized(redFromArgb(argb));
-    double linearG = linearized(greenFromArgb(argb));
-    double linearB = linearized(blueFromArgb(argb));
-    double[][] matrix = SRGB_TO_XYZ;
-    double x = matrix[0][0] * linearR + matrix[0][1] * linearG + matrix[0][2] * linearB;
-    double y = matrix[1][0] * linearR + matrix[1][1] * linearG + matrix[1][2] * linearB;
-    double z = matrix[2][0] * linearR + matrix[2][1] * linearG + matrix[2][2] * linearB;
-    double[] whitePoint = WHITE_POINT_D65;
-    double xNormalized = x / whitePoint[0];
-    double yNormalized = y / whitePoint[1];
-    double zNormalized = z / whitePoint[2];
-    double fx = labF(xNormalized);
-    double fy = labF(yNormalized);
-    double fz = labF(zNormalized);
-    double l = 116.0 * fy - 16;
-    double a = 500.0 * (fx - fy);
-    double b = 200.0 * (fy - fz);
-    return new double[] {l, a, b};
-  }
-
-  /**
-   * Converts an L* value to an ARGB representation.
-   *
-   * @param lstar L* in L*a*b*
-   * @return ARGB representation of grayscale color with lightness matching L*
-   */
-  public static int argbFromLstar(double lstar) {
-    double y = yFromLstar(lstar);
-    int component = delinearized(y);
-    return argbFromRgb(component, component, component);
-  }
-
-  /**
-   * Computes the L* value of a color in ARGB representation.
-   *
-   * @param argb ARGB representation of a color
-   * @return L*, from L*a*b*, coordinate of the color
-   */
-  public static double lstarFromArgb(int argb) {
-    double y = xyzFromArgb(argb)[1];
-    return 116.0 * labF(y / 100.0) - 16.0;
-  }
-
-  /**
-   * Converts an L* value to a Y value.
-   *
-   * 
L* in L*a*b* and Y in XYZ measure the same quantity, luminance.
-   *
-   * 
L* measures perceptual luminance, a linear scale. Y in XYZ measures relative luminance, a
-   * logarithmic scale.
-   *
-   * @param lstar L* in L*a*b*
-   * @return Y in XYZ
-   */
-  public static double yFromLstar(double lstar) {
-    return 100.0 * labInvf((lstar + 16.0) / 116.0);
-  }
-
-  /**
-   * Converts a Y value to an L* value.
-   *
-   * 
L* in L*a*b* and Y in XYZ measure the same quantity, luminance.
-   *
-   * 
L* measures perceptual luminance, a linear scale. Y in XYZ measures relative luminance, a
-   * logarithmic scale.
-   *
-   * @param y Y in XYZ
-   * @return L* in L*a*b*
-   */
-  public static double lstarFromY(double y) {
-    return labF(y / 100.0) * 116.0 - 16.0;
-  }
-
-  /**
-   * Linearizes an RGB component.
-   *
-   * @param rgbComponent 0 <= rgb_component <= 255, represents R/G/B channel
-   * @return 0.0 <= output <= 100.0, color channel converted to linear RGB space
-   */
-  public static double linearized(int rgbComponent) {
-    double normalized = rgbComponent / 255.0;
-    if (normalized <= 0.040449936) {
-      return normalized / 12.92 * 100.0;
-    } else {
-      return Math.pow((normalized + 0.055) / 1.055, 2.4) * 100.0;
-    }
-  }
-
-  /**
-   * Delinearizes an RGB component.
-   *
-   * @param rgbComponent 0.0 <= rgb_component <= 100.0, represents linear R/G/B channel
-   * @return 0 <= output <= 255, color channel converted to regular RGB space
-   */
-  public static int delinearized(double rgbComponent) {
-    double normalized = rgbComponent / 100.0;
-    double delinearized = 0.0;
-    if (normalized <= 0.0031308) {
-      delinearized = normalized * 12.92;
-    } else {
-      delinearized = 1.055 * Math.pow(normalized, 1.0 / 2.4) - 0.055;
-    }
-    return MathUtils.clampInt(0, 255, (int) Math.round(delinearized * 255.0));
-  }
-
-  /**
-   * Returns the standard white point; white on a sunny day.
-   *
-   * @return The white point
-   */
-  public static double[] whitePointD65() {
-    return WHITE_POINT_D65;
-  }
-
-  static double labF(double t) {
-    double e = 216.0 / 24389.0;
-    double kappa = 24389.0 / 27.0;
-    if (t > e) {
-      return Math.pow(t, 1.0 / 3.0);
-    } else {
-      return (kappa * t + 16) / 116;
-    }
-  }
-
-  static double labInvf(double ft) {
-    double e = 216.0 / 24389.0;
-    double kappa = 24389.0 / 27.0;
-    double ft3 = ft * ft * ft;
-    if (ft3 > e) {
-      return ft3;
-    } else {
-      return (116 * ft - 16) / kappa;
-    }
-  }
-}
-
diff --git a/java/utils/MathUtils.java b/java/utils/MathUtils.java
deleted file mode 100644
index a1de2349..00000000
--- a/java/utils/MathUtils.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// This file is automatically generated. Do not modify it.
-
-package utils;
-
-/** Utility methods for mathematical operations. */
-public class MathUtils {
-  private MathUtils() {}
-
-  /**
-   * The signum function.
-   *
-   * @return 1 if num > 0, -1 if num < 0, and 0 if num = 0
-   */
-  public static int signum(double num) {
-    if (num < 0) {
-      return -1;
-    } else if (num == 0) {
-      return 0;
-    } else {
-      return 1;
-    }
-  }
-
-  /**
-   * The linear interpolation function.
-   *
-   * @return start if amount = 0 and stop if amount = 1
-   */
-  public static double lerp(double start, double stop, double amount) {
-    return (1.0 - amount) * start + amount * stop;
-  }
-
-  /**
-   * Clamps an integer between two integers.
-   *
-   * @return input when min <= input <= max, and either min or max otherwise.
-   */
-  public static int clampInt(int min, int max, int input) {
-    if (input < min) {
-      return min;
-    } else if (input > max) {
-      return max;
-    }
-
-    return input;
-  }
-
-  /**
-   * Clamps an integer between two floating-point numbers.
-   *
-   * @return input when min <= input <= max, and either min or max otherwise.
-   */
-  public static double clampDouble(double min, double max, double input) {
-    if (input < min) {
-      return min;
-    } else if (input > max) {
-      return max;
-    }
-
-    return input;
-  }
-
-  /**
-   * Sanitizes a degree measure as an integer.
-   *
-   * @return a degree measure between 0 (inclusive) and 360 (exclusive).
-   */
-  public static int sanitizeDegreesInt(int degrees) {
-    degrees = degrees % 360;
-    if (degrees < 0) {
-      degrees = degrees + 360;
-    }
-    return degrees;
-  }
-
-  /**
-   * Sanitizes a degree measure as a floating-point number.
-   *
-   * @return a degree measure between 0.0 (inclusive) and 360.0 (exclusive).
-   */
-  public static double sanitizeDegreesDouble(double degrees) {
-    degrees = degrees % 360.0;
-    if (degrees < 0) {
-      degrees = degrees + 360.0;
-    }
-    return degrees;
-  }
-
-  /**
-   * Sign of direction change needed to travel from one angle to another.
-   *
-   * 
For angles that are 180 degrees apart from each other, both directions have the same travel
-   * distance, so either direction is shortest. The value 1.0 is returned in this case.
-   *
-   * @param from The angle travel starts from, in degrees.
-   * @param to The angle travel ends at, in degrees.
-   * @return -1 if decreasing from leads to the shortest travel distance, 1 if increasing from leads
-   *     to the shortest travel distance.
-   */
-  public static double rotationDirection(double from, double to) {
-    double increasingDifference = sanitizeDegreesDouble(to - from);
-    return increasingDifference <= 180.0 ? 1.0 : -1.0;
-  }
-
-  /** Distance of two points on a circle, represented using degrees. */
-  public static double differenceDegrees(double a, double b) {
-    return 180.0 - Math.abs(Math.abs(a - b) - 180.0);
-  }
-
-  /** Multiplies a 1x3 row vector with a 3x3 matrix. */
-  public static double[] matrixMultiply(double[] row, double[][] matrix) {
-    double a = row[0] * matrix[0][0] + row[1] * matrix[0][1] + row[2] * matrix[0][2];
-    double b = row[0] * matrix[1][0] + row[1] * matrix[1][1] + row[2] * matrix[1][2];
-    double c = row[0] * matrix[2][0] + row[1] * matrix[2][1] + row[2] * matrix[2][2];
-    return new double[] {a, b, c};
-  }
-}
-
diff --git a/java/utils/StringUtils.java b/java/utils/StringUtils.java
deleted file mode 100644
index 75aa5b1b..00000000
--- a/java/utils/StringUtils.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package utils;
-
-/** Utility methods for string representations of colors. */
-final class StringUtils {
-  private StringUtils() {}
-
-  /**
-   * Hex string representing color, ex. #ff0000 for red.
-   *
-   * @param argb ARGB representation of a color.
-   */
-  public static String hexFromArgb(int argb) {
-    int red = ColorUtils.redFromArgb(argb);
-    int blue = ColorUtils.blueFromArgb(argb);
-    int green = ColorUtils.greenFromArgb(argb);
-    return String.format("#%02x%02x%02x", red, green, blue);
-  }
-}
diff --git a/kotlin/LICENSE b/kotlin/LICENSE
deleted file mode 100644
index 2ea2d16f..00000000
--- a/kotlin/LICENSE
+++ /dev/null
@@ -1,191 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Copyright 2025 Google LLC
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
diff --git a/kotlin/blend/Blend.kt b/kotlin/blend/Blend.kt
deleted file mode 100644
index a2eb9258..00000000
--- a/kotlin/blend/Blend.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// This file is automatically generated. Do not modify it.
-
-package blend
-
-import hct.Cam16
-import hct.Hct
-import utils.ColorUtils
-import utils.MathUtils
-import kotlin.math.min
-
-/** Functions for blending in HCT and CAM16. */
-object Blend {
-  /**
-   * Blend the design color's HCT hue towards the key color's HCT hue, in a way that leaves the
-   * original color recognizable and recognizably shifted towards the key color.
-   *
-   * @param designColor ARGB representation of an arbitrary color.
-   * @param sourceColor ARGB representation of the main theme color.
-   * @return The design color with a hue shifted towards the system's color, a slightly
-   *   warmer/cooler variant of the design color's hue.
-   */
-  @JvmStatic
-  fun harmonize(designColor: Int, sourceColor: Int): Int {
-    val fromHct = Hct.fromInt(designColor)
-    val toHct = Hct.fromInt(sourceColor)
-    val differenceDegrees = MathUtils.differenceDegrees(fromHct.hue, toHct.hue)
-    val rotationDegrees = min(differenceDegrees * 0.5, 15.0)
-    val outputHue =
-      MathUtils.sanitizeDegreesDouble(
-        fromHct.hue + rotationDegrees * MathUtils.rotationDirection(fromHct.hue, toHct.hue)
-      )
-    return Hct.from(outputHue, fromHct.chroma, fromHct.tone).toInt()
-  }
-
-  /**
-   * Blends hue from one color into another. The chroma and tone of the original color are
-   * maintained.
-   *
-   * @param from ARGB representation of color
-   * @param to ARGB representation of color
-   * @param amount how much blending to perform; 0.0 >= and <= 1.0
-   * @return from, with a hue blended towards to. Chroma and tone are constant.
-   */
-  @JvmStatic
-  fun hctHue(from: Int, to: Int, amount: Double): Int {
-    val ucs = cam16Ucs(from, to, amount)
-    val ucsCam = Cam16.fromInt(ucs)
-    val fromCam = Cam16.fromInt(from)
-    val blended = Hct.from(ucsCam.hue, fromCam.chroma, ColorUtils.lstarFromArgb(from))
-    return blended.toInt()
-  }
-
-  /**
-   * Blend in CAM16-UCS space.
-   *
-   * @param from ARGB representation of color
-   * @param to ARGB representation of color
-   * @param amount how much blending to perform; 0.0 >= and <= 1.0
-   * @return from, blended towards to. Hue, chroma, and tone will change.
-   */
-  @JvmStatic
-  fun cam16Ucs(from: Int, to: Int, amount: Double): Int {
-    val fromCam = Cam16.fromInt(from)
-    val toCam = Cam16.fromInt(to)
-    val fromJ = fromCam.jstar
-    val fromA = fromCam.astar
-    val fromB = fromCam.bstar
-    val toJ = toCam.jstar
-    val toA = toCam.astar
-    val toB = toCam.bstar
-    val jstar = fromJ + (toJ - fromJ) * amount
-    val astar = fromA + (toA - fromA) * amount
-    val bstar = fromB + (toB - fromB) * amount
-    return Cam16.fromUcs(jstar, astar, bstar).toInt()
-  }
-}
diff --git a/kotlin/contrast/Contrast.kt b/kotlin/contrast/Contrast.kt
deleted file mode 100644
index 5dce1b5e..00000000
--- a/kotlin/contrast/Contrast.kt
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package contrast
-
-import utils.ColorUtils
-import kotlin.math.abs
-import kotlin.math.max
-
-/**
- * Color science for contrast utilities.
- *
- * Utility methods for calculating contrast given two colors, or calculating a color given one color
- * and a contrast ratio.
- *
- * Contrast ratio is calculated using XYZ's Y. When linearized to match human perception, Y becomes
- * HCT's tone and L*a*b*'s' L*.
- */
-object Contrast {
-  // The minimum contrast ratio of two colors.
-  // Contrast ratio equation = lighter + 5 / darker + 5, if lighter == darker, ratio == 1.
-  const val RATIO_MIN = 1.0
-
-  // The maximum contrast ratio of two colors.
-  // Contrast ratio equation = lighter + 5 / darker + 5. Lighter and darker scale from 0 to 100.
-  // If lighter == 100, darker = 0, ratio == 21.
-  const val RATIO_MAX = 21.0
-  const val RATIO_30 = 3.0
-  const val RATIO_45 = 4.5
-  const val RATIO_70 = 7.0
-
-  // Given a color and a contrast ratio to reach, the luminance of a color that reaches that ratio
-  // with the color can be calculated. However, that luminance may not contrast as desired, i.e. the
-  // contrast ratio of the input color and the returned luminance may not reach the contrast ratio
-  // asked for.
-  //
-  // When the desired contrast ratio and the result contrast ratio differ by more than this amount,
-  // an error value should be returned, or the method should be documented as 'unsafe', meaning,
-  // it will return a valid luminance but that luminance may not meet the requested contrast ratio.
-  //
-  // 0.04 selected because it ensures the resulting ratio rounds to the same tenth.
-  private const val CONTRAST_RATIO_EPSILON = 0.04
-
-  // Color spaces that measure luminance, such as Y in XYZ, L* in L*a*b*, or T in HCT, are known as
-  // perceptually accurate color spaces.
-  //
-  // To be displayed, they must gamut map to a "display space", one that has a defined limit on the
-  // number of colors. Display spaces include sRGB, more commonly understood  as RGB/HSL/HSV/HSB.
-  // Gamut mapping is undefined and not defined by the color space. Any gamut mapping algorithm must
-  // choose how to sacrifice accuracy in hue, saturation, and/or lightness.
-  //
-  // A principled solution is to maintain lightness, thus maintaining contrast/a11y, maintain hue,
-  // thus maintaining aesthetic intent, and reduce chroma until the color is in gamut.
-  //
-  // HCT chooses this solution, but, that doesn't mean it will _exactly_ matched desired lightness,
-  // if only because RGB is quantized: RGB is expressed as a set of integers: there may be an RGB
-  // color with, for example, 47.892 lightness, but not 47.891.
-  //
-  // To allow for this inherent incompatibility between perceptually accurate color spaces and
-  // display color spaces, methods that take a contrast ratio and luminance, and return a luminance
-  // that reaches that contrast ratio for the input luminance, purposefully darken/lighten their
-  // result such that the desired contrast ratio will be reached even if inaccuracy is introduced.
-  //
-  // 0.4 is generous, ex. HCT requires much less delta. It was chosen because it provides a rough
-  // guarantee that as long as a perceptual color space gamut maps lightness such that the resulting
-  // lightness rounds to the same as the requested, the desired contrast ratio will be reached.
-  private const val LUMINANCE_GAMUT_MAP_TOLERANCE = 0.4
-
-  /**
-   * Contrast ratio is a measure of legibility, its used to compare the lightness of two colors.
-   * This method is used commonly in industry due to its use by WCAG.
-   *
-   * To compare lightness, the colors are expressed in the XYZ color space, where Y is lightness,
-   * also known as relative luminance.
-   *
-   * The equation is ratio = lighter Y + 5 / darker Y + 5.
-   */
-  @JvmStatic
-  fun ratioOfYs(y1: Double, y2: Double): Double {
-    val lighter = max(y1, y2)
-    val darker = if (lighter == y2) y1 else y2
-    return (lighter + 5.0) / (darker + 5.0)
-  }
-
-  /**
-   * Contrast ratio of two tones. T in HCT, L* in L*a*b*. Also known as luminance or perpectual
-   * luminance.
-   *
-   * Contrast ratio is defined using Y in XYZ, relative luminance. However, relative luminance is
-   * linear to number of photons, not to perception of lightness. Perceptual luminance, L* in
-   * L*a*b*, T in HCT, is. Designers prefer color spaces with perceptual luminance since they're
-   * accurate to the eye.
-   *
-   * Y and L* are pure functions of each other, so it possible to use perceptually accurate color
-   * spaces, and measure contrast, and measure contrast in a much more understandable way: instead
-   * of a ratio, a linear difference. This allows a designer to determine what they need to adjust a
-   * color's lightness to in order to reach their desired contrast, instead of guessing & checking
-   * with hex codes.
-   */
-  @JvmStatic
-  fun ratioOfTones(t1: Double, t2: Double): Double {
-    return ratioOfYs(ColorUtils.yFromLstar(t1), ColorUtils.yFromLstar(t2))
-  }
-
-  /**
-   * Returns T in HCT, L* in L*a*b* >= tone parameter that ensures ratio with input T/L*. Returns -1
-   * if ratio cannot be achieved.
-   *
-   * @param tone Tone return value must contrast with.
-   * @param ratio Desired contrast ratio of return value and tone parameter.
-   */
-  @JvmStatic
-  fun lighter(tone: Double, ratio: Double): Double {
-    if (tone < 0.0 || tone > 100.0) {
-      return -1.0
-    }
-    // Invert the contrast ratio equation to determine lighter Y given a ratio and darker Y.
-    val darkY = ColorUtils.yFromLstar(tone)
-    val lightY = ratio * (darkY + 5.0) - 5.0
-    if (lightY < 0.0 || lightY > 100.0) {
-      return -1.0
-    }
-    val realContrast = ratioOfYs(lightY, darkY)
-    val delta = abs(realContrast - ratio)
-    if (realContrast < ratio && delta > CONTRAST_RATIO_EPSILON) {
-      return -1.0
-    }
-
-    val returnValue = ColorUtils.lstarFromY(lightY) + LUMINANCE_GAMUT_MAP_TOLERANCE
-    // NOMUTANTS--important validation step; functions it is calling may change implementation.
-    if (returnValue < 0 || returnValue > 100) {
-      return -1.0
-    }
-    return returnValue
-  }
-
-  /**
-   * Tone >= tone parameter that ensures ratio. 100 if ratio cannot be achieved.
-   *
-   * This method is unsafe because the returned value is guaranteed to be in bounds, but, the in
-   * bounds return value may not reach the desired ratio.
-   *
-   * @param tone Tone return value must contrast with.
-   * @param ratio Desired contrast ratio of return value and tone parameter.
-   */
-  @JvmStatic
-  fun lighterUnsafe(tone: Double, ratio: Double): Double {
-    val lighterSafe = lighter(tone, ratio)
-    return if (lighterSafe < 0.0) 100.0 else lighterSafe
-  }
-
-  /**
-   * Returns T in HCT, L* in L*a*b* <= tone parameter that ensures ratio with input T/L*. Returns -1
-   * if ratio cannot be achieved.
-   *
-   * @param tone Tone return value must contrast with.
-   * @param ratio Desired contrast ratio of return value and tone parameter.
-   */
-  @JvmStatic
-  fun darker(tone: Double, ratio: Double): Double {
-    if (tone < 0.0 || tone > 100.0) {
-      return -1.0
-    }
-    // Invert the contrast ratio equation to determine darker Y given a ratio and lighter Y.
-    val lightY = ColorUtils.yFromLstar(tone)
-    val darkY = (lightY + 5.0) / ratio - 5.0
-    if (darkY < 0.0 || darkY > 100.0) {
-      return -1.0
-    }
-    val realContrast = ratioOfYs(lightY, darkY)
-    val delta = abs(realContrast - ratio)
-    if (realContrast < ratio && delta > CONTRAST_RATIO_EPSILON) {
-      return -1.0
-    }
-
-    // For information on 0.4 constant, see comment in lighter(tone, ratio).
-    val returnValue = ColorUtils.lstarFromY(darkY) - LUMINANCE_GAMUT_MAP_TOLERANCE
-    // NOMUTANTS--important validation step; functions it is calling may change implementation.
-    if (returnValue < 0 || returnValue > 100) {
-      return -1.0
-    }
-    return returnValue
-  }
-
-  /**
-   * Tone <= tone parameter that ensures ratio. 0 if ratio cannot be achieved.
-   *
-   * This method is unsafe because the returned value is guaranteed to be in bounds, but, the in
-   * bounds return value may not reach the desired ratio.
-   *
-   * @param tone Tone return value must contrast with.
-   * @param ratio Desired contrast ratio of return value and tone parameter.
-   */
-  @JvmStatic
-  fun darkerUnsafe(tone: Double, ratio: Double): Double {
-    val darkerSafe = darker(tone, ratio)
-    return max(0.0, darkerSafe)
-  }
-}
diff --git a/kotlin/dislike/DislikeAnalyzer.kt b/kotlin/dislike/DislikeAnalyzer.kt
deleted file mode 100644
index 5c7ad579..00000000
--- a/kotlin/dislike/DislikeAnalyzer.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dislike
-
-import hct.Hct
-import kotlin.math.round
-
-/**
- * Check and/or fix universally disliked colors.
- *
- * Color science studies of color preference indicate universal distaste for dark yellow-greens, and
- * also show this is correlated to distate for biological waste and rotting food.
- *
- * See Palmer and Schloss, 2010 or Schloss and Palmer's Chapter 21 in Handbook of Color Psychology
- * (2015).
- */
-object DislikeAnalyzer {
-  /**
-   * Returns true if color is disliked.
-   *
-   * Disliked is defined as a dark yellow-green that is not neutral.
-   */
-  @JvmStatic
-  fun isDisliked(hct: Hct): Boolean {
-    val huePasses = round(hct.hue) >= 90.0 && round(hct.hue) <= 111.0
-    val chromaPasses = round(hct.chroma) > 16.0
-    val tonePasses = round(hct.tone) < 65.0
-    return huePasses && chromaPasses && tonePasses
-  }
-
-  /** If color is disliked, lighten it to make it likable. */
-  @JvmStatic
-  fun fixIfDisliked(hct: Hct): Hct =
-    if (isDisliked(hct)) {
-      Hct.from(hct.hue, hct.chroma, 70.0)
-    } else {
-      hct
-    }
-}
diff --git a/kotlin/dynamiccolor/ColorSpec.kt b/kotlin/dynamiccolor/ColorSpec.kt
deleted file mode 100644
index 1af7768d..00000000
--- a/kotlin/dynamiccolor/ColorSpec.kt
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dynamiccolor
-
-import dynamiccolor.DynamicScheme.Platform
-import hct.Hct
-import palettes.TonalPalette
-
-/** An interface defining all the necessary methods that could be different between specs. */
-interface ColorSpec {
-  /** All available spec versions. */
-  enum class SpecVersion {
-    SPEC_2021,
-    SPEC_2025,
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Main Palettes //
-  // ////////////////////////////////////////////////////////////////
-  fun primaryPaletteKeyColor(): DynamicColor
-
-  fun secondaryPaletteKeyColor(): DynamicColor
-
-  fun tertiaryPaletteKeyColor(): DynamicColor
-
-  fun neutralPaletteKeyColor(): DynamicColor
-
-  fun neutralVariantPaletteKeyColor(): DynamicColor
-
-  fun errorPaletteKeyColor(): DynamicColor
-
-  // ////////////////////////////////////////////////////////////////
-  // Surfaces [S] //
-  // ////////////////////////////////////////////////////////////////
-  fun background(): DynamicColor
-
-  fun onBackground(): DynamicColor
-
-  fun surface(): DynamicColor
-
-  fun surfaceDim(): DynamicColor
-
-  fun surfaceBright(): DynamicColor
-
-  fun surfaceContainerLowest(): DynamicColor
-
-  fun surfaceContainerLow(): DynamicColor
-
-  fun surfaceContainer(): DynamicColor
-
-  fun surfaceContainerHigh(): DynamicColor
-
-  fun surfaceContainerHighest(): DynamicColor
-
-  fun onSurface(): DynamicColor
-
-  fun surfaceVariant(): DynamicColor
-
-  fun onSurfaceVariant(): DynamicColor
-
-  fun inverseSurface(): DynamicColor
-
-  fun inverseOnSurface(): DynamicColor
-
-  fun outline(): DynamicColor
-
-  fun outlineVariant(): DynamicColor
-
-  fun shadow(): DynamicColor
-
-  fun scrim(): DynamicColor
-
-  fun surfaceTint(): DynamicColor
-
-  // ////////////////////////////////////////////////////////////////
-  // Primaries [P] //
-  // ////////////////////////////////////////////////////////////////
-  fun primary(): DynamicColor
-
-  fun primaryDim(): DynamicColor?
-
-  fun onPrimary(): DynamicColor
-
-  fun primaryContainer(): DynamicColor
-
-  fun onPrimaryContainer(): DynamicColor
-
-  fun inversePrimary(): DynamicColor
-
-  // ////////////////////////////////////////////////////////////////
-  // Secondaries [Q] //
-  // ////////////////////////////////////////////////////////////////
-  fun secondary(): DynamicColor
-
-  fun secondaryDim(): DynamicColor?
-
-  fun onSecondary(): DynamicColor
-
-  fun secondaryContainer(): DynamicColor
-
-  fun onSecondaryContainer(): DynamicColor
-
-  // ////////////////////////////////////////////////////////////////
-  // Tertiaries [T] //
-  // ////////////////////////////////////////////////////////////////
-  fun tertiary(): DynamicColor
-
-  fun tertiaryDim(): DynamicColor?
-
-  fun onTertiary(): DynamicColor
-
-  fun tertiaryContainer(): DynamicColor
-
-  fun onTertiaryContainer(): DynamicColor
-
-  // ////////////////////////////////////////////////////////////////
-  // Errors [E] //
-  // ////////////////////////////////////////////////////////////////
-  fun error(): DynamicColor
-
-  fun errorDim(): DynamicColor?
-
-  fun onError(): DynamicColor
-
-  fun errorContainer(): DynamicColor
-
-  fun onErrorContainer(): DynamicColor
-
-  // ////////////////////////////////////////////////////////////////
-  // Primary Fixed Colors [PF] //
-  // ////////////////////////////////////////////////////////////////
-  fun primaryFixed(): DynamicColor
-
-  fun primaryFixedDim(): DynamicColor
-
-  fun onPrimaryFixed(): DynamicColor
-
-  fun onPrimaryFixedVariant(): DynamicColor
-
-  // ////////////////////////////////////////////////////////////////
-  // Secondary Fixed Colors [QF] //
-  // ////////////////////////////////////////////////////////////////
-  fun secondaryFixed(): DynamicColor
-
-  fun secondaryFixedDim(): DynamicColor
-
-  fun onSecondaryFixed(): DynamicColor
-
-  fun onSecondaryFixedVariant(): DynamicColor
-
-  // ////////////////////////////////////////////////////////////////
-  // Tertiary Fixed Colors [TF] //
-  // ////////////////////////////////////////////////////////////////
-  fun tertiaryFixed(): DynamicColor
-
-  fun tertiaryFixedDim(): DynamicColor
-
-  fun onTertiaryFixed(): DynamicColor
-
-  fun onTertiaryFixedVariant(): DynamicColor
-
-  // ////////////////////////////////////////////////////////////////
-  // Other //
-  // ////////////////////////////////////////////////////////////////
-  fun highestSurface(s: DynamicScheme): DynamicColor
-
-  // ///////////////////////////////////////////////////////////////
-  // Color value calculations //
-  // ///////////////////////////////////////////////////////////////
-  fun getHct(scheme: DynamicScheme, color: DynamicColor): Hct
-
-  fun getTone(scheme: DynamicScheme, color: DynamicColor): Double
-
-  // ////////////////////////////////////////////////////////////////
-  // Scheme Palettes //
-  // ////////////////////////////////////////////////////////////////
-  fun getPrimaryPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette
-
-  fun getSecondaryPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette
-
-  fun getTertiaryPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette
-
-  fun getNeutralPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette
-
-  fun getNeutralVariantPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette
-
-  fun getErrorPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette
-}
diff --git a/kotlin/dynamiccolor/ColorSpec2021.kt b/kotlin/dynamiccolor/ColorSpec2021.kt
deleted file mode 100644
index eb2ee22a..00000000
--- a/kotlin/dynamiccolor/ColorSpec2021.kt
+++ /dev/null
@@ -1,1254 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dynamiccolor
-
-import contrast.Contrast
-import dislike.DislikeAnalyzer
-import dynamiccolor.DynamicScheme.Platform
-import dynamiccolor.ToneDeltaPair.DeltaConstraint
-import dynamiccolor.ToneDeltaPair.TonePolarity
-import hct.Hct
-import palettes.TonalPalette
-import temperature.TemperatureCache
-import utils.MathUtils
-import kotlin.math.abs
-import kotlin.math.max
-import kotlin.math.min
-
-/** [ColorSpec] implementation for the 2021 spec. */
-open class ColorSpec2021 : ColorSpec {
-  // ////////////////////////////////////////////////////////////////
-  // Main Palettes //
-  // ////////////////////////////////////////////////////////////////
-  override fun primaryPaletteKeyColor(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("primary_palette_key_color")
-      .setPalette { s: DynamicScheme -> s.primaryPalette }
-      .setTone { s: DynamicScheme -> s.primaryPalette.keyColor.tone }
-      .build()
-  }
-
-  override fun secondaryPaletteKeyColor(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("secondary_palette_key_color")
-      .setPalette { s: DynamicScheme -> s.secondaryPalette }
-      .setTone { s: DynamicScheme -> s.secondaryPalette.keyColor.tone }
-      .build()
-  }
-
-  override fun tertiaryPaletteKeyColor(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("tertiary_palette_key_color")
-      .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-      .setTone { s: DynamicScheme -> s.tertiaryPalette.keyColor.tone }
-      .build()
-  }
-
-  override fun neutralPaletteKeyColor(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("neutral_palette_key_color")
-      .setPalette { s: DynamicScheme -> s.neutralPalette }
-      .setTone { s: DynamicScheme -> s.neutralPalette.keyColor.tone }
-      .build()
-  }
-
-  override fun neutralVariantPaletteKeyColor(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("neutral_variant_palette_key_color")
-      .setPalette { s: DynamicScheme -> s.neutralVariantPalette }
-      .setTone { s: DynamicScheme -> s.neutralVariantPalette.keyColor.tone }
-      .build()
-  }
-
-  override fun errorPaletteKeyColor(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("error_palette_key_color")
-      .setPalette { s: DynamicScheme -> s.errorPalette }
-      .setTone { s: DynamicScheme -> s.errorPalette.keyColor.tone }
-      .build()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Surfaces [S] //
-  // ////////////////////////////////////////////////////////////////
-  override fun background(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("background")
-      .setPalette { s: DynamicScheme -> s.neutralPalette }
-      .setTone { s: DynamicScheme -> if (s.isDark) 6.0 else 98.0 }
-      .setIsBackground(true)
-      .build()
-  }
-
-  override fun onBackground(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("on_background")
-      .setPalette { s: DynamicScheme -> s.neutralPalette }
-      .setTone { s: DynamicScheme -> if (s.isDark) 90.0 else 10.0 }
-      .setBackground { s: DynamicScheme -> background() }
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(3.0, 3.0, 4.5, 7.0) }
-      .build()
-  }
-
-  override fun surface(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("surface")
-      .setPalette { s: DynamicScheme -> s.neutralPalette }
-      .setTone { s: DynamicScheme -> if (s.isDark) 6.0 else 98.0 }
-      .setIsBackground(true)
-      .build()
-  }
-
-  override fun surfaceDim(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("surface_dim")
-      .setPalette { s: DynamicScheme -> s.neutralPalette }
-      .setTone { s: DynamicScheme ->
-        if (s.isDark) 6.0 else ContrastCurve(87.0, 87.0, 80.0, 75.0).get(s.contrastLevel)
-      }
-      .setIsBackground(true)
-      .build()
-  }
-
-  override fun surfaceBright(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("surface_bright")
-      .setPalette { s: DynamicScheme -> s.neutralPalette }
-      .setTone { s: DynamicScheme ->
-        if (s.isDark) ContrastCurve(24.0, 24.0, 29.0, 34.0).get(s.contrastLevel) else 98.0
-      }
-      .setIsBackground(true)
-      .build()
-  }
-
-  override fun surfaceContainerLowest(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("surface_container_lowest")
-      .setPalette { s: DynamicScheme -> s.neutralPalette }
-      .setTone { s: DynamicScheme ->
-        if (s.isDark) ContrastCurve(4.0, 4.0, 2.0, 0.0).get(s.contrastLevel) else 100.0
-      }
-      .setIsBackground(true)
-      .build()
-  }
-
-  override fun surfaceContainerLow(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("surface_container_low")
-      .setPalette { s: DynamicScheme -> s.neutralPalette }
-      .setTone { s: DynamicScheme ->
-        if (s.isDark) {
-          ContrastCurve(10.0, 10.0, 11.0, 12.0).get(s.contrastLevel)
-        } else {
-          ContrastCurve(96.0, 96.0, 96.0, 95.0).get(s.contrastLevel)
-        }
-      }
-      .setIsBackground(true)
-      .build()
-  }
-
-  override fun surfaceContainer(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("surface_container")
-      .setPalette { s: DynamicScheme -> s.neutralPalette }
-      .setTone { s: DynamicScheme ->
-        if (s.isDark) {
-          ContrastCurve(12.0, 12.0, 16.0, 20.0).get(s.contrastLevel)
-        } else {
-          ContrastCurve(94.0, 94.0, 92.0, 90.0).get(s.contrastLevel)
-        }
-      }
-      .setIsBackground(true)
-      .build()
-  }
-
-  override fun surfaceContainerHigh(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("surface_container_high")
-      .setPalette { s: DynamicScheme -> s.neutralPalette }
-      .setTone { s: DynamicScheme ->
-        if (s.isDark) {
-          ContrastCurve(17.0, 17.0, 21.0, 25.0).get(s.contrastLevel)
-        } else {
-          ContrastCurve(92.0, 92.0, 88.0, 85.0).get(s.contrastLevel)
-        }
-      }
-      .setIsBackground(true)
-      .build()
-  }
-
-  override fun surfaceContainerHighest(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("surface_container_highest")
-      .setPalette { s: DynamicScheme -> s.neutralPalette }
-      .setTone { s: DynamicScheme ->
-        if (s.isDark) {
-          ContrastCurve(22.0, 22.0, 26.0, 30.0).get(s.contrastLevel)
-        } else {
-          ContrastCurve(90.0, 90.0, 84.0, 80.0).get(s.contrastLevel)
-        }
-      }
-      .setIsBackground(true)
-      .build()
-  }
-
-  override fun onSurface(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("on_surface")
-      .setPalette { s: DynamicScheme -> s.neutralPalette }
-      .setTone { s: DynamicScheme -> if (s.isDark) 90.0 else 10.0 }
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(4.5, 7.0, 11.0, 21.0) }
-      .build()
-  }
-
-  override fun surfaceVariant(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("surface_variant")
-      .setPalette { s: DynamicScheme -> s.neutralVariantPalette }
-      .setTone { s: DynamicScheme -> if (s.isDark) 30.0 else 90.0 }
-      .setIsBackground(true)
-      .build()
-  }
-
-  override fun onSurfaceVariant(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("on_surface_variant")
-      .setPalette { s: DynamicScheme -> s.neutralVariantPalette }
-      .setTone { s: DynamicScheme -> if (s.isDark) 80.0 else 30.0 }
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(3.0, 4.5, 7.0, 11.0) }
-      .build()
-  }
-
-  override fun inverseSurface(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("inverse_surface")
-      .setPalette { s: DynamicScheme -> s.neutralPalette }
-      .setTone { s: DynamicScheme -> if (s.isDark) 90.0 else 20.0 }
-      .setIsBackground(true)
-      .build()
-  }
-
-  override fun inverseOnSurface(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("inverse_on_surface")
-      .setPalette { s: DynamicScheme -> s.neutralPalette }
-      .setTone { s: DynamicScheme -> if (s.isDark) 20.0 else 95.0 }
-      .setBackground { s: DynamicScheme -> inverseSurface() }
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(4.5, 7.0, 11.0, 21.0) }
-      .build()
-  }
-
-  override fun outline(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("outline")
-      .setPalette { s: DynamicScheme -> s.neutralVariantPalette }
-      .setTone { s: DynamicScheme -> if (s.isDark) 60.0 else 50.0 }
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(1.5, 3.0, 4.5, 7.0) }
-      .build()
-  }
-
-  override fun outlineVariant(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("outline_variant")
-      .setPalette { s: DynamicScheme -> s.neutralVariantPalette }
-      .setTone { s: DynamicScheme -> if (s.isDark) 30.0 else 80.0 }
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(1.0, 1.0, 3.0, 4.5) }
-      .build()
-  }
-
-  override fun shadow(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("shadow")
-      .setPalette { s: DynamicScheme -> s.neutralPalette }
-      .setTone { s: DynamicScheme -> 0.0 }
-      .build()
-  }
-
-  override fun scrim(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("scrim")
-      .setPalette { s: DynamicScheme -> s.neutralPalette }
-      .setTone { s: DynamicScheme -> 0.0 }
-      .build()
-  }
-
-  override fun surfaceTint(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("surface_tint")
-      .setPalette { s: DynamicScheme -> s.primaryPalette }
-      .setTone { s: DynamicScheme -> if (s.isDark) 80.0 else 40.0 }
-      .setIsBackground(true)
-      .build()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Primaries [P] //
-  // ////////////////////////////////////////////////////////////////
-  override fun primary(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("primary")
-      .setPalette { s: DynamicScheme -> s.primaryPalette }
-      .setTone { s: DynamicScheme ->
-        if (isMonochrome(s)) {
-          if (s.isDark) 100.0 else 0.0
-        } else {
-          if (s.isDark) 80.0 else 40.0
-        }
-      }
-      .setIsBackground(true)
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(3.0, 4.5, 7.0, 7.0) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(
-          primaryContainer(),
-          primary(),
-          10.0,
-          TonePolarity.RELATIVE_LIGHTER,
-          stayTogether = false,
-          constraint = DeltaConstraint.NEARER,
-        )
-      }
-      .build()
-  }
-
-  override fun primaryDim(): DynamicColor? {
-    return null
-  }
-
-  override fun onPrimary(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("on_primary")
-      .setPalette { s: DynamicScheme -> s.primaryPalette }
-      .setTone { s: DynamicScheme ->
-        if (isMonochrome(s)) {
-          if (s.isDark) 10.0 else 90.0
-        } else {
-          if (s.isDark) 20.0 else 100.0
-        }
-      }
-      .setBackground { s: DynamicScheme -> primary() }
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(4.5, 7.0, 11.0, 21.0) }
-      .build()
-  }
-
-  override fun primaryContainer(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("primary_container")
-      .setPalette { s: DynamicScheme -> s.primaryPalette }
-      .setTone { s: DynamicScheme ->
-        if (isFidelity(s)) {
-          s.sourceColorHct.tone
-        } else if (isMonochrome(s)) {
-          if (s.isDark) 85.0 else 25.0
-        } else {
-          if (s.isDark) 30.0 else 90.0
-        }
-      }
-      .setIsBackground(true)
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(1.0, 1.0, 3.0, 4.5) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(
-          primaryContainer(),
-          primary(),
-          10.0,
-          TonePolarity.RELATIVE_LIGHTER,
-          stayTogether = false,
-          constraint = DeltaConstraint.NEARER,
-        )
-      }
-      .build()
-  }
-
-  override fun onPrimaryContainer(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("on_primary_container")
-      .setPalette { s: DynamicScheme -> s.primaryPalette }
-      .setTone { s: DynamicScheme ->
-        if (isFidelity(s)) {
-          DynamicColor.foregroundTone(primaryContainer().tone.invoke(s), 4.5)
-        } else if (isMonochrome(s)) {
-          if (s.isDark) 0.0 else 100.0
-        } else {
-          if (s.isDark) 90.0 else 30.0
-        }
-      }
-      .setBackground { s: DynamicScheme -> primaryContainer() }
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(3.0, 4.5, 7.0, 11.0) }
-      .build()
-  }
-
-  override fun inversePrimary(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("inverse_primary")
-      .setPalette { s: DynamicScheme -> s.primaryPalette }
-      .setTone { s: DynamicScheme -> if (s.isDark) 40.0 else 80.0 }
-      .setBackground { s: DynamicScheme -> inverseSurface() }
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(3.0, 4.5, 7.0, 7.0) }
-      .build()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Secondaries [Q] //
-  // ////////////////////////////////////////////////////////////////
-  override fun secondary(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("secondary")
-      .setPalette { s: DynamicScheme -> s.secondaryPalette }
-      .setTone { s: DynamicScheme -> if (s.isDark) 80.0 else 40.0 }
-      .setIsBackground(true)
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(3.0, 4.5, 7.0, 7.0) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(
-          secondaryContainer(),
-          secondary(),
-          10.0,
-          TonePolarity.RELATIVE_LIGHTER,
-          stayTogether = false,
-          constraint = DeltaConstraint.NEARER,
-        )
-      }
-      .build()
-  }
-
-  override fun secondaryDim(): DynamicColor? {
-    return null
-  }
-
-  override fun onSecondary(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("on_secondary")
-      .setPalette { s: DynamicScheme -> s.secondaryPalette }
-      .setTone { s: DynamicScheme ->
-        if (isMonochrome(s)) {
-          if (s.isDark) 10.0 else 100.0
-        } else {
-          if (s.isDark) 20.0 else 100.0
-        }
-      }
-      .setBackground { s: DynamicScheme -> secondary() }
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(4.5, 7.0, 11.0, 21.0) }
-      .build()
-  }
-
-  override fun secondaryContainer(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("secondary_container")
-      .setPalette { s: DynamicScheme -> s.secondaryPalette }
-      .setTone { s: DynamicScheme ->
-        val initialTone = if (s.isDark) 30.0 else 90.0
-        if (isMonochrome(s)) {
-          if (s.isDark) 30.0 else 85.0
-        } else if (!isFidelity(s)) {
-          initialTone
-        } else {
-          findDesiredChromaByTone(
-            s.secondaryPalette.hue,
-            s.secondaryPalette.chroma,
-            initialTone,
-            !s.isDark,
-          )
-        }
-      }
-      .setIsBackground(true)
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(1.0, 1.0, 3.0, 4.5) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(
-          secondaryContainer(),
-          secondary(),
-          10.0,
-          TonePolarity.RELATIVE_LIGHTER,
-          stayTogether = false,
-          constraint = DeltaConstraint.NEARER,
-        )
-      }
-      .build()
-  }
-
-  override fun onSecondaryContainer(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("on_secondary_container")
-      .setPalette { s: DynamicScheme -> s.secondaryPalette }
-      .setTone { s: DynamicScheme ->
-        if (isMonochrome(s)) {
-          if (s.isDark) 90.0 else 10.0
-        } else if (!isFidelity(s)) {
-          if (s.isDark) 90.0 else 30.0
-        } else {
-          DynamicColor.foregroundTone(secondaryContainer().tone.invoke(s), 4.5)
-        }
-      }
-      .setBackground { s: DynamicScheme -> secondaryContainer() }
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(3.0, 4.5, 7.0, 11.0) }
-      .build()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Tertiaries [T] //
-  // ////////////////////////////////////////////////////////////////
-  override fun tertiary(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("tertiary")
-      .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-      .setTone { s: DynamicScheme ->
-        if (isMonochrome(s)) {
-          if (s.isDark) 90.0 else 25.0
-        } else {
-          if (s.isDark) 80.0 else 40.0
-        }
-      }
-      .setIsBackground(true)
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(3.0, 4.5, 7.0, 7.0) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(
-          tertiaryContainer(),
-          tertiary(),
-          10.0,
-          TonePolarity.RELATIVE_LIGHTER,
-          stayTogether = false,
-          constraint = DeltaConstraint.NEARER,
-        )
-      }
-      .build()
-  }
-
-  override fun tertiaryDim(): DynamicColor? {
-    return null
-  }
-
-  override fun onTertiary(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("on_tertiary")
-      .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-      .setTone { s: DynamicScheme ->
-        if (isMonochrome(s)) {
-          if (s.isDark) 10.0 else 90.0
-        } else {
-          if (s.isDark) 20.0 else 100.0
-        }
-      }
-      .setBackground { s: DynamicScheme -> tertiary() }
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(4.5, 7.0, 11.0, 21.0) }
-      .build()
-  }
-
-  override fun tertiaryContainer(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("tertiary_container")
-      .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-      .setTone { s: DynamicScheme ->
-        if (isMonochrome(s)) {
-          if (s.isDark) 60.0 else 49.0
-        } else if (!isFidelity(s)) {
-          if (s.isDark) 30.0 else 90.0
-        } else {
-          val proposedHct = s.tertiaryPalette.getHct(s.sourceColorHct.tone)
-          DislikeAnalyzer.fixIfDisliked(proposedHct).tone
-        }
-      }
-      .setIsBackground(true)
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(1.0, 1.0, 3.0, 4.5) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(
-          tertiaryContainer(),
-          tertiary(),
-          10.0,
-          TonePolarity.RELATIVE_LIGHTER,
-          stayTogether = false,
-          constraint = DeltaConstraint.NEARER,
-        )
-      }
-      .build()
-  }
-
-  override fun onTertiaryContainer(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("on_tertiary_container")
-      .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-      .setTone { s: DynamicScheme ->
-        if (isMonochrome(s)) {
-          if (s.isDark) 0.0 else 100.0
-        } else if (!isFidelity(s)) {
-          if (s.isDark) 90.0 else 30.0
-        } else {
-          DynamicColor.foregroundTone(tertiaryContainer().tone.invoke(s), 4.5)
-        }
-      }
-      .setBackground { s: DynamicScheme -> tertiaryContainer() }
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(3.0, 4.5, 7.0, 11.0) }
-      .build()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Errors [E] //
-  // ////////////////////////////////////////////////////////////////
-  override fun error(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("error")
-      .setPalette { s: DynamicScheme -> s.errorPalette }
-      .setTone { s: DynamicScheme -> if (s.isDark) 80.0 else 40.0 }
-      .setIsBackground(true)
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(3.0, 4.5, 7.0, 7.0) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(
-          errorContainer(),
-          error(),
-          10.0,
-          TonePolarity.RELATIVE_LIGHTER,
-          stayTogether = false,
-          constraint = DeltaConstraint.NEARER,
-        )
-      }
-      .build()
-  }
-
-  override fun errorDim(): DynamicColor? {
-    return null
-  }
-
-  override fun onError(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("on_error")
-      .setPalette { s: DynamicScheme -> s.errorPalette }
-      .setTone { s: DynamicScheme -> if (s.isDark) 20.0 else 100.0 }
-      .setBackground { s: DynamicScheme -> error() }
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(4.5, 7.0, 11.0, 21.0) }
-      .build()
-  }
-
-  override fun errorContainer(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("error_container")
-      .setPalette { s: DynamicScheme -> s.errorPalette }
-      .setTone { s: DynamicScheme -> if (s.isDark) 30.0 else 90.0 }
-      .setIsBackground(true)
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(1.0, 1.0, 3.0, 4.5) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(
-          errorContainer(),
-          error(),
-          10.0,
-          TonePolarity.RELATIVE_LIGHTER,
-          stayTogether = false,
-          constraint = DeltaConstraint.NEARER,
-        )
-      }
-      .build()
-  }
-
-  override fun onErrorContainer(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("on_error_container")
-      .setPalette { s: DynamicScheme -> s.errorPalette }
-      .setTone { s: DynamicScheme ->
-        if (isMonochrome(s)) {
-          if (s.isDark) 90.0 else 10.0
-        } else {
-          if (s.isDark) 90.0 else 30.0
-        }
-      }
-      .setBackground { s: DynamicScheme -> errorContainer() }
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(3.0, 4.5, 7.0, 11.0) }
-      .build()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Primary Fixed Colors [PF] //
-  // ////////////////////////////////////////////////////////////////
-  override fun primaryFixed(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("primary_fixed")
-      .setPalette { s: DynamicScheme -> s.primaryPalette }
-      .setTone { s: DynamicScheme -> if (isMonochrome(s)) 40.0 else 90.0 }
-      .setIsBackground(true)
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(1.0, 1.0, 3.0, 4.5) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(primaryFixed(), primaryFixedDim(), 10.0, TonePolarity.LIGHTER, true)
-      }
-      .build()
-  }
-
-  override fun primaryFixedDim(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("primary_fixed_dim")
-      .setPalette { s: DynamicScheme -> s.primaryPalette }
-      .setTone { s: DynamicScheme -> if (isMonochrome(s)) 30.0 else 80.0 }
-      .setIsBackground(true)
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(1.0, 1.0, 3.0, 4.5) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(primaryFixed(), primaryFixedDim(), 10.0, TonePolarity.LIGHTER, true)
-      }
-      .build()
-  }
-
-  override fun onPrimaryFixed(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("on_primary_fixed")
-      .setPalette { s: DynamicScheme -> s.primaryPalette }
-      .setTone { s: DynamicScheme -> if (isMonochrome(s)) 100.0 else 10.0 }
-      .setBackground { s: DynamicScheme -> primaryFixedDim() }
-      .setSecondBackground { s: DynamicScheme -> primaryFixed() }
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(4.5, 7.0, 11.0, 21.0) }
-      .build()
-  }
-
-  override fun onPrimaryFixedVariant(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("on_primary_fixed_variant")
-      .setPalette { s: DynamicScheme -> s.primaryPalette }
-      .setTone { s: DynamicScheme -> if (isMonochrome(s)) 90.0 else 30.0 }
-      .setBackground { s: DynamicScheme -> primaryFixedDim() }
-      .setSecondBackground { s: DynamicScheme -> primaryFixed() }
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(3.0, 4.5, 7.0, 11.0) }
-      .build()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Secondary Fixed Colors [QF] //
-  // ////////////////////////////////////////////////////////////////
-  override fun secondaryFixed(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("secondary_fixed")
-      .setPalette { s: DynamicScheme -> s.secondaryPalette }
-      .setTone { s: DynamicScheme -> if (isMonochrome(s)) 80.0 else 90.0 }
-      .setIsBackground(true)
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(1.0, 1.0, 3.0, 4.5) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(secondaryFixed(), secondaryFixedDim(), 10.0, TonePolarity.LIGHTER, true)
-      }
-      .build()
-  }
-
-  override fun secondaryFixedDim(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("secondary_fixed_dim")
-      .setPalette { s: DynamicScheme -> s.secondaryPalette }
-      .setTone { s: DynamicScheme -> if (isMonochrome(s)) 70.0 else 80.0 }
-      .setIsBackground(true)
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(1.0, 1.0, 3.0, 4.5) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(secondaryFixed(), secondaryFixedDim(), 10.0, TonePolarity.LIGHTER, true)
-      }
-      .build()
-  }
-
-  override fun onSecondaryFixed(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("on_secondary_fixed")
-      .setPalette { s: DynamicScheme -> s.secondaryPalette }
-      .setTone { s: DynamicScheme -> 10.0 }
-      .setBackground { s: DynamicScheme -> secondaryFixedDim() }
-      .setSecondBackground { s: DynamicScheme -> secondaryFixed() }
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(4.5, 7.0, 11.0, 21.0) }
-      .build()
-  }
-
-  override fun onSecondaryFixedVariant(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("on_secondary_fixed_variant")
-      .setPalette { s: DynamicScheme -> s.secondaryPalette }
-      .setTone { s: DynamicScheme -> if (isMonochrome(s)) 25.0 else 30.0 }
-      .setBackground { s: DynamicScheme -> secondaryFixedDim() }
-      .setSecondBackground { s: DynamicScheme -> secondaryFixed() }
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(3.0, 4.5, 7.0, 11.0) }
-      .build()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Tertiary Fixed Colors [TF] //
-  // ////////////////////////////////////////////////////////////////
-  override fun tertiaryFixed(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("tertiary_fixed")
-      .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-      .setTone { s: DynamicScheme -> if (isMonochrome(s)) 40.0 else 90.0 }
-      .setIsBackground(true)
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(1.0, 1.0, 3.0, 4.5) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(tertiaryFixed(), tertiaryFixedDim(), 10.0, TonePolarity.LIGHTER, true)
-      }
-      .build()
-  }
-
-  override fun tertiaryFixedDim(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("tertiary_fixed_dim")
-      .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-      .setTone { s: DynamicScheme -> if (isMonochrome(s)) 30.0 else 80.0 }
-      .setIsBackground(true)
-      .setBackground(this::highestSurface)
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(1.0, 1.0, 3.0, 4.5) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(tertiaryFixed(), tertiaryFixedDim(), 10.0, TonePolarity.LIGHTER, true)
-      }
-      .build()
-  }
-
-  override fun onTertiaryFixed(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("on_tertiary_fixed")
-      .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-      .setTone { s: DynamicScheme -> if (isMonochrome(s)) 100.0 else 10.0 }
-      .setBackground { s: DynamicScheme -> tertiaryFixedDim() }
-      .setSecondBackground { s: DynamicScheme -> tertiaryFixed() }
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(4.5, 7.0, 11.0, 21.0) }
-      .build()
-  }
-
-  override fun onTertiaryFixedVariant(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("on_tertiary_fixed_variant")
-      .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-      .setTone { s: DynamicScheme -> if (isMonochrome(s)) 90.0 else 30.0 }
-      .setBackground { s: DynamicScheme -> tertiaryFixedDim() }
-      .setSecondBackground { s: DynamicScheme -> tertiaryFixed() }
-      .setContrastCurve { s: DynamicScheme -> ContrastCurve(3.0, 4.5, 7.0, 11.0) }
-      .build()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Other //
-  // ////////////////////////////////////////////////////////////////
-  override fun highestSurface(s: DynamicScheme): DynamicColor {
-    return if (s.isDark) surfaceBright() else surfaceDim()
-  }
-
-  private fun isFidelity(scheme: DynamicScheme): Boolean {
-    return scheme.variant == Variant.FIDELITY || scheme.variant == Variant.CONTENT
-  }
-
-  private fun isMonochrome(scheme: DynamicScheme): Boolean {
-    return scheme.variant == Variant.MONOCHROME
-  }
-
-  private fun findDesiredChromaByTone(
-    hue: Double,
-    chroma: Double,
-    tone: Double,
-    byDecreasingTone: Boolean,
-  ): Double {
-    var answer = tone
-    var closestToChroma = Hct.from(hue, chroma, tone)
-    if (closestToChroma.chroma < chroma) {
-      var chromaPeak = closestToChroma.chroma
-      while (closestToChroma.chroma < chroma) {
-        answer += if (byDecreasingTone) -1.0 else 1.0
-        val potentialSolution = Hct.from(hue, chroma, answer)
-        if (chromaPeak > potentialSolution.chroma) {
-          break
-        }
-        if (abs(potentialSolution.chroma - chroma) < 0.4) {
-          break
-        }
-        val potentialDelta = abs(potentialSolution.chroma - chroma)
-        val currentDelta = abs(closestToChroma.chroma - chroma)
-        if (potentialDelta < currentDelta) {
-          closestToChroma = potentialSolution
-        }
-        chromaPeak = max(chromaPeak, potentialSolution.chroma)
-      }
-    }
-    return answer
-  }
-
-  // ///////////////////////////////////////////////////////////////
-  // Color value calculations //
-  // ///////////////////////////////////////////////////////////////
-  override fun getHct(scheme: DynamicScheme, color: DynamicColor): Hct {
-    // This is crucial for aesthetics: we aren't simply the taking the standard color
-    // and changing its tone for contrast. Rather, we find the tone for contrast, then
-    // use the specified chroma from the palette to construct a new color.
-    //
-    // For example, this enables colors with standard tone of T90, which has limited chroma, to
-    // "recover" intended chroma as contrast increases.
-    val tone = getTone(scheme, color)
-    return color.palette.invoke(scheme).getHct(tone)
-  }
-
-  override fun getTone(scheme: DynamicScheme, color: DynamicColor): Double {
-    val decreasingContrast = scheme.contrastLevel < 0
-    val toneDeltaPair = color.toneDeltaPair?.invoke(scheme)
-
-    // Case 1: dual foreground, pair of colors with delta constraint.
-    if (toneDeltaPair != null) {
-      val roleA = toneDeltaPair.roleA
-      val roleB = toneDeltaPair.roleB
-      val delta = toneDeltaPair.delta
-      val polarity = toneDeltaPair.polarity
-      val stayTogether = toneDeltaPair.stayTogether
-      val aIsNearer =
-        (toneDeltaPair.constraint == DeltaConstraint.NEARER ||
-          (polarity == TonePolarity.LIGHTER && !scheme.isDark) ||
-          (polarity == TonePolarity.DARKER && !scheme.isDark))
-      val nearer = if (aIsNearer) roleA else roleB
-      val farther = if (aIsNearer) roleB else roleA
-      val amNearer = color.name == nearer.name
-      val expansionDir = if (scheme.isDark) 1 else -1
-      var nTone = nearer.tone.invoke(scheme)
-      var fTone = farther.tone.invoke(scheme)
-
-      // 1st round: solve to min, each
-      val background = color.background
-      val nContrastCurve = nearer.contrastCurve?.invoke(scheme)
-      val fContrastCurve = farther.contrastCurve?.invoke(scheme)
-      if (
-        background != null &&
-          nearer.contrastCurve != null &&
-          farther.contrastCurve != null &&
-          nContrastCurve != null &&
-          fContrastCurve != null
-      ) {
-        val bg = background.invoke(scheme)
-        if (bg != null) {
-          val nContrast = nContrastCurve.get(scheme.contrastLevel)
-          val fContrast = fContrastCurve.get(scheme.contrastLevel)
-          val bgTone = bg.getTone(scheme)
-
-          // If a color is good enough, it is not adjusted.
-          // Initial and adjusted tones for `nearer`
-          if (Contrast.ratioOfTones(bgTone, nTone) < nContrast) {
-            nTone = DynamicColor.foregroundTone(bgTone, nContrast)
-          }
-          // Initial and adjusted tones for `farther`
-          if (Contrast.ratioOfTones(bgTone, fTone) < fContrast) {
-            fTone = DynamicColor.foregroundTone(bgTone, fContrast)
-          }
-          if (decreasingContrast) {
-            // If decreasing contrast, adjust color to the "bare minimum"
-            // that satisfies contrast.
-            nTone = DynamicColor.foregroundTone(bgTone, nContrast)
-            fTone = DynamicColor.foregroundTone(bgTone, fContrast)
-          }
-        }
-      }
-
-      // If constraint is not satisfied, try another round.
-      if ((fTone - nTone) * expansionDir < delta) {
-        // 2nd round: expand farther to match delta.
-        fTone = MathUtils.clampDouble(0.0, 100.0, nTone + delta * expansionDir)
-        // If constraint is not satisfied, try another round.
-        if ((fTone - nTone) * expansionDir < delta) {
-          // 3rd round: contract nearer to match delta.
-          nTone = MathUtils.clampDouble(0.0, 100.0, fTone - delta * expansionDir)
-        }
-      }
-
-      // Avoids the 50-59 awkward zone.
-      if (50 <= nTone && nTone < 60) {
-        // If `nearer` is in the awkward zone, move it away, together with
-        // `farther`.
-        if (expansionDir > 0) {
-          nTone = 60.0
-          fTone = max(fTone, nTone + delta * expansionDir)
-        } else {
-          nTone = 49.0
-          fTone = min(fTone, nTone + delta * expansionDir)
-        }
-      } else if (50 <= fTone && fTone < 60) {
-        if (stayTogether) {
-          // Fixes both, to avoid two colors on opposite sides of the "awkward
-          // zone".
-          if (expansionDir > 0) {
-            nTone = 60.0
-            fTone = max(fTone, nTone + delta * expansionDir)
-          } else {
-            nTone = 49.0
-            fTone = min(fTone, nTone + delta * expansionDir)
-          }
-        } else {
-          // Not required to stay together; fixes just one.
-          if (expansionDir > 0) {
-            fTone = 60.0
-          } else {
-            fTone = 49.0
-          }
-        }
-      }
-
-      // Returns `nTone` if this color is `nearer`, otherwise `fTone`.
-      return if (amNearer) nTone else fTone
-    } else {
-      // Case 2: No contrast pair; just solve for itself.
-      var answer = color.tone.invoke(scheme)
-      val background = color.background?.invoke(scheme)
-      val contrastCurve = color.contrastCurve?.invoke(scheme)
-      if (background == null || contrastCurve == null) {
-        return answer // No adjustment for colors with no background.
-      }
-      val bgTone = background.getTone(scheme)
-      val desiredRatio = contrastCurve.get(scheme.contrastLevel)
-      if (Contrast.ratioOfTones(bgTone, answer) >= desiredRatio) {
-        // Don't "improve" what's good enough.
-      } else {
-        // Rough improvement.
-        answer = DynamicColor.foregroundTone(bgTone, desiredRatio)
-      }
-      if (decreasingContrast) {
-        answer = DynamicColor.foregroundTone(bgTone, desiredRatio)
-      }
-      if (color.isBackground && 50 <= answer && answer < 60) {
-        // Must adjust
-        answer =
-          if (Contrast.ratioOfTones(49.0, bgTone) >= desiredRatio) {
-            49.0
-          } else {
-            60.0
-          }
-      }
-      val secondBackground = color.secondBackground?.invoke(scheme)
-      if (secondBackground == null) {
-        return answer
-      }
-
-      // Case 3: Adjust for dual backgrounds.
-      val bgTone1 = background.getTone(scheme)
-      val bgTone2 = secondBackground.getTone(scheme)
-      val upper = max(bgTone1, bgTone2)
-      val lower = min(bgTone1, bgTone2)
-      if (
-        Contrast.ratioOfTones(upper, answer) >= desiredRatio &&
-          Contrast.ratioOfTones(lower, answer) >= desiredRatio
-      ) {
-        return answer
-      }
-
-      // The darkest light tone that satisfies the desired ratio,
-      // or -1 if such ratio cannot be reached.
-      val lightOption = Contrast.lighter(upper, desiredRatio)
-
-      // The lightest dark tone that satisfies the desired ratio,
-      // or -1 if such ratio cannot be reached.
-      val darkOption = Contrast.darker(lower, desiredRatio)
-
-      // Tones suitable for the foreground.
-      val availables = mutableListOf()
-      if (lightOption != -1.0) {
-        availables.add(lightOption)
-      }
-      if (darkOption != -1.0) {
-        availables.add(darkOption)
-      }
-      val prefersLight =
-        DynamicColor.tonePrefersLightForeground(bgTone1) ||
-          DynamicColor.tonePrefersLightForeground(bgTone2)
-      if (prefersLight) {
-        return if (lightOption == -1.0) 100.0 else lightOption
-      }
-      return if (availables.size == 1) {
-        availables[0]
-      } else if (darkOption == -1.0) {
-        0.0
-      } else {
-        darkOption
-      }
-    }
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Scheme Palettes //
-  // ////////////////////////////////////////////////////////////////
-  override fun getPrimaryPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette {
-    return when (variant) {
-      Variant.CONTENT,
-      Variant.FIDELITY -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, sourceColorHct.chroma)
-      Variant.FRUIT_SALAD ->
-        TonalPalette.fromHueAndChroma(
-          MathUtils.sanitizeDegreesDouble(sourceColorHct.hue - 50.0),
-          48.0,
-        )
-      Variant.MONOCHROME -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 0.0)
-      Variant.NEUTRAL -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 12.0)
-      Variant.RAINBOW -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 48.0)
-      Variant.TONAL_SPOT -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 36.0)
-      Variant.EXPRESSIVE ->
-        TonalPalette.fromHueAndChroma(
-          MathUtils.sanitizeDegreesDouble(sourceColorHct.hue + 240),
-          40.0,
-        )
-      Variant.VIBRANT -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 200.0)
-    }
-  }
-
-  override fun getSecondaryPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette {
-    return when (variant) {
-      Variant.CONTENT,
-      Variant.FIDELITY ->
-        TonalPalette.fromHueAndChroma(
-          sourceColorHct.hue,
-          max(sourceColorHct.chroma - 32.0, sourceColorHct.chroma * 0.5),
-        )
-      Variant.FRUIT_SALAD ->
-        TonalPalette.fromHueAndChroma(
-          MathUtils.sanitizeDegreesDouble(sourceColorHct.hue - 50.0),
-          36.0,
-        )
-      Variant.MONOCHROME -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 0.0)
-      Variant.NEUTRAL -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 8.0)
-      Variant.RAINBOW -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 16.0)
-      Variant.TONAL_SPOT -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 16.0)
-      Variant.EXPRESSIVE ->
-        TonalPalette.fromHueAndChroma(
-          DynamicScheme.getRotatedHue(
-            sourceColorHct,
-            doubleArrayOf(0.0, 21.0, 51.0, 121.0, 151.0, 191.0, 271.0, 321.0, 360.0),
-            doubleArrayOf(45.0, 95.0, 45.0, 20.0, 45.0, 90.0, 45.0, 45.0, 45.0),
-          ),
-          24.0,
-        )
-      Variant.VIBRANT ->
-        TonalPalette.fromHueAndChroma(
-          DynamicScheme.getRotatedHue(
-            sourceColorHct,
-            doubleArrayOf(0.0, 41.0, 61.0, 101.0, 131.0, 181.0, 251.0, 301.0, 360.0),
-            doubleArrayOf(18.0, 15.0, 10.0, 12.0, 15.0, 18.0, 15.0, 12.0, 12.0),
-          ),
-          24.0,
-        )
-    }
-  }
-
-  override fun getTertiaryPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette {
-    return when (variant) {
-      Variant.CONTENT ->
-        TonalPalette.fromHct(
-          DislikeAnalyzer.fixIfDisliked(
-            TemperatureCache(sourceColorHct).getAnalogousColors(count = 3, divisions = 6)[2]
-          )
-        )
-      Variant.FIDELITY ->
-        TonalPalette.fromHct(
-          DislikeAnalyzer.fixIfDisliked(TemperatureCache(sourceColorHct).complement)
-        )
-      Variant.FRUIT_SALAD -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 36.0)
-      Variant.MONOCHROME -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 0.0)
-      Variant.NEUTRAL -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 16.0)
-      Variant.RAINBOW,
-      Variant.TONAL_SPOT ->
-        TonalPalette.fromHueAndChroma(
-          MathUtils.sanitizeDegreesDouble(sourceColorHct.hue + 60.0),
-          24.0,
-        )
-      Variant.EXPRESSIVE ->
-        TonalPalette.fromHueAndChroma(
-          DynamicScheme.getRotatedHue(
-            sourceColorHct,
-            doubleArrayOf(0.0, 21.0, 51.0, 121.0, 151.0, 191.0, 271.0, 321.0, 360.0),
-            doubleArrayOf(120.0, 120.0, 20.0, 45.0, 20.0, 15.0, 20.0, 120.0, 120.0),
-          ),
-          32.0,
-        )
-      Variant.VIBRANT ->
-        TonalPalette.fromHueAndChroma(
-          DynamicScheme.getRotatedHue(
-            sourceColorHct,
-            doubleArrayOf(0.0, 41.0, 61.0, 101.0, 131.0, 181.0, 251.0, 301.0, 360.0),
-            doubleArrayOf(35.0, 30.0, 20.0, 25.0, 30.0, 35.0, 30.0, 25.0, 25.0),
-          ),
-          32.0,
-        )
-    }
-  }
-
-  override fun getNeutralPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette {
-    return when (variant) {
-      Variant.CONTENT,
-      Variant.FIDELITY ->
-        TonalPalette.fromHueAndChroma(sourceColorHct.hue, sourceColorHct.chroma / 8.0)
-      Variant.FRUIT_SALAD -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 10.0)
-      Variant.MONOCHROME -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 0.0)
-      Variant.NEUTRAL -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 2.0)
-      Variant.RAINBOW -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 0.0)
-      Variant.TONAL_SPOT -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 6.0)
-      Variant.EXPRESSIVE ->
-        TonalPalette.fromHueAndChroma(MathUtils.sanitizeDegreesDouble(sourceColorHct.hue + 15), 8.0)
-      Variant.VIBRANT -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 10.0)
-    }
-  }
-
-  override fun getNeutralVariantPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette {
-    return when (variant) {
-      Variant.CONTENT,
-      Variant.FIDELITY ->
-        TonalPalette.fromHueAndChroma(sourceColorHct.hue, (sourceColorHct.chroma / 8.0) + 4.0)
-      Variant.FRUIT_SALAD -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 16.0)
-      Variant.MONOCHROME -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 0.0)
-      Variant.NEUTRAL -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 2.0)
-      Variant.RAINBOW -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 0.0)
-      Variant.TONAL_SPOT -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 8.0)
-      Variant.EXPRESSIVE ->
-        TonalPalette.fromHueAndChroma(
-          MathUtils.sanitizeDegreesDouble(sourceColorHct.hue + 15),
-          12.0,
-        )
-      Variant.VIBRANT -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 12.0)
-    }
-  }
-
-  override fun getErrorPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette {
-    return TonalPalette.fromHueAndChroma(25.0, 84.0)
-  }
-}
diff --git a/kotlin/dynamiccolor/ColorSpec2025.kt b/kotlin/dynamiccolor/ColorSpec2025.kt
deleted file mode 100644
index af3222a9..00000000
--- a/kotlin/dynamiccolor/ColorSpec2025.kt
+++ /dev/null
@@ -1,1974 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dynamiccolor
-
-import contrast.Contrast
-import dynamiccolor.DynamicScheme.Platform
-import dynamiccolor.ToneDeltaPair.DeltaConstraint
-import dynamiccolor.ToneDeltaPair.TonePolarity
-import hct.Hct
-import palettes.TonalPalette
-import utils.MathUtils
-import kotlin.math.max
-import kotlin.math.min
-
-/** [ColorSpec] implementation for the 2025 spec. */
-class ColorSpec2025 : ColorSpec2021() {
-  // ////////////////////////////////////////////////////////////////
-  // Surfaces [S] //
-  // ////////////////////////////////////////////////////////////////
-  override fun background(): DynamicColor {
-    // Remapped to surface for 2025 spec.
-    val color2025 = surface().toBuilder().setName("background").build()
-    return super.background()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun onBackground(): DynamicColor {
-    // Remapped to onSurface for 2025 spec.
-    val color2025Builder = onSurface().toBuilder().setName("on_background")
-    color2025Builder.setTone { s: DynamicScheme ->
-      if (s.platform == Platform.WATCH) 100.0 else onSurface().getTone(s)
-    }
-    return super.onBackground()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025Builder.build())
-      .build()
-  }
-
-  override fun surface(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("surface")
-        .setPalette { s: DynamicScheme -> s.neutralPalette }
-        .setTone { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) {
-              4.0
-            } else {
-              if (Hct.isYellow(s.neutralPalette.hue)) {
-                99.0
-              } else if (s.variant == Variant.VIBRANT) {
-                97.0
-              } else {
-                98.0
-              }
-            }
-          } else {
-            0.0
-          }
-        }
-        .setIsBackground(true)
-        .build()
-    return super.surface()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun surfaceDim(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("surface_dim")
-        .setPalette { s: DynamicScheme -> s.neutralPalette }
-        .setTone { s: DynamicScheme ->
-          if (s.isDark) {
-            4.0
-          } else {
-            if (Hct.isYellow(s.neutralPalette.hue)) {
-              90.0
-            } else if (s.variant == Variant.VIBRANT) {
-              85.0
-            } else {
-              87.0
-            }
-          }
-        }
-        .setIsBackground(true)
-        .setChromaMultiplier { s: DynamicScheme ->
-          if (!s.isDark) {
-            if (s.variant == Variant.NEUTRAL) {
-              return@setChromaMultiplier 2.5
-            } else if (s.variant == Variant.TONAL_SPOT) {
-              return@setChromaMultiplier 1.7
-            } else if (s.variant == Variant.EXPRESSIVE) {
-              return@setChromaMultiplier if (Hct.isYellow(s.neutralPalette.hue)) 2.7 else 1.75
-            } else if (s.variant == Variant.VIBRANT) {
-              return@setChromaMultiplier 1.36
-            }
-          }
-          1.0
-        }
-        .build()
-    return super.surfaceDim()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun surfaceBright(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("surface_bright")
-        .setPalette { s: DynamicScheme -> s.neutralPalette }
-        .setTone { s: DynamicScheme ->
-          if (s.isDark) {
-            18.0
-          } else {
-            if (Hct.isYellow(s.neutralPalette.hue)) {
-              99.0
-            } else if (s.variant == Variant.VIBRANT) {
-              97.0
-            } else {
-              98.0
-            }
-          }
-        }
-        .setIsBackground(true)
-        .setChromaMultiplier { s: DynamicScheme ->
-          if (s.isDark) {
-            if (s.variant == Variant.NEUTRAL) {
-              return@setChromaMultiplier 2.5
-            } else if (s.variant == Variant.TONAL_SPOT) {
-              return@setChromaMultiplier 1.7
-            } else if (s.variant == Variant.EXPRESSIVE) {
-              return@setChromaMultiplier if (Hct.isYellow(s.neutralPalette.hue)) 2.7 else 1.75
-            } else if (s.variant == Variant.VIBRANT) {
-              return@setChromaMultiplier 1.36
-            }
-          }
-          1.0
-        }
-        .build()
-    return super.surfaceBright()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun surfaceContainerLowest(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("surface_container_lowest")
-        .setPalette { s: DynamicScheme -> s.neutralPalette }
-        .setTone { s: DynamicScheme -> if (s.isDark) 0.0 else 100.0 }
-        .setIsBackground(true)
-        .build()
-    return super.surfaceContainerLowest()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun surfaceContainerLow(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("surface_container_low")
-        .setPalette { s: DynamicScheme -> s.neutralPalette }
-        .setTone { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) {
-              6.0
-            } else {
-              if (Hct.isYellow(s.neutralPalette.hue)) {
-                98.0
-              } else if (s.variant == Variant.VIBRANT) {
-                95.0
-              } else {
-                96.0
-              }
-            }
-          } else {
-            15.0
-          }
-        }
-        .setIsBackground(true)
-        .setChromaMultiplier { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.variant == Variant.NEUTRAL) {
-              return@setChromaMultiplier 1.3
-            } else if (s.variant == Variant.TONAL_SPOT) {
-              return@setChromaMultiplier 1.25
-            } else if (s.variant == Variant.EXPRESSIVE) {
-              return@setChromaMultiplier if (Hct.isYellow(s.neutralPalette.hue)) 1.3 else 1.15
-            } else if (s.variant == Variant.VIBRANT) {
-              return@setChromaMultiplier 1.08
-            }
-          }
-          1.0
-        }
-        .build()
-    return super.surfaceContainerLow()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun surfaceContainer(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("surface_container")
-        .setPalette { s: DynamicScheme -> s.neutralPalette }
-        .setTone { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) {
-              9.0
-            } else {
-              if (Hct.isYellow(s.neutralPalette.hue)) {
-                96.0
-              } else if (s.variant == Variant.VIBRANT) {
-                92.0
-              } else {
-                94.0
-              }
-            }
-          } else {
-            20.0
-          }
-        }
-        .setIsBackground(true)
-        .setChromaMultiplier { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.variant == Variant.NEUTRAL) {
-              return@setChromaMultiplier 1.6
-            } else if (s.variant == Variant.TONAL_SPOT) {
-              return@setChromaMultiplier 1.4
-            } else if (s.variant == Variant.EXPRESSIVE) {
-              return@setChromaMultiplier if (Hct.isYellow(s.neutralPalette.hue)) 1.6 else 1.3
-            } else if (s.variant == Variant.VIBRANT) {
-              return@setChromaMultiplier 1.15
-            }
-          }
-          1.0
-        }
-        .build()
-    return super.surfaceContainer()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun surfaceContainerHigh(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("surface_container_high")
-        .setPalette { s: DynamicScheme -> s.neutralPalette }
-        .setTone { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) {
-              12.0
-            } else {
-              if (Hct.isYellow(s.neutralPalette.hue)) {
-                94.0
-              } else if (s.variant == Variant.VIBRANT) {
-                90.0
-              } else {
-                92.0
-              }
-            }
-          } else {
-            25.0
-          }
-        }
-        .setIsBackground(true)
-        .setChromaMultiplier { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.variant == Variant.NEUTRAL) {
-              return@setChromaMultiplier 1.9
-            } else if (s.variant == Variant.TONAL_SPOT) {
-              return@setChromaMultiplier 1.5
-            } else if (s.variant == Variant.EXPRESSIVE) {
-              return@setChromaMultiplier if (Hct.isYellow(s.neutralPalette.hue)) 1.95 else 1.45
-            } else if (s.variant == Variant.VIBRANT) {
-              return@setChromaMultiplier 1.22
-            }
-          }
-          1.0
-        }
-        .build()
-    return super.surfaceContainerHigh()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun surfaceContainerHighest(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("surface_container_highest")
-        .setPalette { s: DynamicScheme -> s.neutralPalette }
-        .setTone { s: DynamicScheme ->
-          if (s.isDark) {
-            15.0
-          } else {
-            if (Hct.isYellow(s.neutralPalette.hue)) {
-              92.0
-            } else if (s.variant == Variant.VIBRANT) {
-              88.0
-            } else {
-              90.0
-            }
-          }
-        }
-        .setIsBackground(true)
-        .setChromaMultiplier { s: DynamicScheme ->
-          if (s.variant == Variant.NEUTRAL) {
-            return@setChromaMultiplier 2.2
-          } else if (s.variant == Variant.TONAL_SPOT) {
-            return@setChromaMultiplier 1.7
-          } else if (s.variant == Variant.EXPRESSIVE) {
-            return@setChromaMultiplier if (Hct.isYellow(s.neutralPalette.hue)) 2.3 else 1.6
-          } else if (s.variant == Variant.VIBRANT) {
-            return@setChromaMultiplier 1.29
-          }
-          1.0
-        }
-        .build()
-    return super.surfaceContainerHighest()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun onSurface(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("on_surface")
-        .setPalette { s: DynamicScheme -> s.neutralPalette }
-        .setTone { s: DynamicScheme ->
-          if (s.variant == Variant.VIBRANT) {
-            tMaxC(s.neutralPalette, 0.0, 100.0, 1.1)
-          } else {
-            DynamicColor.getInitialToneFromBackground { scheme: DynamicScheme ->
-                if (scheme.platform == Platform.PHONE) {
-                  if (scheme.isDark) surfaceBright() else surfaceDim()
-                } else {
-                  surfaceContainerHigh()
-                }
-              }
-              .invoke(s)
-          }
-        }
-        .setChromaMultiplier { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.variant == Variant.NEUTRAL) {
-              return@setChromaMultiplier 2.2
-            } else if (s.variant == Variant.TONAL_SPOT) {
-              return@setChromaMultiplier 1.7
-            } else if (s.variant == Variant.EXPRESSIVE) {
-              return@setChromaMultiplier if (Hct.isYellow(s.neutralPalette.hue))
-                (if (s.isDark) 3.0 else 2.3)
-              else 1.6
-            }
-          }
-          1.0
-        }
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) surfaceBright() else surfaceDim()
-          } else {
-            surfaceContainerHigh()
-          }
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.isDark) getContrastCurve(11.0) else getContrastCurve(9.0)
-        }
-        .build()
-    return super.onSurface()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun surfaceVariant(): DynamicColor {
-    // Remapped to surfaceContainerHighest for 2025 spec.
-    val color2025 = surfaceContainerHighest().toBuilder().setName("surface_variant").build()
-    return super.surfaceVariant()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun onSurfaceVariant(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("on_surface_variant")
-        .setPalette { s: DynamicScheme -> s.neutralPalette }
-        .setChromaMultiplier { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.variant == Variant.NEUTRAL) {
-              return@setChromaMultiplier 2.2
-            } else if (s.variant == Variant.TONAL_SPOT) {
-              return@setChromaMultiplier 1.7
-            } else if (s.variant == Variant.EXPRESSIVE) {
-              return@setChromaMultiplier if (Hct.isYellow(s.neutralPalette.hue))
-                (if (s.isDark) 3.0 else 2.3)
-              else 1.6
-            }
-          }
-          1.0
-        }
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) surfaceBright() else surfaceDim()
-          } else {
-            surfaceContainerHigh()
-          }
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            (if (s.isDark) getContrastCurve(6.0) else getContrastCurve(4.5))
-          } else {
-            getContrastCurve(7.0)
-          }
-        }
-        .build()
-    return super.onSurfaceVariant()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun inverseSurface(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("inverse_surface")
-        .setPalette { s: DynamicScheme -> s.neutralPalette }
-        .setTone { s: DynamicScheme -> if (s.isDark) 98.0 else 4.0 }
-        .setIsBackground(true)
-        .build()
-    return super.inverseSurface()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun inverseOnSurface(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("inverse_on_surface")
-        .setPalette { s: DynamicScheme -> s.neutralPalette }
-        .setBackground { s: DynamicScheme -> inverseSurface() }
-        .setContrastCurve { s: DynamicScheme -> getContrastCurve(7.0) }
-        .build()
-    return super.inverseOnSurface()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun outline(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("outline")
-        .setPalette { s: DynamicScheme -> s.neutralPalette }
-        .setChromaMultiplier { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.variant == Variant.NEUTRAL) {
-              return@setChromaMultiplier 2.2
-            } else if (s.variant == Variant.TONAL_SPOT) {
-              return@setChromaMultiplier 1.7
-            } else if (s.variant == Variant.EXPRESSIVE) {
-              return@setChromaMultiplier if (Hct.isYellow(s.neutralPalette.hue))
-                (if (s.isDark) 3.0 else 2.3)
-              else 1.6
-            }
-          }
-          1.0
-        }
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) surfaceBright() else surfaceDim()
-          } else {
-            surfaceContainerHigh()
-          }
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) getContrastCurve(3.0) else getContrastCurve(4.5)
-        }
-        .build()
-    return super.outline()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun outlineVariant(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("outline_variant")
-        .setPalette { s: DynamicScheme -> s.neutralPalette }
-        .setChromaMultiplier { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.variant == Variant.NEUTRAL) {
-              return@setChromaMultiplier 2.2
-            } else if (s.variant == Variant.TONAL_SPOT) {
-              return@setChromaMultiplier 1.7
-            } else if (s.variant == Variant.EXPRESSIVE) {
-              return@setChromaMultiplier if (Hct.isYellow(s.neutralPalette.hue))
-                (if (s.isDark) 3.0 else 2.3)
-              else 1.6
-            }
-          }
-          1.0
-        }
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) surfaceBright() else surfaceDim()
-          } else {
-            surfaceContainerHigh()
-          }
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) getContrastCurve(1.5) else getContrastCurve(3.0)
-        }
-        .build()
-    return super.outlineVariant()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun surfaceTint(): DynamicColor {
-    // Remapped to primary for 2025 spec.
-    val color2025 = primary().toBuilder().setName("surface_tint").build()
-    return super.surfaceTint()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Primaries [P] //
-  // ////////////////////////////////////////////////////////////////
-  override fun primary(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("primary")
-        .setPalette { s: DynamicScheme -> s.primaryPalette }
-        .setTone { s: DynamicScheme ->
-          when {
-            s.variant == Variant.NEUTRAL -> {
-              if (s.platform == Platform.PHONE) {
-                if (s.isDark) 80.0 else 40.0
-              } else {
-                90.0
-              }
-            }
-            s.variant == Variant.TONAL_SPOT -> {
-              if (s.platform == Platform.PHONE) {
-                if (s.isDark) {
-                  80.0
-                } else {
-                  tMaxC(s.primaryPalette)
-                }
-              } else {
-                tMaxC(s.primaryPalette, 0.0, 90.0)
-              }
-            }
-            s.variant == Variant.EXPRESSIVE -> {
-              tMaxC(
-                s.primaryPalette,
-                0.0,
-                if (Hct.isYellow(s.primaryPalette.hue)) 25.0
-                else if (Hct.isCyan(s.primaryPalette.hue)) 88.0 else 98.0,
-              )
-            }
-            else -> { // VIBRANT
-              tMaxC(s.primaryPalette, 0.0, if (Hct.isCyan(s.primaryPalette.hue)) 88.0 else 98.0)
-            }
-          }
-        }
-        .setIsBackground(true)
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) surfaceBright() else surfaceDim()
-          } else {
-            surfaceContainerHigh()
-          }
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) getContrastCurve(4.5) else getContrastCurve(7.0)
-        }
-        .setToneDeltaPair { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            ToneDeltaPair(
-              roleA = primaryContainer(),
-              roleB = primary(),
-              delta = 5.0,
-              polarity = TonePolarity.RELATIVE_LIGHTER,
-              constraint = DeltaConstraint.FARTHER,
-            )
-          } else {
-            null
-          }
-        }
-        .build()
-    return super.primary()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun primaryDim(): DynamicColor {
-    return DynamicColor.Builder()
-      .setName("primary_dim")
-      .setPalette { s: DynamicScheme -> s.primaryPalette }
-      .setTone { s: DynamicScheme ->
-        if (s.variant == Variant.NEUTRAL) {
-          85.0
-        } else if (s.variant == Variant.TONAL_SPOT) {
-          tMaxC(s.primaryPalette, 0.0, 90.0)
-        } else {
-          tMaxC(s.primaryPalette)
-        }
-      }
-      .setIsBackground(true)
-      .setBackground { s: DynamicScheme -> surfaceContainerHigh() }
-      .setContrastCurve { s: DynamicScheme -> getContrastCurve(4.5) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(
-          roleA = primaryDim(),
-          roleB = primary(),
-          delta = 5.0,
-          polarity = TonePolarity.DARKER,
-          constraint = DeltaConstraint.FARTHER,
-        )
-      }
-      .build()
-  }
-
-  override fun onPrimary(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("on_primary")
-        .setPalette { s: DynamicScheme -> s.primaryPalette }
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) primary() else primaryDim()
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) getContrastCurve(6.0) else getContrastCurve(7.0)
-        }
-        .build()
-    return super.onPrimary()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun primaryContainer(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("primary_container")
-        .setPalette { s: DynamicScheme -> s.primaryPalette }
-        .setTone { s: DynamicScheme ->
-          when {
-            s.platform == Platform.WATCH -> 30.0
-            s.variant == Variant.NEUTRAL -> if (s.isDark) 30.0 else 90.0
-            s.variant == Variant.TONAL_SPOT ->
-              if (s.isDark) tMinC(s.primaryPalette, 35.0, 93.0)
-              else tMaxC(s.primaryPalette, 0.0, 90.0)
-            s.variant == Variant.EXPRESSIVE ->
-              if (s.isDark) tMaxC(s.primaryPalette, 30.0, 93.0)
-              else
-                tMaxC(s.primaryPalette, 78.0, if (Hct.isCyan(s.primaryPalette.hue)) 88.0 else 90.0)
-            else -> { // VIBRANT
-              if (s.isDark) tMinC(s.primaryPalette, 66.0, 93.0)
-              else
-                tMaxC(s.primaryPalette, 66.0, if (Hct.isCyan(s.primaryPalette.hue)) 88.0 else 93.0)
-            }
-          }
-        }
-        .setIsBackground(true)
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) surfaceBright() else surfaceDim()
-          } else {
-            null
-          }
-        }
-        .setToneDeltaPair { s: DynamicScheme ->
-          if (s.platform == Platform.WATCH) {
-            ToneDeltaPair(
-              roleA = primaryContainer(),
-              roleB = primaryDim(),
-              delta = 10.0,
-              polarity = TonePolarity.DARKER,
-              constraint = DeltaConstraint.FARTHER,
-            )
-          } else {
-            null
-          }
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE && s.contrastLevel > 0) getContrastCurve(1.5) else null
-        }
-        .build()
-    return super.primaryContainer()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun onPrimaryContainer(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("on_primary_container")
-        .setPalette { s: DynamicScheme -> s.primaryPalette }
-        .setBackground { s: DynamicScheme -> primaryContainer() }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) getContrastCurve(6.0) else getContrastCurve(7.0)
-        }
-        .build()
-    return super.onPrimaryContainer()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun inversePrimary(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("inverse_primary")
-        .setPalette { s: DynamicScheme -> s.primaryPalette }
-        .setTone { s: DynamicScheme -> tMaxC(s.primaryPalette) }
-        .setBackground { s: DynamicScheme -> inverseSurface() }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) getContrastCurve(6.0) else getContrastCurve(7.0)
-        }
-        .build()
-    return super.inversePrimary()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Secondaries [Q] //
-  // ////////////////////////////////////////////////////////////////
-  override fun secondary(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("secondary")
-        .setPalette { s: DynamicScheme -> s.secondaryPalette }
-        .setTone { s: DynamicScheme ->
-          when {
-            s.platform == Platform.WATCH ->
-              if (s.variant == Variant.NEUTRAL) 90.0 else tMaxC(s.secondaryPalette, 0.0, 90.0)
-            s.variant == Variant.NEUTRAL ->
-              if (s.isDark) tMinC(s.secondaryPalette, 0.0, 98.0) else tMaxC(s.secondaryPalette)
-            s.variant == Variant.VIBRANT ->
-              tMaxC(s.secondaryPalette, 0.0, if (s.isDark) 90.0 else 98.0)
-            else -> { // EXPRESSIVE and TONAL_SPOT
-              if (s.isDark) 80.0 else tMaxC(s.secondaryPalette)
-            }
-          }
-        }
-        .setIsBackground(true)
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) surfaceBright() else surfaceDim()
-          } else {
-            surfaceContainerHigh()
-          }
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) getContrastCurve(4.5) else getContrastCurve(7.0)
-        }
-        .setToneDeltaPair { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            ToneDeltaPair(
-              roleA = secondaryContainer(),
-              roleB = secondary(),
-              delta = 5.0,
-              polarity = TonePolarity.RELATIVE_LIGHTER,
-              constraint = DeltaConstraint.FARTHER,
-            )
-          } else {
-            null
-          }
-        }
-        .build()
-    return super.secondary()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun secondaryDim(): DynamicColor? {
-    return DynamicColor.Builder()
-      .setName("secondary_dim")
-      .setPalette { s: DynamicScheme -> s.secondaryPalette }
-      .setTone { s: DynamicScheme ->
-        if (s.variant == Variant.NEUTRAL) {
-          85.0
-        } else {
-          tMaxC(s.secondaryPalette, 0.0, 90.0)
-        }
-      }
-      .setIsBackground(true)
-      .setBackground { s: DynamicScheme -> surfaceContainerHigh() }
-      .setContrastCurve { s: DynamicScheme -> getContrastCurve(4.5) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(
-          roleA = secondaryDim()!!,
-          roleB = secondary(),
-          delta = 5.0,
-          polarity = TonePolarity.DARKER,
-          constraint = DeltaConstraint.FARTHER,
-        )
-      }
-      .build()
-  }
-
-  override fun onSecondary(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("on_secondary")
-        .setPalette { s: DynamicScheme -> s.secondaryPalette }
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) secondary() else secondaryDim()
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) getContrastCurve(6.0) else getContrastCurve(7.0)
-        }
-        .build()
-    return super.onSecondary()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun secondaryContainer(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("secondary_container")
-        .setPalette { s: DynamicScheme -> s.secondaryPalette }
-        .setTone { s: DynamicScheme ->
-          when {
-            s.platform == Platform.WATCH -> 30.0
-            s.variant == Variant.VIBRANT ->
-              if (s.isDark) tMinC(s.secondaryPalette, 30.0, 40.0)
-              else tMaxC(s.secondaryPalette, 84.0, 90.0)
-            s.variant == Variant.EXPRESSIVE ->
-              if (s.isDark) 15.0 else tMaxC(s.secondaryPalette, 90.0, 95.0)
-            else -> if (s.isDark) 25.0 else 90.0
-          }
-        }
-        .setIsBackground(true)
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) surfaceBright() else surfaceDim()
-          } else {
-            null
-          }
-        }
-        .setToneDeltaPair { s: DynamicScheme ->
-          if (s.platform == Platform.WATCH) {
-            ToneDeltaPair(
-              roleA = secondaryContainer(),
-              roleB = secondaryDim()!!,
-              delta = 10.0,
-              polarity = TonePolarity.DARKER,
-              constraint = DeltaConstraint.FARTHER,
-            )
-          } else {
-            null
-          }
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE && s.contrastLevel > 0) getContrastCurve(1.5) else null
-        }
-        .build()
-    return super.secondaryContainer()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun onSecondaryContainer(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("on_secondary_container")
-        .setPalette { s: DynamicScheme -> s.secondaryPalette }
-        .setBackground { s: DynamicScheme -> secondaryContainer() }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) getContrastCurve(6.0) else getContrastCurve(7.0)
-        }
-        .build()
-    return super.onSecondaryContainer()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Tertiaries [T] //
-  // ////////////////////////////////////////////////////////////////
-  override fun tertiary(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("tertiary")
-        .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-        .setTone { s: DynamicScheme ->
-          when {
-            s.platform == Platform.WATCH ->
-              if (s.variant == Variant.TONAL_SPOT) tMaxC(s.tertiaryPalette, 0.0, 90.0)
-              else tMaxC(s.tertiaryPalette)
-            s.variant == Variant.EXPRESSIVE || s.variant == Variant.VIBRANT ->
-              tMaxC(
-                s.tertiaryPalette,
-                lowerBound = 0.0,
-                upperBound =
-                  if (Hct.isCyan(s.tertiaryPalette.hue)) 88.0 else if (s.isDark) 98.0 else 100.0,
-              )
-            else -> { // NEUTRAL and TONAL_SPOT
-              if (s.isDark) tMaxC(s.tertiaryPalette, 0.0, 98.0) else tMaxC(s.tertiaryPalette)
-            }
-          }
-        }
-        .setIsBackground(true)
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) surfaceBright() else surfaceDim()
-          } else {
-            surfaceContainerHigh()
-          }
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) getContrastCurve(4.5) else getContrastCurve(7.0)
-        }
-        .setToneDeltaPair { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            ToneDeltaPair(
-              roleA = tertiaryContainer(),
-              roleB = tertiary(),
-              delta = 5.0,
-              polarity = TonePolarity.RELATIVE_LIGHTER,
-              constraint = DeltaConstraint.FARTHER,
-            )
-          } else {
-            null
-          }
-        }
-        .build()
-    return super.tertiary()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun tertiaryDim(): DynamicColor? {
-    return DynamicColor.Builder()
-      .setName("tertiary_dim")
-      .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-      .setTone { s: DynamicScheme ->
-        if (s.variant == Variant.TONAL_SPOT) {
-          tMaxC(s.tertiaryPalette, 0.0, 90.0)
-        } else {
-          tMaxC(s.tertiaryPalette)
-        }
-      }
-      .setIsBackground(true)
-      .setBackground { s: DynamicScheme -> surfaceContainerHigh() }
-      .setContrastCurve { s: DynamicScheme -> getContrastCurve(4.5) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(
-          roleA = tertiaryDim()!!,
-          roleB = tertiary(),
-          delta = 5.0,
-          polarity = TonePolarity.DARKER,
-          constraint = DeltaConstraint.FARTHER,
-        )
-      }
-      .build()
-  }
-
-  override fun onTertiary(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("on_tertiary")
-        .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) tertiary() else tertiaryDim()
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) getContrastCurve(6.0) else getContrastCurve(7.0)
-        }
-        .build()
-    return super.onTertiary()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun tertiaryContainer(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("tertiary_container")
-        .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-        .setTone { s: DynamicScheme ->
-          when {
-            s.platform == Platform.WATCH ->
-              if (s.variant == Variant.TONAL_SPOT) tMaxC(s.tertiaryPalette, 0.0, 90.0)
-              else tMaxC(s.tertiaryPalette)
-            s.variant == Variant.NEUTRAL ->
-              if (s.isDark) tMaxC(s.tertiaryPalette, 0.0, 93.0)
-              else tMaxC(s.tertiaryPalette, 0.0, 96.0)
-            s.variant == Variant.TONAL_SPOT ->
-              tMaxC(s.tertiaryPalette, 0.0, if (s.isDark) 93.0 else 100.0)
-            s.variant == Variant.EXPRESSIVE ->
-              tMaxC(
-                s.tertiaryPalette,
-                lowerBound = 75.0,
-                upperBound =
-                  if (Hct.isCyan(s.tertiaryPalette.hue)) 88.0 else if (s.isDark) 93.0 else 100.0,
-              )
-            else -> { // VIBRANT
-              if (s.isDark) tMaxC(s.tertiaryPalette, 0.0, 93.0)
-              else tMaxC(s.tertiaryPalette, 72.0, 100.0)
-            }
-          }
-        }
-        .setIsBackground(true)
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) surfaceBright() else surfaceDim()
-          } else {
-            null
-          }
-        }
-        .setToneDeltaPair { s: DynamicScheme ->
-          if (s.platform == Platform.WATCH) {
-            ToneDeltaPair(
-              roleA = tertiaryContainer(),
-              roleB = tertiaryDim()!!,
-              delta = 10.0,
-              polarity = TonePolarity.DARKER,
-              constraint = DeltaConstraint.FARTHER,
-            )
-          } else {
-            null
-          }
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE && s.contrastLevel > 0) getContrastCurve(1.5) else null
-        }
-        .build()
-    return super.tertiaryContainer()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun onTertiaryContainer(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("on_tertiary_container")
-        .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-        .setBackground { s: DynamicScheme -> tertiaryContainer() }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) getContrastCurve(6.0) else getContrastCurve(7.0)
-        }
-        .build()
-    return super.onTertiaryContainer()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Errors [E] //
-  // ////////////////////////////////////////////////////////////////
-  override fun error(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("error")
-        .setPalette { s: DynamicScheme -> s.errorPalette }
-        .setTone { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) tMinC(s.errorPalette, 0.0, 98.0) else tMaxC(s.errorPalette)
-          } else {
-            tMinC(s.errorPalette)
-          }
-        }
-        .setIsBackground(true)
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) surfaceBright() else surfaceDim()
-          } else {
-            surfaceContainerHigh()
-          }
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) getContrastCurve(4.5) else getContrastCurve(7.0)
-        }
-        .setToneDeltaPair { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            ToneDeltaPair(
-              roleA = errorContainer(),
-              roleB = error(),
-              delta = 5.0,
-              polarity = TonePolarity.RELATIVE_LIGHTER,
-              constraint = DeltaConstraint.FARTHER,
-            )
-          } else {
-            null
-          }
-        }
-        .build()
-    return super.error()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun errorDim(): DynamicColor? {
-    return DynamicColor.Builder()
-      .setName("error_dim")
-      .setPalette { s: DynamicScheme -> s.errorPalette }
-      .setTone { s: DynamicScheme -> tMinC(s.errorPalette) }
-      .setIsBackground(true)
-      .setBackground { s: DynamicScheme -> surfaceContainerHigh() }
-      .setContrastCurve { s: DynamicScheme -> getContrastCurve(4.5) }
-      .setToneDeltaPair { s: DynamicScheme ->
-        ToneDeltaPair(
-          roleA = errorDim()!!,
-          roleB = error(),
-          delta = 5.0,
-          polarity = TonePolarity.DARKER,
-          constraint = DeltaConstraint.FARTHER,
-        )
-      }
-      .build()
-  }
-
-  override fun onError(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("on_error")
-        .setPalette { s: DynamicScheme -> s.errorPalette }
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) error() else errorDim()
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) getContrastCurve(6.0) else getContrastCurve(7.0)
-        }
-        .build()
-    return super.onError()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun errorContainer(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("error_container")
-        .setPalette { s: DynamicScheme -> s.errorPalette }
-        .setTone { s: DynamicScheme ->
-          if (s.platform == Platform.WATCH) {
-            30.0
-          } else {
-            if (s.isDark) tMinC(s.errorPalette, 30.0, 93.0) else tMaxC(s.errorPalette, 0.0, 90.0)
-          }
-        }
-        .setIsBackground(true)
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) surfaceBright() else surfaceDim()
-          } else {
-            null
-          }
-        }
-        .setToneDeltaPair { s: DynamicScheme ->
-          if (s.platform == Platform.WATCH) {
-            ToneDeltaPair(
-              roleA = errorContainer(),
-              roleB = errorDim()!!,
-              delta = 10.0,
-              polarity = TonePolarity.DARKER,
-              constraint = DeltaConstraint.FARTHER,
-            )
-          } else {
-            null
-          }
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE && s.contrastLevel > 0) getContrastCurve(1.5) else null
-        }
-        .build()
-    return super.errorContainer()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun onErrorContainer(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("on_error_container")
-        .setPalette { s: DynamicScheme -> s.errorPalette }
-        .setBackground { s: DynamicScheme -> errorContainer() }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) getContrastCurve(4.5) else getContrastCurve(7.0)
-        }
-        .build()
-    return super.onErrorContainer()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Primary Fixed Colors [PF] //
-  // ////////////////////////////////////////////////////////////////
-  override fun primaryFixed(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("primary_fixed")
-        .setPalette { s: DynamicScheme -> s.primaryPalette }
-        .setTone { s: DynamicScheme ->
-          val tempS = DynamicScheme.from(s, isDark = false, contrastLevel = 0.0)
-          primaryContainer().getTone(tempS)
-        }
-        .setIsBackground(true)
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) surfaceBright() else surfaceDim()
-          } else {
-            null
-          }
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE && s.contrastLevel > 0) getContrastCurve(1.5) else null
-        }
-        .build()
-    return super.primaryFixed()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun primaryFixedDim(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("primary_fixed_dim")
-        .setPalette { s: DynamicScheme -> s.primaryPalette }
-        .setTone { s: DynamicScheme -> primaryFixed().getTone(s) }
-        .setIsBackground(true)
-        .setToneDeltaPair { s: DynamicScheme ->
-          ToneDeltaPair(
-            roleA = primaryFixedDim(),
-            roleB = primaryFixed(),
-            delta = 5.0,
-            polarity = TonePolarity.DARKER,
-            constraint = DeltaConstraint.EXACT,
-          )
-        }
-        .build()
-    return super.primaryFixedDim()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun onPrimaryFixed(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("on_primary_fixed")
-        .setPalette { s: DynamicScheme -> s.primaryPalette }
-        .setBackground { s: DynamicScheme -> primaryFixedDim() }
-        .setContrastCurve { s: DynamicScheme -> getContrastCurve(7.0) }
-        .build()
-    return super.onPrimaryFixed()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun onPrimaryFixedVariant(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("on_primary_fixed_variant")
-        .setPalette { s: DynamicScheme -> s.primaryPalette }
-        .setBackground { s: DynamicScheme -> primaryFixedDim() }
-        .setContrastCurve { s: DynamicScheme -> getContrastCurve(4.5) }
-        .build()
-    return super.onPrimaryFixedVariant()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Secondary Fixed Colors [QF] //
-  // ////////////////////////////////////////////////////////////////
-  override fun secondaryFixed(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("secondary_fixed")
-        .setPalette { s: DynamicScheme -> s.secondaryPalette }
-        .setTone { s: DynamicScheme ->
-          val tempS = DynamicScheme.from(s, isDark = false, contrastLevel = 0.0)
-          secondaryContainer().getTone(tempS)
-        }
-        .setIsBackground(true)
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) surfaceBright() else surfaceDim()
-          } else {
-            null
-          }
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE && s.contrastLevel > 0) getContrastCurve(1.5) else null
-        }
-        .build()
-    return super.secondaryFixed()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun secondaryFixedDim(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("secondary_fixed_dim")
-        .setPalette { s: DynamicScheme -> s.secondaryPalette }
-        .setTone { s: DynamicScheme -> secondaryFixed().getTone(s) }
-        .setIsBackground(true)
-        .setToneDeltaPair { s: DynamicScheme ->
-          ToneDeltaPair(
-            roleA = secondaryFixedDim(),
-            roleB = secondaryFixed(),
-            delta = 5.0,
-            polarity = TonePolarity.DARKER,
-            constraint = DeltaConstraint.EXACT,
-          )
-        }
-        .build()
-    return super.secondaryFixedDim()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun onSecondaryFixed(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("on_secondary_fixed")
-        .setPalette { s: DynamicScheme -> s.secondaryPalette }
-        .setBackground { s: DynamicScheme -> secondaryFixedDim() }
-        .setContrastCurve { s: DynamicScheme -> getContrastCurve(7.0) }
-        .build()
-    return super.onSecondaryFixed()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun onSecondaryFixedVariant(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("on_secondary_fixed_variant")
-        .setPalette { s: DynamicScheme -> s.secondaryPalette }
-        .setBackground { s: DynamicScheme -> secondaryFixedDim() }
-        .setContrastCurve { s: DynamicScheme -> getContrastCurve(4.5) }
-        .build()
-    return super.onSecondaryFixedVariant()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Tertiary Fixed Colors [TF] //
-  // ////////////////////////////////////////////////////////////////
-  override fun tertiaryFixed(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("tertiary_fixed")
-        .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-        .setTone { s: DynamicScheme ->
-          val tempS = DynamicScheme.from(s, isDark = false, contrastLevel = 0.0)
-          tertiaryContainer().getTone(tempS)
-        }
-        .setIsBackground(true)
-        .setBackground { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE) {
-            if (s.isDark) surfaceBright() else surfaceDim()
-          } else {
-            null
-          }
-        }
-        .setContrastCurve { s: DynamicScheme ->
-          if (s.platform == Platform.PHONE && s.contrastLevel > 0) getContrastCurve(1.5) else null
-        }
-        .build()
-    return super.tertiaryFixed()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun tertiaryFixedDim(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("tertiary_fixed_dim")
-        .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-        .setTone { s: DynamicScheme -> tertiaryFixed().getTone(s) }
-        .setIsBackground(true)
-        .setToneDeltaPair { s: DynamicScheme ->
-          ToneDeltaPair(
-            roleA = tertiaryFixedDim(),
-            roleB = tertiaryFixed(),
-            delta = 5.0,
-            polarity = TonePolarity.DARKER,
-            constraint = DeltaConstraint.EXACT,
-          )
-        }
-        .build()
-    return super.tertiaryFixedDim()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun onTertiaryFixed(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("on_tertiary_fixed")
-        .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-        .setBackground { s: DynamicScheme -> tertiaryFixedDim() }
-        .setContrastCurve { s: DynamicScheme -> getContrastCurve(7.0) }
-        .build()
-    return super.onTertiaryFixed()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  override fun onTertiaryFixedVariant(): DynamicColor {
-    val color2025 =
-      DynamicColor.Builder()
-        .setName("on_tertiary_fixed_variant")
-        .setPalette { s: DynamicScheme -> s.tertiaryPalette }
-        .setBackground { s: DynamicScheme -> tertiaryFixedDim() }
-        .setContrastCurve { s: DynamicScheme -> getContrastCurve(4.5) }
-        .build()
-    return super.onTertiaryFixedVariant()
-      .toBuilder()
-      .extendSpecVersion(ColorSpec.SpecVersion.SPEC_2025, color2025)
-      .build()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Other //
-  // ////////////////////////////////////////////////////////////////
-  private fun findBestToneForChroma(
-    hue: Double,
-    chroma: Double,
-    tone: Double,
-    byDecreasingTone: Boolean,
-  ): Double {
-    var tone = tone
-    var answer = tone
-    var bestCandidate = Hct.from(hue, chroma, answer)
-    while (bestCandidate.chroma < chroma) {
-      if (tone < 0 || tone > 100) {
-        break
-      }
-      tone += if (byDecreasingTone) -1.0 else 1.0
-      val newCandidate = Hct.from(hue, chroma, tone)
-      if (bestCandidate.chroma < newCandidate.chroma) {
-        bestCandidate = newCandidate
-        answer = tone
-      }
-    }
-    return answer
-  }
-
-  private fun tMaxC(palette: TonalPalette): Double {
-    return tMaxC(palette, 0.0, 100.0)
-  }
-
-  private fun tMaxC(palette: TonalPalette, lowerBound: Double, upperBound: Double): Double {
-    return tMaxC(palette, lowerBound, upperBound, 1.0)
-  }
-
-  private fun tMaxC(
-    palette: TonalPalette,
-    lowerBound: Double,
-    upperBound: Double,
-    chromaMultiplier: Double,
-  ): Double {
-    val answer = findBestToneForChroma(palette.hue, palette.chroma * chromaMultiplier, 100.0, true)
-    return MathUtils.clampDouble(lowerBound, upperBound, answer)
-  }
-
-  private fun tMinC(palette: TonalPalette): Double {
-    return tMinC(palette, 0.0, 100.0)
-  }
-
-  private fun tMinC(palette: TonalPalette, lowerBound: Double, upperBound: Double): Double {
-    val answer = findBestToneForChroma(palette.hue, palette.chroma, 0.0, false)
-    return MathUtils.clampDouble(lowerBound, upperBound, answer)
-  }
-
-  private fun getContrastCurve(defaultContrast: Double): ContrastCurve {
-    return when (defaultContrast) {
-      1.5 -> ContrastCurve(1.5, 1.5, 3.0, 4.5)
-      3.0 -> ContrastCurve(3.0, 3.0, 4.5, 7.0)
-      4.5 -> ContrastCurve(4.5, 4.5, 7.0, 11.0)
-      6.0 -> ContrastCurve(6.0, 6.0, 7.0, 11.0)
-      7.0 -> ContrastCurve(7.0, 7.0, 11.0, 21.0)
-      9.0 -> ContrastCurve(9.0, 9.0, 11.0, 21.0)
-      11.0 -> ContrastCurve(11.0, 11.0, 21.0, 21.0)
-      21.0 -> ContrastCurve(21.0, 21.0, 21.0, 21.0)
-      else -> ContrastCurve(defaultContrast, defaultContrast, 7.0, 21.0)
-    }
-  }
-
-  // /////////////////////////////////////////////////////////////////
-  // Color value calculations //
-  // /////////////////////////////////////////////////////////////////
-  override fun getHct(scheme: DynamicScheme, color: DynamicColor): Hct {
-    // This is crucial for aesthetics: we aren't simply the taking the standard color
-    // and changing its tone for contrast. Rather, we find the tone for contrast, then
-    // use the specified chroma from the palette to construct a new color.
-    //
-    // For example, this enables colors with standard tone of T90, which has limited chroma, to
-    // "recover" intended chroma as contrast increases.
-    val palette = color.palette.invoke(scheme)
-    val tone = getTone(scheme, color)
-    val hue = palette.hue
-    val chromaMultiplier = color.chromaMultiplier?.invoke(scheme) ?: 1.0
-    val chroma = palette.chroma * chromaMultiplier
-    return Hct.from(hue, chroma, tone)
-  }
-
-  override fun getTone(scheme: DynamicScheme, color: DynamicColor): Double {
-    val toneDeltaPair = color.toneDeltaPair?.invoke(scheme)
-
-    // Case 0: tone delta pair.
-    if (toneDeltaPair != null) {
-      val roleA = toneDeltaPair.roleA
-      val roleB = toneDeltaPair.roleB
-      val polarity = toneDeltaPair.polarity
-      val constraint = toneDeltaPair.constraint
-      val absoluteDelta =
-        if (
-          polarity == TonePolarity.DARKER ||
-            (polarity == TonePolarity.RELATIVE_LIGHTER && scheme.isDark) ||
-            (polarity == TonePolarity.RELATIVE_DARKER && !scheme.isDark)
-        ) {
-          -toneDeltaPair.delta
-        } else {
-          toneDeltaPair.delta
-        }
-      val amRoleA = color.name == roleA.name
-      val selfRole = if (amRoleA) roleA else roleB
-      val referenceRole = if (amRoleA) roleB else roleA
-      var selfTone = selfRole.tone.invoke(scheme)
-      val referenceTone = referenceRole.getTone(scheme)
-      val relativeDelta = absoluteDelta * (if (amRoleA) 1 else -1)
-      when (constraint) {
-        DeltaConstraint.EXACT ->
-          selfTone = MathUtils.clampDouble(0.0, 100.0, referenceTone + relativeDelta)
-        DeltaConstraint.NEARER ->
-          if (relativeDelta > 0) {
-            selfTone =
-              MathUtils.clampDouble(
-                0.0,
-                100.0,
-                MathUtils.clampDouble(referenceTone, referenceTone + relativeDelta, selfTone),
-              )
-          } else {
-            selfTone =
-              MathUtils.clampDouble(
-                0.0,
-                100.0,
-                MathUtils.clampDouble(referenceTone + relativeDelta, referenceTone, selfTone),
-              )
-          }
-        DeltaConstraint.FARTHER ->
-          if (relativeDelta > 0) {
-            selfTone = MathUtils.clampDouble(referenceTone + relativeDelta, 100.0, selfTone)
-          } else {
-            selfTone = MathUtils.clampDouble(0.0, referenceTone + relativeDelta, selfTone)
-          }
-      }
-      val background = color.background?.invoke(scheme)
-      val contrastCurve = color.contrastCurve?.invoke(scheme)
-      if (background != null && contrastCurve != null) {
-        val bgTone = background.getTone(scheme)
-        val selfContrast = contrastCurve.get(scheme.contrastLevel)
-        selfTone =
-          if (
-            Contrast.ratioOfTones(bgTone, selfTone) >= selfContrast && scheme.contrastLevel >= 0
-          ) {
-            selfTone
-          } else {
-            DynamicColor.foregroundTone(bgTone, selfContrast)
-          }
-      }
-
-      // This can avoid the awkward tones for background colors including the access fixed colors.
-      // Accent fixed dim colors should not be adjusted.
-      if (color.isBackground && !color.name.endsWith("_fixed_dim")) {
-        selfTone =
-          if (selfTone >= 57) {
-            MathUtils.clampDouble(65.0, 100.0, selfTone)
-          } else {
-            MathUtils.clampDouble(0.0, 49.0, selfTone)
-          }
-      }
-      return selfTone
-    } else {
-      // Case 1: No tone delta pair; just solve for itself.
-      var answer = color.tone.invoke(scheme)
-      val background = color.background?.invoke(scheme)
-      val contrastCurve = color.contrastCurve?.invoke(scheme)
-      if (background == null || contrastCurve == null) {
-        return answer // No adjustment for colors with no background.
-      }
-      val bgTone = background.getTone(scheme)
-      val desiredRatio = contrastCurve.get(scheme.contrastLevel)
-
-      // Recalculate the tone from desired contrast ratio if the current
-      // contrast ratio is not enough or desired contrast level is decreasing
-      // (<0).
-      answer =
-        if (Contrast.ratioOfTones(bgTone, answer) >= desiredRatio && scheme.contrastLevel >= 0) {
-          answer
-        } else {
-          DynamicColor.foregroundTone(bgTone, desiredRatio)
-        }
-
-      // This can avoid the awkward tones for background colors including the access fixed colors.
-      // Accent fixed dim colors should not be adjusted.
-      if (color.isBackground && !color.name.endsWith("_fixed_dim")) {
-        answer =
-          if (answer >= 57) {
-            MathUtils.clampDouble(65.0, 100.0, answer)
-          } else {
-            MathUtils.clampDouble(0.0, 49.0, answer)
-          }
-      }
-      val secondBackground = color.secondBackground?.invoke(scheme)
-      if (secondBackground == null) {
-        return answer
-      }
-
-      // Case 2: Adjust for dual backgrounds.
-      val bgTone1 = background.getTone(scheme)
-      val bgTone2 = secondBackground.getTone(scheme)
-      val upper = max(bgTone1, bgTone2)
-      val lower = min(bgTone1, bgTone2)
-      if (
-        Contrast.ratioOfTones(upper, answer) >= desiredRatio &&
-          Contrast.ratioOfTones(lower, answer) >= desiredRatio
-      ) {
-        return answer
-      }
-
-      // The darkest light tone that satisfies the desired ratio,
-      // or -1 if such ratio cannot be reached.
-      val lightOption = Contrast.lighter(upper, desiredRatio)
-
-      // The lightest dark tone that satisfies the desired ratio,
-      // or -1 if such ratio cannot be reached.
-      val darkOption = Contrast.darker(lower, desiredRatio)
-
-      // Tones suitable for the foreground.
-      val availables = mutableListOf()
-      if (lightOption != -1.0) {
-        availables.add(lightOption)
-      }
-      if (darkOption != -1.0) {
-        availables.add(darkOption)
-      }
-      val prefersLight =
-        DynamicColor.tonePrefersLightForeground(bgTone1) ||
-          DynamicColor.tonePrefersLightForeground(bgTone2)
-      if (prefersLight) {
-        return if (lightOption < 0) 100.0 else lightOption
-      }
-      return if (availables.size == 1) {
-        availables[0]
-      } else if (darkOption < 0) 0.0 else darkOption
-    }
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Scheme Palettes //
-  // ////////////////////////////////////////////////////////////////
-  override fun getPrimaryPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette {
-    return when (variant) {
-      Variant.NEUTRAL ->
-        TonalPalette.fromHueAndChroma(
-          sourceColorHct.hue,
-          if (platform == Platform.PHONE) (if (Hct.isBlue(sourceColorHct.hue)) 12.0 else 8.0)
-          else if (Hct.isBlue(sourceColorHct.hue)) 16.0 else 12.0,
-        )
-      Variant.TONAL_SPOT ->
-        TonalPalette.fromHueAndChroma(
-          sourceColorHct.hue,
-          if (platform == Platform.PHONE && isDark) 26.0 else 32.0,
-        )
-      Variant.EXPRESSIVE ->
-        TonalPalette.fromHueAndChroma(
-          sourceColorHct.hue,
-          if (platform == Platform.PHONE) if (isDark) 36.0 else 48.0 else 40.0,
-        )
-      Variant.VIBRANT ->
-        TonalPalette.fromHueAndChroma(
-          sourceColorHct.hue,
-          if (platform == Platform.PHONE) 74.0 else 56.0,
-        )
-      else -> super.getPrimaryPalette(variant, sourceColorHct, isDark, platform, contrastLevel)
-    }
-  }
-
-  override fun getSecondaryPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette {
-    return when (variant) {
-      Variant.NEUTRAL ->
-        TonalPalette.fromHueAndChroma(
-          sourceColorHct.hue,
-          if (platform == Platform.PHONE) (if (Hct.isBlue(sourceColorHct.hue)) 6.0 else 4.0)
-          else if (Hct.isBlue(sourceColorHct.hue)) 10.0 else 6.0,
-        )
-      Variant.TONAL_SPOT -> TonalPalette.fromHueAndChroma(sourceColorHct.hue, 16.0)
-      Variant.EXPRESSIVE ->
-        TonalPalette.fromHueAndChroma(
-          DynamicScheme.getRotatedHue(
-            sourceColorHct,
-            doubleArrayOf(0.0, 105.0, 140.0, 204.0, 253.0, 278.0, 300.0, 333.0, 360.0),
-            doubleArrayOf(-160.0, 155.0, -100.0, 96.0, -96.0, -156.0, -165.0, -160.0),
-          ),
-          if (platform == Platform.PHONE) if (isDark) 16.0 else 24.0 else 24.0,
-        )
-      Variant.VIBRANT ->
-        TonalPalette.fromHueAndChroma(
-          DynamicScheme.getRotatedHue(
-            sourceColorHct,
-            doubleArrayOf(0.0, 38.0, 105.0, 140.0, 333.0, 360.0),
-            doubleArrayOf(-14.0, 10.0, -14.0, 10.0, -14.0),
-          ),
-          if (platform == Platform.PHONE) 56.0 else 36.0,
-        )
-      else -> super.getSecondaryPalette(variant, sourceColorHct, isDark, platform, contrastLevel)
-    }
-  }
-
-  override fun getTertiaryPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette {
-    return when (variant) {
-      Variant.NEUTRAL ->
-        TonalPalette.fromHueAndChroma(
-          DynamicScheme.getRotatedHue(
-            sourceColorHct,
-            doubleArrayOf(0.0, 38.0, 105.0, 161.0, 204.0, 278.0, 333.0, 360.0),
-            doubleArrayOf(-32.0, 26.0, 10.0, -39.0, 24.0, -15.0, -32.0),
-          ),
-          if (platform == Platform.PHONE) 20.0 else 36.0,
-        )
-      Variant.TONAL_SPOT ->
-        TonalPalette.fromHueAndChroma(
-          DynamicScheme.getRotatedHue(
-            sourceColorHct,
-            doubleArrayOf(0.0, 20.0, 71.0, 161.0, 333.0, 360.0),
-            doubleArrayOf(-40.0, 48.0, -32.0, 40.0, -32.0),
-          ),
-          if (platform == Platform.PHONE) 28.0 else 32.0,
-        )
-      Variant.EXPRESSIVE ->
-        TonalPalette.fromHueAndChroma(
-          DynamicScheme.getRotatedHue(
-            sourceColorHct,
-            doubleArrayOf(0.0, 105.0, 140.0, 204.0, 253.0, 278.0, 300.0, 333.0, 360.0),
-            doubleArrayOf(-165.0, 160.0, -105.0, 101.0, -101.0, -160.0, -170.0, -165.0),
-          ),
-          48.0,
-        )
-      Variant.VIBRANT ->
-        TonalPalette.fromHueAndChroma(
-          DynamicScheme.getRotatedHue(
-            sourceColorHct,
-            doubleArrayOf(0.0, 38.0, 71.0, 105.0, 140.0, 161.0, 253.0, 333.0, 360.0),
-            doubleArrayOf(-72.0, 35.0, 24.0, -24.0, 62.0, 50.0, 62.0, -72.0),
-          ),
-          56.0,
-        )
-      else -> super.getTertiaryPalette(variant, sourceColorHct, isDark, platform, contrastLevel)
-    }
-  }
-
-  override fun getNeutralPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette {
-    return when (variant) {
-      Variant.NEUTRAL ->
-        TonalPalette.fromHueAndChroma(
-          sourceColorHct.hue,
-          if (platform == Platform.PHONE) 1.4 else 6.0,
-        )
-      Variant.TONAL_SPOT ->
-        TonalPalette.fromHueAndChroma(
-          sourceColorHct.hue,
-          if (platform == Platform.PHONE) 5.0 else 10.0,
-        )
-      Variant.EXPRESSIVE ->
-        TonalPalette.fromHueAndChroma(
-          getExpressiveNeutralHue(sourceColorHct),
-          getExpressiveNeutralChroma(sourceColorHct, isDark, platform),
-        )
-      Variant.VIBRANT ->
-        TonalPalette.fromHueAndChroma(
-          getVibrantNeutralHue(sourceColorHct),
-          getVibrantNeutralChroma(sourceColorHct, platform),
-        )
-      else -> super.getNeutralPalette(variant, sourceColorHct, isDark, platform, contrastLevel)
-    }
-  }
-
-  override fun getNeutralVariantPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette {
-    when (variant) {
-      Variant.NEUTRAL ->
-        return TonalPalette.fromHueAndChroma(
-          sourceColorHct.hue,
-          (if (platform == Platform.PHONE) 1.4 else 6.0) * 2.2,
-        )
-      Variant.TONAL_SPOT ->
-        return TonalPalette.fromHueAndChroma(
-          sourceColorHct.hue,
-          (if (platform == Platform.PHONE) 5.0 else 10.0) * 1.7,
-        )
-      Variant.EXPRESSIVE -> {
-        val expressiveNeutralHue = getExpressiveNeutralHue(sourceColorHct)
-        val expressiveNeutralChroma = getExpressiveNeutralChroma(sourceColorHct, isDark, platform)
-        return TonalPalette.fromHueAndChroma(
-          expressiveNeutralHue,
-          expressiveNeutralChroma *
-            if (expressiveNeutralHue >= 105 && expressiveNeutralHue < 125) 1.6 else 2.3,
-        )
-      }
-      Variant.VIBRANT -> {
-        val vibrantNeutralHue = getVibrantNeutralHue(sourceColorHct)
-        val vibrantNeutralChroma = getVibrantNeutralChroma(sourceColorHct, platform)
-        return TonalPalette.fromHueAndChroma(vibrantNeutralHue, vibrantNeutralChroma * 1.29)
-      }
-      else ->
-        return super.getNeutralVariantPalette(
-          variant,
-          sourceColorHct,
-          isDark,
-          platform,
-          contrastLevel,
-        )
-    }
-  }
-
-  override fun getErrorPalette(
-    variant: Variant,
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-    contrastLevel: Double,
-  ): TonalPalette {
-    val errorHue =
-      DynamicScheme.getPiecewiseValue(
-        sourceColorHct,
-        doubleArrayOf(0.0, 3.0, 13.0, 23.0, 33.0, 43.0, 153.0, 273.0, 360.0),
-        doubleArrayOf(12.0, 22.0, 32.0, 12.0, 22.0, 32.0, 22.0, 12.0),
-      )
-    return when (variant) {
-      Variant.NEUTRAL ->
-        TonalPalette.fromHueAndChroma(errorHue, if (platform == Platform.PHONE) 50.0 else 40.0)
-      Variant.TONAL_SPOT ->
-        TonalPalette.fromHueAndChroma(errorHue, if (platform == Platform.PHONE) 60.0 else 48.0)
-      Variant.EXPRESSIVE ->
-        TonalPalette.fromHueAndChroma(errorHue, if (platform == Platform.PHONE) 64.0 else 48.0)
-      Variant.VIBRANT ->
-        TonalPalette.fromHueAndChroma(errorHue, if (platform == Platform.PHONE) 80.0 else 60.0)
-      else -> super.getErrorPalette(variant, sourceColorHct, isDark, platform, contrastLevel)
-    }
-  }
-
-  private fun getExpressiveNeutralHue(sourceColorHct: Hct): Double {
-    return DynamicScheme.getRotatedHue(
-      sourceColorHct,
-      doubleArrayOf(0.0, 71.0, 124.0, 253.0, 278.0, 300.0, 360.0),
-      doubleArrayOf(10.0, 0.0, 10.0, 0.0, 10.0, 0.0),
-    )
-  }
-
-  private fun getExpressiveNeutralChroma(
-    sourceColorHct: Hct,
-    isDark: Boolean,
-    platform: Platform,
-  ): Double {
-    val neutralHue = getExpressiveNeutralHue(sourceColorHct)
-    return if (platform == Platform.PHONE) {
-      if (isDark) if (Hct.isYellow(neutralHue)) 6.0 else 14.0 else 18.0
-    } else {
-      12.0
-    }
-  }
-
-  private fun getVibrantNeutralHue(sourceColorHct: Hct): Double {
-    return DynamicScheme.getRotatedHue(
-      sourceColorHct,
-      doubleArrayOf(0.0, 38.0, 105.0, 140.0, 333.0, 360.0),
-      doubleArrayOf(-14.0, 10.0, -14.0, 10.0, -14.0),
-    )
-  }
-
-  private fun getVibrantNeutralChroma(sourceColorHct: Hct, platform: Platform): Double {
-    val neutralHue = getVibrantNeutralHue(sourceColorHct)
-    return if (platform == Platform.PHONE) 28.0 else if (Hct.isBlue(neutralHue)) 28.0 else 20.0
-  }
-}
diff --git a/kotlin/dynamiccolor/ColorSpecs.kt b/kotlin/dynamiccolor/ColorSpecs.kt
deleted file mode 100644
index 91962609..00000000
--- a/kotlin/dynamiccolor/ColorSpecs.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dynamiccolor
-
-import dynamiccolor.ColorSpec.SpecVersion
-
-/** A utility class to get the correct color spec for a given spec version. */
-object ColorSpecs {
-  private val SPEC_2021: ColorSpec = ColorSpec2021()
-  private val SPEC_2025: ColorSpec = ColorSpec2025()
-
-  @JvmStatic
-  fun get(): ColorSpec {
-    return get(SpecVersion.SPEC_2021)
-  }
-
-  @JvmStatic
-  fun get(specVersion: SpecVersion): ColorSpec {
-    return get(specVersion, false)
-  }
-
-  @JvmStatic
-  fun get(specVersion: SpecVersion, isExtendedFidelity: Boolean): ColorSpec {
-    return if (specVersion == SpecVersion.SPEC_2025) SPEC_2025 else SPEC_2021
-  }
-}
diff --git a/kotlin/dynamiccolor/ContrastCurve.kt b/kotlin/dynamiccolor/ContrastCurve.kt
deleted file mode 100644
index e4ac8b95..00000000
--- a/kotlin/dynamiccolor/ContrastCurve.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dynamiccolor
-
-import utils.MathUtils
-
-/**
- * A class containing a value that changes with the contrast level.
- *
- * Usually represents the contrast requirements for a dynamic color on its background. The four
- * values correspond to values for contrast levels -1.0, 0.0, 0.5, and 1.0, respectively.
- *
- * @property low Value for contrast level -1.0
- * @property normal Value for contrast level 0.0
- * @property medium Value for contrast level 0.5
- * @property high Value for contrast level 1.0
- */
-class ContrastCurve(val low: Double, val normal: Double, val medium: Double, val high: Double) {
-  /**
-   * Returns the value at a given contrast level.
-   *
-   * @param contrastLevel The contrast level. 0.0 is the default (normal); -1.0 is the lowest; 1.0
-   *   is the highest.
-   * @return The value. For contrast ratios, a number between 1.0 and 21.0.
-   */
-  fun get(contrastLevel: Double): Double {
-    return if (contrastLevel <= -1.0) {
-      low
-    } else if (contrastLevel < 0.0) {
-      MathUtils.lerp(low, normal, (contrastLevel - -1) / 1)
-    } else if (contrastLevel < 0.5) {
-      MathUtils.lerp(normal, medium, (contrastLevel - 0) / 0.5)
-    } else if (contrastLevel < 1.0) {
-      MathUtils.lerp(medium, high, (contrastLevel - 0.5) / 0.5)
-    } else {
-      high
-    }
-  }
-}
diff --git a/kotlin/dynamiccolor/DynamicColor.kt b/kotlin/dynamiccolor/DynamicColor.kt
deleted file mode 100644
index 8d260e7f..00000000
--- a/kotlin/dynamiccolor/DynamicColor.kt
+++ /dev/null
@@ -1,533 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dynamiccolor
-
-import com.google.errorprone.annotations.CanIgnoreReturnValue
-import contrast.Contrast
-import dynamiccolor.ColorSpec.SpecVersion
-import hct.Hct
-import palettes.TonalPalette
-import utils.MathUtils
-import kotlin.math.abs
-import kotlin.math.roundToInt
-
-/**
- * A color that adjusts itself based on UI state, represented by DynamicScheme.
- *
- * This color automatically adjusts to accommodate a desired contrast level, or other adjustments
- * such as differing in light mode versus dark mode, or what the theme is, or what the color that
- * produced the theme is, etc.
- *
- * Colors without backgrounds do not change tone when contrast changes. Colors with backgrounds
- * become closer to their background as contrast lowers, and further when contrast increases.
- *
- * Prefer the static constructors. They provide a much more simple interface, such as requiring just
- * a hexcode, or just a hexcode and a background.
- *
- * Ultimately, each component necessary for calculating a color, adjusting it for a desired contrast
- * level, and ensuring it has a certain lightness/tone difference from another color, is provided by
- * a function that takes a DynamicScheme and returns a value. This ensures ultimate flexibility, any
- * desired behavior of a color for any design system, but it usually unnecessary. See the default
- * constructor for more information.
- */
-class DynamicColor(
-  val name: String,
-  val palette: (DynamicScheme) -> TonalPalette,
-  val tone: (DynamicScheme) -> Double,
-  val isBackground: Boolean,
-  val chromaMultiplier: ((DynamicScheme) -> Double)?,
-  val background: ((DynamicScheme) -> DynamicColor?)?,
-  val secondBackground: ((DynamicScheme) -> DynamicColor?)?,
-  val contrastCurve: ((DynamicScheme) -> ContrastCurve?)?,
-  val toneDeltaPair: ((DynamicScheme) -> ToneDeltaPair?)?,
-  val opacity: ((DynamicScheme) -> Double?)?,
-) {
-  private val hctCache = mutableMapOf()
-
-  /**
-   * A constructor for DynamicColor.
-   *
-   * _Strongly_ prefer using one of the convenience constructors. This class is arguably too
-   * flexible to ensure it can support any scenario. Functional arguments allow overriding without
-   * risks that come with subclasses.
-   *
-   * For example, the default behavior of adjust tone at max contrast to be at a 7.0 ratio with its
-   * background is principled and matches accessibility guidance. That does not mean it's the
-   * desired approach for _every_ design system, and every color pairing, always, in every case.
-   *
-   * For opaque colors (colors with alpha = 100%).
-   *
-   * @param name The name of the dynamic color.
-   * @param palette Function that provides a TonalPalette given DynamicScheme. A TonalPalette is
-   *   defined by a hue and chroma, so this replaces the need to specify hue/chroma. By providing a
-   *   tonal palette, when contrast adjustments are made, intended chroma can be preserved.
-   * @param tone Function that provides a tone, given a DynamicScheme.
-   * @param isBackground Whether this dynamic color is a background, with some other color as the
-   *   foreground.
-   * @param background The background of the dynamic color (as a function of a `DynamicScheme`), if
-   *   it exists.
-   * @param secondBackground A second background of the dynamic color (as a function of a
-   *   `DynamicScheme`), if it exists.
-   * @param contrastCurve A `ContrastCurve` object specifying how its contrast against its
-   *   background should behave in various contrast levels options.
-   * @param toneDeltaPair A `ToneDeltaPair` object specifying a tone delta constraint between two
-   *   colors. One of them must be the color being constructed.
-   */
-  constructor(
-    name: String,
-    palette: (DynamicScheme) -> TonalPalette,
-    tone: (DynamicScheme) -> Double,
-    isBackground: Boolean,
-    background: ((DynamicScheme) -> DynamicColor?)?,
-    secondBackground: ((DynamicScheme) -> DynamicColor?)?,
-    contrastCurve: ContrastCurve?,
-    toneDeltaPair: ((DynamicScheme) -> ToneDeltaPair?)?,
-  ) : this(
-    name,
-    palette,
-    tone,
-    isBackground,
-    chromaMultiplier = null,
-    background,
-    secondBackground,
-    if (contrastCurve == null) null else { _ -> contrastCurve },
-    toneDeltaPair,
-    opacity = null,
-  )
-
-  /**
-   * A constructor for DynamicColor.
-   *
-   * _Strongly_ prefer using one of the convenience constructors. This class is arguably too
-   * flexible to ensure it can support any scenario. Functional arguments allow overriding without
-   * risks that come with subclasses.
-   *
-   * For example, the default behavior of adjust tone at max contrast to be at a 7.0 ratio with its
-   * background is principled and matches accessibility guidance. That does not mean it's the
-   * desired approach for _every_ design system, and every color pairing, always, in every case.
-   *
-   * For opaque colors (colors with alpha = 100%).
-   *
-   * @param name The name of the dynamic color.
-   * @param palette Function that provides a TonalPalette given DynamicScheme. A TonalPalette is
-   *   defined by a hue and chroma, so this replaces the need to specify hue/chroma. By providing a
-   *   tonal palette, when contrast adjustments are made, intended chroma can be preserved.
-   * @param tone Function that provides a tone, given a DynamicScheme.
-   * @param isBackground Whether this dynamic color is a background, with some other color as the
-   *   foreground.
-   * @param background The background of the dynamic color (as a function of a `DynamicScheme`), if
-   *   it exists.
-   * @param secondBackground A second background of the dynamic color (as a function of a
-   *   `DynamicScheme`), if it exists.
-   * @param contrastCurve A `ContrastCurve` object specifying how its contrast against its
-   *   background should behave in various contrast levels options.
-   * @param toneDeltaPair A `ToneDeltaPair` object specifying a tone delta constraint between two
-   *   colors. One of them must be the color being constructed.
-   * @param opacity A function returning the opacity of a color, as a number between 0 and 1.
-   */
-  constructor(
-    name: String,
-    palette: (DynamicScheme) -> TonalPalette,
-    tone: (DynamicScheme) -> Double,
-    isBackground: Boolean,
-    background: ((DynamicScheme) -> DynamicColor?)?,
-    secondBackground: ((DynamicScheme) -> DynamicColor?)?,
-    contrastCurve: ContrastCurve?,
-    toneDeltaPair: ((DynamicScheme) -> ToneDeltaPair?)?,
-    opacity: ((DynamicScheme) -> Double?)?,
-  ) : this(
-    name,
-    palette,
-    tone,
-    isBackground,
-    chromaMultiplier = null,
-    background,
-    secondBackground,
-    if (contrastCurve == null) null else { _ -> contrastCurve },
-    toneDeltaPair,
-    opacity,
-  )
-
-  /**
-   * Returns an ARGB integer (i.e. a hex code).
-   *
-   * @param scheme Defines the conditions of the user interface, for example, whether or not it is
-   *   dark mode or light mode, and what the desired contrast level is.
-   */
-  fun getArgb(scheme: DynamicScheme): Int {
-    val argb = getHct(scheme).toInt()
-    val opacityPercentage = opacity?.invoke(scheme)
-    return if (opacityPercentage == null) {
-      argb
-    } else {
-      val alpha = MathUtils.clampInt(0, 255, (opacityPercentage * 255).roundToInt())
-      (argb and 0x00ffffff) or (alpha shl 24)
-    }
-  }
-
-  /**
-   * Returns an HCT object.
-   *
-   * @param scheme Defines the conditions of the user interface, for example, whether or not it is
-   *   dark mode or light mode, and what the desired contrast level is.
-   */
-  fun getHct(scheme: DynamicScheme): Hct {
-    val cachedAnswer = hctCache[scheme]
-    if (cachedAnswer != null) {
-      return cachedAnswer
-    }
-    val answer = ColorSpecs.get(scheme.specVersion).getHct(scheme, this)
-    // NOMUTANTS--trivial test with onerous dependency injection requirement.
-    if (hctCache.size > 4) {
-      hctCache.clear()
-    }
-    // NOMUTANTS--trivial test with onerous dependency injection requirement.
-    hctCache[scheme] = answer
-    return answer
-  }
-
-  /** Returns the tone in HCT, ranging from 0 to 100, of the resolved color given scheme. */
-  fun getTone(scheme: DynamicScheme): Double {
-    return ColorSpecs.get(scheme.specVersion).getTone(scheme, this)
-  }
-
-  fun toBuilder(): Builder {
-    return Builder()
-      .setName(name)
-      .setPalette(palette)
-      .setTone(tone)
-      .setIsBackground(isBackground)
-      .setChromaMultiplier(chromaMultiplier)
-      .setBackground(background)
-      .setSecondBackground(secondBackground)
-      .setContrastCurve(contrastCurve)
-      .setToneDeltaPair(toneDeltaPair)
-      .setOpacity(opacity)
-  }
-
-  /** Builder for [DynamicColor]. */
-  class Builder {
-    private var name: String? = null
-    private var palette: ((DynamicScheme) -> TonalPalette)? = null
-    private var tone: ((DynamicScheme) -> Double)? = null
-    private var isBackground = false
-    private var chromaMultiplier: ((DynamicScheme) -> Double)? = null
-    private var background: ((DynamicScheme) -> DynamicColor?)? = null
-    private var secondBackground: ((DynamicScheme) -> DynamicColor?)? = null
-    private var contrastCurve: ((DynamicScheme) -> ContrastCurve?)? = null
-    private var toneDeltaPair: ((DynamicScheme) -> ToneDeltaPair?)? = null
-    private var opacity: ((DynamicScheme) -> Double?)? = null
-
-    @CanIgnoreReturnValue fun setName(name: String) = apply { this.name = name }
-
-    @CanIgnoreReturnValue
-    fun setPalette(palette: (DynamicScheme) -> TonalPalette) = apply { this.palette = palette }
-
-    @CanIgnoreReturnValue fun setTone(tone: (DynamicScheme) -> Double) = apply { this.tone = tone }
-
-    @CanIgnoreReturnValue
-    fun setIsBackground(isBackground: Boolean) = apply { this.isBackground = isBackground }
-
-    @CanIgnoreReturnValue
-    fun setChromaMultiplier(chromaMultiplier: ((DynamicScheme) -> Double)?) = apply {
-      this.chromaMultiplier = chromaMultiplier
-    }
-
-    @CanIgnoreReturnValue
-    fun setBackground(background: ((DynamicScheme) -> DynamicColor?)?) = apply {
-      this.background = background
-    }
-
-    @CanIgnoreReturnValue
-    fun setSecondBackground(secondBackground: ((DynamicScheme) -> DynamicColor?)?) = apply {
-      this.secondBackground = secondBackground
-    }
-
-    @CanIgnoreReturnValue
-    fun setContrastCurve(contrastCurve: ((DynamicScheme) -> ContrastCurve?)?) = apply {
-      this.contrastCurve = contrastCurve
-    }
-
-    @CanIgnoreReturnValue
-    fun setToneDeltaPair(toneDeltaPair: ((DynamicScheme) -> ToneDeltaPair?)?) = apply {
-      this.toneDeltaPair = toneDeltaPair
-    }
-
-    @CanIgnoreReturnValue
-    fun setOpacity(opacity: ((DynamicScheme) -> Double?)?) = apply { this.opacity = opacity }
-
-    @CanIgnoreReturnValue
-    fun extendSpecVersion(specVersion: SpecVersion, extendedColor: DynamicColor): Builder {
-      validateExtendedColor(specVersion, extendedColor)
-      return Builder()
-        .setName(name!!)
-        .setIsBackground(isBackground)
-        .setPalette { s ->
-          (if (s.specVersion == specVersion) extendedColor.palette else palette!!).invoke(s)
-        }
-        .setTone { s ->
-          (if (s.specVersion == specVersion) extendedColor.tone else tone!!).invoke(s)
-        }
-        .setChromaMultiplier(
-          chromaMultiplier = { s ->
-            (if (s.specVersion == specVersion) extendedColor.chromaMultiplier else chromaMultiplier)
-              ?.invoke(s) ?: 1.0
-          }
-        )
-        .setBackground(
-          background = { s ->
-            (if (s.specVersion == specVersion) extendedColor.background else background)?.invoke(s)
-          }
-        )
-        .setSecondBackground(
-          secondBackground = { s ->
-            (if (s.specVersion == specVersion) extendedColor.secondBackground else secondBackground)
-              ?.invoke(s)
-          }
-        )
-        .setContrastCurve(
-          contrastCurve = { s ->
-            (if (s.specVersion == specVersion) extendedColor.contrastCurve else contrastCurve)
-              ?.invoke(s)
-          }
-        )
-        .setToneDeltaPair(
-          toneDeltaPair = { s ->
-            (if (s.specVersion == specVersion) extendedColor.toneDeltaPair else toneDeltaPair)
-              ?.invoke(s)
-          }
-        )
-        .setOpacity(
-          opacity = { s ->
-            (if (s.specVersion == specVersion) extendedColor.opacity else opacity)?.invoke(s)
-          }
-        )
-    }
-
-    fun build(): DynamicColor {
-      if (background == null && secondBackground != null) {
-        throw IllegalArgumentException(
-          "Color $name has secondBackground defined, but background is not defined."
-        )
-      }
-      if (background == null && contrastCurve != null) {
-        throw IllegalArgumentException(
-          "Color $name has contrastCurve defined, but background is not defined."
-        )
-      }
-      if (background != null && contrastCurve == null) {
-        throw IllegalArgumentException(
-          "Color $name has background defined, but contrastCurve is not defined."
-        )
-      }
-      return DynamicColor(
-        name!!,
-        palette!!,
-        tone ?: getInitialToneFromBackground(background),
-        isBackground,
-        chromaMultiplier,
-        background,
-        secondBackground,
-        contrastCurve,
-        toneDeltaPair,
-        opacity,
-      )
-    }
-
-    private fun validateExtendedColor(specVersion: SpecVersion, extendedColor: DynamicColor) {
-      require(name == extendedColor.name) {
-        "Attempting to extend color $name with color ${extendedColor.name} of different name for spec version $specVersion."
-      }
-      require(isBackground == extendedColor.isBackground) {
-        "Attempting to extend color $name as a ${if (isBackground) "background" else "foreground"} with color ${extendedColor.name} as a ${if (extendedColor.isBackground) "background" else "foreground"} for spec version $specVersion."
-      }
-    }
-  }
-
-  companion object {
-    /**
-     * A convenience constructor for DynamicColor.
-     *
-     * _Strongly_ prefer using one of the convenience constructors. This class is arguably too
-     * flexible to ensure it can support any scenario. Functional arguments allow overriding without
-     * risks that come with subclasses.
-     *
-     * For example, the default behavior of adjust tone at max contrast to be at a 7.0 ratio with
-     * its background is principled and matches accessibility guidance. That does not mean it's the
-     * desired approach for _every_ design system, and every color pairing, always, in every case.
-     *
-     * For opaque colors (colors with alpha = 100%).
-     *
-     * For colors that are not backgrounds, and do not have backgrounds.
-     *
-     * @param name The name of the dynamic color.
-     * @param palette Function that provides a TonalPalette given DynamicScheme. A TonalPalette is
-     *   defined by a hue and chroma, so this replaces the need to specify hue/chroma. By providing
-     *   a tonal palette, when contrast adjustments are made, intended chroma can be preserved.
-     * @param tone Function that provides a tone, given a DynamicScheme.
-     */
-    @JvmStatic
-    fun fromPalette(
-      name: String,
-      palette: (DynamicScheme) -> TonalPalette,
-      tone: (DynamicScheme) -> Double,
-    ): DynamicColor {
-      return DynamicColor(
-        name,
-        palette,
-        tone,
-        isBackground = false,
-        background = null,
-        secondBackground = null,
-        contrastCurve = null,
-        toneDeltaPair = null,
-      )
-    }
-
-    /**
-     * A convenience constructor for DynamicColor.
-     *
-     * _Strongly_ prefer using one of the convenience constructors. This class is arguably too
-     * flexible to ensure it can support any scenario. Functional arguments allow overriding without
-     * risks that come with subclasses.
-     *
-     * For example, the default behavior of adjust tone at max contrast to be at a 7.0 ratio with
-     * its background is principled and matches accessibility guidance. That does not mean it's the
-     * desired approach for _every_ design system, and every color pairing, always, in every case.
-     *
-     * For opaque colors (colors with alpha = 100%).
-     *
-     * For colors that do not have backgrounds.
-     *
-     * @param name The name of the dynamic color.
-     * @param palette Function that provides a TonalPalette given DynamicScheme. A TonalPalette is
-     *   defined by a hue and chroma, so this replaces the need to specify hue/chroma. By providing
-     *   a tonal palette, when contrast adjustments are made, intended chroma can be preserved.
-     * @param tone Function that provides a tone, given a DynamicScheme.
-     * @param isBackground Whether this dynamic color is a background, with some other color as the
-     *   foreground.
-     */
-    @JvmStatic
-    fun fromPalette(
-      name: String,
-      palette: (DynamicScheme) -> TonalPalette,
-      tone: (DynamicScheme) -> Double,
-      isBackground: Boolean,
-    ): DynamicColor {
-      return DynamicColor(
-        name,
-        palette,
-        tone,
-        isBackground,
-        background = null,
-        secondBackground = null,
-        contrastCurve = null,
-        toneDeltaPair = null,
-      )
-    }
-
-    /**
-     * Create a DynamicColor from a hex code.
-     *
-     * Result has no background; thus no support for increasing/decreasing contrast for a11y.
-     *
-     * @param name The name of the dynamic color.
-     * @param argb The source color from which to extract the hue and chroma.
-     */
-    @JvmStatic
-    fun fromArgb(name: String, argb: Int): DynamicColor {
-      val hct = Hct.fromInt(argb)
-      val palette = TonalPalette.fromInt(argb)
-      return fromPalette(name, { _ -> palette }, { _ -> hct.tone })
-    }
-
-    /**
-     * Given a background tone, find a foreground tone, while ensuring they reach a contrast ratio
-     * that is as close to ratio as possible.
-     */
-    @JvmStatic
-    fun foregroundTone(bgTone: Double, ratio: Double): Double {
-      val lighterTone = Contrast.lighterUnsafe(bgTone, ratio)
-      val darkerTone = Contrast.darkerUnsafe(bgTone, ratio)
-      val lighterRatio = Contrast.ratioOfTones(lighterTone, bgTone)
-      val darkerRatio = Contrast.ratioOfTones(darkerTone, bgTone)
-      val preferLighter = tonePrefersLightForeground(bgTone)
-      if (preferLighter) {
-        // "Neglible difference" handles an edge case where the initial contrast ratio is high
-        // (ex. 13.0), and the ratio passed to the function is that high ratio, and both the lighter
-        // and darker ratio fails to pass that ratio.
-        //
-        // This was observed with Tonal Spot's On Primary Container turning black momentarily
-        // between
-        // high and max contrast in light mode. PC's standard tone was T90, OPC's was T10, it was
-        // light mode, and the contrast level was 0.6568521221032331.
-        val negligibleDifference =
-          abs(lighterRatio - darkerRatio) < 0.1 && lighterRatio < ratio && darkerRatio < ratio
-        return if (lighterRatio >= ratio || lighterRatio >= darkerRatio || negligibleDifference) {
-          lighterTone
-        } else {
-          darkerTone
-        }
-      } else {
-        return if (darkerRatio >= ratio || darkerRatio >= lighterRatio) darkerTone else lighterTone
-      }
-    }
-
-    /**
-     * Adjust a tone down such that white has 4.5 contrast, if the tone is reasonably close to
-     * supporting it.
-     */
-    @JvmStatic
-    fun enableLightForeground(tone: Double): Double {
-      return if (tonePrefersLightForeground(tone) && !toneAllowsLightForeground(tone)) {
-        49.0
-      } else {
-        tone
-      }
-    }
-
-    /**
-     * People prefer white foregrounds on ~T60-70. Observed over time, and also by Andrew Somers
-     * during research for APCA.
-     *
-     * T60 used as to create the smallest discontinuity possible when skipping down to T49 in order
-     * to ensure light foregrounds.
-     *
-     * Since `tertiaryContainer` in dark monochrome scheme requires a tone of 60, it should not be
-     * adjusted. Therefore, 60 is excluded here.
-     */
-    @JvmStatic
-    fun tonePrefersLightForeground(tone: Double): Boolean {
-      return tone.roundToInt() < 60
-    }
-
-    /** Tones less than ~T50 always permit white at 4.5 contrast. */
-    @JvmStatic
-    fun toneAllowsLightForeground(tone: Double): Boolean {
-      return tone.roundToInt() <= 49
-    }
-
-    @JvmStatic
-    fun getInitialToneFromBackground(
-      background: ((DynamicScheme) -> DynamicColor?)?
-    ): (DynamicScheme) -> Double {
-      if (background == null) {
-        return { 50.0 }
-      }
-      return { s -> background(s)?.getTone(s) ?: 50.0 }
-    }
-  }
-}
diff --git a/kotlin/dynamiccolor/DynamicScheme.kt b/kotlin/dynamiccolor/DynamicScheme.kt
deleted file mode 100644
index 3127b3a2..00000000
--- a/kotlin/dynamiccolor/DynamicScheme.kt
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dynamiccolor
-
-import dynamiccolor.ColorSpec.SpecVersion
-import hct.Hct
-import palettes.TonalPalette
-import utils.MathUtils
-import java.text.DecimalFormat
-import java.util.Locale
-import kotlin.math.min
-
-/**
- * Provides important settings for creating colors dynamically, and 6 color palettes. Requires: 1. A
- * color. (source color) 2. A theme. (Variant) 3. Whether or not its dark mode. 4. Contrast level.
- * (-1 to 1, currently contrast ratio 3.0 and 7.0)
- */
-open class DynamicScheme(
-  /** The source color of the scheme in HCT format. */
-  val sourceColorHct: Hct,
-  /** The variant of the scheme. */
-  val variant: Variant,
-  /** Whether or not the scheme is dark mode. */
-  val isDark: Boolean,
-  /**
-   * Value from -1 to 1. -1 represents minimum contrast. 0 represents standard (i.e. the design as
-   * spec'd), and 1 represents maximum contrast.
-   */
-  val contrastLevel: Double,
-  /** The platform on which this scheme is intended to be used. */
-  val platform: Platform = DEFAULT_PLATFORM,
-  /** The spec version of the scheme. */
-  val specVersion: SpecVersion = DEFAULT_SPEC_VERSION,
-  val primaryPalette: TonalPalette,
-  val secondaryPalette: TonalPalette,
-  val tertiaryPalette: TonalPalette,
-  val neutralPalette: TonalPalette,
-  val neutralVariantPalette: TonalPalette,
-  val errorPalette: TonalPalette,
-) {
-
-  /** The source color of the scheme in ARGB format. */
-  val sourceColorArgb: Int = sourceColorHct.toInt()
-
-  /** The platform on which this scheme is intended to be used. */
-  enum class Platform {
-    PHONE,
-    WATCH,
-  }
-
-  fun getHct(dynamicColor: DynamicColor): Hct {
-    return dynamicColor.getHct(this)
-  }
-
-  fun getArgb(dynamicColor: DynamicColor): Int {
-    return dynamicColor.getArgb(this)
-  }
-
-  override fun toString(): String {
-    return "Scheme: variant=${variant.name}, mode=${if (isDark) "dark" else "light"}, platform=${platform.name.lowercase(
-      Locale.ENGLISH
-    )}, contrastLevel=${DecimalFormat("0.0").format(contrastLevel)}, seed=$sourceColorHct, specVersion=$specVersion"
-  }
-
-  val primaryPaletteKeyColor: Int
-    get() = getArgb(MaterialDynamicColors().primaryPaletteKeyColor())
-
-  val secondaryPaletteKeyColor: Int
-    get() = getArgb(MaterialDynamicColors().secondaryPaletteKeyColor())
-
-  val tertiaryPaletteKeyColor: Int
-    get() = getArgb(MaterialDynamicColors().tertiaryPaletteKeyColor())
-
-  val neutralPaletteKeyColor: Int
-    get() = getArgb(MaterialDynamicColors().neutralPaletteKeyColor())
-
-  val neutralVariantPaletteKeyColor: Int
-    get() = getArgb(MaterialDynamicColors().neutralVariantPaletteKeyColor())
-
-  val background: Int
-    get() = getArgb(MaterialDynamicColors().background())
-
-  val onBackground: Int
-    get() = getArgb(MaterialDynamicColors().onBackground())
-
-  val surface: Int
-    get() = getArgb(MaterialDynamicColors().surface())
-
-  val surfaceDim: Int
-    get() = getArgb(MaterialDynamicColors().surfaceDim())
-
-  val surfaceBright: Int
-    get() = getArgb(MaterialDynamicColors().surfaceBright())
-
-  val surfaceContainerLowest: Int
-    get() = getArgb(MaterialDynamicColors().surfaceContainerLowest())
-
-  val surfaceContainerLow: Int
-    get() = getArgb(MaterialDynamicColors().surfaceContainerLow())
-
-  val surfaceContainer: Int
-    get() = getArgb(MaterialDynamicColors().surfaceContainer())
-
-  val surfaceContainerHigh: Int
-    get() = getArgb(MaterialDynamicColors().surfaceContainerHigh())
-
-  val surfaceContainerHighest: Int
-    get() = getArgb(MaterialDynamicColors().surfaceContainerHighest())
-
-  val onSurface: Int
-    get() = getArgb(MaterialDynamicColors().onSurface())
-
-  val surfaceVariant: Int
-    get() = getArgb(MaterialDynamicColors().surfaceVariant())
-
-  val onSurfaceVariant: Int
-    get() = getArgb(MaterialDynamicColors().onSurfaceVariant())
-
-  val inverseSurface: Int
-    get() = getArgb(MaterialDynamicColors().inverseSurface())
-
-  val inverseOnSurface: Int
-    get() = getArgb(MaterialDynamicColors().inverseOnSurface())
-
-  val outline: Int
-    get() = getArgb(MaterialDynamicColors().outline())
-
-  val outlineVariant: Int
-    get() = getArgb(MaterialDynamicColors().outlineVariant())
-
-  val shadow: Int
-    get() = getArgb(MaterialDynamicColors().shadow())
-
-  val scrim: Int
-    get() = getArgb(MaterialDynamicColors().scrim())
-
-  val surfaceTint: Int
-    get() = getArgb(MaterialDynamicColors().surfaceTint())
-
-  val primary: Int
-    get() = getArgb(MaterialDynamicColors().primary())
-
-  val onPrimary: Int
-    get() = getArgb(MaterialDynamicColors().onPrimary())
-
-  val primaryContainer: Int
-    get() = getArgb(MaterialDynamicColors().primaryContainer())
-
-  val onPrimaryContainer: Int
-    get() = getArgb(MaterialDynamicColors().onPrimaryContainer())
-
-  val inversePrimary: Int
-    get() = getArgb(MaterialDynamicColors().inversePrimary())
-
-  val secondary: Int
-    get() = getArgb(MaterialDynamicColors().secondary())
-
-  val onSecondary: Int
-    get() = getArgb(MaterialDynamicColors().onSecondary())
-
-  val secondaryContainer: Int
-    get() = getArgb(MaterialDynamicColors().secondaryContainer())
-
-  val onSecondaryContainer: Int
-    get() = getArgb(MaterialDynamicColors().onSecondaryContainer())
-
-  val tertiary: Int
-    get() = getArgb(MaterialDynamicColors().tertiary())
-
-  val onTertiary: Int
-    get() = getArgb(MaterialDynamicColors().onTertiary())
-
-  val tertiaryContainer: Int
-    get() = getArgb(MaterialDynamicColors().tertiaryContainer())
-
-  val onTertiaryContainer: Int
-    get() = getArgb(MaterialDynamicColors().onTertiaryContainer())
-
-  val error: Int
-    get() = getArgb(MaterialDynamicColors().error())
-
-  val onError: Int
-    get() = getArgb(MaterialDynamicColors().onError())
-
-  val errorContainer: Int
-    get() = getArgb(MaterialDynamicColors().errorContainer())
-
-  val onErrorContainer: Int
-    get() = getArgb(MaterialDynamicColors().onErrorContainer())
-
-  val primaryFixed: Int
-    get() = getArgb(MaterialDynamicColors().primaryFixed())
-
-  val primaryFixedDim: Int
-    get() = getArgb(MaterialDynamicColors().primaryFixedDim())
-
-  val onPrimaryFixed: Int
-    get() = getArgb(MaterialDynamicColors().onPrimaryFixed())
-
-  val onPrimaryFixedVariant: Int
-    get() = getArgb(MaterialDynamicColors().onPrimaryFixedVariant())
-
-  val secondaryFixed: Int
-    get() = getArgb(MaterialDynamicColors().secondaryFixed())
-
-  val secondaryFixedDim: Int
-    get() = getArgb(MaterialDynamicColors().secondaryFixedDim())
-
-  val onSecondaryFixed: Int
-    get() = getArgb(MaterialDynamicColors().onSecondaryFixed())
-
-  val onSecondaryFixedVariant: Int
-    get() = getArgb(MaterialDynamicColors().onSecondaryFixedVariant())
-
-  val tertiaryFixed: Int
-    get() = getArgb(MaterialDynamicColors().tertiaryFixed())
-
-  val tertiaryFixedDim: Int
-    get() = getArgb(MaterialDynamicColors().tertiaryFixedDim())
-
-  val onTertiaryFixed: Int
-    get() = getArgb(MaterialDynamicColors().onTertiaryFixed())
-
-  val onTertiaryFixedVariant: Int
-    get() = getArgb(MaterialDynamicColors().onTertiaryFixedVariant())
-
-  companion object {
-    val DEFAULT_SPEC_VERSION = SpecVersion.SPEC_2021
-    val DEFAULT_PLATFORM = Platform.PHONE
-
-    @JvmStatic
-    fun from(other: DynamicScheme, isDark: Boolean): DynamicScheme {
-      return from(other, isDark, other.contrastLevel)
-    }
-
-    @JvmStatic
-    fun from(other: DynamicScheme, isDark: Boolean, contrastLevel: Double): DynamicScheme {
-      return DynamicScheme(
-        other.sourceColorHct,
-        other.variant,
-        isDark,
-        contrastLevel,
-        other.platform,
-        other.specVersion,
-        other.primaryPalette,
-        other.secondaryPalette,
-        other.tertiaryPalette,
-        other.neutralPalette,
-        other.neutralVariantPalette,
-        other.errorPalette,
-      )
-    }
-
-    /**
-     * Returns a new hue based on a piecewise function and input color hue.
-     *
-     * For example, for the following function:
-     * ```
-     * result = 26, if 0 <= hue < 101;
-     * result = 39, if 101 <= hue < 210;
-     * result = 28, if 210 <= hue < 360.
-     * ```
-     *
-     * call the function as:
-     * ```
-     * double[] hueBreakpoints = {0, 101, 210, 360};
-     * double[] hues = {26, 39, 28};
-     * double result = scheme.piecewise(sourceColor, hueBreakpoints, hues);
-     * ```
-     *
-     * @param sourceColorHct The input value.
-     * @param hueBreakpoints The breakpoints, in sorted order. No default lower or upper bounds are
-     *   assumed.
-     * @param hues The hues that should be applied when source color's hue is >= the same index in
-     *   hueBreakpoints array, and < the hue at the next index in hueBreakpoints array. Otherwise,
-     *   the source color's hue is returned.
-     */
-    @JvmStatic
-    fun getPiecewiseValue(
-      sourceColorHct: Hct,
-      hueBreakpoints: DoubleArray,
-      hues: DoubleArray,
-    ): Double {
-      val size = min(hueBreakpoints.size - 1, hues.size)
-      val sourceHue = sourceColorHct.hue
-      for (i in 0 until size) {
-        if (sourceHue >= hueBreakpoints[i] && sourceHue < hueBreakpoints[i + 1]) {
-          return MathUtils.sanitizeDegreesDouble(hues[i])
-        }
-      }
-      // No condition matched, return the source value.
-      return sourceHue
-    }
-
-    /**
-     * Returns a shifted hue based on a piecewise function and input color hue.
-     *
-     * For example, for the following function:
-     * ```
-     * result = hue + 26, if 0 <= hue < 101;
-     * result = hue - 39, if 101 <= hue < 210;
-     * result = hue + 28, if 210 <= hue < 360.
-     * ```
-     *
-     * call the function as:
-     * ```
-     * double[] hueBreakpoints = {0, 101, 210, 360};
-     * double[] rotations = {26, -39, 28};
-     * double result = scheme.getRotatedHue(sourceColor, hueBreakpoints, rotations);
-     * ```
-     *
-     * @param sourceColorHct the source color of the theme, in HCT.
-     * @param hueBreakpoints The "breakpoints", i.e. the hues at which a rotation should be apply.
-     *   No default lower or upper bounds are assumed.
-     * @param rotations The rotation that should be applied when source color's hue is >= the same
-     *   index in hues array, and < the hue at the next index in hues array. Otherwise, the source
-     *   color's hue is returned.
-     */
-    @JvmStatic
-    fun getRotatedHue(
-      sourceColorHct: Hct,
-      hueBreakpoints: DoubleArray,
-      rotations: DoubleArray,
-    ): Double {
-      var rotation = getPiecewiseValue(sourceColorHct, hueBreakpoints, rotations)
-      if (min(hueBreakpoints.size - 1, rotations.size) <= 0) {
-        // No condition matched, return the source hue.
-        rotation = 0.0
-      }
-      return MathUtils.sanitizeDegreesDouble(sourceColorHct.hue + rotation)
-    }
-  }
-}
diff --git a/kotlin/dynamiccolor/MaterialDynamicColors.kt b/kotlin/dynamiccolor/MaterialDynamicColors.kt
deleted file mode 100644
index 51fcd740..00000000
--- a/kotlin/dynamiccolor/MaterialDynamicColors.kt
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dynamiccolor
-
-/** Named colors, otherwise known as tokens, or roles, in the Material Design system. */
-class MaterialDynamicColors {
-  private val colorSpec: ColorSpec = ColorSpec2025()
-
-  fun highestSurface(s: DynamicScheme): DynamicColor {
-    return colorSpec.highestSurface(s)
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Main Palettes //
-  // ////////////////////////////////////////////////////////////////
-  fun primaryPaletteKeyColor(): DynamicColor {
-    return colorSpec.primaryPaletteKeyColor()
-  }
-
-  fun secondaryPaletteKeyColor(): DynamicColor {
-    return colorSpec.secondaryPaletteKeyColor()
-  }
-
-  fun tertiaryPaletteKeyColor(): DynamicColor {
-    return colorSpec.tertiaryPaletteKeyColor()
-  }
-
-  fun neutralPaletteKeyColor(): DynamicColor {
-    return colorSpec.neutralPaletteKeyColor()
-  }
-
-  fun neutralVariantPaletteKeyColor(): DynamicColor {
-    return colorSpec.neutralVariantPaletteKeyColor()
-  }
-
-  fun errorPaletteKeyColor(): DynamicColor {
-    return colorSpec.errorPaletteKeyColor()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Surfaces [S] //
-  // ////////////////////////////////////////////////////////////////
-  fun background(): DynamicColor {
-    return colorSpec.background()
-  }
-
-  fun onBackground(): DynamicColor {
-    return colorSpec.onBackground()
-  }
-
-  fun surface(): DynamicColor {
-    return colorSpec.surface()
-  }
-
-  fun surfaceDim(): DynamicColor {
-    return colorSpec.surfaceDim()
-  }
-
-  fun surfaceBright(): DynamicColor {
-    return colorSpec.surfaceBright()
-  }
-
-  fun surfaceContainerLowest(): DynamicColor {
-    return colorSpec.surfaceContainerLowest()
-  }
-
-  fun surfaceContainerLow(): DynamicColor {
-    return colorSpec.surfaceContainerLow()
-  }
-
-  fun surfaceContainer(): DynamicColor {
-    return colorSpec.surfaceContainer()
-  }
-
-  fun surfaceContainerHigh(): DynamicColor {
-    return colorSpec.surfaceContainerHigh()
-  }
-
-  fun surfaceContainerHighest(): DynamicColor {
-    return colorSpec.surfaceContainerHighest()
-  }
-
-  fun onSurface(): DynamicColor {
-    return colorSpec.onSurface()
-  }
-
-  fun surfaceVariant(): DynamicColor {
-    return colorSpec.surfaceVariant()
-  }
-
-  fun onSurfaceVariant(): DynamicColor {
-    return colorSpec.onSurfaceVariant()
-  }
-
-  fun inverseSurface(): DynamicColor {
-    return colorSpec.inverseSurface()
-  }
-
-  fun inverseOnSurface(): DynamicColor {
-    return colorSpec.inverseOnSurface()
-  }
-
-  fun outline(): DynamicColor {
-    return colorSpec.outline()
-  }
-
-  fun outlineVariant(): DynamicColor {
-    return colorSpec.outlineVariant()
-  }
-
-  fun shadow(): DynamicColor {
-    return colorSpec.shadow()
-  }
-
-  fun scrim(): DynamicColor {
-    return colorSpec.scrim()
-  }
-
-  fun surfaceTint(): DynamicColor {
-    return colorSpec.surfaceTint()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Primaries [P] //
-  // ////////////////////////////////////////////////////////////////
-  fun primary(): DynamicColor {
-    return colorSpec.primary()
-  }
-
-  fun primaryDim(): DynamicColor? {
-    return colorSpec.primaryDim()
-  }
-
-  fun onPrimary(): DynamicColor {
-    return colorSpec.onPrimary()
-  }
-
-  fun primaryContainer(): DynamicColor {
-    return colorSpec.primaryContainer()
-  }
-
-  fun onPrimaryContainer(): DynamicColor {
-    return colorSpec.onPrimaryContainer()
-  }
-
-  fun inversePrimary(): DynamicColor {
-    return colorSpec.inversePrimary()
-  }
-
-  // ///////////////////////////////////////////////////////////////
-  // Primary Fixed Colors [PF] //
-  // ///////////////////////////////////////////////////////////////
-  fun primaryFixed(): DynamicColor {
-    return colorSpec.primaryFixed()
-  }
-
-  fun primaryFixedDim(): DynamicColor {
-    return colorSpec.primaryFixedDim()
-  }
-
-  fun onPrimaryFixed(): DynamicColor {
-    return colorSpec.onPrimaryFixed()
-  }
-
-  fun onPrimaryFixedVariant(): DynamicColor {
-    return colorSpec.onPrimaryFixedVariant()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Secondaries [Q] //
-  // ////////////////////////////////////////////////////////////////
-  fun secondary(): DynamicColor {
-    return colorSpec.secondary()
-  }
-
-  fun secondaryDim(): DynamicColor? {
-    return colorSpec.secondaryDim()
-  }
-
-  fun onSecondary(): DynamicColor {
-    return colorSpec.onSecondary()
-  }
-
-  fun secondaryContainer(): DynamicColor {
-    return colorSpec.secondaryContainer()
-  }
-
-  fun onSecondaryContainer(): DynamicColor {
-    return colorSpec.onSecondaryContainer()
-  }
-
-  // ///////////////////////////////////////////////////////////////
-  // Secondary Fixed Colors [QF] //
-  // ///////////////////////////////////////////////////////////////
-  fun secondaryFixed(): DynamicColor {
-    return colorSpec.secondaryFixed()
-  }
-
-  fun secondaryFixedDim(): DynamicColor {
-    return colorSpec.secondaryFixedDim()
-  }
-
-  fun onSecondaryFixed(): DynamicColor {
-    return colorSpec.onSecondaryFixed()
-  }
-
-  fun onSecondaryFixedVariant(): DynamicColor {
-    return colorSpec.onSecondaryFixedVariant()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Tertiaries [T] //
-  // ////////////////////////////////////////////////////////////////
-  fun tertiary(): DynamicColor {
-    return colorSpec.tertiary()
-  }
-
-  fun tertiaryDim(): DynamicColor? {
-    return colorSpec.tertiaryDim()
-  }
-
-  fun onTertiary(): DynamicColor {
-    return colorSpec.onTertiary()
-  }
-
-  fun tertiaryContainer(): DynamicColor {
-    return colorSpec.tertiaryContainer()
-  }
-
-  fun onTertiaryContainer(): DynamicColor {
-    return colorSpec.onTertiaryContainer()
-  }
-
-  // ///////////////////////////////////////////////////////////////
-  // Tertiary Fixed Colors [TF] //
-  // ///////////////////////////////////////////////////////////////
-  fun tertiaryFixed(): DynamicColor {
-    return colorSpec.tertiaryFixed()
-  }
-
-  fun tertiaryFixedDim(): DynamicColor {
-    return colorSpec.tertiaryFixedDim()
-  }
-
-  fun onTertiaryFixed(): DynamicColor {
-    return colorSpec.onTertiaryFixed()
-  }
-
-  fun onTertiaryFixedVariant(): DynamicColor {
-    return colorSpec.onTertiaryFixedVariant()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // Errors [E] //
-  // ////////////////////////////////////////////////////////////////
-  fun error(): DynamicColor {
-    return colorSpec.error()
-  }
-
-  fun errorDim(): DynamicColor? {
-    return colorSpec.errorDim()
-  }
-
-  fun onError(): DynamicColor {
-    return colorSpec.onError()
-  }
-
-  fun errorContainer(): DynamicColor {
-    return colorSpec.errorContainer()
-  }
-
-  fun onErrorContainer(): DynamicColor {
-    return colorSpec.onErrorContainer()
-  }
-
-  // ////////////////////////////////////////////////////////////////
-  // All Colors //
-  // ////////////////////////////////////////////////////////////////
-  /** All dynamic colors in Material Design system. */
-  val allDynamicColors: List<() -> DynamicColor?> by lazy {
-    listOf(
-      this::primaryPaletteKeyColor,
-      this::secondaryPaletteKeyColor,
-      this::tertiaryPaletteKeyColor,
-      this::neutralPaletteKeyColor,
-      this::neutralVariantPaletteKeyColor,
-      this::errorPaletteKeyColor,
-      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::outline,
-      this::outlineVariant,
-      this::inverseSurface,
-      this::inverseOnSurface,
-      this::shadow,
-      this::scrim,
-      this::surfaceTint,
-      this::primary,
-      this::primaryDim,
-      this::onPrimary,
-      this::primaryContainer,
-      this::onPrimaryContainer,
-      this::primaryFixed,
-      this::primaryFixedDim,
-      this::onPrimaryFixed,
-      this::onPrimaryFixedVariant,
-      this::inversePrimary,
-      this::secondary,
-      this::secondaryDim,
-      this::onSecondary,
-      this::secondaryContainer,
-      this::onSecondaryContainer,
-      this::secondaryFixed,
-      this::secondaryFixedDim,
-      this::onSecondaryFixed,
-      this::onSecondaryFixedVariant,
-      this::tertiary,
-      this::tertiaryDim,
-      this::onTertiary,
-      this::tertiaryContainer,
-      this::onTertiaryContainer,
-      this::tertiaryFixed,
-      this::tertiaryFixedDim,
-      this::onTertiaryFixed,
-      this::onTertiaryFixedVariant,
-      this::error,
-      this::errorDim,
-      this::onError,
-      this::errorContainer,
-      this::onErrorContainer,
-    )
-  }
-}
diff --git a/kotlin/dynamiccolor/ToneDeltaPair.kt b/kotlin/dynamiccolor/ToneDeltaPair.kt
deleted file mode 100644
index e9f22957..00000000
--- a/kotlin/dynamiccolor/ToneDeltaPair.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dynamiccolor
-
-/**
- * Documents a constraint between two DynamicColors, in which their tones must have a certain
- * distance from each other.
- *
- * The polarity is an adjective that describes "A", compared to "B". For instance, ToneDeltaPair(A,
- * B, 15, 'darker') states that A's tone should be at least 15 darker than B's.
- *
- * Prefer a DynamicColor with a background, this is for special cases when designers want tonal
- * distance, literally contrast, between two colors that don't have a background / foreground
- * relationship or a contrast guarantee.
- *
- * @param roleA The first role in a pair.
- * @param roleB The second role in a pair.
- * @param delta Required difference between tones. Absolute value, negative values have undefined
- *   behavior.
- * @param polarity The relative relation between tones of roleA and roleB, as described above.
- * @param stayTogether Whether these two roles should stay on the same side of the "awkward zone"
- *   (T50-59). This is necessary for certain cases where one role has two backgrounds.
- * @param constraint How to fulfill the tone delta pair constraint.
- */
-data class ToneDeltaPair(
-  val roleA: DynamicColor,
-  val roleB: DynamicColor,
-  val delta: Double,
-  val polarity: TonePolarity,
-  val stayTogether: Boolean = true,
-  val constraint: DeltaConstraint = DeltaConstraint.EXACT,
-) {
-  /**
-   * Describes how to fulfill a tone delta pair constraint.
-   *
-   * Determines if the delta is a minimum, maximum, or exact tonal distance that must be maintained.
-   */
-  enum class DeltaConstraint {
-    // The tone of roleA must be an exact delta away from the tone of roleB.
-    EXACT,
-    // The tonal distance of roleA and roleB must be at most delta.
-    NEARER,
-    // The tonal distance of roleA and roleB must be at least delta.
-    FARTHER,
-  }
-
-  /**
-   * Describes the relationship in lightness between two colors.
-   *
-   * 'relative_darker' and 'relative_lighter' describes the tone adjustment relative to the surface
-   * color trend (white in light mode; black in dark mode). For instance, ToneDeltaPair(A, B, 10,
-   * 'relative_lighter', 'farther') states that A should be at least 10 lighter than B in light
-   * mode, and at least 10 darker than B in dark mode.
-   */
-  enum class TonePolarity {
-    // The tone of roleA is always darker than the tone of roleB.
-    DARKER,
-    // The tone of roleA is always lighter than the tone of roleB.
-    LIGHTER,
-    // The tone of roleA is darker than the tone of roleB in light mode, and lighter than the tone
-    // ofroleB in dark mode.
-    RELATIVE_DARKER,
-    // The tone of roleA is lighter than the tone of roleB in light mode, and darker than the tone
-    // ofroleB in dark mode.
-    RELATIVE_LIGHTER,
-  }
-}
diff --git a/kotlin/dynamiccolor/Variant.kt b/kotlin/dynamiccolor/Variant.kt
deleted file mode 100644
index f12dcdb0..00000000
--- a/kotlin/dynamiccolor/Variant.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dynamiccolor
-
-/** Themes for Dynamic Color. */
-enum class Variant {
-  MONOCHROME,
-  NEUTRAL,
-  TONAL_SPOT,
-  VIBRANT,
-  EXPRESSIVE,
-  FIDELITY,
-  CONTENT,
-  RAINBOW,
-  FRUIT_SALAD,
-}
diff --git a/kotlin/hct/Cam16.kt b/kotlin/hct/Cam16.kt
deleted file mode 100644
index 6e3bf622..00000000
--- a/kotlin/hct/Cam16.kt
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package hct
-
-import utils.ColorUtils
-import kotlin.math.PI
-import kotlin.math.abs
-import kotlin.math.atan2
-import kotlin.math.cos
-import kotlin.math.expm1
-import kotlin.math.hypot
-import kotlin.math.ln1p
-import kotlin.math.max
-import kotlin.math.pow
-import kotlin.math.sign
-import kotlin.math.sin
-import kotlin.math.sqrt
-
-/**
- * CAM16, a color appearance model. Colors are not just defined by their hex code, but rather, a hex
- * code and viewing conditions.
- *
- * CAM16 instances also have coordinates in the CAM16-UCS space, called J*, a*, b*, or jstar, astar,
- * bstar in code. CAM16-UCS is included in the CAM16 specification, and should be used when
- * measuring distances between colors.
- *
- * In traditional color spaces, a color can be identified solely by the observer's measurement of
- * the color. Color appearance models such as CAM16 also use information about the environment where
- * the color was observed, known as the viewing conditions.
- *
- * For example, white under the traditional assumption of a midday sun white point is accurately
- * measured as a slightly chromatic blue by CAM16. (roughly, hue 203, chroma 3, lightness 100)
- */
-@ConsistentCopyVisibility
-data class Cam16
-private constructor(
-  /** Hue in CAM16 */
-  val hue: Double,
-  /** Chroma in CAM16 */
-  val chroma: Double,
-  /** Lightness in CAM16 */
-  val j: Double,
-  /**
-   * Brightness in CAM16.
-   *
-   * Prefer lightness, brightness is an absolute quantity. For example, a sheet of white paper is
-   * much brighter viewed in sunlight than in indoor light, but it is the lightest object under any
-   * lighting.
-   */
-  val q: Double,
-  /**
-   * Colorfulness in CAM16.
-   *
-   * Prefer chroma, colorfulness is an absolute quantity. For example, a yellow toy car is much more
-   * colorful outside than inside, but it has the same chroma in both environments.
-   */
-  val m: Double,
-  /**
-   * Saturation in CAM16.
-   *
-   * Colorfulness in proportion to brightness. Prefer chroma, saturation measures colorfulness
-   * relative to the color's own brightness, where chroma is colorfulness relative to white.
-   */
-  val s: Double,
-  /** Lightness coordinate in CAM16-UCS */
-  val jstar: Double,
-  /** a* coordinate in CAM16-UCS */
-  val astar: Double,
-  /** b* coordinate in CAM16-UCS */
-  val bstar: Double,
-) {
-
-  /**
-   * CAM16 instances also have coordinates in the CAM16-UCS space, called J*, a*, b*, or jstar,
-   * astar, bstar in code. CAM16-UCS is included in the CAM16 specification, and is used to measure
-   * distances between colors.
-   */
-  fun distance(other: Cam16): Double {
-    val dJ = jstar - other.jstar
-    val dA = astar - other.astar
-    val dB = bstar - other.bstar
-    val dEPrime = sqrt(dJ * dJ + dA * dA + dB * dB)
-    val dE = 1.41 * dEPrime.pow(0.63)
-    return dE
-  }
-
-  /**
-   * ARGB representation of the color. Assumes the color was viewed in default viewing conditions,
-   * which are near-identical to the default viewing conditions for sRGB.
-   */
-  fun toInt(): Int {
-    return viewed(ViewingConditions.DEFAULT)
-  }
-
-  /**
-   * ARGB representation of the color, in defined viewing conditions.
-   *
-   * @param viewingConditions Information about the environment where the color will be viewed.
-   * @return ARGB representation of color
-   */
-  internal fun viewed(viewingConditions: ViewingConditions): Int {
-    val xyz = xyzInViewingConditions(viewingConditions)
-    return ColorUtils.argbFromXyz(xyz[0], xyz[1], xyz[2])
-  }
-
-  internal fun xyzInViewingConditions(
-    viewingConditions: ViewingConditions,
-    returnArray: DoubleArray? = null,
-  ): DoubleArray {
-    val alpha = if (chroma == 0.0 || j == 0.0) 0.0 else chroma / sqrt(j / 100.0)
-    val t = (alpha / (1.64 - 0.29.pow(viewingConditions.n)).pow(0.73)).pow(1.0 / 0.9)
-    val hRad = Math.toRadians(hue)
-    val eHue = 0.25 * (cos(hRad + 2.0) + 3.8)
-    val ac = viewingConditions.aw * (j / 100.0).pow(1.0 / viewingConditions.c / viewingConditions.z)
-    val p1 = eHue * (50000.0 / 13.0) * viewingConditions.nc * viewingConditions.ncb
-    val p2 = ac / viewingConditions.nbb
-    val hSin = sin(hRad)
-    val hCos = cos(hRad)
-    val gamma = 23.0 * (p2 + 0.305) * t / (23.0 * p1 + 11.0 * t * hCos + 108.0 * t * hSin)
-    val a = gamma * hCos
-    val b = gamma * hSin
-    val rA = (460.0 * p2 + 451.0 * a + 288.0 * b) / 1403.0
-    val gA = (460.0 * p2 - 891.0 * a - 261.0 * b) / 1403.0
-    val bA = (460.0 * p2 - 220.0 * a - 6300.0 * b) / 1403.0
-    val rCBase = max(0.0, 27.13 * abs(rA) / (400.0 - abs(rA)))
-    val rC = sign(rA) * (100.0 / viewingConditions.fl) * (rCBase).pow(1.0 / 0.42)
-    val gCBase = max(0.0, 27.13 * abs(gA) / (400.0 - abs(gA)))
-    val gC = sign(gA) * (100.0 / viewingConditions.fl) * (gCBase).pow(1.0 / 0.42)
-    val bCBase = max(0.0, 27.13 * abs(bA) / (400.0 - abs(bA)))
-    val bC = sign(bA) * (100.0 / viewingConditions.fl) * (bCBase).pow(1.0 / 0.42)
-    val rF = rC / viewingConditions.rgbD[0]
-    val gF = gC / viewingConditions.rgbD[1]
-    val bF = bC / viewingConditions.rgbD[2]
-    val matrix = CAM16RGB_TO_XYZ
-    val x = rF * matrix[0][0] + gF * matrix[0][1] + bF * matrix[0][2]
-    val y = rF * matrix[1][0] + gF * matrix[1][1] + bF * matrix[1][2]
-    val z = rF * matrix[2][0] + gF * matrix[2][1] + bF * matrix[2][2]
-    return if (returnArray != null) {
-      returnArray[0] = x
-      returnArray[1] = y
-      returnArray[2] = z
-      returnArray
-    } else {
-      doubleArrayOf(x, y, z)
-    }
-  }
-
-  companion object {
-    // Transforms XYZ color space coordinates to 'cone'/'RGB' responses in CAM16.
-    internal val XYZ_TO_CAM16RGB =
-      arrayOf(
-        doubleArrayOf(0.401288, 0.650173, -0.051461),
-        doubleArrayOf(-0.250268, 1.204414, 0.045854),
-        doubleArrayOf(-0.002079, 0.048952, 0.953127),
-      )
-
-    // Transforms 'cone'/'RGB' responses in CAM16 to XYZ color space coordinates.
-    internal val CAM16RGB_TO_XYZ =
-      arrayOf(
-        doubleArrayOf(1.8620678, -1.0112547, 0.14918678),
-        doubleArrayOf(0.38752654, 0.62144744, -0.00897398),
-        doubleArrayOf(-0.0158415, -0.03412294, 1.0499644),
-      )
-
-    /**
-     * Create a CAM16 color from a color, assuming the color was viewed in default viewing
-     * conditions.
-     *
-     * @param argb ARGB representation of a color.
-     */
-    @JvmStatic
-    fun fromInt(argb: Int): Cam16 {
-      return fromIntInViewingConditions(argb, ViewingConditions.DEFAULT)
-    }
-
-    /**
-     * Create a CAM16 color from a color in defined viewing conditions.
-     *
-     * @param argb ARGB representation of a color.
-     * @param viewingConditions Information about the environment where the color was observed.
-     */
-    // The RGB => XYZ conversion matrix elements are derived scientific constants. While the values
-    // may differ at runtime due to floating point imprecision, keeping the values the same, and
-    // accurate, across implementations takes precedence.
-    @SuppressWarnings("FloatingPointLiteralPrecision")
-    internal fun fromIntInViewingConditions(
-      argb: Int,
-      viewingConditions: ViewingConditions,
-    ): Cam16 {
-      // Transform ARGB int to XYZ
-      val red = argb and 0x00ff0000 shr 16
-      val green = argb and 0x0000ff00 shr 8
-      val blue = argb and 0x000000ff
-      val redL = ColorUtils.linearized(red)
-      val greenL = ColorUtils.linearized(green)
-      val blueL = ColorUtils.linearized(blue)
-      val x = 0.41233895 * redL + 0.35762064 * greenL + 0.18051042 * blueL
-      val y = 0.2126 * redL + 0.7152 * greenL + 0.0722 * blueL
-      val z = 0.01932141 * redL + 0.11916382 * greenL + 0.95034478 * blueL
-      return fromXyzInViewingConditions(x, y, z, viewingConditions)
-    }
-
-    internal fun fromXyzInViewingConditions(
-      x: Double,
-      y: Double,
-      z: Double,
-      viewingConditions: ViewingConditions,
-    ): Cam16 {
-      // Transform XYZ to 'cone'/'rgb' responses
-      val matrix = XYZ_TO_CAM16RGB
-      val rT = x * matrix[0][0] + y * matrix[0][1] + z * matrix[0][2]
-      val gT = x * matrix[1][0] + y * matrix[1][1] + z * matrix[1][2]
-      val bT = x * matrix[2][0] + y * matrix[2][1] + z * matrix[2][2]
-
-      // Discount illuminant
-      val rD = viewingConditions.rgbD[0] * rT
-      val gD = viewingConditions.rgbD[1] * gT
-      val bD = viewingConditions.rgbD[2] * bT
-
-      // Chromatic adaptation
-      val rAF = (viewingConditions.fl * abs(rD) / 100.0).pow(0.42)
-      val gAF = (viewingConditions.fl * abs(gD) / 100.0).pow(0.42)
-      val bAF = (viewingConditions.fl * abs(bD) / 100.0).pow(0.42)
-      val rA = sign(rD) * 400.0 * rAF / (rAF + 27.13)
-      val gA = sign(gD) * 400.0 * gAF / (gAF + 27.13)
-      val bA = sign(bD) * 400.0 * bAF / (bAF + 27.13)
-
-      // redness-greenness
-      val a = (11.0 * rA + -12.0 * gA + bA) / 11.0
-      // yellowness-blueness
-      val b = (rA + gA - 2.0 * bA) / 9.0
-
-      // auxiliary components
-      val u = (20.0 * rA + 20.0 * gA + 21.0 * bA) / 20.0
-      val p2 = (40.0 * rA + 20.0 * gA + bA) / 20.0
-
-      // hue
-      val atan2 = atan2(b, a)
-      val atanDegrees = Math.toDegrees(atan2)
-      val hue =
-        if (atanDegrees < 0) {
-          atanDegrees + 360.0
-        } else if (atanDegrees >= 360) {
-          atanDegrees - 360.0
-        } else {
-          atanDegrees
-        }
-      val hueRadians = Math.toRadians(hue)
-
-      // achromatic response to color
-      val ac = p2 * viewingConditions.nbb
-
-      // CAM16 lightness and brightness
-      val j = 100.0 * (ac / viewingConditions.aw).pow(viewingConditions.c * viewingConditions.z)
-      val q =
-        4.0 / viewingConditions.c *
-          sqrt(j / 100.0) *
-          (viewingConditions.aw + 4.0) *
-          viewingConditions.flRoot
-
-      // CAM16 chroma, colorfulness, and saturation.
-      val huePrime = if (hue < 20.14) hue + 360 else hue
-      val eHue = 0.25 * (cos(Math.toRadians(huePrime) + 2.0) + 3.8)
-      val p1 = 50000.0 / 13.0 * eHue * viewingConditions.nc * viewingConditions.ncb
-      val t = p1 * hypot(a, b) / (u + 0.305)
-      val alpha = (1.64 - 0.29.pow(viewingConditions.n)).pow(0.73) * t.pow(0.9)
-      // CAM16 chroma, colorfulness, saturation
-      val c = alpha * sqrt(j / 100.0)
-      val m = c * viewingConditions.flRoot
-      val s = 50.0 * sqrt(alpha * viewingConditions.c / (viewingConditions.aw + 4.0))
-
-      // CAM16-UCS components
-      val jstar = (1.0 + 100.0 * 0.007) * j / (1.0 + 0.007 * j)
-      val mstar = 1.0 / 0.0228 * ln1p(0.0228 * m)
-      val astar = mstar * cos(hueRadians)
-      val bstar = mstar * sin(hueRadians)
-      return Cam16(hue, c, j, q, m, s, jstar, astar, bstar)
-    }
-
-    /**
-     * @param j CAM16 lightness
-     * @param c CAM16 chroma
-     * @param h CAM16 hue
-     */
-    internal fun fromJch(j: Double, c: Double, h: Double): Cam16 {
-      return fromJchInViewingConditions(j, c, h, ViewingConditions.DEFAULT)
-    }
-
-    /**
-     * @param j CAM16 lightness
-     * @param c CAM16 chroma
-     * @param h CAM16 hue
-     * @param viewingConditions Information about the environment where the color was observed.
-     */
-    private fun fromJchInViewingConditions(
-      j: Double,
-      c: Double,
-      h: Double,
-      viewingConditions: ViewingConditions,
-    ): Cam16 {
-      val q =
-        4.0 / viewingConditions.c *
-          sqrt(j / 100.0) *
-          (viewingConditions.aw + 4.0) *
-          viewingConditions.flRoot
-      val m = c * viewingConditions.flRoot
-      val alpha = c / sqrt(j / 100.0)
-      val s = 50.0 * sqrt(alpha * viewingConditions.c / (viewingConditions.aw + 4.0))
-      val hueRadians = Math.toRadians(h)
-      val jstar = (1.0 + 100.0 * 0.007) * j / (1.0 + 0.007 * j)
-      val mstar = 1.0 / 0.0228 * ln1p(0.0228 * m)
-      val astar = mstar * cos(hueRadians)
-      val bstar = mstar * sin(hueRadians)
-      return Cam16(h, c, j, q, m, s, jstar, astar, bstar)
-    }
-
-    /**
-     * Create a CAM16 color from CAM16-UCS coordinates.
-     *
-     * @param jstar CAM16-UCS lightness.
-     * @param astar CAM16-UCS a dimension. Like a* in L*a*b*, it is a Cartesian coordinate on the Y
-     *   axis.
-     * @param bstar CAM16-UCS b dimension. Like a* in L*a*b*, it is a Cartesian coordinate on the X
-     *   axis.
-     */
-    @JvmStatic
-    fun fromUcs(jstar: Double, astar: Double, bstar: Double): Cam16 {
-      return fromUcsInViewingConditions(jstar, astar, bstar, ViewingConditions.DEFAULT)
-    }
-
-    /**
-     * Create a CAM16 color from CAM16-UCS coordinates in defined viewing conditions.
-     *
-     * @param jstar CAM16-UCS lightness.
-     * @param astar CAM16-UCS a dimension. Like a* in L*a*b*, it is a Cartesian coordinate on the Y
-     *   axis.
-     * @param bstar CAM16-UCS b dimension. Like a* in L*a*b*, it is a Cartesian coordinate on the X
-     *   axis.
-     * @param viewingConditions Information about the environment where the color was observed.
-     */
-    @JvmStatic
-    fun fromUcsInViewingConditions(
-      jstar: Double,
-      astar: Double,
-      bstar: Double,
-      viewingConditions: ViewingConditions,
-    ): Cam16 {
-      val m = hypot(astar, bstar)
-      val m2 = expm1(m * 0.0228) / 0.0228
-      val c = m2 / viewingConditions.flRoot
-      var h = atan2(bstar, astar) * (180.0 / PI)
-      if (h < 0.0) {
-        h += 360.0
-      }
-      val j = jstar / (1.0 - (jstar - 100.0) * 0.007)
-      return fromJchInViewingConditions(j, c, h, viewingConditions)
-    }
-  }
-}
diff --git a/kotlin/hct/Hct.kt b/kotlin/hct/Hct.kt
deleted file mode 100644
index f1325eac..00000000
--- a/kotlin/hct/Hct.kt
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package hct
-
-import utils.ColorUtils
-import kotlin.math.roundToInt
-
-/**
- * A color system built using CAM16 hue and chroma, and L* from L*a*b*.
- *
- * Using L* creates a link between the color system, contrast, and thus accessibility. Contrast
- * ratio depends on relative luminance, or Y in the XYZ color space. L*, or perceptual luminance can
- * be calculated from Y.
- *
- * Unlike Y, L* is linear to human perception, allowing trivial creation of accurate color tones.
- *
- * Unlike contrast ratio, measuring contrast in L* is linear, and simple to calculate. A difference
- * of 40 in HCT tone guarantees a contrast ratio >= 3.0, and a difference of 50 guarantees a
- * contrast ratio >= 4.5.
- */
-
-/**
- * HCT, hue, chroma, and tone. A color system that provides a perceptually accurate color
- * measurement system that can also accurately render what colors will appear as in different
- * lighting environments.
- */
-class Hct private constructor(argb: Int) {
-  var hue = 0.0
-    private set
-
-  var chroma = 0.0
-    private set
-
-  var tone = 0.0
-    private set
-
-  private var argb = 0
-
-  init {
-    setInternalState(argb)
-  }
-
-  fun toInt(): Int {
-    return argb
-  }
-
-  /**
-   * Set the hue of this color. Chroma may decrease because chroma has a different maximum for any
-   * given hue and tone.
-   *
-   * @param newHue 0 <= newHue < 360; invalid values are corrected.
-   */
-  fun setHue(newHue: Double) {
-    setInternalState(HctSolver.solveToInt(newHue, chroma, tone))
-  }
-
-  /**
-   * Set the chroma of this color. Chroma may decrease because chroma has a different maximum for
-   * any given hue and tone.
-   *
-   * @param newChroma 0 <= newChroma < ?
-   */
-  fun setChroma(newChroma: Double) {
-    setInternalState(HctSolver.solveToInt(hue, newChroma, tone))
-  }
-
-  /**
-   * Set the tone of this color. Chroma may decrease because chroma has a different maximum for any
-   * given hue and tone.
-   *
-   * @param newTone 0 <= newTone <= 100; invalid valids are corrected.
-   */
-  fun setTone(newTone: Double) {
-    setInternalState(HctSolver.solveToInt(hue, chroma, newTone))
-  }
-
-  override fun toString(): String {
-    return "HCT(${hue.roundToInt()}, ${chroma.roundToInt()}, ${tone.roundToInt()})"
-  }
-
-  /**
-   * Translate a color into different ViewingConditions.
-   *
-   * Colors change appearance. They look different with lights on versus off, the same color, as in
-   * hex code, on white looks different when on black. This is called color relativity, most
-   * famously explicated by Josef Albers in Interaction of Color.
-   *
-   * In color science, color appearance models can account for this and calculate the appearance of
-   * a color in different settings. HCT is based on CAM16, a color appearance model, and uses it to
-   * make these calculations.
-   *
-   * See ViewingConditions.make for parameters affecting color appearance.
-   */
-  fun inViewingConditions(vc: ViewingConditions): Hct {
-    // 1. Use CAM16 to find XYZ coordinates of color in specified VC.
-    val cam16 = Cam16.fromInt(toInt())
-    val viewedInVc = cam16.xyzInViewingConditions(vc, null)
-
-    // 2. Create CAM16 of those XYZ coordinates in default VC.
-    val recastInVc =
-      Cam16.fromXyzInViewingConditions(
-        viewedInVc[0],
-        viewedInVc[1],
-        viewedInVc[2],
-        ViewingConditions.DEFAULT,
-      )
-
-    // 3. Create HCT from:
-    // - CAM16 using default VC with XYZ coordinates in specified VC.
-    // - L* converted from Y in XYZ coordinates in specified VC.
-    return from(recastInVc.hue, recastInVc.chroma, ColorUtils.lstarFromY(viewedInVc[1]))
-  }
-
-  private fun setInternalState(argb: Int) {
-    this.argb = argb
-    val cam = Cam16.fromInt(argb)
-    hue = cam.hue
-    chroma = cam.chroma
-    tone = ColorUtils.lstarFromArgb(argb)
-  }
-
-  companion object {
-    /**
-     * Create an HCT color from hue, chroma, and tone.
-     *
-     * @param hue 0 <= hue < 360; invalid values are corrected.
-     * @param chroma 0 <= chroma < ?; Informally, colorfulness. The color returned may be lower than
-     *   the requested chroma. Chroma has a different maximum for any given hue and tone.
-     * @param tone 0 <= tone <= 100; invalid values are corrected.
-     * @return HCT representation of a color in default viewing conditions.
-     */
-    @JvmStatic
-    fun from(hue: Double, chroma: Double, tone: Double): Hct {
-      val argb = HctSolver.solveToInt(hue, chroma, tone)
-      return Hct(argb)
-    }
-
-    /**
-     * Create an HCT color from a color.
-     *
-     * @param argb ARGB representation of a color.
-     * @return HCT representation of a color in default viewing conditions
-     */
-    @JvmStatic
-    fun fromInt(argb: Int): Hct {
-      return Hct(argb)
-    }
-
-    @JvmStatic
-    fun isBlue(hue: Double): Boolean {
-      return hue >= 250 && hue < 270
-    }
-
-    @JvmStatic
-    fun isYellow(hue: Double): Boolean {
-      return hue >= 105 && hue < 125
-    }
-
-    @JvmStatic
-    fun isCyan(hue: Double): Boolean {
-      return hue >= 170 && hue < 207
-    }
-  }
-}
diff --git a/kotlin/hct/HctSolver.kt b/kotlin/hct/HctSolver.kt
deleted file mode 100644
index d55dcf1d..00000000
--- a/kotlin/hct/HctSolver.kt
+++ /dev/null
@@ -1,668 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// This file is automatically generated. Do not modify it.
-package hct
-
-import utils.ColorUtils
-import utils.MathUtils
-import kotlin.math.PI
-import kotlin.math.abs
-import kotlin.math.atan2
-import kotlin.math.ceil
-import kotlin.math.cos
-import kotlin.math.floor
-import kotlin.math.pow
-import kotlin.math.sin
-import kotlin.math.sqrt
-
-/** A class that solves the HCT equation. */
-object HctSolver {
-  private val SCALED_DISCOUNT_FROM_LINRGB =
-    arrayOf(
-      doubleArrayOf(0.001200833568784504, 0.002389694492170889, 0.0002795742885861124),
-      doubleArrayOf(0.0005891086651375999, 0.0029785502573438758, 0.0003270666104008398),
-      doubleArrayOf(0.00010146692491640572, 0.0005364214359186694, 0.0032979401770712076),
-    )
-  private val LINRGB_FROM_SCALED_DISCOUNT =
-    arrayOf(
-      doubleArrayOf(1373.2198709594231, -1100.4251190754821, -7.278681089101213),
-      doubleArrayOf(-271.815969077903, 559.6580465940733, -32.46047482791194),
-      doubleArrayOf(1.9622899599665666, -57.173814538844006, 308.7233197812385),
-    )
-  private val Y_FROM_LINRGB = doubleArrayOf(0.2126, 0.7152, 0.0722)
-  private val CRITICAL_PLANES =
-    doubleArrayOf(
-      0.015176349177441876,
-      0.045529047532325624,
-      0.07588174588720938,
-      0.10623444424209313,
-      0.13658714259697685,
-      0.16693984095186062,
-      0.19729253930674434,
-      0.2276452376616281,
-      0.2579979360165119,
-      0.28835063437139563,
-      0.3188300904430532,
-      0.350925934958123,
-      0.3848314933096426,
-      0.42057480301049466,
-      0.458183274052838,
-      0.4976837250274023,
-      0.5391024159806381,
-      0.5824650784040898,
-      0.6277969426914107,
-      0.6751227633498623,
-      0.7244668422128921,
-      0.775853049866786,
-      0.829304845476233,
-      0.8848452951698498,
-      0.942497089126609,
-      1.0022825574869039,
-      1.0642236851973577,
-      1.1283421258858297,
-      1.1946592148522128,
-      1.2631959812511864,
-      1.3339731595349034,
-      1.407011200216447,
-      1.4823302800086415,
-      1.5599503113873272,
-      1.6398909516233677,
-      1.7221716113234105,
-      1.8068114625156377,
-      1.8938294463134073,
-      1.9832442801866852,
-      2.075074464868551,
-      2.1693382909216234,
-      2.2660538449872063,
-      2.36523901573795,
-      2.4669114995532007,
-      2.5710888059345764,
-      2.6777882626779785,
-      2.7870270208169257,
-      2.898822059350997,
-      3.0131901897720907,
-      3.1301480604002863,
-      3.2497121605402226,
-      3.3718988244681087,
-      3.4967242352587946,
-      3.624204428461639,
-      3.754355295633311,
-      3.887192587735158,
-      4.022731918402185,
-      4.160988767090289,
-      4.301978482107941,
-      4.445716283538092,
-      4.592217266055746,
-      4.741496401646282,
-      4.893568542229298,
-      5.048448422192488,
-      5.20615066083972,
-      5.3666897647573375,
-      5.5300801301023865,
-      5.696336044816294,
-      5.865471690767354,
-      6.037501145825082,
-      6.212438385869475,
-      6.390297286737924,
-      6.571091626112461,
-      6.7548350853498045,
-      6.941541251256611,
-      7.131223617812143,
-      7.323895587840543,
-      7.5195704746346665,
-      7.7182615035334345,
-      7.919981813454504,
-      8.124744458384042,
-      8.332562408825165,
-      8.543448553206703,
-      8.757415699253682,
-      8.974476575321063,
-      9.194643831691977,
-      9.417930041841839,
-      9.644347703669503,
-      9.873909240696694,
-      10.106627003236781,
-      10.342513269534024,
-      10.58158024687427,
-      10.8238400726681,
-      11.069304815507364,
-      11.317986476196008,
-      11.569896988756009,
-      11.825048221409341,
-      12.083451977536606,
-      12.345119996613247,
-      12.610063955123938,
-      12.878295467455942,
-      13.149826086772048,
-      13.42466730586372,
-      13.702830557985108,
-      13.984327217668513,
-      14.269168601521828,
-      14.55736596900856,
-      14.848930523210871,
-      15.143873411576273,
-      15.44220572664832,
-      15.743938506781891,
-      16.04908273684337,
-      16.35764934889634,
-      16.66964922287304,
-      16.985093187232053,
-      17.30399201960269,
-      17.62635644741625,
-      17.95219714852476,
-      18.281524751807332,
-      18.614349837764564,
-      18.95068293910138,
-      19.290534541298456,
-      19.633915083172692,
-      19.98083495742689,
-      20.331304511189067,
-      20.685334046541502,
-      21.042933821039977,
-      21.404114048223256,
-      21.76888489811322,
-      22.137256497705877,
-      22.50923893145328,
-      22.884842241736916,
-      23.264076429332462,
-      23.6469514538663,
-      24.033477234264016,
-      24.42366364919083,
-      24.817520537484558,
-      25.21505769858089,
-      25.61628489293138,
-      26.021211842414342,
-      26.429848230738664,
-      26.842203703840827,
-      27.258287870275353,
-      27.678110301598522,
-      28.10168053274597,
-      28.529008062403893,
-      28.96010235337422,
-      29.39497283293396,
-      29.83362889318845,
-      30.276079891419332,
-      30.722335150426627,
-      31.172403958865512,
-      31.62629557157785,
-      32.08401920991837,
-      32.54558406207592,
-      33.010999283389665,
-      33.4802739966603,
-      33.953417292456834,
-      34.430438229418264,
-      34.911345834551085,
-      35.39614910352207,
-      35.88485700094671,
-      36.37747846067349,
-      36.87402238606382,
-      37.37449765026789,
-      37.87891309649659,
-      38.38727753828926,
-      38.89959975977785,
-      39.41588851594697,
-      39.93615253289054,
-      40.460400508064545,
-      40.98864111053629,
-      41.520882981230194,
-      42.05713473317016,
-      42.597404951718396,
-      43.141702194811224,
-      43.6900349931913,
-      44.24241185063697,
-      44.798841244188324,
-      45.35933162437017,
-      45.92389141541209,
-      46.49252901546552,
-      47.065252796817916,
-      47.64207110610409,
-      48.22299226451468,
-      48.808024568002054,
-      49.3971762874833,
-      49.9904556690408,
-      50.587870934119984,
-      51.189430279724725,
-      51.79514187861014,
-      52.40501387947288,
-      53.0190544071392,
-      53.637271562750364,
-      54.259673423945976,
-      54.88626804504493,
-      55.517063457223934,
-      56.15206766869424,
-      56.79128866487574,
-      57.43473440856916,
-      58.08241284012621,
-      58.734331877617365,
-      59.39049941699807,
-      60.05092333227251,
-      60.715611475655585,
-      61.38457167773311,
-      62.057811747619894,
-      62.7353394731159,
-      63.417162620860914,
-      64.10328893648692,
-      64.79372614476921,
-      65.48848194977529,
-      66.18756403501224,
-      66.89098006357258,
-      67.59873767827808,
-      68.31084450182222,
-      69.02730813691093,
-      69.74813616640164,
-      70.47333615344107,
-      71.20291564160104,
-      71.93688215501312,
-      72.67524319850172,
-      73.41800625771542,
-      74.16517879925733,
-      74.9167682708136,
-      75.67278210128072,
-      76.43322770089146,
-      77.1981124613393,
-      77.96744375590167,
-      78.74122893956174,
-      79.51947534912904,
-      80.30219030335869,
-      81.08938110306934,
-      81.88105503125999,
-      82.67721935322541,
-      83.4778813166706,
-      84.28304815182372,
-      85.09272707154808,
-      85.90692527145302,
-      86.72564993000343,
-      87.54890820862819,
-      88.3767072518277,
-      89.2090541872801,
-      90.04595612594655,
-      90.88742016217518,
-      91.73345337380438,
-      92.58406282226491,
-      93.43925555268066,
-      94.29903859396902,
-      95.16341895893969,
-      96.03240364439274,
-      96.9059996312159,
-      97.78421388448044,
-      98.6670533535366,
-      99.55452497210776,
-    )
-
-  /**
-   * Sanitizes a small enough angle in radians.
-   *
-   * @param angle An angle in radians; must not deviate too much from 0.
-   * @return A coterminal angle between 0 and 2pi.
-   */
-  internal fun sanitizeRadians(angle: Double): Double {
-    return (angle + PI * 8) % (PI * 2)
-  }
-
-  /**
-   * Delinearizes an RGB component, returning a floating-point number.
-   *
-   * @param rgbComponent 0.0 <= rgb_component <= 100.0, represents linear R/G/B channel
-   * @return 0.0 <= output <= 255.0, color channel converted to regular RGB space
-   */
-  internal fun trueDelinearized(rgbComponent: Double): Double {
-    val normalized = rgbComponent / 100.0
-    val delinearized: Double =
-      if (normalized <= 0.0031308) {
-        normalized * 12.92
-      } else {
-        1.055 * normalized.pow(1.0 / 2.4) - 0.055
-      }
-    return delinearized * 255.0
-  }
-
-  internal fun chromaticAdaptation(component: Double): Double {
-    val af = abs(component).pow(0.42)
-    return MathUtils.signum(component) * 400.0 * af / (af + 27.13)
-  }
-
-  /**
-   * Returns the hue of a linear RGB color in CAM16.
-   *
-   * @param linrgb The linear RGB coordinates of a color.
-   * @return The hue of the color in CAM16, in radians.
-   */
-  internal fun hueOf(linrgb: DoubleArray): Double {
-    val scaledDiscount = MathUtils.matrixMultiply(linrgb, SCALED_DISCOUNT_FROM_LINRGB)
-    val rA = chromaticAdaptation(scaledDiscount[0])
-    val gA = chromaticAdaptation(scaledDiscount[1])
-    val bA = chromaticAdaptation(scaledDiscount[2])
-    // redness-greenness
-    val a = (11.0 * rA + -12.0 * gA + bA) / 11.0
-    // yellowness-blueness
-    val b = (rA + gA - 2.0 * bA) / 9.0
-    return atan2(b, a)
-  }
-
-  internal fun areInCyclicOrder(a: Double, b: Double, c: Double): Boolean {
-    val deltaAB = sanitizeRadians(b - a)
-    val deltaAC = sanitizeRadians(c - a)
-    return deltaAB < deltaAC
-  }
-
-  /**
-   * Solves the lerp equation.
-   *
-   * @param source The starting number.
-   * @param mid The number in the middle.
-   * @param target The ending number.
-   * @return A number t such that lerp(source, target, t) = mid.
-   */
-  internal fun intercept(source: Double, mid: Double, target: Double): Double {
-    return (mid - source) / (target - source)
-  }
-
-  internal fun lerpPoint(source: DoubleArray, t: Double, target: DoubleArray): DoubleArray {
-    return doubleArrayOf(
-      source[0] + (target[0] - source[0]) * t,
-      source[1] + (target[1] - source[1]) * t,
-      source[2] + (target[2] - source[2]) * t,
-    )
-  }
-
-  /**
-   * Intersects a segment with a plane.
-   *
-   * @param source The coordinates of point A.
-   * @param coordinate The R-, G-, or B-coordinate of the plane.
-   * @param target The coordinates of point B.
-   * @param axis The axis the plane is perpendicular with. (0: R, 1: G, 2: B)
-   * @return The intersection point of the segment AB with the plane R=coordinate, G=coordinate, or
-   *   B=coordinate
-   */
-  internal fun setCoordinate(
-    source: DoubleArray,
-    coordinate: Double,
-    target: DoubleArray,
-    axis: Int,
-  ): DoubleArray {
-    val t = intercept(source[axis], coordinate, target[axis])
-    return lerpPoint(source, t, target)
-  }
-
-  internal fun isBounded(x: Double): Boolean {
-    return 0.0 <= x && x <= 100.0
-  }
-
-  /**
-   * Returns the nth possible vertex of the polygonal intersection.
-   *
-   * @param y The Y value of the plane.
-   * @param n The zero-based index of the point. 0 <= n <= 11.
-   * @return The nth possible vertex of the polygonal intersection of the y plane and the RGB cube,
-   *   in linear RGB coordinates, if it exists. If this possible vertex lies outside of the cube,
-   *   [-1.0, -1.0, -1.0] is returned.
-   */
-  internal fun nthVertex(y: Double, n: Int): DoubleArray {
-    val kR = Y_FROM_LINRGB[0]
-    val kG = Y_FROM_LINRGB[1]
-    val kB = Y_FROM_LINRGB[2]
-    val coordA = if (n % 4 <= 1) 0.0 else 100.0
-    val coordB = if (n % 2 == 0) 0.0 else 100.0
-    if (n < 4) {
-      val g = coordA
-      val b = coordB
-      val r = (y - g * kG - b * kB) / kR
-      return if (isBounded(r)) {
-        doubleArrayOf(r, g, b)
-      } else {
-        doubleArrayOf(-1.0, -1.0, -1.0)
-      }
-    } else if (n < 8) {
-      val b = coordA
-      val r = coordB
-      val g = (y - r * kR - b * kB) / kG
-      return if (isBounded(g)) {
-        doubleArrayOf(r, g, b)
-      } else {
-        doubleArrayOf(-1.0, -1.0, -1.0)
-      }
-    } else {
-      val r = coordA
-      val g = coordB
-      val b = (y - r * kR - g * kG) / kB
-      return if (isBounded(b)) {
-        doubleArrayOf(r, g, b)
-      } else {
-        doubleArrayOf(-1.0, -1.0, -1.0)
-      }
-    }
-  }
-
-  /**
-   * Finds the segment containing the desired color.
-   *
-   * @param y The Y value of the color.
-   * @param targetHue The hue of the color.
-   * @return A list of two sets of linear RGB coordinates, each corresponding to an endpoint of the
-   *   segment containing the desired color.
-   */
-  internal fun bisectToSegment(y: Double, targetHue: Double): Array {
-    var left = doubleArrayOf(-1.0, -1.0, -1.0)
-    var right = left
-    var leftHue = 0.0
-    var rightHue = 0.0
-    var initialized = false
-    var uncut = true
-    for (n in 0..11) {
-      val mid = nthVertex(y, n)
-      if (mid[0] < 0) {
-        continue
-      }
-      val midHue = hueOf(mid)
-      if (!initialized) {
-        left = mid
-        right = mid
-        leftHue = midHue
-        rightHue = midHue
-        initialized = true
-        continue
-      }
-      if (uncut || areInCyclicOrder(leftHue, midHue, rightHue)) {
-        uncut = false
-        if (areInCyclicOrder(leftHue, targetHue, midHue)) {
-          right = mid
-          rightHue = midHue
-        } else {
-          left = mid
-          leftHue = midHue
-        }
-      }
-    }
-    return arrayOf(left, right)
-  }
-
-  internal fun midpoint(a: DoubleArray, b: DoubleArray): DoubleArray {
-    return doubleArrayOf((a[0] + b[0]) / 2, (a[1] + b[1]) / 2, (a[2] + b[2]) / 2)
-  }
-
-  internal fun criticalPlaneBelow(x: Double): Int {
-    return floor(x - 0.5).toInt()
-  }
-
-  internal fun criticalPlaneAbove(x: Double): Int {
-    return ceil(x - 0.5).toInt()
-  }
-
-  /**
-   * Finds a color with the given Y and hue on the boundary of the cube.
-   *
-   * @param y The Y value of the color.
-   * @param targetHue The hue of the color.
-   * @return The desired color, in linear RGB coordinates.
-   */
-  internal fun bisectToLimit(y: Double, targetHue: Double): DoubleArray {
-    val segment = bisectToSegment(y, targetHue)
-    var left = segment[0]
-    var leftHue = hueOf(left)
-    var right = segment[1]
-    for (axis in 0..2) {
-      if (left[axis] != right[axis]) {
-        var lPlane =
-          if (left[axis] < right[axis]) {
-            criticalPlaneBelow(trueDelinearized(left[axis]))
-          } else {
-            criticalPlaneAbove(trueDelinearized(left[axis]))
-          }
-        var rPlane =
-          if (left[axis] < right[axis]) {
-            criticalPlaneAbove(trueDelinearized(right[axis]))
-          } else {
-            criticalPlaneBelow(trueDelinearized(right[axis]))
-          }
-        for (i in 0..7) {
-          if (abs((rPlane - lPlane).toDouble()) <= 1) {
-            break
-          } else {
-            val mPlane = floor((lPlane + rPlane) / 2.0).toInt()
-            val midPlaneCoordinate = CRITICAL_PLANES[mPlane]
-            val mid = setCoordinate(left, midPlaneCoordinate, right, axis)
-            val midHue = hueOf(mid)
-            if (areInCyclicOrder(leftHue, targetHue, midHue)) {
-              right = mid
-              rPlane = mPlane
-            } else {
-              left = mid
-              leftHue = midHue
-              lPlane = mPlane
-            }
-          }
-        }
-      }
-    }
-    return midpoint(left, right)
-  }
-
-  internal fun inverseChromaticAdaptation(adapted: Double): Double {
-    val adaptedAbs = abs(adapted)
-    val base = Math.max(0.0, 27.13 * adaptedAbs / (400.0 - adaptedAbs))
-    return MathUtils.signum(adapted) * base.pow(1.0 / 0.42)
-  }
-
-  /**
-   * Finds a color with the given hue, chroma, and Y.
-   *
-   * @param hueRadians The desired hue in radians.
-   * @param chroma The desired chroma.
-   * @param y The desired Y.
-   * @return The desired color as a hexadecimal integer, if found; 0 otherwise.
-   */
-  internal fun findResultByJ(hueRadians: Double, chroma: Double, y: Double): Int {
-    // Initial estimate of j.
-    var j = sqrt(y) * 11.0
-    // ===========================================================
-    // Operations inlined from Cam16 to avoid repeated calculation
-    // ===========================================================
-    val viewingConditions = ViewingConditions.DEFAULT
-    val tInnerCoeff = 1 / (1.64 - 0.29.pow(viewingConditions.n)).pow(0.73)
-    val eHue = 0.25 * (cos(hueRadians + 2.0) + 3.8)
-    val p1 = eHue * (50000.0 / 13.0) * viewingConditions.nc * viewingConditions.ncb
-    val hSin = sin(hueRadians)
-    val hCos = cos(hueRadians)
-    for (iterationRound in 0..4) {
-      // ===========================================================
-      // Operations inlined from Cam16 to avoid repeated calculation
-      // ===========================================================
-      val jNormalized = j / 100.0
-      val alpha = if (chroma == 0.0 || j == 0.0) 0.0 else chroma / sqrt(jNormalized)
-      val t = (alpha * tInnerCoeff).pow(1.0 / 0.9)
-      val ac =
-        viewingConditions.aw * jNormalized.pow(1.0 / viewingConditions.c / viewingConditions.z)
-      val p2 = ac / viewingConditions.nbb
-      val gamma = 23.0 * (p2 + 0.305) * t / (23.0 * p1 + 11 * t * hCos + 108.0 * t * hSin)
-      val a = gamma * hCos
-      val b = gamma * hSin
-      val rA = (460.0 * p2 + 451.0 * a + 288.0 * b) / 1403.0
-      val gA = (460.0 * p2 - 891.0 * a - 261.0 * b) / 1403.0
-      val bA = (460.0 * p2 - 220.0 * a - 6300.0 * b) / 1403.0
-      val rCScaled = inverseChromaticAdaptation(rA)
-      val gCScaled = inverseChromaticAdaptation(gA)
-      val bCScaled = inverseChromaticAdaptation(bA)
-      val linrgb =
-        MathUtils.matrixMultiply(
-          doubleArrayOf(rCScaled, gCScaled, bCScaled),
-          LINRGB_FROM_SCALED_DISCOUNT,
-        )
-      // ===========================================================
-      // Operations inlined from Cam16 to avoid repeated calculation
-      // ===========================================================
-      if (linrgb[0] < 0 || linrgb[1] < 0 || linrgb[2] < 0) {
-        return 0
-      }
-      val kR = Y_FROM_LINRGB[0]
-      val kG = Y_FROM_LINRGB[1]
-      val kB = Y_FROM_LINRGB[2]
-      val fnj = kR * linrgb[0] + kG * linrgb[1] + kB * linrgb[2]
-      if (fnj <= 0) {
-        return 0
-      }
-      if (iterationRound == 4 || abs(fnj - y) < 0.002) {
-        return if (linrgb[0] > 100.01 || linrgb[1] > 100.01 || linrgb[2] > 100.01) {
-          0
-        } else {
-          ColorUtils.argbFromLinrgb(linrgb)
-        }
-      }
-      // Iterates with Newton method,
-      // Using 2 * fn(j) / j as the approximation of fn'(j)
-      j -= (fnj - y) * j / (2 * fnj)
-    }
-    return 0
-  }
-
-  /**
-   * Finds an sRGB color with the given hue, chroma, and L*, if possible.
-   *
-   * @param hueDegrees The desired hue, in degrees.
-   * @param chroma The desired chroma.
-   * @param lstar The desired L*.
-   * @return A hexadecimal representing the sRGB color. The color has sufficiently close hue,
-   *   chroma, and L* to the desired values, if possible; otherwise, the hue and L* will be
-   *   sufficiently close, and chroma will be maximized.
-   */
-  fun solveToInt(hueDegrees: Double, chroma: Double, lstar: Double): Int {
-    if (chroma < 0.0001 || lstar < 0.0001 || lstar > 99.9999) {
-      return ColorUtils.argbFromLstar(lstar)
-    }
-    val hueRadians = MathUtils.sanitizeDegreesDouble(hueDegrees) / 180 * PI
-    val y = ColorUtils.yFromLstar(lstar)
-    val exactAnswer = findResultByJ(hueRadians, chroma, y)
-    if (exactAnswer != 0) {
-      return exactAnswer
-    }
-    val linrgb = bisectToLimit(y, hueRadians)
-    return ColorUtils.argbFromLinrgb(linrgb)
-  }
-
-  /**
-   * Finds an sRGB color with the given hue, chroma, and L*, if possible.
-   *
-   * @param hueDegrees The desired hue, in degrees.
-   * @param chroma The desired chroma.
-   * @param lstar The desired L*.
-   * @return A CAM16 object representing the sRGB color. The color has sufficiently close hue,
-   *   chroma, and L* to the desired values, if possible; otherwise, the hue and L* will be
-   *   sufficiently close, and chroma will be maximized.
-   */
-  fun solveToCam(hueDegrees: Double, chroma: Double, lstar: Double): Cam16 {
-    return Cam16.fromInt(solveToInt(hueDegrees, chroma, lstar))
-  }
-}
diff --git a/kotlin/hct/ViewingConditions.kt b/kotlin/hct/ViewingConditions.kt
deleted file mode 100644
index 4bfcebad..00000000
--- a/kotlin/hct/ViewingConditions.kt
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package hct
-
-import utils.ColorUtils
-import utils.MathUtils
-import kotlin.math.PI
-import kotlin.math.cbrt
-import kotlin.math.exp
-import kotlin.math.max
-import kotlin.math.pow
-import kotlin.math.sqrt
-
-/**
- * In traditional color spaces, a color can be identified solely by the observer's measurement of
- * the color. Color appearance models such as CAM16 also use information about the environment where
- * the color was observed, known as the viewing conditions.
- *
- * For example, white under the traditional assumption of a midday sun white point is accurately
- * measured as a slightly chromatic blue by CAM16. (roughly, hue 203, chroma 3, lightness 100)
- *
- * This class caches intermediate values of the CAM16 conversion process that depend only on viewing
- * conditions, enabling speed ups.
- */
-@ConsistentCopyVisibility
-data class ViewingConditions
-/**
- * Parameters are intermediate values of the CAM16 conversion process. Their names are shorthand for
- * technical color science terminology, this class would not benefit from documenting them
- * individually. A brief overview is available in the CAM16 specification, and a complete overview
- * requires a color science textbook, such as Fairchild's Color Appearance Models.
- */
-private constructor(
-  val n: Double,
-  val aw: Double,
-  val nbb: Double,
-  internal val ncb: Double,
-  internal val c: Double,
-  internal val nc: Double,
-  val rgbD: DoubleArray,
-  internal val fl: Double,
-  val flRoot: Double,
-  internal val z: Double,
-) {
-
-  companion object {
-    /** sRGB-like viewing conditions. */
-    val DEFAULT = defaultWithBackgroundLstar(50.0)
-
-    /**
-     * Create ViewingConditions from a simple, physically relevant, set of parameters.
-     *
-     * @param whitePoint White point, measured in the XYZ color space. default = D65, or sunny day
-     *   afternoon
-     * @param adaptingLuminance The luminance of the adapting field. Informally, how bright it is in
-     *   the room where the color is viewed. Can be calculated from lux by multiplying lux by
-     *   0.0586. default = 11.72, or 200 lux.
-     * @param backgroundLstar The lightness of the area surrounding the color. measured by L* in
-     *   L*a*b*. default = 50.0
-     * @param surround A general description of the lighting surrounding the color. 0 is pitch dark,
-     *   like watching a movie in a theater. 1.0 is a dimly light room, like watching TV at home at
-     *   night. 2.0 means there is no difference between the lighting on the color and around it.
-     *   default = 2.0
-     * @param discountingIlluminant Whether the eye accounts for the tint of the ambient lighting,
-     *   such as knowing an apple is still red in green light. default = false, the eye does not
-     *   perform this process on self-luminous objects like displays.
-     */
-    @JvmStatic
-    fun make(
-      whitePoint: DoubleArray,
-      adaptingLuminance: Double,
-      backgroundLstar: Double,
-      surround: Double,
-      discountingIlluminant: Boolean,
-    ): ViewingConditions {
-      // A background of pure black is non-physical and leads to infinities that represent the idea
-      // that any color viewed in pure black can't be seen.
-      val backgroundLstar = max(0.1, backgroundLstar)
-      // Transform white point XYZ to 'cone'/'rgb' responses
-      val matrix = Cam16.XYZ_TO_CAM16RGB
-      val xyz = whitePoint
-      val rW = xyz[0] * matrix[0][0] + xyz[1] * matrix[0][1] + xyz[2] * matrix[0][2]
-      val gW = xyz[0] * matrix[1][0] + xyz[1] * matrix[1][1] + xyz[2] * matrix[1][2]
-      val bW = xyz[0] * matrix[2][0] + xyz[1] * matrix[2][1] + xyz[2] * matrix[2][2]
-      val f = 0.8 + surround / 10.0
-      val c =
-        if (f >= 0.9) {
-          MathUtils.lerp(0.59, 0.69, (f - 0.9) * 10.0)
-        } else {
-          MathUtils.lerp(0.525, 0.59, (f - 0.8) * 10.0)
-        }
-      var d =
-        if (discountingIlluminant) {
-          1.0
-        } else {
-          f * (1.0 - 1.0 / 3.6 * exp((-adaptingLuminance - 42.0) / 92.0))
-        }
-      d = MathUtils.clampDouble(0.0, 1.0, d)
-      val nc = f
-      val rgbD =
-        doubleArrayOf(
-          d * (100.0 / rW) + 1.0 - d,
-          d * (100.0 / gW) + 1.0 - d,
-          d * (100.0 / bW) + 1.0 - d,
-        )
-      val k = 1.0 / (5.0 * adaptingLuminance + 1.0)
-      val k4 = k * k * k * k
-      val k4F = 1.0 - k4
-      val fl = k4 * adaptingLuminance + 0.1 * k4F * k4F * cbrt(5.0 * adaptingLuminance)
-      val n = ColorUtils.yFromLstar(backgroundLstar) / whitePoint[1]
-      val z = 1.48 + sqrt(n)
-      val nbb = 0.725 / n.pow(0.2)
-      val ncb = nbb
-      val rgbAFactors =
-        doubleArrayOf(
-          (fl * rgbD[0] * rW / 100.0).pow(0.42),
-          (fl * rgbD[1] * gW / 100.0).pow(0.42),
-          (fl * rgbD[2] * bW / 100.0).pow(0.42),
-        )
-      val rgbA =
-        doubleArrayOf(
-          400.0 * rgbAFactors[0] / (rgbAFactors[0] + 27.13),
-          400.0 * rgbAFactors[1] / (rgbAFactors[1] + 27.13),
-          400.0 * rgbAFactors[2] / (rgbAFactors[2] + 27.13),
-        )
-      val aw = (2.0 * rgbA[0] + rgbA[1] + 0.05 * rgbA[2]) * nbb
-      return ViewingConditions(n, aw, nbb, ncb, c, nc, rgbD, fl, fl.pow(0.25), z)
-    }
-
-    /**
-     * Create sRGB-like viewing conditions with a custom background lstar.
-     *
-     * Default viewing conditions have a lstar of 50, midgray.
-     */
-    @JvmStatic
-    fun defaultWithBackgroundLstar(lstar: Double): ViewingConditions {
-      return make(
-        ColorUtils.whitePointD65(),
-        200.0 / PI * ColorUtils.yFromLstar(50.0) / 100f,
-        lstar,
-        2.0,
-        false,
-      )
-    }
-  }
-}
diff --git a/kotlin/palettes/CorePalettes.kt b/kotlin/palettes/CorePalettes.kt
deleted file mode 100644
index 7b1af35e..00000000
--- a/kotlin/palettes/CorePalettes.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2024 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package palettes
-
-/**
- * Comprises foundational palettes to build a color scheme.
- *
- * Generated from a source color, these palettes will then be part of a [DynamicScheme] together
- * with appearance preferences.
- */
-data class CorePalettes(
-  val primary: TonalPalette,
-  val secondary: TonalPalette,
-  val tertiary: TonalPalette,
-  val neutral: TonalPalette,
-  val neutralVariant: TonalPalette,
-)
diff --git a/kotlin/palettes/TonalPalette.kt b/kotlin/palettes/TonalPalette.kt
deleted file mode 100644
index 9f62b8d1..00000000
--- a/kotlin/palettes/TonalPalette.kt
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package palettes
-
-import hct.Hct
-import kotlin.math.abs
-import kotlin.math.roundToInt
-
-/**
- * A convenience class for retrieving colors that are constant in hue and chroma, but vary in tone.
- *
- * TonalPalette is intended for use in a single thread due to its stateful caching.
- */
-class TonalPalette
-private constructor(
-  /** The hue of the Tonal Palette, in HCT. Ranges from 0 to 360. */
-  val hue: Double,
-  /** The chroma of the Tonal Palette, in HCT. Ranges from 0 to ~130 (for sRGB gamut). */
-  val chroma: Double,
-  /** The key color is the first tone, starting from T50, that matches the palette's chroma. */
-  val keyColor: Hct,
-) {
-  var cache: MutableMap = mutableMapOf()
-
-  /**
-   * Create an ARGB color with HCT hue and chroma of this Tones instance, and the provided HCT tone.
-   *
-   * @param tone HCT tone, measured from 0 to 100.
-   * @return ARGB representation of a color with that tone.
-   */
-  fun tone(tone: Int): Int {
-    var color = cache[tone]
-    if (color == null) {
-      color =
-        if (tone == 99 && Hct.isYellow(hue)) {
-          averageArgb(tone(98), tone(100))
-        } else {
-          Hct.from(hue, chroma, tone.toDouble()).toInt()
-        }
-      cache[tone] = color
-    }
-    return color
-  }
-
-  /** Given a tone, use hue and chroma of palette to create a color, and return it as HCT. */
-  fun getHct(tone: Double): Hct {
-    return Hct.from(hue, chroma, tone)
-  }
-
-  private fun averageArgb(argb1: Int, argb2: Int): Int {
-    val red1 = argb1 ushr 16 and 0xff
-    val green1 = argb1 ushr 8 and 0xff
-    val blue1 = argb1 and 0xff
-    val red2 = argb2 ushr 16 and 0xff
-    val green2 = argb2 ushr 8 and 0xff
-    val blue2 = argb2 and 0xff
-    val red = ((red1 + red2) / 2f).roundToInt()
-    val green = ((green1 + green2) / 2f).roundToInt()
-    val blue = ((blue1 + blue2) / 2f).roundToInt()
-    return 255 shl 24 or (red and 255) shl 16 or (green and 255) shl 8 or (blue and 255)
-  }
-
-  /** Key color is a color that represents the hue and chroma of a tonal palette. */
-  private class KeyColor(private val hue: Double, private val requestedChroma: Double) {
-    // Cache that maps tone to max chroma to avoid duplicated HCT calculation.
-    private val chromaCache: MutableMap = mutableMapOf()
-
-    /**
-     * Creates a key color from a [hue] and a [chroma]. The key color is the first tone, starting
-     * from T50, matching the given hue and chroma.
-     *
-     * @return Key color [Hct]
-     */
-    fun create(): Hct {
-      // Pivot around T50 because T50 has the most chroma available, on
-      // average. Thus it is most likely to have a direct answer.
-      val pivotTone = 50
-      val toneStepSize = 1
-      // Epsilon to accept values slightly higher than the requested chroma.
-      val epsilon = 0.01
-
-      // Binary search to find the tone that can provide a chroma that is closest
-      // to the requested chroma.
-      var lowerTone = 0
-      var upperTone = 100
-      while (lowerTone < upperTone) {
-        val midTone = (lowerTone + upperTone) / 2
-        val isAscending = maxChroma(midTone) < maxChroma(midTone + toneStepSize)
-        val sufficientChroma = maxChroma(midTone) >= requestedChroma - epsilon
-        if (sufficientChroma) {
-          // Either range [lowerTone, midTone] or [midTone, upperTone] has
-          // the answer, so search in the range that is closer the pivot tone.
-          if (abs((lowerTone - pivotTone).toDouble()) < abs((upperTone - pivotTone).toDouble())) {
-            upperTone = midTone
-          } else {
-            if (lowerTone == midTone) {
-              return Hct.from(hue, requestedChroma, lowerTone.toDouble())
-            }
-            lowerTone = midTone
-          }
-        } else {
-          // As there is no sufficient chroma in the midTone, follow the direction to the chroma
-          // peak.
-          if (isAscending) {
-            lowerTone = midTone + toneStepSize
-          } else {
-            // Keep midTone for potential chroma peak.
-            upperTone = midTone
-          }
-        }
-      }
-      return Hct.from(hue, requestedChroma, lowerTone.toDouble())
-    }
-
-    // Find the maximum chroma for a given tone
-    private fun maxChroma(tone: Int): Double {
-      return chromaCache.getOrPut(tone) { Hct.from(hue, MAX_CHROMA_VALUE, tone.toDouble()).chroma }
-    }
-
-    companion object {
-      private const val MAX_CHROMA_VALUE = 200.0
-    }
-  }
-
-  companion object {
-    /**
-     * Create tones using the HCT hue and chroma from a color.
-     *
-     * @param argb ARGB representation of a color
-     * @return Tones matching that color's hue and chroma.
-     */
-    @JvmStatic
-    fun fromInt(argb: Int): TonalPalette {
-      return fromHct(Hct.fromInt(argb))
-    }
-
-    /**
-     * Create tones using a HCT color.
-     *
-     * @param hct HCT representation of a color.
-     * @return Tones matching that color's hue and chroma.
-     */
-    @JvmStatic
-    fun fromHct(hct: Hct): TonalPalette {
-      return TonalPalette(hct.hue, hct.chroma, hct)
-    }
-
-    /**
-     * Create tones from a defined HCT hue and chroma.
-     *
-     * @param hue HCT hue
-     * @param chroma HCT chroma
-     * @return Tones matching hue and chroma.
-     */
-    @JvmStatic
-    fun fromHueAndChroma(hue: Double, chroma: Double): TonalPalette {
-      val keyColor = KeyColor(hue, chroma).create()
-      return TonalPalette(hue, chroma, keyColor)
-    }
-  }
-}
diff --git a/kotlin/quantize/PointProvider.kt b/kotlin/quantize/PointProvider.kt
deleted file mode 100644
index 5947fe28..00000000
--- a/kotlin/quantize/PointProvider.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package quantize
-
-/** An interface to allow use of different color spaces by quantizers. */
-interface PointProvider {
-  /** The four components in the color space of an sRGB color. */
-  fun fromInt(argb: Int): DoubleArray
-
-  /** The ARGB (i.e. hex code) representation of this color. */
-  fun toInt(point: DoubleArray): Int
-
-  /**
-   * Squared distance between two colors. Distance is defined by scientific color spaces and
-   * referred to as delta E.
-   */
-  fun distance(a: DoubleArray, b: DoubleArray): Double
-}
diff --git a/kotlin/quantize/PointProviderLab.kt b/kotlin/quantize/PointProviderLab.kt
deleted file mode 100644
index 81b17ac7..00000000
--- a/kotlin/quantize/PointProviderLab.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package quantize
-
-import utils.ColorUtils
-
-/**
- * Provides conversions needed for K-Means quantization. Converting input to points, and converting
- * the final state of the K-Means algorithm to colors.
- */
-class PointProviderLab : PointProvider {
-  /**
-   * Convert a color represented in ARGB to a 3-element array of L*a*b* coordinates of the color.
-   */
-  override fun fromInt(argb: Int): DoubleArray {
-    val lab = ColorUtils.labFromArgb(argb)
-    return doubleArrayOf(lab[0], lab[1], lab[2])
-  }
-
-  /** Convert a 3-element array to a color represented in ARGB. */
-  override fun toInt(point: DoubleArray): Int {
-    return ColorUtils.argbFromLab(point[0], point[1], point[2])
-  }
-
-  /**
-   * Standard CIE 1976 delta E formula also takes the square root, unneeded here. This method is
-   * used by quantization algorithms to compare distance, and the relative ordering is the same,
-   * with or without a square root.
-   *
-   * This relatively minor optimization is helpful because this method is called at least once for
-   * each pixel in an image.
-   */
-  override fun distance(a: DoubleArray, b: DoubleArray): Double {
-    val dL = a[0] - b[0]
-    val dA = a[1] - b[1]
-    val dB = a[2] - b[2]
-    return dL * dL + dA * dA + dB * dB
-  }
-}
diff --git a/kotlin/quantize/Quantizer.kt b/kotlin/quantize/Quantizer.kt
deleted file mode 100644
index c2f51b31..00000000
--- a/kotlin/quantize/Quantizer.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package quantize
-
-internal interface Quantizer {
-  fun quantize(pixels: IntArray, maxColors: Int): QuantizerResult
-}
diff --git a/kotlin/quantize/QuantizerCelebi.kt b/kotlin/quantize/QuantizerCelebi.kt
deleted file mode 100644
index 6700fd1b..00000000
--- a/kotlin/quantize/QuantizerCelebi.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package quantize
-
-/**
- * An image quantizer that improves on the quality of a standard K-Means algorithm by setting the
- * K-Means initial state to the output of a Wu quantizer, instead of random centroids. Improves on
- * speed by several optimizations, as implemented in Wsmeans, or Weighted Square Means, K-Means with
- * those optimizations.
- *
- * This algorithm was designed by M. Emre Celebi, and was found in their 2011 paper, Improving the
- * Performance of K-Means for Color Quantization. https://arxiv.org/abs/1101.0395
- */
-object QuantizerCelebi {
-  /**
-   * Reduce the number of colors needed to represented the input, minimizing the difference between
-   * the original image and the recolored image.
-   *
-   * @param pixels Colors in ARGB format.
-   * @param maxColors The number of colors to divide the image into. A lower number of colors may be
-   *   returned.
-   * @return Map with keys of colors in ARGB format, and values of number of pixels in the original
-   *   image that correspond to the color in the quantized image.
-   */
-  fun quantize(pixels: IntArray, maxColors: Int): Map {
-    val wu = QuantizerWu()
-    val wuResult = wu.quantize(pixels, maxColors)
-    val wuClustersAsObjects = wuResult.colorToCount.keys
-    var index = 0
-    val wuClusters = IntArray(wuClustersAsObjects.size)
-    for (argb in wuClustersAsObjects) {
-      wuClusters[index++] = argb
-    }
-    return QuantizerWsmeans.quantize(pixels, wuClusters, maxColors)
-  }
-}
diff --git a/kotlin/quantize/QuantizerMap.kt b/kotlin/quantize/QuantizerMap.kt
deleted file mode 100644
index 97ce2e4b..00000000
--- a/kotlin/quantize/QuantizerMap.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package quantize
-
-import java.util.LinkedHashMap
-
-/** Creates a dictionary with keys of colors, and values of count of the color */
-class QuantizerMap : Quantizer {
-  var colorToCount: MutableMap? = null
-    private set
-
-  override fun quantize(pixels: IntArray, maxColors: Int): QuantizerResult {
-    val pixelByCount: MutableMap = LinkedHashMap()
-    for (pixel in pixels) {
-      val currentPixelCount = pixelByCount[pixel]
-      val newPixelCount = if (currentPixelCount == null) 1 else currentPixelCount + 1
-      pixelByCount[pixel] = newPixelCount
-    }
-    colorToCount = pixelByCount
-    return QuantizerResult(pixelByCount)
-  }
-}
diff --git a/kotlin/quantize/QuantizerResult.kt b/kotlin/quantize/QuantizerResult.kt
deleted file mode 100644
index 57343256..00000000
--- a/kotlin/quantize/QuantizerResult.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package quantize
-
-/** Represents result of a quantizer run */
-data class QuantizerResult(val colorToCount: Map)
diff --git a/kotlin/quantize/QuantizerWsmeans.kt b/kotlin/quantize/QuantizerWsmeans.kt
deleted file mode 100644
index cb816476..00000000
--- a/kotlin/quantize/QuantizerWsmeans.kt
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package quantize
-
-import java.util.Arrays
-import java.util.LinkedHashMap
-import java.util.Random
-import kotlin.math.abs
-import kotlin.math.min
-import kotlin.math.sqrt
-
-/**
- * An image quantizer that improves on the speed of a standard K-Means algorithm by implementing
- * several optimizations, including deduping identical pixels and a triangle inequality rule that
- * reduces the number of comparisons needed to identify which cluster a point should be moved to.
- *
- * Wsmeans stands for Weighted Square Means.
- *
- * This algorithm was designed by M. Emre Celebi, and was found in their 2011 paper, Improving the
- * Performance of K-Means for Color Quantization. https://arxiv.org/abs/1101.0395
- */
-object QuantizerWsmeans {
-  private class Distance() : Comparable {
-    var index = -1
-    var distance = -1.0
-
-    override fun compareTo(other: Distance): Int {
-      return distance.compareTo(other.distance)
-    }
-  }
-
-  private const val MAX_ITERATIONS = 10
-  private const val MIN_MOVEMENT_DISTANCE = 3.0
-
-  /**
-   * Reduce the number of colors needed to represented the input, minimizing the difference between
-   * the original image and the recolored image.
-   *
-   * @param inputPixels Colors in ARGB format.
-   * @param startingClusters Defines the initial state of the quantizer. Passing an empty array is
-   *   fine, the implementation will create its own initial state that leads to reproducible results
-   *   for the same inputs. Passing an array that is the result of Wu quantization leads to higher
-   *   quality results.
-   * @param maxColors The number of colors to divide the image into. A lower number of colors may be
-   *   returned.
-   * @return Map with keys of colors in ARGB format, values of how many of the input pixels belong
-   *   to the color.
-   */
-  fun quantize(inputPixels: IntArray, startingClusters: IntArray, maxColors: Int): Map {
-    // Uses a seeded random number generator to ensure consistent results.
-    val random = Random(0x42688L)
-    val pixelToCount: MutableMap = LinkedHashMap()
-    val points = arrayOfNulls(inputPixels.size)
-    val pixels = IntArray(inputPixels.size)
-    val pointProvider: PointProvider = PointProviderLab()
-    var pointCount = 0
-    for (i in inputPixels.indices) {
-      val inputPixel = inputPixels[i]
-      val pixelCount = pixelToCount[inputPixel]
-      if (pixelCount == null) {
-        points[pointCount] = pointProvider.fromInt(inputPixel)
-        pixels[pointCount] = inputPixel
-        pointCount++
-        pixelToCount[inputPixel] = 1
-      } else {
-        pixelToCount[inputPixel] = pixelCount + 1
-      }
-    }
-    val counts = IntArray(pointCount)
-    for (i in 0 until pointCount) {
-      val pixel = pixels[i]
-      val count = pixelToCount[pixel]!!
-      counts[i] = count
-    }
-    var clusterCount = min(maxColors, pointCount)
-    if (startingClusters.isNotEmpty()) {
-      clusterCount = min(clusterCount, startingClusters.size)
-    }
-    val clusters = arrayOfNulls(clusterCount)
-    var clustersCreated = 0
-    for (i in startingClusters.indices) {
-      clusters[i] = pointProvider.fromInt(startingClusters[i])
-      clustersCreated++
-    }
-    val additionalClustersNeeded = clusterCount - clustersCreated
-    if (additionalClustersNeeded > 0) {
-      for (i in 0 until additionalClustersNeeded) {}
-    }
-    val clusterIndices = IntArray(pointCount) { random.nextInt(clusterCount) }
-    val indexMatrix = Array(clusterCount) { IntArray(clusterCount) }
-    val distanceToIndexMatrix = Array(clusterCount) { Array(clusterCount) { Distance() } }
-    val pixelCountSums = IntArray(clusterCount)
-    for (iteration in 0 until MAX_ITERATIONS) {
-      for (i in 0 until clusterCount) {
-        for (j in i + 1 until clusterCount) {
-          val distance = pointProvider.distance(clusters[i]!!, clusters[j]!!)
-          distanceToIndexMatrix[j][i].distance = distance
-          distanceToIndexMatrix[j][i].index = i
-          distanceToIndexMatrix[i][j].distance = distance
-          distanceToIndexMatrix[i][j].index = j
-        }
-        Arrays.sort(distanceToIndexMatrix[i])
-        for (j in 0 until clusterCount) {
-          indexMatrix[i][j] = distanceToIndexMatrix[i][j].index
-        }
-      }
-      var pointsMoved = 0
-      for (i in 0 until pointCount) {
-        val point = points[i]!!
-        val previousClusterIndex = clusterIndices[i]
-        val previousCluster = clusters[previousClusterIndex]!!
-        val previousDistance = pointProvider.distance(point, previousCluster)
-        var minimumDistance = previousDistance
-        var newClusterIndex = -1
-        for (j in 0 until clusterCount) {
-          if (distanceToIndexMatrix[previousClusterIndex][j].distance >= 4 * previousDistance) {
-            continue
-          }
-          val distance = pointProvider.distance(point, clusters[j]!!)
-          if (distance < minimumDistance) {
-            minimumDistance = distance
-            newClusterIndex = j
-          }
-        }
-        if (newClusterIndex != -1) {
-          val distanceChange = abs(sqrt(minimumDistance) - sqrt(previousDistance))
-          if (distanceChange > MIN_MOVEMENT_DISTANCE) {
-            pointsMoved++
-            clusterIndices[i] = newClusterIndex
-          }
-        }
-      }
-      if (pointsMoved == 0 && iteration != 0) {
-        break
-      }
-      val componentASums = DoubleArray(clusterCount)
-      val componentBSums = DoubleArray(clusterCount)
-      val componentCSums = DoubleArray(clusterCount)
-      pixelCountSums.fill(0)
-      for (i in 0 until pointCount) {
-        val clusterIndex = clusterIndices[i]
-        val point = points[i]!!
-        val count = counts[i]
-        pixelCountSums[clusterIndex] += count
-        componentASums[clusterIndex] += point[0] * count
-        componentBSums[clusterIndex] += point[1] * count
-        componentCSums[clusterIndex] += point[2] * count
-      }
-      for (i in 0 until clusterCount) {
-        val count = pixelCountSums[i]
-        if (count == 0) {
-          clusters[i] = doubleArrayOf(0.0, 0.0, 0.0)
-          continue
-        }
-        val a = componentASums[i] / count
-        val b = componentBSums[i] / count
-        val c = componentCSums[i] / count
-        clusters[i] = doubleArrayOf(a, b, c)
-      }
-    }
-    val argbToPopulation: MutableMap = LinkedHashMap()
-    for (i in 0 until clusterCount) {
-      val count = pixelCountSums[i]
-      if (count == 0) {
-        continue
-      }
-      val possibleNewCluster = pointProvider.toInt(clusters[i]!!)
-      if (argbToPopulation.containsKey(possibleNewCluster)) {
-        continue
-      }
-      argbToPopulation[possibleNewCluster] = count
-    }
-    return argbToPopulation
-  }
-}
diff --git a/kotlin/quantize/QuantizerWu.kt b/kotlin/quantize/QuantizerWu.kt
deleted file mode 100644
index 98097fd6..00000000
--- a/kotlin/quantize/QuantizerWu.kt
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package quantize
-
-import utils.ColorUtils
-import java.util.ArrayList
-import java.util.LinkedHashMap
-
-/**
- * An image quantizer that divides the image's pixels into clusters by recursively cutting an RGB
- * cube, based on the weight of pixels in each area of the cube.
- *
- * The algorithm was described by Xiaolin Wu in Graphic Gems II, published in 1991.
- */
-class QuantizerWu : Quantizer {
-  private lateinit var weights: IntArray
-  private lateinit var momentsR: IntArray
-  private lateinit var momentsG: IntArray
-  private lateinit var momentsB: IntArray
-  private lateinit var moments: DoubleArray
-  private lateinit var cubes: Array
-
-  override fun quantize(pixels: IntArray, maxColors: Int): QuantizerResult {
-    val mapResult = QuantizerMap().quantize(pixels, maxColors)
-    constructHistogram(mapResult.colorToCount)
-    createMoments()
-    val createBoxesResult = createBoxes(maxColors)
-    val colors = createResult(createBoxesResult.resultCount)
-    val resultMap: MutableMap = LinkedHashMap()
-    for (color in colors) {
-      resultMap[color] = 0
-    }
-    return QuantizerResult(resultMap)
-  }
-
-  fun constructHistogram(pixels: Map) {
-    weights = IntArray(TOTAL_SIZE)
-    momentsR = IntArray(TOTAL_SIZE)
-    momentsG = IntArray(TOTAL_SIZE)
-    momentsB = IntArray(TOTAL_SIZE)
-    moments = DoubleArray(TOTAL_SIZE)
-    for ((pixel, count) in pixels) {
-      val red = ColorUtils.redFromArgb(pixel)
-      val green = ColorUtils.greenFromArgb(pixel)
-      val blue = ColorUtils.blueFromArgb(pixel)
-      val bitsToRemove = 8 - INDEX_BITS
-      val iR = (red shr bitsToRemove) + 1
-      val iG = (green shr bitsToRemove) + 1
-      val iB = (blue shr bitsToRemove) + 1
-      val index = getIndex(iR, iG, iB)
-      weights[index] += count
-      momentsR[index] += red * count
-      momentsG[index] += green * count
-      momentsB[index] += blue * count
-      moments[index] += count * (red * red + green * green + blue * blue).toDouble()
-    }
-  }
-
-  fun createMoments() {
-    for (r in 1 until INDEX_COUNT) {
-      val area = IntArray(INDEX_COUNT)
-      val areaR = IntArray(INDEX_COUNT)
-      val areaG = IntArray(INDEX_COUNT)
-      val areaB = IntArray(INDEX_COUNT)
-      val area2 = DoubleArray(INDEX_COUNT)
-      for (g in 1 until INDEX_COUNT) {
-        var line = 0
-        var lineR = 0
-        var lineG = 0
-        var lineB = 0
-        var line2 = 0.0
-        for (b in 1 until INDEX_COUNT) {
-          val index = getIndex(r, g, b)
-          line += weights[index]
-          lineR += momentsR[index]
-          lineG += momentsG[index]
-          lineB += momentsB[index]
-          line2 += moments[index]
-          area[b] += line
-          areaR[b] += lineR
-          areaG[b] += lineG
-          areaB[b] += lineB
-          area2[b] += line2
-          val previousIndex = getIndex(r - 1, g, b)
-          weights[index] = weights[previousIndex] + area[b]
-          momentsR[index] = momentsR[previousIndex] + areaR[b]
-          momentsG[index] = momentsG[previousIndex] + areaG[b]
-          momentsB[index] = momentsB[previousIndex] + areaB[b]
-          moments[index] = moments[previousIndex] + area2[b]
-        }
-      }
-    }
-  }
-
-  internal fun createBoxes(maxColorCount: Int): CreateBoxesResult {
-    cubes = Array(maxColorCount) { Box() }
-    val volumeVariance = DoubleArray(maxColorCount)
-    val firstBox = cubes[0]
-    firstBox.r1 = INDEX_COUNT - 1
-    firstBox.g1 = INDEX_COUNT - 1
-    firstBox.b1 = INDEX_COUNT - 1
-    var generatedColorCount = maxColorCount
-    var next = 0
-    var i = 1
-    while (i < maxColorCount) {
-      if (cut(cubes[next], cubes[i])) {
-        volumeVariance[next] = if (cubes[next].vol > 1) variance(cubes[next]) else 0.0
-        volumeVariance[i] = if (cubes[i].vol > 1) variance(cubes[i]) else 0.0
-      } else {
-        volumeVariance[next] = 0.0
-        i--
-      }
-      next = 0
-      var temp = volumeVariance[0]
-      for (j in 1..i) {
-        if (volumeVariance[j] > temp) {
-          temp = volumeVariance[j]
-          next = j
-        }
-      }
-      if (temp <= 0.0) {
-        generatedColorCount = i + 1
-        break
-      }
-      i++
-    }
-    return CreateBoxesResult(maxColorCount, generatedColorCount)
-  }
-
-  fun createResult(colorCount: Int): List {
-    val colors: MutableList = ArrayList()
-    for (i in 0 until colorCount) {
-      val cube = cubes[i]
-      val weight = volume(cube, weights)
-      if (weight > 0) {
-        val r = volume(cube, momentsR) / weight
-        val g = volume(cube, momentsG) / weight
-        val b = volume(cube, momentsB) / weight
-        val color = 255 shl 24 or (r and 0x0ff shl 16) or (g and 0x0ff shl 8) or (b and 0x0ff)
-        colors.add(color)
-      }
-    }
-    return colors
-  }
-
-  internal fun variance(cube: Box): Double {
-    val dr = volume(cube, momentsR)
-    val dg = volume(cube, momentsG)
-    val db = volume(cube, momentsB)
-    val xx =
-      (moments[getIndex(cube.r1, cube.g1, cube.b1)] -
-        moments[getIndex(cube.r1, cube.g1, cube.b0)] -
-        moments[getIndex(cube.r1, cube.g0, cube.b1)] +
-        moments[getIndex(cube.r1, cube.g0, cube.b0)] -
-        moments[getIndex(cube.r0, cube.g1, cube.b1)] +
-        moments[getIndex(cube.r0, cube.g1, cube.b0)] +
-        moments[getIndex(cube.r0, cube.g0, cube.b1)] - moments[getIndex(cube.r0, cube.g0, cube.b0)])
-    val hypotenuse = dr * dr + dg * dg + db * db
-    val volume = volume(cube, weights)
-    return xx - hypotenuse / volume.toDouble()
-  }
-
-  internal fun cut(one: Box, two: Box): Boolean {
-    val wholeR = volume(one, momentsR)
-    val wholeG = volume(one, momentsG)
-    val wholeB = volume(one, momentsB)
-    val wholeW = volume(one, weights)
-    val maxRResult =
-      maximize(one, Direction.RED, one.r0 + 1, one.r1, wholeR, wholeG, wholeB, wholeW)
-    val maxGResult =
-      maximize(one, Direction.GREEN, one.g0 + 1, one.g1, wholeR, wholeG, wholeB, wholeW)
-    val maxBResult =
-      maximize(one, Direction.BLUE, one.b0 + 1, one.b1, wholeR, wholeG, wholeB, wholeW)
-    val cutDirection: Direction
-    val maxR = maxRResult.maximum
-    val maxG = maxGResult.maximum
-    val maxB = maxBResult.maximum
-    cutDirection =
-      if (maxR >= maxG && maxR >= maxB) {
-        if (maxRResult.cutLocation < 0) {
-          return false
-        }
-        Direction.RED
-      } else if (maxG >= maxR && maxG >= maxB) {
-        Direction.GREEN
-      } else {
-        Direction.BLUE
-      }
-    two.r1 = one.r1
-    two.g1 = one.g1
-    two.b1 = one.b1
-    when (cutDirection) {
-      Direction.RED -> {
-        one.r1 = maxRResult.cutLocation
-        two.r0 = one.r1
-        two.g0 = one.g0
-        two.b0 = one.b0
-      }
-      Direction.GREEN -> {
-        one.g1 = maxGResult.cutLocation
-        two.r0 = one.r0
-        two.g0 = one.g1
-        two.b0 = one.b0
-      }
-      Direction.BLUE -> {
-        one.b1 = maxBResult.cutLocation
-        two.r0 = one.r0
-        two.g0 = one.g0
-        two.b0 = one.b1
-      }
-    }
-    one.vol = (one.r1 - one.r0) * (one.g1 - one.g0) * (one.b1 - one.b0)
-    two.vol = (two.r1 - two.r0) * (two.g1 - two.g0) * (two.b1 - two.b0)
-    return true
-  }
-
-  internal fun maximize(
-    cube: Box,
-    direction: Direction,
-    first: Int,
-    last: Int,
-    wholeR: Int,
-    wholeG: Int,
-    wholeB: Int,
-    wholeW: Int,
-  ): MaximizeResult {
-    val bottomR = bottom(cube, direction, momentsR)
-    val bottomG = bottom(cube, direction, momentsG)
-    val bottomB = bottom(cube, direction, momentsB)
-    val bottomW = bottom(cube, direction, weights)
-    var max = 0.0
-    var cut = -1
-    var halfR: Int
-    var halfG: Int
-    var halfB: Int
-    var halfW: Int
-    for (i in first until last) {
-      halfR = bottomR + top(cube, direction, i, momentsR)
-      halfG = bottomG + top(cube, direction, i, momentsG)
-      halfB = bottomB + top(cube, direction, i, momentsB)
-      halfW = bottomW + top(cube, direction, i, weights)
-      if (halfW == 0) {
-        continue
-      }
-      var tempNumerator = (halfR * halfR + halfG * halfG + halfB * halfB).toDouble()
-      var tempDenominator = halfW.toDouble()
-      var temp = tempNumerator / tempDenominator
-      halfR = wholeR - halfR
-      halfG = wholeG - halfG
-      halfB = wholeB - halfB
-      halfW = wholeW - halfW
-      if (halfW == 0) {
-        continue
-      }
-      tempNumerator = (halfR * halfR + halfG * halfG + halfB * halfB).toDouble()
-      tempDenominator = halfW.toDouble()
-      temp += tempNumerator / tempDenominator
-      if (temp > max) {
-        max = temp
-        cut = i
-      }
-    }
-    return MaximizeResult(cut, max)
-  }
-
-  internal enum class Direction {
-    RED,
-    GREEN,
-    BLUE,
-  }
-
-  internal class MaximizeResult(
-    // < 0 if cut impossible
-    var cutLocation: Int,
-    var maximum: Double,
-  )
-
-  internal class CreateBoxesResult(var requestedCount: Int, var resultCount: Int)
-
-  internal class Box {
-    var r0 = 0
-    var r1 = 0
-    var g0 = 0
-    var g1 = 0
-    var b0 = 0
-    var b1 = 0
-    var vol = 0
-  }
-
-  companion object {
-    // A histogram of all the input colors is constructed. It has the shape of a cube. The cube
-    // would be too large if it contained all 16 million colors: historical best practice is to use
-    // 5 bits of the 8 in each channel, reducing the histogram to a volume of ~32,000.
-    private const val INDEX_BITS = 5
-    private const val INDEX_COUNT = 33 // ((1 << INDEX_BITS) + 1)
-    private const val TOTAL_SIZE = 35937 // INDEX_COUNT * INDEX_COUNT * INDEX_COUNT
-
-    fun getIndex(r: Int, g: Int, b: Int): Int {
-      return (r shl (INDEX_BITS * 2)) + (r shl (INDEX_BITS + 1)) + r + (g shl INDEX_BITS) + g + b
-    }
-
-    internal fun volume(cube: Box, moment: IntArray): Int {
-      return (moment[getIndex(cube.r1, cube.g1, cube.b1)] -
-        moment[getIndex(cube.r1, cube.g1, cube.b0)] -
-        moment[getIndex(cube.r1, cube.g0, cube.b1)] + moment[getIndex(cube.r1, cube.g0, cube.b0)] -
-        moment[getIndex(cube.r0, cube.g1, cube.b1)] +
-        moment[getIndex(cube.r0, cube.g1, cube.b0)] +
-        moment[getIndex(cube.r0, cube.g0, cube.b1)] - moment[getIndex(cube.r0, cube.g0, cube.b0)])
-    }
-
-    internal fun bottom(cube: Box, direction: Direction, moment: IntArray): Int {
-      return when (direction) {
-        Direction.RED ->
-          -moment[getIndex(cube.r0, cube.g1, cube.b1)] +
-            moment[getIndex(cube.r0, cube.g1, cube.b0)] +
-            moment[getIndex(cube.r0, cube.g0, cube.b1)] -
-            moment[getIndex(cube.r0, cube.g0, cube.b0)]
-        Direction.GREEN ->
-          -moment[getIndex(cube.r1, cube.g0, cube.b1)] +
-            moment[getIndex(cube.r1, cube.g0, cube.b0)] +
-            moment[getIndex(cube.r0, cube.g0, cube.b1)] -
-            moment[getIndex(cube.r0, cube.g0, cube.b0)]
-        Direction.BLUE ->
-          -moment[getIndex(cube.r1, cube.g1, cube.b0)] +
-            moment[getIndex(cube.r1, cube.g0, cube.b0)] +
-            moment[getIndex(cube.r0, cube.g1, cube.b0)] -
-            moment[getIndex(cube.r0, cube.g0, cube.b0)]
-      }
-    }
-
-    internal fun top(cube: Box, direction: Direction, position: Int, moment: IntArray): Int {
-      return when (direction) {
-        Direction.RED ->
-          (moment[getIndex(position, cube.g1, cube.b1)] -
-            moment[getIndex(position, cube.g1, cube.b0)] -
-            moment[getIndex(position, cube.g0, cube.b1)] +
-            moment[getIndex(position, cube.g0, cube.b0)])
-        Direction.GREEN ->
-          (moment[getIndex(cube.r1, position, cube.b1)] -
-            moment[getIndex(cube.r1, position, cube.b0)] -
-            moment[getIndex(cube.r0, position, cube.b1)] +
-            moment[getIndex(cube.r0, position, cube.b0)])
-        Direction.BLUE ->
-          (moment[getIndex(cube.r1, cube.g1, position)] -
-            moment[getIndex(cube.r1, cube.g0, position)] -
-            moment[getIndex(cube.r0, cube.g1, position)] +
-            moment[getIndex(cube.r0, cube.g0, position)])
-      }
-    }
-  }
-}
diff --git a/kotlin/scheme/SchemeContent.kt b/kotlin/scheme/SchemeContent.kt
deleted file mode 100644
index 37538a0e..00000000
--- a/kotlin/scheme/SchemeContent.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package scheme
-
-import dynamiccolor.ColorSpec.SpecVersion
-import dynamiccolor.ColorSpecs
-import dynamiccolor.DynamicScheme
-import dynamiccolor.Variant
-import hct.Hct
-
-/**
- * A scheme that places the source color in Scheme.primaryContainer.
- *
- * Primary Container is the source color, adjusted for color relativity. It maintains constant
- * appearance in light mode and dark mode. This adds ~5 tone in light mode, and subtracts ~5 tone in
- * dark mode.
- *
- * Tertiary Container is an analogous color, specifically, the analog of a color wheel divided into
- * 6, and the precise analog is the one found by increasing hue. This is a scientifically grounded
- * equivalent to rotating hue clockwise by 60 degrees. It also maintains constant appearance.
- */
-class SchemeContent(
-  sourceColorHct: Hct,
-  isDark: Boolean,
-  contrastLevel: Double,
-  specVersion: SpecVersion = DEFAULT_SPEC_VERSION,
-  platform: Platform = DEFAULT_PLATFORM,
-) :
-  DynamicScheme(
-    sourceColorHct,
-    Variant.CONTENT,
-    isDark,
-    contrastLevel,
-    platform,
-    specVersion,
-    ColorSpecs.get(specVersion)
-      .getPrimaryPalette(Variant.CONTENT, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getSecondaryPalette(Variant.CONTENT, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getTertiaryPalette(Variant.CONTENT, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralPalette(Variant.CONTENT, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralVariantPalette(Variant.CONTENT, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getErrorPalette(Variant.CONTENT, sourceColorHct, isDark, platform, contrastLevel),
-  )
diff --git a/kotlin/scheme/SchemeExpressive.kt b/kotlin/scheme/SchemeExpressive.kt
deleted file mode 100644
index e054705e..00000000
--- a/kotlin/scheme/SchemeExpressive.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package scheme
-
-import dynamiccolor.ColorSpec.SpecVersion
-import dynamiccolor.ColorSpecs
-import dynamiccolor.DynamicScheme
-import dynamiccolor.Variant
-import hct.Hct
-
-/** A playful theme - the source color's hue does not appear in the theme. */
-class SchemeExpressive(
-  sourceColorHct: Hct,
-  isDark: Boolean,
-  contrastLevel: Double,
-  specVersion: SpecVersion = DEFAULT_SPEC_VERSION,
-  platform: Platform = DEFAULT_PLATFORM,
-) :
-  DynamicScheme(
-    sourceColorHct,
-    Variant.EXPRESSIVE,
-    isDark,
-    contrastLevel,
-    platform,
-    specVersion,
-    ColorSpecs.get(specVersion)
-      .getPrimaryPalette(Variant.EXPRESSIVE, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getSecondaryPalette(Variant.EXPRESSIVE, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getTertiaryPalette(Variant.EXPRESSIVE, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralPalette(Variant.EXPRESSIVE, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralVariantPalette(
-        Variant.EXPRESSIVE,
-        sourceColorHct,
-        isDark,
-        platform,
-        contrastLevel,
-      ),
-    ColorSpecs.get(specVersion)
-      .getErrorPalette(Variant.EXPRESSIVE, sourceColorHct, isDark, platform, contrastLevel),
-  )
diff --git a/kotlin/scheme/SchemeFidelity.kt b/kotlin/scheme/SchemeFidelity.kt
deleted file mode 100644
index b0911bc3..00000000
--- a/kotlin/scheme/SchemeFidelity.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package scheme
-
-import dynamiccolor.ColorSpec.SpecVersion
-import dynamiccolor.ColorSpecs
-import dynamiccolor.DynamicScheme
-import dynamiccolor.Variant
-import hct.Hct
-
-/**
- * A scheme that places the source color in Scheme.primaryContainer.
- *
- * Primary Container is the source color, adjusted for color relativity. It maintains constant
- * appearance in light mode and dark mode. This adds ~5 tone in light mode, and subtracts ~5 tone in
- * dark mode.
- *
- * Tertiary Container is the complement to the source color, using TemperatureCache. It also
- * maintains constant appearance.
- */
-class SchemeFidelity(
-  sourceColorHct: Hct,
-  isDark: Boolean,
-  contrastLevel: Double,
-  specVersion: SpecVersion = DEFAULT_SPEC_VERSION,
-  platform: Platform = DEFAULT_PLATFORM,
-) :
-  DynamicScheme(
-    sourceColorHct,
-    Variant.FIDELITY,
-    isDark,
-    contrastLevel,
-    platform,
-    specVersion,
-    ColorSpecs.get(specVersion)
-      .getPrimaryPalette(Variant.FIDELITY, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getSecondaryPalette(Variant.FIDELITY, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getTertiaryPalette(Variant.FIDELITY, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralPalette(Variant.FIDELITY, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralVariantPalette(Variant.FIDELITY, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getErrorPalette(Variant.FIDELITY, sourceColorHct, isDark, platform, contrastLevel),
-  )
diff --git a/kotlin/scheme/SchemeFruitSalad.kt b/kotlin/scheme/SchemeFruitSalad.kt
deleted file mode 100644
index 42cf7d04..00000000
--- a/kotlin/scheme/SchemeFruitSalad.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package scheme
-
-import dynamiccolor.ColorSpec.SpecVersion
-import dynamiccolor.ColorSpecs
-import dynamiccolor.DynamicScheme
-import dynamiccolor.Variant
-import hct.Hct
-
-/** A playful theme - the source color's hue does not appear in the theme. */
-class SchemeFruitSalad(
-  sourceColorHct: Hct,
-  isDark: Boolean,
-  contrastLevel: Double,
-  specVersion: SpecVersion = DEFAULT_SPEC_VERSION,
-  platform: Platform = DEFAULT_PLATFORM,
-) :
-  DynamicScheme(
-    sourceColorHct,
-    Variant.FRUIT_SALAD,
-    isDark,
-    contrastLevel,
-    platform,
-    specVersion,
-    ColorSpecs.get(specVersion)
-      .getPrimaryPalette(Variant.FRUIT_SALAD, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getSecondaryPalette(Variant.FRUIT_SALAD, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getTertiaryPalette(Variant.FRUIT_SALAD, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralPalette(Variant.FRUIT_SALAD, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralVariantPalette(
-        Variant.FRUIT_SALAD,
-        sourceColorHct,
-        isDark,
-        platform,
-        contrastLevel,
-      ),
-    ColorSpecs.get(specVersion)
-      .getErrorPalette(Variant.FRUIT_SALAD, sourceColorHct, isDark, platform, contrastLevel),
-  )
diff --git a/kotlin/scheme/SchemeMonochrome.kt b/kotlin/scheme/SchemeMonochrome.kt
deleted file mode 100644
index 0c3436d7..00000000
--- a/kotlin/scheme/SchemeMonochrome.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package scheme
-
-import dynamiccolor.ColorSpec.SpecVersion
-import dynamiccolor.ColorSpecs
-import dynamiccolor.DynamicScheme
-import dynamiccolor.Variant
-import hct.Hct
-
-/** A monochrome theme, colors are purely black / white / gray. */
-class SchemeMonochrome(
-  sourceColorHct: Hct,
-  isDark: Boolean,
-  contrastLevel: Double,
-  specVersion: SpecVersion = DEFAULT_SPEC_VERSION,
-  platform: Platform = DEFAULT_PLATFORM,
-) :
-  DynamicScheme(
-    sourceColorHct,
-    Variant.MONOCHROME,
-    isDark,
-    contrastLevel,
-    platform,
-    specVersion,
-    ColorSpecs.get(specVersion)
-      .getPrimaryPalette(Variant.MONOCHROME, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getSecondaryPalette(Variant.MONOCHROME, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getTertiaryPalette(Variant.MONOCHROME, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralPalette(Variant.MONOCHROME, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralVariantPalette(
-        Variant.MONOCHROME,
-        sourceColorHct,
-        isDark,
-        platform,
-        contrastLevel,
-      ),
-    ColorSpecs.get(specVersion)
-      .getErrorPalette(Variant.MONOCHROME, sourceColorHct, isDark, platform, contrastLevel),
-  )
diff --git a/kotlin/scheme/SchemeNeutral.kt b/kotlin/scheme/SchemeNeutral.kt
deleted file mode 100644
index 8b7aa395..00000000
--- a/kotlin/scheme/SchemeNeutral.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package scheme
-
-import dynamiccolor.ColorSpec.SpecVersion
-import dynamiccolor.ColorSpecs
-import dynamiccolor.DynamicScheme
-import dynamiccolor.Variant
-import hct.Hct
-
-/** A theme that's slightly more chromatic than monochrome, which is purely black / white / gray. */
-class SchemeNeutral(
-  sourceColorHct: Hct,
-  isDark: Boolean,
-  contrastLevel: Double,
-  specVersion: SpecVersion = DEFAULT_SPEC_VERSION,
-  platform: Platform = DEFAULT_PLATFORM,
-) :
-  DynamicScheme(
-    sourceColorHct,
-    Variant.NEUTRAL,
-    isDark,
-    contrastLevel,
-    platform,
-    specVersion,
-    ColorSpecs.get(specVersion)
-      .getPrimaryPalette(Variant.NEUTRAL, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getSecondaryPalette(Variant.NEUTRAL, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getTertiaryPalette(Variant.NEUTRAL, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralPalette(Variant.NEUTRAL, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralVariantPalette(Variant.NEUTRAL, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getErrorPalette(Variant.NEUTRAL, sourceColorHct, isDark, platform, contrastLevel),
-  )
diff --git a/kotlin/scheme/SchemeRainbow.kt b/kotlin/scheme/SchemeRainbow.kt
deleted file mode 100644
index 842b6ecb..00000000
--- a/kotlin/scheme/SchemeRainbow.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package scheme
-
-import dynamiccolor.ColorSpec.SpecVersion
-import dynamiccolor.ColorSpecs
-import dynamiccolor.DynamicScheme
-import dynamiccolor.Variant
-import hct.Hct
-
-/** A playful theme - the source color's hue does not appear in the theme. */
-class SchemeRainbow(
-  sourceColorHct: Hct,
-  isDark: Boolean,
-  contrastLevel: Double,
-  specVersion: SpecVersion = DEFAULT_SPEC_VERSION,
-  platform: Platform = DEFAULT_PLATFORM,
-) :
-  DynamicScheme(
-    sourceColorHct,
-    Variant.RAINBOW,
-    isDark,
-    contrastLevel,
-    platform,
-    specVersion,
-    ColorSpecs.get(specVersion)
-      .getPrimaryPalette(Variant.RAINBOW, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getSecondaryPalette(Variant.RAINBOW, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getTertiaryPalette(Variant.RAINBOW, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralPalette(Variant.RAINBOW, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralVariantPalette(Variant.RAINBOW, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getErrorPalette(Variant.RAINBOW, sourceColorHct, isDark, platform, contrastLevel),
-  )
diff --git a/kotlin/scheme/SchemeTonalSpot.kt b/kotlin/scheme/SchemeTonalSpot.kt
deleted file mode 100644
index 9105e31c..00000000
--- a/kotlin/scheme/SchemeTonalSpot.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package scheme
-
-import dynamiccolor.ColorSpec.SpecVersion
-import dynamiccolor.ColorSpecs
-import dynamiccolor.DynamicScheme
-import dynamiccolor.Variant
-import hct.Hct
-
-/** A calm theme, sedated colors that aren't particularly chromatic. */
-class SchemeTonalSpot(
-  sourceColorHct: Hct,
-  isDark: Boolean,
-  contrastLevel: Double,
-  specVersion: SpecVersion = DEFAULT_SPEC_VERSION,
-  platform: Platform = DEFAULT_PLATFORM,
-) :
-  DynamicScheme(
-    sourceColorHct,
-    Variant.TONAL_SPOT,
-    isDark,
-    contrastLevel,
-    platform,
-    specVersion,
-    ColorSpecs.get(specVersion)
-      .getPrimaryPalette(Variant.TONAL_SPOT, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getSecondaryPalette(Variant.TONAL_SPOT, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getTertiaryPalette(Variant.TONAL_SPOT, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralPalette(Variant.TONAL_SPOT, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralVariantPalette(
-        Variant.TONAL_SPOT,
-        sourceColorHct,
-        isDark,
-        platform,
-        contrastLevel,
-      ),
-    ColorSpecs.get(specVersion)
-      .getErrorPalette(Variant.TONAL_SPOT, sourceColorHct, isDark, platform, contrastLevel),
-  )
diff --git a/kotlin/scheme/SchemeVibrant.kt b/kotlin/scheme/SchemeVibrant.kt
deleted file mode 100644
index b159c288..00000000
--- a/kotlin/scheme/SchemeVibrant.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package scheme
-
-import dynamiccolor.ColorSpec.SpecVersion
-import dynamiccolor.ColorSpecs
-import dynamiccolor.DynamicScheme
-import dynamiccolor.Variant
-import hct.Hct
-
-/** A loud theme, colorfulness is maximum for Primary palette, increased for others. */
-class SchemeVibrant(
-  sourceColorHct: Hct,
-  isDark: Boolean,
-  contrastLevel: Double,
-  specVersion: SpecVersion = DEFAULT_SPEC_VERSION,
-  platform: Platform = DEFAULT_PLATFORM,
-) :
-  DynamicScheme(
-    sourceColorHct,
-    Variant.VIBRANT,
-    isDark,
-    contrastLevel,
-    platform,
-    specVersion,
-    ColorSpecs.get(specVersion)
-      .getPrimaryPalette(Variant.VIBRANT, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getSecondaryPalette(Variant.VIBRANT, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getTertiaryPalette(Variant.VIBRANT, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralPalette(Variant.VIBRANT, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getNeutralVariantPalette(Variant.VIBRANT, sourceColorHct, isDark, platform, contrastLevel),
-    ColorSpecs.get(specVersion)
-      .getErrorPalette(Variant.VIBRANT, sourceColorHct, isDark, platform, contrastLevel),
-  )
diff --git a/kotlin/score/Score.kt b/kotlin/score/Score.kt
deleted file mode 100644
index c3918ca7..00000000
--- a/kotlin/score/Score.kt
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package score
-
-import hct.Hct
-import utils.MathUtils
-import java.util.ArrayList
-import java.util.Collections
-import kotlin.math.floor
-import kotlin.math.roundToInt
-
-/**
- * Given a large set of colors, remove colors that are unsuitable for a UI theme, and rank the rest
- * based on suitability.
- *
- * Enables use of a high cluster count for image quantization, thus ensuring colors aren't muddied,
- * while curating the high cluster count to a much smaller number of appropriate choices.
- */
-object Score {
-  private const val TARGET_CHROMA = 48.0 // A1 Chroma
-  private const val WEIGHT_PROPORTION = 0.7
-  private const val WEIGHT_CHROMA_ABOVE = 0.3
-  private const val WEIGHT_CHROMA_BELOW = 0.1
-  private const val CUTOFF_CHROMA = 5.0
-  private const val CUTOFF_EXCITED_PROPORTION = 0.01
-
-  @JvmStatic
-  fun score(colorsToPopulation: Map): List {
-    // Fallback color is Google Blue.
-    return score(colorsToPopulation, 4, 0xff4285f4.toInt(), true)
-  }
-
-  @JvmStatic
-  fun score(colorsToPopulation: Map, desired: Int): List {
-    return score(colorsToPopulation, desired, 0xff4285f4.toInt(), true)
-  }
-
-  @JvmStatic
-  fun score(colorsToPopulation: Map, desired: Int, fallbackColorArgb: Int): List {
-    return score(colorsToPopulation, desired, fallbackColorArgb, true)
-  }
-
-  /**
-   * Given a map with keys of colors and values of how often the color appears, rank the colors
-   * based on suitability for being used for a UI theme.
-   *
-   * @param colorsToPopulation map with keys of colors and values of how often the color appears,
-   *   usually from a source image.
-   * @param desired max count of colors to be returned in the list.
-   * @param fallbackColorArgb color to be returned if no other options available.
-   * @param filter whether to filter out undesireable combinations.
-   * @return Colors sorted by suitability for a UI theme. The most suitable color is the first item,
-   *   the least suitable is the last. There will always be at least one color returned. If all the
-   *   input colors were not suitable for a theme, a default fallback color will be provided, Google
-   *   Blue.
-   */
-  @JvmStatic
-  fun score(
-    colorsToPopulation: Map,
-    desired: Int,
-    fallbackColorArgb: Int,
-    filter: Boolean,
-  ): List {
-
-    // Get the HCT color for each Argb value, while finding the per hue count and
-    // total count.
-    val colorsHct: MutableList = ArrayList()
-    val huePopulation = IntArray(360)
-    var populationSum = 0.0
-    for ((key, value) in colorsToPopulation) {
-      val hct = Hct.fromInt(key)
-      colorsHct.add(hct)
-      val hue = floor(hct.hue).toInt()
-      huePopulation[hue] += value
-      populationSum += value.toDouble()
-    }
-
-    // Hues with more usage in neighboring 30 degree slice get a larger number.
-    val hueExcitedProportions = DoubleArray(360)
-    for (hue in 0..359) {
-      val proportion = huePopulation[hue] / populationSum
-      for (i in hue - 14 until hue + 16) {
-        val neighborHue = MathUtils.sanitizeDegreesInt(i)
-        hueExcitedProportions[neighborHue] += proportion
-      }
-    }
-
-    // Scores each HCT color based on usage and chroma, while optionally
-    // filtering out values that do not have enough chroma or usage.
-    val scoredHcts: MutableList = ArrayList()
-    for (hct in colorsHct) {
-      val hue = MathUtils.sanitizeDegreesInt(hct.hue.roundToInt())
-      val proportion = hueExcitedProportions[hue]
-      if (filter && (hct.chroma < CUTOFF_CHROMA || proportion <= CUTOFF_EXCITED_PROPORTION)) {
-        continue
-      }
-      val proportionScore = proportion * 100.0 * WEIGHT_PROPORTION
-      val chromaWeight =
-        if (hct.chroma < TARGET_CHROMA) WEIGHT_CHROMA_BELOW else WEIGHT_CHROMA_ABOVE
-      val chromaScore = (hct.chroma - TARGET_CHROMA) * chromaWeight
-      val score = proportionScore + chromaScore
-      scoredHcts.add(ScoredHCT(hct, score))
-    }
-    // Sorted so that colors with higher scores come first.
-    Collections.sort(scoredHcts, ScoredComparator())
-
-    // Iterates through potential hue differences in degrees in order to select
-    // the colors with the largest distribution of hues possible. Starting at
-    // 90 degrees(maximum difference for 4 colors) then decreasing down to a
-    // 15 degree minimum.
-    val chosenColors: MutableList = ArrayList()
-    for (differenceDegrees in 90 downTo 15) {
-      chosenColors.clear()
-      for (entry in scoredHcts) {
-        val hct = entry.hct
-        var hasDuplicateHue = false
-        for (chosenHct in chosenColors) {
-          if (MathUtils.differenceDegrees(hct.hue, chosenHct.hue) < differenceDegrees) {
-            hasDuplicateHue = true
-            break
-          }
-        }
-        if (!hasDuplicateHue) {
-          chosenColors.add(hct)
-        }
-        if (chosenColors.size >= desired) {
-          break
-        }
-      }
-      if (chosenColors.size >= desired) {
-        break
-      }
-    }
-    val colors: MutableList = ArrayList()
-    if (chosenColors.isEmpty()) {
-      colors.add(fallbackColorArgb)
-    }
-    for (chosenHct in chosenColors) {
-      colors.add(chosenHct.toInt())
-    }
-    return colors
-  }
-
-  private class ScoredHCT(val hct: Hct, val score: Double)
-
-  private class ScoredComparator() : Comparator {
-    override fun compare(entry1: ScoredHCT, entry2: ScoredHCT): Int {
-      return entry2.score.compareTo(entry1.score)
-    }
-  }
-}
diff --git a/kotlin/temperature/TemperatureCache.kt b/kotlin/temperature/TemperatureCache.kt
deleted file mode 100644
index b0f49fa6..00000000
--- a/kotlin/temperature/TemperatureCache.kt
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package temperature
-
-import hct.Hct
-import utils.ColorUtils
-import utils.MathUtils
-import java.util.ArrayList
-import java.util.Collections
-import java.util.HashMap
-import kotlin.math.abs
-import kotlin.math.atan2
-import kotlin.math.cos
-import kotlin.math.floor
-import kotlin.math.hypot
-import kotlin.math.pow
-import kotlin.math.roundToInt
-
-/**
- * Design utilities using color temperature theory.
- *
- * Analogous colors, complementary color, and cache to efficiently, lazily, generate data for
- * calculations when needed.
- */
-class TemperatureCache(val input: Hct) {
-  private var _precomputedComplement: Hct? = null
-  private var _precomputedHctsByTemp: List? = null
-  private var _precomputedHctsByHue: List? = null
-  private var _precomputedTempsByHct: Map? = null
-
-  /**
-   * A color that complements the input color aesthetically.
-   *
-   * In art, this is usually described as being across the color wheel. History of this shows intent
-   * as a color that is just as cool-warm as the input color is warm-cool.
-   */
-  val complement: Hct
-    get() {
-      if (_precomputedComplement != null) {
-        return _precomputedComplement!!
-      }
-      val coldestHue = coldest.hue
-      val coldestTemp = tempsByHct[coldest]!!
-      val warmestHue = warmest.hue
-      val warmestTemp = tempsByHct[warmest]!!
-      val range = warmestTemp - coldestTemp
-      val startHueIsColdestToWarmest = isBetween(input.hue, coldestHue, warmestHue)
-      val startHue = if (startHueIsColdestToWarmest) warmestHue else coldestHue
-      val endHue = if (startHueIsColdestToWarmest) coldestHue else warmestHue
-      val directionOfRotation = 1.0
-      var smallestError = 1000.0
-      var answer = hctsByHue[input.hue.roundToInt()]
-      val complementRelativeTemp = 1.0 - getRelativeTemperature(input)
-      // Find the color in the other section, closest to the inverse percentile
-      // of the input color. This is the complement.
-      var hueAddend = 0.0
-      while (hueAddend <= 360.0) {
-        val hue = MathUtils.sanitizeDegreesDouble(startHue + directionOfRotation * hueAddend)
-        if (!isBetween(hue, startHue, endHue)) {
-          hueAddend += 1.0
-          continue
-        }
-        val possibleAnswer = hctsByHue[hue.roundToInt()]
-        val relativeTemp = (tempsByHct[possibleAnswer]!! - coldestTemp) / range
-        val error = abs(complementRelativeTemp - relativeTemp)
-        if (error < smallestError) {
-          smallestError = error
-          answer = possibleAnswer
-        }
-        hueAddend += 1.0
-      }
-      _precomputedComplement = answer
-      return _precomputedComplement!!
-    }
-
-  /**
-   * 5 colors that pair well with the input color.
-   *
-   * The colors are equidistant in temperature and adjacent in hue.
-   */
-  fun getAnalogousColors(): List {
-    return getAnalogousColors(5, 12)
-  }
-
-  /**
-   * A set of colors with differing hues, equidistant in temperature.
-   *
-   * In art, this is usually described as a set of 5 colors on a color wheel divided into 12
-   * sections. This method allows provision of either of those values.
-   *
-   * Behavior is undefined when count or divisions is 0. When divisions < count, colors repeat.
-   *
-   * @param count The number of colors to return, includes the input color.
-   * @param divisions The number of divisions on the color wheel.
-   */
-  fun getAnalogousColors(count: Int, divisions: Int): List {
-    // The starting hue is the hue of the input color.
-    val startHue = input.hue.roundToInt()
-    val startHct = hctsByHue[startHue]
-    var lastTemp = getRelativeTemperature(startHct)
-    val allColors: MutableList = ArrayList()
-    allColors.add(startHct)
-    var absoluteTotalTempDelta = 0f
-    for (i in 0..359) {
-      val hue = MathUtils.sanitizeDegreesInt(startHue + i)
-      val hct = hctsByHue[hue]
-      val temp = getRelativeTemperature(hct)
-      val tempDelta = abs(temp - lastTemp)
-      lastTemp = temp
-      absoluteTotalTempDelta += tempDelta.toFloat()
-    }
-    var hueAddend = 1
-    val tempStep = absoluteTotalTempDelta / divisions.toDouble()
-    var totalTempDelta = 0.0
-    lastTemp = getRelativeTemperature(startHct)
-    while (allColors.size < divisions) {
-      val hue = MathUtils.sanitizeDegreesInt(startHue + hueAddend)
-      val hct = hctsByHue[hue]
-      val temp = getRelativeTemperature(hct)
-      val tempDelta = abs(temp - lastTemp)
-      totalTempDelta += tempDelta
-      var desiredTotalTempDeltaForIndex = allColors.size * tempStep
-      var indexSatisfied = totalTempDelta >= desiredTotalTempDeltaForIndex
-      var indexAddend = 1
-      // Keep adding this hue to the answers until its temperature is
-      // insufficient. This ensures consistent behavior when there aren't
-      // `divisions` discrete steps between 0 and 360 in hue with `tempStep`
-      // delta in temperature between them.
-      //
-      // For example, white and black have no analogues: there are no other
-      // colors at T100/T0. Therefore, they should just be added to the array
-      // as answers.
-      while (indexSatisfied && allColors.size < divisions) {
-        allColors.add(hct)
-        desiredTotalTempDeltaForIndex = (allColors.size + indexAddend) * tempStep
-        indexSatisfied = totalTempDelta >= desiredTotalTempDeltaForIndex
-        indexAddend++
-      }
-      lastTemp = temp
-      hueAddend++
-      if (hueAddend > 360) {
-        while (allColors.size < divisions) {
-          allColors.add(hct)
-        }
-        break
-      }
-    }
-    val answers: MutableList = ArrayList()
-    answers.add(input)
-    val ccwCount = floor(((count - 1.0) / 2.0)).toInt()
-    for (i in 1 until ccwCount + 1) {
-      var index = 0 - i
-      while (index < 0) {
-        index = allColors.size + index
-      }
-      if (index >= allColors.size) {
-        index %= allColors.size
-      }
-      answers.add(0, allColors[index])
-    }
-    val cwCount = count - ccwCount - 1
-    for (i in 1 until cwCount + 1) {
-      var index = i
-      while (index < 0) {
-        index = allColors.size + index
-      }
-      if (index >= allColors.size) {
-        index %= allColors.size
-      }
-      answers.add(allColors[index])
-    }
-    return answers
-  }
-
-  /**
-   * Temperature relative to all colors with the same chroma and tone.
-   *
-   * @param hct HCT to find the relative temperature of.
-   * @return Value on a scale from 0 to 1.
-   */
-  fun getRelativeTemperature(hct: Hct): Double {
-    val range = tempsByHct[warmest]!! - tempsByHct[coldest]!!
-    val differenceFromColdest = tempsByHct[hct]!! - tempsByHct[coldest]!!
-    // Handle when there's no difference in temperature between warmest and
-    // coldest: for example, at T100, only one color is available, white.
-    return if (range == 0.0) {
-      0.5
-    } else {
-      differenceFromColdest / range
-    }
-  }
-
-  /** Coldest color with same chroma and tone as input. */
-  private val coldest: Hct
-    get() = hctsByTemp[0]
-
-  /**
-   * HCTs for all colors with the same chroma/tone as the input.
-   *
-   * Sorted by hue, ex. index 0 is hue 0.
-   */
-  private val hctsByHue: List
-    get() {
-      if (_precomputedHctsByHue != null) {
-        return _precomputedHctsByHue!!
-      }
-      val hcts: MutableList = ArrayList()
-      var hue = 0.0
-      while (hue <= 360.0) {
-        val colorAtHue = Hct.from(hue, input.chroma, input.tone)
-        hcts.add(colorAtHue)
-        hue += 1.0
-      }
-      val unmodifiableList = Collections.unmodifiableList(hcts)
-      _precomputedHctsByHue = unmodifiableList
-      return unmodifiableList
-    }
-
-  /**
-   * HCTs for all colors with the same chroma/tone as the input.
-   *
-   * Sorted from coldest first to warmest last.
-   */
-  private val hctsByTemp: List
-    get() {
-      if (_precomputedHctsByTemp != null) {
-        return _precomputedHctsByTemp!!
-      }
-      val hcts: MutableList = ArrayList(hctsByHue)
-      hcts.add(input)
-      hcts.sortWith(compareBy { tempsByHct[it]!! })
-      _precomputedHctsByTemp = hcts
-      return hcts
-    }
-
-  /** Keys of HCTs in getHctsByTemp, values of raw temperature. */
-  private val tempsByHct: Map
-    get() {
-      if (_precomputedTempsByHct != null) {
-        return _precomputedTempsByHct!!
-      }
-      val allHcts: MutableList = ArrayList(hctsByHue)
-      allHcts.add(input)
-      val temperaturesByHct: MutableMap = HashMap()
-      for (hct in allHcts) {
-        temperaturesByHct[hct] = rawTemperature(hct)
-      }
-      _precomputedTempsByHct = temperaturesByHct
-      return temperaturesByHct
-    }
-
-  /** Warmest color with same chroma and tone as input. */
-  private val warmest: Hct
-    get() = hctsByTemp[hctsByTemp.size - 1]
-
-  companion object {
-    /**
-     * Value representing cool-warm factor of a color. Values below 0 are considered cool, above,
-     * warm.
-     *
-     * Color science has researched emotion and harmony, which art uses to select colors. Warm-cool
-     * is the foundation of analogous and complementary colors. See:
-     * - Li-Chen Ou's Chapter 19 in Handbook of Color Psychology (2015).
-     * - Josef Albers' Interaction of Color chapters 19 and 21.
-     *
-     * Implementation of Ou, Woodcock and Wright's algorithm, which uses Lab/LCH color space. Return
-     * value has these properties:
-     * - Values below 0 are cool, above 0 are warm.
-     * - Lower bound: -9.66. Chroma is infinite. Assuming max of Lab chroma 130.
-     * - Upper bound: 8.61. Chroma is infinite. Assuming max of Lab chroma 130.
-     */
-    fun rawTemperature(color: Hct): Double {
-      val lab = ColorUtils.labFromArgb(color.toInt())
-      val hue = MathUtils.sanitizeDegreesDouble(Math.toDegrees(atan2(lab[2], lab[1])))
-      val chroma = hypot(lab[1], lab[2])
-      return -0.5 +
-        0.02 * chroma.pow(1.07) * cos(Math.toRadians(MathUtils.sanitizeDegreesDouble(hue - 50.0)))
-    }
-
-    /** Determines if an angle is between two other angles, rotating clockwise. */
-    private fun isBetween(angle: Double, a: Double, b: Double): Boolean {
-      return if (a < b) {
-        a <= angle && angle <= b
-      } else {
-        a <= angle || angle <= b
-      }
-    }
-  }
-}
diff --git a/kotlin/utils/ColorUtils.kt b/kotlin/utils/ColorUtils.kt
deleted file mode 100644
index 33e417e5..00000000
--- a/kotlin/utils/ColorUtils.kt
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// This file is automatically generated. Do not modify it.
-package utils
-
-import kotlin.math.pow
-import kotlin.math.roundToInt
-
-/**
- * Color science utilities.
- *
- * Utility methods for color science constants and color space conversions that aren't HCT or CAM16.
- */
-object ColorUtils {
-  private val SRGB_TO_XYZ =
-    arrayOf(
-      doubleArrayOf(0.41233895, 0.35762064, 0.18051042),
-      doubleArrayOf(0.2126, 0.7152, 0.0722),
-      doubleArrayOf(0.01932141, 0.11916382, 0.95034478),
-    )
-  private val XYZ_TO_SRGB =
-    arrayOf(
-      doubleArrayOf(3.2413774792388685, -1.5376652402851851, -0.49885366846268053),
-      doubleArrayOf(-0.9691452513005321, 1.8758853451067872, 0.04156585616912061),
-      doubleArrayOf(0.05562093689691305, -0.20395524564742123, 1.0571799111220335),
-    )
-  private val WHITE_POINT_D65 = doubleArrayOf(95.047, 100.0, 108.883)
-
-  /** Converts a color from RGB components to ARGB format. */
-  fun argbFromRgb(red: Int, green: Int, blue: Int): Int {
-    return 255 shl 24 or (red and 255 shl 16) or (green and 255 shl 8) or (blue and 255)
-  }
-
-  /** Converts a color from linear RGB components to ARGB format. */
-  fun argbFromLinrgb(linrgb: DoubleArray): Int {
-    val r = delinearized(linrgb[0])
-    val g = delinearized(linrgb[1])
-    val b = delinearized(linrgb[2])
-    return argbFromRgb(r, g, b)
-  }
-
-  /** Returns the alpha component of a color in ARGB format. */
-  fun alphaFromArgb(argb: Int): Int {
-    return argb shr 24 and 255
-  }
-
-  /** Returns the red component of a color in ARGB format. */
-  fun redFromArgb(argb: Int): Int {
-    return argb shr 16 and 255
-  }
-
-  /** Returns the green component of a color in ARGB format. */
-  fun greenFromArgb(argb: Int): Int {
-    return argb shr 8 and 255
-  }
-
-  /** Returns the blue component of a color in ARGB format. */
-  fun blueFromArgb(argb: Int): Int {
-    return argb and 255
-  }
-
-  /** Returns whether a color in ARGB format is opaque. */
-  fun isOpaque(argb: Int): Boolean {
-    return alphaFromArgb(argb) >= 255
-  }
-
-  /** Converts a color from ARGB to XYZ. */
-  fun argbFromXyz(x: Double, y: Double, z: Double): Int {
-    val matrix = XYZ_TO_SRGB
-    val linearR = matrix[0][0] * x + matrix[0][1] * y + matrix[0][2] * z
-    val linearG = matrix[1][0] * x + matrix[1][1] * y + matrix[1][2] * z
-    val linearB = matrix[2][0] * x + matrix[2][1] * y + matrix[2][2] * z
-    val r = delinearized(linearR)
-    val g = delinearized(linearG)
-    val b = delinearized(linearB)
-    return argbFromRgb(r, g, b)
-  }
-
-  /** Converts a color from XYZ to ARGB. */
-  fun xyzFromArgb(argb: Int): DoubleArray {
-    val r = linearized(redFromArgb(argb))
-    val g = linearized(greenFromArgb(argb))
-    val b = linearized(blueFromArgb(argb))
-    return MathUtils.matrixMultiply(doubleArrayOf(r, g, b), SRGB_TO_XYZ)
-  }
-
-  /** Converts a color represented in Lab color space into an ARGB integer. */
-  fun argbFromLab(l: Double, a: Double, b: Double): Int {
-    val whitePoint = WHITE_POINT_D65
-    val fy = (l + 16.0) / 116.0
-    val fx = a / 500.0 + fy
-    val fz = fy - b / 200.0
-    val xNormalized = labInvf(fx)
-    val yNormalized = labInvf(fy)
-    val zNormalized = labInvf(fz)
-    val x = xNormalized * whitePoint[0]
-    val y = yNormalized * whitePoint[1]
-    val z = zNormalized * whitePoint[2]
-    return argbFromXyz(x, y, z)
-  }
-
-  /**
-   * Converts a color from ARGB representation to L*a*b* representation.
-   *
-   * @param argb the ARGB representation of a color
-   * @return a Lab object representing the color
-   */
-  fun labFromArgb(argb: Int): DoubleArray {
-    val linearR = linearized(redFromArgb(argb))
-    val linearG = linearized(greenFromArgb(argb))
-    val linearB = linearized(blueFromArgb(argb))
-    val matrix = SRGB_TO_XYZ
-    val x = matrix[0][0] * linearR + matrix[0][1] * linearG + matrix[0][2] * linearB
-    val y = matrix[1][0] * linearR + matrix[1][1] * linearG + matrix[1][2] * linearB
-    val z = matrix[2][0] * linearR + matrix[2][1] * linearG + matrix[2][2] * linearB
-    val whitePoint = WHITE_POINT_D65
-    val xNormalized = x / whitePoint[0]
-    val yNormalized = y / whitePoint[1]
-    val zNormalized = z / whitePoint[2]
-    val fx = labF(xNormalized)
-    val fy = labF(yNormalized)
-    val fz = labF(zNormalized)
-    val l = 116.0 * fy - 16
-    val a = 500.0 * (fx - fy)
-    val b = 200.0 * (fy - fz)
-    return doubleArrayOf(l, a, b)
-  }
-
-  /**
-   * Converts an L* value to an ARGB representation.
-   *
-   * @param lstar L* in L*a*b*
-   * @return ARGB representation of grayscale color with lightness matching L*
-   */
-  fun argbFromLstar(lstar: Double): Int {
-    val y = yFromLstar(lstar)
-    val component = delinearized(y)
-    return argbFromRgb(component, component, component)
-  }
-
-  /**
-   * Computes the L* value of a color in ARGB representation.
-   *
-   * @param argb ARGB representation of a color
-   * @return L*, from L*a*b*, coordinate of the color
-   */
-  fun lstarFromArgb(argb: Int): Double {
-    val y = xyzFromArgb(argb)[1]
-    return 116.0 * labF(y / 100.0) - 16.0
-  }
-
-  /**
-   * Converts an L* value to a Y value.
-   *
-   * L* in L*a*b* and Y in XYZ measure the same quantity, luminance.
-   *
-   * L* measures perceptual luminance, a linear scale. Y in XYZ measures relative luminance, a
-   * logarithmic scale.
-   *
-   * @param lstar L* in L*a*b*
-   * @return Y in XYZ
-   */
-  fun yFromLstar(lstar: Double): Double {
-    return 100.0 * labInvf((lstar + 16.0) / 116.0)
-  }
-
-  /**
-   * Converts a Y value to an L* value.
-   *
-   * L* in L*a*b* and Y in XYZ measure the same quantity, luminance.
-   *
-   * L* measures perceptual luminance, a linear scale. Y in XYZ measures relative luminance, a
-   * logarithmic scale.
-   *
-   * @param y Y in XYZ
-   * @return L* in L*a*b*
-   */
-  fun lstarFromY(y: Double): Double {
-    return labF(y / 100.0) * 116.0 - 16.0
-  }
-
-  /**
-   * Linearizes an RGB component.
-   *
-   * @param rgbComponent 0 <= rgb_component <= 255, represents R/G/B channel
-   * @return 0.0 <= output <= 100.0, color channel converted to linear RGB space
-   */
-  fun linearized(rgbComponent: Int): Double {
-    val normalized = rgbComponent / 255.0
-    return if (normalized <= 0.040449936) {
-      normalized / 12.92 * 100.0
-    } else {
-      ((normalized + 0.055) / 1.055).pow(2.4) * 100.0
-    }
-  }
-
-  /**
-   * Delinearizes an RGB component.
-   *
-   * @param rgbComponent 0.0 <= rgb_component <= 100.0, represents linear R/G/B channel
-   * @return 0 <= output <= 255, color channel converted to regular RGB space
-   */
-  fun delinearized(rgbComponent: Double): Int {
-    val normalized = rgbComponent / 100.0
-    val delinearized: Double =
-      if (normalized <= 0.0031308) {
-        normalized * 12.92
-      } else {
-        1.055 * normalized.pow(1.0 / 2.4) - 0.055
-      }
-    return MathUtils.clampInt(0, 255, (delinearized * 255.0).roundToInt())
-  }
-
-  /**
-   * Returns the standard white point; white on a sunny day.
-   *
-   * @return The white point
-   */
-  fun whitePointD65(): DoubleArray {
-    return WHITE_POINT_D65
-  }
-
-  fun labF(t: Double): Double {
-    val e = 216.0 / 24389.0
-    val kappa = 24389.0 / 27.0
-    return if (t > e) {
-      t.pow(1.0 / 3.0)
-    } else {
-      (kappa * t + 16) / 116
-    }
-  }
-
-  fun labInvf(ft: Double): Double {
-    val e = 216.0 / 24389.0
-    val kappa = 24389.0 / 27.0
-    val ft3 = ft * ft * ft
-    return if (ft3 > e) {
-      ft3
-    } else {
-      (116 * ft - 16) / kappa
-    }
-  }
-}
diff --git a/kotlin/utils/MathUtils.kt b/kotlin/utils/MathUtils.kt
deleted file mode 100644
index 4be99c9d..00000000
--- a/kotlin/utils/MathUtils.kt
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// This file is automatically generated. Do not modify it.
-package utils
-
-import kotlin.math.abs
-
-/** Utility methods for mathematical operations. */
-object MathUtils {
-  /**
-   * The signum function.
-   *
-   * @return 1 if num > 0, -1 if num < 0, and 0 if num = 0
-   */
-  fun signum(num: Double): Int {
-    return if (num < 0) {
-      -1
-    } else if (num == 0.0) {
-      0
-    } else {
-      1
-    }
-  }
-
-  /**
-   * The linear interpolation function.
-   *
-   * @return start if amount = 0 and stop if amount = 1
-   */
-  fun lerp(start: Double, stop: Double, amount: Double): Double {
-    return (1.0 - amount) * start + amount * stop
-  }
-
-  /**
-   * Clamps an integer between two integers.
-   *
-   * @return input when min <= input <= max, and either min or max otherwise.
-   */
-  fun clampInt(min: Int, max: Int, input: Int): Int {
-    if (input < min) {
-      return min
-    } else if (input > max) {
-      return max
-    }
-    return input
-  }
-
-  /**
-   * Clamps an integer between two floating-point numbers.
-   *
-   * @return input when min <= input <= max, and either min or max otherwise.
-   */
-  fun clampDouble(min: Double, max: Double, input: Double): Double {
-    if (input < min) {
-      return min
-    } else if (input > max) {
-      return max
-    }
-    return input
-  }
-
-  /**
-   * Sanitizes a degree measure as an integer.
-   *
-   * @return a degree measure between 0 (inclusive) and 360 (exclusive).
-   */
-  fun sanitizeDegreesInt(degrees: Int): Int {
-    var degrees = degrees % 360
-    if (degrees < 0) {
-      degrees += 360
-    }
-    return degrees
-  }
-
-  /**
-   * Sanitizes a degree measure as a floating-point number.
-   *
-   * @return a degree measure between 0.0 (inclusive) and 360.0 (exclusive).
-   */
-  fun sanitizeDegreesDouble(degrees: Double): Double {
-    var degrees = degrees % 360.0
-    if (degrees < 0) {
-      degrees += 360.0
-    }
-    return degrees
-  }
-
-  /**
-   * Sign of direction change needed to travel from one angle to another.
-   *
-   * For angles that are 180 degrees apart from each other, both directions have the same travel
-   * distance, so either direction is shortest. The value 1.0 is returned in this case.
-   *
-   * @param from The angle travel starts from, in degrees.
-   * @param to The angle travel ends at, in degrees.
-   * @return -1 if decreasing from leads to the shortest travel distance, 1 if increasing from leads
-   *   to the shortest travel distance.
-   */
-  fun rotationDirection(from: Double, to: Double): Double {
-    val increasingDifference = sanitizeDegreesDouble(to - from)
-    return if (increasingDifference <= 180.0) 1.0 else -1.0
-  }
-
-  /** Distance of two points on a circle, represented using degrees. */
-  fun differenceDegrees(a: Double, b: Double): Double {
-    return 180.0 - abs(abs(a - b) - 180.0)
-  }
-
-  /** Multiplies a 1x3 row vector with a 3x3 matrix. */
-  fun matrixMultiply(row: DoubleArray, matrix: Array): DoubleArray {
-    val a = row[0] * matrix[0][0] + row[1] * matrix[0][1] + row[2] * matrix[0][2]
-    val b = row[0] * matrix[1][0] + row[1] * matrix[1][1] + row[2] * matrix[1][2]
-    val c = row[0] * matrix[2][0] + row[1] * matrix[2][1] + row[2] * matrix[2][2]
-    return doubleArrayOf(a, b, c)
-  }
-}
diff --git a/kotlin/utils/StringUtils.kt b/kotlin/utils/StringUtils.kt
deleted file mode 100644
index 7e2156d1..00000000
--- a/kotlin/utils/StringUtils.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package utils
-
-/** Utility methods for string representations of colors. */
-internal object StringUtils {
-  /**
-   * Hex string representing color, ex. #ff0000 for red.
-   *
-   * @param argb ARGB representation of a color.
-   */
-  fun hexFromArgb(argb: Int): String {
-    val red = ColorUtils.redFromArgb(argb)
-    val blue = ColorUtils.blueFromArgb(argb)
-    val green = ColorUtils.greenFromArgb(argb)
-    return String.format("#%02x%02x%02x", red, green, blue)
-  }
-}
diff --git a/libs/libmaterial-colors.a b/libs/libmaterial-colors.a
new file mode 100644
index 00000000..db8317d6
Binary files /dev/null and b/libs/libmaterial-colors.a differ
diff --git a/libs/libmaterial_color_utilities_lib.a b/libs/libmaterial_color_utilities_lib.a
new file mode 100644
index 00000000..12dbe652
Binary files /dev/null and b/libs/libmaterial_color_utilities_lib.a differ
diff --git a/pull_request_template.md b/pull_request_template.md
deleted file mode 100644
index e0e19223..00000000
--- a/pull_request_template.md
+++ /dev/null
@@ -1,2 +0,0 @@
-This repo is not *currently* accepting external contributions, but feature
-requests and bug reports are very welcome!
diff --git a/swift/Guides/Hct.md b/swift/Guides/Hct.md
deleted file mode 100644
index 8beb1823..00000000
--- a/swift/Guides/Hct.md
+++ /dev/null
@@ -1,120 +0,0 @@
-# Hct
-
-HCT, hue, chroma, and tone. A color system that provides a perceptually accurate color measurement system that can also accurately render what colors will appear as in different lighting environments.
-
-```swift
-let hct = Hct.from(hue, chroma, tone)
-let hct = Hct.fromInt(0x00000000)
-```
-
-### Hue
-
-> 0 <= [value] < 360
-
-A number, in degrees, representing ex. red, orange, yellow, etc. Ranges from 0 <= [hue] < 360
-
-```swift
-Hct(...).hue
-```
-
-Invalid values are corrected. After setting hue, the color is mapped from HCT to the more limited sRGB gamut for display. This will change its ARGB/integer representation. If the HCT color is outside of the sRGB gamut, chroma will decrease until it is inside the gamut.
-
-### Chroma
-
-> 0 <= [value] <= ?
-
-```swift
-Hct(...).chroma
-```
-
-After setting chroma, the color is mapped from HCT to the more limited sRGB gamut for display. This will change its ARGB/integer representation. If the HCT color is outside of the sRGB gamut, chroma will decrease until it is inside the gamut.
-
-### Tone
-
-> 0 <= [value] <= 100
-
-Lightness. Ranges from 0 to 100.
-
-```swift
-Hct(...).tone
-```
-
-Invalid values are corrected. After setting tone, the color is mapped from HCT to the more limited sRGB gamut for display. This will change its ARGB/integer representation. If the HCT color is outside of the sRGB gamut, chroma will decrease until it is inside the gamut.
-
-### ARGB
-
-Argb representation of Hct
-
-```swift
-Hct(...).toInt()
-```
-
-### In Viewing Conditions
-
-Translate a color into different [ViewingConditions](#viewing-conditions).
-
-Colors change appearance. They look different with lights on versus off, the same color, as in hex code, on white looks different when on black. This is called color relativity, most famously explicated by Josef Albers in Interaction of Color.
-
-In color science, color appearance models can account for this and calculate the appearance of a color in different settings. HCT is based on CAM16, a color appearance model, and uses it to make these calculations.
-
-See [ViewingConditions.make](#make) for parameters affecting color appearance.
-
-```swift
-let vc = ViewingConditions.sRgb()
-let newHct = Hct(...).inViewingConditions(vc)
-```
-
-## Viewing Conditions
-
-In traditional color spaces, a color can be identified solely by the observer's measurement of the color. Color appearance models such as CAM16 also use information about the environment where the color was observed, known as the viewing conditions.
-
-For example, white under the traditional assumption of a midday sun white point is accurately measured as a slightly chromatic blue by CAM16. (roughly, hue 203, chroma 3, lightness 100)
-
-This class caches intermediate values of the CAM16 conversion process that depend only on viewing conditions, enabling speed ups.
-
-### Static
-
-There are two static viewing conditions that can be referenced (standard and sRgb):
-
-```swift
-let standard = ViewingConditions.standard()
-let sRgb = ViewingConditions.sRgb()
-```
-
-### Make
-
-There is also a convenience constructor for `ViewingConditions`.
-
-Parameters affecting color appearance include:
-
-| Parameter | Description | Default |
-| ---- | ---- | --- |
-| whitePoint | Coordinates of white in XYZ color space | nil |
-| adaptingLuminance | Light strength, in lux | -1 |
-| backgroundLstar | Average luminance of 10 degrees around color | 50 |
-| surround | Brightness of the entire environment | 2 |
-| discountingIlluminant | Whether eyes have adjusted to lighting | false |
-
-```swift
-let vc = ViewingConditions.make(...)
-```
-
-## Cam 16
-
-CAM16, a color appearance model. Colors are not just defined by their hex code, but rather, a hex code and viewing conditions.
-
-CAM16 instances also have coordinates in the CAM16-UCS space, called J*, a*, b*, or jstar, astar, bstar in code. CAM16-UCS is included in the CAM16 specification, and should be used when measuring distances between colors.
-
-In traditional color spaces, a color can be identified solely by the observer's measurement of the color. Color appearance models such as CAM16 also use information about the environment where the color was observed, known as the viewing conditions.
-
-For example, white under the traditional assumption of a midday sun white point is accurately measured as a slightly chromatic blue by (roughly, hue 203, chroma 3, lightness 100) CAM16, a color appearance model. Colors are not just defined by their hex code, but rather, a hex code and viewing conditions.
-
-CAM16 instances also have coordinates in the CAM16-UCS space, called J*, a*, b*, or jstar, astar, bstar in code. CAM16-UCS is included in the CAM16 specification, and should be used when measuring distances between colors.
-
-In traditional color spaces, a color can be identified solely by the observer's measurement of the color. Color appearance models such as CAM16 also use information about the environment where the color was observed, known as the viewing conditions.
-
-For example, white under the traditional assumption of a midday sun white point is accurately measured as a slightly chromatic blue by (roughly, hue 203, chroma 3, lightness 100)
-
-```swift
-let cam16 = Cam16.fromInt(0x00000000)
-```
diff --git a/swift/LICENSE b/swift/LICENSE
deleted file mode 100644
index 3879bcb2..00000000
--- a/swift/LICENSE
+++ /dev/null
@@ -1,191 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Copyright 2021 Google LLC
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/swift/Package.swift b/swift/Package.swift
deleted file mode 100644
index 079ed93f..00000000
--- a/swift/Package.swift
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// swift-tools-version: 5.8
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-  name: "MaterialColorUtilities",
-  products: [
-    .library(
-      name: "MaterialColorUtilities",
-      targets: ["MaterialColorUtilities"]
-    )
-  ],
-  targets: [
-    .target(name: "MaterialColorUtilities"),
-    .testTarget(
-      name: "MaterialColorUtilitiesTests",
-      dependencies: ["MaterialColorUtilities"]
-    ),
-  ]
-)
diff --git a/swift/README.md b/swift/README.md
deleted file mode 100644
index e55c38a2..00000000
--- a/swift/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Material Color Utilities
-
-Swift port of [Material Color Utilities](https://github.com/material-foundation/material-color-utilities).
diff --git a/swift/Sources/MaterialColorUtilities/Blend/Blend.swift b/swift/Sources/MaterialColorUtilities/Blend/Blend.swift
deleted file mode 100644
index 88fd10d8..00000000
--- a/swift/Sources/MaterialColorUtilities/Blend/Blend.swift
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/// Functions for blending in HCT and CAM16.
-public class Blend {
-  /// Blend the design color's HCT hue towards the key color's HCT
-  /// hue, in a way that leaves the original color recognizable and
-  /// recognizably shifted towards the key color.
-  ///
-  /// [designColor] ARGB representation of an arbitrary color.
-  /// [sourceColor] ARGB representation of the main theme color.
-  /// Returns The design color with a hue shifted towards the
-  /// system's color, a slightly warmer/cooler variant of the design
-  /// color's hue.
-  public static func harmonize(_ designColor: Int, _ sourceColor: Int) -> Int {
-    let fromHct = Hct.fromInt(designColor)
-    let toHct = Hct.fromInt(sourceColor)
-    let differenceDegrees = MathUtils.differenceDegrees(fromHct.hue, toHct.hue)
-    let rotationDegrees = min(differenceDegrees * 0.5, 15.0)
-    let outputHue = MathUtils.sanitizeDegreesDouble(
-      fromHct.hue + rotationDegrees * MathUtils.rotationDirection(fromHct.hue, toHct.hue))
-    return Hct.from(outputHue, fromHct.chroma, fromHct.tone).toInt()
-  }
-
-  /// Blends hue from one color into another. The chroma and tone of
-  /// the original color are maintained.
-  ///
-  /// [from] ARGB representation of color
-  /// [to] ARGB representation of color
-  /// [amount] how much blending to perform; 0.0 >= and <= 1.0
-  /// Returns from, with a hue blended towards to. Chroma and tone
-  /// are constant.
-  public static func hctHue(_ from: Int, _ to: Int, _ amount: Double) -> Int {
-    let ucs = cam16Ucs(from, to, amount)
-    let ucsCam = Cam16.fromInt(ucs)
-    let fromCam = Cam16.fromInt(from)
-    let blended = Hct.from(ucsCam.hue, fromCam.chroma, ColorUtils.lstarFromArgb(from))
-    return blended.toInt()
-  }
-
-  /// Blend in CAM16-UCS space.
-  ///
-  /// [from] ARGB representation of color
-  /// [to] ARGB representation of color
-  /// [amount] how much blending to perform; 0.0 >= and <= 1.0
-  /// Returns from, blended towards to. Hue, chroma, and tone will
-  /// change.
-  public static func cam16Ucs(_ from: Int, _ to: Int, _ amount: Double) -> Int {
-    let fromCam = Cam16.fromInt(from)
-    let toCam = Cam16.fromInt(to)
-    let fromJ = fromCam.jstar
-    let fromA = fromCam.astar
-    let fromB = fromCam.bstar
-    let toJ = toCam.jstar
-    let toA = toCam.astar
-    let toB = toCam.bstar
-    let jstar = fromJ + (toJ - fromJ) * amount
-    let astar = fromA + (toA - fromA) * amount
-    let bstar = fromB + (toB - fromB) * amount
-    return Cam16.fromUcs(jstar, astar, bstar).toInt()
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Contrast/Contrast.swift b/swift/Sources/MaterialColorUtilities/Contrast/Contrast.swift
deleted file mode 100644
index f7d04120..00000000
--- a/swift/Sources/MaterialColorUtilities/Contrast/Contrast.swift
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/// Utility methods for calculating contrast given two colors, or calculating a
-/// color given one color and a contrast ratio.
-///
-/// Contrast ratio is calculated using XYZ's Y. When linearized to match human
-/// perception, Y becomes HCT's tone and L*a*b*'s' L*. Informally, this is the
-/// lightness of a color.
-///
-/// Methods refer to tone, T in the the HCT color space.
-/// Tone is equivalent to L* in the L*a*b* color space, or L in the LCH color
-/// space.
-public class Contrast {
-  /// Returns a contrast ratio, which ranges from 1 to 21.
-  /// [toneA] Tone between 0 and 100. Values outside will be clamped.
-  /// [toneB] Tone between 0 and 100. Values outside will be clamped.
-  public static func ratioOfTones(_ toneA: Double, _ toneB: Double) -> Double {
-    let toneA = MathUtils.clampDouble(0, 100, toneA)
-    let toneB = MathUtils.clampDouble(0, 100, toneB)
-    return ratioOfYs(ColorUtils.yFromLstar(toneA), ColorUtils.yFromLstar(toneB))
-  }
-
-  static private func ratioOfYs(_ y1: Double, _ y2: Double) -> Double {
-    let lighter = y1 > y2 ? y1 : y2
-    let darker = lighter == y2 ? y1 : y2
-    return (lighter + 5.0) / (darker + 5.0)
-  }
-
-  /// Returns a tone >= [tone] that ensures [ratio].
-  /// Return value is between 0 and 100.
-  /// Returns -1 if [ratio] cannot be achieved with [tone].
-  ///
-  /// [tone] Tone return value must contrast with.
-  /// Range is 0 to 100. Invalid values will result in -1 being returned.
-  /// [ratio] Contrast ratio of return value and [tone].
-  /// Range is 1 to 21, invalid values have undefined behavior.
-  public static func lighter(tone: Double, ratio: Double) -> Double {
-    if tone < 0 || tone > 100 {
-      return -1
-    }
-
-    let darkY = ColorUtils.yFromLstar(tone)
-    let lightY = ratio * (darkY + 5.0) - 5.0
-    let realContrast = ratioOfYs(lightY, darkY)
-    let delta = abs(realContrast - ratio)
-    if realContrast < ratio && delta > 0.04 {
-      return -1
-    }
-
-    // Ensure gamut mapping, which requires a 'range' on tone, will still result
-    // the correct ratio by darkening slightly.
-    let returnValue = ColorUtils.lstarFromY(lightY) + 0.4
-    if returnValue < 0 || returnValue > 100 {
-      return -1
-    }
-    return returnValue
-  }
-
-  /// Returns a tone <= [tone] that ensures [ratio].
-  /// Return value is between 0 and 100.
-  /// Returns -1 if [ratio] cannot be achieved with [tone].
-  ///
-  /// [tone] Tone return value must contrast with.
-  /// Range is 0 to 100. Invalid values will result in -1 being returned.
-  /// [ratio] Contrast ratio of return value and [tone].
-  /// Range is 1 to 21, invalid values have undefined behavior.
-  public static func darker(tone: Double, ratio: Double) -> Double {
-    if tone < 0 || tone > 100 {
-      return -1
-    }
-
-    let lightY = ColorUtils.yFromLstar(tone)
-    let darkY = ((lightY + 5.0) / ratio) - 5.0
-    let realContrast = ratioOfYs(lightY, darkY)
-
-    let delta = abs(realContrast - ratio)
-    if realContrast < ratio && delta > 0.04 {
-      return -1
-    }
-
-    // Ensure gamut mapping, which requires a 'range' on tone, will still result
-    // the correct ratio by darkening slightly.
-    let returnValue = ColorUtils.lstarFromY(darkY) - 0.4
-    if returnValue < 0 || returnValue > 100 {
-      return -1
-    }
-    return returnValue
-  }
-
-  /// Returns a tone >= [tone] that ensures [ratio].
-  /// Return value is between 0 and 100.
-  /// Returns 100 if [ratio] cannot be achieved with [tone].
-  ///
-  /// This method is unsafe because the returned value is guaranteed to be in
-  /// bounds for tone, i.e. between 0 and 100. However, that value may not reach
-  /// the [ratio] with [tone]. For example, there is no color lighter than T100.
-  ///
-  /// [tone] Tone return value must contrast with.
-  /// Range is 0 to 100. Invalid values will result in 100 being returned.
-  /// [ratio] Desired contrast ratio of return value and tone parameter.
-  /// Range is 1 to 21, invalid values have undefined behavior.
-  public static func lighterUnsafe(tone: Double, ratio: Double) -> Double {
-    let lighterSafe = lighter(tone: tone, ratio: ratio)
-    return lighterSafe < 0 ? 100 : lighterSafe
-  }
-
-  /// Returns a tone <= [tone] that ensures [ratio].
-  /// Return value is between 0 and 100.
-  /// Returns 0 if [ratio] cannot be achieved with [tone].
-  ///
-  /// This method is unsafe because the returned value is guaranteed to be in
-  /// bounds for tone, i.e. between 0 and 100. However, that value may not reach
-  /// the [ratio] with [tone]. For example, there is no color darker than T0.
-  ///
-  /// [tone] Tone return value must contrast with.
-  /// Range is 0 to 100. Invalid values will result in 0 being returned.
-  /// [ratio] Desired contrast ratio of return value and tone parameter.
-  /// Range is 1 to 21, invalid values have undefined behavior.
-  public static func darkerUnsafe(tone: Double, ratio: Double) -> Double {
-    let darkerSafe = darker(tone: tone, ratio: ratio)
-    return darkerSafe < 0 ? 0 : darkerSafe
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Dislike/DislikeAnalyzer.swift b/swift/Sources/MaterialColorUtilities/Dislike/DislikeAnalyzer.swift
deleted file mode 100644
index c54f8175..00000000
--- a/swift/Sources/MaterialColorUtilities/Dislike/DislikeAnalyzer.swift
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-/// Check and/or fix universally disliked colors.
-///
-/// Color science studies of color preference indicate universal distaste for
-/// dark yellow-greens, and also show this is correlated to distate for
-/// biological waste and rotting food.
-///
-/// See Palmer and Schloss, 2010 or Schloss and Palmer's Chapter 21 in Handbook
-/// of Color Psychology (2015).
-public class DislikeAnalyzer {
-  /// Returns true if [hct] is disliked.
-  ///
-  /// Disliked is defined as a dark yellow-green that is not neutral.
-  public static func isDisliked(_ hct: Hct) -> Bool {
-    let huePasses = round(hct.hue) >= 90 && round(hct.hue) <= 111
-    let chromaPasses = round(hct.chroma) > 16
-    let tonePasses = round(hct.tone) < 65
-
-    return huePasses && chromaPasses && tonePasses
-  }
-
-  /// If [hct] is disliked, lighten it to make it likable.
-  public static func fixIfDisliked(_ hct: Hct) -> Hct {
-    if isDisliked(hct) {
-      return Hct.from(hct.hue, hct.chroma, 70)
-    }
-
-    return hct
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/DynamicColor/ContrastCurve.swift b/swift/Sources/MaterialColorUtilities/DynamicColor/ContrastCurve.swift
deleted file mode 100644
index 954a3897..00000000
--- a/swift/Sources/MaterialColorUtilities/DynamicColor/ContrastCurve.swift
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/// A class containing a value that changes with the contrast level.
-///
-/// Usually represents the contrast requirements for a dynamic color on its
-/// background. The four values correspond to values for contrast levels
-/// -1.0, 0.0, 0.5, and 1.0, respectively.
-public struct ContrastCurve {
-  let low: Double
-  let normal: Double
-  let medium: Double
-  let high: Double
-
-  /// - Parameters:
-  ///   - low: Value for contrast level -1.0
-  ///   - normal: Value for contrast level 0.0
-  ///   - medium: Value for contrast level 0.5
-  ///   - high: Value for contrast level 1.0
-  public init(_ low: Double, _ normal: Double, _ medium: Double, _ high: Double) {
-    self.low = low
-    self.normal = normal
-    self.medium = medium
-    self.high = high
-  }
-
-  /// Returns the value at a given contrast level.
-  ///
-  /// - Parameter contrastLevel: The contrast level. 0.0 is the default (normal);
-  ///   -1.0 is the lowest; 1.0 is the highest.
-  ///
-  /// - Returns: The value. For contrast ratios, a number between 1.0 and 21.0.
-  public func get(_ contrastLevel: Double) -> Double {
-    if contrastLevel <= -1.0 {
-      return self.low
-    } else if contrastLevel < 0.0 {
-      return MathUtils.lerp(self.low, self.normal, (contrastLevel - (-1)) / 1)
-    } else if contrastLevel < 0.5 {
-      return MathUtils.lerp(self.normal, self.medium, (contrastLevel - 0) / 0.5)
-    } else if contrastLevel < 1.0 {
-      return MathUtils.lerp(self.medium, self.high, (contrastLevel - 0.5) / 0.5)
-    } else {
-      return self.high
-    }
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/DynamicColor/DynamicColor.swift b/swift/Sources/MaterialColorUtilities/DynamicColor/DynamicColor.swift
deleted file mode 100644
index 7518cebe..00000000
--- a/swift/Sources/MaterialColorUtilities/DynamicColor/DynamicColor.swift
+++ /dev/null
@@ -1,380 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-public typealias DynamicSchemeValue = (DynamicScheme) -> T
-
-/// A color that adjusts itself based on UI state provided by `DynamicScheme`.
-///
-/// This color automatically adjusts to accommodate a desired contrast level, or
-/// other adjustments such as differing in light mode versus dark mode, or what
-/// the theme is, or what the color that produced the theme is, etc.
-///
-/// Colors without backgrounds do not change tone when contrast changes. Colors
-/// with backgrounds become closer to their background as contrast lowers, and
-/// further when contrast increases.
-///
-/// Prefer the static constructors. They provide a much more simple interface,
-/// such as requiring just a hexcode, or just a hexcode and a background.
-///
-/// Ultimately, each component necessary for calculating a color, adjusting it
-/// for a desired contrast level, and ensuring it has a certain lightness/tone
-/// difference from another color, is provided by a function that takes a
-/// `DynamicScheme` and returns a value. This ensures ultimate flexibility, any
-/// desired behavior of a color for any design system, but it usually
-/// unnecessary. See the default constructor for more information.
-public class DynamicColor {
-  public let name: String
-  let palette: DynamicSchemeValue
-  let tone: DynamicSchemeValue
-  let isBackground: Bool
-  let background: DynamicSchemeValue?
-  let secondBackground: DynamicSchemeValue?
-  let contrastCurve: ContrastCurve?
-  let toneDeltaPair: DynamicSchemeValue?
-
-  private var _hctCache: [DynamicScheme: Hct] = [:]
-
-  /// The base constructor for DynamicColor.
-  ///
-  /// _Strongly_ prefer using one of the convenience constructors. This class is
-  /// arguably too flexible to ensure it can support any scenario. Functional
-  /// arguments allow  overriding without risks that come with subclasses.
-  ///
-  /// For example, the default behavior of adjust tone at max contrast
-  /// to be at a 7.0 ratio with its background is principled and
-  /// matches accessibility guidance. That does not mean it's the desired
-  /// approach for _every_ design system, and every color pairing,
-  /// always, in every case.
-  ///
-  /// - Parameters:
-  ///   - name: The name of the dynamic color.
-  ///   - palette: Function that provides a TonalPalette given DynamicScheme.
-  ///       A TonalPalette is defined by a hue and chroma, so this
-  ///       replaces the need to specify hue/chroma. By providing a tonal palette,
-  ///       when contrast adjustments are made, intended chroma can be preserved.
-  ///   - tone: Function that provides a tone, given a DynamicScheme.
-  ///   - isBackground: Whether this dynamic color is a background, with
-  ///       some other color as the foreground.
-  ///   - background: The background of the dynamic color (as a function of a
-  ///       `DynamicScheme`), if it exists.
-  ///   - secondBackground: A second background of the dynamic color (as a function
-  ///       of a `DynamicScheme`), if it exists.
-  ///   - contrastCurve: A `ContrastCurve` object specifying how its contrast
-  ///       against its background should behave in various contrast levels options.
-  ///   - toneDeltaPair: A `ToneDeltaPair` object specifying a tone delta
-  ///       constraint between two colors. One of them must be the color being constructed.
-  ///
-  /// Unlikely to be useful unless a design system has some distortions
-  /// where colors that don't have a background/foreground relationship
-  /// don't want to have a formal relationship or a principled value for their
-  /// tone distance based on common contrast / tone delta values, yet, want
-  /// tone distance.
-  public init(
-    name: String,
-    palette: @escaping DynamicSchemeValue,
-    tone: @escaping DynamicSchemeValue,
-    isBackground: Bool = false,
-    background: DynamicSchemeValue? = nil,
-    secondBackground: DynamicSchemeValue? = nil,
-    contrastCurve: ContrastCurve? = nil,
-    toneDeltaPair: DynamicSchemeValue? = nil
-  ) {
-    self.name = name
-    self.palette = palette
-    self.tone = tone
-    self.isBackground = isBackground
-    self.background = background
-    self.secondBackground = secondBackground
-    self.contrastCurve = contrastCurve
-    self.toneDeltaPair = toneDeltaPair
-  }
-
-  /// Return a ARGB integer (i.e. a hex code).
-  ///
-  /// - Parameter scheme: Defines the conditions of the user interface, for example,
-  ///   whether or not it is dark mode or light mode, and what the desired contrast level is.
-  /// - Returns: The color as an integer (ARGB).
-  public func getArgb(_ scheme: DynamicScheme) -> Int {
-    return getHct(scheme).toInt()
-  }
-
-  /// - Parameter scheme: Defines the conditions of the user interface, for example,
-  ///   whether or not it is dark mode or light mode, and what the desired
-  ///   contrast level is.
-  /// - Returns: a color, expressed in the HCT color space, that this
-  ///   `DynamicColor` is under the conditions in `scheme`.
-  public func getHct(_ scheme: DynamicScheme) -> Hct {
-    if let cachedAnswer = _hctCache[scheme] {
-      return cachedAnswer
-    }
-    let answer = palette(scheme).getHct(getTone(scheme))
-    if _hctCache.count > 4 {
-      _hctCache.removeAll()
-    }
-    _hctCache[scheme] = answer
-    return answer
-  }
-
-  /// - Parameter scheme: Defines the conditions of the user interface, for example,
-  ///   whether or not it is dark mode or light mode, and what the desired
-  ///   contrast level is.
-  /// - Returns: a tone, T in the HCT color space, that this `DynamicColor` is under
-  ///   the conditions in `scheme`.
-  public func getTone(_ scheme: DynamicScheme) -> Double {
-    let decreasingContrast = scheme.contrastLevel < 0
-
-    // Case 1: dual foreground, pair of colors with delta constraint.
-    if let toneDeltaPair {
-      let pair = toneDeltaPair(scheme)
-      let roleA = pair.subject
-      let roleB = pair.basis
-      let delta = pair.delta
-      let polarity = pair.polarity
-      let stayTogether = pair.stayTogether
-
-      let bg = background!(scheme)
-      let bgTone = bg.getTone(scheme)
-
-      let aIsNearer =
-        (polarity == TonePolarity.nearer || (polarity == TonePolarity.lighter && !scheme.isDark)
-          || (polarity == TonePolarity.darker && scheme.isDark))
-      let nearer = aIsNearer ? roleA : roleB
-      let farther = aIsNearer ? roleB : roleA
-      let amNearer = self.name == nearer.name
-      let expansionDir: Double = scheme.isDark ? 1 : -1
-
-      // 1st round: solve to min, each
-      let nContrast = nearer.contrastCurve!.get(scheme.contrastLevel)
-      let fContrast =
-        farther.contrastCurve!.get(scheme.contrastLevel)
-
-      // If a color is good enough, it is not adjusted.
-      // Initial and adjusted tones for `nearer`
-      let nInitialTone = nearer.tone(scheme)
-      var nTone =
-        Contrast.ratioOfTones(bgTone, nInitialTone) >= nContrast
-        ? nInitialTone
-        : DynamicColor.foregroundTone(bgTone, nContrast)
-      // Initial and adjusted tones for `farther`
-      let fInitialTone = farther.tone(scheme)
-      var fTone =
-        Contrast.ratioOfTones(bgTone, fInitialTone) >= fContrast
-        ? fInitialTone
-        : DynamicColor.foregroundTone(bgTone, fContrast)
-
-      if decreasingContrast {
-        // If decreasing contrast, adjust color to the "bare minimum"
-        // that satisfies contrast.
-        nTone = DynamicColor.foregroundTone(bgTone, nContrast)
-        fTone = DynamicColor.foregroundTone(bgTone, fContrast)
-      }
-
-      if (fTone - nTone) * expansionDir >= delta {
-        // Good! Tones satisfy the constraint; no change needed.
-      } else {
-        // 2nd round: expand farther to match delta.
-        fTone = MathUtils.clampDouble(0, 100, nTone + delta * expansionDir)
-        if (fTone - nTone) * expansionDir >= delta {
-          // Good! Tones now satisfy the constraint; no change needed.
-        } else {
-          // 3rd round: contract nearer to match delta.
-          nTone = MathUtils.clampDouble(0, 100, fTone - delta * expansionDir)
-        }
-      }
-
-      // Avoids the 50-59 awkward zone.
-      if 50 <= nTone && nTone < 60 {
-        // If `nearer` is in the awkward zone, move it away, together with
-        // `farther`.
-        if expansionDir > 0 {
-          nTone = 60
-          fTone = max(fTone, nTone + delta * expansionDir)
-        } else {
-          nTone = 49
-          fTone = min(fTone, nTone + delta * expansionDir)
-        }
-      } else if 50 <= fTone && fTone < 60 {
-        if stayTogether {
-          // Fixes both, to avoid two colors on opposite sides of the "awkward
-          // zone".
-          if expansionDir > 0 {
-            nTone = 60
-            fTone = max(fTone, nTone + delta * expansionDir)
-          } else {
-            nTone = 49
-            fTone = min(fTone, nTone + delta * expansionDir)
-          }
-        } else {
-          // Not required to stay together; fixes just one.
-          if expansionDir > 0 {
-            fTone = 60
-          } else {
-            fTone = 49
-          }
-        }
-      }
-
-      // Returns `nTone` if this color is `nearer`, otherwise `fTone`.
-      return amNearer ? nTone : fTone
-    } else {
-      // Case 2: No contrast pair; just solve for itself.
-      var answer = self.tone(scheme)
-
-      if let background {
-        let bgTone = background(scheme).getTone(scheme)
-
-        let desiredRatio =
-          self.contrastCurve!.get(scheme.contrastLevel)
-
-        if Contrast.ratioOfTones(bgTone, answer) >= desiredRatio {
-          // Don't "improve" what's good enough.
-        } else {
-          // Rough improvement.
-          answer = DynamicColor.foregroundTone(bgTone, desiredRatio)
-        }
-
-        if decreasingContrast {
-          answer = DynamicColor.foregroundTone(bgTone, desiredRatio)
-        }
-
-        if self.isBackground && 50 <= answer && answer < 60 {
-          // Must adjust
-          if Contrast.ratioOfTones(49, bgTone) >= desiredRatio {
-            answer = 49
-          } else {
-            answer = 60
-          }
-        }
-
-        if let secondBackground {
-          // Case 3: Adjust for dual backgrounds.
-
-          let bgTone1 = self.background!(scheme).getTone(scheme)
-          let bgTone2 = secondBackground(scheme).getTone(scheme)
-
-          let upper = max(bgTone1, bgTone2)
-          let lower = min(bgTone1, bgTone2)
-
-          if Contrast.ratioOfTones(upper, answer) >= desiredRatio
-            && Contrast.ratioOfTones(lower, answer) >= desiredRatio
-          {
-            return answer
-          }
-
-          // The darkest light tone that satisfies the desired ratio,
-          // or -1 if such ratio cannot be reached.
-          let lightOption = Contrast.lighter(tone: upper, ratio: desiredRatio)
-
-          // The lightest dark tone that satisfies the desired ratio,
-          // or -1 if such ratio cannot be reached.
-          let darkOption = Contrast.darker(tone: lower, ratio: desiredRatio)
-
-          // Tones suitable for the foreground.
-          var availables: [Double] = []
-          if lightOption != -1 { availables.append(lightOption) }
-          if darkOption != -1 { availables.append(darkOption) }
-
-          let prefersLight =
-            DynamicColor.tonePrefersLightForeground(bgTone1)
-            || DynamicColor.tonePrefersLightForeground(bgTone2)
-          if prefersLight {
-            return (lightOption < 0) ? 100 : lightOption
-          }
-          if availables.count == 1 {
-            return availables[0]
-          }
-          return (darkOption < 0) ? 0 : darkOption
-        }
-      }
-
-      return answer
-    }
-  }
-
-  /// Given a background tone, find a foreground tone, while ensuring they reach
-  /// a contrast ratio that is as close to `ratio` as possible.
-  ///
-  /// - Parameters:
-  ///   - bgTone: Tone in HCT. Range is 0 to 100, undefined behavior when it falls
-  ///     outside that range.
-  ///   - ratio: The contrast ratio desired between `bgTone` and the return value.
-  ///
-  /// - Returns: The desired foreground tone.
-  public static func foregroundTone(_ bgTone: Double, _ ratio: Double) -> Double {
-    let lighterTone = Contrast.lighterUnsafe(tone: bgTone, ratio: ratio)
-    let darkerTone = Contrast.darkerUnsafe(tone: bgTone, ratio: ratio)
-    let lighterRatio = Contrast.ratioOfTones(lighterTone, bgTone)
-    let darkerRatio = Contrast.ratioOfTones(darkerTone, bgTone)
-    let preferLigher = tonePrefersLightForeground(bgTone)
-
-    if preferLigher {
-      // This handles an edge case where the initial contrast ratio is high
-      // (ex. 13.0), and the ratio passed to the function is that high ratio,
-      // and both the lighter and darker ratio fails to pass that ratio.
-      //
-      // This was observed with Tonal Spot's On Primary Container turning black
-      // momentarily between high and max contrast in light mode.
-      // PC's standard tone was T90, OPC's was T10, it was light mode, and the
-      // contrast value was 0.6568521221032331.
-      let negligibleDifference =
-        (abs(lighterRatio - darkerRatio) < 0.1 && lighterRatio < ratio && darkerRatio < ratio)
-      return lighterRatio >= ratio || lighterRatio >= darkerRatio || negligibleDifference
-        ? lighterTone
-        : darkerTone
-    } else {
-      return darkerRatio >= ratio || darkerRatio >= lighterRatio
-        ? darkerTone
-        : lighterTone
-    }
-  }
-
-  /// Adjusts a tone such that white has 4.5 contrast, if the tone is
-  /// reasonably close to supporting it.
-  /// - Parameter tone: The tone to be adjusted.
-  /// - Returns: The (possibly updated) tone.
-  public static func enableLightForeground(_ tone: Double) -> Double {
-    if tonePrefersLightForeground(tone) && !toneAllowsLightForeground(tone) {
-      return 49
-    }
-    return tone
-  }
-
-  /// Returns whether `tone` prefers a light foreground.
-  ///
-  /// People prefer white foregrounds on ~T60-70. Observed over time, and also
-  /// by Andrew Somers during research for APCA.
-  ///
-  /// T60 used as to create the smallest discontinuity possible when skipping
-  /// down to T49 in order to ensure light foregrounds.
-  ///
-  /// Since `tertiaryContainer` in dark monochrome scheme requires a tone of
-  /// 60, it should not be adjusted. Therefore, 60 is excluded here.
-  ///
-  /// - Parameter tone: The tone to be judged.
-  /// - Returns: whether `tone` prefers a light foreground.
-  public static func tonePrefersLightForeground(_ tone: Double) -> Bool {
-    return round(tone) < 60
-  }
-
-  /// Returns whether `tone` can reach a contrast ratio of 4.5 with a lighter
-  /// color.
-  ///
-  /// - Parameter tone: The tone to be judged.
-  /// - Returns: whether `tone` allows a light foreground.
-  public static func toneAllowsLightForeground(_ tone: Double) -> Bool {
-    return round(tone) <= 49
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/DynamicColor/DynamicScheme.swift b/swift/Sources/MaterialColorUtilities/DynamicColor/DynamicScheme.swift
deleted file mode 100644
index 3d916ceb..00000000
--- a/swift/Sources/MaterialColorUtilities/DynamicColor/DynamicScheme.swift
+++ /dev/null
@@ -1,298 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/// Constructed by a set of values representing the current UI state (such as
-/// whether or not its dark theme, what the theme style is, etc.), and
-/// provides a set of [TonalPalette]s that can create colors that fit in
-/// with the theme style. Used by [DynamicColor] to resolve into a color.
-public class DynamicScheme: Equatable, Hashable {
-  /// The source color of the theme as an ARGB integer.
-  public let sourceColorArgb: Int
-
-  /// The source color of the theme in HCT.
-  public let sourceColorHct: Hct
-
-  /// The variant, or style, of the theme.
-  public let variant: Variant
-
-  /// Whether or not the scheme is in 'dark mode' or 'light mode'.
-  public let isDark: Bool
-
-  /// Value from -1 to 1. -1 represents minimum contrast, 0 represents
-  /// standard (i.e. the design as spec'd), and 1 represents maximum contrast.
-  public let contrastLevel: Double
-
-  /// Given a tone, produces a color. Hue and chroma of the color are specified
-  /// in the design specification of the variant. Usually colorful.
-  public let primaryPalette: TonalPalette
-
-  /// Given a tone, produces a color. Hue and chroma of the color are specified
-  /// in the design specification of the variant. Usually less colorful.
-  public let secondaryPalette: TonalPalette
-
-  /// Given a tone, produces a color. Hue and chroma of the color are specified
-  /// in the design specification of the variant. Usually a different hue from
-  /// primary and colorful.
-  public let tertiaryPalette: TonalPalette
-
-  /// Given a tone, produces a color. Hue and chroma of the color are specified
-  /// in the design specification of the variant. Usually not colorful at all,
-  /// intended for background & surface colors.
-  public let neutralPalette: TonalPalette
-
-  /// Given a tone, produces a color. Hue and chroma of the color are specified
-  /// in the design specification of the variant. Usually not colorful, but
-  /// slightly more colorful than Neutral. Intended for backgrounds & surfaces.
-  public let neutralVariantPalette: TonalPalette
-
-  /// Given a tone, produces a reddish, colorful, color.
-  public let errorPalette: TonalPalette
-
-  public init(
-    sourceColorHct: Hct, variant: Variant, isDark: Bool,
-    contrastLevel: Double = 0, primaryPalette: TonalPalette, secondaryPalette: TonalPalette,
-    tertiaryPalette: TonalPalette, neutralPalette: TonalPalette,
-    neutralVariantPalette: TonalPalette, errorPalette: TonalPalette? = nil
-  ) {
-    self.sourceColorArgb = sourceColorHct.toInt()
-    self.sourceColorHct = sourceColorHct
-    self.variant = variant
-    self.isDark = isDark
-    self.contrastLevel = contrastLevel
-    self.primaryPalette = primaryPalette
-    self.secondaryPalette = secondaryPalette
-    self.tertiaryPalette = tertiaryPalette
-    self.neutralPalette = neutralPalette
-    self.neutralVariantPalette = neutralVariantPalette
-    self.errorPalette = errorPalette ?? TonalPalette.of(25.0, 84.0)
-  }
-
-  public static func getRotatedHue(_ sourceColor: Hct, _ hues: [Double], _ rotations: [Double])
-    -> Double
-  {
-    let sourceHue = sourceColor.hue
-    assert(hues.count == rotations.count)
-    if rotations.count == 1 {
-      return MathUtils.sanitizeDegreesDouble(sourceColor.hue + rotations[0])
-    }
-    let size = hues.count
-    var i = 0
-    while i <= (size - 2) {
-      let thisHue = hues[i]
-      let nextHue = hues[i + 1]
-      if thisHue < sourceHue && sourceHue < nextHue {
-        return MathUtils.sanitizeDegreesDouble(sourceHue + rotations[i])
-      }
-      i += 1
-    }
-    // If this statement executes, something is wrong, there should have been a rotation
-    // found using the arrays.
-    return sourceHue
-  }
-
-  func isEqual(to other: DynamicScheme) -> Bool {
-    return sourceColorArgb == other.sourceColorArgb
-      && sourceColorHct == other.sourceColorHct
-      && variant == other.variant
-      && isDark == other.isDark
-      && contrastLevel == other.contrastLevel
-      && primaryPalette == other.primaryPalette
-      && secondaryPalette == other.secondaryPalette
-      && tertiaryPalette == other.tertiaryPalette
-      && neutralPalette == other.neutralPalette
-      && neutralVariantPalette == other.neutralVariantPalette
-      && errorPalette == other.errorPalette
-  }
-
-  public static func == (lhs: DynamicScheme, rhs: DynamicScheme) -> Bool {
-    return type(of: lhs) == type(of: rhs) && lhs.isEqual(to: rhs)
-  }
-
-  public func hash(into hasher: inout Hasher) {
-    hasher.combine(sourceColorArgb)
-    hasher.combine(sourceColorHct)
-    hasher.combine(variant)
-    hasher.combine(isDark)
-    hasher.combine(contrastLevel)
-    hasher.combine(primaryPalette)
-    hasher.combine(secondaryPalette)
-    hasher.combine(tertiaryPalette)
-    hasher.combine(neutralPalette)
-    hasher.combine(neutralVariantPalette)
-    hasher.combine(errorPalette)
-  }
-
-  public var primaryPaletteKeyColor: Int {
-    MaterialDynamicColors.primaryPaletteKeyColor.getArgb(self)
-  }
-  public var secondaryPaletteKeyColor: Int {
-    MaterialDynamicColors.secondaryPaletteKeyColor.getArgb(self)
-  }
-  public var tertiaryPaletteKeyColor: Int {
-    MaterialDynamicColors.tertiaryPaletteKeyColor.getArgb(self)
-  }
-  public var neutralPaletteKeyColor: Int {
-    MaterialDynamicColors.neutralPaletteKeyColor.getArgb(self)
-  }
-  public var neutralVariantPaletteKeyColor: Int {
-    MaterialDynamicColors.neutralVariantPaletteKeyColor.getArgb(self)
-  }
-  public var background: Int {
-    MaterialDynamicColors.background.getArgb(self)
-  }
-  public var onBackground: Int {
-    MaterialDynamicColors.onBackground.getArgb(self)
-  }
-  public var surface: Int {
-    MaterialDynamicColors.surface.getArgb(self)
-  }
-  public var surfaceDim: Int {
-    MaterialDynamicColors.surfaceDim.getArgb(self)
-  }
-  public var surfaceBright: Int {
-    MaterialDynamicColors.surfaceBright.getArgb(self)
-  }
-  public var surfaceContainerLowest: Int {
-    MaterialDynamicColors.surfaceContainerLowest.getArgb(self)
-  }
-  public var surfaceContainerLow: Int {
-    MaterialDynamicColors.surfaceContainerLow.getArgb(self)
-  }
-  public var surfaceContainer: Int {
-    MaterialDynamicColors.surfaceContainer.getArgb(self)
-  }
-  public var surfaceContainerHigh: Int {
-    MaterialDynamicColors.surfaceContainerHigh.getArgb(self)
-  }
-  public var surfaceContainerHighest: Int {
-    MaterialDynamicColors.surfaceContainerHighest.getArgb(self)
-  }
-  public var onSurface: Int {
-    MaterialDynamicColors.onSurface.getArgb(self)
-  }
-  public var surfaceVariant: Int {
-    MaterialDynamicColors.surfaceVariant.getArgb(self)
-  }
-  public var onSurfaceVariant: Int {
-    MaterialDynamicColors.onSurfaceVariant.getArgb(self)
-  }
-  public var inverseSurface: Int {
-    MaterialDynamicColors.inverseSurface.getArgb(self)
-  }
-  public var inverseOnSurface: Int {
-    MaterialDynamicColors.inverseOnSurface.getArgb(self)
-  }
-  public var outline: Int {
-    MaterialDynamicColors.outline.getArgb(self)
-  }
-  public var outlineVariant: Int {
-    MaterialDynamicColors.outlineVariant.getArgb(self)
-  }
-  public var shadow: Int {
-    MaterialDynamicColors.shadow.getArgb(self)
-  }
-  public var scrim: Int {
-    MaterialDynamicColors.scrim.getArgb(self)
-  }
-  public var surfaceTint: Int {
-    MaterialDynamicColors.surfaceTint.getArgb(self)
-  }
-  public var primary: Int {
-    MaterialDynamicColors.primary.getArgb(self)
-  }
-  public var onPrimary: Int {
-    MaterialDynamicColors.onPrimary.getArgb(self)
-  }
-  public var primaryContainer: Int {
-    MaterialDynamicColors.primaryContainer.getArgb(self)
-  }
-  public var onPrimaryContainer: Int {
-    MaterialDynamicColors.onPrimaryContainer.getArgb(self)
-  }
-  public var inversePrimary: Int {
-    MaterialDynamicColors.inversePrimary.getArgb(self)
-  }
-  public var secondary: Int {
-    MaterialDynamicColors.secondary.getArgb(self)
-  }
-  public var onSecondary: Int {
-    MaterialDynamicColors.onSecondary.getArgb(self)
-  }
-  public var secondaryContainer: Int {
-    MaterialDynamicColors.secondaryContainer.getArgb(self)
-  }
-  public var onSecondaryContainer: Int {
-    MaterialDynamicColors.onSecondaryContainer.getArgb(self)
-  }
-  public var tertiary: Int {
-    MaterialDynamicColors.tertiary.getArgb(self)
-  }
-  public var onTertiary: Int {
-    MaterialDynamicColors.onTertiary.getArgb(self)
-  }
-  public var tertiaryContainer: Int {
-    MaterialDynamicColors.tertiaryContainer.getArgb(self)
-  }
-  public var onTertiaryContainer: Int {
-    MaterialDynamicColors.onTertiaryContainer.getArgb(self)
-  }
-  public var error: Int {
-    MaterialDynamicColors.error.getArgb(self)
-  }
-  public var onError: Int {
-    MaterialDynamicColors.onError.getArgb(self)
-  }
-  public var errorContainer: Int {
-    MaterialDynamicColors.errorContainer.getArgb(self)
-  }
-  public var onErrorContainer: Int {
-    MaterialDynamicColors.onErrorContainer.getArgb(self)
-  }
-  public var primaryFixed: Int {
-    MaterialDynamicColors.primaryFixed.getArgb(self)
-  }
-  public var primaryFixedDim: Int {
-    MaterialDynamicColors.primaryFixedDim.getArgb(self)
-  }
-  public var onPrimaryFixed: Int {
-    MaterialDynamicColors.onPrimaryFixed.getArgb(self)
-  }
-  public var onPrimaryFixedVariant: Int {
-    MaterialDynamicColors.onPrimaryFixedVariant.getArgb(self)
-  }
-  public var secondaryFixed: Int {
-    MaterialDynamicColors.secondaryFixed.getArgb(self)
-  }
-  public var secondaryFixedDim: Int {
-    MaterialDynamicColors.secondaryFixedDim.getArgb(self)
-  }
-  public var onSecondaryFixed: Int {
-    MaterialDynamicColors.onSecondaryFixed.getArgb(self)
-  }
-  public var onSecondaryFixedVariant: Int {
-    MaterialDynamicColors.onSecondaryFixedVariant.getArgb(self)
-  }
-  public var tertiaryFixed: Int {
-    MaterialDynamicColors.tertiaryFixed.getArgb(self)
-  }
-  public var tertiaryFixedDim: Int {
-    MaterialDynamicColors.tertiaryFixedDim.getArgb(self)
-  }
-  public var onTertiaryFixed: Int {
-    MaterialDynamicColors.onTertiaryFixed.getArgb(self)
-  }
-  public var onTertiaryFixedVariant: Int {
-    MaterialDynamicColors.onTertiaryFixedVariant.getArgb(self)
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/DynamicColor/DynamicSchemeProvider.swift b/swift/Sources/MaterialColorUtilities/DynamicColor/DynamicSchemeProvider.swift
deleted file mode 100644
index 7a56045f..00000000
--- a/swift/Sources/MaterialColorUtilities/DynamicColor/DynamicSchemeProvider.swift
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/// Provides [DynamicScheme] for a given source color.
-protocol DynamicSchemeProvider {
-  init(sourceColorHct: Hct)
-
-  /// Returns a [DynamicScheme] for the given parameters.
-  func scheme(isDark: Bool, contrastLevel: Double) -> DynamicScheme
-}
diff --git a/swift/Sources/MaterialColorUtilities/DynamicColor/MaterialDynamicColors.swift b/swift/Sources/MaterialColorUtilities/DynamicColor/MaterialDynamicColors.swift
deleted file mode 100644
index 716997bc..00000000
--- a/swift/Sources/MaterialColorUtilities/DynamicColor/MaterialDynamicColors.swift
+++ /dev/null
@@ -1,931 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-private func _isFidelity(_ scheme: DynamicScheme) -> Bool {
-  return scheme.variant == Variant.fidelity || scheme.variant == Variant.content
-}
-
-private func _isMonochrome(_ scheme: DynamicScheme) -> Bool {
-  return scheme.variant == Variant.monochrome
-}
-
-/// Tokens, or named colors, in the Material Design system.
-public class MaterialDynamicColors {
-  static let contentAccentToneDelta: Double = 15
-
-  static func highestSurface(_ scheme: DynamicScheme) -> DynamicColor {
-    return scheme.isDark ? surfaceBright : surfaceDim
-  }
-
-  public static let primaryPaletteKeyColor: DynamicColor = DynamicColor(
-    name: "primary_palette_key_color",
-    palette: { scheme in
-      return scheme.primaryPalette
-    },
-    tone: { scheme in
-      return scheme.primaryPalette.keyColor.tone
-    }
-  )
-
-  public static let secondaryPaletteKeyColor: DynamicColor = DynamicColor(
-    name: "secondary_palette_key_color",
-    palette: { scheme in
-      return scheme.secondaryPalette
-    },
-    tone: { scheme in
-      return scheme.secondaryPalette.keyColor.tone
-    }
-  )
-
-  public static let tertiaryPaletteKeyColor: DynamicColor = DynamicColor(
-    name: "tertiary_palette_key_color",
-    palette: { scheme in
-      return scheme.tertiaryPalette
-    },
-    tone: { scheme in
-      return scheme.tertiaryPalette.keyColor.tone
-    }
-  )
-
-  public static let neutralPaletteKeyColor: DynamicColor = DynamicColor(
-    name: "neutral_palette_key_color",
-    palette: { scheme in
-      return scheme.neutralPalette
-    },
-    tone: { scheme in
-      return scheme.neutralPalette.keyColor.tone
-    }
-  )
-
-  public static let neutralVariantPaletteKeyColor: DynamicColor = DynamicColor(
-    name: "neutral_variant_palette_key_color",
-    palette: { scheme in
-      return scheme.neutralVariantPalette
-    },
-    tone: { scheme in
-      return scheme.neutralVariantPalette.keyColor.tone
-    }
-  )
-
-  public static let background: DynamicColor = DynamicColor(
-    name: "background",
-    palette: { scheme in
-      return scheme.neutralPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? 6 : 98
-    },
-    isBackground: true
-  )
-
-  public static let onBackground: DynamicColor = DynamicColor(
-    name: "on_background",
-    palette: { scheme in
-      return scheme.neutralPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? 90 : 10
-    },
-    background: { scheme in
-      return MaterialDynamicColors.background
-    },
-    contrastCurve: ContrastCurve(3, 3, 4.5, 7)
-  )
-
-  public static let surface: DynamicColor = DynamicColor(
-    name: "surface",
-    palette: { scheme in
-      return scheme.neutralPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? 6 : 98
-    },
-    isBackground: true
-  )
-
-  public static let surfaceDim: DynamicColor = DynamicColor(
-    name: "surface_dim",
-    palette: { scheme in
-      return scheme.neutralPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? 6 : ContrastCurve(87, 87, 80, 75).get(scheme.contrastLevel)
-    },
-    isBackground: true
-  )
-
-  public static let surfaceBright: DynamicColor = DynamicColor(
-    name: "surface_bright",
-    palette: { scheme in
-      return scheme.neutralPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? ContrastCurve(24, 24, 29, 34).get(scheme.contrastLevel) : 98
-    },
-    isBackground: true
-  )
-
-  public static let surfaceContainerLowest: DynamicColor = DynamicColor(
-    name: "surface_container_lowest",
-    palette: { scheme in
-      return scheme.neutralPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? ContrastCurve(4, 4, 2, 0).get(scheme.contrastLevel) : 100
-    },
-    isBackground: true
-  )
-
-  public static let surfaceContainerLow: DynamicColor = DynamicColor(
-    name: "surface_container_low",
-    palette: { scheme in
-      return scheme.neutralPalette
-    },
-    tone: { scheme in
-      return scheme.isDark
-        ? ContrastCurve(10, 10, 11, 12).get(scheme.contrastLevel)
-        : ContrastCurve(96, 96, 96, 95).get(scheme.contrastLevel)
-    },
-    isBackground: true
-  )
-
-  public static let surfaceContainer: DynamicColor = DynamicColor(
-    name: "surface_container",
-    palette: { scheme in
-      return scheme.neutralPalette
-    },
-    tone: { scheme in
-      return scheme.isDark
-        ? ContrastCurve(12, 12, 16, 20).get(scheme.contrastLevel)
-        : ContrastCurve(94, 94, 92, 90).get(scheme.contrastLevel)
-    },
-    isBackground: true
-  )
-
-  public static let surfaceContainerHigh: DynamicColor = DynamicColor(
-    name: "surface_container_high",
-    palette: { scheme in
-      return scheme.neutralPalette
-    },
-    tone: { scheme in
-      return scheme.isDark
-        ? ContrastCurve(17, 17, 21, 25).get(scheme.contrastLevel)
-        : ContrastCurve(92, 92, 88, 85).get(scheme.contrastLevel)
-    },
-    isBackground: true
-  )
-
-  public static let surfaceContainerHighest: DynamicColor = DynamicColor(
-    name: "surface_container_highest",
-    palette: { scheme in
-      return scheme.neutralPalette
-    },
-    tone: { scheme in
-      return scheme.isDark
-        ? ContrastCurve(22, 22, 26, 30).get(scheme.contrastLevel)
-        : ContrastCurve(90, 90, 84, 80).get(scheme.contrastLevel)
-    },
-    isBackground: true
-  )
-
-  public static let onSurface: DynamicColor = DynamicColor(
-    name: "on_surface",
-    palette: { scheme in
-      return scheme.neutralPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? 90 : 10
-    },
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(4.5, 7, 11, 21)
-  )
-
-  public static let surfaceVariant: DynamicColor = DynamicColor(
-    name: "surface_variant",
-    palette: { scheme in
-      return scheme.neutralVariantPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? 30 : 90
-    },
-    isBackground: true
-  )
-
-  public static let onSurfaceVariant: DynamicColor = DynamicColor(
-    name: "on_surface_variant",
-    palette: { scheme in
-      return scheme.neutralVariantPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? 80 : 30
-    },
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(3, 4.5, 7, 11)
-  )
-
-  public static let inverseSurface: DynamicColor = DynamicColor(
-    name: "inverse_surface",
-    palette: { scheme in
-      return scheme.neutralPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? 90 : 20
-    }
-  )
-
-  public static let inverseOnSurface: DynamicColor = DynamicColor(
-    name: "inverse_on_surface",
-    palette: { scheme in
-      return scheme.neutralPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? 20 : 95
-    },
-    background: { scheme in
-      return MaterialDynamicColors.inverseSurface
-    },
-    contrastCurve: ContrastCurve(4.5, 7, 11, 21)
-  )
-
-  public static let outline: DynamicColor = DynamicColor(
-    name: "outline",
-    palette: { scheme in
-      return scheme.neutralVariantPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? 60 : 50
-    },
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(1.5, 3, 4.5, 7)
-  )
-
-  public static let outlineVariant: DynamicColor = DynamicColor(
-    name: "outline_variant",
-    palette: { scheme in
-      return scheme.neutralVariantPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? 30 : 80
-    },
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(1, 1, 3, 4.5)
-  )
-
-  public static let shadow: DynamicColor = DynamicColor(
-    name: "shadow",
-    palette: { scheme in
-      return scheme.neutralPalette
-    },
-    tone: { scheme in
-      return 0
-    }
-  )
-
-  public static let scrim: DynamicColor = DynamicColor(
-    name: "scrim",
-    palette: { scheme in
-      return scheme.neutralPalette
-    },
-    tone: { scheme in
-      return 0
-    }
-  )
-
-  public static let surfaceTint: DynamicColor = DynamicColor(
-    name: "surface_tint",
-    palette: { scheme in
-      return scheme.primaryPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? 80 : 40
-    },
-    isBackground: true
-  )
-
-  public static let primary: DynamicColor = DynamicColor(
-    name: "primary",
-    palette: { scheme in
-      return scheme.primaryPalette
-    },
-    tone: { scheme in
-      if _isMonochrome(scheme) {
-        return scheme.isDark ? 100 : 0
-      }
-      return scheme.isDark ? 80 : 40
-    },
-    isBackground: true,
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(3, 4.5, 7, 7),
-    toneDeltaPair: { scheme in
-      return ToneDeltaPair(
-        MaterialDynamicColors.primaryContainer, MaterialDynamicColors.primary,
-        10, polarity: TonePolarity.nearer, stayTogether: false)
-    }
-  )
-
-  public static let onPrimary: DynamicColor = DynamicColor(
-    name: "on_primary",
-    palette: { scheme in
-      return scheme.primaryPalette
-    },
-    tone: { scheme in
-      if _isMonochrome(scheme) {
-        return scheme.isDark ? 10 : 90
-      }
-      return scheme.isDark ? 20 : 100
-    },
-    background: { scheme in
-      return MaterialDynamicColors.primary
-    },
-    contrastCurve: ContrastCurve(4.5, 7, 11, 21)
-  )
-
-  public static let primaryContainer: DynamicColor = DynamicColor(
-    name: "primary_container",
-    palette: { scheme in
-      return scheme.primaryPalette
-    },
-    tone: { scheme in
-      if _isFidelity(scheme) {
-        return scheme.sourceColorHct.tone
-      }
-      if _isMonochrome(scheme) {
-        return scheme.isDark ? 85 : 25
-      }
-      return scheme.isDark ? 30 : 90
-    },
-    isBackground: true,
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(1, 1, 3, 4.5),
-    toneDeltaPair: { scheme in
-      return ToneDeltaPair(
-        MaterialDynamicColors.primaryContainer, MaterialDynamicColors.primary,
-        10, polarity: TonePolarity.nearer, stayTogether: false)
-    }
-  )
-
-  public static let onPrimaryContainer: DynamicColor = DynamicColor(
-    name: "on_primary_container",
-    palette: { scheme in
-      return scheme.primaryPalette
-    },
-    tone: { scheme in
-      if _isFidelity(scheme) {
-        return DynamicColor.foregroundTone(
-          MaterialDynamicColors.primaryContainer.tone(scheme), 4.5)
-      }
-      if _isMonochrome(scheme) {
-        return scheme.isDark ? 0 : 100
-      }
-      return scheme.isDark ? 90 : 30
-    },
-    background: { scheme in
-      return MaterialDynamicColors.primaryContainer
-    },
-    contrastCurve: ContrastCurve(3, 4.5, 7, 11)
-  )
-
-  public static let inversePrimary: DynamicColor = DynamicColor(
-    name: "inverse_primary",
-    palette: { scheme in
-      return scheme.primaryPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? 40 : 80
-    },
-    background: { scheme in
-      return MaterialDynamicColors.inverseSurface
-    },
-    contrastCurve: ContrastCurve(3, 4.5, 7, 7)
-  )
-
-  public static let secondary: DynamicColor = DynamicColor(
-    name: "secondary",
-    palette: { scheme in
-      return scheme.secondaryPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? 80 : 40
-    },
-    isBackground: true,
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(3, 4.5, 7, 7),
-    toneDeltaPair: { scheme in
-      return ToneDeltaPair(
-        MaterialDynamicColors.secondaryContainer,
-        MaterialDynamicColors.secondary, 10, polarity: TonePolarity.nearer, stayTogether: false)
-    }
-  )
-
-  public static let onSecondary: DynamicColor = DynamicColor(
-    name: "on_secondary",
-    palette: { scheme in
-      return scheme.secondaryPalette
-    },
-    tone: { scheme in
-      if _isMonochrome(scheme) {
-        return scheme.isDark ? 10 : 100
-      } else {
-        return scheme.isDark ? 20 : 100
-      }
-    },
-    background: { scheme in
-      return MaterialDynamicColors.secondary
-    },
-    contrastCurve: ContrastCurve(4.5, 7, 11, 21)
-  )
-
-  public static let secondaryContainer: DynamicColor = DynamicColor(
-    name: "secondary_container",
-    palette: { scheme in
-      return scheme.secondaryPalette
-    },
-    tone: { scheme in
-      let initialTone: Double = scheme.isDark ? 30 : 90
-      if _isMonochrome(scheme) {
-        return scheme.isDark ? 30 : 85
-      }
-      if !_isFidelity(scheme) {
-        return initialTone
-      }
-      return _findDesiredChromaByTone(
-        scheme.secondaryPalette.hue, scheme.secondaryPalette.chroma, initialTone,
-        scheme.isDark ? false : true)
-    },
-    isBackground: true,
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(1, 1, 3, 4.5),
-    toneDeltaPair: { scheme in
-      return ToneDeltaPair(
-        MaterialDynamicColors.secondaryContainer,
-        MaterialDynamicColors.secondary, 10, polarity: TonePolarity.nearer, stayTogether: false)
-    }
-  )
-
-  public static let onSecondaryContainer: DynamicColor = DynamicColor(
-    name: "on_secondary_container",
-    palette: { scheme in
-      return scheme.secondaryPalette
-    },
-    tone: { scheme in
-      if _isMonochrome(scheme) {
-        return scheme.isDark ? 90 : 10
-      }
-      if !_isFidelity(scheme) {
-        return scheme.isDark ? 90 : 30
-      }
-      return DynamicColor.foregroundTone(
-        MaterialDynamicColors.secondaryContainer.tone(scheme), 4.5)
-    },
-    background: { scheme in
-      return MaterialDynamicColors.secondaryContainer
-    },
-    contrastCurve: ContrastCurve(3, 4.5, 7, 11)
-  )
-
-  public static let tertiary: DynamicColor = DynamicColor(
-    name: "tertiary",
-    palette: { scheme in
-      return scheme.tertiaryPalette
-    },
-    tone: { scheme in
-      if _isMonochrome(scheme) {
-        return scheme.isDark ? 90 : 25
-      }
-      return scheme.isDark ? 80 : 40
-    },
-    isBackground: true,
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(3, 4.5, 7, 7),
-    toneDeltaPair: { scheme in
-      return ToneDeltaPair(
-        MaterialDynamicColors.tertiaryContainer, MaterialDynamicColors.tertiary,
-        10, polarity: TonePolarity.nearer, stayTogether: false)
-    }
-  )
-
-  public static let onTertiary: DynamicColor = DynamicColor(
-    name: "on_tertiary",
-    palette: { scheme in
-      return scheme.tertiaryPalette
-    },
-    tone: { scheme in
-      if _isMonochrome(scheme) {
-        return scheme.isDark ? 10 : 90
-      }
-      return scheme.isDark ? 20 : 100
-    },
-    background: { scheme in
-      return MaterialDynamicColors.tertiary
-    },
-    contrastCurve: ContrastCurve(4.5, 7, 11, 21)
-  )
-
-  public static let tertiaryContainer: DynamicColor = DynamicColor(
-    name: "tertiary_container",
-    palette: { scheme in
-      return scheme.tertiaryPalette
-    },
-    tone: { scheme in
-      if _isMonochrome(scheme) {
-        return scheme.isDark ? 60 : 49
-      }
-      if !_isFidelity(scheme) {
-        return scheme.isDark ? 30 : 90
-      }
-      let proposedHct = scheme.tertiaryPalette.getHct(scheme.sourceColorHct.tone)
-      return DislikeAnalyzer.fixIfDisliked(proposedHct).tone
-    },
-    isBackground: true,
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(1, 1, 3, 4.5),
-    toneDeltaPair: { scheme in
-      return ToneDeltaPair(
-        MaterialDynamicColors.tertiaryContainer, MaterialDynamicColors.tertiary,
-        10, polarity: TonePolarity.nearer, stayTogether: false)
-    }
-  )
-
-  public static let onTertiaryContainer: DynamicColor = DynamicColor(
-    name: "on_tertiary_container",
-    palette: { scheme in
-      return scheme.tertiaryPalette
-    },
-    tone: { scheme in
-      if _isMonochrome(scheme) {
-        return scheme.isDark ? 0 : 100
-      }
-      if !_isFidelity(scheme) {
-        return scheme.isDark ? 90 : 30
-      }
-      return DynamicColor.foregroundTone(
-        MaterialDynamicColors.tertiaryContainer.tone(scheme), 4.5)
-    },
-    background: { scheme in
-      return MaterialDynamicColors.tertiaryContainer
-    },
-    contrastCurve: ContrastCurve(3, 4.5, 7, 11)
-  )
-
-  public static let error: DynamicColor = DynamicColor(
-    name: "error",
-    palette: { scheme in
-      return scheme.errorPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? 80 : 40
-    },
-    isBackground: true,
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(3, 4.5, 7, 7),
-    toneDeltaPair: { scheme in
-      return ToneDeltaPair(
-        MaterialDynamicColors.errorContainer, MaterialDynamicColors.error, 10,
-        polarity: TonePolarity.nearer, stayTogether: false)
-    }
-  )
-
-  public static let onError: DynamicColor = DynamicColor(
-    name: "on_error",
-    palette: { scheme in
-      return scheme.errorPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? 20 : 100
-    },
-    background: { scheme in
-      return MaterialDynamicColors.error
-    },
-    contrastCurve: ContrastCurve(4.5, 7, 11, 21)
-  )
-
-  public static let errorContainer: DynamicColor = DynamicColor(
-    name: "error_container",
-    palette: { scheme in
-      return scheme.errorPalette
-    },
-    tone: { scheme in
-      return scheme.isDark ? 30 : 90
-    },
-    isBackground: true,
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(1, 1, 3, 4.5),
-    toneDeltaPair: { scheme in
-      return ToneDeltaPair(
-        MaterialDynamicColors.errorContainer, MaterialDynamicColors.error, 10,
-        polarity: TonePolarity.nearer, stayTogether: false)
-    }
-  )
-
-  public static let onErrorContainer: DynamicColor = DynamicColor(
-    name: "on_error_container",
-    palette: { scheme in
-      return scheme.errorPalette
-    },
-    tone: { scheme in
-      if _isMonochrome(scheme) {
-        return scheme.isDark ? 90 : 10
-      }
-      return scheme.isDark ? 90 : 30
-    },
-    background: { scheme in
-      return MaterialDynamicColors.errorContainer
-    },
-    contrastCurve: ContrastCurve(3, 4.5, 7, 11)
-  )
-
-  public static let primaryFixed: DynamicColor = DynamicColor(
-    name: "primary_fixed",
-    palette: { scheme in
-      return scheme.primaryPalette
-    },
-    tone: { scheme in
-      return _isMonochrome(scheme) ? 40.0 : 90.0
-    },
-    isBackground: true,
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(1, 1, 3, 4.5),
-    toneDeltaPair: { scheme in
-      return ToneDeltaPair(
-        MaterialDynamicColors.primaryFixed,
-        MaterialDynamicColors.primaryFixedDim, 10, polarity: TonePolarity.lighter,
-        stayTogether: true)
-    }
-  )
-
-  public static let primaryFixedDim: DynamicColor = DynamicColor(
-    name: "primary_fixed_dim",
-    palette: { scheme in
-      return scheme.primaryPalette
-    },
-    tone: { scheme in
-      return _isMonochrome(scheme) ? 30.0 : 80.0
-    },
-    isBackground: true,
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(1, 1, 3, 4.5),
-    toneDeltaPair: { scheme in
-      return ToneDeltaPair(
-        MaterialDynamicColors.primaryFixed,
-        MaterialDynamicColors.primaryFixedDim, 10, polarity: TonePolarity.lighter,
-        stayTogether: true)
-    }
-  )
-
-  public static let onPrimaryFixed: DynamicColor = DynamicColor(
-    name: "on_primary_fixed",
-    palette: { scheme in
-      return scheme.primaryPalette
-    },
-    tone: { scheme in
-      return _isMonochrome(scheme) ? 100.0 : 10.0
-    },
-    background: { scheme in
-      return MaterialDynamicColors.primaryFixedDim
-    },
-    secondBackground: { scheme in
-      return MaterialDynamicColors.primaryFixed
-    },
-    contrastCurve: ContrastCurve(4.5, 7, 11, 21)
-  )
-
-  public static let onPrimaryFixedVariant: DynamicColor = DynamicColor(
-    name: "on_primary_fixed_variant",
-    palette: { scheme in
-      return scheme.primaryPalette
-    },
-    tone: { scheme in
-      return _isMonochrome(scheme) ? 90.0 : 30.0
-    },
-    background: { scheme in
-      return MaterialDynamicColors.primaryFixedDim
-    },
-    secondBackground: { scheme in
-      return MaterialDynamicColors.primaryFixed
-    },
-    contrastCurve: ContrastCurve(3, 4.5, 7, 11)
-  )
-
-  public static let secondaryFixed: DynamicColor = DynamicColor(
-    name: "secondary_fixed",
-    palette: { scheme in
-      return scheme.secondaryPalette
-    },
-    tone: { scheme in
-      return _isMonochrome(scheme) ? 80.0 : 90.0
-    },
-    isBackground: true,
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(1, 1, 3, 4.5),
-    toneDeltaPair: { scheme in
-      return ToneDeltaPair(
-        MaterialDynamicColors.secondaryFixed,
-        MaterialDynamicColors.secondaryFixedDim, 10, polarity: TonePolarity.lighter,
-        stayTogether: true)
-    }
-  )
-
-  public static let secondaryFixedDim: DynamicColor = DynamicColor(
-    name: "secondary_fixed_dim",
-    palette: { scheme in
-      return scheme.secondaryPalette
-    },
-    tone: { scheme in
-      return _isMonochrome(scheme) ? 70.0 : 80.0
-    },
-    isBackground: true,
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(1, 1, 3, 4.5),
-    toneDeltaPair: { scheme in
-      return ToneDeltaPair(
-        MaterialDynamicColors.secondaryFixed,
-        MaterialDynamicColors.secondaryFixedDim, 10, polarity: TonePolarity.lighter,
-        stayTogether: true)
-    }
-  )
-
-  public static let onSecondaryFixed: DynamicColor = DynamicColor(
-    name: "on_secondary_fixed",
-    palette: { scheme in
-      return scheme.secondaryPalette
-    },
-    tone: { scheme in
-      return 10.0
-    },
-    background: { scheme in
-      return MaterialDynamicColors.secondaryFixedDim
-    },
-    secondBackground: { scheme in
-      return MaterialDynamicColors.secondaryFixed
-    },
-    contrastCurve: ContrastCurve(4.5, 7, 11, 21)
-  )
-
-  public static let onSecondaryFixedVariant: DynamicColor = DynamicColor(
-    name: "on_secondary_fixed_variant",
-    palette: { scheme in
-      return scheme.secondaryPalette
-    },
-    tone: { scheme in
-      return _isMonochrome(scheme) ? 25.0 : 30.0
-    },
-    background: { scheme in
-      return MaterialDynamicColors.secondaryFixedDim
-    },
-    secondBackground: { scheme in
-      return MaterialDynamicColors.secondaryFixed
-    },
-    contrastCurve: ContrastCurve(3, 4.5, 7, 11)
-  )
-
-  public static let tertiaryFixed: DynamicColor = DynamicColor(
-    name: "tertiary_fixed",
-    palette: { scheme in
-      return scheme.tertiaryPalette
-    },
-    tone: { scheme in
-      return _isMonochrome(scheme) ? 40.0 : 90.0
-    },
-    isBackground: true,
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(1, 1, 3, 4.5),
-    toneDeltaPair: { scheme in
-      return ToneDeltaPair(
-        MaterialDynamicColors.tertiaryFixed,
-        MaterialDynamicColors.tertiaryFixedDim, 10, polarity: TonePolarity.lighter,
-        stayTogether: true)
-    }
-  )
-
-  public static let tertiaryFixedDim: DynamicColor = DynamicColor(
-    name: "tertiary_fixed_dim",
-    palette: { scheme in
-      return scheme.tertiaryPalette
-    },
-    tone: { scheme in
-      return _isMonochrome(scheme) ? 30.0 : 80.0
-    },
-    isBackground: true,
-    background: { scheme in
-      return highestSurface(scheme)
-    },
-    contrastCurve: ContrastCurve(1, 1, 3, 4.5),
-    toneDeltaPair: { scheme in
-      return ToneDeltaPair(
-        MaterialDynamicColors.tertiaryFixed,
-        MaterialDynamicColors.tertiaryFixedDim, 10, polarity: TonePolarity.lighter,
-        stayTogether: true)
-    }
-  )
-
-  public static let onTertiaryFixed: DynamicColor = DynamicColor(
-    name: "on_tertiary_fixed",
-    palette: { scheme in
-      return scheme.tertiaryPalette
-    },
-    tone: { scheme in
-      return _isMonochrome(scheme) ? 100.0 : 10.0
-    },
-    background: { scheme in
-      return MaterialDynamicColors.tertiaryFixedDim
-    },
-    secondBackground: { scheme in
-      return MaterialDynamicColors.tertiaryFixed
-    },
-    contrastCurve: ContrastCurve(4.5, 7, 11, 21)
-  )
-
-  public static let onTertiaryFixedVariant: DynamicColor = DynamicColor(
-    name: "on_tertiary_fixed_variant",
-    palette: { scheme in
-      return scheme.tertiaryPalette
-    },
-    tone: { scheme in
-      return _isMonochrome(scheme) ? 90.0 : 30.0
-    },
-    background: { scheme in
-      return MaterialDynamicColors.tertiaryFixedDim
-    },
-    secondBackground: { scheme in
-      return MaterialDynamicColors.tertiaryFixed
-    },
-    contrastCurve: ContrastCurve(3, 4.5, 7, 11)
-  )
-
-  static private func _findDesiredChromaByTone(
-    _ hue: Double, _ chroma: Double, _ tone: Double, _ byDecreasingTone: Bool
-  ) -> Double {
-    var answer = tone
-
-    var closestToChroma = Hct.from(hue, chroma, tone)
-    if closestToChroma.chroma < chroma {
-      var chromaPeak: Double = closestToChroma.chroma
-      while closestToChroma.chroma < chroma {
-        answer += byDecreasingTone ? -1 : 1
-        let potentialSolution = Hct.from(hue, chroma, answer)
-        if chromaPeak > potentialSolution.chroma {
-          break
-        }
-        if abs(potentialSolution.chroma - chroma) < 0.4 {
-          break
-        }
-
-        let potentialDelta = abs(potentialSolution.chroma - chroma)
-        let currentDelta = abs(closestToChroma.chroma - chroma)
-        if potentialDelta < currentDelta {
-          closestToChroma = potentialSolution
-        }
-        chromaPeak = max(chromaPeak, potentialSolution.chroma)
-      }
-    }
-
-    return answer
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/DynamicColor/ToneDeltaPair.swift b/swift/Sources/MaterialColorUtilities/DynamicColor/ToneDeltaPair.swift
deleted file mode 100644
index 5be67618..00000000
--- a/swift/Sources/MaterialColorUtilities/DynamicColor/ToneDeltaPair.swift
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/// Describes the different in tone between colors. If there is no preference,
-/// the tones at standard contrast are examined and the polarity of those is
-/// attempted to be maintained.
-enum TonePolarity {
-  case darker
-  case lighter
-  case nearer
-  case farther
-}
-
-/// Documents a constraint between two `DynamicColor`s, in which their tones must
-/// have a certain distance from each other. Prefer a `DynamicColor` with a
-/// background, this is for special cases when designers want tonal distance,
-/// literally contrast, between two colors that don't have a background /
-/// foreground relationship or a contrast guarantee.
-public struct ToneDeltaPair {
-  let subject: DynamicColor
-  let basis: DynamicColor
-  let delta: Double
-  let polarity: TonePolarity
-  let stayTogether: Bool
-
-  /// Documents a constraint in tone distance between two `DynamicColor`s.
-  ///
-  /// The polarity is an adjective that describes "A", compared to "B".
-  ///
-  /// For instance, ToneDeltaPair(A, B, 15, 'darker', stayTogether) states that
-  /// A's tone should be at least 15 darker than B's.
-  ///
-  /// 'nearer' and 'farther' describes closeness to the surface roles. For
-  /// instance, ToneDeltaPair(A, B, 10, 'nearer', stayTogether) states that A
-  /// should be 10 lighter than B in light mode, and 10 darker than B in dark
-  /// mode.
-  ///
-  /// - Parameters:
-  ///   - subject: The color role to be judged.
-  ///   - basis: The role used as a basis of comparison.
-  ///   - delta: Required difference between tones. Absolute value, negative
-  ///     values have undefined behavior.
-  ///   - polarity: The relative relation between tones of subject and basis,
-  ///     as described above.
-  ///   - stayTogether: Whether these two roles should stay on the same side of
-  ///     the "awkward zone" (T50-59). This is necessary for certain cases where
-  ///     one role has two backgrounds.
-  init(
-    _ subject: DynamicColor,
-    _ basis: DynamicColor,
-    _ delta: Double,
-    polarity: TonePolarity,
-    stayTogether: Bool
-  ) {
-    self.subject = subject
-    self.basis = basis
-    self.delta = delta
-    self.polarity = polarity
-    self.stayTogether = stayTogether
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/DynamicColor/Variant.swift b/swift/Sources/MaterialColorUtilities/DynamicColor/Variant.swift
deleted file mode 100644
index 096acac5..00000000
--- a/swift/Sources/MaterialColorUtilities/DynamicColor/Variant.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/// Set of themes supported by Dynamic Color.
-/// Instantiate the corresponding subclass, ex. SchemeTonalSpot, to create
-/// colors corresponding to the theme.
-public enum Variant {
-  case monochrome
-  case neutral
-  case tonalSpot
-  case vibrant
-  case expressive
-  case fidelity
-  case content
-  case rainbow
-  case fruitSalad
-}
diff --git a/swift/Sources/MaterialColorUtilities/Hct/Cam16.swift b/swift/Sources/MaterialColorUtilities/Hct/Cam16.swift
deleted file mode 100644
index 01d20ec7..00000000
--- a/swift/Sources/MaterialColorUtilities/Hct/Cam16.swift
+++ /dev/null
@@ -1,332 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-/// CAM16, a color appearance model. Colors are not just defined by their hex
-/// code, but rather, a hex code and viewing conditions.
-///
-/// CAM16 instances also have coordinates in the CAM16-UCS space, called J*, a*,
-/// b*, or jstar, astar, bstar in code. CAM16-UCS is included in the CAM16
-/// specification, and should be used when measuring distances between colors.
-///
-/// In traditional color spaces, a color can be identified solely by the
-/// observer's measurement of the color. Color appearance models such as CAM16
-/// also use information about the environment where the color was
-/// observed, known as the viewing conditions.
-///
-/// For example, white under the traditional assumption of a midday sun white
-/// point is accurately measured as a slightly chromatic blue by
-/// (roughly, hue 203, chroma 3, lightness 100)
-/// CAM16, a color appearance model. Colors are not just defined by their hex
-/// code, but rather, a hex code and viewing conditions.
-///
-/// CAM16 instances also have coordinates in the CAM16-UCS space, called J*, a*,
-/// b*, or jstar, astar, bstar in code. CAM16-UCS is included in the CAM16
-/// specification, and should be used when measuring distances between colors.
-///
-/// In traditional color spaces, a color can be identified solely by the
-/// observer's measurement of the color. Color appearance models such as CAM16
-/// also use information about the environment where the color was
-/// observed, known as the viewing conditions.
-///
-/// For example, white under the traditional assumption of a midday sun white
-/// point is accurately measured as a slightly chromatic blue by
-/// (roughly, hue 203, chroma 3, lightness 100)
-public class Cam16 {
-  /// Like red, orange, yellow, green, etc.
-  public let hue: Double
-
-  /// Informally, colorfulness / color intensity. Like saturation in HSL,
-  /// except perceptually accurate.
-  public let chroma: Double
-
-  /// Lightness
-  let j: Double
-
-  /// Brightness; ratio of lightness to white point's lightness
-  let q: Double
-
-  /// Colorfulness
-  let m: Double
-
-  /// Saturation; ratio of chroma to white point's chroma
-  let s: Double
-
-  /// CAM16-UCS J coordinate
-  public let jstar: Double
-
-  /// CAM16-UCS a coordinate
-  public let astar: Double
-
-  /// CAM16-UCS b coordinate
-  public let bstar: Double
-
-  /// All of the CAM16 dimensions can be calculated from 3 of the dimensions, in
-  /// the following combinations:
-  ///     -  {j or q} and {c, m, or s} and hue
-  ///     - jstar, astar, bstar
-  /// Prefer using a static method that constructs from 3 of those dimensions.
-  /// This constructor is intended for those methods to use to return all
-  /// possible dimensions.
-  public init(
-    _ hue: Double,
-    _ chroma: Double,
-    _ j: Double,
-    _ q: Double,
-    _ m: Double,
-    _ s: Double,
-    _ jstar: Double,
-    _ astar: Double,
-    _ bstar: Double
-  ) {
-    self.hue = hue
-    self.chroma = chroma
-    self.j = j
-    self.q = q
-    self.m = m
-    self.s = s
-    self.jstar = jstar
-    self.astar = astar
-    self.bstar = bstar
-  }
-
-  /// CAM16 instances also have coordinates in the CAM16-UCS space, called J*,
-  /// a*, b*, or jstar, astar, bstar in code. CAM16-UCS is included in the CAM16
-  /// specification, and should be used when measuring distances between colors.
-  @inlinable public func distance(_ other: Cam16) -> Double {
-    let dJ = jstar - other.jstar
-    let dA = astar - other.astar
-    let dB = bstar - other.bstar
-    let dEPrime = sqrt(dJ * dJ + dA * dA + dB * dB)
-    let dE = 1.41 * pow(dEPrime, 0.63)
-    return dE
-  }
-
-  /// Convert [argb] to CAM16, assuming the color was viewed in default viewing
-  /// conditions.
-  public static func fromInt(_ argb: Int) -> Cam16 {
-    return fromIntInViewingConditions(argb, ViewingConditions.sRgb())
-  }
-
-  /// Given [viewingConditions], convert [argb] to
-  public static func fromIntInViewingConditions(_ argb: Int, _ viewingConditions: ViewingConditions)
-    -> Cam16
-  {
-    // Transform ARGB int to XYZ
-    let xyz = ColorUtils.xyzFromArgb(argb)
-    let x = xyz[0]
-    let y = xyz[1]
-    let z = xyz[2]
-    return fromXyzInViewingConditions(x, y, z, viewingConditions)
-  }
-
-  /// Given color expressed in XYZ and viewed in [viewingConditions], convert to
-  ///
-  public static func fromXyzInViewingConditions(
-    _ x: Double, _ y: Double, _ z: Double, _ viewingConditions: ViewingConditions
-  ) -> Cam16 {
-    // Transform XYZ to 'cone'/'rgb' responses
-
-    let rC = 0.401288 * x + 0.650173 * y - 0.051461 * z
-    let gC = -0.250268 * x + 1.204414 * y + 0.045854 * z
-    let bC = -0.002079 * x + 0.048952 * y + 0.953127 * z
-
-    // Discount illuminant
-    let rD = viewingConditions.rgbD[0] * rC
-    let gD = viewingConditions.rgbD[1] * gC
-    let bD = viewingConditions.rgbD[2] * bC
-
-    // chromatic adaptation
-    let rAF = pow(viewingConditions.fl * abs(rD) / 100, 0.42)
-    let gAF = pow(viewingConditions.fl * abs(gD) / 100, 0.42)
-    let bAF = pow(viewingConditions.fl * abs(bD) / 100, 0.42)
-    let rA = Double(MathUtils.signum(rD)) * 400 * rAF / (rAF + 27.13)
-    let gA = Double(MathUtils.signum(gD)) * 400 * gAF / (gAF + 27.13)
-    let bA = Double(MathUtils.signum(bD)) * 400 * bAF / (bAF + 27.13)
-
-    // redness-greenness
-    let a = (11.0 * rA + -12.0 * gA + bA) / 11.0
-    // yellowness-blueness
-    let b = (rA + gA - 2.0 * bA) / 9.0
-    // auxiliary components
-    let u = (20.0 * rA + 20.0 * gA + 21.0 * bA) / 20.0
-    let p2 = (40.0 * rA + 20.0 * gA + bA) / 20.0
-
-    // hue
-    let atan2 = atan2(b, a)
-    let atanDegrees = atan2 * 180 / Double.pi
-    let hue =
-      atanDegrees < 0
-      ? atanDegrees + 360.0
-      : atanDegrees >= 360
-        ? atanDegrees - 360
-        : atanDegrees
-    let hueRadians = hue * Double.pi / 180.0
-    assert(hue >= 0 && hue < 360, "hue was really \(hue)")
-
-    // achromatic response to color
-    let ac = p2 * viewingConditions.nbb
-
-    // CAM16 lightness and brightness
-    let J = 100.0 * pow(ac / viewingConditions.aw, viewingConditions.c * viewingConditions.z)
-    let Q =
-      (4.0 / viewingConditions.c) * sqrt(J / 100.0) * (viewingConditions.aw + 4.0)
-      * (viewingConditions.fLRoot)
-
-    let huePrime = (hue < 20.14) ? hue + 360 : hue
-    let eHue = (1.0 / 4.0) * (cos(huePrime * Double.pi / 180.0 + 2.0) + 3.8)
-    let p1 = 50000.0 / 13.0 * eHue * viewingConditions.nC * viewingConditions.ncb
-    let t = p1 * sqrt(a * a + b * b) / (u + 0.305)
-    let alpha =
-      pow(t, 0.9) * pow(1.64 - pow(0.29, viewingConditions.backgroundYTowhitePointY), 0.73)
-
-    // CAM16 chroma, colorfulness, chroma
-    let C = alpha * sqrt(J / 100.0)
-    let M = C * viewingConditions.fLRoot
-    let s = 50.0 * sqrt((alpha * viewingConditions.c) / (viewingConditions.aw + 4.0))
-
-    // CAM16-UCS components
-    let jstar = (1.0 + 100.0 * 0.007) * J / (1.0 + 0.007 * J)
-    let mstar = log(1.0 + 0.0228 * M) / 0.0228
-    let astar = mstar * cos(hueRadians)
-    let bstar = mstar * sin(hueRadians)
-
-    return Cam16(hue, C, J, Q, M, s, jstar, astar, bstar)
-  }
-
-  /// Create a CAM16 color from lightness [j], chroma [c], and hue [h],
-  /// assuming the color was viewed in default viewing conditions.
-  public static func fromJch(_ j: Double, _ c: Double, _ h: Double) -> Cam16 {
-    return fromJchInViewingConditions(j, c, h, ViewingConditions.sRgb())
-  }
-
-  /// Create a CAM16 color from lightness [j], chroma [c], and hue [h],
-  /// in [viewingConditions].
-  public static func fromJchInViewingConditions(
-    _ J: Double, _ C: Double, _ h: Double, _ viewingConditions: ViewingConditions
-  ) -> Cam16 {
-    let Q =
-      (4.0 / viewingConditions.c) * sqrt(J / 100.0) * (viewingConditions.aw + 4.0)
-      * (viewingConditions.fLRoot)
-    let M = C * viewingConditions.fLRoot
-    let alpha = C / sqrt(J / 100.0)
-    let s = 50.0 * sqrt((alpha * viewingConditions.c) / (viewingConditions.aw + 4.0))
-
-    let hueRadians = h * Double.pi / 180
-    let jstar = (1.0 + 100.0 * 0.007) * J / (1.0 + 0.007 * J)
-    let mstar = 1.0 / 0.0228 * log(1.0 + 0.0228 * M)
-    let astar = mstar * cos(hueRadians)
-    let bstar = mstar * sin(hueRadians)
-    return Cam16(h, C, J, Q, M, s, jstar, astar, bstar)
-  }
-
-  /// Create a CAM16 color from CAM16-UCS coordinates [jstar], [astar], [bstar].
-  /// assuming the color was viewed in default viewing conditions.
-  public static func fromUcs(_ jstar: Double, _ astar: Double, _ bstar: Double) -> Cam16 {
-    return fromUcsInViewingConditions(jstar, astar, bstar, ViewingConditions.standard())
-  }
-
-  /// Create a CAM16 color from CAM16-UCS coordinates [jstar], [astar], [bstar].
-  /// in [viewingConditions].
-  public static func fromUcsInViewingConditions(
-    _ jstar: Double, _ astar: Double, _ bstar: Double, _ viewingConditions: ViewingConditions
-  ) -> Cam16 {
-    let a = astar
-    let b = bstar
-    let m = sqrt(a * a + b * b)
-    let M = (exp(m * 0.0228) - 1.0) / 0.0228
-    let c = M / viewingConditions.fLRoot
-    var h = atan2(b, a) * (180.0 / Double.pi)
-    if h < 0.0 {
-      h += 360.0
-    }
-    let j = jstar / (1 - (jstar - 100) * 0.007)
-
-    return fromJchInViewingConditions(j, c, h, viewingConditions)
-  }
-
-  /// ARGB representation of color, assuming the color was viewed in default
-  /// viewing conditions.
-  public func toInt() -> Int {
-    return viewed(ViewingConditions.sRgb())
-  }
-
-  // Avoid allocations during conversion by pre-allocating an array.
-  private var viewedArray: [Double] = [0, 0, 0]
-
-  /// ARGB representation of a color, given the color was viewed in
-  /// [viewingConditions]
-  public func viewed(_ viewingConditions: ViewingConditions) -> Int {
-    let xyz = xyzInViewingConditions(viewingConditions, array: viewedArray)
-    let argb = ColorUtils.argbFromXyz(xyz[0], xyz[1], xyz[2])
-    return argb
-  }
-
-  /// XYZ representation of CAM16 seen in [viewingConditions].
-  public func xyzInViewingConditions(_ viewingConditions: ViewingConditions, array: [Double]? = nil)
-    -> [Double]
-  {
-    let alpha =
-      (chroma == 0.0 || j == 0.0) ? 0.0 : chroma / sqrt(j / 100.0)
-    let t = pow(
-      alpha
-        / pow(
-          1.64 - pow(0.29, viewingConditions.backgroundYTowhitePointY),
-          0.73),
-      1.0 / 0.9)
-    let hRad = hue * Double.pi / 180.0
-
-    let eHue = 0.25 * (cos(hRad + 2.0) + 3.8)
-    let ac = viewingConditions.aw * pow(j / 100.0, 1.0 / viewingConditions.c / viewingConditions.z)
-    let p1 =
-      eHue * (50000.0 / 13.0) * viewingConditions.nC * viewingConditions.ncb
-
-    let p2 = (ac / viewingConditions.nbb)
-
-    let hSin = sin(hRad)
-    let hCos = cos(hRad)
-
-    let gamma = 23.0 * (p2 + 0.305) * t / (23.0 * p1 + 11 * t * hCos + 108.0 * t * hSin)
-    let a = gamma * hCos
-    let b = gamma * hSin
-    let rA = (460.0 * p2 + 451.0 * a + 288.0 * b) / 1403.0
-    let gA = (460.0 * p2 - 891.0 * a - 261.0 * b) / 1403.0
-    let bA = (460.0 * p2 - 220.0 * a - 6300.0 * b) / 1403.0
-
-    let rCBase = max(0, (27.13 * abs(rA)) / (400.0 - abs(rA)))
-    let rC = Double(MathUtils.signum(rA)) * (100.0 / viewingConditions.fl) * pow(rCBase, 1.0 / 0.42)
-    let gCBase = max(0, (27.13 * abs(gA)) / (400.0 - abs(gA)))
-    let gC = Double(MathUtils.signum(gA)) * (100.0 / viewingConditions.fl) * pow(gCBase, 1.0 / 0.42)
-    let bCBase = max(0, (27.13 * abs(bA)) / (400.0 - abs(bA)))
-    let bC = Double(MathUtils.signum(bA)) * (100.0 / viewingConditions.fl) * pow(bCBase, 1.0 / 0.42)
-    let rF = rC / viewingConditions.rgbD[0]
-    let gF = gC / viewingConditions.rgbD[1]
-    let bF = bC / viewingConditions.rgbD[2]
-
-    let x = 1.86206786 * rF - 1.01125463 * gF + 0.14918677 * bF
-    let y = 0.38752654 * rF + 0.62144744 * gF - 0.00897398 * bF
-    let z = -0.01584150 * rF - 0.03412294 * gF + 1.04996444 * bF
-
-    if array != nil {
-      var local = array!
-      local[0] = x
-      local[1] = y
-      local[2] = z
-      return local
-    } else {
-      return [x, y, z]
-    }
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Hct/Hct.swift b/swift/Sources/MaterialColorUtilities/Hct/Hct.swift
deleted file mode 100644
index fd937114..00000000
--- a/swift/Sources/MaterialColorUtilities/Hct/Hct.swift
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-/// HCT, hue, chroma, and tone. A color system that provides a perceptually
-/// accurate color measurement system that can also accurately render what
-/// colors will appear as in different lighting environments.
-public class Hct: Equatable, Hashable {
-  private var _hue: Double
-  private var _chroma: Double
-  private var _tone: Double
-  private var _argb: Int
-
-  /// A number, in degrees, representing ex. red, orange, yellow, etc.
-  /// Ranges from 0 <= [hue] < 360
-  ///
-  /// 0 <= [newHue] < 360; invalid values are corrected.
-  /// After setting hue, the color is mapped from HCT to the more
-  /// limited sRGB gamut for display. This will change its ARGB/integer
-  /// representation. If the HCT color is outside of the sRGB gamut, chroma
-  /// will decrease until it is inside the gamut.
-  public var hue: Double {
-    get { return _hue }
-    set {
-      _argb = HctSolver.solveToInt(newValue, chroma, tone)
-      let cam16 = Cam16.fromInt(_argb)
-      _hue = cam16.hue
-      _chroma = cam16.chroma
-      _tone = ColorUtils.lstarFromArgb(_argb)
-    }
-  }
-
-  /// 0 <= [newChroma] <= ?
-  /// After setting chroma, the color is mapped from HCT to the more
-  /// limited sRGB gamut for display. This will change its ARGB/integer
-  /// representation. If the HCT color is outside of the sRGB gamut, chroma
-  /// will decrease until it is inside the gamut.
-  public var chroma: Double {
-    get { return _chroma }
-    set {
-      _argb = HctSolver.solveToInt(hue, newValue, tone)
-      let cam16 = Cam16.fromInt(_argb)
-      _hue = cam16.hue
-      _chroma = cam16.chroma
-      _tone = ColorUtils.lstarFromArgb(_argb)
-    }
-  }
-
-  /// Lightness. Ranges from 0 to 100.
-  ///
-  /// 0 <= [newTone] <= 100; invalid values are corrected.
-  /// After setting tone, the color is mapped from HCT to the more
-  /// limited sRGB gamut for display. This will change its ARGB/integer
-  /// representation. If the HCT color is outside of the sRGB gamut, chroma
-  /// will decrease until it is inside the gamut.
-  public var tone: Double {
-    get { return _tone }
-    set {
-      _argb = HctSolver.solveToInt(hue, chroma, newValue)
-      let cam16 = Cam16.fromInt(_argb)
-      _hue = cam16.hue
-      _chroma = cam16.chroma
-      _tone = ColorUtils.lstarFromArgb(_argb)
-    }
-  }
-
-  public init(_ argb: Int) {
-    self._argb = argb
-    let cam16 = Cam16.fromInt(argb)
-    self._hue = cam16.hue
-    self._chroma = cam16.chroma
-    self._tone = ColorUtils.lstarFromArgb(argb)
-  }
-
-  /// 0 <= [hue] < 360; invalid values are corrected.
-  /// 0 <= [chroma] <= ?; Informally, colorfulness. The color returned may be
-  ///    lower than the requested chroma. Chroma has a different maximum for any
-  ///    given hue and tone.
-  /// 0 <= [tone] <= 100; informally, lightness. Invalid values are corrected.
-  public static func from(_ hue: Double, _ chroma: Double, _ tone: Double) -> Hct {
-    let argb = HctSolver.solveToInt(hue, chroma, tone)
-    return Hct(argb)
-  }
-
-  func isEqual(to other: Hct) -> Bool {
-    return _argb == other._argb
-  }
-
-  public static func == (lhs: Hct, rhs: Hct) -> Bool {
-    return type(of: lhs) == type(of: rhs) && lhs.isEqual(to: rhs)
-  }
-
-  public func hash(into hasher: inout Hasher) {
-    hasher.combine(_argb)
-  }
-
-  public var description: String {
-    return "H\(round(hue)) C\(round(chroma)) T\(round(tone))"
-  }
-
-  /// HCT representation of [argb].
-  public static func fromInt(_ argb: Int) -> Hct {
-    return Hct(argb)
-  }
-
-  func toInt() -> Int {
-    return _argb
-  }
-
-  /// Translate a color into different [ViewingConditions].
-  ///
-  /// Colors change appearance. They look different with lights on versus off,
-  /// the same color, as in hex code, on white looks different when on black.
-  /// This is called color relativity, most famously explicated by Josef Albers
-  /// in Interaction of Color.
-  ///
-  /// In color science, color appearance models can account for this and
-  /// calculate the appearance of a color in different settings. HCT is based on
-  /// CAM16, a color appearance model, and uses it to make these calculations.
-  ///
-  /// See [ViewingConditions.make] for parameters affecting color appearance.
-  public func inViewingConditions(_ vc: ViewingConditions) -> Hct {
-    // 1. Use CAM16 to find XYZ coordinates of color in specified VC.
-    let cam16 = Cam16.fromInt(toInt())
-    let viewedInVc = cam16.xyzInViewingConditions(vc)
-
-    // 2. Create CAM16 of those XYZ coordinates in default VC.
-    let recastInVc = Cam16.fromXyzInViewingConditions(
-      viewedInVc[0],
-      viewedInVc[1],
-      viewedInVc[2],
-      ViewingConditions.make()
-    )
-
-    // 3. Create HCT from:
-    // - CAM16 using default VC with XYZ coordinates in specified VC.
-    // - L* converted from Y in XYZ coordinates in specified VC.
-    let recastHct = Hct.from(
-      recastInVc.hue,
-      recastInVc.chroma,
-      ColorUtils.lstarFromY(viewedInVc[1])
-    )
-    return recastHct
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Hct/HctSolver.swift b/swift/Sources/MaterialColorUtilities/Hct/HctSolver.swift
deleted file mode 100644
index 172b8236..00000000
--- a/swift/Sources/MaterialColorUtilities/Hct/HctSolver.swift
+++ /dev/null
@@ -1,658 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-/// A class that solves the HCT equation.
-class HctSolver {
-  private static let scaledDiscountFromLinrgb: [[Double]] = [
-    [
-      0.001200833568784504,
-      0.002389694492170889,
-      0.0002795742885861124,
-    ],
-    [
-      0.0005891086651375999,
-      0.0029785502573438758,
-      0.0003270666104008398,
-    ],
-    [
-      0.00010146692491640572,
-      0.0005364214359186694,
-      0.0032979401770712076,
-    ],
-  ]
-
-  private static let linrgbFromScaledDiscount: [[Double]] = [
-    [
-      1373.2198709594231,
-      -1100.4251190754821,
-      -7.278681089101213,
-    ],
-    [
-      -271.815969077903,
-      559.6580465940733,
-      -32.46047482791194,
-    ],
-    [
-      1.9622899599665666,
-      -57.173814538844006,
-      308.7233197812385,
-    ],
-  ]
-
-  private static let yFromLinrgb = [0.2126, 0.7152, 0.0722]
-
-  private static let criticalPlanes = [
-    0.015176349177441876,
-    0.045529047532325624,
-    0.07588174588720938,
-    0.10623444424209313,
-    0.13658714259697685,
-    0.16693984095186062,
-    0.19729253930674434,
-    0.2276452376616281,
-    0.2579979360165119,
-    0.28835063437139563,
-    0.3188300904430532,
-    0.350925934958123,
-    0.3848314933096426,
-    0.42057480301049466,
-    0.458183274052838,
-    0.4976837250274023,
-    0.5391024159806381,
-    0.5824650784040898,
-    0.6277969426914107,
-    0.6751227633498623,
-    0.7244668422128921,
-    0.775853049866786,
-    0.829304845476233,
-    0.8848452951698498,
-    0.942497089126609,
-    1.0022825574869039,
-    1.0642236851973577,
-    1.1283421258858297,
-    1.1946592148522128,
-    1.2631959812511864,
-    1.3339731595349034,
-    1.407011200216447,
-    1.4823302800086415,
-    1.5599503113873272,
-    1.6398909516233677,
-    1.7221716113234105,
-    1.8068114625156377,
-    1.8938294463134073,
-    1.9832442801866852,
-    2.075074464868551,
-    2.1693382909216234,
-    2.2660538449872063,
-    2.36523901573795,
-    2.4669114995532007,
-    2.5710888059345764,
-    2.6777882626779785,
-    2.7870270208169257,
-    2.898822059350997,
-    3.0131901897720907,
-    3.1301480604002863,
-    3.2497121605402226,
-    3.3718988244681087,
-    3.4967242352587946,
-    3.624204428461639,
-    3.754355295633311,
-    3.887192587735158,
-    4.022731918402185,
-    4.160988767090289,
-    4.301978482107941,
-    4.445716283538092,
-    4.592217266055746,
-    4.741496401646282,
-    4.893568542229298,
-    5.048448422192488,
-    5.20615066083972,
-    5.3666897647573375,
-    5.5300801301023865,
-    5.696336044816294,
-    5.865471690767354,
-    6.037501145825082,
-    6.212438385869475,
-    6.390297286737924,
-    6.571091626112461,
-    6.7548350853498045,
-    6.941541251256611,
-    7.131223617812143,
-    7.323895587840543,
-    7.5195704746346665,
-    7.7182615035334345,
-    7.919981813454504,
-    8.124744458384042,
-    8.332562408825165,
-    8.543448553206703,
-    8.757415699253682,
-    8.974476575321063,
-    9.194643831691977,
-    9.417930041841839,
-    9.644347703669503,
-    9.873909240696694,
-    10.106627003236781,
-    10.342513269534024,
-    10.58158024687427,
-    10.8238400726681,
-    11.069304815507364,
-    11.317986476196008,
-    11.569896988756009,
-    11.825048221409341,
-    12.083451977536606,
-    12.345119996613247,
-    12.610063955123938,
-    12.878295467455942,
-    13.149826086772048,
-    13.42466730586372,
-    13.702830557985108,
-    13.984327217668513,
-    14.269168601521828,
-    14.55736596900856,
-    14.848930523210871,
-    15.143873411576273,
-    15.44220572664832,
-    15.743938506781891,
-    16.04908273684337,
-    16.35764934889634,
-    16.66964922287304,
-    16.985093187232053,
-    17.30399201960269,
-    17.62635644741625,
-    17.95219714852476,
-    18.281524751807332,
-    18.614349837764564,
-    18.95068293910138,
-    19.290534541298456,
-    19.633915083172692,
-    19.98083495742689,
-    20.331304511189067,
-    20.685334046541502,
-    21.042933821039977,
-    21.404114048223256,
-    21.76888489811322,
-    22.137256497705877,
-    22.50923893145328,
-    22.884842241736916,
-    23.264076429332462,
-    23.6469514538663,
-    24.033477234264016,
-    24.42366364919083,
-    24.817520537484558,
-    25.21505769858089,
-    25.61628489293138,
-    26.021211842414342,
-    26.429848230738664,
-    26.842203703840827,
-    27.258287870275353,
-    27.678110301598522,
-    28.10168053274597,
-    28.529008062403893,
-    28.96010235337422,
-    29.39497283293396,
-    29.83362889318845,
-    30.276079891419332,
-    30.722335150426627,
-    31.172403958865512,
-    31.62629557157785,
-    32.08401920991837,
-    32.54558406207592,
-    33.010999283389665,
-    33.4802739966603,
-    33.953417292456834,
-    34.430438229418264,
-    34.911345834551085,
-    35.39614910352207,
-    35.88485700094671,
-    36.37747846067349,
-    36.87402238606382,
-    37.37449765026789,
-    37.87891309649659,
-    38.38727753828926,
-    38.89959975977785,
-    39.41588851594697,
-    39.93615253289054,
-    40.460400508064545,
-    40.98864111053629,
-    41.520882981230194,
-    42.05713473317016,
-    42.597404951718396,
-    43.141702194811224,
-    43.6900349931913,
-    44.24241185063697,
-    44.798841244188324,
-    45.35933162437017,
-    45.92389141541209,
-    46.49252901546552,
-    47.065252796817916,
-    47.64207110610409,
-    48.22299226451468,
-    48.808024568002054,
-    49.3971762874833,
-    49.9904556690408,
-    50.587870934119984,
-    51.189430279724725,
-    51.79514187861014,
-    52.40501387947288,
-    53.0190544071392,
-    53.637271562750364,
-    54.259673423945976,
-    54.88626804504493,
-    55.517063457223934,
-    56.15206766869424,
-    56.79128866487574,
-    57.43473440856916,
-    58.08241284012621,
-    58.734331877617365,
-    59.39049941699807,
-    60.05092333227251,
-    60.715611475655585,
-    61.38457167773311,
-    62.057811747619894,
-    62.7353394731159,
-    63.417162620860914,
-    64.10328893648692,
-    64.79372614476921,
-    65.48848194977529,
-    66.18756403501224,
-    66.89098006357258,
-    67.59873767827808,
-    68.31084450182222,
-    69.02730813691093,
-    69.74813616640164,
-    70.47333615344107,
-    71.20291564160104,
-    71.93688215501312,
-    72.67524319850172,
-    73.41800625771542,
-    74.16517879925733,
-    74.9167682708136,
-    75.67278210128072,
-    76.43322770089146,
-    77.1981124613393,
-    77.96744375590167,
-    78.74122893956174,
-    79.51947534912904,
-    80.30219030335869,
-    81.08938110306934,
-    81.88105503125999,
-    82.67721935322541,
-    83.4778813166706,
-    84.28304815182372,
-    85.09272707154808,
-    85.90692527145302,
-    86.72564993000343,
-    87.54890820862819,
-    88.3767072518277,
-    89.2090541872801,
-    90.04595612594655,
-    90.88742016217518,
-    91.73345337380438,
-    92.58406282226491,
-    93.43925555268066,
-    94.29903859396902,
-    95.16341895893969,
-    96.03240364439274,
-    96.9059996312159,
-    97.78421388448044,
-    98.6670533535366,
-    99.55452497210776,
-  ]
-
-  /// Sanitizes a small enough angle in radians.
-  ///
-  /// [angle] An angle in radians; must not deviate too much from 0.
-  /// Returns A coterminal angle between 0 and 2pi.
-  static private func sanitizeRadians(_ angle: Double) -> Double {
-    return (angle + Double.pi * 8).truncatingRemainder(dividingBy: Double.pi * 2)
-  }
-
-  /// Delinearizes an RGB component, returning a floating-point
-  /// number.
-  ///
-  /// 0.0 <= [rgbComponent] <= 100.0 represents linear R/G/B channel.
-  /// 0.0 <= output <= 255.0, color channel converted to regular RGB
-  /// space.
-  static private func trueDelinearized(_ rgbComponent: Double) -> Double {
-    let normalized = rgbComponent / 100.0
-    var delinearized = 0.0
-    if normalized <= 0.0031308 {
-      delinearized = normalized * 12.92
-    } else {
-      delinearized = 1.055 * pow(normalized, 1.0 / 2.4) - 0.055
-    }
-    return delinearized * 255.0
-  }
-
-  static private func chromaticAdaptation(_ component: Double) -> Double {
-    let af = pow(abs(component), 0.42)
-    return Double(MathUtils.signum(component)) * 400.0 * af / (af + 27.13)
-  }
-
-  /// Returns the hue of [linrgb], a linear RGB color, in CAM16, in
-  /// radians.
-  static private func hueOf(_ linrgb: [Double]) -> Double {
-    let scaledDiscount = MathUtils.matrixMultiply(linrgb, scaledDiscountFromLinrgb)
-    let rA = chromaticAdaptation(scaledDiscount[0])
-    let gA = chromaticAdaptation(scaledDiscount[1])
-    let bA = chromaticAdaptation(scaledDiscount[2])
-    // redness-greenness
-    let a = (11.0 * rA + -12.0 * gA + bA) / 11.0
-    // yellowness-blueness
-    let b = (rA + gA - 2.0 * bA) / 9.0
-    return atan2(b, a)
-  }
-
-  static private func areInCyclicOrder(_ a: Double, _ b: Double, _ c: Double) -> Bool {
-    let deltaAB = sanitizeRadians(b - a)
-    let deltaAC = sanitizeRadians(c - a)
-    return deltaAB < deltaAC
-  }
-
-  /// Solves the lerp equation.
-  ///
-  /// Returns a number t such that lerp([source], [target], t) =
-  /// [mid].
-  static private func intercept(_ source: Double, _ mid: Double, _ target: Double) -> Double {
-    return (mid - source) / (target - source)
-  }
-
-  static private func lerpPoint(_ source: [Double], _ t: Double, _ target: [Double]) -> [Double] {
-    return [
-      source[0] + (target[0] - source[0]) * t,
-      source[1] + (target[1] - source[1]) * t,
-      source[2] + (target[2] - source[2]) * t,
-    ]
-  }
-
-  /// Intersects a segment with a plane.
-  ///
-  /// Returns the intersection point of:
-  /// - the segment with [source] and [target] as its endpoints, and
-  /// - the plane
-  /// ... R = [coordinate] if [axis] == 0
-  /// ... G = [coordinate] if [axis] == 1
-  /// ... B = [coordinate] if [axis] == 2
-  static private func setCoordinate(
-    _ source: [Double], _ coordinate: Double, _ target: [Double], _ axis: Int
-  ) -> [Double] {
-    let t = intercept(source[axis], coordinate, target[axis])
-    return lerpPoint(source, t, target)
-  }
-
-  static private func isBounded(_ x: Double) -> Bool {
-    return 0 <= x && x <= 100
-  }
-
-  /// Returns the nth possible vertex of the polygonal intersection.
-  ///
-  /// Given a plane Y = [y] and an zero-based index [n] such that 0
-  /// <= [n] <= 11, returns the nth possible vertex of the polygonal
-  /// intersection of the plane and the RGB cube, in linear RGB
-  /// coordinates, if it exists.
-  /// If this possible vertex lies outside of the cube, [-1.0, -1.0,
-  /// -1.0] is returned.
-  static private func nthVertex(_ y: Double, _ n: Int) -> [Double] {
-    let kR = yFromLinrgb[0]
-    let kG = yFromLinrgb[1]
-    let kB = yFromLinrgb[2]
-    let coordA = n % 4 <= 1 ? 0.0 : 100.0
-    let coordB = n % 2 == 0 ? 0.0 : 100.0
-    if n < 4 {
-      let g = coordA
-      let b = coordB
-      let r = (y - g * kG - b * kB) / kR
-      if isBounded(r) {
-        return [r, g, b]
-      } else {
-        return [-1, -1, -1]
-      }
-    } else if n < 8 {
-      let b = coordA
-      let r = coordB
-      let g = (y - r * kR - b * kB) / kG
-      if isBounded(g) {
-        return [r, g, b]
-      } else {
-        return [-1, -1, -1]
-      }
-    } else {
-      let r = coordA
-      let g = coordB
-      let b = (y - r * kR - g * kG) / kB
-      if isBounded(b) {
-        return [r, g, b]
-      } else {
-        return [-1, -1, -1]
-      }
-    }
-  }
-
-  /// Finds the segment containing the desired color.
-  ///
-  /// Given a plane Y = [y] and a desired [target_hue], returns the
-  /// segment containing the desired color, represented as an array of
-  /// its two endpoints.
-  static private func bisectToSegment(_ y: Double, _ targetHue: Double) -> [[Double]] {
-    var left: [Double] = [-1, -1, -1]
-    var right = left
-    var leftHue: Double = 0
-    var rightHue: Double = 0
-    var initialized = false
-    var uncut = true
-    for n in 0..<12 {
-      let mid = nthVertex(y, n)
-      if mid[0] < 0 {
-        continue
-      }
-      let midHue = hueOf(mid)
-      if !initialized {
-        left = mid
-        right = mid
-        leftHue = midHue
-        rightHue = midHue
-        initialized = true
-        continue
-      }
-      if uncut || areInCyclicOrder(leftHue, midHue, rightHue) {
-        uncut = false
-        if areInCyclicOrder(leftHue, targetHue, midHue) {
-          right = mid
-          rightHue = midHue
-        } else {
-          left = mid
-          leftHue = midHue
-        }
-      }
-    }
-    return [left, right]
-  }
-
-  static private func midPoint(_ a: [Double], _ b: [Double]) -> [Double] {
-    return [
-      (a[0] + b[0]) / 2,
-      (a[1] + b[1]) / 2,
-      (a[2] + b[2]) / 2,
-    ]
-  }
-
-  static private func criticalPlaneBelow(_ x: Double) -> Int {
-    return Int(floor(x - 0.5))
-  }
-
-  static private func criticalPlaneAbove(_ x: Double) -> Int {
-    return Int(ceil(x - 0.5))
-  }
-
-  /// Finds a color with the given Y and hue on the boundary of the
-  /// cube.
-  ///
-  /// Returns the color with the desired Y value [y] and hue
-  /// [targetHue], in linear RGB coordinates.
-  static private func bisectToLimit(_ y: Double, _ targetHue: Double) -> [Double] {
-    let segment = bisectToSegment(y, targetHue)
-    var left = segment[0]
-    var leftHue = hueOf(left)
-    var right = segment[1]
-    for axis in 0..<3 {
-      if left[axis] != right[axis] {
-        var lPlane = -1
-        var rPlane = 255
-        if left[axis] < right[axis] {
-          lPlane = criticalPlaneBelow(trueDelinearized(left[axis]))
-          rPlane = criticalPlaneAbove(trueDelinearized(right[axis]))
-        } else {
-          lPlane = criticalPlaneAbove(trueDelinearized(left[axis]))
-          rPlane = criticalPlaneBelow(trueDelinearized(right[axis]))
-        }
-        for _ in 0..<8 {
-          if abs(rPlane - lPlane) <= 1 {
-            break
-          } else {
-            let mPlane = Int(floor(Double(lPlane + rPlane) / 2))
-            let midPlaneCoordinate = criticalPlanes[mPlane]
-            let mid = setCoordinate(left, midPlaneCoordinate, right, axis)
-            let midHue = hueOf(mid)
-            if areInCyclicOrder(leftHue, targetHue, midHue) {
-              right = mid
-              rPlane = mPlane
-            } else {
-              left = mid
-              leftHue = midHue
-              lPlane = mPlane
-            }
-          }
-        }
-      }
-    }
-    return midPoint(left, right)
-  }
-
-  static private func inverseChromaticAdaptation(_ adapted: Double) -> Double {
-    let adaptedAbs = abs(adapted)
-    let base = max(0, 27.13 * adaptedAbs / (400 - adaptedAbs))
-    return Double(MathUtils.signum(adapted)) * pow(base, 1 / 0.42)
-  }
-
-  /// Finds a color with the given hue, chroma, and Y.
-  ///
-  /// Returns a color with the desired [hueRadians], [chroma], and
-  /// [y] as a hexadecimal integer, if found; and returns 0 otherwise.
-  static private func findResultByJ(_ hueRadians: Double, _ chroma: Double, _ y: Double) -> Int {
-    // Initial estimate of j.
-    var j = sqrt(y) * 11.0
-    // ===========================================================
-    // Operations inlined from Cam16 to avoid repeated calculation
-    // ===========================================================
-    let viewingConditions = ViewingConditions.standard()
-    let tInnerCoeff =
-      1
-      / pow(
-        1.64 - pow(0.29, viewingConditions.backgroundYTowhitePointY),
-        0.73
-      )
-    let eHue = 0.25 * (cos(hueRadians + 2.0) + 3.8)
-    let p1 = eHue * (50000.0 / 13.0) * viewingConditions.nC * viewingConditions.ncb
-    let hSin = sin(hueRadians)
-    let hCos = cos(hueRadians)
-    for iterationRound in 0..<5 {
-      // ===========================================================
-      // Operations inlined from Cam16 to avoid repeated calculation
-      // ===========================================================
-      let jNormalized = j / 100.0
-      let alpha = chroma == 0.0 || j == 0.0 ? 0.0 : chroma / sqrt(jNormalized)
-      let t = pow(alpha * tInnerCoeff, 1.0 / 0.9)
-      let ac =
-        viewingConditions.aw
-        * pow(
-          jNormalized,
-          1.0 / viewingConditions.c / viewingConditions.z
-        )
-      let p2 = ac / viewingConditions.nbb
-      let gamma = 23.0 * (p2 + 0.305) * t / (23.0 * p1 + 11 * t * hCos + 108.0 * t * hSin)
-      let a = gamma * hCos
-      let b = gamma * hSin
-      let rA = (460.0 * p2 + 451.0 * a + 288.0 * b) / 1403.0
-      let gA = (460.0 * p2 - 891.0 * a - 261.0 * b) / 1403.0
-      let bA = (460.0 * p2 - 220.0 * a - 6300.0 * b) / 1403.0
-      let rCScaled = inverseChromaticAdaptation(rA)
-      let gCScaled = inverseChromaticAdaptation(gA)
-      let bCScaled = inverseChromaticAdaptation(bA)
-      let linrgb = MathUtils.matrixMultiply(
-        [rCScaled, gCScaled, bCScaled],
-        linrgbFromScaledDiscount
-      )
-      // ===========================================================
-      // Operations inlined from Cam16 to avoid repeated calculation
-      // ===========================================================
-      if linrgb[0] < 0 || linrgb[1] < 0 || linrgb[2] < 0 {
-        return 0
-      }
-      let kR = yFromLinrgb[0]
-      let kG = yFromLinrgb[1]
-      let kB = yFromLinrgb[2]
-      let fnj = kR * linrgb[0] + kG * linrgb[1] + kB * linrgb[2]
-      if fnj <= 0 {
-        return 0
-      }
-      if iterationRound == 4 || abs(fnj - y) < 0.002 {
-        if linrgb[0] > 100.01 || linrgb[1] > 100.01 || linrgb[2] > 100.01 {
-          return 0
-        }
-        return ColorUtils.argbFromLinrgb(linrgb)
-      }
-      // Iterates with Newton method,
-      // Using 2 * fn(j) / j as the approximation of fn'(j)
-      j = j - (fnj - y) * j / (2 * fnj)
-    }
-    return 0
-  }
-
-  /// Finds an sRGB color with the given hue, chroma, and L*, if
-  /// possible.
-  ///
-  /// Returns a hexadecimal representing a sRGB color with its hue,
-  /// chroma, and L* sufficiently close to [hueDegrees], [chroma], and
-  /// [lstar], respectively. If it is impossible to satisfy all three
-  /// constraints, the hue and L* will be sufficiently close, and the
-  /// chroma will be maximized.
-  static func solveToInt(_ hueDegrees: Double, _ chroma: Double, _ lstar: Double) -> Int {
-    if chroma < 0.0001 || lstar < 0.0001 || lstar > 99.9999 {
-      return ColorUtils.argbFromLstar(lstar)
-    }
-    let hueDegrees = MathUtils.sanitizeDegreesDouble(hueDegrees)
-    let hueRadians = hueDegrees / 180 * Double.pi
-    let y = ColorUtils.yFromLstar(lstar)
-    let exactAnswer = findResultByJ(hueRadians, chroma, y)
-    if exactAnswer != 0 {
-      return exactAnswer
-    }
-    let linrgb = bisectToLimit(y, hueRadians)
-    return ColorUtils.argbFromLinrgb(linrgb)
-  }
-
-  /// Finds a CAM16 object with the given hue, chroma, and L*, if
-  /// possible.
-  ///
-  /// Returns a CAM16 object representing a sRGB color with its hue,
-  /// chroma, and L* sufficiently close to [hueDegrees], [chroma], and
-  /// [lstar], respectively. If it is impossible to satisfy all three
-  /// constraints, the hue and L* will be sufficiently close, and the
-  /// chroma will be maximized.
-  static func solveToCam(_ hueDegrees: Double, _ chroma: Double, _ lstar: Double) -> Cam16 {
-    return Cam16.fromInt(solveToInt(hueDegrees, chroma, lstar))
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Hct/ViewingConditions.swift b/swift/Sources/MaterialColorUtilities/Hct/ViewingConditions.swift
deleted file mode 100644
index b3c06d9c..00000000
--- a/swift/Sources/MaterialColorUtilities/Hct/ViewingConditions.swift
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-/// In traditional color spaces, a color can be identified solely by the
-/// observer's measurement of the color. Color appearance models such as CAM16
-/// also use information about the environment where the color was
-/// observed, known as the viewing conditions.
-///
-/// For example, white under the traditional assumption of a midday sun white
-/// point is accurately measured as a slightly chromatic blue by CAM16.
-/// (roughly, hue 203, chroma 3, lightness 100)
-///
-/// This class caches intermediate values of the CAM16 conversion process that
-/// depend only on viewing conditions, enabling speed ups.
-public class ViewingConditions {
-  public static func standard() -> ViewingConditions {
-    return sRgb()
-  }
-
-  public static func sRgb() -> ViewingConditions {
-    return make()
-  }
-
-  let whitePoint: [Double]
-  let adaptingLuminance: Double
-  let backgroundLstar: Double
-  let surround: Double
-  let discountingIlluminant: Bool
-
-  let backgroundYTowhitePointY: Double
-  let aw: Double
-  let nbb: Double
-  let ncb: Double
-  let c: Double
-  let nC: Double
-  let drgbInverse: [Double]
-  let rgbD: [Double]
-  let fl: Double
-  let fLRoot: Double
-  let z: Double
-
-  init(
-    whitePoint: [Double],
-    adaptingLuminance: Double,
-    backgroundLstar: Double,
-    surround: Double,
-    discountingIlluminant: Bool,
-    backgroundYTowhitePointY: Double,
-    aw: Double,
-    nbb: Double,
-    ncb: Double,
-    c: Double,
-    nC: Double,
-    drgbInverse: [Double],
-    rgbD: [Double],
-    fl: Double,
-    fLRoot: Double,
-    z: Double
-  ) {
-    self.whitePoint = whitePoint
-    self.adaptingLuminance = adaptingLuminance
-    self.backgroundLstar = backgroundLstar
-    self.surround = surround
-    self.discountingIlluminant = discountingIlluminant
-
-    self.backgroundYTowhitePointY = backgroundYTowhitePointY
-    self.aw = aw
-    self.nbb = nbb
-    self.ncb = ncb
-    self.c = c
-    self.nC = nC
-    self.drgbInverse = drgbInverse
-    self.rgbD = rgbD
-    self.fl = fl
-    self.fLRoot = fLRoot
-    self.z = z
-  }
-
-  /// Convenience constructor for [ViewingConditions].
-  ///
-  /// Parameters affecting color appearance include:
-  /// [whitePoint]: coordinates of white in XYZ color space.
-  /// [adaptingLuminance]: light strength, in lux.
-  /// [backgroundLstar]: average luminance of 10 degrees around color.
-  /// [surround]: brightness of the entire environment.
-  /// [discountingIlluminant]: whether eyes have adjusted to lighting.
-  public static func make(
-    whitePoint: [Double]? = nil,
-    adaptingLuminance: Double = -1,
-    backgroundLstar: Double = 50,
-    surround: Double = 2,
-    discountingIlluminant: Bool = false
-  ) -> ViewingConditions {
-    let whitePoint = whitePoint ?? ColorUtils.whitePointD65
-
-    let adaptingLuminance =
-      (adaptingLuminance > 0)
-      ? adaptingLuminance
-      : (200 / Double.pi * ColorUtils.yFromLstar(50) / 100)
-    // A background of pure black is non-physical and leads to infinities that
-    // represent the idea that any color viewed in pure black can't be seen.
-    let backgroundLstar = max(0.1, backgroundLstar)
-    // Transform test illuminant white in XYZ to 'cone'/'rgb' responses
-    let xyz = whitePoint
-    let rW = xyz[0] * 0.401288 + xyz[1] * 0.650173 + xyz[2] * -0.051461
-    let gW = xyz[0] * -0.250268 + xyz[1] * 1.204414 + xyz[2] * 0.045854
-    let bW = xyz[0] * -0.002079 + xyz[1] * 0.048952 + xyz[2] * 0.953127
-
-    // Scale input surround, domain (0, 2), to CAM16 surround, domain (0.8, 1.0)
-    assert(surround >= 0 && surround <= 2)
-    let f = 0.8 + (surround / 10.0)
-    // "Exponential non-linearity"
-    let c =
-      (f >= 0.9)
-      ? MathUtils.lerp(0.59, 0.69, ((f - 0.9) * 10.0))
-      : MathUtils.lerp(0.525, 0.59, ((f - 0.8) * 10.0))
-    // Calculate degree of adaptation to illuminant
-    var d =
-      discountingIlluminant
-      ? 1.0
-      : f * (1.0 - ((1.0 / 3.6) * exp((-adaptingLuminance - 42.0) / 92.0)))
-    // Per Li et al, if D is greater than 1 or less than 0, set it to 1 or 0.
-    d =
-      (d > 1.0)
-      ? 1.0
-      : (d < 0.0)
-        ? 0.0
-        : d
-    // chromatic induction factor
-    let nc = f
-
-    // Cone responses to the whitePoint, r/g/b/W, adjusted for discounting.
-    //
-    // Why use 100.0 instead of the white point's relative luminance?
-    //
-    // Some papers and implementations, for both CAM02 and CAM16, use the Y
-    // value of the reference white instead of 100. Fairchild's Color Appearance
-    // Models (3rd edition) notes that this is in error: it was included in the
-    // CIE 2004a report on CIECAM02, but, later parts of the conversion process
-    // account for scaling of appearance relative to the white point relative
-    // luminance. This part should simply use 100 as luminance.
-    let rgbD: [Double] = [
-      d * (100.0 / rW) + 1.0 - d,
-      d * (100.0 / gW) + 1.0 - d,
-      d * (100.0 / bW) + 1.0 - d,
-    ]
-
-    // Factor used in calculating meaningful factors
-    let k = 1.0 / (5.0 * adaptingLuminance + 1.0)
-    let k4 = k * k * k * k  // pow(k, 4)
-    let k4F = 1 - k4
-
-    // Luminance-level adaptation factor
-    let fl = (k4 * adaptingLuminance) + (0.1 * k4F * k4F * pow(5.0 * adaptingLuminance, 1.0 / 3.0))
-    // Intermediate factor, ratio of background relative luminance to white relative luminance
-    let n = ColorUtils.yFromLstar(backgroundLstar) / whitePoint[1]
-
-    // Base exponential nonlinearity
-    // note Schlomer 2018 has a typo and uses 1.58, the correct factor is 1.48
-    let z = 1.48 + sqrt(n)
-
-    // Luminance-level induction factors
-    let nbb = 0.725 / pow(n, 0.2)
-    let ncb = nbb
-
-    // Discounted cone responses to the white point, adjusted for post-saturationtic
-    // adaptation perceptual nonlinearities.
-    let rgbAFactors: [Double] = [
-      pow(fl * rgbD[0] * rW / 100.0, 0.42),
-      pow(fl * rgbD[1] * gW / 100.0, 0.42),
-      pow(fl * rgbD[2] * bW / 100.0, 0.42),
-    ]
-
-    let rgbA: [Double] = [
-      (400.0 * rgbAFactors[0]) / (rgbAFactors[0] + 27.13),
-      (400.0 * rgbAFactors[1]) / (rgbAFactors[1] + 27.13),
-      (400.0 * rgbAFactors[2]) / (rgbAFactors[2] + 27.13),
-    ]
-
-    let aw = (40.0 * rgbA[0] + 20.0 * rgbA[1] + rgbA[2]) / 20.0 * nbb
-
-    return ViewingConditions(
-      whitePoint: whitePoint,
-      adaptingLuminance: adaptingLuminance,
-      backgroundLstar: backgroundLstar,
-      surround: surround,
-      discountingIlluminant: discountingIlluminant,
-      backgroundYTowhitePointY: n,
-      aw: aw,
-      nbb: nbb,
-      ncb: ncb,
-      c: c,
-      nC: nc,
-      drgbInverse: [0.0, 0.0, 0.0],
-      rgbD: rgbD,
-      fl: fl,
-      fLRoot: Double(pow(fl, 0.25)),
-      z: z
-    )
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Palettes/CorePalettes.swift b/swift/Sources/MaterialColorUtilities/Palettes/CorePalettes.swift
deleted file mode 100644
index 0343da5c..00000000
--- a/swift/Sources/MaterialColorUtilities/Palettes/CorePalettes.swift
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/// Comprises foundational palettes to build a color scheme.
-///
-/// Generated from a source color, these palettes will then be part of a [DynamicScheme] together
-/// with appearance preferences.
-protocol CorePalettes {
-  var primary: TonalPalette { get }
-  var secondary: TonalPalette { get }
-  var tertiary: TonalPalette { get }
-  var neutral: TonalPalette { get }
-  var neutralVariant: TonalPalette { get }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Palettes/TonalPalette.swift b/swift/Sources/MaterialColorUtilities/Palettes/TonalPalette.swift
deleted file mode 100644
index da951263..00000000
--- a/swift/Sources/MaterialColorUtilities/Palettes/TonalPalette.swift
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-/// A convenience class for retrieving colors that are constant in hue and
-/// chroma, but vary in tone.
-///
-/// This class can be instantiated in two ways:
-/// 1. [of] From hue and chroma. (preferred)
-/// 2. [fromList] From a fixed-size ([TonalPalette.commonSize]) list of ints
-/// representing ARBG colors. Correctness (constant hue and chroma) of the input
-/// is not enforced. [get] will only return the input colors, corresponding to
-/// [commonTones].
-public class TonalPalette: Equatable, Hashable {
-  /// Commonly-used tone values.
-  public static let commonTones = [
-    0,
-    10,
-    20,
-    30,
-    40,
-    50,
-    60,
-    70,
-    80,
-    90,
-    95,
-    99,
-    100,
-  ]
-
-  static var commonSize: Int {
-    return commonTones.count
-  }
-
-  private let _hue: Double
-  public var hue: Double {
-    return _hue
-  }
-  private let _chroma: Double
-  public var chroma: Double {
-    return _chroma
-  }
-  private let _keyColor: Hct
-  var keyColor: Hct {
-    return _keyColor
-  }
-
-  var _cache: [Double: Int]
-
-  private init(hue: Double, chroma: Double, keyColor: Hct, cache: [Double: Int]) {
-    self._hue = hue
-    self._chroma = chroma
-    self._keyColor = keyColor
-    self._cache = cache
-  }
-
-  convenience init(hct: Hct) {
-    self.init(
-      hue: hct.hue,
-      chroma: hct.chroma,
-      keyColor: hct,
-      cache: [:]
-    )
-  }
-
-  convenience init(hue: Double, chroma: Double) {
-    self.init(
-      hue: hue,
-      chroma: chroma,
-      keyColor: KeyColor(hue: hue, requestedChroma: chroma).create(),
-      cache: [:]
-    )
-  }
-
-  /// Create a Tonal Palette from hue and chroma of [hct].
-  public static func fromHct(_ hct: Hct) -> TonalPalette {
-    return TonalPalette(hct: hct)
-  }
-
-  /// Create a Tonal Palette from hue and chroma, which generates a key color.
-  static func fromHueAndChroma(_ hue: Double, _ chroma: Double) -> TonalPalette {
-    return TonalPalette(hue: hue, chroma: chroma)
-  }
-
-  /// Create colors using [hue] and [chroma].
-  public static func of(_ hue: Double, _ chroma: Double) -> TonalPalette {
-    return TonalPalette(hue: hue, chroma: chroma)
-  }
-
-  /// Returns the ARGB representation of an Hct color.
-  ///
-  /// If the class was instantiated from [_hue] and [_chroma], will return the
-  /// color with corresponding [tone].
-  /// If the class was instantiated from a fixed-size list of color ints, [tone]
-  /// must be in [commonTones].
-  public func tone(_ tone: Double) -> Int {
-    if _cache[tone] == nil {
-      _cache[tone] = Hct.from(hue, chroma, tone).toInt()
-    }
-    return _cache[tone]!
-  }
-
-  public func getHct(_ tone: Double) -> Hct {
-    return Hct.fromInt(self.tone(tone))
-  }
-
-  func isEqual(to other: TonalPalette) -> Bool {
-    return _hue == other._hue && _chroma == other._chroma
-  }
-
-  public static func == (lhs: TonalPalette, rhs: TonalPalette) -> Bool {
-    return type(of: lhs) == type(of: rhs) && lhs.isEqual(to: rhs)
-  }
-
-  public func hash(into hasher: inout Hasher) {
-    hasher.combine(_hue)
-    hasher.combine(_chroma)
-  }
-
-  public var description: String {
-    return "TonalPalette.of(\(hue), \(chroma))"
-  }
-}
-
-/// Key color is a color that represents the hue and chroma of a tonal palette.
-private class KeyColor {
-  let hue: Double
-  let requestedChroma: Double
-
-  /// Cache that maps (hue, tone) to max chroma to avoid duplicated Hct calculation.
-  private var chromaCache: [Int: Double] = [:]
-  private let maxChromaValue = 200.0
-
-  init(hue: Double, requestedChroma: Double) {
-    self.hue = hue
-    self.requestedChroma = requestedChroma
-  }
-
-  /// Creates a key color from a [hue] and a [chroma].
-  /// The key color is the first tone, starting from T50, matching the given hue and chroma.
-  /// Key color [Hct]
-  func create() -> Hct {
-    /// Pivot around T50 because T50 has the most chroma available, on average. Thus it is most
-    /// likely to have a direct answer.
-    let pivotTone = 50
-    let toneStepSize = 1
-    /// Epsilon to accept values slightly higher than the requested chroma.
-    let epsilon = 0.01
-
-    /// Binary search to find the tone that can provide a chroma that is closest
-    /// to the requested chroma.
-    var lowerTone = 0
-    var upperTone = 100
-
-    while lowerTone < upperTone {
-      let midTone = (lowerTone + upperTone) / 2
-      let isAscending =
-        maxChroma(tone: midTone) < maxChroma(tone: midTone + toneStepSize)
-      let sufficientChroma = maxChroma(tone: midTone) >= requestedChroma - epsilon
-
-      if sufficientChroma {
-        /// Either range [lowerTone, midTone] or [midTone, upperTone] has answer, so search in the
-        /// range that is closer the pivot tone.
-        if abs(lowerTone - pivotTone) < abs(upperTone - pivotTone) {
-          upperTone = midTone
-        } else {
-          if lowerTone == midTone {
-            return Hct.from(hue, requestedChroma, Double(lowerTone))
-          }
-          lowerTone = midTone
-        }
-      } else if isAscending {
-        /// As there is no sufficient chroma in the midTone, follow the direction to the chroma
-        /// peak.
-        lowerTone = midTone + toneStepSize
-      } else {
-        /// Keep midTone for potential chroma peak.
-        upperTone = midTone
-      }
-    }
-
-    return Hct.from(hue, requestedChroma, Double(lowerTone))
-  }
-
-  /// Find the maximum chroma for a given tone
-  private func maxChroma(tone: Int) -> Double {
-    return chromaCache[tone]
-      ?? {
-        let chroma = Hct.from(self.hue, self.maxChromaValue, Double(tone)).chroma
-        chromaCache[tone] = chroma
-        return chroma
-      }()
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Quantize/PointProvider.swift b/swift/Sources/MaterialColorUtilities/Quantize/PointProvider.swift
deleted file mode 100644
index 0a22611c..00000000
--- a/swift/Sources/MaterialColorUtilities/Quantize/PointProvider.swift
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-public protocol PointProvider {
-  func fromInt(_ argb: Int) -> [Double]
-  func toInt(_ lab: [Double]) -> Int
-  func distance(_ one: [Double], _ two: [Double]) -> Double
-}
diff --git a/swift/Sources/MaterialColorUtilities/Quantize/PointProviderLab.swift b/swift/Sources/MaterialColorUtilities/Quantize/PointProviderLab.swift
deleted file mode 100644
index d160b3a8..00000000
--- a/swift/Sources/MaterialColorUtilities/Quantize/PointProviderLab.swift
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-public class PointProviderLab: PointProvider {
-  public init() {}
-
-  public func fromInt(_ argb: Int) -> [Double] {
-    return ColorUtils.labFromArgb(argb)
-  }
-
-  public func toInt(_ lab: [Double]) -> Int {
-    return ColorUtils.argbFromLab(lab[0], lab[1], lab[2])
-  }
-
-  public func distance(_ one: [Double], _ two: [Double]) -> Double {
-    let dL = (one[0] - two[0])
-    let dA = (one[1] - two[1])
-    let dB = (one[2] - two[2])
-    // Standard CIE 1976 delta E formula also takes the square root, unneeded
-    // here. This method is used by quantization algorithms to compare distance,
-    // and the relative ordering is the same, with or without a square root.
-
-    // This relatively minor optimization is helpful because this method is
-    // called at least once for each pixel in an image.
-    return (dL * dL + dA * dA + dB * dB)
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Quantize/Quantizer.swift b/swift/Sources/MaterialColorUtilities/Quantize/Quantizer.swift
deleted file mode 100644
index 757b9aab..00000000
--- a/swift/Sources/MaterialColorUtilities/Quantize/Quantizer.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-protocol Quantizer {
-  func quantize(_ pixels: [Int], _ maxColors: Int, returnInputPixelToClusterPixel: Bool)
-    -> QuantizerResult
-}
-
-public class QuantizerResult {
-  public let colorToCount: [Int: Int]
-  public let inputPixelToClusterPixel: [Int: Int]
-
-  public init(_ colorToCount: [Int: Int], inputPixelToClusterPixel: [Int: Int] = [:]) {
-    self.colorToCount = colorToCount
-    self.inputPixelToClusterPixel = inputPixelToClusterPixel
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Quantize/QuantizerCelebi.swift b/swift/Sources/MaterialColorUtilities/Quantize/QuantizerCelebi.swift
deleted file mode 100644
index dd37ffbd..00000000
--- a/swift/Sources/MaterialColorUtilities/Quantize/QuantizerCelebi.swift
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-public class QuantizerCelebi: Quantizer {
-  public init() {}
-  public func quantize(
-    _ pixels: [Int], _ maxColors: Int, returnInputPixelToClusterPixel: Bool = false
-  )
-    -> QuantizerResult
-  {
-    let wu = QuantizerWu()
-    let wuResult = wu.quantize(pixels, maxColors)
-    let wsmeansResult = QuantizerWsmeans.quantize(
-      pixels,
-      maxColors,
-      startingClusters: Array(wuResult.colorToCount.keys).sorted(by: { $0 > $1 }),
-      pointProvider: PointProviderLab(),
-      returnInputPixelToClusterPixel: returnInputPixelToClusterPixel
-    )
-    return wsmeansResult
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Quantize/QuantizerMap.swift b/swift/Sources/MaterialColorUtilities/Quantize/QuantizerMap.swift
deleted file mode 100644
index be0550eb..00000000
--- a/swift/Sources/MaterialColorUtilities/Quantize/QuantizerMap.swift
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-public class QuantizerMap: Quantizer {
-  public func quantize(
-    _ pixels: [Int], _ maxColors: Int, returnInputPixelToClusterPixel: Bool = false
-  )
-    -> QuantizerResult
-  {
-    var countByColor: [Int: Int] = [:]
-    for pixel in pixels {
-      let alpha = ColorUtils.alphaFromArgb(pixel)
-      if alpha < 255 {
-        continue
-      }
-      countByColor[pixel] = (countByColor[pixel] ?? 0) + 1
-    }
-    return QuantizerResult(countByColor)
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Quantize/QuantizerWsmeans.swift b/swift/Sources/MaterialColorUtilities/Quantize/QuantizerWsmeans.swift
deleted file mode 100644
index 85440cae..00000000
--- a/swift/Sources/MaterialColorUtilities/Quantize/QuantizerWsmeans.swift
+++ /dev/null
@@ -1,292 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-class DistanceAndIndex: Comparable {
-  func compareTo(_ other: DistanceAndIndex) -> Int {
-    if distance < other.distance {
-      return -1
-    } else if distance > other.distance {
-      return 1
-    } else {
-      return 0
-    }
-  }
-
-  static func < (lhs: DistanceAndIndex, rhs: DistanceAndIndex) -> Bool {
-    return lhs.distance < rhs.distance
-  }
-
-  static func == (lhs: DistanceAndIndex, rhs: DistanceAndIndex) -> Bool {
-    return lhs.distance != rhs.distance
-  }
-
-  var distance: Double
-  var index: Int
-
-  init(_ distance: Double, _ index: Int) {
-    self.distance = distance
-    self.index = index
-  }
-}
-
-public class QuantizerWsmeans {
-  static var debug: Bool = false
-
-  static func debugLog(_ log: String) {
-    if debug {
-      print(log)
-    }
-  }
-
-  public static func quantize(
-    _ inputPixels: [Int],
-    _ maxColors: Int,
-    startingClusters: [Int] = [],
-    pointProvider: PointProvider = PointProviderLab(),
-    maxIterations: Int = 5,
-    returnInputPixelToClusterPixel: Bool = false
-  ) -> QuantizerResult {
-    var pixelToCount: [Int: Int] = [:]
-    var points: [[Double]] = []
-    var pixels: [Int] = []
-    var pointCount = 0
-    for inputPixel in inputPixels {
-      var pixelCount = pixelToCount[inputPixel]
-      if pixelCount == nil {
-        pixelCount = 1
-        pixelToCount[inputPixel] = pixelCount
-      } else {
-        pixelCount = pixelCount! + 1
-        pixelToCount[inputPixel] = pixelCount
-      }
-      if pixelCount == 1 {
-        pointCount = pointCount + 1
-        points.append(pointProvider.fromInt(inputPixel))
-        pixels.append(inputPixel)
-      }
-    }
-
-    var counts = [Int](repeating: 0, count: pointCount)
-    for i in 0.. 0 {
-      var seedGenerator = RandomNumberWithSeed(0x42688)
-      var indices: [Int] = []
-      for _ in 0..= 4 * previousDistance {
-            continue
-          }
-          let distance = pointProvider.distance(point, clusters[j])
-          if distance < minimumDistance {
-            minimumDistance = distance
-            newClusterIndex = j
-          }
-        }
-        if newClusterIndex != -1 {
-          pointsMoved = pointsMoved + 1
-          clusterIndices[i] = newClusterIndex
-        }
-      }
-
-      if pointsMoved == 0 && iteration > 0 {
-        QuantizerWsmeans.debugLog("terminated after \(iteration) k-means iterations")
-        break
-      }
-
-      QuantizerWsmeans.debugLog("iteration \(iteration + 1) moved \(pointsMoved)")
-      var componentASums = [Double](repeating: 0, count: clusterCount)
-      var componentBSums = [Double](repeating: 0, count: clusterCount)
-      var componentCSums = [Double](repeating: 0, count: clusterCount)
-
-      for i in 0..(_ count: Int, _ callback: (_ index: Int) -> T) -> [T] {
-  var results: [T] = []
-  for index in 0.. UInt64 {
-    return UInt64(drand48() * Double(Int.max))
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Quantize/QuantizerWu.swift b/swift/Sources/MaterialColorUtilities/Quantize/QuantizerWu.swift
deleted file mode 100644
index 64ef4125..00000000
--- a/swift/Sources/MaterialColorUtilities/Quantize/QuantizerWu.swift
+++ /dev/null
@@ -1,418 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-public class QuantizerWu: Quantizer {
-  var weights: [Int] = []
-  var momentsR: [Int] = []
-  var momentsG: [Int] = []
-  var momentsB: [Int] = []
-  var moments: [Double] = []
-  var cubes: [Box] = []
-
-  // A histogram of all the input colors is constructed. It has the shape of a
-  // cube. The cube would be too large if it contained all 16 million colors:
-  // historical best practice is to use 5 bits  of the 8 in each channel,
-  // reducing the histogram to a volume of ~32,000.
-  static let indexBits: Int = 5
-  static let maxIndex: Int = 32
-  static let sideLength: Int = 33
-  static let totalSize: Int = 35937
-
-  public func quantize(
-    _ pixels: [Int], _ maxColors: Int, returnInputPixelToClusterPixel: Bool = false
-  )
-    -> QuantizerResult
-  {
-    let result = QuantizerMap().quantize(pixels, maxColors)
-
-    var colorToPopulation = result.colorToCount.map({ (color: $0.key, population: $0.value) })
-      .sorted(by: { $0.population > $1.population })
-
-    constructHistogram(colorToPopulation)
-    computeMoments()
-    let createBoxesResult = createBoxes(maxColors)
-    let results = createResult(createBoxesResult.resultCount)
-    var colorToCount: [Int: Int] = [:]
-    for e in results {
-      colorToCount[e] = 0
-    }
-    return QuantizerResult(colorToCount)
-  }
-
-  public static func getIndex(_ r: Int, _ g: Int, _ b: Int) -> Int {
-    let indexBits = QuantizerWu.indexBits
-    let red = r << (indexBits * 2)
-    let green = r << (indexBits + 1)
-    let blue = g << indexBits
-    return red + green + blue + r + g + b
-  }
-
-  public func constructHistogram(_ pixels: [(color: Int, population: Int)]) {
-    weights = [Int](repeating: 0, count: QuantizerWu.totalSize)
-    momentsR = [Int](repeating: 0, count: QuantizerWu.totalSize)
-    momentsG = [Int](repeating: 0, count: QuantizerWu.totalSize)
-    momentsB = [Int](repeating: 0, count: QuantizerWu.totalSize)
-    moments = [Double](repeating: 0, count: QuantizerWu.totalSize)
-    for entry in pixels {
-      let pixel = entry.color
-      let count = entry.population
-
-      let red = ColorUtils.redFromArgb(pixel)
-      let green = ColorUtils.greenFromArgb(pixel)
-      let blue = ColorUtils.blueFromArgb(pixel)
-
-      let bitsToRemove = 8 - QuantizerWu.indexBits
-      let iR = (red >> bitsToRemove) + 1
-      let iG = (green >> bitsToRemove) + 1
-      let iB = (blue >> bitsToRemove) + 1
-      let index = QuantizerWu.getIndex(iR, iG, iB)
-
-      weights[index] += count
-      momentsR[index] += (red * count)
-      momentsG[index] += (green * count)
-      momentsB[index] += (blue * count)
-      moments[index] +=
-        (Double(count) * (Double(red * red) + Double(green * green) + Double(blue * blue)))
-    }
-  }
-
-  public func computeMoments() {
-    for r in 1.. CreateBoxesResult {
-    cubes = []
-    for _ in 0.. 1) ? variance(cubes[next]) : 0
-        volumeVariance[i] = (cubes[i].vol > 1) ? variance(cubes[i]) : 0
-      } else {
-        volumeVariance[next] = 0
-        i -= 1
-      }
-
-      next = 0
-      var temp = volumeVariance[0]
-      var j = 1
-      while j <= i {
-        if volumeVariance[j] > temp {
-          temp = volumeVariance[j]
-          next = j
-        }
-        j += 1
-      }
-      if temp <= 0 {
-        generatedColorCount = i + 1
-        break
-      }
-      i += 1
-    }
-
-    return CreateBoxesResult(
-      requestedCount: maxColorCount,
-      resultCount: generatedColorCount
-    )
-  }
-
-  public func createResult(_ colorCount: Int) -> [Int] {
-    var colors: [Int] = []
-    for i in 0.. 0 {
-        let r = Int(round(Double(QuantizerWu.volume(cube, momentsR)) / Double(weight)))
-        let g = Int(round(Double(QuantizerWu.volume(cube, momentsG)) / Double(weight)))
-        let b = Int(round(Double(QuantizerWu.volume(cube, momentsB)) / Double(weight)))
-        let color = ColorUtils.argbFromRgb(r, g, b)
-        colors.append(color)
-      }
-    }
-    return colors
-  }
-
-  public func variance(_ cube: Box) -> Double {
-    let dr = QuantizerWu.volume(cube, momentsR)
-    let dg = QuantizerWu.volume(cube, momentsG)
-    let db = QuantizerWu.volume(cube, momentsB)
-    let xx =
-      moments[QuantizerWu.getIndex(cube.r1, cube.g1, cube.b1)]
-      - moments[QuantizerWu.getIndex(cube.r1, cube.g1, cube.b0)]
-      - moments[QuantizerWu.getIndex(cube.r1, cube.g0, cube.b1)]
-      + moments[QuantizerWu.getIndex(cube.r1, cube.g0, cube.b0)]
-      - moments[QuantizerWu.getIndex(cube.r0, cube.g1, cube.b1)]
-      + moments[QuantizerWu.getIndex(cube.r0, cube.g1, cube.b0)]
-      + moments[QuantizerWu.getIndex(cube.r0, cube.g0, cube.b1)]
-      - moments[QuantizerWu.getIndex(cube.r0, cube.g0, cube.b0)]
-
-    let hypotenuse = (dr * dr + dg * dg + db * db)
-    let volume_ = QuantizerWu.volume(cube, weights)
-    return xx - Double(hypotenuse / volume_)
-  }
-
-  public func cut(_ one: Box, _ two: Box) -> Bool {
-    let wholeR = QuantizerWu.volume(one, momentsR)
-    let wholeG = QuantizerWu.volume(one, momentsG)
-    let wholeB = QuantizerWu.volume(one, momentsB)
-    let wholeW = QuantizerWu.volume(one, weights)
-
-    let maxRResult = maximize(
-      one, Direction.red, one.r0 + 1, one.r1, wholeR, wholeG, wholeB, wholeW)
-    let maxGResult = maximize(
-      one, Direction.green, one.g0 + 1, one.g1, wholeR, wholeG, wholeB, wholeW)
-    let maxBResult = maximize(
-      one, Direction.blue, one.b0 + 1, one.b1, wholeR, wholeG, wholeB, wholeW)
-
-    var cutDirection: Direction
-    let maxR = maxRResult.maximum
-    let maxG = maxGResult.maximum
-    let maxB = maxBResult.maximum
-    if maxR >= maxG && maxR >= maxB {
-      cutDirection = Direction.red
-      if maxRResult.cutLocation < 0 {
-        return false
-      }
-    } else if maxG >= maxR && maxG >= maxB {
-      cutDirection = Direction.green
-    } else {
-      cutDirection = Direction.blue
-    }
-
-    two.r1 = one.r1
-    two.g1 = one.g1
-    two.b1 = one.b1
-
-    switch cutDirection {
-    case Direction.red:
-      one.r1 = maxRResult.cutLocation
-      two.r0 = one.r1
-      two.g0 = one.g0
-      two.b0 = one.b0
-      break
-    case Direction.green:
-      one.g1 = maxGResult.cutLocation
-      two.r0 = one.r0
-      two.g0 = one.g1
-      two.b0 = one.b0
-      break
-    case Direction.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)
-    two.vol = (two.r1 - two.r0) * (two.g1 - two.g0) * (two.b1 - two.b0)
-    return true
-  }
-
-  public func maximize(
-    _ cube: Box, _ direction: Direction, _ first: Int, _ last: Int, _ wholeR: Int, _ wholeG: Int,
-    _ wholeB: Int, _ wholeW: Int
-  ) -> MaximizeResult {
-    let bottomR = QuantizerWu.bottom(cube, direction, momentsR)
-    let bottomG = QuantizerWu.bottom(cube, direction, momentsG)
-    let bottomB = QuantizerWu.bottom(cube, direction, momentsB)
-    let bottomW = QuantizerWu.bottom(cube, direction, weights)
-
-    var max: Double = 0
-    var cut: Int = -1
-
-    for i in first.. max {
-        max = temp
-        cut = i
-      }
-    }
-    return MaximizeResult(cutLocation: cut, maximum: max)
-  }
-
-  public static func volume(_ cube: Box, _ moment: [Int]) -> Int {
-    return
-      (moment[getIndex(cube.r1, cube.g1, cube.b1)] - moment[getIndex(cube.r1, cube.g1, cube.b0)]
-      - moment[getIndex(cube.r1, cube.g0, cube.b1)] + moment[getIndex(cube.r1, cube.g0, cube.b0)]
-      - moment[getIndex(cube.r0, cube.g1, cube.b1)] + moment[getIndex(cube.r0, cube.g1, cube.b0)]
-      + moment[getIndex(cube.r0, cube.g0, cube.b1)] - moment[getIndex(cube.r0, cube.g0, cube.b0)])
-  }
-
-  public static func bottom(_ cube: Box, _ direction: Direction, _ moment: [Int]) -> Int {
-    switch direction {
-    case Direction.red:
-      return -moment[getIndex(cube.r0, cube.g1, cube.b1)]
-        + moment[getIndex(cube.r0, cube.g1, cube.b0)] + moment[getIndex(cube.r0, cube.g0, cube.b1)]
-        - moment[getIndex(cube.r0, cube.g0, cube.b0)]
-    case Direction.green:
-      return -moment[getIndex(cube.r1, cube.g0, cube.b1)]
-        + moment[getIndex(cube.r1, cube.g0, cube.b0)] + moment[getIndex(cube.r0, cube.g0, cube.b1)]
-        - moment[getIndex(cube.r0, cube.g0, cube.b0)]
-    case Direction.blue:
-      return -moment[getIndex(cube.r1, cube.g1, cube.b0)]
-        + moment[getIndex(cube.r1, cube.g0, cube.b0)] + moment[getIndex(cube.r0, cube.g1, cube.b0)]
-        - moment[getIndex(cube.r0, cube.g0, cube.b0)]
-    }
-  }
-
-  public static func top(_ cube: Box, _ direction: Direction, _ position: Int, _ moment: [Int])
-    -> Int
-  {
-    switch direction {
-    case Direction.red:
-      return
-        (moment[getIndex(position, cube.g1, cube.b1)] - moment[getIndex(position, cube.g1, cube.b0)]
-        - moment[getIndex(position, cube.g0, cube.b1)]
-        + moment[getIndex(position, cube.g0, cube.b0)])
-    case Direction.green:
-      return
-        (moment[getIndex(cube.r1, position, cube.b1)] - moment[getIndex(cube.r1, position, cube.b0)]
-        - moment[getIndex(cube.r0, position, cube.b1)]
-        + moment[getIndex(cube.r0, position, cube.b0)])
-    case Direction.blue:
-      return
-        (moment[getIndex(cube.r1, cube.g1, position)] - moment[getIndex(cube.r1, cube.g0, position)]
-        - moment[getIndex(cube.r0, cube.g1, position)]
-        + moment[getIndex(cube.r0, cube.g0, position)])
-    }
-  }
-}
-
-public enum Direction {
-  case red
-  case green
-  case blue
-}
-
-public class MaximizeResult {
-  // < 0 if cut impossible
-  var cutLocation: Int
-  var maximum: Double
-
-  init(cutLocation: Int, maximum: Double) {
-    self.cutLocation = cutLocation
-    self.maximum = maximum
-  }
-}
-
-public class CreateBoxesResult {
-  var requestedCount: Int
-  var resultCount: Int
-
-  init(requestedCount: Int, resultCount: Int) {
-    self.requestedCount = requestedCount
-    self.resultCount = resultCount
-  }
-}
-
-public class Box {
-  var r0: Int
-  var r1: Int
-  var g0: Int
-  var g1: Int
-  var b0: Int
-  var b1: Int
-  var vol: Int
-
-  init(r0: Int = 0, r1: Int = 0, g0: Int = 0, g1: Int = 0, b0: Int = 0, b1: Int = 0, vol: Int = 0) {
-    self.r0 = r0
-    self.r1 = r1
-    self.g0 = g0
-    self.g1 = g1
-    self.b0 = b0
-    self.b1 = b1
-    self.vol = vol
-  }
-
-  public var description: String {
-    return "Box R \(r0) -> \(r1) G \(g0) -> \(g1) B \(b0) -> \(b1) VOL = \(vol)"
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Scheme/SchemeContent.swift b/swift/Sources/MaterialColorUtilities/Scheme/SchemeContent.swift
deleted file mode 100644
index 65adcefd..00000000
--- a/swift/Sources/MaterialColorUtilities/Scheme/SchemeContent.swift
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2023-2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-/// A scheme that places the source color in [Scheme.primaryContainer].
-///
-/// Primary Container is the source color, adjusted for color relativity.
-/// It maintains constant appearance in light mode and dark mode.
-/// This adds ~5 tone in light mode, and subtracts ~5 tone in dark mode.
-///
-/// Tertiary Container is an analogous color, specifically, the analog of a
-/// color wheel divided into 6, and the precise analog is the one found by
-/// increasing hue. It also maintains constant appearance.
-public class SchemeContent: DynamicScheme {
-  public convenience init(sourceColorHct: Hct, isDark: Bool, contrastLevel: Double) {
-    let palettes = CorePalettesContent(sourceColorHct: sourceColorHct)
-    self.init(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel)
-  }
-
-  fileprivate init(
-    sourceColorHct: Hct, palettes: CorePalettes, isDark: Bool, contrastLevel: Double
-  ) {
-    super.init(
-      sourceColorHct: sourceColorHct,
-      variant: .content,
-      isDark: isDark,
-      contrastLevel: contrastLevel,
-      primaryPalette: palettes.primary,
-      secondaryPalette: palettes.secondary,
-      tertiaryPalette: palettes.tertiary,
-      neutralPalette: palettes.neutral,
-      neutralVariantPalette: palettes.neutralVariant
-    )
-  }
-}
-
-/// Use [SchemeContentProvider] when you need to create multiple [SchemeContent] from the same
-/// source color.
-///
-/// This provider reduces overlapped computation by reusing tonal palettes.
-public struct SchemeContentProvider: DynamicSchemeProvider {
-  private let sourceColorHct: Hct
-  private let palettes: CorePalettes
-
-  public init(sourceColorHct: Hct) {
-    self.sourceColorHct = sourceColorHct
-    self.palettes = CorePalettesContent(sourceColorHct: sourceColorHct)
-  }
-
-  public func scheme(isDark: Bool, contrastLevel: Double) -> DynamicScheme {
-    SchemeContent(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel)
-  }
-}
-
-/// Core palettes of [SchemeContent].
-struct CorePalettesContent: CorePalettes {
-  let primary: TonalPalette
-  let secondary: TonalPalette
-  let tertiary: TonalPalette
-  let neutral: TonalPalette
-  let neutralVariant: TonalPalette
-
-  init(sourceColorHct: Hct) {
-    self.primary = TonalPalette.of(sourceColorHct.hue, sourceColorHct.chroma)
-    self.secondary = TonalPalette.of(
-      sourceColorHct.hue,
-      max(sourceColorHct.chroma - 32, sourceColorHct.chroma * 0.5)
-    )
-    self.tertiary = TonalPalette.fromHct(
-      DislikeAnalyzer.fixIfDisliked(
-        TemperatureCache(sourceColorHct)
-          .analogous(count: 3, divisions: 6)
-          .last!
-      )
-    )
-    self.neutral = TonalPalette.of(sourceColorHct.hue, sourceColorHct.chroma / 8)
-    self.neutralVariant = TonalPalette.of(sourceColorHct.hue, (sourceColorHct.chroma / 8) + 4)
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Scheme/SchemeExpressive.swift b/swift/Sources/MaterialColorUtilities/Scheme/SchemeExpressive.swift
deleted file mode 100644
index 82835d50..00000000
--- a/swift/Sources/MaterialColorUtilities/Scheme/SchemeExpressive.swift
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2023-2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-/// A Dynamic Color theme that is intentionally detached from the input color to offer an expressive
-/// visual expression.
-public class SchemeExpressive: DynamicScheme {
-  public convenience init(sourceColorHct: Hct, isDark: Bool, contrastLevel: Double) {
-    let palettes = CorePalettesExpressive(sourceColorHct: sourceColorHct)
-    self.init(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel)
-  }
-
-  fileprivate init(
-    sourceColorHct: Hct, palettes: CorePalettes, isDark: Bool, contrastLevel: Double
-  ) {
-    super.init(
-      sourceColorHct: sourceColorHct,
-      variant: .expressive,
-      isDark: isDark,
-      contrastLevel: contrastLevel,
-      primaryPalette: palettes.primary,
-      secondaryPalette: palettes.secondary,
-      tertiaryPalette: palettes.tertiary,
-      neutralPalette: palettes.neutral,
-      neutralVariantPalette: palettes.neutralVariant
-    )
-  }
-}
-
-/// Use [SchemeExpressiveProvider] when you need to create multiple [SchemeExpressive] from the same
-/// source color.
-///
-/// This provider reduces overlapped computation by reusing core palettes.
-public struct SchemeExpressiveProvider: DynamicSchemeProvider {
-  private let sourceColorHct: Hct
-  private let palettes: CorePalettes
-
-  public init(sourceColorHct: Hct) {
-    self.sourceColorHct = sourceColorHct
-    self.palettes = CorePalettesExpressive(sourceColorHct: sourceColorHct)
-  }
-
-  public func scheme(isDark: Bool, contrastLevel: Double) -> DynamicScheme {
-    SchemeExpressive(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel
-    )
-  }
-}
-
-/// Core palettes of [SchemeExpressive].
-private struct CorePalettesExpressive: CorePalettes {
-  /// Hues used at breakpoints for hue rotation adjustments.
-  private let hues: [Double] = [0, 21, 51, 121, 151, 191, 271, 321, 360]
-
-  /// Hue rotations of the Secondary [TonalPalette] corresponding to the breakpoints in [hues].
-  private let secondaryRotations: [Double] = [45, 95, 45, 20, 45, 90, 45, 45, 45]
-
-  /// Hue rotations of the Tertiary [TonalPalette] corresponding to the breakpoints in [hues].
-  private let tertiaryRotations: [Double] = [120, 120, 20, 45, 20, 15, 20, 120, 120]
-
-  let primary: TonalPalette
-  let secondary: TonalPalette
-  let tertiary: TonalPalette
-  let neutral: TonalPalette
-  let neutralVariant: TonalPalette
-
-  init(sourceColorHct: Hct) {
-    self.primary = TonalPalette.of(
-      MathUtils.sanitizeDegreesDouble(sourceColorHct.hue + 240.0),
-      40.0
-    )
-    self.secondary = TonalPalette.of(
-      DynamicScheme.getRotatedHue(
-        sourceColorHct, hues, secondaryRotations),
-      24.0
-    )
-    self.tertiary = TonalPalette.of(
-      DynamicScheme.getRotatedHue(
-        sourceColorHct, hues, tertiaryRotations),
-      32.0
-    )
-    self.neutral = TonalPalette.of(sourceColorHct.hue + 15, 8.0)
-    self.neutralVariant = TonalPalette.of(sourceColorHct.hue + 15, 12.0)
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Scheme/SchemeFidelity.swift b/swift/Sources/MaterialColorUtilities/Scheme/SchemeFidelity.swift
deleted file mode 100644
index b25e77bb..00000000
--- a/swift/Sources/MaterialColorUtilities/Scheme/SchemeFidelity.swift
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2023-2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-/// A Dynamic Color theme that places the source color in [Scheme.primaryContainer].
-///
-/// Primary Container is the source color, adjusted for color relativity.
-/// It maintains constant appearance in both light and dark mode by adjusting the source color's
-/// tone by adding 5 tones in light mode and subtracting 5 tone in dark mode.
-///
-/// Tertiary Container is the complement to the source color, using [TemperatureCache]. It also
-/// maintains constant appearance.
-public class SchemeFidelity: DynamicScheme {
-  public convenience init(sourceColorHct: Hct, isDark: Bool, contrastLevel: Double) {
-    let palettes = CorePalettesFidelity(sourceColorHct: sourceColorHct)
-    self.init(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel
-    )
-  }
-
-  fileprivate init(
-    sourceColorHct: Hct, palettes: CorePalettes, isDark: Bool, contrastLevel: Double
-  ) {
-    super.init(
-      sourceColorHct: sourceColorHct,
-      variant: .fidelity,
-      isDark: isDark,
-      contrastLevel: contrastLevel,
-      primaryPalette: palettes.primary,
-      secondaryPalette: palettes.secondary,
-      tertiaryPalette: palettes.tertiary,
-      neutralPalette: palettes.neutral,
-      neutralVariantPalette: palettes.neutralVariant
-    )
-  }
-}
-
-/// Use [SchemeFidelityProvider] when you need to create multiple [SchemeFidelity] instances from
-/// the same source color.
-///
-/// This provider reduces overlapped computation by reusing tonal palettes.
-public struct SchemeFidelityProvider: DynamicSchemeProvider {
-  private let sourceColorHct: Hct
-  private let palettes: CorePalettes
-
-  public init(sourceColorHct: Hct) {
-    self.sourceColorHct = sourceColorHct
-    self.palettes = CorePalettesFidelity(sourceColorHct: sourceColorHct)
-  }
-
-  public func scheme(isDark: Bool, contrastLevel: Double) -> DynamicScheme {
-    SchemeFidelity(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel
-    )
-  }
-}
-
-/// Core palettes of [SchemeFidelity].
-private struct CorePalettesFidelity: CorePalettes {
-  let primary: TonalPalette
-  let secondary: TonalPalette
-  let tertiary: TonalPalette
-  let neutral: TonalPalette
-  let neutralVariant: TonalPalette
-
-  init(sourceColorHct: Hct) {
-    self.primary = TonalPalette.of(sourceColorHct.hue, sourceColorHct.chroma)
-    self.secondary = TonalPalette.of(
-      sourceColorHct.hue,
-      max(sourceColorHct.chroma - 32.0, sourceColorHct.chroma * 0.5)
-    )
-    self.tertiary = TonalPalette.fromHct(
-      DislikeAnalyzer.fixIfDisliked(
-        TemperatureCache(sourceColorHct).complement
-      )
-    )
-    self.neutral = TonalPalette.of(sourceColorHct.hue, sourceColorHct.chroma / 8.0)
-    self.neutralVariant = TonalPalette.of(sourceColorHct.hue, (sourceColorHct.chroma / 8.0) + 4.0)
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Scheme/SchemeFruitSalad.swift b/swift/Sources/MaterialColorUtilities/Scheme/SchemeFruitSalad.swift
deleted file mode 100644
index 107271a0..00000000
--- a/swift/Sources/MaterialColorUtilities/Scheme/SchemeFruitSalad.swift
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2023-2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-/// A playful Dynamic Color theme where the source color's hue is intentionally left out.
-public class SchemeFruitSalad: DynamicScheme {
-  public convenience init(sourceColorHct: Hct, isDark: Bool, contrastLevel: Double) {
-    let palettes = CorePalettesFruitSalad(sourceColorHct: sourceColorHct)
-    self.init(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel
-    )
-  }
-
-  fileprivate init(
-    sourceColorHct: Hct, palettes: CorePalettes, isDark: Bool, contrastLevel: Double
-  ) {
-    super.init(
-      sourceColorHct: sourceColorHct,
-      variant: .fruitSalad,
-      isDark: isDark,
-      contrastLevel: contrastLevel,
-      primaryPalette: palettes.primary,
-      secondaryPalette: palettes.secondary,
-      tertiaryPalette: palettes.tertiary,
-      neutralPalette: palettes.neutral,
-      neutralVariantPalette: palettes.neutralVariant
-    )
-  }
-}
-
-/// Use [SchemeFruitSaladProvider] when you need to create multiple [SchemeFruitSalad] instances
-/// from the same source color.
-///
-/// This provider reduces overlapped computation by reusing tonal palettes.
-public struct SchemeFruitSaladProvider: DynamicSchemeProvider {
-  private let sourceColorHct: Hct
-  private let palettes: CorePalettes
-
-  public init(sourceColorHct: Hct) {
-    self.sourceColorHct = sourceColorHct
-    self.palettes = CorePalettesFruitSalad(sourceColorHct: sourceColorHct)
-  }
-
-  public func scheme(isDark: Bool, contrastLevel: Double) -> DynamicScheme {
-    return SchemeFruitSalad(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel
-    )
-  }
-}
-
-/// Core palettes of [SchemeFruitSalad].
-private struct CorePalettesFruitSalad: CorePalettes {
-  let primary: TonalPalette
-  let secondary: TonalPalette
-  let tertiary: TonalPalette
-  let neutral: TonalPalette
-  let neutralVariant: TonalPalette
-
-  init(sourceColorHct: Hct) {
-    let shiftedHue = MathUtils.sanitizeDegreesDouble(sourceColorHct.hue - 50.0)
-
-    self.primary = TonalPalette.of(shiftedHue, 48.0)
-    self.secondary = TonalPalette.of(shiftedHue, 36.0)
-    self.tertiary = TonalPalette.of(sourceColorHct.hue, 36.0)
-    self.neutral = TonalPalette.of(sourceColorHct.hue, 10.0)
-    self.neutralVariant = TonalPalette.of(sourceColorHct.hue, 16.0)
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Scheme/SchemeMonochrome.swift b/swift/Sources/MaterialColorUtilities/Scheme/SchemeMonochrome.swift
deleted file mode 100644
index 400021fe..00000000
--- a/swift/Sources/MaterialColorUtilities/Scheme/SchemeMonochrome.swift
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2023-2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-/// A Dynamic Color theme that is grayscale.
-public class SchemeMonochrome: DynamicScheme {
-  public convenience init(sourceColorHct: Hct, isDark: Bool, contrastLevel: Double) {
-    let palettes = CorePalettesMonochrome(sourceColorHct: sourceColorHct)
-    self.init(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel)
-  }
-
-  fileprivate init(
-    sourceColorHct: Hct, palettes: CorePalettes, isDark: Bool, contrastLevel: Double
-  ) {
-    super.init(
-      sourceColorHct: sourceColorHct,
-      variant: .monochrome,
-      isDark: isDark,
-      contrastLevel: contrastLevel,
-      primaryPalette: palettes.primary,
-      secondaryPalette: palettes.secondary,
-      tertiaryPalette: palettes.tertiary,
-      neutralPalette: palettes.neutral,
-      neutralVariantPalette: palettes.neutralVariant
-    )
-  }
-}
-
-/// Use [SchemeMonochromeProvider] when you need to create multiple [SchemeMonochrome] from the same
-/// source color.
-///
-/// This provider reduces overlapped computation by reusing tonal palettes.
-public struct SchemeMonochromeProvider: DynamicSchemeProvider {
-  private let sourceColorHct: Hct
-  private let palettes: CorePalettes
-
-  public init(sourceColorHct: Hct) {
-    self.sourceColorHct = sourceColorHct
-    self.palettes = CorePalettesMonochrome(sourceColorHct: sourceColorHct)
-  }
-
-  public func scheme(isDark: Bool, contrastLevel: Double) -> DynamicScheme {
-    SchemeMonochrome(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel)
-  }
-}
-
-/// Core palettes of [SchemeMonochrome].
-private struct CorePalettesMonochrome: CorePalettes {
-  let primary: TonalPalette
-  let secondary: TonalPalette
-  let tertiary: TonalPalette
-  let neutral: TonalPalette
-  let neutralVariant: TonalPalette
-
-  init(sourceColorHct: Hct) {
-    let zeroChromaPalette = TonalPalette.of(sourceColorHct.hue, 0.0)
-
-    self.primary = zeroChromaPalette
-    self.secondary = zeroChromaPalette
-    self.tertiary = zeroChromaPalette
-    self.neutral = zeroChromaPalette
-    self.neutralVariant = zeroChromaPalette
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Scheme/SchemeNeutral.swift b/swift/Sources/MaterialColorUtilities/Scheme/SchemeNeutral.swift
deleted file mode 100644
index ed82a8a9..00000000
--- a/swift/Sources/MaterialColorUtilities/Scheme/SchemeNeutral.swift
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2023-2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-/// A Dynamic Color theme that is near grayscale.
-public class SchemeNeutral: DynamicScheme {
-  public convenience init(sourceColorHct: Hct, isDark: Bool, contrastLevel: Double) {
-    let palettes = CorePalettesNeutral(sourceColorHct: sourceColorHct)
-    self.init(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel)
-  }
-
-  fileprivate init(
-    sourceColorHct: Hct, palettes: CorePalettes, isDark: Bool, contrastLevel: Double
-  ) {
-    super.init(
-      sourceColorHct: sourceColorHct,
-      variant: .neutral,
-      isDark: isDark,
-      contrastLevel: contrastLevel,
-      primaryPalette: palettes.primary,
-      secondaryPalette: palettes.secondary,
-      tertiaryPalette: palettes.tertiary,
-      neutralPalette: palettes.neutral,
-      neutralVariantPalette: palettes.neutralVariant
-    )
-  }
-}
-
-/// Use [SchemeNeutralProvider] when you need to create multiple [SchemeNeutral] from the same
-/// source color.
-///
-/// This provider reduces overlapped computation by reusing tonal palettes.
-public struct SchemeNeutralProvider: DynamicSchemeProvider {
-  private let sourceColorHct: Hct
-  private let palettes: CorePalettes
-
-  public init(sourceColorHct: Hct) {
-    self.sourceColorHct = sourceColorHct
-    self.palettes = CorePalettesNeutral(sourceColorHct: sourceColorHct)
-  }
-
-  public func scheme(isDark: Bool, contrastLevel: Double) -> DynamicScheme {
-    SchemeNeutral(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel)
-  }
-}
-
-/// Core palettes of [SchemeNeutral].
-private struct CorePalettesNeutral: CorePalettes {
-  let primary: TonalPalette
-  let secondary: TonalPalette
-  let tertiary: TonalPalette
-  let neutral: TonalPalette
-  let neutralVariant: TonalPalette
-
-  init(sourceColorHct: Hct) {
-    self.primary = TonalPalette.of(sourceColorHct.hue, 12.0)
-    self.secondary = TonalPalette.of(sourceColorHct.hue, 8.0)
-    self.tertiary = TonalPalette.of(sourceColorHct.hue, 16.0)
-    self.neutral = TonalPalette.of(sourceColorHct.hue, 2.0)
-    self.neutralVariant = TonalPalette.of(sourceColorHct.hue, 2.0)
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Scheme/SchemeRainbow.swift b/swift/Sources/MaterialColorUtilities/Scheme/SchemeRainbow.swift
deleted file mode 100644
index 000d45f1..00000000
--- a/swift/Sources/MaterialColorUtilities/Scheme/SchemeRainbow.swift
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2023-2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-/// A playful theme - the source color's hue does not appear in the theme.
-public class SchemeRainbow: DynamicScheme {
-  public convenience init(sourceColorHct: Hct, isDark: Bool, contrastLevel: Double) {
-    let palettes = CorePalettesRainbow(sourceColorHct: sourceColorHct)
-    self.init(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel)
-  }
-
-  fileprivate init(
-    sourceColorHct: Hct, palettes: CorePalettes, isDark: Bool, contrastLevel: Double
-  ) {
-    super.init(
-      sourceColorHct: sourceColorHct,
-      variant: .rainbow,
-      isDark: isDark,
-      contrastLevel: contrastLevel,
-      primaryPalette: palettes.primary,
-      secondaryPalette: palettes.secondary,
-      tertiaryPalette: palettes.tertiary,
-      neutralPalette: palettes.neutral,
-      neutralVariantPalette: palettes.neutralVariant
-    )
-  }
-}
-
-/// Use [SchemeRainbowProvider] when you need to create multiple [SchemeRainbow] from the same
-/// source color.
-///
-/// This provider reduces overlapped computation by reusing tonal palettes.
-public struct SchemeRainbowProvider: DynamicSchemeProvider {
-  private let sourceColorHct: Hct
-  private let palettes: CorePalettes
-
-  public init(sourceColorHct: Hct) {
-    self.sourceColorHct = sourceColorHct
-    self.palettes = CorePalettesRainbow(sourceColorHct: sourceColorHct)
-  }
-
-  public func scheme(isDark: Bool, contrastLevel: Double) -> DynamicScheme {
-    SchemeRainbow(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel)
-  }
-}
-
-/// Core palettes of [SchemeRainbow].
-private struct CorePalettesRainbow: CorePalettes {
-  let primary: TonalPalette
-  let secondary: TonalPalette
-  let tertiary: TonalPalette
-  let neutral: TonalPalette
-  let neutralVariant: TonalPalette
-
-  init(sourceColorHct: Hct) {
-    self.primary = TonalPalette.of(sourceColorHct.hue, 48.0)
-    self.secondary = TonalPalette.of(sourceColorHct.hue, 16.0)
-    self.tertiary = TonalPalette.of(
-      MathUtils.sanitizeDegreesDouble(sourceColorHct.hue + 60.0), 24.0)
-    self.neutral = TonalPalette.of(sourceColorHct.hue, 0.0)
-    self.neutralVariant = TonalPalette.of(sourceColorHct.hue, 0.0)
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Scheme/SchemeTonalSpot.swift b/swift/Sources/MaterialColorUtilities/Scheme/SchemeTonalSpot.swift
deleted file mode 100644
index 05e24c9b..00000000
--- a/swift/Sources/MaterialColorUtilities/Scheme/SchemeTonalSpot.swift
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2023-2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-/// A Dynamic Color theme with low to medium colorfulness and a Tertiary
-/// [TonalPalette] with a hue related to the source color. The default
-/// Material You theme on Android 12 and 13.
-public class SchemeTonalSpot: DynamicScheme {
-  public convenience init(sourceColorHct: Hct, isDark: Bool, contrastLevel: Double) {
-    let palettes = CorePalettesTonalSpot(sourceColorHct: sourceColorHct)
-    self.init(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel)
-  }
-
-  fileprivate init(
-    sourceColorHct: Hct, palettes: CorePalettes, isDark: Bool, contrastLevel: Double
-  ) {
-    super.init(
-      sourceColorHct: sourceColorHct,
-      variant: .tonalSpot,
-      isDark: isDark,
-      contrastLevel: contrastLevel,
-      primaryPalette: palettes.primary,
-      secondaryPalette: palettes.secondary,
-      tertiaryPalette: palettes.tertiary,
-      neutralPalette: palettes.neutral,
-      neutralVariantPalette: palettes.neutralVariant)
-  }
-}
-
-/// Use [SchemeTonalSpotProvider] when you need to create multiple [SchemeTonalSpot] from the same
-/// source color.
-///
-/// This provider reduces overlapped computation by reusing tonal palettes.
-public struct SchemeTonalSpotProvider: DynamicSchemeProvider {
-  private let sourceColorHct: Hct
-  private let palettes: CorePalettes
-
-  public init(sourceColorHct: Hct) {
-    self.sourceColorHct = sourceColorHct
-    self.palettes = CorePalettesTonalSpot(sourceColorHct: sourceColorHct)
-  }
-
-  public func scheme(isDark: Bool, contrastLevel: Double) -> DynamicScheme {
-    SchemeTonalSpot(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel)
-  }
-}
-
-/// Core palettes of [SchemeTonalSpot].
-private struct CorePalettesTonalSpot: CorePalettes {
-  let primary: TonalPalette
-  let secondary: TonalPalette
-  let tertiary: TonalPalette
-  let neutral: TonalPalette
-  let neutralVariant: TonalPalette
-
-  init(sourceColorHct: Hct) {
-    self.primary = TonalPalette.of(sourceColorHct.hue, 36.0)
-    self.secondary = TonalPalette.of(sourceColorHct.hue, 16.0)
-    self.tertiary = TonalPalette.of(
-      MathUtils.sanitizeDegreesDouble(sourceColorHct.hue + 60.0),
-      24.0
-    )
-    self.neutral = TonalPalette.of(sourceColorHct.hue, 6.0)
-    self.neutralVariant = TonalPalette.of(sourceColorHct.hue, 8.0)
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Scheme/SchemeVibrant.swift b/swift/Sources/MaterialColorUtilities/Scheme/SchemeVibrant.swift
deleted file mode 100644
index 785e54bc..00000000
--- a/swift/Sources/MaterialColorUtilities/Scheme/SchemeVibrant.swift
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2023-2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-/// A Dynamic Color theme that maxes out colorfulness at each position in the
-/// Primary [TonalPalette].
-public class SchemeVibrant: DynamicScheme {
-  public convenience init(sourceColorHct: Hct, isDark: Bool, contrastLevel: Double) {
-    let palettes = CorePalettesVibrant(sourceColorHct: sourceColorHct)
-    self.init(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel)
-  }
-
-  fileprivate init(
-    sourceColorHct: Hct, palettes: CorePalettes, isDark: Bool, contrastLevel: Double
-  ) {
-    super.init(
-      sourceColorHct: sourceColorHct,
-      variant: .vibrant,
-      isDark: isDark,
-      contrastLevel: contrastLevel,
-      primaryPalette: palettes.primary,
-      secondaryPalette: palettes.secondary,
-      tertiaryPalette: palettes.tertiary,
-      neutralPalette: palettes.neutral,
-      neutralVariantPalette: palettes.neutralVariant
-    )
-  }
-}
-
-/// Use [SchemeVibrantProvider] when you need to create multiple [SchemeVibrant] from the same
-/// source color.
-///
-/// This provider reduces overlapped computation by reusing tonal palettes.
-public struct SchemeVibrantProvider: DynamicSchemeProvider {
-  private let sourceColorHct: Hct
-  private let palettes: CorePalettes
-
-  public init(sourceColorHct: Hct) {
-    self.sourceColorHct = sourceColorHct
-    self.palettes = CorePalettesVibrant(sourceColorHct: sourceColorHct)
-  }
-
-  public func scheme(isDark: Bool, contrastLevel: Double) -> DynamicScheme {
-    SchemeVibrant(
-      sourceColorHct: sourceColorHct,
-      palettes: palettes,
-      isDark: isDark,
-      contrastLevel: contrastLevel)
-  }
-}
-
-/// Core palettes of [SchemeVibrant].
-private struct CorePalettesVibrant: CorePalettes {
-  let primary: TonalPalette
-  let secondary: TonalPalette
-  let tertiary: TonalPalette
-  let neutral: TonalPalette
-  let neutralVariant: TonalPalette
-
-  /// Hues used at breakpoints such that designers can specify a hue rotation that occurs at a
-  ///given break point.
-  private let hues: [Double] = [0, 41, 61, 101, 131, 181, 251, 301, 360]
-
-  /// Hue rotations of the Secondary [TonalPalette], corresponding to the breakpoints in [hues].
-  private let secondaryRotations: [Double] = [
-    18,
-    15,
-    10,
-    12,
-    15,
-    18,
-    15,
-    12,
-    12,
-  ]
-
-  /// Hue rotations of the Tertiary [TonalPalette], corresponding to the breakpoints in [hues].
-  private let tertiaryRotations: [Double] = [35, 30, 20, 25, 30, 35, 30, 25, 25]
-
-  init(sourceColorHct: Hct) {
-    self.primary = TonalPalette.of(sourceColorHct.hue, 200.0)
-    self.secondary = TonalPalette.of(
-      DynamicScheme.getRotatedHue(
-        sourceColorHct, hues, secondaryRotations),
-      24.0
-    )
-    self.tertiary = TonalPalette.of(
-      DynamicScheme.getRotatedHue(
-        sourceColorHct, hues, tertiaryRotations),
-      32.0
-    )
-    self.neutral = TonalPalette.of(sourceColorHct.hue, 10.0)
-    self.neutralVariant = TonalPalette.of(sourceColorHct.hue, 12.0)
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Score/Score.swift b/swift/Sources/MaterialColorUtilities/Score/Score.swift
deleted file mode 100644
index 5f0ba3c1..00000000
--- a/swift/Sources/MaterialColorUtilities/Score/Score.swift
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-private struct ScoredHCT {
-  let hct: Hct
-  let score: Double
-
-  init(hct: Hct, score: Double) {
-    self.hct = hct
-    self.score = score
-  }
-}
-
-/// Given a large set of colors, remove colors that are unsuitable for a UI
-/// theme, and rank the rest based on suitability.
-///
-/// Enables use of a high cluster count for image quantization, thus ensuring
-/// colors aren't muddied, while curating the high cluster count to a much
-///  smaller number of appropriate choices.
-public enum Score {
-  static private let targetChroma: Double = 48.0  // A1 Chroma
-  static private let weightProportion: Double = 0.7
-  static private let weightChromaAbove: Double = 0.3
-  static private let weightChromaBelow: Double = 0.1
-  static private let cutoffChroma: Double = 5.0
-  static private let cutoffExcitedProportion: Double = 0.01
-
-  /// Given a map with keys of colors and values of how often the color appears,
-  /// rank the colors based on suitability for being used for a UI theme.
-  ///
-  /// - Parameters:
-  ///   `colorsToPopulation`: is a map with keys of colors and values of often
-  ///     the color appears, usually from a source image.
-  ///   `desired`: Max count of colors to be returned in the list.
-  ///   `fallbackColorARGB`: Color to be returned if no other options available.
-  ///   `filter`: Whether to filter out undesireable combinations.
-  ///
-  /// - Returns: A list of color `Int` that can be used when generating a theme.
-  ///   The list returned is of length <= `desired`. The recommended color is
-  ///   the first item, the least suitable is the last. There will always be at
-  ///   least one color returned. If all the input colors were not suitable for
-  ///   a theme, a default fallback color will be provided, Google Blue. The
-  ///   default number of colors returned is 4, simply because thats the # of
-  ///   colors display in Android 12's wallpaper picker.
-  public static func score(
-    _ colorsToPopulation: [Int: Int], desired: Int = 4, fallbackColorARGB: Int = 0xff42_85F4,
-    filter: Bool = true
-  )
-    -> [Int]
-  {
-    // Get the HCT color for each Argb value, while finding the per hue count and
-    // total count.
-    var colorsHCT: [Hct] = []
-    var huePopulation = [Int](repeating: 0, count: 360)
-    var populationSum: Double = 0.0
-    for argb in colorsToPopulation.keys {
-      let population = colorsToPopulation[argb]!
-      let hct = Hct.fromInt(argb)
-      colorsHCT.append(hct)
-      let hue = Int(floor(hct.hue))
-      huePopulation[hue] += population
-      populationSum += Double(population)
-    }
-
-    // Hues with more usage in neighboring 30 degree slice get a larger number.
-    var hueExcitedProportions = [Double](repeating: 0.0, count: 360)
-    for hue in 0..<360 {
-      let proportion = Double(huePopulation[hue]) / populationSum
-      for i in (hue - 14)..<(hue + 16) {
-        let neighborHue = MathUtils.sanitizeDegreesInt(i)
-        hueExcitedProportions[neighborHue] += proportion
-      }
-    }
-
-    // Scores each HCT color based on usage and chroma, while optionally
-    // filtering out values that do not have enough chroma or usage.
-    var scoredHCTs: [ScoredHCT] = []
-    for hct in colorsHCT {
-      let hue = MathUtils.sanitizeDegreesInt(Int(round(hct.hue)))
-      let proportion = hueExcitedProportions[hue]
-      if filter && (hct.chroma < cutoffChroma || proportion <= cutoffExcitedProportion) {
-        continue
-      }
-
-      let proportionScore = proportion * 100.0 * weightProportion
-      let chromaWeight = hct.chroma < targetChroma ? weightChromaBelow : weightChromaAbove
-      let chromaScore = (hct.chroma - targetChroma) * chromaWeight
-      let score = proportionScore + chromaScore
-      scoredHCTs.append(ScoredHCT(hct: hct, score: score))
-    }
-    // Sorted so that colors with higher scores come first.
-    scoredHCTs.sort {
-      $0.score > $1.score
-    }
-
-    // Iterates through potential hue differences in degrees in order to select
-    // the colors with the largest distribution of hues possible. Starting at
-    // 90 degrees(maximum difference for 4 colors) then decreasing down to a
-    // 15 degree minimum.
-    var chosenColors: [Hct] = []
-    for differenceDegrees in (15...90).reversed() {
-      chosenColors.removeAll()
-      for entry in scoredHCTs {
-        if !chosenColors.contains(where: {
-          MathUtils.differenceDegrees(entry.hct.hue, $0.hue) < Double(differenceDegrees)
-        }) {
-          chosenColors.append(entry.hct)
-        }
-        if chosenColors.count >= desired {
-          break
-        }
-      }
-      if chosenColors.count >= desired {
-        break
-      }
-    }
-    var colors: [Int] = []
-    if chosenColors.isEmpty {
-      colors.append(fallbackColorARGB)
-    }
-    for chosenHCT in chosenColors {
-      colors.append(chosenHCT.toInt())
-    }
-    return colors
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Temperature/TemperatureCache.swift b/swift/Sources/MaterialColorUtilities/Temperature/TemperatureCache.swift
deleted file mode 100644
index d4b287e8..00000000
--- a/swift/Sources/MaterialColorUtilities/Temperature/TemperatureCache.swift
+++ /dev/null
@@ -1,300 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-/// Design utilities using color temperature theory.
-///
-/// Analogous colors, complementary color, and cache to efficiently, lazily,
-/// generate data for calculations when needed.
-class TemperatureCache {
-  let input: Hct
-
-  private var _hctsByTemp: [Hct] = []
-  private var _hctsByHue: [Hct] = []
-  private var _tempsByHct: [Hct: Double] = [:]
-  private var _inputRelativeTemperature: Double = -1
-  private var _complement: Hct? = nil
-
-  public var warmest: Hct {
-    return hctsByTemp.last!
-  }
-
-  public var coldest: Hct {
-    return hctsByTemp.first!
-  }
-
-  public init(_ input: Hct) {
-    self.input = input
-  }
-
-  /// A set of colors with differing hues, equidistant in temperature.
-  ///
-  /// In art, this is usually described as a set of 5 colors on a color wheel
-  /// divided into 12 sections. This method allows provision of either of those
-  /// values.
-  ///
-  /// Behavior is undefined when [count] or [divisions] is 0.
-  /// When divisions < count, colors repeat.
-  ///
-  /// [count] The number of colors to return, includes the input color.
-  /// [divisions] The number of divisions on the color wheel.
-  public func analogous(count: Int = 5, divisions: Int = 12) -> [Hct] {
-    let startHue = Int(round(input.hue))
-    let startHct = hctsByHue[startHue]
-    var lastTemp = relativeTemperature(startHct)
-    var allColors: [Hct] = [startHct]
-
-    var absoluteTotalTempDelta = 0.0
-    for i in 0..<360 {
-      let hue = MathUtils.sanitizeDegreesInt(startHue + i)
-      let hct = hctsByHue[hue]
-      let temp = relativeTemperature(hct)
-      let tempDelta = abs(temp - lastTemp)
-      lastTemp = temp
-      absoluteTotalTempDelta += tempDelta
-    }
-    var hueAddend = 1
-    let tempStep = absoluteTotalTempDelta / Double(divisions)
-    var totalTempDelta: Double = 0
-    lastTemp = relativeTemperature(startHct)
-    while allColors.count < divisions {
-      let hue = MathUtils.sanitizeDegreesInt(startHue + hueAddend)
-      let hct = hctsByHue[hue]
-      let temp = relativeTemperature(hct)
-      let tempDelta = abs(temp - lastTemp)
-      totalTempDelta += tempDelta
-
-      let desiredTotalTempDeltaForIndex = Double(allColors.count) * tempStep
-      var indexSatisfied = totalTempDelta >= desiredTotalTempDeltaForIndex
-      var indexAddend = 1
-
-      // Keep adding this hue to the answers until its temperature is
-      // insufficient. This ensures consistent behavior when there aren't
-      // [divisions] discrete steps between 0 and 360 in hue with [tempStep]
-      // delta in temperature between them.
-      //
-      // For example, white and black have no analogues: there are no other
-      // colors at T100/T0. Therefore, they should just be added to the array
-      // as answers.
-      while indexSatisfied && allColors.count < divisions {
-        allColors.append(hct)
-        let desiredTotalTempDeltaForIndex = (Double(allColors.count + indexAddend) * tempStep)
-        indexSatisfied = totalTempDelta >= desiredTotalTempDeltaForIndex
-        indexAddend += 1
-      }
-      lastTemp = temp
-      hueAddend += 1
-      if hueAddend > 360 {
-        while allColors.count < divisions {
-          allColors.append(hct)
-        }
-        break
-      }
-    }
-
-    var answers: [Hct] = [input]
-
-    // First, generate analogues from rotating counter-clockwise.
-    let increaseHueCount = Int(floor(Double(count - 1) / 2))
-    for i in 1...increaseHueCount {
-      var index = 0 - i
-      while index < 0 {
-        index = allColors.count + index
-      }
-      if index >= allColors.count {
-        index = index % allColors.count
-      }
-      answers.insert(allColors[index], at: 0)
-    }
-
-    // Second, generate analogues from rotating clockwise.
-    let decreaseHueCount = count - increaseHueCount - 1
-    for i in 1...decreaseHueCount {
-      var index = i
-      while index < 0 {
-        index = allColors.count + index
-      }
-      if index >= allColors.count {
-        index = index % allColors.count
-      }
-      answers.append(allColors[index])
-    }
-
-    return answers
-  }
-
-  /// A color that complements the input color aesthetically.
-  ///
-  /// In art, this is usually described as being across the color wheel.
-  /// History of this shows intent as a color that is just as cool-warm as the
-  /// input color is warm-cool.
-  public var complement: Hct {
-    if _complement != nil {
-      return _complement!
-    }
-
-    let coldestHue = coldest.hue
-    let coldestTemp = tempsByHct[coldest]!
-
-    let warmestHue = warmest.hue
-    let warmestTemp = tempsByHct[warmest]!
-
-    let range = warmestTemp - coldestTemp
-    let startHueIsColdestToWarmest = TemperatureCache.isBetween(
-      angle: input.hue, a: coldestHue, b: warmestHue)
-    let startHue = startHueIsColdestToWarmest ? warmestHue : coldestHue
-    let endHue = startHueIsColdestToWarmest ? coldestHue : warmestHue
-    let directionOfRotation: Double = 1
-    var smallestError: Double = 1000
-    var answer = hctsByHue[Int(round(input.hue))]
-
-    let complementRelativeTemp = 1 - inputRelativeTemperature
-    // Find the color in the other section, closest to the inverse percentile
-    // of the input color. This is the complement.
-    for hueAddend in 0...360 {
-      let hue = MathUtils.sanitizeDegreesDouble(startHue + directionOfRotation * Double(hueAddend))
-      if !TemperatureCache.isBetween(angle: hue, a: startHue, b: endHue) {
-        continue
-      }
-      let possibleAnswer = hctsByHue[Int(round(hue))]
-      let relativeTemp = (_tempsByHct[possibleAnswer]! - coldestTemp) / range
-      let error = abs(complementRelativeTemp - relativeTemp)
-      if error < smallestError {
-        smallestError = error
-        answer = possibleAnswer
-      }
-    }
-    _complement = answer
-    return _complement!
-  }
-
-  /// Temperature relative to all colors with the same chroma and tone.
-  /// Value on a scale from 0 to 1.
-  public func relativeTemperature(_ hct: Hct) -> Double {
-    let range = tempsByHct[warmest]! - tempsByHct[coldest]!
-    let differenceFromColdest = tempsByHct[hct]! - tempsByHct[coldest]!
-
-    // Handle when there's no difference in temperature between warmest and
-    // coldest: for example, at T100, only one color is available, white.
-    if range == 0 {
-      return 0.5
-    }
-    return differenceFromColdest / range
-  }
-
-  /// Relative temperature of the input color. See [relativeTemperature].
-  public var inputRelativeTemperature: Double {
-    if _inputRelativeTemperature >= 0 {
-      return _inputRelativeTemperature
-    }
-
-    let coldestTemp = tempsByHct[coldest]!
-
-    let range = tempsByHct[warmest]! - coldestTemp
-    let differenceFromColdest = tempsByHct[input]! - coldestTemp
-    let inputRelativeTemp = (range == 0) ? 0.5 : differenceFromColdest / range
-
-    _inputRelativeTemperature = inputRelativeTemp
-    return _inputRelativeTemperature
-  }
-
-  /// HCTs for all hues, with the same chroma/tone as the input.
-  /// Sorted from coldest first to warmest last.
-  public var hctsByTemp: [Hct] {
-    if !_hctsByTemp.isEmpty {
-      return _hctsByTemp
-    }
-
-    var hcts = hctsByHue
-    hcts.append(input)
-    hcts.sort(by: sortByTemp)
-    _hctsByTemp = hcts
-    return _hctsByTemp
-  }
-
-  private func sortByTemp(this: Hct, that: Hct) -> Bool {
-    let a = tempsByHct[this]!
-    let b = tempsByHct[that]!
-    return a < b
-  }
-
-  /// A Map with keys of HCTs in [hctsByTemp], values of raw temperature.
-  public var tempsByHct: [Hct: Double] {
-    if !_tempsByHct.isEmpty {
-      return _tempsByHct
-    }
-
-    var allHcts = hctsByHue
-    allHcts.append(input)
-    var temperaturesByHct: [Hct: Double] = [:]
-    for e in allHcts {
-      temperaturesByHct[e] = TemperatureCache.rawTemperature(e)
-    }
-    _tempsByHct = temperaturesByHct
-    return _tempsByHct
-  }
-
-  /// HCTs for all hues, with the same chroma/tone as the input.
-  /// Sorted ascending, hue 0 to 360.
-  public var hctsByHue: [Hct] {
-    if !_hctsByHue.isEmpty {
-      return _hctsByHue
-    }
-    var hcts: [Hct] = []
-    for hue in 0...360 {
-      let colorAtHue = Hct.from(Double(hue), input.chroma, input.tone)
-      hcts.append(colorAtHue)
-    }
-    _hctsByHue = hcts
-    return _hctsByHue
-  }
-
-  /// Determines if an angle is between two other angles, rotating clockwise.
-  public static func isBetween(angle: Double, a: Double, b: Double) -> Bool {
-    if a < b {
-      return a <= angle && angle <= b
-    } else {
-      return a <= angle || angle <= b
-    }
-  }
-
-  /// Value representing cool-warm factor of a color.
-  /// Values below 0 are considered cool, above, warm.
-  ///
-  /// Color science has researched emotion and harmony, which art uses to select
-  /// colors. Warm-cool is the foundation of analogous and complementary colors.
-  /// See:
-  /// - Li-Chen Ou's Chapter 19 in Handbook of Color Psychology (2015).
-  /// - Josef Albers' Interaction of Color chapters 19 and 21.
-  ///
-  /// Implementation of Ou, Woodcock and Wright's algorithm, which uses
-  /// L*a*b*/LCH color space.
-  /// Return value has these properties:
-  /// - Values below 0 are cool, above 0 are warm.
-  /// - Lower bound: -0.52 - (chroma ^ 1.07 / 20). L*a*b* chroma is infinite.
-  ///   Assuming max of 130 chroma, -9.66.
-  /// - Upper bound: -0.52 + (chroma ^ 1.07 / 20). L*a*b* chroma is infinite.
-  ///   Assuming max of 130 chroma, 8.61.
-  public static func rawTemperature(_ color: Hct) -> Double {
-    let lab = ColorUtils.labFromArgb(color.toInt())
-    let hue = MathUtils.sanitizeDegreesDouble(
-      atan2(lab[2], lab[1]) * 180.0 / Double.pi)
-    let chroma = sqrt((lab[1] * lab[1]) + (lab[2] * lab[2]))
-    let temperature =
-      -0.5 + 0.02 * pow(chroma, 1.07)
-      * cos(MathUtils.sanitizeDegreesDouble(hue - 50.0) * Double.pi / 180.0)
-    return temperature
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Utils/ColorUtils.swift b/swift/Sources/MaterialColorUtilities/Utils/ColorUtils.swift
deleted file mode 100644
index b8278bcb..00000000
--- a/swift/Sources/MaterialColorUtilities/Utils/ColorUtils.swift
+++ /dev/null
@@ -1,249 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-/// Color science utilities.
-///
-/// Utility methods for color science constants and color space
-/// conversions that aren't HCT or CAM16.
-public class ColorUtils {
-  public static let srgbToXyz: [[Double]] = [
-    [0.41233895, 0.35762064, 0.18051042],
-    [0.2126, 0.7152, 0.0722],
-    [0.01932141, 0.11916382, 0.95034478],
-  ]
-
-  public static let xyzToSrgb: [[Double]] = [
-    [
-      3.2413774792388685,
-      -1.5376652402851851,
-      -0.49885366846268053,
-    ],
-    [
-      -0.9691452513005321,
-      1.8758853451067872,
-      0.04156585616912061,
-    ],
-    [
-      0.05562093689691305,
-      -0.20395524564742123,
-      1.0571799111220335,
-    ],
-  ]
-
-  /// Returns the standard white point; white on a sunny day.
-  ///
-  /// Returns The white point
-  public static let whitePointD65: [Double] = [95.047, 100.0, 108.883]
-
-  /// Converts a color from RGB components to ARGB format.
-  @inlinable public static func argbFromRgb(_ red: Int, _ green: Int, _ blue: Int) -> Int {
-    return 255 << 24 | (red & 255) << 16 | (green & 255) << 8 | blue & 255
-  }
-
-  /// Converts a color from linear RGB components to ARGB format.
-  @inlinable public static func argbFromLinrgb(_ linrgb: [Double]) -> Int {
-    let r = delinearized(linrgb[0])
-    let g = delinearized(linrgb[1])
-    let b = delinearized(linrgb[2])
-    return argbFromRgb(r, g, b)
-  }
-
-  /// Returns the alpha component of a color in ARGB format.
-  @inlinable public static func alphaFromArgb(_ argb: Int) -> Int {
-    return argb >> 24 & 255
-  }
-
-  /// Returns the red component of a color in ARGB format.
-  @inlinable public static func redFromArgb(_ argb: Int) -> Int {
-    return argb >> 16 & 255
-  }
-
-  /// Returns the green component of a color in ARGB format.
-  @inlinable public static func greenFromArgb(_ argb: Int) -> Int {
-    return argb >> 8 & 255
-  }
-
-  /// Returns the blue component of a color in ARGB format.
-  @inlinable public static func blueFromArgb(_ argb: Int) -> Int {
-    return argb & 255
-  }
-
-  /// Returns whether a color in ARGB format is opaque.
-  @inlinable public static func isOpaque(_ argb: Int) -> Bool {
-    return alphaFromArgb(argb) >= 255
-  }
-
-  /// Converts a color from ARGB to XYZ.
-  @inlinable public static func argbFromXyz(_ x: Double, _ y: Double, _ z: Double) -> Int {
-    let matrix = xyzToSrgb
-    let linearR = matrix[0][0] * x + matrix[0][1] * y + matrix[0][2] * z
-    let linearG = matrix[1][0] * x + matrix[1][1] * y + matrix[1][2] * z
-    let linearB = matrix[2][0] * x + matrix[2][1] * y + matrix[2][2] * z
-    let r = delinearized(linearR)
-    let g = delinearized(linearG)
-    let b = delinearized(linearB)
-    return argbFromRgb(r, g, b)
-  }
-
-  /// Converts a color from XYZ to ARGB.
-  @inlinable public static func xyzFromArgb(_ argb: Int) -> [Double] {
-    let r = linearized(redFromArgb(argb))
-    let g = linearized(greenFromArgb(argb))
-    let b = linearized(blueFromArgb(argb))
-    return MathUtils.matrixMultiply([r, g, b], srgbToXyz)
-  }
-
-  /// Converts a color represented in Lab color space into an ARGB
-  /// integer.
-  @inlinable public static func argbFromLab(_ l: Double, _ a: Double, _ b: Double) -> Int {
-    let whitePoint = whitePointD65
-    let fy = (l + 16) / 116
-    let fx = a / 500 + fy
-    let fz = fy - b / 200
-    let xNormalized = labInvf(fx)
-    let yNormalized = labInvf(fy)
-    let zNormalized = labInvf(fz)
-    let x = xNormalized * whitePoint[0]
-    let y = yNormalized * whitePoint[1]
-    let z = zNormalized * whitePoint[2]
-    return argbFromXyz(x, y, z)
-  }
-
-  /// Converts a color from ARGB representation to L*a*b*
-  /// representation.
-  ///
-  /// [argb] the ARGB representation of a color
-  /// Returns a Lab object representing the color
-  @inlinable public static func labFromArgb(_ argb: Int) -> [Double] {
-    let linearR = linearized(redFromArgb(argb))
-    let linearG = linearized(greenFromArgb(argb))
-    let linearB = linearized(blueFromArgb(argb))
-    let matrix = srgbToXyz
-    let x = matrix[0][0] * linearR + matrix[0][1] * linearG + matrix[0][2] * linearB
-    let y = matrix[1][0] * linearR + matrix[1][1] * linearG + matrix[1][2] * linearB
-    let z = matrix[2][0] * linearR + matrix[2][1] * linearG + matrix[2][2] * linearB
-    let whitePoint = whitePointD65
-    let xNormalized = x / whitePoint[0]
-    let yNormalized = y / whitePoint[1]
-    let zNormalized = z / whitePoint[2]
-    let fx = labF(xNormalized)
-    let fy = labF(yNormalized)
-    let fz = labF(zNormalized)
-    let l = 116 * fy - 16
-    let a = 500 * (fx - fy)
-    let b = 200 * (fy - fz)
-    return [l, a, b]
-  }
-
-  /// Converts an L* value to an ARGB representation.
-  ///
-  /// [lstar] L* in L*a*b*
-  /// Returns ARGB representation of grayscale color with lightness
-  /// matching L*
-  @inlinable public static func argbFromLstar(_ lstar: Double) -> Int {
-    let y = yFromLstar(lstar)
-    let component = delinearized(y)
-    return argbFromRgb(component, component, component)
-  }
-
-  /// Computes the L* value of a color in ARGB representation.
-  ///
-  /// [argb] ARGB representation of a color
-  /// Returns L*, from L*a*b*, coordinate of the color
-  @inlinable public static func lstarFromArgb(_ argb: Int) -> Double {
-    let y = xyzFromArgb(argb)[1]
-    return 116 * labF(y / 100) - 16
-  }
-
-  /// Converts an L* value to a Y value.
-  ///
-  /// L* in L*a*b* and Y in XYZ measure the same quantity, luminance.
-  ///
-  /// L* measures perceptual luminance, a linear scale. Y in XYZ
-  /// measures relative luminance, a logarithmic scale.
-  ///
-  /// [lstar] L* in L*a*b*
-  /// Returns Y in XYZ
-  @inlinable public static func yFromLstar(_ lstar: Double) -> Double {
-    return 100 * labInvf((lstar + 16) / 116)
-  }
-
-  /// Converts a Y value to an L* value.
-  ///
-  /// L* in L*a*b* and Y in XYZ measure the same quantity, luminance.
-  ///
-  /// L* measures perceptual luminance, a linear scale. Y in XYZ
-  /// measures relative luminance, a logarithmic scale.
-  ///
-  /// [y] Y in XYZ
-  /// Returns L* in L*a*b*
-  @inlinable public static func lstarFromY(_ y: Double) -> Double {
-    return labF(y / 100) * 116 - 16
-  }
-
-  /// Linearizes an RGB component.
-  ///
-  /// [rgbComponent] 0 <= rgb_component <= 255, represents R/G/B
-  /// channel
-  /// Returns 0.0 <= output <= 100.0, color channel converted to
-  /// linear RGB space
-  @inlinable public static func linearized(_ rgbComponent: Int) -> Double {
-    let normalized = Double(rgbComponent) / 255
-    if normalized <= 0.040449936 {
-      return normalized / 12.92 * 100
-    } else {
-      return pow((normalized + 0.055) / 1.055, 2.4) * 100
-    }
-  }
-
-  /// Delinearizes an RGB component.
-  ///
-  /// [rgbComponent] 0.0 <= rgb_component <= 100.0, represents linear
-  /// R/G/B channel
-  /// Returns 0 <= output <= 255, color channel converted to regular
-  /// RGB space
-  @inlinable public static func delinearized(_ rgbComponent: Double) -> Int {
-    let normalized = rgbComponent / 100
-    var delinearlized: Double = 0
-    if normalized <= 0.0031308 {
-      delinearlized = normalized * 12.92
-    } else {
-      delinearlized = 1.055 * Double(pow(normalized, 1 / 2.4)) - 0.055
-    }
-    return MathUtils.clampInt(0, 255, Int(round(delinearlized * 255)))
-  }
-
-  public static func labF(_ t: Double) -> Double {
-    let e = 216.0 / 24389.0
-    let kappa = 24389.0 / 27.0
-    if t > e {
-      return pow(t, 1 / 3)
-    } else {
-      return (kappa * t + 16) / 116
-    }
-  }
-
-  public static func labInvf(_ ft: Double) -> Double {
-    let e = 216.0 / 24389.0
-    let kappa = 24389.0 / 27.0
-    let ft3 = ft * ft * ft  // pow(ft, 3)
-    if ft3 > e {
-      return ft3
-    } else {
-      return (116 * ft - 16) / kappa
-    }
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Utils/MathUtils.swift b/swift/Sources/MaterialColorUtilities/Utils/MathUtils.swift
deleted file mode 100644
index a321ead9..00000000
--- a/swift/Sources/MaterialColorUtilities/Utils/MathUtils.swift
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-public class MathUtils {
-  /// The signum function.
-  ///
-  /// Returns 1 if num > 0, -1 if num < 0, and 0 if num = 0
-  @inlinable public static func signum(_ value: Double) -> Int {
-    if value < 0 {
-      return -1
-    } else if value == 0 {
-      return 0
-    } else {
-      return 1
-    }
-  }
-
-  /// The linear interpolation function.
-  ///
-  /// Returns start if amount = 0 and stop if amount = 1
-  @inlinable public static func lerp(_ start: Double, _ stop: Double, _ amount: Double) -> Double {
-    return (1 - amount) * start + amount * stop
-  }
-
-  /// Clamps an integer between two integers.
-  ///
-  /// Returns input when min <= input <= max, and either min or max
-  /// otherwise.
-  @inlinable public static func clampInt(_ min: Int, _ max: Int, _ input: Int) -> Int {
-    if input < min {
-      return min
-    } else if input > max {
-      return max
-    }
-    return input
-  }
-
-  /// Clamps an floating-point between two floating-point numbers.
-  ///
-  /// Returns input when min <= input <= max, and either min or max
-  /// otherwise.
-  @inlinable public static func clampDouble(_ min: Double, _ max: Double, _ input: Double) -> Double
-  {
-    if input < min {
-      return min
-    } else if input > max {
-      return max
-    }
-    return input
-
-  }
-
-  /// Sanitizes a degree measure as an integer.
-  ///
-  /// Returns a degree measure between 0 (inclusive) and 360
-  /// (exclusive).
-  @inlinable public static func sanitizeDegreesInt(_ degrees: Int) -> Int {
-    var degrees = degrees % 360
-    if degrees < 0 {
-      degrees = degrees + 360
-    }
-    return degrees
-  }
-
-  /// Sanitizes a degree measure as a floating-point number.
-  ///
-  /// Returns a degree measure between 0.0 (inclusive) and 360.0
-  /// (exclusive).
-  @inlinable public static func sanitizeDegreesDouble(_ degrees: Double) -> Double {
-    var degrees = degrees.truncatingRemainder(dividingBy: 360)
-    if degrees < 0 {
-      degrees = degrees + 360
-    }
-    return degrees
-  }
-
-  /// Sign of direction change needed to travel from one angle to
-  /// another.
-  ///
-  /// For angles that are 180 degrees apart from each other, both
-  /// directions have the same travel distance, so either direction is
-  /// shortest. The value 1.0 is returned in this case.
-  ///
-  /// [from] The angle travel starts from, in degrees.
-  /// [to] The angle travel ends at, in degrees.
-  /// Returns -1 if decreasing from leads to the shortest travel
-  /// distance, 1 if increasing from leads to the shortest travel
-  /// distance.
-  @inlinable public static func rotationDirection(_ from: Double, _ to: Double) -> Double {
-    let increasingDifference = sanitizeDegreesDouble(to - from)
-    return increasingDifference <= 180 ? 1 : -1
-  }
-
-  /// Distance of two points on a circle, represented using degrees.
-  @inlinable public static func differenceDegrees(_ a: Double, _ b: Double) -> Double {
-    return 180 - abs(abs(a - b) - 180)
-  }
-
-  /// Multiplies a 1x3 row vector with a 3x3 matrix.
-  @inlinable public static func matrixMultiply(_ row: [Double], _ matrix: [[Double]]) -> [Double] {
-    let a = row[0] * matrix[0][0] + row[1] * matrix[0][1] + row[2] * matrix[0][2]
-    let b = row[0] * matrix[1][0] + row[1] * matrix[1][1] + row[2] * matrix[1][2]
-    let c = row[0] * matrix[2][0] + row[1] * matrix[2][1] + row[2] * matrix[2][2]
-    return [a, b, c]
-  }
-}
diff --git a/swift/Sources/MaterialColorUtilities/Utils/StringUtils.swift b/swift/Sources/MaterialColorUtilities/Utils/StringUtils.swift
deleted file mode 100644
index 60e64782..00000000
--- a/swift/Sources/MaterialColorUtilities/Utils/StringUtils.swift
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-
-public class StringUtils {
-  /// Convert from a hex color to a argb color
-  @inlinable public static func hexFromArgb(_ argb: Int, leadingHashSign: Bool = true) -> String {
-    let red = ColorUtils.redFromArgb(argb)
-    let green = ColorUtils.greenFromArgb(argb)
-    let blue = ColorUtils.blueFromArgb(argb)
-    return "\(leadingHashSign ? "#" : "")\(hex(red))\(hex(green))\(hex(blue))"
-  }
-
-  /// Convert a string containing a hex color to a argb color
-  @inlinable public static func argbFromHex(_ hex: String) -> Int? {
-    if hex.hasPrefix("#") {
-      return Int(hex.dropFirst(), radix: 16)
-    } else {
-      return Int(hex, radix: 16)
-    }
-  }
-
-  static public func hex(_ value: Int) -> String {
-    return String(format: "%02X", value)
-  }
-}
diff --git a/swift/Tests/MaterialColorUtilitiesTests/BlendTests/BlendTests.swift b/swift/Tests/MaterialColorUtilitiesTests/BlendTests/BlendTests.swift
deleted file mode 100644
index e9b82ca2..00000000
--- a/swift/Tests/MaterialColorUtilitiesTests/BlendTests/BlendTests.swift
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-import XCTest
-
-@testable import MaterialColorUtilities
-
-final class BlendTests: XCTestCase {
-  let red = 0xffff_0000
-  let blue = 0xff00_00ff
-  let green = 0xff00_ff00
-  let yellow = 0xffff_ff00
-
-  func testRedToBlue() {
-    let answer = Blend.harmonize(red, blue)
-
-    XCTAssertEqual(answer, 0xffFB_0057)
-  }
-
-  func testRedToGreen() {
-    let answer = Blend.harmonize(red, green)
-
-    XCTAssertEqual(answer, 0xffD8_5600)
-  }
-
-  func testRedToYellow() {
-    let answer = Blend.harmonize(red, yellow)
-
-    XCTAssertEqual(answer, 0xffD8_5600)
-  }
-
-  func testBlueToRed() {
-    let answer = Blend.harmonize(blue, red)
-
-    XCTAssertEqual(answer, 0xff57_00DC)
-  }
-
-  func testBlueToYellow() {
-    let answer = Blend.harmonize(blue, yellow)
-
-    XCTAssertEqual(answer, 0xff00_47A3)
-  }
-
-  func testGreenToBlue() {
-    let answer = Blend.harmonize(green, blue)
-
-    XCTAssertEqual(answer, 0xff00_FC94)
-  }
-
-  func testGreenToRed() {
-    let answer = Blend.harmonize(green, red)
-
-    XCTAssertEqual(answer, 0xffB1_F000)
-  }
-
-  func testGreenToYellow() {
-    let answer = Blend.harmonize(green, yellow)
-
-    XCTAssertEqual(answer, 0xffB1_F000)
-  }
-
-  func testYellowToBlue() {
-    let answer = Blend.harmonize(yellow, blue)
-
-    XCTAssertEqual(answer, 0xffEB_FFBA)
-  }
-
-  func testYellowToGreen() {
-    let answer = Blend.harmonize(yellow, green)
-
-    XCTAssertEqual(answer, 0xffEB_FFBA)
-  }
-
-  func testYellowToRed() {
-    let answer = Blend.harmonize(yellow, red)
-
-    XCTAssertEqual(answer, 0xffFF_F6E3)
-  }
-}
diff --git a/swift/Tests/MaterialColorUtilitiesTests/ContrastTests/ContrastTests.swift b/swift/Tests/MaterialColorUtilitiesTests/ContrastTests/ContrastTests.swift
deleted file mode 100644
index b66a5141..00000000
--- a/swift/Tests/MaterialColorUtilitiesTests/ContrastTests/ContrastTests.swift
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-import XCTest
-
-@testable import MaterialColorUtilities
-
-final class ContrastTests: XCTestCase {
-  func testRatioOfTonesOutOfBoundsInput() {
-    XCTAssertEqual(21.0, Contrast.ratioOfTones(-10.0, 110.0), accuracy: 0.001)
-  }
-
-  func testLighterImpossibleRatioErrors() {
-    XCTAssertEqual(-1, Contrast.lighter(tone: 90, ratio: 10), accuracy: 0.001)
-  }
-
-  func testLighterOutOfBoundsInputAboveErrors() {
-    XCTAssertEqual(-1, Contrast.lighter(tone: 110, ratio: 2), accuracy: 0.001)
-  }
-
-  func testLighterOutOfBoundsInputBelowErrors() {
-    XCTAssertEqual(-1, Contrast.lighter(tone: -10, ratio: 2), accuracy: 0.001)
-  }
-
-  func testLighterUnsafeReturnsMaxTone() {
-    XCTAssertEqual(100, Contrast.lighterUnsafe(tone: 100, ratio: 2), accuracy: 0.001)
-  }
-
-  func testDarkerImpossibleRatioErrors() {
-    XCTAssertEqual(-1, Contrast.darker(tone: 10, ratio: 20), accuracy: 0.001)
-  }
-
-  func testDarkerOutOfBoundsInputAboveErrors() {
-    XCTAssertEqual(-1, Contrast.darker(tone: 110, ratio: 2), accuracy: 0.001)
-  }
-
-  func testDarkerOutOfBoundsInputBelowErrors() {
-    XCTAssertEqual(-1, Contrast.darker(tone: -10, ratio: 2), accuracy: 0.001)
-  }
-
-  func testDarkerUnsafeReturnsMinTone() {
-    XCTAssertEqual(0, Contrast.darkerUnsafe(tone: 0, ratio: 2), accuracy: 0.001)
-  }
-}
diff --git a/swift/Tests/MaterialColorUtilitiesTests/DislikeTests/DislikeAnalyzerTests.swift b/swift/Tests/MaterialColorUtilitiesTests/DislikeTests/DislikeAnalyzerTests.swift
deleted file mode 100644
index 7f583eed..00000000
--- a/swift/Tests/MaterialColorUtilitiesTests/DislikeTests/DislikeAnalyzerTests.swift
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-import XCTest
-
-@testable import MaterialColorUtilities
-
-final class DislikeAnalyzerTests: XCTestCase {
-  func testMonkSkinToneScaleColors() {
-    // From https://skintone.google#/get-started
-    let monkSkinToneScaleColors = [
-      0xfff6_ede4,
-      0xfff3_e7db,
-      0xfff7_ead0,
-      0xffea_daba,
-      0xffd7_bd96,
-      0xffa0_7e56,
-      0xff82_5c43,
-      0xff60_4134,
-      0xff3a_312a,
-      0xff29_2420,
-    ]
-    for color in monkSkinToneScaleColors {
-      XCTAssertFalse(DislikeAnalyzer.isDisliked(Hct.fromInt(color)))
-    }
-  }
-
-  func testBileColorsDisliked() {
-    let unlikable = [
-      0xff95_884B,
-      0xff71_6B40,
-      0xffB0_8E00,
-      0xff4C_4308,
-      0xff46_4521,
-    ]
-    for color in unlikable {
-      XCTAssertTrue(DislikeAnalyzer.isDisliked(Hct.fromInt(color)))
-    }
-  }
-
-  func testBileColorsBecameLikable() {
-    let unlikable = [
-      0xff95_884B,
-      0xff71_6B40,
-      0xffB0_8E00,
-      0xff4C_4308,
-      0xff46_4521,
-    ]
-    for color in unlikable {
-      let hct = Hct.fromInt(color)
-
-      XCTAssertTrue(DislikeAnalyzer.isDisliked(hct))
-
-      let likable = DislikeAnalyzer.fixIfDisliked(hct)
-
-      XCTAssertFalse(DislikeAnalyzer.isDisliked(likable))
-    }
-  }
-
-  func testTone67NotDisliked() {
-    let color = Hct.from(100, 50, 67)
-
-    XCTAssertFalse(DislikeAnalyzer.isDisliked(color))
-    XCTAssertEqual(DislikeAnalyzer.fixIfDisliked(color).toInt(), color.toInt())
-  }
-}
diff --git a/swift/Tests/MaterialColorUtilitiesTests/DynamicColorTests/DynamicColorTests.swift b/swift/Tests/MaterialColorUtilitiesTests/DynamicColorTests/DynamicColorTests.swift
deleted file mode 100644
index af7dba27..00000000
--- a/swift/Tests/MaterialColorUtilitiesTests/DynamicColorTests/DynamicColorTests.swift
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import Foundation
-import XCTest
-
-@testable import MaterialColorUtilities
-
-final class DynamicColorTests: XCTestCase {
-  let seedColors = [
-    Hct.fromInt(0xFFFF_0000),
-    Hct.fromInt(0xFFFF_FF00),
-    Hct.fromInt(0xFF00_FF00),
-    Hct.fromInt(0xFF00_00FF),
-  ]
-
-  let contrastLevels: [Double] = [-1, -0.5, 0, 0.5, 1]
-
-  let red = Hct.fromInt(0xFFFF_0000)
-
-  private let _colors: [String: DynamicColor] = [
-    "background": MaterialDynamicColors.background,
-    "onBackground": MaterialDynamicColors.onBackground,
-    "surface": MaterialDynamicColors.surface,
-    "surfaceDim": MaterialDynamicColors.surfaceDim,
-    "surfaceBright": MaterialDynamicColors.surfaceBright,
-    "surfaceContainerLowest": MaterialDynamicColors.surfaceContainerLowest,
-    "surfaceContainerLow": MaterialDynamicColors.surfaceContainerLow,
-    "surfaceContainer": MaterialDynamicColors.surfaceContainer,
-    "surfaceContainerHigh": MaterialDynamicColors.surfaceContainerHigh,
-    "surfaceContainerHighest": MaterialDynamicColors.surfaceContainerHighest,
-    "onSurface": MaterialDynamicColors.onSurface,
-    "surfaceVariant": MaterialDynamicColors.surfaceVariant,
-    "onSurfaceVariant": MaterialDynamicColors.onSurfaceVariant,
-    "inverseSurface": MaterialDynamicColors.inverseSurface,
-    "inverseOnSurface": MaterialDynamicColors.inverseOnSurface,
-    "outline": MaterialDynamicColors.outline,
-    "outlineVariant": MaterialDynamicColors.outlineVariant,
-    "shadow": MaterialDynamicColors.shadow,
-    "scrim": MaterialDynamicColors.scrim,
-    "surfaceTint": MaterialDynamicColors.surfaceTint,
-    "primary": MaterialDynamicColors.primary,
-    "onPrimary": MaterialDynamicColors.onPrimary,
-    "primaryContainer": MaterialDynamicColors.primaryContainer,
-    "onPrimaryContainer": MaterialDynamicColors.onPrimaryContainer,
-    "inversePrimary": MaterialDynamicColors.inversePrimary,
-    "secondary": MaterialDynamicColors.secondary,
-    "onSecondary": MaterialDynamicColors.onSecondary,
-    "secondaryContainer": MaterialDynamicColors.secondaryContainer,
-    "onSecondaryContainer": MaterialDynamicColors.onSecondaryContainer,
-    "tertiary": MaterialDynamicColors.tertiary,
-    "onTertiary": MaterialDynamicColors.onTertiary,
-    "tertiaryContainer": MaterialDynamicColors.tertiaryContainer,
-    "onTertiaryContainer": MaterialDynamicColors.onTertiaryContainer,
-    "error": MaterialDynamicColors.error,
-    "onError": MaterialDynamicColors.onError,
-    "errorContainer": MaterialDynamicColors.errorContainer,
-    "onErrorContainer": MaterialDynamicColors.onErrorContainer,
-  ]
-
-  private let _textSurfacePairs = [
-    _Pair("onPrimary", "primary"),
-    _Pair("onPrimaryContainer", "primaryContainer"),
-    _Pair("onSecondary", "secondary"),
-    _Pair("onSecondaryContainer", "secondaryContainer"),
-    _Pair("onTertiary", "tertiary"),
-    _Pair("onTertiaryContainer", "tertiaryContainer"),
-    _Pair("onError", "error"),
-    _Pair("onErrorContainer", "errorContainer"),
-    _Pair("onBackground", "background"),
-    _Pair("onSurfaceVariant", "surfaceBright"),
-    _Pair("onSurfaceVariant", "surfaceDim"),
-  ]
-
-  // Parametric test, ensuring that dynamic schemes respect contrast
-  // between text-surface pairs.
-
-  func testContrastPairs() {
-    for color in seedColors {
-      for contrastLevel in contrastLevels {
-        for isDark in [false, true] {
-          for scheme in [
-            SchemeContent(
-              sourceColorHct: color,
-              isDark: isDark,
-              contrastLevel: contrastLevel),
-            SchemeMonochrome(
-              sourceColorHct: color,
-              isDark: isDark,
-              contrastLevel: contrastLevel),
-            SchemeTonalSpot(
-              sourceColorHct: color,
-              isDark: isDark,
-              contrastLevel: contrastLevel),
-            SchemeFidelity(
-              sourceColorHct: color,
-              isDark: isDark,
-              contrastLevel: contrastLevel),
-          ] {
-            print(
-              "Scheme: \(scheme); Seed color: \(color); Contrast level: \(contrastLevel); Dark: \(isDark)"
-            )
-            for pair in _textSurfacePairs {
-              // Expect that each text-surface pair has a
-              // minimum contrast of 4.5 (unreduced contrast), or 3.0
-              // (reduced contrast).
-              let fgName = pair.fgName
-              let bgName = pair.bgName
-              let foregroundTone = _colors[fgName]!.getHct(scheme).tone
-              let backgroundTone = _colors[bgName]!.getHct(scheme).tone
-              let contrast = Contrast.ratioOfTones(foregroundTone, backgroundTone)
-
-              let minimumRequirement: Double = contrastLevel >= 0 ? 4.5 : 3
-
-              XCTAssertTrue(
-                contrast >= minimumRequirement,
-                "Contrast \(contrast) is too low between foreground (\(fgName); \(foregroundTone)) and (\(bgName); \(backgroundTone))"
-              )
-            }
-          }
-        }
-      }
-    }
-  }
-
-  // Tests for fixed colors.
-  func testFixedColorsInNonMonochromeSchemes() {
-    let scheme = SchemeTonalSpot(
-      sourceColorHct: Hct.fromInt(0xFFFF_0000),
-      isDark: true,
-      contrastLevel: 0.0
-    )
-
-    XCTAssertEqual(MaterialDynamicColors.primaryFixed.getHct(scheme).tone, 90, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.primaryFixedDim.getHct(scheme).tone, 80, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.onPrimaryFixed.getHct(scheme).tone, 10, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.onPrimaryFixedVariant.getHct(scheme).tone, 30, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.secondaryFixed.getHct(scheme).tone, 90, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.secondaryFixedDim.getHct(scheme).tone, 80, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.onSecondaryFixed.getHct(scheme).tone, 10, accuracy: 1)
-    XCTAssertEqual(
-      MaterialDynamicColors.onSecondaryFixedVariant.getHct(scheme).tone, 30, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.tertiaryFixed.getHct(scheme).tone, 90, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.tertiaryFixedDim.getHct(scheme).tone, 80, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.onTertiaryFixed.getHct(scheme).tone, 10, accuracy: 1)
-    XCTAssertEqual(
-      MaterialDynamicColors.onTertiaryFixedVariant.getHct(scheme).tone, 30, accuracy: 1)
-  }
-
-  func testFixedColorsInLightMonochromeSchemes() {
-    let scheme = SchemeMonochrome(
-      sourceColorHct: Hct.fromInt(0xFFFF_0000),
-      isDark: false,
-      contrastLevel: 0.0
-    )
-
-    XCTAssertEqual(MaterialDynamicColors.primaryFixed.getHct(scheme).tone, 40, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.primaryFixedDim.getHct(scheme).tone, 30, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.onPrimaryFixed.getHct(scheme).tone, 100, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.onPrimaryFixedVariant.getHct(scheme).tone, 90, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.secondaryFixed.getHct(scheme).tone, 80, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.secondaryFixedDim.getHct(scheme).tone, 70, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.onSecondaryFixed.getHct(scheme).tone, 10, accuracy: 1)
-    XCTAssertEqual(
-      MaterialDynamicColors.onSecondaryFixedVariant.getHct(scheme).tone, 25, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.tertiaryFixed.getHct(scheme).tone, 40, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.tertiaryFixedDim.getHct(scheme).tone, 30, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.onTertiaryFixed.getHct(scheme).tone, 100, accuracy: 1)
-    XCTAssertEqual(
-      MaterialDynamicColors.onTertiaryFixedVariant.getHct(scheme).tone, 90, accuracy: 1)
-  }
-
-  func testFixedColorsInDarkMonochromeSchemes() {
-    let scheme = SchemeMonochrome(
-      sourceColorHct: Hct.fromInt(0xFFFF_0000),
-      isDark: true,
-      contrastLevel: 0.0
-    )
-
-    XCTAssertEqual(MaterialDynamicColors.primaryFixed.getHct(scheme).tone, 40, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.primaryFixedDim.getHct(scheme).tone, 30, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.onPrimaryFixed.getHct(scheme).tone, 100, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.onPrimaryFixedVariant.getHct(scheme).tone, 90, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.secondaryFixed.getHct(scheme).tone, 80, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.secondaryFixedDim.getHct(scheme).tone, 70, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.onSecondaryFixed.getHct(scheme).tone, 10, accuracy: 1)
-    XCTAssertEqual(
-      MaterialDynamicColors.onSecondaryFixedVariant.getHct(scheme).tone, 25, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.tertiaryFixed.getHct(scheme).tone, 40, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.tertiaryFixedDim.getHct(scheme).tone, 30, accuracy: 1)
-    XCTAssertEqual(MaterialDynamicColors.onTertiaryFixed.getHct(scheme).tone, 100, accuracy: 1)
-    XCTAssertEqual(
-      MaterialDynamicColors.onTertiaryFixedVariant.getHct(scheme).tone, 90, accuracy: 1)
-  }
-}
-
-private class _Pair {
-  let fgName: String
-  let bgName: String
-
-  init(_ fgName: String, _ bgName: String) {
-    self.fgName = fgName
-    self.bgName = bgName
-  }
-}
diff --git a/swift/Tests/MaterialColorUtilitiesTests/HctTests/Cam16Tests.swift b/swift/Tests/MaterialColorUtilitiesTests/HctTests/Cam16Tests.swift
deleted file mode 100644
index f57d1cab..00000000
--- a/swift/Tests/MaterialColorUtilitiesTests/HctTests/Cam16Tests.swift
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import XCTest
-
-@testable import MaterialColorUtilities
-
-final class Cam16Tests: XCTestCase {
-  func testCam16() {
-    let result0 = Cam16.fromInt(1_151_024_110)
-    let result1 = Cam16.fromInt(2_599_766_946)
-    let result2 = Cam16.fromInt(207_007_830)
-    let result3 = Cam16.fromInt(2_178_068_049)
-    let result4 = Cam16.fromInt(2_293_293_753)
-    let result5 = Cam16.fromInt(2_127_352_735)
-    let result6 = Cam16.fromInt(2_692_552_334)
-    let result7 = Cam16.fromInt(481_692_528)
-    let result8 = Cam16.fromInt(1_073_904_100)
-    let result9 = Cam16.fromInt(3_734_873_206)
-
-    XCTAssertEqual(result0.hue, 311.42806917590127, accuracy: 1e-7)
-    XCTAssertEqual(result0.j, 39.80957637025326, accuracy: 1e-7)
-    XCTAssertEqual(result0.q, 98.12583617460575, accuracy: 1e-7)
-    XCTAssertEqual(result0.m, 64.10143150621671, accuracy: 1e-7)
-    XCTAssertEqual(result0.s, 80.82434221770161, accuracy: 1e-7)
-    XCTAssertEqual(result0.jstar, 52.927210914635715, accuracy: 1e-7)
-    XCTAssertEqual(result0.astar, 26.14144025259719, accuracy: 1e-7)
-    XCTAssertEqual(result0.bstar, -29.622376253821233, accuracy: 1e-7)
-    XCTAssertEqual(result1.hue, 355.0503461678604, accuracy: 1e-7)
-    XCTAssertEqual(result1.j, 52.56866623390567, accuracy: 1e-7)
-    XCTAssertEqual(result1.q, 112.75948188554017, accuracy: 1e-7)
-    XCTAssertEqual(result1.m, 64.2339418261725, accuracy: 1e-7)
-    XCTAssertEqual(result1.s, 75.4754569748874, accuracy: 1e-7)
-    XCTAssertEqual(result1.jstar, 65.32748230521139, accuracy: 1e-7)
-    XCTAssertEqual(result1.astar, 39.413992608446186, accuracy: 1e-7)
-    XCTAssertEqual(result1.bstar, -3.413381791164169, accuracy: 1e-7)
-    XCTAssertEqual(result2.hue, 145.62456894249067, accuracy: 1e-7)
-    XCTAssertEqual(result2.j, 53.54270205682524, accuracy: 1e-7)
-    XCTAssertEqual(result2.q, 113.79933774011006, accuracy: 1e-7)
-    XCTAssertEqual(result2.m, 45.67944977111023, accuracy: 1e-7)
-    XCTAssertEqual(result2.s, 63.35641059229854, accuracy: 1e-7)
-    XCTAssertEqual(result2.jstar, 66.20793233348957, accuracy: 1e-7)
-    XCTAssertEqual(result2.astar, -25.83510432830831, accuracy: 1e-7)
-    XCTAssertEqual(result2.bstar, 17.67339768662175, accuracy: 1e-7)
-    XCTAssertEqual(result3.hue, 89.18218954198817, accuracy: 1e-7)
-    XCTAssertEqual(result3.j, 64.64864806089051, accuracy: 1e-7)
-    XCTAssertEqual(result3.q, 125.04585955071941, accuracy: 1e-7)
-    XCTAssertEqual(result3.m, 31.023158944993195, accuracy: 1e-7)
-    XCTAssertEqual(result3.s, 49.809060584658496, accuracy: 1e-7)
-    XCTAssertEqual(result3.jstar, 75.66239905009027, accuracy: 1e-7)
-    XCTAssertEqual(result3.astar, 0.3348706268561027, accuracy: 1e-7)
-    XCTAssertEqual(result3.bstar, 23.45943416825876, accuracy: 1e-7)
-    XCTAssertEqual(result4.hue, 154.90292039856698, accuracy: 1e-7)
-    XCTAssertEqual(result4.j, 79.40954826675019, accuracy: 1e-7)
-    XCTAssertEqual(result4.q, 138.58810463022758, accuracy: 1e-7)
-    XCTAssertEqual(result4.m, 24.01419462632291, accuracy: 1e-7)
-    XCTAssertEqual(result4.s, 41.62660916534058, accuracy: 1e-7)
-    XCTAssertEqual(result4.jstar, 86.76592929927428, accuracy: 1e-7)
-    XCTAssertEqual(result4.astar, -17.343486416766375, accuracy: 1e-7)
-    XCTAssertEqual(result4.bstar, 8.123204738848699, accuracy: 1e-7)
-    XCTAssertEqual(result5.hue, 119.29861501791848, accuracy: 1e-7)
-    XCTAssertEqual(result5.j, 76.65379834326399, accuracy: 1e-7)
-    XCTAssertEqual(result5.q, 136.16216008227642, accuracy: 1e-7)
-    XCTAssertEqual(result5.m, 18.68775872501647, accuracy: 1e-7)
-    XCTAssertEqual(result5.s, 37.04677374071979, accuracy: 1e-7)
-    XCTAssertEqual(result5.jstar, 84.80635340083987, accuracy: 1e-7)
-    XCTAssertEqual(result5.astar, -7.617941092812117, accuracy: 1e-7)
-    XCTAssertEqual(result5.bstar, 13.575780288737059, accuracy: 1e-7)
-    XCTAssertEqual(result6.hue, 327.9022451708669, accuracy: 1e-7)
-    XCTAssertEqual(result6.j, 25.207401197509327, accuracy: 1e-7)
-    XCTAssertEqual(result6.q, 78.0824855218106, accuracy: 1e-7)
-    XCTAssertEqual(result6.m, 53.16273184281286, accuracy: 1e-7)
-    XCTAssertEqual(result6.s, 82.51384599304502, accuracy: 1e-7)
-    XCTAssertEqual(result6.jstar, 36.425276182524954, accuracy: 1e-7)
-    XCTAssertEqual(result6.astar, 29.499403055932383, accuracy: 1e-7)
-    XCTAssertEqual(result6.bstar, -18.50332986780255, accuracy: 1e-7)
-    XCTAssertEqual(result7.hue, 355.279570048603, accuracy: 1e-7)
-    XCTAssertEqual(result7.j, 33.2614419664756, accuracy: 1e-7)
-    XCTAssertEqual(result7.q, 89.69332605634818, accuracy: 1e-7)
-    XCTAssertEqual(result7.m, 64.28874467824023, accuracy: 1e-7)
-    XCTAssertEqual(result7.s, 84.6617825549819, accuracy: 1e-7)
-    XCTAssertEqual(result7.jstar, 45.865567063105644, accuracy: 1e-7)
-    XCTAssertEqual(result7.astar, 39.449488663086846, accuracy: 1e-7)
-    XCTAssertEqual(result7.bstar, -3.257500355999049, accuracy: 1e-7)
-    XCTAssertEqual(result8.hue, 261.1968416808902, accuracy: 1e-7)
-    XCTAssertEqual(result8.j, 40.7183615122085, accuracy: 1e-7)
-    XCTAssertEqual(result8.q, 99.23953929867855, accuracy: 1e-7)
-    XCTAssertEqual(result8.m, 49.66881860103603, accuracy: 1e-7)
-    XCTAssertEqual(result8.s, 70.74561810312906, accuracy: 1e-7)
-    XCTAssertEqual(result8.jstar, 53.86745346363419, accuracy: 1e-7)
-    XCTAssertEqual(result8.astar, -5.083026592209834, accuracy: 1e-7)
-    XCTAssertEqual(result8.bstar, -32.82238686945024, accuracy: 1e-7)
-    XCTAssertEqual(result9.hue, 119.84832142132542, accuracy: 1e-7)
-    XCTAssertEqual(result9.j, 56.17844931089786, accuracy: 1e-7)
-    XCTAssertEqual(result9.q, 116.56669043770763, accuracy: 1e-7)
-    XCTAssertEqual(result9.m, 17.906925043592874, accuracy: 1e-7)
-    XCTAssertEqual(result9.s, 39.19433269789186, accuracy: 1e-7)
-    XCTAssertEqual(result9.jstar, 68.547225856322, accuracy: 1e-7)
-    XCTAssertEqual(result9.astar, -7.47360894560527, accuracy: 1e-7)
-    XCTAssertEqual(result9.bstar, 13.024174399350978, accuracy: 1e-7)
-  }
-}
diff --git a/swift/Tests/MaterialColorUtilitiesTests/HctTests/HctTests.swift b/swift/Tests/MaterialColorUtilitiesTests/HctTests/HctTests.swift
deleted file mode 100644
index 6f64cadd..00000000
--- a/swift/Tests/MaterialColorUtilitiesTests/HctTests/HctTests.swift
+++ /dev/null
@@ -1,342 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import XCTest
-
-@testable import MaterialColorUtilities
-
-final class HctTests: XCTestCase {
-  //    func testHctRoundTrip() {
-  //        let colors = allColors()
-  //        var idx = 0
-  //
-  //        for argb in colors {
-  //            let hct = Hct.fromInt(argb)
-  //            let reconstructedArgb = Hct.from(hct.hue, hct.chroma, hct.tone)
-  //
-  //            XCTAssertEqual(hct.toInt(), reconstructedArgb.toInt())
-  //
-  //            print("\(argb) \(idx + 1)/\(colors.count)")
-  //            idx += 1
-  //        }
-  //    }
-
-  func testHashCode() {
-    XCTAssertEqual(Hct.fromInt(123), Hct.fromInt(123))
-    XCTAssertEqual(Hct.fromInt(123).hashValue, Hct.fromInt(123).hashValue)
-  }
-
-  func testConversionsAreReflexive() {
-    let cam = Cam16.fromInt(red)
-    let color = cam.viewed(ViewingConditions.standard())
-
-    XCTAssertEqual(color, red)
-  }
-
-  func testYMidgray() {
-    XCTAssertEqual(18.418, ColorUtils.yFromLstar(50), accuracy: 0.001)
-  }
-
-  func testYBlack() {
-    XCTAssertEqual(0, ColorUtils.yFromLstar(0), accuracy: 0.001)
-  }
-
-  func testYWhite() {
-    XCTAssertEqual(100, ColorUtils.yFromLstar(100), accuracy: 0.001)
-  }
-
-  func testCamRed() {
-    let cam = Cam16.fromInt(red)
-
-    XCTAssertEqual(46.445, cam.j, accuracy: 0.001)
-    XCTAssertEqual(113.357, cam.chroma, accuracy: 0.001)
-    XCTAssertEqual(27.408, cam.hue, accuracy: 0.001)
-    XCTAssertEqual(89.494, cam.m, accuracy: 0.001)
-    XCTAssertEqual(91.889, cam.s, accuracy: 0.001)
-    XCTAssertEqual(105.988, cam.q, accuracy: 0.001)
-  }
-
-  func testCamGreen() {
-    let cam = Cam16.fromInt(green)
-
-    XCTAssertEqual(79.331, cam.j, accuracy: 0.001)
-    XCTAssertEqual(108.410, cam.chroma, accuracy: 0.001)
-    XCTAssertEqual(142.139, cam.hue, accuracy: 0.001)
-    XCTAssertEqual(85.587, cam.m, accuracy: 0.001)
-    XCTAssertEqual(78.604, cam.s, accuracy: 0.001)
-    XCTAssertEqual(138.520, cam.q, accuracy: 0.001)
-  }
-
-  func testCamBlue() {
-    let cam = Cam16.fromInt(blue)
-
-    XCTAssertEqual(25.465, cam.j, accuracy: 0.001)
-    XCTAssertEqual(87.230, cam.chroma, accuracy: 0.001)
-    XCTAssertEqual(282.788, cam.hue, accuracy: 0.001)
-    XCTAssertEqual(68.867, cam.m, accuracy: 0.001)
-    XCTAssertEqual(93.674, cam.s, accuracy: 0.001)
-    XCTAssertEqual(78.481, cam.q, accuracy: 0.001)
-  }
-
-  func testCamBlack() {
-    let cam = Cam16.fromInt(black)
-
-    XCTAssertEqual(0.0, cam.j, accuracy: 0.001)
-    XCTAssertEqual(0.0, cam.chroma, accuracy: 0.001)
-    XCTAssertEqual(0.0, cam.hue, accuracy: 0.001)
-    XCTAssertEqual(0.0, cam.m, accuracy: 0.001)
-    XCTAssertEqual(0.0, cam.s, accuracy: 0.001)
-    XCTAssertEqual(0.0, cam.q, accuracy: 0.001)
-  }
-
-  func testCamWhite() {
-    let cam = Cam16.fromInt(white)
-
-    XCTAssertEqual(100.0, cam.j, accuracy: 0.001)
-    XCTAssertEqual(2.869, cam.chroma, accuracy: 0.001)
-    XCTAssertEqual(209.492, cam.hue, accuracy: 0.001)
-    XCTAssertEqual(2.265, cam.m, accuracy: 0.001)
-    XCTAssertEqual(12.068, cam.s, accuracy: 0.001)
-    XCTAssertEqual(155.521, cam.q, accuracy: 0.001)
-  }
-
-  func testCamutMapRed() {
-    let colorToTest = red
-    let cam = Cam16.fromInt(colorToTest)
-    let color = Hct.from(cam.hue, cam.chroma, ColorUtils.lstarFromArgb(colorToTest)).toInt()
-
-    XCTAssertEqual(colorToTest, color)
-  }
-
-  func testCamutMapGreen() {
-    let colorToTest = green
-    let cam = Cam16.fromInt(colorToTest)
-    let color = Hct.from(cam.hue, cam.chroma, ColorUtils.lstarFromArgb(colorToTest)).toInt()
-
-    XCTAssertEqual(colorToTest, color)
-  }
-
-  func testCamutMapBlue() {
-    let colorToTest = blue
-    let cam = Cam16.fromInt(colorToTest)
-    let color = Hct.from(cam.hue, cam.chroma, ColorUtils.lstarFromArgb(colorToTest)).toInt()
-
-    XCTAssertEqual(colorToTest, color)
-  }
-
-  func testCamutMapWhite() {
-    let colorToTest = white
-    let cam = Cam16.fromInt(colorToTest)
-    let color = Hct.from(cam.hue, cam.chroma, ColorUtils.lstarFromArgb(colorToTest)).toInt()
-
-    XCTAssertEqual(colorToTest, color)
-  }
-
-  func testCamutMapMidgray() {
-    let colorToTest = midgray
-    let cam = Cam16.fromInt(colorToTest)
-    let color = Hct.from(cam.hue, cam.chroma, ColorUtils.lstarFromArgb(colorToTest)).toInt()
-
-    XCTAssertEqual(colorToTest, color)
-  }
-
-  func testCamutMapBlack() {
-    let colorToTest = black
-    let cam = Cam16.fromInt(colorToTest)
-    let color = Hct.from(cam.hue, cam.chroma, ColorUtils.lstarFromArgb(colorToTest)).toInt()
-
-    XCTAssertEqual(colorToTest, color)
-  }
-
-  func testHctReturnsSufficientlyCloseColor() {
-    for hue in stride(from: 15, to: 361, by: 30) {
-      for chroma in stride(from: 0, to: 100, by: 10) {
-        for tone in stride(from: 20, to: 80, by: 10) {
-          let hctRequestDescription = "H\(hue) C\(chroma) T\(tone)"
-          let hctColor = Hct.from(Double(hue), Double(chroma), Double(tone))
-
-          if chroma > 0 {
-            XCTAssertEqual(
-              Int(hctColor.hue), hue, accuracy: 4,
-              "Hue should be close for \(hctRequestDescription)")
-          }
-
-          XCTAssertTrue(
-            0...(Double(chroma) + 2.5) ~= hctColor.chroma,
-            "Chroma should be close or less for \(hctRequestDescription)")
-
-          if hctColor.chroma < Double(chroma) - 2.5 {
-            XCTAssertTrue(
-              colorIsOnBoundary(hctColor.toInt()),
-              "HCT request for non-sRGB color should return a color on the boundary of the sRGB cube for \(hctRequestDescription), but got \(StringUtils.hexFromArgb(hctColor.toInt())) instead"
-            )
-          }
-
-          XCTAssertEqual(
-            hctColor.tone, Double(tone), accuracy: 0.5,
-            "Tone should be close for \(hctRequestDescription)")
-        }
-      }
-    }
-  }
-
-  func testCam16ToXyzWithoutArray() {
-    let colorToTest = red
-    let cam = Cam16.fromInt(colorToTest)
-    let xyz = cam.xyzInViewingConditions(ViewingConditions.sRgb())
-
-    XCTAssertEqual(xyz[0], 41.23, accuracy: 0.01)
-    XCTAssertEqual(xyz[1], 21.26, accuracy: 0.01)
-    XCTAssertEqual(xyz[2], 1.93, accuracy: 0.01)
-  }
-
-  func testCam16ToXyzWithArray() {
-    let colorToTest = red
-    let cam = Cam16.fromInt(colorToTest)
-    let xyz = cam.xyzInViewingConditions(ViewingConditions.sRgb(), array: [0, 0, 0])
-
-    XCTAssertEqual(xyz[0], 41.23, accuracy: 0.01)
-    XCTAssertEqual(xyz[1], 21.26, accuracy: 0.01)
-    XCTAssertEqual(xyz[2], 1.93, accuracy: 0.01)
-  }
-
-  func testColorRelativityRedInBlack() {
-    let colorToTest = red
-    let hct = Hct.fromInt(colorToTest)
-
-    let result = hct.inViewingConditions(ViewingConditions.make(backgroundLstar: 0))
-
-    XCTAssertEqual(result.toInt(), 0xff9F_5C51)
-  }
-
-  func testColorRelativityRedInWhite() {
-    let colorToTest = red
-    let hct = Hct.fromInt(colorToTest)
-
-    let result = hct.inViewingConditions(ViewingConditions.make(backgroundLstar: 100))
-
-    XCTAssertEqual(result.toInt(), 0xffFF_5D48)
-  }
-
-  func testColorRelativityGreenInBlack() {
-    let colorToTest = green
-    let hct = Hct.fromInt(colorToTest)
-
-    let result = hct.inViewingConditions(ViewingConditions.make(backgroundLstar: 0))
-
-    XCTAssertEqual(result.toInt(), 0xffAC_D69D)
-  }
-
-  func testColorRelativityGreenInWhite() {
-    let colorToTest = green
-    let hct = Hct.fromInt(colorToTest)
-
-    let result = hct.inViewingConditions(ViewingConditions.make(backgroundLstar: 100))
-
-    XCTAssertEqual(result.toInt(), 0xff8E_FF77)
-  }
-
-  func testColorRelativityBlueInBlack() {
-    let colorToTest = blue
-    let hct = Hct.fromInt(colorToTest)
-
-    let result = hct.inViewingConditions(ViewingConditions.make(backgroundLstar: 0))
-
-    XCTAssertEqual(result.toInt(), 0xff34_3654)
-  }
-
-  func testColorRelativityBlueInWhite() {
-    let colorToTest = blue
-    let hct = Hct.fromInt(colorToTest)
-
-    let result = hct.inViewingConditions(ViewingConditions.make(backgroundLstar: 100))
-
-    XCTAssertEqual(result.toInt(), 0xff3F_49FF)
-  }
-
-  func testColorRelativityWhiteInBlack() {
-    let colorToTest = white
-    let hct = Hct.fromInt(colorToTest)
-
-    let result = hct.inViewingConditions(ViewingConditions.make(backgroundLstar: 0))
-
-    XCTAssertEqual(result.toInt(), 0xffFF_FFFF)
-  }
-
-  func testColorRelativityWhiteInWhite() {
-    let colorToTest = white
-    let hct = Hct.fromInt(colorToTest)
-
-    let result = hct.inViewingConditions(ViewingConditions.make(backgroundLstar: 100))
-
-    XCTAssertEqual(result.toInt(), 0xffFF_FFFF)
-  }
-
-  func testColorRelativityMidgrayInBlack() {
-    let colorToTest = midgray
-    let hct = Hct.fromInt(colorToTest)
-
-    let result = hct.inViewingConditions(ViewingConditions.make(backgroundLstar: 0))
-
-    XCTAssertEqual(result.toInt(), 0xff60_5F5F)
-  }
-
-  func testColorRelativityMidgrayInWhite() {
-    let colorToTest = midgray
-    let hct = Hct.fromInt(colorToTest)
-
-    let result = hct.inViewingConditions(ViewingConditions.make(backgroundLstar: 100))
-
-    XCTAssertEqual(result.toInt(), 0xff8E_8E8E)
-  }
-
-  func testColorRelativityBlackInBlack() {
-    let colorToTest = black
-    let hct = Hct.fromInt(colorToTest)
-
-    let result = hct.inViewingConditions(ViewingConditions.make(backgroundLstar: 0))
-
-    XCTAssertEqual(result.toInt(), 0xff00_0000)
-  }
-
-  func testColorRelativityBlackInWhite() {
-    let colorToTest = black
-    let hct = Hct.fromInt(colorToTest)
-
-    let result = hct.inViewingConditions(ViewingConditions.make(backgroundLstar: 100))
-
-    XCTAssertEqual(result.toInt(), 0xff00_0000)
-  }
-}
-
-private let black = 0xff00_0000
-private let white = 0xffff_ffff
-private let red = 0xffff_0000
-private let green = 0xff00_ff00
-private let blue = 0xff00_00ff
-private let midgray = 0xff77_7777
-
-private func colorIsOnBoundary(_ argb: Int) -> Bool {
-  return ColorUtils.redFromArgb(argb) == 0 || ColorUtils.redFromArgb(argb) == 255
-    || ColorUtils.greenFromArgb(argb) == 0 || ColorUtils.greenFromArgb(argb) == 255
-    || ColorUtils.blueFromArgb(argb) == 0 || ColorUtils.blueFromArgb(argb) == 255
-}
-
-private func allColors() -> [Int] {
-  var colors: [Int] = []
-  for color in 0xFF00_0000...0xFFFF_FFFF {
-    colors.append(color)
-  }
-  return colors
-}
diff --git a/swift/Tests/MaterialColorUtilitiesTests/HctTests/ViewingConditionsTests.swift b/swift/Tests/MaterialColorUtilitiesTests/HctTests/ViewingConditionsTests.swift
deleted file mode 100644
index f58b2149..00000000
--- a/swift/Tests/MaterialColorUtilitiesTests/HctTests/ViewingConditionsTests.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import XCTest
-
-@testable import MaterialColorUtilities
-
-final class ViewingConditionsTests: XCTestCase {
-  func testViewingConditions() {
-    let result1 = ViewingConditions.make()
-
-    XCTAssertEqual(result1.adaptingLuminance, 11.725677948856951)
-    XCTAssertEqual(result1.backgroundLstar, 50.0)
-    XCTAssertEqual(result1.surround, 2.0)
-    XCTAssertEqual(result1.discountingIlluminant, false)
-  }
-}
diff --git a/swift/Tests/MaterialColorUtilitiesTests/PalettesTest/TonalPalettesTests.swift b/swift/Tests/MaterialColorUtilitiesTests/PalettesTest/TonalPalettesTests.swift
deleted file mode 100644
index 705b3ef5..00000000
--- a/swift/Tests/MaterialColorUtilitiesTests/PalettesTest/TonalPalettesTests.swift
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import XCTest
-
-@testable import MaterialColorUtilities
-
-final class TonalPalettesTests: XCTestCase {
-  func testOfTonesOfBlue() {
-    let hct = Hct.fromInt(0xff00_00ff)
-    let tones = TonalPalette.of(hct.hue, hct.chroma)
-
-    XCTAssertEqual(tones.tone(0), 0xff00_0000)
-    XCTAssertEqual(tones.tone(10), 0xff00_006e)
-    XCTAssertEqual(tones.tone(20), 0xff00_01ac)
-    XCTAssertEqual(tones.tone(30), 0xff00_00ef)
-    XCTAssertEqual(tones.tone(40), 0xff34_3dff)
-    XCTAssertEqual(tones.tone(50), 0xff5a_64ff)
-    XCTAssertEqual(tones.tone(60), 0xff7c_84ff)
-    XCTAssertEqual(tones.tone(70), 0xff9d_a3ff)
-    XCTAssertEqual(tones.tone(80), 0xffbe_c2ff)
-    XCTAssertEqual(tones.tone(90), 0xffe0_e0ff)
-    XCTAssertEqual(tones.tone(95), 0xfff1_efff)
-    XCTAssertEqual(tones.tone(99), 0xffff_fbff)
-    XCTAssertEqual(tones.tone(100), 0xffff_ffff)
-
-    /// Tone not in [TonalPalette.commonTones]
-    XCTAssertEqual(tones.tone(3), 0xff00_003c)
-  }
-
-  func testKeyColor_exactChromaAvailable() {
-    // Requested chroma is exactly achievable at a certain tone.
-    let palette = TonalPalette(hue: 50.0, chroma: 60.0)
-    let result = palette.keyColor
-
-    XCTAssertEqual(result.hue, 50.0, accuracy: 10.0)
-    XCTAssertEqual(result.chroma, 60.0, accuracy: 0.5)
-    // Tone might vary, but should be within the range from 0 to 100.
-    XCTAssertTrue(result.tone > 0 && result.tone < 100)
-  }
-
-  func testKeyColor_unusuallyHighChroma() {
-    // Requested chroma is above what is achievable. For Hue 149, chroma peak is 89.6 at Tone 87.9.
-    // The result key color's chroma should be close to the chroma peak.
-    let palette = TonalPalette(hue: 149.0, chroma: 200.0)
-    let result = palette.keyColor
-
-    XCTAssertEqual(result.hue, 149.0, accuracy: 10.0)
-    XCTAssertGreaterThan(result.chroma, 89.0)
-    // Tone might vary, but should be within the range from 0 to 100.
-    XCTAssertTrue(result.tone > 0 && result.tone < 100)
-  }
-
-  func testKeyColor_unusuallyLowChroma() {
-    // By definition, the key color should be the first tone, starting from Tone 50, matching the
-    // given hue and chroma. When requesting a very low chroma, the result should be close to Tone
-    // 50, since most tones can produce a low chroma.
-    let palette = TonalPalette(hue: 50.0, chroma: 3.0)
-    let result = palette.keyColor
-
-    // Higher error tolerance for hue when the requested chroma is unusually low.
-    XCTAssertEqual(result.hue, 50.0, accuracy: 10.0)
-    XCTAssertEqual(result.chroma, 3.0, accuracy: 0.5)
-    XCTAssertEqual(result.tone, 50.0, accuracy: 0.5)
-  }
-
-  func testOfOperatorAndHash() {
-    let hctAB = Hct.fromInt(0xff00_00ff)
-    let tonesA = TonalPalette.of(hctAB.hue, hctAB.chroma)
-    let tonesB = TonalPalette.of(hctAB.hue, hctAB.chroma)
-    let hctC = Hct.fromInt(0xff12_3456)
-    let tonesC = TonalPalette.of(hctC.hue, hctC.chroma)
-
-    XCTAssertEqual(tonesA, tonesB)
-    XCTAssertTrue(tonesB != tonesC)
-
-    XCTAssertEqual(tonesA.hashValue, tonesB.hashValue)
-    XCTAssertTrue(tonesB.hashValue != tonesC.hashValue)
-  }
-
-  func testFromHct() {
-    let hct = Hct.fromInt(0xff00_00ff)
-
-    let paletteFromHct = TonalPalette.fromHct(hct)
-    let paletteFromHueAndChroma = TonalPalette.of(hct.hue, hct.chroma)
-
-    XCTAssertEqual(paletteFromHct.hashValue, paletteFromHueAndChroma.hashValue)
-  }
-}
-
-private func createList(_ size: Int, value: Int? = nil) -> [Int] {
-  var results: [Int] = []
-  for i in 0.. [Double] {
-  let stepSize = (stop - start) / Double(caseCount - 1)
-  var result: [Double] = []
-  for index in 0.. [Int] {
-  let values = createRange(0, 255, 8)
-  return values.map { Int(round($0)) }
-}
-
-private func createFullRgbRange() -> [Int] {
-  var result: [Int] = []
-  for index in 0...255 {
-    result.append(index)
-  }
-  return result
-}
diff --git a/swift/Tests/MaterialColorUtilitiesTests/UtilsTests/MathUtilsTests.swift b/swift/Tests/MaterialColorUtilitiesTests/UtilsTests/MathUtilsTests.swift
deleted file mode 100644
index 68dd6638..00000000
--- a/swift/Tests/MaterialColorUtilitiesTests/UtilsTests/MathUtilsTests.swift
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import XCTest
-
-@testable import MaterialColorUtilities
-
-final class MathUtilsTests: XCTestCase {
-  func testSignum() {
-    let result1 = MathUtils.signum(-2)
-    let result2 = MathUtils.signum(0)
-    let result3 = MathUtils.signum(2)
-
-    XCTAssertEqual(result1, -1)
-    XCTAssertEqual(result2, 0)
-    XCTAssertEqual(result3, 1)
-  }
-
-  func testLerp() {
-    let result1 = MathUtils.lerp(0, 1, 0.5)
-    let result2 = MathUtils.lerp(0, 1, 0.2)
-    let result3 = MathUtils.lerp(0, 1, 0.8)
-    let result4 = MathUtils.lerp(0, 100, 0.5)
-
-    XCTAssertEqual(result1, 0.5)
-    XCTAssertEqual(result2, 0.2)
-    XCTAssertEqual(result3, 0.8)
-    XCTAssertEqual(result4, 50)
-  }
-
-  func testClampInt() {
-    let result1 = MathUtils.clampInt(0, 2, -1)
-    let result2 = MathUtils.clampInt(0, 2, 1)
-    let result3 = MathUtils.clampInt(0, 2, 3)
-
-    XCTAssertEqual(result1, 0)
-    XCTAssertEqual(result2, 1)
-    XCTAssertEqual(result3, 2)
-  }
-
-  func testClampDouble() {
-    let result1 = MathUtils.clampDouble(0, 2, -1)
-    let result2 = MathUtils.clampDouble(0, 2, 1)
-    let result3 = MathUtils.clampDouble(0, 2, 3)
-
-    XCTAssertEqual(result1, 0)
-    XCTAssertEqual(result2, 1)
-    XCTAssertEqual(result3, 2)
-  }
-
-  func testSanitizeDegreesInt() {
-    let result1 = MathUtils.sanitizeDegreesInt(20)
-    let result2 = MathUtils.sanitizeDegreesInt(360)
-    let result3 = MathUtils.sanitizeDegreesInt(420)
-
-    XCTAssertEqual(result1, 20)
-    XCTAssertEqual(result2, 0)
-    XCTAssertEqual(result3, 60)
-  }
-
-  func testSanitizeDegreesDouble() {
-    let result1 = MathUtils.sanitizeDegreesDouble(20)
-    let result2 = MathUtils.sanitizeDegreesDouble(360)
-    let result3 = MathUtils.sanitizeDegreesDouble(420)
-
-    XCTAssertEqual(result1, 20)
-    XCTAssertEqual(result2, 0)
-    XCTAssertEqual(result3, 60)
-  }
-
-  func testRotationDirection() {
-    var from = 0.0
-    while from < 360 {
-      var to = 7.5
-      while to < 360 {
-        let expectedAnswer = rotationDirection(from, to)
-        let actualAnswer = MathUtils.rotationDirection(from, to)
-
-        XCTAssertEqual(actualAnswer, expectedAnswer)
-        XCTAssertEqual(abs(actualAnswer), 1)
-
-        to += 15
-      }
-      from += 15
-    }
-  }
-
-  func testDifferenceDegrees() {
-    let result0 = MathUtils.differenceDegrees(274.6219605304299, 77.72547409861208)
-    let result1 = MathUtils.differenceDegrees(34.300891775453685, 345.71661212068005)
-    let result2 = MathUtils.differenceDegrees(133.40137028102632, 242.91571888782715)
-    let result3 = MathUtils.differenceDegrees(190.0917641906071, 212.50303144714914)
-    let result4 = MathUtils.differenceDegrees(74.32650812140363, 8.216795031646305)
-    let result5 = MathUtils.differenceDegrees(297.86357401167163, 40.68646508824719)
-    let result6 = MathUtils.differenceDegrees(267.81615364209966, 278.2059089562928)
-    let result7 = MathUtils.differenceDegrees(174.5904980548994, 23.563620558167703)
-    let result8 = MathUtils.differenceDegrees(157.88312470562747, 136.9620280065816)
-    let result9 = MathUtils.differenceDegrees(125.57678704737181, 232.55663167025088)
-    let result10 = MathUtils.differenceDegrees(29.516420072682976, 282.618422595264)
-
-    XCTAssertEqual(result0, 163.10351356818222)
-    XCTAssertEqual(result1, 48.58427965477364)
-    XCTAssertEqual(result2, 109.51434860680084)
-    XCTAssertEqual(result3, 22.411267256542033)
-    XCTAssertEqual(result4, 66.10971308975734)
-    XCTAssertEqual(result5, 102.82289107657556)
-    XCTAssertEqual(result6, 10.38975531419311)
-    XCTAssertEqual(result7, 151.0268774967317)
-    XCTAssertEqual(result8, 20.921096699045876)
-    XCTAssertEqual(result9, 106.97984462287907)
-    XCTAssertEqual(result10, 106.89799747741898)
-  }
-
-  func testMatrixMultiply() {
-    let result1 = MathUtils.matrixMultiply(
-      [0, 1, 2],
-      [
-        [1, 2, 3],
-        [2, 3, 4],
-        [4, 5, 6],
-      ])
-    let result2 = MathUtils.matrixMultiply(
-      [3, 4, 5],
-      [
-        [3, 7, 1],
-        [5, 8, 2],
-        [6, 9, 3],
-      ])
-
-    XCTAssertEqual(result1, [8, 11, 17])
-    XCTAssertEqual(result2, [42, 57, 69])
-  }
-}
-
-// Original implementation for MathUtils.rotationDirection.
-// Included here to test equivalence with new implementation.
-private func rotationDirection(_ from: Double, _ to: Double) -> Double {
-  let a = to - from
-  let b = to - from + 360
-  let c = to - from - 360
-  let aAbs = abs(a)
-  let bAbs = abs(b)
-  let cAbs = abs(c)
-  if aAbs <= bAbs && aAbs <= cAbs {
-    return a >= 0 ? 1 : -1
-  } else if bAbs <= aAbs && bAbs <= cAbs {
-    return b >= 0 ? 1 : -1
-  } else {
-    return c >= 0 ? 1 : -1
-  }
-}
diff --git a/swift/Tests/MaterialColorUtilitiesTests/UtilsTests/StringUtilsTests.swift b/swift/Tests/MaterialColorUtilitiesTests/UtilsTests/StringUtilsTests.swift
deleted file mode 100644
index 07a326e4..00000000
--- a/swift/Tests/MaterialColorUtilitiesTests/UtilsTests/StringUtilsTests.swift
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import XCTest
-
-@testable import MaterialColorUtilities
-
-final class StringUtilsTests: XCTestCase {
-  func testHexFromArgb() {
-    let result0 = StringUtils.hexFromArgb(914_181_854)
-    let result1 = StringUtils.hexFromArgb(1_941_786_595)
-    let result2 = StringUtils.hexFromArgb(4_002_780_905)
-    let result3 = StringUtils.hexFromArgb(2_734_560_664)
-    let result4 = StringUtils.hexFromArgb(3_291_681_504)
-    let result5 = StringUtils.hexFromArgb(607_316_496)
-    let result6 = StringUtils.hexFromArgb(2_460_285_668)
-    let result7 = StringUtils.hexFromArgb(3_285_071_752)
-    let result8 = StringUtils.hexFromArgb(3_940_857_847)
-    let result9 = StringUtils.hexFromArgb(1_802_349_691)
-
-    XCTAssertEqual(result0, "#7D4EDE")
-    XCTAssertEqual(result1, "#BD4FE3")
-    XCTAssertEqual(result2, "#9596E9")
-    XCTAssertEqual(result3, "#FE1598")
-    XCTAssertEqual(result4, "#3312E0")
-    XCTAssertEqual(result5, "#32EA10")
-    XCTAssertEqual(result6, "#A4FAE4")
-    XCTAssertEqual(result7, "#CE3788")
-    XCTAssertEqual(result8, "#E4B7F7")
-    XCTAssertEqual(result9, "#6DAC7B")
-  }
-
-  func testArgbFromHex() {
-    let result0 = StringUtils.argbFromHex("#7D4EDE")
-    let result1 = StringUtils.argbFromHex("#BD4FE3")
-    let result2 = StringUtils.argbFromHex("#9596E9")
-    let result3 = StringUtils.argbFromHex("#FE1598")
-    let result4 = StringUtils.argbFromHex("#3312E0")
-    let result5 = StringUtils.argbFromHex("#32EA10")
-    let result6 = StringUtils.argbFromHex("#A4FAE4")
-    let result7 = StringUtils.argbFromHex("#CE3788")
-    let result8 = StringUtils.argbFromHex("#E4B7F7")
-    let result9 = StringUtils.argbFromHex("#6DAC7B")
-
-    XCTAssertEqual(result0, 8_212_190)
-    XCTAssertEqual(result1, 12_406_755)
-    XCTAssertEqual(result2, 9_803_497)
-    XCTAssertEqual(result3, 16_651_672)
-    XCTAssertEqual(result4, 3_347_168)
-    XCTAssertEqual(result5, 3_336_720)
-    XCTAssertEqual(result6, 10_812_132)
-    XCTAssertEqual(result7, 13_514_632)
-    XCTAssertEqual(result8, 14_989_303)
-    XCTAssertEqual(result9, 7_187_579)
-  }
-
-  func testHexFroundTrip() {
-    let result0 = "#7D4EDE"
-    let result1 = "#BD4FE3"
-    let result2 = "#9596E9"
-    let result3 = "#FE1598"
-    let result4 = "#3312E0"
-    let result5 = "#32EA10"
-    let result6 = "#A4FAE4"
-    let result7 = "#CE3788"
-    let result8 = "#E4B7F7"
-    let result9 = "#6DAC7B"
-
-    XCTAssertEqual(result0, StringUtils.hexFromArgb(StringUtils.argbFromHex(result0)!))
-    XCTAssertEqual(result1, StringUtils.hexFromArgb(StringUtils.argbFromHex(result1)!))
-    XCTAssertEqual(result2, StringUtils.hexFromArgb(StringUtils.argbFromHex(result2)!))
-    XCTAssertEqual(result3, StringUtils.hexFromArgb(StringUtils.argbFromHex(result3)!))
-    XCTAssertEqual(result4, StringUtils.hexFromArgb(StringUtils.argbFromHex(result4)!))
-    XCTAssertEqual(result5, StringUtils.hexFromArgb(StringUtils.argbFromHex(result5)!))
-    XCTAssertEqual(result6, StringUtils.hexFromArgb(StringUtils.argbFromHex(result6)!))
-    XCTAssertEqual(result7, StringUtils.hexFromArgb(StringUtils.argbFromHex(result7)!))
-    XCTAssertEqual(result8, StringUtils.hexFromArgb(StringUtils.argbFromHex(result8)!))
-    XCTAssertEqual(result9, StringUtils.hexFromArgb(StringUtils.argbFromHex(result9)!))
-  }
-}
diff --git a/typescript/LICENSE b/typescript/LICENSE
deleted file mode 100644
index c3df629a..00000000
--- a/typescript/LICENSE
+++ /dev/null
@@ -1,191 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Copyright 2021 Google LLC
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
diff --git a/typescript/README.md b/typescript/README.md
deleted file mode 100644
index 0afb8de5..00000000
--- a/typescript/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# material-color-utilities
-
-[![npm package](https://badgen.net/npm/v/@material/material-color-utilities)](https://npmjs.com/package/@material/material-color-utilities)
-
-Algorithms and utilities that power the Material Design 3 (M3) color system,
-including choosing theme colors from images and creating tones of colors; all in
-a new color space.
-
-See the main
-[README](https://github.com/material-foundation/material-color-utilities#readme)
-for more information.
-
-## Getting started
-
-`npm i @material/material-color-utilities` or `yarn add @material/material-color-utilities`
-
-```typescript
-import { Hct } from "@material/material-color-utilities";
-
-// Simple demonstration of HCT.
-const color = Hct.fromInt(0xff4285f4);
-console.log(`Hue: ${color.hue}`);
-console.log(`Chrome: ${color.chroma}`);
-console.log(`Tone: ${color.tone}`);
-
-```
-
-### Theming
-
-```typescript
-import { argbFromHex, themeFromSourceColor, applyTheme } from "@material/material-color-utilities";
-
-// Get the theme from a hex color
-const theme = themeFromSourceColor(argbFromHex('#f82506'), [
-  {
-    name: "custom-1",
-    value: argbFromHex("#ff0000"),
-    blend: true,
-  },
-]);
-
-// Print out the theme as JSON
-console.log(JSON.stringify(theme, null, 2));
-
-// Check if the user has dark mode turned on
-const systemDark = window.matchMedia("(prefers-color-scheme: dark)").matches;
-
-// Apply the theme to the body by updating custom properties for material tokens
-applyTheme(theme, {target: document.body, dark: systemDark});
-
-```
-
-## Contributing
-
-This repo is not accepting external contributions, but feature requests and bug
-reports are welcome on
-[GitHub](https://github.com/material-foundation/material-color-utilities/issues).
diff --git a/typescript/blend/blend.ts b/typescript/blend/blend.ts
deleted file mode 100644
index ce396fcb..00000000
--- a/typescript/blend/blend.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// This file is automatically generated. Do not modify it.
-
-import {Cam16} from '../hct/cam16.js';
-import {Hct} from '../hct/hct.js';
-import * as colorUtils from '../utils/color_utils.js';
-import * as mathUtils from '../utils/math_utils.js';
-
-// material_color_utilities is designed to have a consistent API across
-// platforms and modular components that can be moved around easily. Using a
-// class as a namespace facilitates this.
-//
-// tslint:disable:class-as-namespace
-
-/**
- * Functions for blending in HCT and CAM16.
- */
-export class Blend {
-  /**
-   * Blend the design color's HCT hue towards the key color's HCT
-   * hue, in a way that leaves the original color recognizable and
-   * recognizably shifted towards the key color.
-   *
-   * @param designColor ARGB representation of an arbitrary color.
-   * @param sourceColor ARGB representation of the main theme color.
-   * @return The design color with a hue shifted towards the
-   * system's color, a slightly warmer/cooler variant of the design
-   * color's hue.
-   */
-  static harmonize(designColor: number, sourceColor: number): number {
-    const fromHct = Hct.fromInt(designColor);
-    const toHct = Hct.fromInt(sourceColor);
-    const differenceDegrees =
-        mathUtils.differenceDegrees(fromHct.hue, toHct.hue);
-    const rotationDegrees = Math.min(differenceDegrees * 0.5, 15.0);
-    const outputHue = mathUtils.sanitizeDegreesDouble(
-        fromHct.hue +
-        rotationDegrees * mathUtils.rotationDirection(fromHct.hue, toHct.hue));
-    return Hct.from(outputHue, fromHct.chroma, fromHct.tone).toInt();
-  }
-
-  /**
-   * Blends hue from one color into another. The chroma and tone of
-   * the original color are maintained.
-   *
-   * @param from ARGB representation of color
-   * @param to ARGB representation of color
-   * @param amount how much blending to perform; 0.0 >= and <= 1.0
-   * @return from, with a hue blended towards to. Chroma and tone
-   * are constant.
-   */
-  static hctHue(from: number, to: number, amount: number): number {
-    const ucs = Blend.cam16Ucs(from, to, amount);
-    const ucsCam = Cam16.fromInt(ucs);
-    const fromCam = Cam16.fromInt(from);
-    const blended = Hct.from(
-        ucsCam.hue,
-        fromCam.chroma,
-        colorUtils.lstarFromArgb(from),
-    );
-    return blended.toInt();
-  }
-
-  /**
-   * Blend in CAM16-UCS space.
-   *
-   * @param from ARGB representation of color
-   * @param to ARGB representation of color
-   * @param amount how much blending to perform; 0.0 >= and <= 1.0
-   * @return from, blended towards to. Hue, chroma, and tone will
-   * change.
-   */
-  static cam16Ucs(from: number, to: number, amount: number): number {
-    const fromCam = Cam16.fromInt(from);
-    const toCam = Cam16.fromInt(to);
-    const fromJ = fromCam.jstar;
-    const fromA = fromCam.astar;
-    const fromB = fromCam.bstar;
-    const toJ = toCam.jstar;
-    const toA = toCam.astar;
-    const toB = toCam.bstar;
-    const jstar = fromJ + (toJ - fromJ) * amount;
-    const astar = fromA + (toA - fromA) * amount;
-    const bstar = fromB + (toB - fromB) * amount;
-    return Cam16.fromUcs(jstar, astar, bstar).toInt();
-  }
-}
diff --git a/typescript/blend/blend_test.ts b/typescript/blend/blend_test.ts
deleted file mode 100644
index 461d107b..00000000
--- a/typescript/blend/blend_test.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless requiRED by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import 'jasmine';
-
-import {customMatchers} from '../utils/test_utils.js';
-
-import {Blend} from './blend.js';
-
-beforeEach(() => {
-  jasmine.addMatchers(customMatchers);
-});
-
-const RED = 0xffff0000;
-const BLUE = 0xff0000ff;
-const GREEN = 0xff00ff00;
-const YELLOW = 0xffffff00;
-
-describe('harmonize', () => {
-  it('redToBlue', () => {
-    const answer = Blend.harmonize(RED, BLUE);
-    expect(answer).matchesColor(0xffFB0057);
-  });
-
-  it('redToGreen', () => {
-    const answer = Blend.harmonize(RED, GREEN);
-    expect(answer).matchesColor(0xffD85600);
-  });
-
-  it('redToYellow', () => {
-    const answer = Blend.harmonize(RED, YELLOW);
-    expect(answer).matchesColor(0xffD85600);
-  });
-
-  it('blueToGreen', () => {
-    const answer = Blend.harmonize(BLUE, GREEN);
-    expect(answer).matchesColor(0xff0047A3);
-  });
-
-  it('blueToRed', () => {
-    const answer = Blend.harmonize(BLUE, RED);
-    expect(answer).matchesColor(0xff5700DC);
-  });
-
-  it('blueToYellow', () => {
-    const answer = Blend.harmonize(BLUE, YELLOW);
-    expect(answer).matchesColor(0xff0047A3);
-  });
-
-  it('greenToBlue', () => {
-    const answer = Blend.harmonize(GREEN, BLUE);
-    expect(answer).matchesColor(0xff00FC94);
-  });
-
-  it('greenToRed', () => {
-    const answer = Blend.harmonize(GREEN, RED);
-    expect(answer).matchesColor(0xffB1F000);
-  });
-
-  it('greenToYellow', () => {
-    const answer = Blend.harmonize(GREEN, YELLOW);
-    expect(answer).matchesColor(0xffB1F000);
-  });
-
-  it('yellowToBlue', () => {
-    const answer = Blend.harmonize(YELLOW, BLUE);
-    expect(answer).matchesColor(0xffEBFFBA);
-  });
-
-  it('yellowToGreen', () => {
-    const answer = Blend.harmonize(YELLOW, GREEN);
-    expect(answer).matchesColor(0xffEBFFBA);
-  });
-
-  it('yellowToRed', () => {
-    const answer = Blend.harmonize(YELLOW, RED);
-    expect(answer).matchesColor(0xffFFF6E3);
-  });
-});
diff --git a/typescript/contrast/contrast.ts b/typescript/contrast/contrast.ts
deleted file mode 100644
index dacb39c2..00000000
--- a/typescript/contrast/contrast.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * @license
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// material_color_utilities is designed to have a consistent API across
-// platforms and modular components that can be moved around easily. Using a
-// class as a namespace facilitates this.
-//
-// tslint:disable:class-as-namespace
-
-import * as utils from '../utils/color_utils.js';
-import * as math from '../utils/math_utils.js';
-
-/**
- * Utility methods for calculating contrast given two colors, or calculating a
- * color given one color and a contrast ratio.
- *
- * Contrast ratio is calculated using XYZ's Y. When linearized to match human
- * perception, Y becomes HCT's tone and L*a*b*'s' L*. Informally, this is the
- * lightness of a color.
- *
- * Methods refer to tone, T in the the HCT color space.
- * Tone is equivalent to L* in the L*a*b* color space, or L in the LCH color
- * space.
- */
-export class Contrast {
-  /**
-   * Returns a contrast ratio, which ranges from 1 to 21.
-   *
-   * @param toneA Tone between 0 and 100. Values outside will be clamped.
-   * @param toneB Tone between 0 and 100. Values outside will be clamped.
-   */
-  static ratioOfTones(toneA: number, toneB: number): number {
-    toneA = math.clampDouble(0.0, 100.0, toneA);
-    toneB = math.clampDouble(0.0, 100.0, toneB);
-    return Contrast.ratioOfYs(utils.yFromLstar(toneA), utils.yFromLstar(toneB));
-  }
-
-  static ratioOfYs(y1: number, y2: number): number {
-    const lighter = y1 > y2 ? y1 : y2;
-    const darker = (lighter === y2) ? y1 : y2;
-    return (lighter + 5.0) / (darker + 5.0);
-  }
-
-  /**
-   * Returns a tone >= tone parameter that ensures ratio parameter.
-   * Return value is between 0 and 100.
-   * Returns -1 if ratio cannot be achieved with tone parameter.
-   *
-   * @param tone Tone return value must contrast with.
-   * Range is 0 to 100. Invalid values will result in -1 being returned.
-   * @param ratio Contrast ratio of return value and tone.
-   * Range is 1 to 21, invalid values have undefined behavior.
-   */
-  static lighter(tone: number, ratio: number): number {
-    if (tone < 0.0 || tone > 100.0) {
-      return -1.0;
-    }
-
-    const darkY = utils.yFromLstar(tone);
-    const lightY = ratio * (darkY + 5.0) - 5.0;
-    const realContrast = Contrast.ratioOfYs(lightY, darkY);
-    const delta = Math.abs(realContrast - ratio);
-    if (realContrast < ratio && delta > 0.04) {
-      return -1;
-    }
-
-    // Ensure gamut mapping, which requires a 'range' on tone, will still result
-    // the correct ratio by darkening slightly.
-    const returnValue = utils.lstarFromY(lightY) + 0.4;
-    if (returnValue < 0 || returnValue > 100) {
-      return -1;
-    }
-    return returnValue;
-  }
-
-  /**
-   * Returns a tone <= tone parameter that ensures ratio parameter.
-   * Return value is between 0 and 100.
-   * Returns -1 if ratio cannot be achieved with tone parameter.
-   *
-   * @param tone Tone return value must contrast with.
-   * Range is 0 to 100. Invalid values will result in -1 being returned.
-   * @param ratio Contrast ratio of return value and tone.
-   * Range is 1 to 21, invalid values have undefined behavior.
-   */
-  static darker(tone: number, ratio: number): number {
-    if (tone < 0.0 || tone > 100.0) {
-      return -1.0;
-    }
-
-    const lightY = utils.yFromLstar(tone);
-    const darkY = ((lightY + 5.0) / ratio) - 5.0;
-    const realContrast = Contrast.ratioOfYs(lightY, darkY);
-
-    const delta = Math.abs(realContrast - ratio);
-    if (realContrast < ratio && delta > 0.04) {
-      return -1;
-    }
-
-    // Ensure gamut mapping, which requires a 'range' on tone, will still result
-    // the correct ratio by darkening slightly.
-    const returnValue = utils.lstarFromY(darkY) - 0.4;
-    if (returnValue < 0 || returnValue > 100) {
-      return -1;
-    }
-    return returnValue;
-  }
-
-  /**
-   * Returns a tone >= tone parameter that ensures ratio parameter.
-   * Return value is between 0 and 100.
-   * Returns 100 if ratio cannot be achieved with tone parameter.
-   *
-   * This method is unsafe because the returned value is guaranteed to be in
-   * bounds for tone, i.e. between 0 and 100. However, that value may not reach
-   * the ratio with tone. For example, there is no color lighter than T100.
-   *
-   * @param tone Tone return value must contrast with.
-   * Range is 0 to 100. Invalid values will result in 100 being returned.
-   * @param ratio Desired contrast ratio of return value and tone parameter.
-   * Range is 1 to 21, invalid values have undefined behavior.
-   */
-  static lighterUnsafe(tone: number, ratio: number): number {
-    const lighterSafe = Contrast.lighter(tone, ratio);
-    return (lighterSafe < 0.0) ? 100.0 : lighterSafe;
-  }
-
-  /**
-   * Returns a tone >= tone parameter that ensures ratio parameter.
-   * Return value is between 0 and 100.
-   * Returns 100 if ratio cannot be achieved with tone parameter.
-   *
-   * This method is unsafe because the returned value is guaranteed to be in
-   * bounds for tone, i.e. between 0 and 100. However, that value may not reach
-   * the [ratio with [tone]. For example, there is no color darker than T0.
-   *
-   * @param tone Tone return value must contrast with.
-   * Range is 0 to 100. Invalid values will result in 0 being returned.
-   * @param ratio Desired contrast ratio of return value and tone parameter.
-   * Range is 1 to 21, invalid values have undefined behavior.
-   */
-  static darkerUnsafe(tone: number, ratio: number): number {
-    const darkerSafe = Contrast.darker(tone, ratio);
-    return (darkerSafe < 0.0) ? 0.0 : darkerSafe;
-  }
-}
\ No newline at end of file
diff --git a/typescript/contrast/contrast_test.ts b/typescript/contrast/contrast_test.ts
deleted file mode 100644
index 5d915bff..00000000
--- a/typescript/contrast/contrast_test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * @license
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import 'jasmine';
-
-import {Contrast} from './contrast.js';
-
-describe('contrast', () => {
-  it('ratioOfTones_outOfBoundsInput', () => {
-    expect(21.0).toBeCloseTo(Contrast.ratioOfTones(-10.0, 110.0), 0.001);
-  });
-
-  it('lighter_impossibleRatioErrors', () => {
-    expect(-1.0).toBeCloseTo(Contrast.lighter(90.0, 10.0), 0.001);
-  });
-
-  it('lighter_outOfBoundsInputAboveErrors', () => {
-    expect(-1.0).toBeCloseTo(Contrast.lighter(110.0, 2.0), 0.001);
-  });
-
-  it('lighter_outOfBoundsInputBelowErrors', () => {
-    expect(-1.0).toBeCloseTo(Contrast.lighter(-10.0, 2.0), 0.001);
-  });
-
-  it('lighterUnsafe_returnsMaxTone', () => {
-    expect(100).toBeCloseTo(Contrast.lighterUnsafe(100.0, 2.0), 0.001);
-  });
-
-  it('darker_impossibleRatioErrors', () => {
-    expect(-1.0).toBeCloseTo(Contrast.darker(10.0, 20.0), 0.001);
-  });
-
-  it('darker_outOfBoundsInputAboveErrors', () => {
-    expect(-1.0).toBeCloseTo(Contrast.darker(110.0, 2.0), 0.001);
-  });
-
-  it('darker_outOfBoundsInputBelowErrors', () => {
-    expect(-1.0).toBeCloseTo(Contrast.darker(-10.0, 2.0), 0.001);
-  });
-
-  it('darkerUnsafe_returnsMinTone', () => {
-    expect(0.0).toBeCloseTo(Contrast.darkerUnsafe(0.0, 2.0), 0.001);
-  });
-});
\ No newline at end of file
diff --git a/typescript/dislike/dislike_analyzer.ts b/typescript/dislike/dislike_analyzer.ts
deleted file mode 100644
index 1fcc2ef8..00000000
--- a/typescript/dislike/dislike_analyzer.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * @license
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {Hct} from '../hct/hct.js';
-
-// material_color_utilities is designed to have a consistent API across
-// platforms and modular components that can be moved around easily. Using a
-// class as a namespace facilitates this.
-//
-// tslint:disable:class-as-namespace
-
-/**
- * Check and/or fix universally disliked colors.
- * Color science studies of color preference indicate universal distaste for
- * dark yellow-greens, and also show this is correlated to distate for
- * biological waste and rotting food.
- *
- * See Palmer and Schloss, 2010 or Schloss and Palmer's Chapter 21 in Handbook
- * of Color Psychology (2015).
- */
-export class DislikeAnalyzer {
-  /**
-   * Returns true if a color is disliked.
-   *
-   * @param hct A color to be judged.
-   * @return Whether the color is disliked.
-   *
-   * Disliked is defined as a dark yellow-green that is not neutral.
-   */
-  static isDisliked(hct: Hct): boolean {
-    const huePasses =
-        Math.round(hct.hue) >= 90.0 && Math.round(hct.hue) <= 111.0;
-    const chromaPasses = Math.round(hct.chroma) > 16.0;
-    const tonePasses = Math.round(hct.tone) < 65.0;
-
-    return huePasses && chromaPasses && tonePasses;
-  }
-
-  /**
-   * If a color is disliked, lighten it to make it likable.
-   *
-   * @param hct A color to be judged.
-   * @return A new color if the original color is disliked, or the original
-   *   color if it is acceptable.
-   */
-  static fixIfDisliked(hct: Hct): Hct {
-    if (DislikeAnalyzer.isDisliked(hct)) {
-      return Hct.from(
-          hct.hue,
-          hct.chroma,
-          70.0,
-      );
-    }
-
-    return hct;
-  }
-}
diff --git a/typescript/dislike/dislike_analyzer_test.ts b/typescript/dislike/dislike_analyzer_test.ts
deleted file mode 100644
index ddffd8d0..00000000
--- a/typescript/dislike/dislike_analyzer_test.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * @license
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import 'jasmine';
-
-import {Hct} from '../hct/hct.js';
-
-import {DislikeAnalyzer} from './dislike_analyzer.js';
-
-describe('dislike analyzer', () => {
-  it('likes Monk Skin Tone Scale colors', () => {
-    // From https://skintone.google#/get-started
-    const monkSkinToneScaleColors = [
-      0xfff6ede4,
-      0xfff3e7db,
-      0xfff7ead0,
-      0xffeadaba,
-      0xffd7bd96,
-      0xffa07e56,
-      0xff825c43,
-      0xff604134,
-      0xff3a312a,
-      0xff292420,
-    ];
-    for (const color of monkSkinToneScaleColors) {
-      expect(DislikeAnalyzer.isDisliked(Hct.fromInt(color))).toBeFalse();
-    }
-  });
-
-  it('dislikes bile colors', () => {
-    const unlikable = [
-      0xff95884B,
-      0xff716B40,
-      0xffB08E00,
-      0xff4C4308,
-      0xff464521,
-    ];
-    for (const color of unlikable) {
-      expect(DislikeAnalyzer.isDisliked(Hct.fromInt(color))).toBeTrue();
-    }
-  });
-
-  it('makes bile colors likable', () => {
-    const unlikable = [
-      0xff95884B,
-      0xff716B40,
-      0xffB08E00,
-      0xff4C4308,
-      0xff464521,
-    ];
-    for (const color of unlikable) {
-      const hct = Hct.fromInt(color);
-      expect(DislikeAnalyzer.isDisliked(hct)).toBeTrue();
-      const likable = DislikeAnalyzer.fixIfDisliked(hct);
-      expect(DislikeAnalyzer.isDisliked(likable)).toBeFalse();
-    }
-  });
-
-  it('likes tone 67 colors', () => {
-    const color = Hct.from(100.0, 50.0, 67.0);
-    expect(DislikeAnalyzer.isDisliked(color)).toBeFalse()
-    expect(DislikeAnalyzer.fixIfDisliked(color).toInt()).toEqual(color.toInt());
-  });
-});
diff --git a/typescript/dynamiccolor/color_spec.ts b/typescript/dynamiccolor/color_spec.ts
deleted file mode 100644
index e80221ec..00000000
--- a/typescript/dynamiccolor/color_spec.ts
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {Hct} from '../hct/hct.js';
-import {TonalPalette} from '../palettes/tonal_palette.js';
-
-import {ColorSpecDelegateImpl2021} from './color_spec_2021.js';
-import {ColorSpecDelegateImpl2025} from './color_spec_2025.js';
-import type {DynamicColor} from './dynamic_color';
-import {DynamicScheme, Platform} from './dynamic_scheme';
-import {Variant} from './variant.js';
-
-export type SpecVersion = '2021'|'2025';
-
-/**
- * A delegate that provides the dynamic color constraints for
- * MaterialDynamicColors.
- *
- * This is used to allow for different color constraints for different spec
- * versions.
- */
-export interface ColorSpecDelegate {
-  ////////////////////////////////////////////////////////////////
-  // Main Palettes                                              //
-  ////////////////////////////////////////////////////////////////
-
-  primaryPaletteKeyColor(): DynamicColor;
-
-  secondaryPaletteKeyColor(): DynamicColor;
-
-  tertiaryPaletteKeyColor(): DynamicColor;
-
-  neutralPaletteKeyColor(): DynamicColor;
-
-  neutralVariantPaletteKeyColor(): DynamicColor;
-
-  errorPaletteKeyColor(): DynamicColor;
-
-  ////////////////////////////////////////////////////////////////
-  // Surfaces [S]                                               //
-  ////////////////////////////////////////////////////////////////
-
-  background(): DynamicColor;
-
-  onBackground(): DynamicColor;
-
-  surface(): DynamicColor;
-
-  surfaceDim(): DynamicColor;
-
-  surfaceBright(): DynamicColor;
-
-  surfaceContainerLowest(): DynamicColor;
-
-  surfaceContainerLow(): DynamicColor;
-
-  surfaceContainer(): DynamicColor;
-
-  surfaceContainerHigh(): DynamicColor;
-
-  surfaceContainerHighest(): DynamicColor;
-
-  onSurface(): DynamicColor;
-
-  surfaceVariant(): DynamicColor;
-
-  onSurfaceVariant(): DynamicColor;
-
-  inverseSurface(): DynamicColor;
-
-  inverseOnSurface(): DynamicColor;
-
-  outline(): DynamicColor;
-
-  outlineVariant(): DynamicColor;
-
-  shadow(): DynamicColor;
-
-  scrim(): DynamicColor;
-
-  surfaceTint(): DynamicColor;
-
-  ////////////////////////////////////////////////////////////////
-  // Primaries [P]                                              //
-  ////////////////////////////////////////////////////////////////
-
-  primary(): DynamicColor;
-
-  primaryDim(): DynamicColor|undefined;
-
-  onPrimary(): DynamicColor;
-
-  primaryContainer(): DynamicColor;
-
-  onPrimaryContainer(): DynamicColor;
-
-  inversePrimary(): DynamicColor;
-
-  ////////////////////////////////////////////////////////////////
-  // Secondaries [Q]                                            //
-  ////////////////////////////////////////////////////////////////
-
-  secondary(): DynamicColor;
-
-  secondaryDim(): DynamicColor|undefined;
-
-  onSecondary(): DynamicColor;
-
-  secondaryContainer(): DynamicColor;
-
-  onSecondaryContainer(): DynamicColor;
-
-  ////////////////////////////////////////////////////////////////
-  // Tertiaries [T]                                             //
-  ////////////////////////////////////////////////////////////////
-
-  tertiary(): DynamicColor;
-
-  tertiaryDim(): DynamicColor|undefined;
-
-  onTertiary(): DynamicColor;
-
-  tertiaryContainer(): DynamicColor;
-
-  onTertiaryContainer(): DynamicColor;
-
-  ////////////////////////////////////////////////////////////////
-  // Errors [E]                                                 //
-  ////////////////////////////////////////////////////////////////
-
-  error(): DynamicColor;
-
-  errorDim(): DynamicColor|undefined;
-
-  onError(): DynamicColor;
-
-  errorContainer(): DynamicColor;
-
-  onErrorContainer(): DynamicColor;
-
-  ////////////////////////////////////////////////////////////////
-  // Primary Fixed Colors [PF]                                  //
-  ////////////////////////////////////////////////////////////////
-
-  primaryFixed(): DynamicColor;
-
-  primaryFixedDim(): DynamicColor;
-
-  onPrimaryFixed(): DynamicColor;
-
-  onPrimaryFixedVariant(): DynamicColor;
-
-  ////////////////////////////////////////////////////////////////
-  // Secondary Fixed Colors [QF]                                //
-  ////////////////////////////////////////////////////////////////
-
-  secondaryFixed(): DynamicColor;
-
-  secondaryFixedDim(): DynamicColor;
-
-  onSecondaryFixed(): DynamicColor;
-
-  onSecondaryFixedVariant(): DynamicColor;
-
-  ////////////////////////////////////////////////////////////////
-  // Tertiary Fixed Colors [TF]                                 //
-  ////////////////////////////////////////////////////////////////
-
-  tertiaryFixed(): DynamicColor;
-
-  tertiaryFixedDim(): DynamicColor;
-
-  onTertiaryFixed(): DynamicColor;
-
-  onTertiaryFixedVariant(): DynamicColor;
-
-  ////////////////////////////////////////////////////////////////
-  // Other                                                      //
-  ////////////////////////////////////////////////////////////////
-
-  highestSurface: (s: DynamicScheme) => DynamicColor;
-}
-
-export const spec_2021 = new ColorSpecDelegateImpl2021();
-export const spec_2025 = new ColorSpecDelegateImpl2025();
-
-/**
- * Returns the ColorSpecDelegate for the given spec version.
- */
-export function getSpec(specVersion: SpecVersion): ColorSpecDelegate {
-  switch (specVersion) {
-    case '2021':
-      return spec_2021;
-    case '2025':
-      return spec_2025;
-    default:
-      throw new Error(`Unsupported spec version: ${specVersion}`);
-  }
-}
diff --git a/typescript/dynamiccolor/color_spec_2021.ts b/typescript/dynamiccolor/color_spec_2021.ts
deleted file mode 100644
index ccb1b315..00000000
--- a/typescript/dynamiccolor/color_spec_2021.ts
+++ /dev/null
@@ -1,814 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {DislikeAnalyzer} from '../dislike/dislike_analyzer.js';
-import {Hct} from '../hct/hct.js';
-import {TonalPalette} from '../palettes/tonal_palette.js';
-import * as math from '../utils/math_utils.js';
-
-import {ColorSpecDelegate} from './color_spec.js';
-import {ContrastCurve} from './contrast_curve.js';
-import {DynamicColor} from './dynamic_color.js';
-import type {DynamicScheme} from './dynamic_scheme';
-import {ToneDeltaPair} from './tone_delta_pair.js';
-import {Variant} from './variant.js';
-
-/**
- * Returns true if the scheme is Fidelity or Content.
- */
-function isFidelity(scheme: DynamicScheme): boolean {
-  return scheme.variant === Variant.FIDELITY ||
-      scheme.variant === Variant.CONTENT;
-}
-
-/**
- * Returns true if the scheme is Monochrome.
- */
-function isMonochrome(scheme: DynamicScheme): boolean {
-  return scheme.variant === Variant.MONOCHROME;
-}
-
-/**
- * Returns the desired chroma for a given tone at a specific hue.
- *
- * @param hue The given hue.
- * @param chroma The target chroma.
- * @param tone The tone to start with.
- * @param byDecreasingTone Whether to search for lower tones.
- */
-function findDesiredChromaByTone(
-    hue: number, chroma: number, tone: number,
-    byDecreasingTone: boolean): number {
-  let answer = tone;
-
-  let closestToChroma = Hct.from(hue, chroma, tone);
-  if (closestToChroma.chroma < chroma) {
-    let chromaPeak = closestToChroma.chroma;
-    while (closestToChroma.chroma < chroma) {
-      answer += byDecreasingTone ? -1.0 : 1.0;
-      const potentialSolution = Hct.from(hue, chroma, answer);
-      if (chromaPeak > potentialSolution.chroma) {
-        break;
-      }
-      if (Math.abs(potentialSolution.chroma - chroma) < 0.4) {
-        break;
-      }
-
-      const potentialDelta = Math.abs(potentialSolution.chroma - chroma);
-      const currentDelta = Math.abs(closestToChroma.chroma - chroma);
-      if (potentialDelta < currentDelta) {
-        closestToChroma = potentialSolution;
-      }
-      chromaPeak = Math.max(chromaPeak, potentialSolution.chroma);
-    }
-  }
-
-  return answer;
-}
-
-/**
- * A delegate for the dynamic color spec of a DynamicScheme in the 2021 spec.
- */
-export class ColorSpecDelegateImpl2021 implements ColorSpecDelegate {
-  ////////////////////////////////////////////////////////////////
-  // Main Palettes                                              //
-  ////////////////////////////////////////////////////////////////
-
-  primaryPaletteKeyColor(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'primary_palette_key_color',
-      palette: (s) => s.primaryPalette,
-      tone: (s) => s.primaryPalette.keyColor.tone,
-    });
-  }
-
-  secondaryPaletteKeyColor(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'secondary_palette_key_color',
-      palette: (s) => s.secondaryPalette,
-      tone: (s) => s.secondaryPalette.keyColor.tone,
-    });
-  }
-
-  tertiaryPaletteKeyColor(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'tertiary_palette_key_color',
-      palette: (s) => s.tertiaryPalette,
-      tone: (s) => s.tertiaryPalette.keyColor.tone,
-    });
-  }
-
-  neutralPaletteKeyColor(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'neutral_palette_key_color',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => s.neutralPalette.keyColor.tone,
-    });
-  }
-
-  neutralVariantPaletteKeyColor(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'neutral_variant_palette_key_color',
-      palette: (s) => s.neutralVariantPalette,
-      tone: (s) => s.neutralVariantPalette.keyColor.tone,
-    });
-  }
-
-  errorPaletteKeyColor(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'error_palette_key_color',
-      palette: (s) => s.errorPalette,
-      tone: (s) => s.errorPalette.keyColor.tone,
-    });
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Surfaces [S]                                               //
-  ////////////////////////////////////////////////////////////////
-
-  background(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'background',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => s.isDark ? 6 : 98,
-      isBackground: true,
-    });
-  }
-
-  onBackground(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'on_background',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => s.isDark ? 90 : 10,
-      background: (s) => this.background(),
-      contrastCurve: (s) => new ContrastCurve(3, 3, 4.5, 7),
-    });
-  }
-
-  surface(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'surface',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => s.isDark ? 6 : 98,
-      isBackground: true,
-    });
-  }
-
-  surfaceDim(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'surface_dim',
-      palette: (s) => s.neutralPalette,
-      tone: (s) =>
-          s.isDark ? 6 : new ContrastCurve(87, 87, 80, 75).get(s.contrastLevel),
-      isBackground: true,
-    });
-  }
-
-  surfaceBright(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'surface_bright',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => s.isDark ?
-          new ContrastCurve(24, 24, 29, 34).get(s.contrastLevel) :
-          98,
-      isBackground: true,
-    });
-  }
-
-  surfaceContainerLowest(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'surface_container_lowest',
-      palette: (s) => s.neutralPalette,
-      tone: (s) =>
-          s.isDark ? new ContrastCurve(4, 4, 2, 0).get(s.contrastLevel) : 100,
-      isBackground: true,
-    });
-  }
-
-  surfaceContainerLow(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'surface_container_low',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => s.isDark ?
-          new ContrastCurve(10, 10, 11, 12).get(s.contrastLevel) :
-          new ContrastCurve(96, 96, 96, 95).get(s.contrastLevel),
-      isBackground: true,
-    });
-  }
-
-  surfaceContainer(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'surface_container',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => s.isDark ?
-          new ContrastCurve(12, 12, 16, 20).get(s.contrastLevel) :
-          new ContrastCurve(94, 94, 92, 90).get(s.contrastLevel),
-      isBackground: true,
-    });
-  }
-
-  surfaceContainerHigh(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'surface_container_high',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => s.isDark ?
-          new ContrastCurve(17, 17, 21, 25).get(s.contrastLevel) :
-          new ContrastCurve(92, 92, 88, 85).get(s.contrastLevel),
-      isBackground: true,
-    });
-  }
-
-  surfaceContainerHighest(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'surface_container_highest',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => s.isDark ?
-          new ContrastCurve(22, 22, 26, 30).get(s.contrastLevel) :
-          new ContrastCurve(90, 90, 84, 80).get(s.contrastLevel),
-      isBackground: true,
-    });
-  }
-
-  onSurface(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'on_surface',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => s.isDark ? 90 : 10,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(4.5, 7, 11, 21),
-    });
-  }
-
-  surfaceVariant(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'surface_variant',
-      palette: (s) => s.neutralVariantPalette,
-      tone: (s) => s.isDark ? 30 : 90,
-      isBackground: true,
-    });
-  }
-
-  onSurfaceVariant(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'on_surface_variant',
-      palette: (s) => s.neutralVariantPalette,
-      tone: (s) => s.isDark ? 80 : 30,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(3, 4.5, 7, 11),
-    });
-  }
-
-  inverseSurface(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'inverse_surface',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => s.isDark ? 90 : 20,
-      isBackground: true,
-    });
-  }
-
-  inverseOnSurface(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'inverse_on_surface',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => s.isDark ? 20 : 95,
-      background: (s) => this.inverseSurface(),
-      contrastCurve: (s) => new ContrastCurve(4.5, 7, 11, 21),
-    });
-  }
-
-  outline(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'outline',
-      palette: (s) => s.neutralVariantPalette,
-      tone: (s) => s.isDark ? 60 : 50,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(1.5, 3, 4.5, 7),
-    });
-  }
-
-  outlineVariant(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'outline_variant',
-      palette: (s) => s.neutralVariantPalette,
-      tone: (s) => s.isDark ? 30 : 80,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(1, 1, 3, 4.5),
-    });
-  }
-
-  shadow(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'shadow',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => 0,
-    });
-  }
-
-  scrim(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'scrim',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => 0,
-    });
-  }
-
-  surfaceTint(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'surface_tint',
-      palette: (s) => s.primaryPalette,
-      tone: (s) => s.isDark ? 80 : 40,
-      isBackground: true,
-    });
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Primary [P].                                               //
-  ////////////////////////////////////////////////////////////////
-
-  primary(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'primary',
-      palette: (s) => s.primaryPalette,
-      tone: (s) => {
-        if (isMonochrome(s)) {
-          return s.isDark ? 100 : 0;
-        }
-        return s.isDark ? 80 : 40;
-      },
-      isBackground: true,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(3, 4.5, 7, 7),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.primaryContainer(), this.primary(), 10, 'nearer', false),
-    });
-  }
-
-  primaryDim(): DynamicColor|undefined {
-    return undefined;
-  }
-
-  onPrimary(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'on_primary',
-      palette: (s) => s.primaryPalette,
-      tone: (s) => {
-        if (isMonochrome(s)) {
-          return s.isDark ? 10 : 90;
-        }
-        return s.isDark ? 20 : 100;
-      },
-      background: (s) => this.primary(),
-      contrastCurve: (s) => new ContrastCurve(4.5, 7, 11, 21),
-    });
-  }
-
-  primaryContainer(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'primary_container',
-      palette: (s) => s.primaryPalette,
-      tone: (s) => {
-        if (isFidelity(s)) {
-          return s.sourceColorHct.tone;
-        }
-        if (isMonochrome(s)) {
-          return s.isDark ? 85 : 25;
-        }
-        return s.isDark ? 30 : 90;
-      },
-      isBackground: true,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(1, 1, 3, 4.5),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.primaryContainer(), this.primary(), 10, 'nearer', false),
-    });
-  }
-
-  onPrimaryContainer(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'on_primary_container',
-      palette: (s) => s.primaryPalette,
-      tone: (s) => {
-        if (isFidelity(s)) {
-          return DynamicColor.foregroundTone(
-              this.primaryContainer().tone(s), 4.5);
-        }
-        if (isMonochrome(s)) {
-          return s.isDark ? 0 : 100;
-        }
-        return s.isDark ? 90 : 30;
-      },
-      background: (s) => this.primaryContainer(),
-      contrastCurve: (s) => new ContrastCurve(3, 4.5, 7, 11),
-    });
-  }
-
-  inversePrimary(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'inverse_primary',
-      palette: (s) => s.primaryPalette,
-      tone: (s) => s.isDark ? 40 : 80,
-      background: (s) => this.inverseSurface(),
-      contrastCurve: (s) => new ContrastCurve(3, 4.5, 7, 7),
-    });
-  }
-
-  /////////////////////////////////////////////////////////////////
-  // Secondary [Q].                                              //
-  /////////////////////////////////////////////////////////////////
-
-  secondary(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'secondary',
-      palette: (s) => s.secondaryPalette,
-      tone: (s) => s.isDark ? 80 : 40,
-      isBackground: true,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(3, 4.5, 7, 7),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.secondaryContainer(), this.secondary(), 10, 'nearer', false),
-    });
-  }
-
-  secondaryDim(): DynamicColor|undefined {
-    return undefined;
-  }
-
-  onSecondary(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'on_secondary',
-      palette: (s) => s.secondaryPalette,
-      tone: (s) => {
-        if (isMonochrome(s)) {
-          return s.isDark ? 10 : 100;
-        } else {
-          return s.isDark ? 20 : 100;
-        }
-      },
-      background: (s) => this.secondary(),
-      contrastCurve: (s) => new ContrastCurve(4.5, 7, 11, 21),
-    });
-  }
-
-  secondaryContainer(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'secondary_container',
-      palette: (s) => s.secondaryPalette,
-      tone: (s) => {
-        const initialTone = s.isDark ? 30 : 90;
-        if (isMonochrome(s)) {
-          return s.isDark ? 30 : 85;
-        }
-        if (!isFidelity(s)) {
-          return initialTone;
-        }
-        return findDesiredChromaByTone(
-            s.secondaryPalette.hue, s.secondaryPalette.chroma, initialTone,
-            s.isDark ? false : true);
-      },
-      isBackground: true,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(1, 1, 3, 4.5),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.secondaryContainer(), this.secondary(), 10, 'nearer', false),
-    });
-  }
-
-  onSecondaryContainer(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'on_secondary_container',
-      palette: (s) => s.secondaryPalette,
-      tone: (s) => {
-        if (isMonochrome(s)) {
-          return s.isDark ? 90 : 10;
-        }
-        if (!isFidelity(s)) {
-          return s.isDark ? 90 : 30;
-        }
-        return DynamicColor.foregroundTone(
-            this.secondaryContainer().tone(s), 4.5);
-      },
-      background: (s) => this.secondaryContainer(),
-      contrastCurve: (s) => new ContrastCurve(3, 4.5, 7, 11),
-    });
-  }
-
-  /////////////////////////////////////////////////////////////////
-  // Tertiary [T].                                               //
-  /////////////////////////////////////////////////////////////////
-
-  tertiary(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'tertiary',
-      palette: (s) => s.tertiaryPalette,
-      tone: (s) => {
-        if (isMonochrome(s)) {
-          return s.isDark ? 90 : 25;
-        }
-        return s.isDark ? 80 : 40;
-      },
-      isBackground: true,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(3, 4.5, 7, 7),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.tertiaryContainer(), this.tertiary(), 10, 'nearer', false),
-    });
-  }
-
-  tertiaryDim(): DynamicColor|undefined {
-    return undefined;
-  }
-
-  onTertiary(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'on_tertiary',
-      palette: (s) => s.tertiaryPalette,
-      tone: (s) => {
-        if (isMonochrome(s)) {
-          return s.isDark ? 10 : 90;
-        }
-        return s.isDark ? 20 : 100;
-      },
-      background: (s) => this.tertiary(),
-      contrastCurve: (s) => new ContrastCurve(4.5, 7, 11, 21),
-    });
-  }
-
-  tertiaryContainer(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'tertiary_container',
-      palette: (s) => s.tertiaryPalette,
-      tone: (s) => {
-        if (isMonochrome(s)) {
-          return s.isDark ? 60 : 49;
-        }
-        if (!isFidelity(s)) {
-          return s.isDark ? 30 : 90;
-        }
-        const proposedHct = s.tertiaryPalette.getHct(s.sourceColorHct.tone);
-        return DislikeAnalyzer.fixIfDisliked(proposedHct).tone;
-      },
-      isBackground: true,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(1, 1, 3, 4.5),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.tertiaryContainer(), this.tertiary(), 10, 'nearer', false),
-    });
-  }
-
-  onTertiaryContainer(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'on_tertiary_container',
-      palette: (s) => s.tertiaryPalette,
-      tone: (s) => {
-        if (isMonochrome(s)) {
-          return s.isDark ? 0 : 100;
-        }
-        if (!isFidelity(s)) {
-          return s.isDark ? 90 : 30;
-        }
-        return DynamicColor.foregroundTone(
-            this.tertiaryContainer().tone(s), 4.5);
-      },
-      background: (s) => this.tertiaryContainer(),
-      contrastCurve: (s) => new ContrastCurve(3, 4.5, 7, 11),
-    });
-  }
-
-  //////////////////////////////////////////////////////////////////
-  // Error [E].                                                   //
-  //////////////////////////////////////////////////////////////////
-
-  error(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'error',
-      palette: (s) => s.errorPalette,
-      tone: (s) => s.isDark ? 80 : 40,
-      isBackground: true,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(3, 4.5, 7, 7),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.errorContainer(), this.error(), 10, 'nearer', false),
-    });
-  }
-
-  errorDim(): DynamicColor|undefined {
-    return undefined;
-  }
-
-  onError(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'on_error',
-      palette: (s) => s.errorPalette,
-      tone: (s) => s.isDark ? 20 : 100,
-      background: (s) => this.error(),
-      contrastCurve: (s) => new ContrastCurve(4.5, 7, 11, 21),
-    });
-  }
-
-  errorContainer(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'error_container',
-      palette: (s) => s.errorPalette,
-      tone: (s) => s.isDark ? 30 : 90,
-      isBackground: true,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(1, 1, 3, 4.5),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.errorContainer(), this.error(), 10, 'nearer', false),
-    });
-  }
-
-  onErrorContainer(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'on_error_container',
-      palette: (s) => s.errorPalette,
-      tone: (s) => {
-        if (isMonochrome(s)) {
-          return s.isDark ? 90 : 10;
-        }
-        return s.isDark ? 90 : 30;
-      },
-      background: (s) => this.errorContainer(),
-      contrastCurve: (s) => new ContrastCurve(3, 4.5, 7, 11),
-    });
-  }
-
-  //////////////////////////////////////////////////////////////////
-  // Primary Fixed [PF]                                           //
-  //////////////////////////////////////////////////////////////////
-
-  primaryFixed(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'primary_fixed',
-      palette: (s) => s.primaryPalette,
-      tone: (s) => isMonochrome(s) ? 40.0 : 90.0,
-      isBackground: true,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(1, 1, 3, 4.5),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.primaryFixed(), this.primaryFixedDim(), 10, 'lighter', true),
-    });
-  }
-
-  primaryFixedDim(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'primary_fixed_dim',
-      palette: (s) => s.primaryPalette,
-      tone: (s) => isMonochrome(s) ? 30.0 : 80.0,
-      isBackground: true,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(1, 1, 3, 4.5),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.primaryFixed(), this.primaryFixedDim(), 10, 'lighter', true),
-    });
-  }
-
-  onPrimaryFixed(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'on_primary_fixed',
-      palette: (s) => s.primaryPalette,
-      tone: (s) => isMonochrome(s) ? 100.0 : 10.0,
-      background: (s) => this.primaryFixedDim(),
-      secondBackground: (s) => this.primaryFixed(),
-      contrastCurve: (s) => new ContrastCurve(4.5, 7, 11, 21),
-    });
-  }
-
-  onPrimaryFixedVariant(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'on_primary_fixed_variant',
-      palette: (s) => s.primaryPalette,
-      tone: (s) => isMonochrome(s) ? 90.0 : 30.0,
-      background: (s) => this.primaryFixedDim(),
-      secondBackground: (s) => this.primaryFixed(),
-      contrastCurve: (s) => new ContrastCurve(3, 4.5, 7, 11),
-    });
-  }
-
-  ///////////////////////////////////////////////////////////////////
-  // Secondary Fixed [QF]                                          //
-  ///////////////////////////////////////////////////////////////////
-
-  secondaryFixed(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'secondary_fixed',
-      palette: (s) => s.secondaryPalette,
-      tone: (s) => isMonochrome(s) ? 80.0 : 90.0,
-      isBackground: true,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(1, 1, 3, 4.5),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.secondaryFixed(), this.secondaryFixedDim(), 10, 'lighter', true),
-    });
-  }
-
-  secondaryFixedDim(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'secondary_fixed_dim',
-      palette: (s) => s.secondaryPalette,
-      tone: (s) => isMonochrome(s) ? 70.0 : 80.0,
-      isBackground: true,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(1, 1, 3, 4.5),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.secondaryFixed(), this.secondaryFixedDim(), 10, 'lighter', true),
-    });
-  }
-
-  onSecondaryFixed(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'on_secondary_fixed',
-      palette: (s) => s.secondaryPalette,
-      tone: (s) => 10.0,
-      background: (s) => this.secondaryFixedDim(),
-      secondBackground: (s) => this.secondaryFixed(),
-      contrastCurve: (s) => new ContrastCurve(4.5, 7, 11, 21),
-    });
-  }
-
-  onSecondaryFixedVariant(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'on_secondary_fixed_variant',
-      palette: (s) => s.secondaryPalette,
-      tone: (s) => isMonochrome(s) ? 25.0 : 30.0,
-      background: (s) => this.secondaryFixedDim(),
-      secondBackground: (s) => this.secondaryFixed(),
-      contrastCurve: (s) => new ContrastCurve(3, 4.5, 7, 11),
-    });
-  }
-
-  /////////////////////////////////////////////////////////////////
-  // Tertiary Fixed [TF]                                         //
-  /////////////////////////////////////////////////////////////////
-
-  tertiaryFixed(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'tertiary_fixed',
-      palette: (s) => s.tertiaryPalette,
-      tone: (s) => isMonochrome(s) ? 40.0 : 90.0,
-      isBackground: true,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(1, 1, 3, 4.5),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.tertiaryFixed(), this.tertiaryFixedDim(), 10, 'lighter', true),
-    });
-  }
-
-  tertiaryFixedDim(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'tertiary_fixed_dim',
-      palette: (s) => s.tertiaryPalette,
-      tone: (s) => isMonochrome(s) ? 30.0 : 80.0,
-      isBackground: true,
-      background: (s) => this.highestSurface(s),
-      contrastCurve: (s) => new ContrastCurve(1, 1, 3, 4.5),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.tertiaryFixed(), this.tertiaryFixedDim(), 10, 'lighter', true),
-    });
-  }
-
-  onTertiaryFixed(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'on_tertiary_fixed',
-      palette: (s) => s.tertiaryPalette,
-      tone: (s) => isMonochrome(s) ? 100.0 : 10.0,
-      background: (s) => this.tertiaryFixedDim(),
-      secondBackground: (s) => this.tertiaryFixed(),
-      contrastCurve: (s) => new ContrastCurve(4.5, 7, 11, 21),
-    });
-  }
-
-  onTertiaryFixedVariant(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'on_tertiary_fixed_variant',
-      palette: (s) => s.tertiaryPalette,
-      tone: (s) => isMonochrome(s) ? 90.0 : 30.0,
-      background: (s) => this.tertiaryFixedDim(),
-      secondBackground: (s) => this.tertiaryFixed(),
-      contrastCurve: (s) => new ContrastCurve(3, 4.5, 7, 11),
-    });
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Other                                                      //
-  ////////////////////////////////////////////////////////////////
-
-  highestSurface(s: DynamicScheme): DynamicColor {
-    return s.isDark ? this.surfaceBright() : this.surfaceDim();
-  }
-}
\ No newline at end of file
diff --git a/typescript/dynamiccolor/color_spec_2025.ts b/typescript/dynamiccolor/color_spec_2025.ts
deleted file mode 100644
index 3e8186c1..00000000
--- a/typescript/dynamiccolor/color_spec_2025.ts
+++ /dev/null
@@ -1,1163 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {Contrast} from '../contrast/contrast.js';
-import {Hct} from '../hct/hct.js';
-import {TonalPalette} from '../palettes/tonal_palette.js';
-import * as math from '../utils/math_utils.js';
-
-import {ColorSpecDelegateImpl2021} from './color_spec_2021.js';
-import {ContrastCurve} from './contrast_curve.js';
-import {DynamicColor, extendSpecVersion} from './dynamic_color';
-import type {DynamicScheme} from './dynamic_scheme';
-import {ToneDeltaPair} from './tone_delta_pair.js';
-import {Variant} from './variant.js';
-
-/**
- * Returns the maximum tone for a given chroma in the palette.
- *
- * @param palette The tonal palette to use.
- * @param lowerBound The lower bound of the tone.
- * @param upperBound The upper bound of the tone.
- */
-function tMaxC(
-    palette: TonalPalette, lowerBound: number = 0, upperBound: number = 100,
-    chromaMultiplier: number = 1): number {
-  let answer = findBestToneForChroma(
-      palette.hue, palette.chroma * chromaMultiplier, 100, true);
-  return math.clampDouble(lowerBound, upperBound, answer);
-}
-
-/**
- * Returns the minimum tone for a given chroma in the palette.
- *
- * @param palette The tonal palette to use.
- * @param lowerBound The lower bound of the tone.
- * @param upperBound The upper bound of the tone.
- */
-function tMinC(
-    palette: TonalPalette, lowerBound: number = 0,
-    upperBound: number = 100): number {
-  let answer = findBestToneForChroma(palette.hue, palette.chroma, 0, false);
-  return math.clampDouble(lowerBound, upperBound, answer);
-}
-
-/**
- * Searches for the best tone with a given chroma from a given tone at a
- * specific hue.
- *
- * @param hue The given hue.
- * @param chroma The target chroma.
- * @param tone The tone to start with.
- * @param byDecreasingTone Whether to search for lower tones.
- */
-function findBestToneForChroma(
-    hue: number, chroma: number, tone: number,
-    byDecreasingTone: boolean): number {
-  let answer = tone;
-  let bestCandidate = Hct.from(hue, chroma, answer);
-  while (bestCandidate.chroma < chroma) {
-    if (tone < 0 || tone > 100) {
-      break;
-    }
-    tone += byDecreasingTone ? -1.0 : 1.0;
-    const newCandidate = Hct.from(hue, chroma, tone);
-    if (bestCandidate.chroma < newCandidate.chroma) {
-      bestCandidate = newCandidate;
-      answer = tone;
-    }
-  }
-
-  return answer;
-}
-
-/**
- * Returns the contrast curve for a given default contrast.
- *
- * @param defaultContrast The default contrast to use.
- */
-function getCurve(defaultContrast: number): ContrastCurve {
-  if (defaultContrast === 1.5) {
-    return new ContrastCurve(1.5, 1.5, 3, 4.5);
-  } else if (defaultContrast === 3) {
-    return new ContrastCurve(3, 3, 4.5, 7);
-  } else if (defaultContrast === 4.5) {
-    return new ContrastCurve(4.5, 4.5, 7, 11);
-  } else if (defaultContrast === 6) {
-    return new ContrastCurve(6, 6, 7, 11);
-  } else if (defaultContrast === 7) {
-    return new ContrastCurve(7, 7, 11, 21);
-  } else if (defaultContrast === 9) {
-    return new ContrastCurve(9, 9, 11, 21);
-  } else if (defaultContrast === 11) {
-    return new ContrastCurve(11, 11, 21, 21);
-  } else if (defaultContrast === 21) {
-    return new ContrastCurve(21, 21, 21, 21);
-  } else {
-    // Shouldn't happen.
-    return new ContrastCurve(defaultContrast, defaultContrast, 7, 21);
-  }
-}
-
-/**
- * A delegate for the dynamic color spec of a DynamicScheme in the 2025 spec.
- */
-export class ColorSpecDelegateImpl2025 extends ColorSpecDelegateImpl2021 {
-  ////////////////////////////////////////////////////////////////
-  // Surfaces [S]                                               //
-  ////////////////////////////////////////////////////////////////
-
-  override surface(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'surface',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => {
-        super.surface().tone(s);
-        if (s.platform === 'phone') {
-          if (s.isDark) {
-            return 4;
-          } else {
-            if (Hct.isYellow(s.neutralPalette.hue)) {
-              return 99;
-            } else if (s.variant === Variant.VIBRANT) {
-              return 97;
-            } else {
-              return 98;
-            }
-          }
-        } else {
-          return 0;
-        }
-      },
-      isBackground: true,
-    });
-    return extendSpecVersion(super.surface(), '2025', color2025);
-  }
-
-  override surfaceDim(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'surface_dim',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => {
-        if (s.isDark) {
-          return 4;
-        } else {
-          if (Hct.isYellow(s.neutralPalette.hue)) {
-            return 90;
-          } else if (s.variant === Variant.VIBRANT) {
-            return 85;
-          } else {
-            return 87;
-          }
-        }
-      },
-      isBackground: true,
-      chromaMultiplier: (s) => {
-        if (!s.isDark) {
-          if (s.variant === Variant.NEUTRAL) {
-            return 2.5;
-          } else if (s.variant === Variant.TONAL_SPOT) {
-            return 1.7;
-          } else if (s.variant === Variant.EXPRESSIVE) {
-            return Hct.isYellow(s.neutralPalette.hue) ? 2.7 : 1.75;
-          } else if (s.variant === Variant.VIBRANT) {
-            return 1.36;
-          }
-        }
-        return 1;
-      },
-    });
-    return extendSpecVersion(super.surfaceDim(), '2025', color2025);
-  }
-
-  override surfaceBright(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'surface_bright',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => {
-        if (s.isDark) {
-          return 18;
-        } else {
-          if (Hct.isYellow(s.neutralPalette.hue)) {
-            return 99;
-          } else if (s.variant === Variant.VIBRANT) {
-            return 97;
-          } else {
-            return 98;
-          }
-        }
-      },
-      isBackground: true,
-      chromaMultiplier: (s) => {
-        if (s.isDark) {
-          if (s.variant === Variant.NEUTRAL) {
-            return 2.5;
-          } else if (s.variant === Variant.TONAL_SPOT) {
-            return 1.7;
-          } else if (s.variant === Variant.EXPRESSIVE) {
-            return Hct.isYellow(s.neutralPalette.hue) ? 2.7 : 1.75;
-          } else if (s.variant === Variant.VIBRANT) {
-            return 1.36;
-          }
-        }
-        return 1;
-      },
-    });
-    return extendSpecVersion(super.surfaceBright(), '2025', color2025);
-  }
-
-  override surfaceContainerLowest(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'surface_container_lowest',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => s.isDark ? 0 : 100,
-      isBackground: true,
-    });
-    return extendSpecVersion(super.surfaceContainerLowest(), '2025', color2025);
-  }
-
-  override surfaceContainerLow(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'surface_container_low',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => {
-        if (s.platform === 'phone') {
-          if (s.isDark) {
-            return 6;
-          } else {
-            if (Hct.isYellow(s.neutralPalette.hue)) {
-              return 98;
-            } else if (s.variant === Variant.VIBRANT) {
-              return 95;
-            } else {
-              return 96;
-            }
-          }
-        } else {
-          return 15;
-        }
-      },
-      isBackground: true,
-      chromaMultiplier: (s) => {
-        if (s.platform === 'phone') {
-          if (s.variant === Variant.NEUTRAL) {
-            return 1.3;
-          } else if (s.variant === Variant.TONAL_SPOT) {
-            return 1.25;
-          } else if (s.variant === Variant.EXPRESSIVE) {
-            return Hct.isYellow(s.neutralPalette.hue) ? 1.3 : 1.15;
-          } else if (s.variant === Variant.VIBRANT) {
-            return 1.08;
-          }
-        }
-        return 1;
-      },
-    });
-    return extendSpecVersion(super.surfaceContainerLow(), '2025', color2025);
-  }
-
-  override surfaceContainer(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'surface_container',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => {
-        if (s.platform === 'phone') {
-          if (s.isDark) {
-            return 9;
-          } else {
-            if (Hct.isYellow(s.neutralPalette.hue)) {
-              return 96;
-            } else if (s.variant === Variant.VIBRANT) {
-              return 92;
-            } else {
-              return 94;
-            }
-          }
-        } else {
-          return 20;
-        }
-      },
-      isBackground: true,
-      chromaMultiplier: (s) => {
-        if (s.platform === 'phone') {
-          if (s.variant === Variant.NEUTRAL) {
-            return 1.6;
-          } else if (s.variant === Variant.TONAL_SPOT) {
-            return 1.4;
-          } else if (s.variant === Variant.EXPRESSIVE) {
-            return Hct.isYellow(s.neutralPalette.hue) ? 1.6 : 1.3;
-          } else if (s.variant === Variant.VIBRANT) {
-            return 1.15;
-          }
-        }
-        return 1;
-      },
-    });
-    return extendSpecVersion(super.surfaceContainer(), '2025', color2025);
-  }
-
-  override surfaceContainerHigh(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'surface_container_high',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => {
-        if (s.platform === 'phone') {
-          if (s.isDark) {
-            return 12;
-          } else {
-            if (Hct.isYellow(s.neutralPalette.hue)) {
-              return 94;
-            } else if (s.variant === Variant.VIBRANT) {
-              return 90;
-            } else {
-              return 92;
-            }
-          }
-        } else {
-          return 25;
-        }
-      },
-      isBackground: true,
-      chromaMultiplier: (s) => {
-        if (s.platform === 'phone') {
-          if (s.variant === Variant.NEUTRAL) {
-            return 1.9;
-          } else if (s.variant === Variant.TONAL_SPOT) {
-            return 1.5;
-          } else if (s.variant === Variant.EXPRESSIVE) {
-            return Hct.isYellow(s.neutralPalette.hue) ? 1.95 : 1.45;
-          } else if (s.variant === Variant.VIBRANT) {
-            return 1.22;
-          }
-        }
-        return 1;
-      },
-    });
-    return extendSpecVersion(super.surfaceContainerHigh(), '2025', color2025);
-  }
-
-  override surfaceContainerHighest(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'surface_container_highest',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => {
-        if (s.isDark) {
-          return 15;
-        } else {
-          if (Hct.isYellow(s.neutralPalette.hue)) {
-            return 92;
-          } else if (s.variant === Variant.VIBRANT) {
-            return 88;
-          } else {
-            return 90;
-          }
-        }
-      },
-      isBackground: true,
-      chromaMultiplier: (s) => {
-        if (s.variant === Variant.NEUTRAL) {
-          return 2.2;
-        } else if (s.variant === Variant.TONAL_SPOT) {
-          return 1.7;
-        } else if (s.variant === Variant.EXPRESSIVE) {
-          return Hct.isYellow(s.neutralPalette.hue) ? 2.3 : 1.6;
-        } else if (s.variant === Variant.VIBRANT) {
-          return 1.29;
-        } else {  // default
-          return 1;
-        }
-      },
-    });
-    return extendSpecVersion(
-        super.surfaceContainerHighest(), '2025', color2025);
-  }
-
-  override onSurface(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'on_surface',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => {
-        if (s.variant === Variant.VIBRANT) {
-          return tMaxC(s.neutralPalette, 0, 100, 1.1);
-        } else {
-          // For all other variants, the initial tone should be the default
-          // tone, which is the same as the background color.
-          return DynamicColor.getInitialToneFromBackground(
-              (s) => s.platform === 'phone' ? this.highestSurface(s) :
-                                              this.surfaceContainerHigh())(s);
-        }
-      },
-      chromaMultiplier: (s) => {
-        if (s.platform === 'phone') {
-          if (s.variant === Variant.NEUTRAL) {
-            return 2.2;
-          } else if (s.variant === Variant.TONAL_SPOT) {
-            return 1.7;
-          } else if (s.variant === Variant.EXPRESSIVE) {
-            return Hct.isYellow(s.neutralPalette.hue) ? (s.isDark ? 3.0 : 2.3) :
-                                                        1.6;
-          }
-        }
-        return 1;
-      },
-      background: (s) => s.platform === 'phone' ? this.highestSurface(s) :
-                                                  this.surfaceContainerHigh(),
-      contrastCurve: (s) => s.isDark ? getCurve(11) : getCurve(9),
-    });
-    return extendSpecVersion(super.onSurface(), '2025', color2025);
-  }
-
-  override onSurfaceVariant(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'on_surface_variant',
-      palette: (s) => s.neutralPalette,
-      chromaMultiplier: (s) => {
-        if (s.platform === 'phone') {
-          if (s.variant === Variant.NEUTRAL) {
-            return 2.2;
-          } else if (s.variant === Variant.TONAL_SPOT) {
-            return 1.7;
-          } else if (s.variant === Variant.EXPRESSIVE) {
-            return Hct.isYellow(s.neutralPalette.hue) ? (s.isDark ? 3.0 : 2.3) :
-                                                        1.6;
-          }
-        }
-        return 1;
-      },
-      background: (s) => s.platform === 'phone' ? this.highestSurface(s) :
-                                                  this.surfaceContainerHigh(),
-      contrastCurve: (s) => s.platform === 'phone' ?
-          (s.isDark ? getCurve(6) : getCurve(4.5)) :
-          getCurve(7),
-    });
-    return extendSpecVersion(super.onSurfaceVariant(), '2025', color2025);
-  }
-
-  override outline(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'outline',
-      palette: (s) => s.neutralPalette,
-      chromaMultiplier: (s) => {
-        if (s.platform === 'phone') {
-          if (s.variant === Variant.NEUTRAL) {
-            return 2.2;
-          } else if (s.variant === Variant.TONAL_SPOT) {
-            return 1.7;
-          } else if (s.variant === Variant.EXPRESSIVE) {
-            return Hct.isYellow(s.neutralPalette.hue) ? (s.isDark ? 3.0 : 2.3) :
-                                                        1.6;
-          }
-        }
-        return 1;
-      },
-      background: (s) => s.platform === 'phone' ? this.highestSurface(s) :
-                                                  this.surfaceContainerHigh(),
-      contrastCurve: (s) =>
-          s.platform === 'phone' ? getCurve(3) : getCurve(4.5),
-    });
-    return extendSpecVersion(super.outline(), '2025', color2025);
-  }
-
-  override outlineVariant(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'outline_variant',
-      palette: (s) => s.neutralPalette,
-      chromaMultiplier: (s) => {
-        if (s.platform === 'phone') {
-          if (s.variant === Variant.NEUTRAL) {
-            return 2.2;
-          } else if (s.variant === Variant.TONAL_SPOT) {
-            return 1.7;
-          } else if (s.variant === Variant.EXPRESSIVE) {
-            return Hct.isYellow(s.neutralPalette.hue) ? (s.isDark ? 3.0 : 2.3) :
-                                                        1.6;
-          }
-        }
-        return 1;
-      },
-      background: (s) => s.platform === 'phone' ? this.highestSurface(s) :
-                                                  this.surfaceContainerHigh(),
-      contrastCurve: (s) =>
-          s.platform === 'phone' ? getCurve(1.5) : getCurve(3),
-    });
-    return extendSpecVersion(super.outlineVariant(), '2025', color2025);
-  }
-
-  override inverseSurface(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'inverse_surface',
-      palette: (s) => s.neutralPalette,
-      tone: (s) => s.isDark ? 98 : 4,
-      isBackground: true,
-    });
-    return extendSpecVersion(super.inverseSurface(), '2025', color2025);
-  }
-
-  override inverseOnSurface(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'inverse_on_surface',
-      palette: (s) => s.neutralPalette,
-      background: (s) => this.inverseSurface(),
-      contrastCurve: (s) => getCurve(7),
-    });
-    return extendSpecVersion(super.inverseOnSurface(), '2025', color2025);
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Primaries [P]                                              //
-  ////////////////////////////////////////////////////////////////
-
-  override primary(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'primary',
-      palette: (s) => s.primaryPalette,
-      tone: (s) => {
-        if (s.variant === Variant.NEUTRAL) {
-          if (s.platform === 'phone') {
-            return s.isDark ? 80 : 40;
-          } else {
-            return 90;
-          }
-        } else if (s.variant === Variant.TONAL_SPOT) {
-          if (s.platform === 'phone') {
-            if (s.isDark) {
-              return 80;
-            } else {
-              return tMaxC(s.primaryPalette);
-            }
-          } else {
-            return tMaxC(s.primaryPalette, 0, 90);
-          }
-        } else if (s.variant === Variant.EXPRESSIVE) {
-          return tMaxC(
-              s.primaryPalette, 0,
-              Hct.isYellow(s.primaryPalette.hue)   ? 25 :
-                  Hct.isCyan(s.primaryPalette.hue) ? 88 :
-                                                     98);
-        } else {  // VIBRANT
-          return tMaxC(
-              s.primaryPalette, 0, Hct.isCyan(s.primaryPalette.hue) ? 88 : 98);
-        }
-      },
-      isBackground: true,
-      background: (s) => s.platform === 'phone' ? this.highestSurface(s) :
-                                                  this.surfaceContainerHigh(),
-      contrastCurve: (s) =>
-          s.platform === 'phone' ? getCurve(4.5) : getCurve(7),
-      toneDeltaPair: (s) => s.platform === 'phone' ?
-          new ToneDeltaPair(
-              this.primaryContainer(), this.primary(), 5, 'relative_lighter',
-              true, 'farther') :
-          undefined,
-    });
-    return extendSpecVersion(super.primary(), '2025', color2025);
-  }
-
-  override primaryDim(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'primary_dim',
-      palette: (s) => s.primaryPalette,
-      tone: (s) => {
-        if (s.variant === Variant.NEUTRAL) {
-          return 85;
-        } else if (s.variant === Variant.TONAL_SPOT) {
-          return tMaxC(s.primaryPalette, 0, 90);
-        } else {
-          return tMaxC(s.primaryPalette);
-        }
-      },
-      isBackground: true,
-      background: (s) => this.surfaceContainerHigh(),
-      contrastCurve: (s) => getCurve(4.5),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.primaryDim(), this.primary(), 5, 'darker', true, 'farther'),
-    });
-  }
-
-  override onPrimary(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'on_primary',
-      palette: (s) => s.primaryPalette,
-      background: (s) =>
-          s.platform === 'phone' ? this.primary() : this.primaryDim(),
-      contrastCurve: (s) => s.platform === 'phone' ? getCurve(6) : getCurve(7),
-    });
-    return extendSpecVersion(super.onPrimary(), '2025', color2025);
-  }
-
-  override primaryContainer(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'primary_container',
-      palette: (s) => s.primaryPalette,
-      tone: (s) => {
-        if (s.platform === 'watch') {
-          return 30;
-        } else if (s.variant === Variant.NEUTRAL) {
-          return s.isDark ? 30 : 90;
-        } else if (s.variant === Variant.TONAL_SPOT) {
-          return s.isDark ? tMinC(s.primaryPalette, 35, 93) :
-                            tMaxC(s.primaryPalette, 0, 90);
-        } else if (s.variant === Variant.EXPRESSIVE) {
-          return s.isDark ? tMaxC(s.primaryPalette, 30, 93) :
-                            tMaxC(
-                                s.primaryPalette, 78,
-                                Hct.isCyan(s.primaryPalette.hue) ? 88 : 90);
-        } else {  // VIBRANT
-          return s.isDark ? tMinC(s.primaryPalette, 66, 93) :
-                            tMaxC(
-                                s.primaryPalette, 66,
-                                Hct.isCyan(s.primaryPalette.hue) ? 88 : 93);
-        }
-      },
-      isBackground: true,
-      background: (s) =>
-          s.platform === 'phone' ? this.highestSurface(s) : undefined,
-      toneDeltaPair: (s) => s.platform === 'phone' ?
-          undefined :
-          new ToneDeltaPair(
-              this.primaryContainer(), this.primaryDim(), 10, 'darker', true,
-              'farther'),
-      contrastCurve: (s) => s.platform === 'phone' && s.contrastLevel > 0 ?
-          getCurve(1.5) :
-          undefined,
-    });
-    return extendSpecVersion(super.primaryContainer(), '2025', color2025);
-  }
-
-  override onPrimaryContainer(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'on_primary_container',
-      palette: (s) => s.primaryPalette,
-      background: (s) => this.primaryContainer(),
-      contrastCurve: (s) => s.platform === 'phone' ? getCurve(6) : getCurve(7),
-    });
-    return extendSpecVersion(super.onPrimaryContainer(), '2025', color2025);
-  }
-
-  override primaryFixed(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'primary_fixed',
-      palette: (s) => s.primaryPalette,
-      tone: (s) => {
-        let tempS = Object.assign({}, s, {isDark: false, contrastLevel: 0});
-        return this.primaryContainer().getTone(tempS);
-      },
-      isBackground: true,
-      background: (s) =>
-          s.platform === 'phone' ? this.highestSurface(s) : undefined,
-      contrastCurve: (s) => s.platform === 'phone' && s.contrastLevel > 0 ?
-          getCurve(1.5) :
-          undefined,
-    });
-    return extendSpecVersion(super.primaryFixed(), '2025', color2025);
-  }
-
-  override primaryFixedDim(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'primary_fixed_dim',
-      palette: (s) => s.primaryPalette,
-      tone: (s) => this.primaryFixed().getTone(s),
-      isBackground: true,
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.primaryFixedDim(), this.primaryFixed(), 5, 'darker', true,
-          'exact'),
-    });
-    return extendSpecVersion(super.primaryFixedDim(), '2025', color2025);
-  }
-
-  override onPrimaryFixed(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'on_primary_fixed',
-      palette: (s) => s.primaryPalette,
-      background: (s) => this.primaryFixedDim(),
-      contrastCurve: (s) => getCurve(7),
-    });
-    return extendSpecVersion(super.onPrimaryFixed(), '2025', color2025);
-  }
-
-  override onPrimaryFixedVariant(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'on_primary_fixed_variant',
-      palette: (s) => s.primaryPalette,
-      background: (s) => this.primaryFixedDim(),
-      contrastCurve: (s) => getCurve(4.5),
-    });
-    return extendSpecVersion(super.onPrimaryFixedVariant(), '2025', color2025);
-  }
-
-  override inversePrimary(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'inverse_primary',
-      palette: (s) => s.primaryPalette,
-      tone: (s) => tMaxC(s.primaryPalette),
-      background: (s) => this.inverseSurface(),
-      contrastCurve: (s) => s.platform === 'phone' ? getCurve(6) : getCurve(7),
-    });
-    return extendSpecVersion(super.inversePrimary(), '2025', color2025);
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Secondaries [Q]                                            //
-  ////////////////////////////////////////////////////////////////
-
-  override secondary(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'secondary',
-      palette: (s) => s.secondaryPalette,
-      tone: (s) => {
-        if (s.platform === 'watch') {
-          return s.variant === Variant.NEUTRAL ?
-              90 :
-              tMaxC(s.secondaryPalette, 0, 90);
-        } else if (s.variant === Variant.NEUTRAL) {
-          return s.isDark ? tMinC(s.secondaryPalette, 0, 98) :
-                            tMaxC(s.secondaryPalette);
-        } else if (s.variant === Variant.VIBRANT) {
-          return tMaxC(s.secondaryPalette, 0, s.isDark ? 90 : 98);
-        } else {  // EXPRESSIVE and TONAL_SPOT
-          return s.isDark ? 80 : tMaxC(s.secondaryPalette);
-        }
-      },
-      isBackground: true,
-      background: (s) => s.platform === 'phone' ? this.highestSurface(s) :
-                                                  this.surfaceContainerHigh(),
-      contrastCurve: (s) =>
-          s.platform === 'phone' ? getCurve(4.5) : getCurve(7),
-      toneDeltaPair: (s) => s.platform === 'phone' ?
-          new ToneDeltaPair(
-              this.secondaryContainer(), this.secondary(), 5,
-              'relative_lighter', true, 'farther') :
-          undefined,
-    });
-    return extendSpecVersion(super.secondary(), '2025', color2025);
-  }
-
-  override secondaryDim(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'secondary_dim',
-      palette: (s) => s.secondaryPalette,
-      tone: (s) => {
-        if (s.variant === Variant.NEUTRAL) {
-          return 85;
-        } else {
-          return tMaxC(s.secondaryPalette, 0, 90);
-        }
-      },
-      isBackground: true,
-      background: (s) => this.surfaceContainerHigh(),
-      contrastCurve: (s) => getCurve(4.5),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.secondaryDim(), this.secondary(), 5, 'darker', true, 'farther'),
-    });
-  }
-
-  override onSecondary(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'on_secondary',
-      palette: (s) => s.secondaryPalette,
-      background: (s) =>
-          s.platform === 'phone' ? this.secondary() : this.secondaryDim(),
-      contrastCurve: (s) => s.platform === 'phone' ? getCurve(6) : getCurve(7),
-    });
-    return extendSpecVersion(super.onSecondary(), '2025', color2025);
-  }
-
-  override secondaryContainer(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'secondary_container',
-      palette: (s) => s.secondaryPalette,
-      tone: (s) => {
-        if (s.platform === 'watch') {
-          return 30;
-        } else if (s.variant === Variant.VIBRANT) {
-          return s.isDark ? tMinC(s.secondaryPalette, 30, 40) :
-                            tMaxC(s.secondaryPalette, 84, 90);
-        } else if (s.variant === Variant.EXPRESSIVE) {
-          return s.isDark ? 15 : tMaxC(s.secondaryPalette, 90, 95);
-        } else {
-          return s.isDark ? 25 : 90;
-        }
-      },
-      isBackground: true,
-      background: (s) =>
-          s.platform === 'phone' ? this.highestSurface(s) : undefined,
-      toneDeltaPair: (s) => s.platform === 'watch' ?
-          new ToneDeltaPair(
-              this.secondaryContainer(), this.secondaryDim(), 10, 'darker',
-              true, 'farther') :
-          undefined,
-      contrastCurve: (s) => s.platform === 'phone' && s.contrastLevel > 0 ?
-          getCurve(1.5) :
-          undefined,
-    });
-    return extendSpecVersion(super.secondaryContainer(), '2025', color2025);
-  }
-
-  override onSecondaryContainer(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'on_secondary_container',
-      palette: (s) => s.secondaryPalette,
-      background: (s) => this.secondaryContainer(),
-      contrastCurve: (s) => s.platform === 'phone' ? getCurve(6) : getCurve(7),
-    });
-    return extendSpecVersion(super.onSecondaryContainer(), '2025', color2025);
-  }
-
-  override secondaryFixed(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'secondary_fixed',
-      palette: (s) => s.secondaryPalette,
-      tone: (s) => {
-        let tempS = Object.assign({}, s, {isDark: false, contrastLevel: 0});
-        return this.secondaryContainer().getTone(tempS);
-      },
-      isBackground: true,
-      background: (s) =>
-          s.platform === 'phone' ? this.highestSurface(s) : undefined,
-      contrastCurve: (s) => s.platform === 'phone' && s.contrastLevel > 0 ?
-          getCurve(1.5) :
-          undefined,
-    });
-    return extendSpecVersion(super.secondaryFixed(), '2025', color2025);
-  }
-
-  override secondaryFixedDim(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'secondary_fixed_dim',
-      palette: (s) => s.secondaryPalette,
-      tone: (s) => this.secondaryFixed().getTone(s),
-      isBackground: true,
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.secondaryFixedDim(), this.secondaryFixed(), 5, 'darker', true,
-          'exact'),
-    });
-    return extendSpecVersion(super.secondaryFixedDim(), '2025', color2025);
-  }
-
-  override onSecondaryFixed(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'on_secondary_fixed',
-      palette: (s) => s.secondaryPalette,
-      background: (s) => this.secondaryFixedDim(),
-      contrastCurve: (s) => getCurve(7),
-    });
-    return extendSpecVersion(super.onSecondaryFixed(), '2025', color2025);
-  }
-
-  override onSecondaryFixedVariant(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'on_secondary_fixed_variant',
-      palette: (s) => s.secondaryPalette,
-      background: (s) => this.secondaryFixedDim(),
-      contrastCurve: (s) => getCurve(4.5),
-    });
-    return extendSpecVersion(
-        super.onSecondaryFixedVariant(), '2025', color2025);
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Tertiaries [T]                                             //
-  ////////////////////////////////////////////////////////////////
-
-  override tertiary(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'tertiary',
-      palette: (s) => s.tertiaryPalette,
-      tone: (s) => {
-        if (s.platform === 'watch') {
-          return s.variant === Variant.TONAL_SPOT ?
-              tMaxC(s.tertiaryPalette, 0, 90) :
-              tMaxC(s.tertiaryPalette);
-        } else if (
-            s.variant === Variant.EXPRESSIVE || s.variant === Variant.VIBRANT) {
-          return tMaxC(
-              s.tertiaryPalette, 0,
-              Hct.isCyan(s.tertiaryPalette.hue) ? 88 : (s.isDark ? 98 : 100));
-        } else {  // NEUTRAL and TONAL_SPOT
-          return s.isDark ? tMaxC(s.tertiaryPalette, 0, 98) :
-                            tMaxC(s.tertiaryPalette);
-        }
-      },
-      isBackground: true,
-      background: (s) => s.platform === 'phone' ? this.highestSurface(s) :
-                                                  this.surfaceContainerHigh(),
-      contrastCurve: (s) =>
-          s.platform === 'phone' ? getCurve(4.5) : getCurve(7),
-      toneDeltaPair: (s) => s.platform === 'phone' ?
-          new ToneDeltaPair(
-              this.tertiaryContainer(), this.tertiary(), 5, 'relative_lighter',
-              true, 'farther') :
-          undefined,
-    });
-    return extendSpecVersion(super.tertiary(), '2025', color2025);
-  }
-
-  override tertiaryDim(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'tertiary_dim',
-      palette: (s) => s.tertiaryPalette,
-      tone: (s) => {
-        if (s.variant === Variant.TONAL_SPOT) {
-          return tMaxC(s.tertiaryPalette, 0, 90);
-        } else {
-          return tMaxC(s.tertiaryPalette);
-        }
-      },
-      isBackground: true,
-      background: (s) => this.surfaceContainerHigh(),
-      contrastCurve: (s) => getCurve(4.5),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.tertiaryDim(), this.tertiary(), 5, 'darker', true, 'farther'),
-    });
-  }
-
-  override onTertiary(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'on_tertiary',
-      palette: (s) => s.tertiaryPalette,
-      background: (s) =>
-          s.platform === 'phone' ? this.tertiary() : this.tertiaryDim(),
-      contrastCurve: (s) => s.platform === 'phone' ? getCurve(6) : getCurve(7),
-    });
-    return extendSpecVersion(super.onTertiary(), '2025', color2025);
-  }
-
-  override tertiaryContainer(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'tertiary_container',
-      palette: (s) => s.tertiaryPalette,
-      tone: (s) => {
-        if (s.platform === 'watch') {
-          return s.variant === Variant.TONAL_SPOT ?
-              tMaxC(s.tertiaryPalette, 0, 90) :
-              tMaxC(s.tertiaryPalette);
-        } else {
-          if (s.variant === Variant.NEUTRAL) {
-            return s.isDark ? tMaxC(s.tertiaryPalette, 0, 93) :
-                              tMaxC(s.tertiaryPalette, 0, 96);
-          } else if (s.variant === Variant.TONAL_SPOT) {
-            return tMaxC(s.tertiaryPalette, 0, s.isDark ? 93 : 100);
-          } else if (s.variant === Variant.EXPRESSIVE) {
-            return tMaxC(
-                s.tertiaryPalette, 75,
-                Hct.isCyan(s.tertiaryPalette.hue) ? 88 : (s.isDark ? 93 : 100));
-          } else {  // VIBRANT
-            return s.isDark ? tMaxC(s.tertiaryPalette, 0, 93) :
-                              tMaxC(s.tertiaryPalette, 72, 100);
-          }
-        }
-      },
-      isBackground: true,
-      background: (s) =>
-          s.platform === 'phone' ? this.highestSurface(s) : undefined,
-      toneDeltaPair: (s) => s.platform === 'watch' ?
-          new ToneDeltaPair(
-              this.tertiaryContainer(), this.tertiaryDim(), 10, 'darker', true,
-              'farther') :
-          undefined,
-      contrastCurve: (s) => s.platform === 'phone' && s.contrastLevel > 0 ?
-          getCurve(1.5) :
-          undefined,
-    });
-    return extendSpecVersion(super.tertiaryContainer(), '2025', color2025);
-  }
-
-  override onTertiaryContainer(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'on_tertiary_container',
-      palette: (s) => s.tertiaryPalette,
-      background: (s) => this.tertiaryContainer(),
-      contrastCurve: (s) => s.platform === 'phone' ? getCurve(6) : getCurve(7),
-    });
-    return extendSpecVersion(super.onTertiaryContainer(), '2025', color2025);
-  }
-
-  override tertiaryFixed(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'tertiary_fixed',
-      palette: (s) => s.tertiaryPalette,
-      tone: (s) => {
-        let tempS = Object.assign({}, s, {isDark: false, contrastLevel: 0});
-        return this.tertiaryContainer().getTone(tempS);
-      },
-      isBackground: true,
-      background: (s) =>
-          s.platform === 'phone' ? this.highestSurface(s) : undefined,
-      contrastCurve: (s) => s.platform === 'phone' && s.contrastLevel > 0 ?
-          getCurve(1.5) :
-          undefined,
-    });
-    return extendSpecVersion(super.tertiaryFixed(), '2025', color2025);
-  }
-
-  override tertiaryFixedDim(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'tertiary_fixed_dim',
-      palette: (s) => s.tertiaryPalette,
-      tone: (s) => this.tertiaryFixed().getTone(s),
-      isBackground: true,
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.tertiaryFixedDim(), this.tertiaryFixed(), 5, 'darker', true,
-          'exact'),
-    });
-    return extendSpecVersion(super.tertiaryFixedDim(), '2025', color2025);
-  }
-
-  override onTertiaryFixed(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'on_tertiary_fixed',
-      palette: (s) => s.tertiaryPalette,
-      background: (s) => this.tertiaryFixedDim(),
-      contrastCurve: (s) => getCurve(7),
-    });
-    return extendSpecVersion(super.onTertiaryFixed(), '2025', color2025);
-  }
-
-  override onTertiaryFixedVariant(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'on_tertiary_fixed_variant',
-      palette: (s) => s.tertiaryPalette,
-      background: (s) => this.tertiaryFixedDim(),
-      contrastCurve: (s) => getCurve(4.5),
-    });
-    return extendSpecVersion(super.onTertiaryFixedVariant(), '2025', color2025);
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Errors [E]                                                 //
-  ////////////////////////////////////////////////////////////////
-
-  override error(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'error',
-      palette: (s) => s.errorPalette,
-      tone: (s) => {
-        if (s.platform === 'phone') {
-          return s.isDark ? tMinC(s.errorPalette, 0, 98) :
-                            tMaxC(s.errorPalette);
-        } else {
-          return tMinC(s.errorPalette);
-        }
-      },
-      isBackground: true,
-      background: (s) => s.platform === 'phone' ? this.highestSurface(s) :
-                                                  this.surfaceContainerHigh(),
-      contrastCurve: (s) =>
-          s.platform === 'phone' ? getCurve(4.5) : getCurve(7),
-      toneDeltaPair: (s) => s.platform === 'phone' ?
-          new ToneDeltaPair(
-              this.errorContainer(), this.error(), 5, 'relative_lighter', true,
-              'farther') :
-          undefined,
-    });
-    return extendSpecVersion(super.error(), '2025', color2025);
-  }
-
-  override errorDim(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: 'error_dim',
-      palette: (s) => s.errorPalette,
-      tone: (s) => tMinC(s.errorPalette),
-      isBackground: true,
-      background: (s) => this.surfaceContainerHigh(),
-      contrastCurve: (s) => getCurve(4.5),
-      toneDeltaPair: (s) => new ToneDeltaPair(
-          this.errorDim(), this.error(), 5, 'darker', true, 'farther'),
-    });
-  }
-
-  override onError(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'on_error',
-      palette: (s) => s.errorPalette,
-      background: (s) =>
-          s.platform === 'phone' ? this.error() : this.errorDim(),
-      contrastCurve: (s) => s.platform === 'phone' ? getCurve(6) : getCurve(7),
-    });
-    return extendSpecVersion(super.onError(), '2025', color2025);
-  }
-
-  override errorContainer(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'error_container',
-      palette: (s) => s.errorPalette,
-      tone: (s) => {
-        if (s.platform === 'watch') {
-          return 30;
-        } else {
-          return s.isDark ? tMinC(s.errorPalette, 30, 93) :
-                            tMaxC(s.errorPalette, 0, 90);
-        }
-      },
-      isBackground: true,
-      background: (s) =>
-          s.platform === 'phone' ? this.highestSurface(s) : undefined,
-      toneDeltaPair: (s) => s.platform === 'watch' ?
-          new ToneDeltaPair(
-              this.errorContainer(), this.errorDim(), 10, 'darker', true,
-              'farther') :
-          undefined,
-      contrastCurve: (s) => s.platform === 'phone' && s.contrastLevel > 0 ?
-          getCurve(1.5) :
-          undefined,
-    });
-    return extendSpecVersion(super.errorContainer(), '2025', color2025);
-  }
-
-  override onErrorContainer(): DynamicColor {
-    const color2025: DynamicColor = DynamicColor.fromPalette({
-      name: 'on_error_container',
-      palette: (s) => s.errorPalette,
-      background: (s) => this.errorContainer(),
-      contrastCurve: (s) =>
-          s.platform === 'phone' ? getCurve(4.5) : getCurve(7),
-    });
-    return extendSpecVersion(super.onErrorContainer(), '2025', color2025);
-  }
-
-  /////////////////////////////////////////////////////////////////
-  // Remapped Colors                                             //
-  /////////////////////////////////////////////////////////////////
-
-  override surfaceVariant(): DynamicColor {
-    const color2025: DynamicColor = Object.assign(
-        this.surfaceContainerHighest().clone(), {name: 'surface_variant'});
-    return extendSpecVersion(super.surfaceVariant(), '2025', color2025);
-  }
-
-  override surfaceTint(): DynamicColor {
-    const color2025: DynamicColor =
-        Object.assign(this.primary().clone(), {name: 'surface_tint'});
-    return extendSpecVersion(super.surfaceTint(), '2025', color2025);
-  }
-
-  override background(): DynamicColor {
-    const color2025: DynamicColor =
-        Object.assign(this.surface().clone(), {name: 'background'});
-    return extendSpecVersion(super.background(), '2025', color2025);
-  }
-
-  override onBackground(): DynamicColor {
-    const color2025: DynamicColor = Object.assign(this.onSurface().clone(), {
-      name: 'on_background',
-      tone: (s: DynamicScheme) => {
-        return s.platform === 'watch' ? 100.0 : this.onSurface().getTone(s);
-      }
-    });
-    return extendSpecVersion(super.onBackground(), '2025', color2025);
-  }
-}
diff --git a/typescript/dynamiccolor/contrast_curve.ts b/typescript/dynamiccolor/contrast_curve.ts
deleted file mode 100644
index a52b3465..00000000
--- a/typescript/dynamiccolor/contrast_curve.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * @license
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import * as math from '../utils/math_utils.js';
-
-/**
- * A class containing a value that changes with the contrast level.
- *
- * Usually represents the contrast requirements for a dynamic color on its
- * background. The four values correspond to values for contrast levels -1.0,
- * 0.0, 0.5, and 1.0, respectively.
- */
-export class ContrastCurve {
-  /**
-   * Creates a `ContrastCurve` object.
-   *
-   * @param low Value for contrast level -1.0
-   * @param normal Value for contrast level 0.0
-   * @param medium Value for contrast level 0.5
-   * @param high Value for contrast level 1.0
-   */
-  constructor(
-      readonly low: number,
-      readonly normal: number,
-      readonly medium: number,
-      readonly high: number,
-  ) {}
-
-  /**
-   * Returns the value at a given contrast level.
-   *
-   * @param contrastLevel The contrast level. 0.0 is the default (normal); -1.0
-   *     is the lowest; 1.0 is the highest.
-   * @return The value. For contrast ratios, a number between 1.0 and 21.0.
-   */
-  get(contrastLevel: number): number {
-    if (contrastLevel <= -1.0) {
-      return this.low;
-    } else if (contrastLevel < 0.0) {
-      return math.lerp(this.low, this.normal, (contrastLevel - (-1)) / 1);
-    } else if (contrastLevel < 0.5) {
-      return math.lerp(this.normal, this.medium, (contrastLevel - 0) / 0.5);
-    } else if (contrastLevel < 1.0) {
-      return math.lerp(this.medium, this.high, (contrastLevel - 0.5) / 0.5);
-    } else {
-      return this.high;
-    }
-  }
-}
diff --git a/typescript/dynamiccolor/dynamic_color.ts b/typescript/dynamiccolor/dynamic_color.ts
deleted file mode 100644
index 74fef8e2..00000000
--- a/typescript/dynamiccolor/dynamic_color.ts
+++ /dev/null
@@ -1,752 +0,0 @@
-/**
- * @license
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {Contrast} from '../contrast/contrast.js';
-import {Hct} from '../hct/hct.js';
-import type {TonalPalette} from '../palettes/tonal_palette';
-import * as math from '../utils/math_utils.js';
-
-import type {SpecVersion} from './color_spec';
-import {ContrastCurve} from './contrast_curve.js';
-import {DynamicScheme} from './dynamic_scheme.js';
-import {ToneDeltaPair} from './tone_delta_pair.js';
-
-/**
- * @param name The name of the dynamic color. Defaults to empty.
- * @param palette Function that provides a TonalPalette given DynamicScheme. A
- *     TonalPalette is defined by a hue and chroma, so this replaces the need to
- *     specify hue/chroma. By providing a tonal palette, when contrast
- *     adjustments are made, intended chroma can be preserved.
- * @param tone Function that provides a tone given DynamicScheme. When not
- *     provided, the tone is same as the background tone or 50, when no
- *     background is provided.
- * @param chromaMultiplier A factor that multiplies the chroma for this color.
- *     Default to 1.
- * @param isBackground Whether this dynamic color is a background, with some
- *     other color as the foreground. Defaults to false.
- * @param background The background of the dynamic color (as a function of a
- *     `DynamicScheme`), if it exists.
- * @param secondBackground A second background of the dynamic color (as a
- *     function of a `DynamicScheme`), if it exists.
- * @param contrastCurve A `ContrastCurve` object specifying how its contrast
- *     against its background should behave in various contrast levels options.
- *     Must used together with `background`. When not provided or resolved as
- *     undefined, the contrast curve is calculated based on other constraints.
- * @param toneDeltaPair A `ToneDeltaPair` object specifying a tone delta
- *     constraint between two colors. One of them must be the color being
- *     constructed. When not provided or resolved as undefined, the tone is
- *     calculated based on other constraints.
- */
-interface FromPaletteOptions {
-  name?: string;
-  palette: (scheme: DynamicScheme) => TonalPalette;
-  tone?: (scheme: DynamicScheme) => number;
-  chromaMultiplier?: (scheme: DynamicScheme) => number;
-  isBackground?: boolean;
-  background?: (scheme: DynamicScheme) => DynamicColor | undefined;
-  secondBackground?: (scheme: DynamicScheme) => DynamicColor | undefined;
-  contrastCurve?: (scheme: DynamicScheme) => ContrastCurve | undefined;
-  toneDeltaPair?: (scheme: DynamicScheme) => ToneDeltaPair | undefined;
-}
-
-/**
- * A delegate that provides the HCT and tone of a DynamicColor.
- *
- * This is used to allow different implementations of the color calculation
- * logic for different spec versions.
- */
-interface ColorCalculationDelegate {
-  getHct(scheme: DynamicScheme, color: DynamicColor): Hct;
-  getTone(scheme: DynamicScheme, color: DynamicColor): number;
-}
-
-function validateExtendedColor(
-    originalColor: DynamicColor, specVersion: SpecVersion,
-    extendedColor: DynamicColor) {
-  if (originalColor.name !== extendedColor.name) {
-    throw new Error(
-        `Attempting to extend color ${originalColor.name} with color ${
-            extendedColor.name} of different name for spec version ${
-            specVersion}.`);
-  }
-  if (originalColor.isBackground !== extendedColor.isBackground) {
-    throw new Error(`Attempting to extend color ${originalColor.name} as a ${
-        (originalColor.isBackground ?
-             'background' :
-             'foreground')} with color ${extendedColor.name} as a ${
-        (extendedColor.isBackground ?
-             'background' :
-             'foreground')} for spec version ${specVersion}.`);
-  }
-}
-/**
- * Returns a new DynamicColor that is the same as the original color, but with
- * the extended dynamic color's constraints for the given spec version.
- *
- * @param originlColor The original color.
- * @param specVersion The spec version to extend.
- * @param extendedColor The color with the values to extend.
- */
-export function extendSpecVersion(
-    originlColor: DynamicColor, specVersion: SpecVersion,
-    extendedColor: DynamicColor): DynamicColor {
-  validateExtendedColor(originlColor, specVersion, extendedColor);
-
-  return DynamicColor.fromPalette({
-    name: originlColor.name,
-    palette: (s) => s.specVersion === specVersion ? extendedColor.palette(s) :
-                                                    originlColor.palette(s),
-    tone: (s) => s.specVersion === specVersion ? extendedColor.tone(s) :
-                                                 originlColor.tone(s),
-    isBackground: originlColor.isBackground,
-    chromaMultiplier: (s) => {
-      const chromaMultiplier = s.specVersion === specVersion ?
-          extendedColor.chromaMultiplier :
-          originlColor.chromaMultiplier;
-      return chromaMultiplier !== undefined ? chromaMultiplier(s) : 1;
-    },
-    background: (s) => {
-      const background = s.specVersion === specVersion ?
-          extendedColor.background :
-          originlColor.background;
-      return background !== undefined ? background(s) : undefined
-    },
-    secondBackground: (s) => {
-      const secondBackground = s.specVersion === specVersion ?
-          extendedColor.secondBackground :
-          originlColor.secondBackground;
-      return secondBackground !== undefined ? secondBackground(s) : undefined;
-    },
-    contrastCurve: (s) => {
-      const contrastCurve = s.specVersion === specVersion ?
-          extendedColor.contrastCurve :
-          originlColor.contrastCurve;
-      return contrastCurve !== undefined ? contrastCurve(s) : undefined;
-    },
-    toneDeltaPair: (s) => {
-      const toneDeltaPair = s.specVersion === specVersion ?
-          extendedColor.toneDeltaPair :
-          originlColor.toneDeltaPair;
-      return toneDeltaPair !== undefined ? toneDeltaPair(s) : undefined;
-    },
-  });
-}
-
-/**
- * A color that adjusts itself based on UI state provided by DynamicScheme.
- *
- * Colors without backgrounds do not change tone when contrast changes. Colors
- * with backgrounds become closer to their background as contrast lowers, and
- * further when contrast increases.
- *
- * Prefer static constructors. They require either a hexcode, a palette and
- * tone, or a hue and chroma. Optionally, they can provide a background
- * DynamicColor.
- */
-export class DynamicColor {
-  private readonly hctCache = new Map();
-
-  /**
-   * Create a DynamicColor defined by a TonalPalette and HCT tone.
-   *
-   * @param args Functions with DynamicScheme as input. Must provide a palette
-   *     and tone. May provide a background DynamicColor and ToneDeltaPair.
-   */
-  static fromPalette(args: FromPaletteOptions): DynamicColor {
-    return new DynamicColor(
-        args.name ?? '',
-        args.palette,
-        args.tone ?? DynamicColor.getInitialToneFromBackground(args.background),
-        args.isBackground ?? false,
-        args.chromaMultiplier,
-        args.background,
-        args.secondBackground,
-        args.contrastCurve,
-        args.toneDeltaPair,
-    );
-  }
-
-  static getInitialToneFromBackground(
-      background?: (scheme: DynamicScheme) => DynamicColor |
-          undefined): (scheme: DynamicScheme) => number {
-    if (background === undefined) {
-      return (s) => 50;
-    }
-    return (s) => background(s) ? background(s)!.getTone(s) : 50;
-  }
-
-  /**
-   * The base constructor for DynamicColor.
-   *
-   * _Strongly_ prefer using one of the convenience constructors. This class is
-   * arguably too flexible to ensure it can support any scenario. Functional
-   * arguments allow  overriding without risks that come with subclasses.
-   *
-   * For example, the default behavior of adjust tone at max contrast
-   * to be at a 7.0 ratio with its background is principled and
-   * matches accessibility guidance. That does not mean it's the desired
-   * approach for _every_ design system, and every color pairing,
-   * always, in every case.
-   *
-   * @param name The name of the dynamic color. Defaults to empty.
-   * @param palette Function that provides a TonalPalette given DynamicScheme. A
-   *     TonalPalette is defined by a hue and chroma, so this replaces the need
-   *     to specify hue/chroma. By providing a tonal palette, when contrast
-   *     adjustments are made, intended chroma can be preserved.
-   * @param tone Function that provides a tone, given a DynamicScheme.
-   * @param isBackground Whether this dynamic color is a background, with some
-   *     other color as the foreground. Defaults to false.
-   * @param chromaMultiplier A factor that multiplies the chroma for this color.
-   * @param background The background of the dynamic color (as a function of a
-   *     `DynamicScheme`), if it exists.
-   * @param secondBackground A second background of the dynamic color (as a
-   *     function of a `DynamicScheme`), if it exists.
-   * @param contrastCurve A `ContrastCurve` object specifying how its contrast
-   *     against its background should behave in various contrast levels
-   *     options.
-   * @param toneDeltaPair A `ToneDeltaPair` object specifying a tone delta
-   *     constraint between two colors. One of them must be the color being
-   *     constructed.
-   */
-  constructor(
-      readonly name: string,
-      readonly palette: (scheme: DynamicScheme) => TonalPalette,
-      readonly tone: (scheme: DynamicScheme) => number,
-      readonly isBackground: boolean,
-      readonly chromaMultiplier?: (scheme: DynamicScheme) => number,
-      readonly background?: (scheme: DynamicScheme) => DynamicColor | undefined,
-      readonly secondBackground?: (scheme: DynamicScheme) => DynamicColor |
-          undefined,
-      readonly contrastCurve?: (scheme: DynamicScheme) => ContrastCurve |
-          undefined,
-      readonly toneDeltaPair?: (scheme: DynamicScheme) => ToneDeltaPair |
-          undefined,
-  ) {
-    if ((!background) && secondBackground) {
-      throw new Error(
-          `Color ${name} has secondBackground` +
-          `defined, but background is not defined.`);
-    }
-    if ((!background) && contrastCurve) {
-      throw new Error(
-          `Color ${name} has contrastCurve` +
-          `defined, but background is not defined.`);
-    }
-    if (background && !contrastCurve) {
-      throw new Error(
-          `Color ${name} has background` +
-          `defined, but contrastCurve is not defined.`);
-    }
-  }
-
-  /**
-   * Returns a deep copy of this DynamicColor.
-   */
-  clone(): DynamicColor {
-    return DynamicColor.fromPalette({
-      name: this.name,
-      palette: this.palette,
-      tone: this.tone,
-      isBackground: this.isBackground,
-      chromaMultiplier: this.chromaMultiplier,
-      background: this.background,
-      secondBackground: this.secondBackground,
-      contrastCurve: this.contrastCurve,
-      toneDeltaPair: this.toneDeltaPair,
-    });
-  }
-
-  /**
-   * Clears the cache of HCT values for this color. For testing or debugging
-   * purposes.
-   */
-  clearCache() {
-    this.hctCache.clear();
-  }
-
-  /**
-   * Returns a ARGB integer (i.e. a hex code).
-   *
-   * @param scheme Defines the conditions of the user interface, for example,
-   *     whether or not it is dark mode or light mode, and what the desired
-   *     contrast level is.
-   */
-  getArgb(scheme: DynamicScheme): number {
-    return this.getHct(scheme).toInt();
-  }
-
-  /**
-   * Returns a color, expressed in the HCT color space, that this
-   * DynamicColor is under the conditions in scheme.
-   *
-   * @param scheme Defines the conditions of the user interface, for example,
-   *     whether or not it is dark mode or light mode, and what the desired
-   *     contrast level is.
-   */
-  getHct(scheme: DynamicScheme): Hct {
-    const cachedAnswer = this.hctCache.get(scheme);
-    if (cachedAnswer != null) {
-      return cachedAnswer;
-    }
-    const answer = getSpec(scheme.specVersion).getHct(scheme, this);
-    if (this.hctCache.size > 4) {
-      this.hctCache.clear();
-    }
-    this.hctCache.set(scheme, answer);
-    return answer;
-  }
-
-  /**
-   * Returns a tone, T in the HCT color space, that this DynamicColor is under
-   * the conditions in scheme.
-   *
-   * @param scheme Defines the conditions of the user interface, for example,
-   *     whether or not it is dark mode or light mode, and what the desired
-   *     contrast level is.
-   */
-  getTone(scheme: DynamicScheme): number {
-    return getSpec(scheme.specVersion).getTone(scheme, this);
-  }
-
-  /**
-   * Given a background tone, finds a foreground tone, while ensuring they reach
-   * a contrast ratio that is as close to [ratio] as possible.
-   *
-   * @param bgTone Tone in HCT. Range is 0 to 100, undefined behavior when it
-   *     falls outside that range.
-   * @param ratio The contrast ratio desired between bgTone and the return
-   *     value.
-   */
-  static foregroundTone(bgTone: number, ratio: number): number {
-    const lighterTone = Contrast.lighterUnsafe(bgTone, ratio);
-    const darkerTone = Contrast.darkerUnsafe(bgTone, ratio);
-    const lighterRatio = Contrast.ratioOfTones(lighterTone, bgTone);
-    const darkerRatio = Contrast.ratioOfTones(darkerTone, bgTone);
-    const preferLighter = DynamicColor.tonePrefersLightForeground(bgTone);
-
-    if (preferLighter) {
-      // This handles an edge case where the initial contrast ratio is high
-      // (ex. 13.0), and the ratio passed to the function is that high
-      // ratio, and both the lighter and darker ratio fails to pass that
-      // ratio.
-      //
-      // This was observed with Tonal Spot's On Primary Container turning
-      // black momentarily between high and max contrast in light mode. PC's
-      // standard tone was T90, OPC's was T10, it was light mode, and the
-      // contrast value was 0.6568521221032331.
-      const negligibleDifference = Math.abs(lighterRatio - darkerRatio) < 0.1 &&
-          lighterRatio < ratio && darkerRatio < ratio;
-      return lighterRatio >= ratio || lighterRatio >= darkerRatio ||
-              negligibleDifference ?
-          lighterTone :
-          darkerTone;
-    } else {
-      return darkerRatio >= ratio || darkerRatio >= lighterRatio ? darkerTone :
-                                                                   lighterTone;
-    }
-  }
-
-  /**
-   * Returns whether [tone] prefers a light foreground.
-   *
-   * People prefer white foregrounds on ~T60-70. Observed over time, and also
-   * by Andrew Somers during research for APCA.
-   *
-   * T60 used as to create the smallest discontinuity possible when skipping
-   * down to T49 in order to ensure light foregrounds.
-   * Since `tertiaryContainer` in dark monochrome scheme requires a tone of
-   * 60, it should not be adjusted. Therefore, 60 is excluded here.
-   */
-  static tonePrefersLightForeground(tone: number): boolean {
-    return Math.round(tone) < 60.0;
-  }
-
-  /**
-   * Returns whether [tone] can reach a contrast ratio of 4.5 with a lighter
-   * color.
-   */
-  static toneAllowsLightForeground(tone: number): boolean {
-    return Math.round(tone) <= 49.0;
-  }
-
-  /**
-   * Adjusts a tone such that white has 4.5 contrast, if the tone is
-   * reasonably close to supporting it.
-   */
-  static enableLightForeground(tone: number): number {
-    if (DynamicColor.tonePrefersLightForeground(tone) &&
-        !DynamicColor.toneAllowsLightForeground(tone)) {
-      return 49.0;
-    }
-    return tone;
-  }
-}
-
-/**
- * A delegate for the color calculation of a DynamicScheme in the 2021 spec.
- */
-class ColorCalculationDelegateImpl2021 implements ColorCalculationDelegate {
-  getHct(scheme: DynamicScheme, color: DynamicColor): Hct {
-    const tone = color.getTone(scheme);
-    const palette = color.palette(scheme);
-    return palette.getHct(tone);
-  }
-
-  getTone(scheme: DynamicScheme, color: DynamicColor): number {
-    const decreasingContrast = scheme.contrastLevel < 0;
-    const toneDeltaPair =
-        color.toneDeltaPair ? color.toneDeltaPair(scheme) : undefined;
-
-    // Case 1: dual foreground, pair of colors with delta constraint.
-    if (toneDeltaPair) {
-      const roleA = toneDeltaPair.roleA;
-      const roleB = toneDeltaPair.roleB;
-      const delta = toneDeltaPair.delta;
-      const polarity = toneDeltaPair.polarity;
-      const stayTogether = toneDeltaPair.stayTogether;
-
-      const aIsNearer =
-          (polarity === 'nearer' ||
-           (polarity === 'lighter' && !scheme.isDark) ||
-           (polarity === 'darker' && scheme.isDark));
-      const nearer = aIsNearer ? roleA : roleB;
-      const farther = aIsNearer ? roleB : roleA;
-      const amNearer = color.name === nearer.name;
-      const expansionDir = scheme.isDark ? 1 : -1;
-      let nTone = nearer.tone(scheme);
-      let fTone = farther.tone(scheme);
-
-      // 1st round: solve to min for each, if background and contrast curve
-      // are defined.
-      if (color.background && nearer.contrastCurve && farther.contrastCurve) {
-        const bg = color.background(scheme);
-        const nContrastCurve = nearer.contrastCurve(scheme);
-        const fContrastCurve = farther.contrastCurve(scheme);
-        if (bg && nContrastCurve && fContrastCurve) {
-          const bgTone = bg.getTone(scheme);
-          const nContrast = nContrastCurve.get(scheme.contrastLevel);
-          const fContrast = fContrastCurve.get(scheme.contrastLevel);
-          // If a color is good enough, it is not adjusted.
-          // Initial and adjusted tones for `nearer`
-          if (Contrast.ratioOfTones(bgTone, nTone) < nContrast) {
-            nTone = DynamicColor.foregroundTone(bgTone, nContrast);
-          }
-          // Initial and adjusted tones for `farther`
-          if (Contrast.ratioOfTones(bgTone, fTone) < fContrast) {
-            fTone = DynamicColor.foregroundTone(bgTone, fContrast);
-          }
-          if (decreasingContrast) {
-            // If decreasing contrast, adjust color to the "bare minimum"
-            // that satisfies contrast.
-            nTone = DynamicColor.foregroundTone(bgTone, nContrast);
-            fTone = DynamicColor.foregroundTone(bgTone, fContrast);
-          }
-        }
-      }
-
-      if ((fTone - nTone) * expansionDir < delta) {
-        // 2nd round: expand farther to match delta, if contrast is not
-        // satisfied.
-        fTone = math.clampDouble(0, 100, nTone + delta * expansionDir);
-        if ((fTone - nTone) * expansionDir >= delta) {
-          // Good! Tones now satisfy the constraint; no change needed.
-        } else {
-          // 3rd round: contract nearer to match delta.
-          nTone = math.clampDouble(0, 100, fTone - delta * expansionDir);
-        }
-      }
-
-      // Avoids the 50-59 awkward zone.
-      if (50 <= nTone && nTone < 60) {
-        // If `nearer` is in the awkward zone, move it away, together with
-        // `farther`.
-        if (expansionDir > 0) {
-          nTone = 60;
-          fTone = Math.max(fTone, nTone + delta * expansionDir);
-        } else {
-          nTone = 49;
-          fTone = Math.min(fTone, nTone + delta * expansionDir);
-        }
-      } else if (50 <= fTone && fTone < 60) {
-        if (stayTogether) {
-          // Fixes both, to avoid two colors on opposite sides of the "awkward
-          // zone".
-          if (expansionDir > 0) {
-            nTone = 60;
-            fTone = Math.max(fTone, nTone + delta * expansionDir);
-          } else {
-            nTone = 49;
-            fTone = Math.min(fTone, nTone + delta * expansionDir);
-          }
-        } else {
-          // Not required to stay together; fixes just one.
-          if (expansionDir > 0) {
-            fTone = 60;
-          } else {
-            fTone = 49;
-          }
-        }
-      }
-
-      // Returns `nTone` if this color is `nearer`, otherwise `fTone`.
-      return amNearer ? nTone : fTone;
-    } else {
-      // Case 2: No contrast pair; just solve for itself.
-      let answer = color.tone(scheme);
-
-      if (color.background == undefined ||
-          color.background(scheme) === undefined ||
-          color.contrastCurve == undefined ||
-          color.contrastCurve(scheme) === undefined) {
-        return answer;  // No adjustment for colors with no background.
-      }
-
-      const bgTone = color.background(scheme)!.getTone(scheme);
-      const desiredRatio =
-          color.contrastCurve(scheme)!.get(scheme.contrastLevel);
-
-      if (Contrast.ratioOfTones(bgTone, answer) >= desiredRatio) {
-        // Don't "improve" what's good enough.
-      } else {
-        // Rough improvement.
-        answer = DynamicColor.foregroundTone(bgTone, desiredRatio);
-      }
-
-      if (decreasingContrast) {
-        answer = DynamicColor.foregroundTone(bgTone, desiredRatio);
-      }
-
-      if (color.isBackground && 50 <= answer && answer < 60) {
-        // Must adjust
-        if (Contrast.ratioOfTones(49, bgTone) >= desiredRatio) {
-          answer = 49;
-        } else {
-          answer = 60;
-        }
-      }
-
-      if (color.secondBackground == undefined ||
-          color.secondBackground(scheme) === undefined) {
-        return answer;
-      }
-
-      // Case 3: Adjust for dual backgrounds.
-      const [bg1, bg2] = [color.background, color.secondBackground];
-      const [bgTone1, bgTone2] =
-          [bg1(scheme)!.getTone(scheme), bg2(scheme)!.getTone(scheme)];
-      const [upper, lower] =
-          [Math.max(bgTone1, bgTone2), Math.min(bgTone1, bgTone2)];
-
-      if (Contrast.ratioOfTones(upper, answer) >= desiredRatio &&
-          Contrast.ratioOfTones(lower, answer) >= desiredRatio) {
-        return answer;
-      }
-
-      // The darkest light tone that satisfies the desired ratio,
-      // or -1 if such ratio cannot be reached.
-      const lightOption = Contrast.lighter(upper, desiredRatio);
-
-      // The lightest dark tone that satisfies the desired ratio,
-      // or -1 if such ratio cannot be reached.
-      const darkOption = Contrast.darker(lower, desiredRatio);
-
-      // Tones suitable for the foreground.
-      const availables = [];
-      if (lightOption !== -1) availables.push(lightOption);
-      if (darkOption !== -1) availables.push(darkOption);
-
-      const prefersLight = DynamicColor.tonePrefersLightForeground(bgTone1) ||
-          DynamicColor.tonePrefersLightForeground(bgTone2);
-      if (prefersLight) {
-        return (lightOption < 0) ? 100 : lightOption;
-      }
-      if (availables.length === 1) {
-        return availables[0];
-      }
-      return (darkOption < 0) ? 0 : darkOption;
-    }
-  }
-}
-
-/**
- * A delegate for the color calculation of a DynamicScheme in the 2025 spec.
- */
-class ColorCalculationDelegateImpl2025 implements ColorCalculationDelegate {
-  getHct(scheme: DynamicScheme, color: DynamicColor): Hct {
-    const palette = color.palette(scheme);
-    const tone = color.getTone(scheme);
-    const hue = palette.hue;
-    const chroma = palette.chroma *
-        (color.chromaMultiplier ? color.chromaMultiplier(scheme) : 1);
-
-    return Hct.from(hue, chroma, tone);
-  }
-
-  getTone(scheme: DynamicScheme, color: DynamicColor): number {
-    const toneDeltaPair =
-        color.toneDeltaPair ? color.toneDeltaPair(scheme) : undefined;
-
-    // Case 0: tone delta constraint.
-    if (toneDeltaPair) {
-      const roleA = toneDeltaPair.roleA;
-      const roleB = toneDeltaPair.roleB;
-      const polarity = toneDeltaPair.polarity;
-      const constraint = toneDeltaPair.constraint;
-      const absoluteDelta = polarity === 'darker' ||
-              (polarity === 'relative_lighter' && scheme.isDark) ||
-              (polarity === 'relative_darker' && !scheme.isDark) ?
-          -toneDeltaPair.delta :
-          toneDeltaPair.delta;
-
-      const amRoleA = color.name === roleA.name;
-      const selfRole = amRoleA ? roleA : roleB;
-      const refRole = amRoleA ? roleB : roleA;
-      let selfTone = selfRole.tone(scheme);
-      let refTone = refRole.getTone(scheme);
-      const relativeDelta = absoluteDelta * (amRoleA ? 1 : -1);
-
-      if (constraint === 'exact') {
-        selfTone = math.clampDouble(0, 100, refTone + relativeDelta);
-      } else if (constraint === 'nearer') {
-        if (relativeDelta > 0) {
-          selfTone = math.clampDouble(
-              0, 100,
-              math.clampDouble(refTone, refTone + relativeDelta, selfTone));
-        } else {
-          selfTone = math.clampDouble(
-              0, 100,
-              math.clampDouble(refTone + relativeDelta, refTone, selfTone));
-        }
-      } else if (constraint === 'farther') {
-        if (relativeDelta > 0) {
-          selfTone = math.clampDouble(refTone + relativeDelta, 100, selfTone);
-        } else {
-          selfTone = math.clampDouble(0, refTone + relativeDelta, selfTone);
-        }
-      }
-
-      if (color.background && color.contrastCurve) {
-        const background = color.background(scheme);
-        const contrastCurve = color.contrastCurve(scheme);
-        if (background && contrastCurve) {
-          // Adjust the tones for contrast, if background and contrast curve
-          // are defined.
-          const bgTone = background.getTone(scheme);
-          const selfContrast = contrastCurve.get(scheme.contrastLevel);
-          selfTone = Contrast.ratioOfTones(bgTone, selfTone) >= selfContrast &&
-                  scheme.contrastLevel >= 0 ?
-              selfTone :
-              DynamicColor.foregroundTone(bgTone, selfContrast);
-        }
-      }
-
-      // This can avoid the awkward tones for background colors including the
-      // access fixed colors. Accent fixed dim colors should not be adjusted.
-      if (color.isBackground && !color.name.endsWith('_fixed_dim')) {
-        if (selfTone >= 57) {
-          selfTone = math.clampDouble(65, 100, selfTone);
-        } else {
-          selfTone = math.clampDouble(0, 49, selfTone);
-        }
-      }
-
-      return selfTone;
-    } else {
-      // Case 1: No tone delta pair; just solve for itself.
-      let answer = color.tone(scheme);
-
-      if (color.background == undefined ||
-          color.background(scheme) === undefined ||
-          color.contrastCurve == undefined ||
-          color.contrastCurve(scheme) === undefined) {
-        return answer;  // No adjustment for colors with no background.
-      }
-
-      const bgTone = color.background(scheme)!.getTone(scheme);
-      const desiredRatio =
-          color.contrastCurve(scheme)!.get(scheme.contrastLevel);
-
-      // Recalculate the tone from desired contrast ratio if the current
-      // contrast ratio is not enough or desired contrast level is decreasing
-      // (<0).
-      answer = Contrast.ratioOfTones(bgTone, answer) >= desiredRatio &&
-              scheme.contrastLevel >= 0 ?
-          answer :
-          DynamicColor.foregroundTone(bgTone, desiredRatio);
-
-      // This can avoid the awkward tones for background colors including the
-      // access fixed colors. Accent fixed dim colors should not be adjusted.
-      if (color.isBackground && !color.name.endsWith('_fixed_dim')) {
-        if (answer >= 57) {
-          answer = math.clampDouble(65, 100, answer);
-        } else {
-          answer = math.clampDouble(0, 49, answer);
-        }
-      }
-
-      if (color.secondBackground == undefined ||
-          color.secondBackground(scheme) === undefined) {
-        return answer;
-      }
-
-      // Case 2: Adjust for dual backgrounds.
-      const [bg1, bg2] = [color.background, color.secondBackground];
-      const [bgTone1, bgTone2] =
-          [bg1(scheme)!.getTone(scheme), bg2(scheme)!.getTone(scheme)];
-      const [upper, lower] =
-          [Math.max(bgTone1, bgTone2), Math.min(bgTone1, bgTone2)];
-
-      if (Contrast.ratioOfTones(upper, answer) >= desiredRatio &&
-          Contrast.ratioOfTones(lower, answer) >= desiredRatio) {
-        return answer;
-      }
-
-      // The darkest light tone that satisfies the desired ratio,
-      // or -1 if such ratio cannot be reached.
-      const lightOption = Contrast.lighter(upper, desiredRatio);
-
-      // The lightest dark tone that satisfies the desired ratio,
-      // or -1 if such ratio cannot be reached.
-      const darkOption = Contrast.darker(lower, desiredRatio);
-
-      // Tones suitable for the foreground.
-      const availables = [];
-      if (lightOption !== -1) availables.push(lightOption);
-      if (darkOption !== -1) availables.push(darkOption);
-
-      const prefersLight = DynamicColor.tonePrefersLightForeground(bgTone1) ||
-          DynamicColor.tonePrefersLightForeground(bgTone2);
-      if (prefersLight) {
-        return (lightOption < 0) ? 100 : lightOption;
-      }
-      if (availables.length === 1) {
-        return availables[0];
-      }
-      return (darkOption < 0) ? 0 : darkOption;
-    }
-  }
-}
-
-const spec2021 = new ColorCalculationDelegateImpl2021();
-const spec2025 = new ColorCalculationDelegateImpl2025();
-
-/**
- * Returns the ColorCalculationDelegate for the given spec version.
- */
-function getSpec(specVersion: SpecVersion): ColorCalculationDelegate {
-  return specVersion === '2025' ? spec2025 : spec2021;
-}
diff --git a/typescript/dynamiccolor/dynamic_color_test.ts b/typescript/dynamiccolor/dynamic_color_test.ts
deleted file mode 100644
index d34a9575..00000000
--- a/typescript/dynamiccolor/dynamic_color_test.ts
+++ /dev/null
@@ -1,504 +0,0 @@
-/**
- * @license
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import 'jasmine';
-
-import {Contrast} from '../contrast/contrast.js';
-import {ContrastCurve} from '../dynamiccolor/contrast_curve.js';
-import {MaterialDynamicColors} from '../dynamiccolor/material_dynamic_colors.js';
-import {Hct} from '../hct/hct.js';
-import {SchemeContent} from '../scheme/scheme_content.js';
-import {SchemeExpressive} from '../scheme/scheme_expressive.js';
-import {SchemeFidelity} from '../scheme/scheme_fidelity.js';
-import {SchemeMonochrome} from '../scheme/scheme_monochrome.js';
-import {SchemeNeutral} from '../scheme/scheme_neutral.js';
-import {SchemeTonalSpot} from '../scheme/scheme_tonal_spot.js';
-import {SchemeVibrant} from '../scheme/scheme_vibrant.js';
-import * as colorUtils from '../utils/color_utils.js';
-
-import {DynamicScheme} from './dynamic_scheme.js';
-
-const seedColors = [
-  Hct.fromInt(0xFFFF0000),
-  Hct.fromInt(0xFFFFFF00),
-  Hct.fromInt(0xFF00FF00),
-  Hct.fromInt(0xFF0000FF),
-];
-
-class Pair {
-  constructor(public fgName: string, public bgName: string) {}
-}
-
-const colors = [
-  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,
-];
-
-const colorByName = new Map(
-    colors.map((color) => [color.name, color]),
-);
-
-const textSurfacePairs = [
-  new Pair('on_primary', 'primary'),
-  new Pair('on_primary_container', 'primary_container'),
-  new Pair('on_secondary', 'secondary'),
-  new Pair('on_secondary_container', 'secondary_container'),
-  new Pair('on_tertiary', 'tertiary'),
-  new Pair('on_tertiary_container', 'tertiary_container'),
-  new Pair('on_error', 'error'),
-  new Pair('on_error_container', 'error_container'),
-  new Pair('on_background', 'background'),
-  new Pair('on_surface_variant', 'surface_bright'),
-  new Pair('on_surface_variant', 'surface_dim'),
-];
-
-function getMinRequirement(curve: ContrastCurve, level: number): number {
-  if (level >= 1) return curve.high;
-  if (level >= 0.5) return curve.medium;
-  if (level >= 0) return curve.normal;
-  return curve.low;
-}
-
-function getPairs(resp: boolean, fores: string[], backs: string[]): string[][] {
-  const ans = [];
-  if (resp) {
-    for (let i = 0; i < fores.length; i++) {
-      ans.push([fores[i], backs[i]]);
-    }
-  } else {
-    for (const f of fores) {
-      for (const b of backs) {
-        ans.push([f, b]);
-      }
-    }
-  }
-  return ans;
-}
-
-const schemes: DynamicScheme[] = [];
-
-for (const color of seedColors) {
-  for (const contrastLevel
-           of [-1.0, -0.75, -0.5, -0.25, 0.0, 0.25, 0.5, 0.75, 1.0]) {
-    for (const isDark of [false, true]) {
-      for (const scheme
-               of [new SchemeContent(color, isDark, contrastLevel),
-                   new SchemeExpressive(color, isDark, contrastLevel),
-                   new SchemeFidelity(color, isDark, contrastLevel),
-                   new SchemeMonochrome(color, isDark, contrastLevel),
-                   new SchemeNeutral(color, isDark, contrastLevel),
-                   new SchemeTonalSpot(color, isDark, contrastLevel),
-                   new SchemeVibrant(color, isDark, contrastLevel),
-      ]) {
-        schemes.push(scheme);
-      }
-    }
-  }
-}
-
-describe('DynamicColor', () => {
-  // Parametric test, ensuring that dynamic schemes respect contrast
-  // between text-surface pairs.
-
-  it('generates colors respecting contrast', () => {
-    for (const scheme of schemes) {
-      for (const pair of textSurfacePairs) {
-        // Expect that each text-surface pair has a
-        // minimum contrast of 4.5 (unreduced contrast), or 3.0
-        // (reduced contrast).
-        const fgName = pair.fgName;
-        const bgName = pair.bgName;
-        const foregroundTone = colorByName.get(fgName)!.getHct(scheme).tone;
-        const backgroundTone = colorByName.get(bgName)!.getHct(scheme).tone;
-        const contrast = Contrast.ratioOfTones(foregroundTone, backgroundTone);
-
-        const minimumRequirement = scheme.contrastLevel >= 0.0 ? 4.5 : 3.0;
-
-        if (contrast < minimumRequirement) {
-          fail(`${fgName} on ${bgName} is ${contrast}, needed ${
-              minimumRequirement}`);
-        }
-      }
-    }
-  });
-
-  it('constraint conformance test', () => {
-    /*
-      Tone delta pair:
-      [A, B, delta, "lighter"] = A is lighter than B by delta
-      [A, B, delta, "darker"] = A is darker than B by delta
-      [A, B, delta, "farther"] = A is farther (from + surfaces) than B by delta
-                              = [A, B, delta, "darker"] in light
-                              = [A, B, delta, "lighter"] in dark
-      [A, B, delta, "nearer"] = A is nearer (to + surfaces) than B by delta
-                              = [A, B, delta, "lighter"] in light
-                              = [A, B, delta, "darker"] in dark
-    */
-    const limitingSurfaces = [
-      'surface_dim',
-      'surface_bright',
-    ];
-
-    const constraints = [
-      // Contrast constraints, as defined in the spec.
-      //
-      // If "respectively" is set to true, the constraint is tested against
-      // every pair of __corresponding__ foreground and background;
-      // otherwise, the constraint is tested against every possible pair
-      // of foreground and background.
-      //
-      // In other words, if "respectively" is true, "fore" and "back" must
-      // have equal length N, and there will be N comparisons.
-      // If "respectively" is false, "fore" has length M, and "back" has length
-      // N, then there will be (M * N) comparisons.
-      //
-      // Surface contrast constraints.
-      {
-        kind: 'Contrast',
-        values: new ContrastCurve(4.5, 7, 11, 21),
-        fore: ['on_surface'],
-        back: limitingSurfaces,
-      },
-      {
-        kind: 'Contrast',
-        values: new ContrastCurve(3, 4.5, 7, 11),
-        fore: ['on_surface_variant'],
-        back: limitingSurfaces,
-      },
-      {
-        kind: 'Contrast',
-        values: new ContrastCurve(3, 4.5, 7, 7),
-        fore: ['primary', 'secondary', 'tertiary', 'error'],
-        back: limitingSurfaces,
-      },
-      {
-        kind: 'Contrast',
-        values: new ContrastCurve(1.5, 3, 4.5, 7),
-        fore: ['outline'],
-        back: limitingSurfaces,
-      },
-      {
-        kind: 'Contrast',
-        values: new ContrastCurve(0, 0, 3, 4.5),
-        fore: [
-          'primary_container',
-          'primary_fixed',
-          'primary_fixed_dim',
-          'secondary_container',
-          'secondary_fixed',
-          'secondary_fixed_dim',
-          'tertiary_container',
-          'tertiary_fixed',
-          'tertiary_fixed_dim',
-          'error_container',
-          'outline_variant',
-        ],
-        back: limitingSurfaces,
-      },
-      {
-        kind: 'Contrast',
-        values: new ContrastCurve(4.5, 7, 11, 21),
-        fore: ['inverse_on_surface'],
-        back: ['inverse_surface'],
-      },
-      {
-        kind: 'Contrast',
-        values: new ContrastCurve(3, 4.5, 7, 7),
-        fore: ['inverse_primary'],
-        back: ['inverse_surface'],
-      },
-
-      // Accent contrast constraints.
-      {
-        kind: 'Contrast',
-        respectively: true,
-        values: new ContrastCurve(4.5, 7, 11, 21),
-        fore: [
-          'on_primary',
-          'on_secondary',
-          'on_tertiary',
-          'on_error',
-        ],
-        back: [
-          'primary',
-          'secondary',
-          'tertiary',
-          'error',
-        ],
-      },
-
-      {
-        kind: 'Contrast',
-        respectively: true,
-        values: new ContrastCurve(3, 4.5, 7, 11),
-        fore: [
-          'on_primary_container',
-          'on_secondary_container',
-          'on_tertiary_container',
-          'on_error_container',
-        ],
-        back: [
-          'primary_container',
-          'secondary_container',
-          'tertiary_container',
-          'error_container',
-        ],
-      },
-
-      {
-        kind: 'Contrast',
-        values: new ContrastCurve(4.5, 7, 11, 21),
-        fore: ['on_primary_fixed'],
-        back: ['primary_fixed', 'primary_fixed_dim'],
-      },
-      {
-        kind: 'Contrast',
-        values: new ContrastCurve(4.5, 7, 11, 21),
-        fore: ['on_secondary_fixed'],
-        back: ['secondary_fixed', 'secondary_fixed_dim'],
-      },
-      {
-        kind: 'Contrast',
-        values: new ContrastCurve(4.5, 7, 11, 21),
-        fore: ['on_tertiary_fixed'],
-        back: ['tertiary_fixed', 'tertiary_fixed_dim'],
-      },
-      {
-        kind: 'Contrast',
-        values: new ContrastCurve(3, 4.5, 7, 11),
-        fore: ['on_primary_fixed_variant'],
-        back: ['primary_fixed', 'primary_fixed_dim'],
-      },
-      {
-        kind: 'Contrast',
-        values: new ContrastCurve(3, 4.5, 7, 11),
-        fore: ['on_secondary_fixed_variant'],
-        back: ['secondary_fixed', 'secondary_fixed_dim'],
-      },
-      {
-        kind: 'Contrast',
-        values: new ContrastCurve(3, 4.5, 7, 11),
-        fore: ['on_tertiary_fixed_variant'],
-        back: ['tertiary_fixed', 'tertiary_fixed_dim'],
-      },
-
-      // Delta constraints.
-      {
-        kind: 'Delta',
-        delta: 10,
-        respectively: true,
-        fore: [
-          'primary',
-          'secondary',
-          'tertiary',
-          'error',
-        ],
-        back: [
-          'primary_container',
-          'secondary_container',
-          'tertiary_container',
-          'error_container',
-        ],
-        polarity: 'farther',
-      },
-      {
-        kind: 'Delta',
-        delta: 10,
-        respectively: true,
-        fore: [
-          'primary_fixed_dim',
-          'secondary_fixed_dim',
-          'tertiary_fixed_dim',
-        ],
-        back: [
-          'primary_fixed',
-          'secondary_fixed',
-          'tertiary_fixed',
-        ],
-        polarity: 'darker',
-      },
-
-      // Background constraints.
-      {
-        kind: 'Background',
-        objects: [
-          'background',
-          'error',
-          'error_container',
-          'primary',
-          'primary_container',
-          'primary_fixed',
-          'primary_fixed_dim',
-          'secondary',
-          'secondary_container',
-          'secondary_fixed',
-          'secondary_fixed_dim',
-          'surface',
-          'surface_bright',
-          'surface_container',
-          'surface_container_high',
-          'surface_container_highest',
-          'surface_container_low',
-          'surface_container_lowest',
-          'surface_dim',
-          'surface_tint',
-          'surface_variant',
-          'tertiary',
-          'tertiary_container',
-          'tertiary_fixed',
-          'tertiary_fixed_dim',
-        ],
-      }
-    ];
-
-    for (const scheme of schemes) {
-      const prec = 2;
-
-      const resolvedColors = new Map(
-          colors.map((color) => [color.name, color.getArgb(scheme)]),
-      );
-
-      for (const cstr of constraints) {
-        if (cstr.kind === 'Contrast') {
-          const contrastTolerance = 0.05;
-
-          const minRequirement =
-              getMinRequirement(cstr.values!, scheme.contrastLevel);
-          const respectively = cstr.respectively ?? false;
-          const pairs = getPairs(respectively, cstr.fore!, cstr.back!);
-          // Check each pair
-          for (const pair of pairs) {
-            const [fore, back] = pair;
-            const ftone = colorUtils.lstarFromArgb(resolvedColors.get(fore)!);
-            const btone = colorUtils.lstarFromArgb(resolvedColors.get(back)!);
-            const contrast = Contrast.ratioOfTones(ftone, btone);
-
-            // It's failing only if:
-            //     A minimum requirement of 4.5 or lower is not reached
-            //     A minimum requirement of >4.5 is not reached, while
-            //     some colors are not B or White yet.
-            const failing = (minRequirement <= 4.5) ?
-                (contrast < minRequirement - contrastTolerance) :
-                (ftone !== 0 && btone !== 0 && ftone !== 100 && btone !== 100 &&
-                 contrast < minRequirement - contrastTolerance);
-
-            if (contrast < minRequirement - contrastTolerance &&
-                minRequirement <= 4.5) {
-              // Real fail.
-              fail(`Contrast ${fore} ${ftone.toFixed(prec)} ${back} ${
-                  btone.toFixed(
-                      prec)} ${contrast.toFixed(prec)} ${minRequirement} `);
-            }
-            if (failing && minRequirement > 4.5) {
-              fail(`Contrast(stretch-goal) ${fore} ${ftone.toFixed(prec)} ${
-                  back} ${btone.toFixed(prec)} ${contrast.toFixed(prec)} ${
-                  minRequirement} `);
-            }
-          }
-        } else if (cstr.kind === 'Delta') {
-          // Verifies that the two colors satisfy the required
-          // tone delta constraint.
-          const respectively = cstr.respectively ?? false;
-          const pairs = getPairs(respectively, cstr.fore!, cstr.back!);
-          const polarity = cstr.polarity;
-          expect(
-              polarity === 'nearer' || polarity === 'farther' ||
-              polarity === 'lighter' || polarity === 'darker')
-              .toBeTrue();
-          for (const pair of pairs) {
-            const [fore, back] = pair;
-            const ftone = colorUtils.lstarFromArgb(resolvedColors.get(fore)!);
-            const btone = colorUtils.lstarFromArgb(resolvedColors.get(back)!);
-
-            const isLighter =
-                (polarity === 'lighter' ||
-                 (polarity === 'nearer' && !scheme.isDark) ||
-                 (polarity === 'farther' && scheme.isDark));
-
-            const observedDelta = isLighter ? ftone - btone : btone - ftone;
-
-            if (observedDelta < cstr.delta! - 0.5 /* lenient */) {
-              // Failing
-              fail(`Delta ${fore} ${ftone.toFixed(prec)} ${back} ${
-                  btone.toFixed(
-                      prec)} ${observedDelta.toFixed(prec)} ${cstr.delta}`);
-            }
-          }
-        } else if (cstr.kind === 'Background') {
-          // Verifies that none of the background tones are in the
-          // "awkward zone" from 50 to 60.
-          for (const bg of cstr.objects!) {
-            const bgtone = colorUtils.lstarFromArgb(resolvedColors.get(bg)!);
-            if (bgtone >= 50.5 && bgtone < 59.5 /* lenient */) {
-              // Failing
-              fail(`Background ${bg} ${bgtone.toFixed(prec)}`);
-            }
-          }
-        } else {
-          fail(`Bad constraint kind = ${cstr.kind}`);
-        }
-      }
-    }
-  });
-});
diff --git a/typescript/dynamiccolor/dynamic_scheme.ts b/typescript/dynamiccolor/dynamic_scheme.ts
deleted file mode 100644
index 85223eaf..00000000
--- a/typescript/dynamiccolor/dynamic_scheme.ts
+++ /dev/null
@@ -1,989 +0,0 @@
-/**
- * @license
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {DislikeAnalyzer} from '../dislike/dislike_analyzer.js';
-import {Hct} from '../hct/hct.js';
-import {TonalPalette} from '../palettes/tonal_palette.js';
-import {TemperatureCache} from '../temperature/temperature_cache.js';
-import * as math from '../utils/math_utils.js';
-
-import {SpecVersion} from './color_spec.js';
-import {DynamicColor} from './dynamic_color.js';
-import {MaterialDynamicColors} from './material_dynamic_colors.js';
-import {Variant} from './variant.js';
-
-/**
- * The platform on which this scheme is intended to be used. Only used in the
- * 2025 spec.
- */
-export type Platform = 'phone'|'watch';
-
-/**
- * @param sourceColorArgb The source color of the theme as an ARGB 32-bit
- *     integer.
- * @param variant The variant, or style, of the theme.
- * @param contrastLevel Value from -1 to 1. -1 represents minimum contrast, 0
- *     represents standard (i.e. the design as spec'd), and 1 represents maximum
- *     contrast.
- * @param isDark Whether the scheme is in dark mode or light mode.
- * @param platform The platform on which this scheme is intended to be used.
- * @param specVersion The version of the design spec that this scheme is based
- *     on.
- * @param primaryPalette Given a tone, produces a color. Hue and chroma of the
- *     color are specified in the design specification of the variant. Usually
- *     colorful.
- * @param secondaryPalette Given a tone, produces a color. Hue and chroma of the
- *     color are specified in the design specification of the variant. Usually
- *     less colorful.
- * @param tertiaryPalette Given a tone, produces a color. Hue and chroma of the
- *     color are specified in the design specification of the variant. Usually a
- *     different hue from primary and colorful.
- * @param neutralPalette Given a tone, produces a color. Hue and chroma of the
- *     color are specified in the design specification of the variant. Usually
- *     not colorful at all, intended for background & surface colors.
- * @param neutralVariantPalette Given a tone, produces a color. Hue and chroma
- *     of the color are specified in the design specification of the variant.
- *     Usually not colorful, but slightly more colorful than Neutral. Intended
- *     for backgrounds & surfaces.
- */
-interface DynamicSchemeOptions {
-  sourceColorHct: Hct;
-  variant: Variant;
-  contrastLevel: number;
-  isDark: boolean;
-  platform?: Platform;
-  specVersion?: SpecVersion;
-  primaryPalette?: TonalPalette;
-  secondaryPalette?: TonalPalette;
-  tertiaryPalette?: TonalPalette;
-  neutralPalette?: TonalPalette;
-  neutralVariantPalette?: TonalPalette;
-  errorPalette?: TonalPalette;
-}
-
-/**
- * A delegate that provides the palettes of a DynamicScheme.
- *
- * This is used to allow different implementations of the palette calculation
- * logic for different spec versions.
- */
-interface DynamicSchemePalettesDelegate {
-  getPrimaryPalette:
-      (variant: Variant, sourceColorHct: Hct, isDark: boolean,
-       platform: Platform, contrastLevel: number) => TonalPalette;
-
-  getSecondaryPalette:
-      (variant: Variant, sourceColorHct: Hct, isDark: boolean,
-       platform: Platform, contrastLevel: number) => TonalPalette;
-
-  getTertiaryPalette:
-      (variant: Variant, sourceColorHct: Hct, isDark: boolean,
-       platform: Platform, contrastLevel: number) => TonalPalette;
-
-  getNeutralPalette:
-      (variant: Variant, sourceColorHct: Hct, isDark: boolean,
-       platform: Platform, contrastLevel: number) => TonalPalette;
-
-  getNeutralVariantPalette:
-      (variant: Variant, sourceColorHct: Hct, isDark: boolean,
-       platform: Platform, contrastLevel: number) => TonalPalette;
-
-  getErrorPalette:
-      (variant: Variant, sourceColorHct: Hct, isDark: boolean,
-       platform: Platform, contrastLevel: number) => TonalPalette | undefined;
-}
-
-/**
- * Constructed by a set of values representing the current UI state (such as
- * whether or not its dark theme, what the theme style is, etc.), and
- * provides a set of TonalPalettes that can create colors that fit in
- * with the theme style. Used by DynamicColor to resolve into a color.
- */
-export class DynamicScheme {
-  static readonly DEFAULT_SPEC_VERSION = '2021';
-  static readonly DEFAULT_PLATFORM = 'phone';
-
-  /**
-   * The source color of the theme as an HCT color.
-   */
-  sourceColorHct: Hct;
-
-  /** The source color of the theme as an ARGB 32-bit integer. */
-  readonly sourceColorArgb: number;
-
-  /** The variant, or style, of the theme. */
-  readonly variant: Variant;
-
-  /**
-   * Value from -1 to 1. -1 represents minimum contrast. 0 represents standard
-   * (i.e. the design as spec'd), and 1 represents maximum contrast.
-   */
-  readonly contrastLevel: number;
-
-  /** Whether the scheme is in dark mode or light mode. */
-  readonly isDark: boolean;
-
-  /** The platform on which this scheme is intended to be used. */
-  readonly platform: Platform;
-
-  /** The version of the design spec that this scheme is based on. */
-  readonly specVersion: SpecVersion;
-
-  /**
-   * Given a tone, produces a color. Hue and chroma of the
-   * color are specified in the design specification of the variant. Usually
-   * colorful.
-   */
-  readonly primaryPalette: TonalPalette;
-
-  /**
-   * Given a tone, produces a color. Hue and chroma of
-   * the color are specified in the design specification of the variant. Usually
-   * less colorful.
-   */
-  readonly secondaryPalette: TonalPalette;
-
-  /**
-   * Given a tone, produces a color. Hue and chroma of
-   * the color are specified in the design specification of the variant. Usually
-   * a different hue from primary and colorful.
-   */
-  readonly tertiaryPalette: TonalPalette;
-
-  /**
-   * Given a tone, produces a color. Hue and chroma of the
-   * color are specified in the design specification of the variant. Usually not
-   * colorful at all, intended for background & surface colors.
-   */
-  readonly neutralPalette: TonalPalette;
-
-  /**
-   * Given a tone, produces a color. Hue and chroma
-   * of the color are specified in the design specification of the variant.
-   * Usually not colorful, but slightly more colorful than Neutral. Intended for
-   * backgrounds & surfaces.
-   */
-  readonly neutralVariantPalette: TonalPalette;
-
-  /**
-   * Given a tone, produces a reddish, colorful, color.
-   */
-  errorPalette: TonalPalette;
-
-  readonly colors: MaterialDynamicColors;
-
-  constructor(args: DynamicSchemeOptions) {
-    this.sourceColorArgb = args.sourceColorHct.toInt();
-    this.variant = args.variant;
-    this.contrastLevel = args.contrastLevel;
-    this.isDark = args.isDark;
-    this.platform = args.platform ?? 'phone';
-    this.specVersion = args.specVersion ?? '2021';
-    this.sourceColorHct = args.sourceColorHct;
-    this.primaryPalette = args.primaryPalette ??
-        getSpec(this.specVersion)
-            .getPrimaryPalette(
-                this.variant, args.sourceColorHct, this.isDark, this.platform,
-                this.contrastLevel);
-    this.secondaryPalette = args.secondaryPalette ??
-        getSpec(this.specVersion)
-            .getSecondaryPalette(
-                this.variant, args.sourceColorHct, this.isDark, this.platform,
-                this.contrastLevel);
-    this.tertiaryPalette = args.tertiaryPalette ??
-        getSpec(this.specVersion)
-            .getTertiaryPalette(
-                this.variant, args.sourceColorHct, this.isDark, this.platform,
-                this.contrastLevel);
-    this.neutralPalette = args.neutralPalette ??
-        getSpec(this.specVersion)
-            .getNeutralPalette(
-                this.variant, args.sourceColorHct, this.isDark, this.platform,
-                this.contrastLevel);
-    this.neutralVariantPalette = args.neutralVariantPalette ??
-        getSpec(this.specVersion)
-            .getNeutralVariantPalette(
-                this.variant, args.sourceColorHct, this.isDark, this.platform,
-                this.contrastLevel);
-    this.errorPalette = args.errorPalette ??
-        getSpec(this.specVersion)
-            .getErrorPalette(
-                this.variant, args.sourceColorHct, this.isDark, this.platform,
-                this.contrastLevel) ??
-        TonalPalette.fromHueAndChroma(25.0, 84.0);
-
-    this.colors = new MaterialDynamicColors();
-  }
-
-  toString(): string {
-    return `Scheme: ` +
-        `variant=${Variant[this.variant]}, ` +
-        `mode=${this.isDark ? 'dark' : 'light'}, ` +
-        `platform=${this.platform}, ` +
-        `contrastLevel=${this.contrastLevel.toFixed(1)}, ` +
-        `seed=${this.sourceColorHct.toString()}, ` +
-        `specVersion=${this.specVersion}`
-  }
-
-  /**
-   * Returns a new hue based on a piecewise function and input color hue.
-   *
-   * For example, for the following function:
-   * result = 26 if 0 <= hue < 101
-   * result = 39 if 101 <= hue < 210
-   * result = 28 if 210 <= hue < 360
-   *
-   * call the function as:
-   *
-   * const hueBreakpoints = [0, 101, 210, 360];
-   * const hues = [26, 39, 28];
-   * const result = scheme.piecewise(hue, hueBreakpoints, hues);
-   *
-   * @param sourceColorHct The input value.
-   * @param hueBreakpoints The breakpoints, in sorted order. No default lower or
-   *     upper bounds are assumed.
-   * @param hues The hues that should be applied when source color's hue is >=
-   *     the same index in hueBrakpoints array, and < the hue at the next index
-   *     in hueBrakpoints array. Otherwise, the source color's hue is returned.
-   */
-  static getPiecewiseHue(
-      sourceColorHct: Hct, hueBreakpoints: number[], hues: number[]): number {
-    const size = Math.min(hueBreakpoints.length - 1, hues.length);
-    const sourceHue = sourceColorHct.hue;
-    for (let i = 0; i < size; i++) {
-      if (sourceHue >= hueBreakpoints[i] && sourceHue < hueBreakpoints[i + 1]) {
-        return math.sanitizeDegreesDouble(hues[i]);
-      }
-    }
-    // No condition matched, return the source hue.
-    return sourceHue;
-  }
-
-  /**
-   * Returns a shifted hue based on a piecewise function and input color hue.
-   *
-   * For example, for the following function:
-   * result = hue + 26 if 0 <= hue < 101
-   * result = hue - 39 if 101 <= hue < 210
-   * result = hue + 28 if 210 <= hue < 360
-   *
-   * call the function as:
-   *
-   * const hueBreakpoints = [0, 101, 210, 360];
-   * const hues = [26, -39, 28];
-   * const result = scheme.getRotatedHue(hue, hueBreakpoints, hues);
-   *
-   * @param sourceColorHct the source color of the theme, in HCT.
-   * @param hueBreakpoints The "breakpoints", i.e. the hues at which a rotation
-   *     should be apply. No default lower or upper bounds are assumed.
-   * @param rotations The rotation that should be applied when source color's
-   *     hue is >= the same index in hues array, and < the hue at the next
-   *     index in hues array. Otherwise, the source color's hue is returned.
-   */
-  static getRotatedHue(
-      sourceColorHct: Hct, hueBreakpoints: number[],
-      rotations: number[]): number {
-    let rotation = DynamicScheme.getPiecewiseHue(
-        sourceColorHct, hueBreakpoints, rotations);
-    if (Math.min(hueBreakpoints.length - 1, rotations.length) <= 0) {
-      // No condition matched, return the source hue.
-      rotation = 0;
-    }
-    return math.sanitizeDegreesDouble(sourceColorHct.hue + rotation);
-  }
-
-  getArgb(dynamicColor: DynamicColor): number {
-    return dynamicColor.getArgb(this);
-  }
-
-  getHct(dynamicColor: DynamicColor): Hct {
-    return dynamicColor.getHct(this);
-  }
-
-  // Palette key colors
-
-  get primaryPaletteKeyColor(): number {
-    return this.getArgb(this.colors.primaryPaletteKeyColor());
-  }
-
-  get secondaryPaletteKeyColor(): number {
-    return this.getArgb(this.colors.secondaryPaletteKeyColor());
-  }
-
-  get tertiaryPaletteKeyColor(): number {
-    return this.getArgb(this.colors.tertiaryPaletteKeyColor());
-  }
-
-  get neutralPaletteKeyColor(): number {
-    return this.getArgb(this.colors.neutralPaletteKeyColor());
-  }
-
-  get neutralVariantPaletteKeyColor(): number {
-    return this.getArgb(this.colors.neutralVariantPaletteKeyColor());
-  }
-
-  get errorPaletteKeyColor(): number {
-    return this.getArgb(this.colors.errorPaletteKeyColor());
-  }
-
-  // Surface colors
-
-  get background(): number {
-    return this.getArgb(this.colors.background());
-  }
-
-  get onBackground(): number {
-    return this.getArgb(this.colors.onBackground());
-  }
-
-  get surface(): number {
-    return this.getArgb(this.colors.surface());
-  }
-
-  get surfaceDim(): number {
-    return this.getArgb(this.colors.surfaceDim());
-  }
-
-  get surfaceBright(): number {
-    return this.getArgb(this.colors.surfaceBright());
-  }
-
-  get surfaceContainerLowest(): number {
-    return this.getArgb(this.colors.surfaceContainerLowest());
-  }
-
-  get surfaceContainerLow(): number {
-    return this.getArgb(this.colors.surfaceContainerLow());
-  }
-
-  get surfaceContainer(): number {
-    return this.getArgb(this.colors.surfaceContainer());
-  }
-
-  get surfaceContainerHigh(): number {
-    return this.getArgb(this.colors.surfaceContainerHigh());
-  }
-
-  get surfaceContainerHighest(): number {
-    return this.getArgb(this.colors.surfaceContainerHighest());
-  }
-
-  get onSurface(): number {
-    return this.getArgb(this.colors.onSurface());
-  }
-
-  get surfaceVariant(): number {
-    return this.getArgb(this.colors.surfaceVariant());
-  }
-
-  get onSurfaceVariant(): number {
-    return this.getArgb(this.colors.onSurfaceVariant());
-  }
-
-  get inverseSurface(): number {
-    return this.getArgb(this.colors.inverseSurface());
-  }
-
-  get inverseOnSurface(): number {
-    return this.getArgb(this.colors.inverseOnSurface());
-  }
-
-  get outline(): number {
-    return this.getArgb(this.colors.outline());
-  }
-
-  get outlineVariant(): number {
-    return this.getArgb(this.colors.outlineVariant());
-  }
-
-  get shadow(): number {
-    return this.getArgb(this.colors.shadow());
-  }
-
-  get scrim(): number {
-    return this.getArgb(this.colors.scrim());
-  }
-
-  get surfaceTint(): number {
-    return this.getArgb(this.colors.surfaceTint());
-  }
-
-  // Primary colors
-
-  get primary(): number {
-    return this.getArgb(this.colors.primary());
-  }
-
-  get primaryDim(): number {
-    const primaryDim = this.colors.primaryDim();
-    if (primaryDim === undefined) {
-      throw new Error('`primaryDim` color is undefined prior to 2025 spec.');
-    }
-    return this.getArgb(primaryDim);
-  }
-
-  get onPrimary(): number {
-    return this.getArgb(this.colors.onPrimary());
-  }
-
-  get primaryContainer(): number {
-    return this.getArgb(this.colors.primaryContainer());
-  }
-
-  get onPrimaryContainer(): number {
-    return this.getArgb(this.colors.onPrimaryContainer());
-  }
-
-  get primaryFixed(): number {
-    return this.getArgb(this.colors.primaryFixed());
-  }
-
-  get primaryFixedDim(): number {
-    return this.getArgb(this.colors.primaryFixedDim());
-  }
-
-  get onPrimaryFixed(): number {
-    return this.getArgb(this.colors.onPrimaryFixed());
-  }
-
-  get onPrimaryFixedVariant(): number {
-    return this.getArgb(this.colors.onPrimaryFixedVariant());
-  }
-
-  get inversePrimary(): number {
-    return this.getArgb(this.colors.inversePrimary());
-  }
-
-  // Secondary colors
-
-  get secondary(): number {
-    return this.getArgb(this.colors.secondary());
-  }
-
-  get secondaryDim(): number {
-    const secondaryDim = this.colors.secondaryDim();
-    if (secondaryDim === undefined) {
-      throw new Error('`secondaryDim` color is undefined prior to 2025 spec.');
-    }
-    return this.getArgb(secondaryDim);
-  }
-
-  get onSecondary(): number {
-    return this.getArgb(this.colors.onSecondary());
-  }
-
-  get secondaryContainer(): number {
-    return this.getArgb(this.colors.secondaryContainer());
-  }
-
-  get onSecondaryContainer(): number {
-    return this.getArgb(this.colors.onSecondaryContainer());
-  }
-
-  get secondaryFixed(): number {
-    return this.getArgb(this.colors.secondaryFixed());
-  }
-
-  get secondaryFixedDim(): number {
-    return this.getArgb(this.colors.secondaryFixedDim());
-  }
-
-  get onSecondaryFixed(): number {
-    return this.getArgb(this.colors.onSecondaryFixed());
-  }
-
-  get onSecondaryFixedVariant(): number {
-    return this.getArgb(this.colors.onSecondaryFixedVariant());
-  }
-
-  // Tertiary colors
-
-  get tertiary(): number {
-    return this.getArgb(this.colors.tertiary());
-  }
-
-  get tertiaryDim(): number {
-    const tertiaryDim = this.colors.tertiaryDim();
-    if (tertiaryDim === undefined) {
-      throw new Error('`tertiaryDim` color is undefined prior to 2025 spec.');
-    }
-    return this.getArgb(tertiaryDim);
-  }
-
-  get onTertiary(): number {
-    return this.getArgb(this.colors.onTertiary());
-  }
-
-  get tertiaryContainer(): number {
-    return this.getArgb(this.colors.tertiaryContainer());
-  }
-
-  get onTertiaryContainer(): number {
-    return this.getArgb(this.colors.onTertiaryContainer());
-  }
-
-  get tertiaryFixed(): number {
-    return this.getArgb(this.colors.tertiaryFixed());
-  }
-
-  get tertiaryFixedDim(): number {
-    return this.getArgb(this.colors.tertiaryFixedDim());
-  }
-
-  get onTertiaryFixed(): number {
-    return this.getArgb(this.colors.onTertiaryFixed());
-  }
-
-  get onTertiaryFixedVariant(): number {
-    return this.getArgb(this.colors.onTertiaryFixedVariant());
-  }
-
-  // Error colors
-
-  get error(): number {
-    return this.getArgb(this.colors.error());
-  }
-
-  get errorDim(): number {
-    const errorDim = this.colors.errorDim();
-    if (errorDim === undefined) {
-      throw new Error('`errorDim` color is undefined prior to 2025 spec.');
-    }
-    return this.getArgb(errorDim);
-  }
-
-  get onError(): number {
-    return this.getArgb(this.colors.onError());
-  }
-
-  get errorContainer(): number {
-    return this.getArgb(this.colors.errorContainer());
-  }
-
-  get onErrorContainer(): number {
-    return this.getArgb(this.colors.onErrorContainer());
-  }
-}
-
-/**
- * A delegate for the palettes of a DynamicScheme in the 2021 spec.
- */
-class DynamicSchemePalettesDelegateImpl2021 implements
-    DynamicSchemePalettesDelegate {
-  //////////////////////////////////////////////////////////////////
-  // Scheme Palettes                                              //
-  //////////////////////////////////////////////////////////////////
-
-  getPrimaryPalette(
-      variant: Variant, sourceColorHct: Hct, isDark: boolean,
-      platform: Platform, contrastLevel: number): TonalPalette {
-    switch (variant) {
-      case Variant.CONTENT:
-      case Variant.FIDELITY:
-        return TonalPalette.fromHueAndChroma(
-            sourceColorHct.hue, sourceColorHct.chroma);
-      case Variant.FRUIT_SALAD:
-        return TonalPalette.fromHueAndChroma(
-            math.sanitizeDegreesDouble(sourceColorHct.hue - 50.0), 48.0);
-      case Variant.MONOCHROME:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 0.0);
-      case Variant.NEUTRAL:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 12.0);
-      case Variant.RAINBOW:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 48.0);
-      case Variant.TONAL_SPOT:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 36.0);
-      case Variant.EXPRESSIVE:
-        return TonalPalette.fromHueAndChroma(
-            math.sanitizeDegreesDouble(sourceColorHct.hue + 240), 40);
-      case Variant.VIBRANT:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 200.0);
-      default:
-        throw new Error(`Unsupported variant: ${variant}`);
-    }
-  }
-
-  getSecondaryPalette(
-      variant: Variant, sourceColorHct: Hct, isDark: boolean,
-      platform: Platform, contrastLevel: number): TonalPalette {
-    switch (variant) {
-      case Variant.CONTENT:
-      case Variant.FIDELITY:
-        return TonalPalette.fromHueAndChroma(
-            sourceColorHct.hue,
-            Math.max(
-                sourceColorHct.chroma - 32.0, sourceColorHct.chroma * 0.5));
-      case Variant.FRUIT_SALAD:
-        return TonalPalette.fromHueAndChroma(
-            math.sanitizeDegreesDouble(sourceColorHct.hue - 50.0), 36.0);
-      case Variant.MONOCHROME:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 0.0);
-      case Variant.NEUTRAL:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 8.0);
-      case Variant.RAINBOW:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 16.0);
-      case Variant.TONAL_SPOT:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 16.0);
-      case Variant.EXPRESSIVE:
-        return TonalPalette.fromHueAndChroma(
-            DynamicScheme.getRotatedHue(
-                sourceColorHct, [0, 21, 51, 121, 151, 191, 271, 321, 360],
-                [45, 95, 45, 20, 45, 90, 45, 45, 45]),
-            24.0);
-      case Variant.VIBRANT:
-        return TonalPalette.fromHueAndChroma(
-            DynamicScheme.getRotatedHue(
-                sourceColorHct, [0, 41, 61, 101, 131, 181, 251, 301, 360],
-                [18, 15, 10, 12, 15, 18, 15, 12, 12]),
-            24.0);
-      default:
-        throw new Error(`Unsupported variant: ${variant}`);
-    }
-  }
-
-  getTertiaryPalette(
-      variant: Variant, sourceColorHct: Hct, isDark: boolean,
-      platform: Platform, contrastLevel: number): TonalPalette {
-    switch (variant) {
-      case Variant.CONTENT:
-        return TonalPalette.fromHct(DislikeAnalyzer.fixIfDisliked(
-            new TemperatureCache(sourceColorHct)
-                .analogous(/* count= */ 3, /* divisions= */ 6)[2]));
-      case Variant.FIDELITY:
-        return TonalPalette.fromHct(DislikeAnalyzer.fixIfDisliked(
-            new TemperatureCache(sourceColorHct).complement));
-      case Variant.FRUIT_SALAD:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 36.0);
-      case Variant.MONOCHROME:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 0.0);
-      case Variant.NEUTRAL:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 16.0);
-      case Variant.RAINBOW:
-      case Variant.TONAL_SPOT:
-        return TonalPalette.fromHueAndChroma(
-            math.sanitizeDegreesDouble(sourceColorHct.hue + 60.0), 24.0);
-      case Variant.EXPRESSIVE:
-        return TonalPalette.fromHueAndChroma(
-            DynamicScheme.getRotatedHue(
-                sourceColorHct, [0, 21, 51, 121, 151, 191, 271, 321, 360],
-                [120, 120, 20, 45, 20, 15, 20, 120, 120]),
-            32.0);
-      case Variant.VIBRANT:
-        return TonalPalette.fromHueAndChroma(
-            DynamicScheme.getRotatedHue(
-                sourceColorHct, [0, 41, 61, 101, 131, 181, 251, 301, 360],
-                [35, 30, 20, 25, 30, 35, 30, 25, 25]),
-            32.0);
-      default:
-        throw new Error(`Unsupported variant: ${variant}`);
-    }
-  }
-
-  getNeutralPalette(
-      variant: Variant, sourceColorHct: Hct, isDark: boolean,
-      platform: Platform, contrastLevel: number): TonalPalette {
-    switch (variant) {
-      case Variant.CONTENT:
-      case Variant.FIDELITY:
-        return TonalPalette.fromHueAndChroma(
-            sourceColorHct.hue, sourceColorHct.chroma / 8.0);
-      case Variant.FRUIT_SALAD:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 10.0);
-      case Variant.MONOCHROME:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 0.0);
-      case Variant.NEUTRAL:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 2.0);
-      case Variant.RAINBOW:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 0.0);
-      case Variant.TONAL_SPOT:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 6.0);
-      case Variant.EXPRESSIVE:
-        return TonalPalette.fromHueAndChroma(
-            math.sanitizeDegreesDouble(sourceColorHct.hue + 15), 8);
-      case Variant.VIBRANT:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 10);
-      default:
-        throw new Error(`Unsupported variant: ${variant}`);
-    }
-  }
-
-  getNeutralVariantPalette(
-      variant: Variant, sourceColorHct: Hct, isDark: boolean,
-      platform: Platform, contrastLevel: number): TonalPalette {
-    switch (variant) {
-      case Variant.CONTENT:
-        return TonalPalette.fromHueAndChroma(
-            sourceColorHct.hue, (sourceColorHct.chroma / 8.0) + 4.0);
-      case Variant.FIDELITY:
-        return TonalPalette.fromHueAndChroma(
-            sourceColorHct.hue, (sourceColorHct.chroma / 8.0) + 4.0);
-      case Variant.FRUIT_SALAD:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 16.0);
-      case Variant.MONOCHROME:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 0.0);
-      case Variant.NEUTRAL:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 2.0);
-      case Variant.RAINBOW:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 0.0);
-      case Variant.TONAL_SPOT:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 8.0);
-      case Variant.EXPRESSIVE:
-        return TonalPalette.fromHueAndChroma(
-            math.sanitizeDegreesDouble(sourceColorHct.hue + 15), 12);
-      case Variant.VIBRANT:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 12);
-      default:
-        throw new Error(`Unsupported variant: ${variant}`);
-    }
-  }
-
-  getErrorPalette(
-      variant: Variant, sourceColorHct: Hct, isDark: boolean,
-      platform: Platform, contrastLevel: number): TonalPalette|undefined {
-    return undefined;
-  }
-}
-
-/**
- * A delegate for the palettes of a DynamicScheme in the 2025 spec.
- */
-class DynamicSchemePalettesDelegateImpl2025 extends
-    DynamicSchemePalettesDelegateImpl2021 {
-  //////////////////////////////////////////////////////////////////
-  // Scheme Palettes                                              //
-  //////////////////////////////////////////////////////////////////
-
-  override getPrimaryPalette(
-      variant: Variant, sourceColorHct: Hct, isDark: boolean,
-      platform: Platform, contrastLevel: number): TonalPalette {
-    switch (variant) {
-      case Variant.NEUTRAL:
-        return TonalPalette.fromHueAndChroma(
-            sourceColorHct.hue,
-            platform === 'phone' ? (Hct.isBlue(sourceColorHct.hue) ? 12 : 8) :
-                                   (Hct.isBlue(sourceColorHct.hue) ? 16 : 12));
-      case Variant.TONAL_SPOT:
-        return TonalPalette.fromHueAndChroma(
-            sourceColorHct.hue, platform === 'phone' && isDark ? 26 : 32);
-      case Variant.EXPRESSIVE:
-        return TonalPalette.fromHueAndChroma(
-            sourceColorHct.hue, platform === 'phone' ? (isDark ? 36 : 48) : 40);
-      case Variant.VIBRANT:
-        return TonalPalette.fromHueAndChroma(
-            sourceColorHct.hue, platform === 'phone' ? 74 : 56);
-      default:
-        return super.getPrimaryPalette(
-            variant, sourceColorHct, isDark, platform, contrastLevel);
-    }
-  }
-
-  override getSecondaryPalette(
-      variant: Variant, sourceColorHct: Hct, isDark: boolean,
-      platform: Platform, contrastLevel: number): TonalPalette {
-    switch (variant) {
-      case Variant.NEUTRAL:
-        return TonalPalette.fromHueAndChroma(
-            sourceColorHct.hue,
-            platform === 'phone' ? (Hct.isBlue(sourceColorHct.hue) ? 6 : 4) :
-                                   (Hct.isBlue(sourceColorHct.hue) ? 10 : 6));
-      case Variant.TONAL_SPOT:
-        return TonalPalette.fromHueAndChroma(sourceColorHct.hue, 16);
-      case Variant.EXPRESSIVE:
-        return TonalPalette.fromHueAndChroma(
-            DynamicScheme.getRotatedHue(
-                sourceColorHct, [0, 105, 140, 204, 253, 278, 300, 333, 360],
-                [-160, 155, -100, 96, -96, -156, -165, -160]),
-            platform === 'phone' ? (isDark ? 16 : 24) : 24);
-      case Variant.VIBRANT:
-        return TonalPalette.fromHueAndChroma(
-            DynamicScheme.getRotatedHue(
-                sourceColorHct, [0, 38, 105, 140, 333, 360],
-                [-14, 10, -14, 10, -14]),
-            platform === 'phone' ? 56 : 36);
-      default:
-        return super.getSecondaryPalette(
-            variant, sourceColorHct, isDark, platform, contrastLevel);
-    }
-  }
-
-  override getTertiaryPalette(
-      variant: Variant, sourceColorHct: Hct, isDark: boolean,
-      platform: Platform, contrastLevel: number): TonalPalette {
-    switch (variant) {
-      case Variant.NEUTRAL:
-        return TonalPalette.fromHueAndChroma(
-            DynamicScheme.getRotatedHue(
-                sourceColorHct, [0, 38, 105, 161, 204, 278, 333, 360],
-                [-32, 26, 10, -39, 24, -15, -32]),
-            platform === 'phone' ? 20 : 36);
-      case Variant.TONAL_SPOT:
-        return TonalPalette.fromHueAndChroma(
-            DynamicScheme.getRotatedHue(
-                sourceColorHct, [0, 20, 71, 161, 333, 360],
-                [-40, 48, -32, 40, -32]),
-            platform === 'phone' ? 28 : 32);
-      case Variant.EXPRESSIVE:
-        return TonalPalette.fromHueAndChroma(
-            DynamicScheme.getRotatedHue(
-                sourceColorHct, [0, 105, 140, 204, 253, 278, 300, 333, 360],
-                [-165, 160, -105, 101, -101, -160, -170, -165]),
-            48);
-      case Variant.VIBRANT:
-        return TonalPalette.fromHueAndChroma(
-            DynamicScheme.getRotatedHue(
-                sourceColorHct, [0, 38, 71, 105, 140, 161, 253, 333, 360],
-                [-72, 35, 24, -24, 62, 50, 62, -72]),
-            56);
-      default:
-        return super.getTertiaryPalette(
-            variant, sourceColorHct, isDark, platform, contrastLevel);
-    }
-  }
-
-  private static getExpressiveNeutralHue(sourceColorHct: Hct): number {
-    const hue = DynamicScheme.getRotatedHue(
-        sourceColorHct, [0, 71, 124, 253, 278, 300, 360],
-        [10, 0, 10, 0, 10, 0]);
-    return hue;
-  }
-
-  private static getExpressiveNeutralChroma(
-      sourceColorHct: Hct, isDark: boolean, platform: Platform): number {
-    const neutralHue =
-        DynamicSchemePalettesDelegateImpl2025.getExpressiveNeutralHue(
-            sourceColorHct);
-    return platform === 'phone' ?
-        (isDark ? (Hct.isYellow(neutralHue) ? 6 : 14) : 18) :
-        12;
-  }
-
-  private static getVibrantNeutralHue(sourceColorHct: Hct): number {
-    return DynamicScheme.getRotatedHue(
-        sourceColorHct, [0, 38, 105, 140, 333, 360], [-14, 10, -14, 10, -14]);
-  }
-
-  private static getVibrantNeutralChroma(
-      sourceColorHct: Hct, platform: Platform): number {
-    const neutralHue =
-        DynamicSchemePalettesDelegateImpl2025.getVibrantNeutralHue(
-            sourceColorHct);
-    return platform === 'phone' ? 28 : (Hct.isBlue(neutralHue) ? 28 : 20);
-  }
-
-  override getNeutralPalette(
-      variant: Variant, sourceColorHct: Hct, isDark: boolean,
-      platform: Platform, contrastLevel: number): TonalPalette {
-    switch (variant) {
-      case Variant.NEUTRAL:
-        return TonalPalette.fromHueAndChroma(
-            sourceColorHct.hue, platform === 'phone' ? 1.4 : 6);
-      case Variant.TONAL_SPOT:
-        return TonalPalette.fromHueAndChroma(
-            sourceColorHct.hue, platform === 'phone' ? 5 : 10);
-      case Variant.EXPRESSIVE:
-        return TonalPalette.fromHueAndChroma(
-            DynamicSchemePalettesDelegateImpl2025.getExpressiveNeutralHue(
-                sourceColorHct),
-            DynamicSchemePalettesDelegateImpl2025.getExpressiveNeutralChroma(
-                sourceColorHct, isDark, platform));
-      case Variant.VIBRANT:
-        return TonalPalette.fromHueAndChroma(
-            DynamicSchemePalettesDelegateImpl2025.getVibrantNeutralHue(
-                sourceColorHct),
-            DynamicSchemePalettesDelegateImpl2025.getVibrantNeutralChroma(
-                sourceColorHct, platform));
-      default:
-        return super.getNeutralPalette(
-            variant, sourceColorHct, isDark, platform, contrastLevel);
-    }
-  }
-
-  override getNeutralVariantPalette(
-      variant: Variant, sourceColorHct: Hct, isDark: boolean,
-      platform: Platform, contrastLevel: number): TonalPalette {
-    switch (variant) {
-      case Variant.NEUTRAL:
-        return TonalPalette.fromHueAndChroma(
-            sourceColorHct.hue, (platform === 'phone' ? 1.4 : 6) * 2.2);
-      case Variant.TONAL_SPOT:
-        return TonalPalette.fromHueAndChroma(
-            sourceColorHct.hue, (platform === 'phone' ? 5 : 10) * 1.7);
-      case Variant.EXPRESSIVE:
-        const expressiveNeutralHue =
-            DynamicSchemePalettesDelegateImpl2025.getExpressiveNeutralHue(
-                sourceColorHct);
-        const expressiveNeutralChroma =
-            DynamicSchemePalettesDelegateImpl2025.getExpressiveNeutralChroma(
-                sourceColorHct, isDark, platform);
-        return TonalPalette.fromHueAndChroma(
-            expressiveNeutralHue,
-            expressiveNeutralChroma *
-                (expressiveNeutralHue >= 105 && expressiveNeutralHue < 125 ?
-                     1.6 :
-                     2.3),
-        );
-      case Variant.VIBRANT:
-        const vibrantNeutralHue =
-            DynamicSchemePalettesDelegateImpl2025.getVibrantNeutralHue(
-                sourceColorHct);
-        const vibrantNeutralChroma =
-            DynamicSchemePalettesDelegateImpl2025.getVibrantNeutralChroma(
-                sourceColorHct, platform);
-        return TonalPalette.fromHueAndChroma(
-            vibrantNeutralHue, vibrantNeutralChroma * 1.29);
-      default:
-        return super.getNeutralVariantPalette(
-            variant, sourceColorHct, isDark, platform, contrastLevel);
-    }
-  }
-
-  override getErrorPalette(
-      variant: Variant, sourceColorHct: Hct, isDark: boolean,
-      platform: Platform, contrastLevel: number): TonalPalette|undefined {
-    const errorHue = DynamicScheme.getPiecewiseHue(
-        sourceColorHct, [0, 3, 13, 23, 33, 43, 153, 273, 360],
-        [12, 22, 32, 12, 22, 32, 22, 12]);
-    switch (variant) {
-      case Variant.NEUTRAL:
-        return TonalPalette.fromHueAndChroma(
-            errorHue, platform === 'phone' ? 50 : 40);
-      case Variant.TONAL_SPOT:
-        return TonalPalette.fromHueAndChroma(
-            errorHue, platform === 'phone' ? 60 : 48);
-      case Variant.EXPRESSIVE:
-        return TonalPalette.fromHueAndChroma(
-            errorHue, platform === 'phone' ? 64 : 48);
-      case Variant.VIBRANT:
-        return TonalPalette.fromHueAndChroma(
-            errorHue, platform === 'phone' ? 80 : 60);
-      default:
-        return super.getErrorPalette(
-            variant, sourceColorHct, isDark, platform, contrastLevel);
-    }
-  }
-}
-
-const spec2021 = new DynamicSchemePalettesDelegateImpl2021();
-const spec2025 = new DynamicSchemePalettesDelegateImpl2025();
-
-/**
- * Returns the DynamicSchemePalettesDelegate for the given spec version.
- */
-function getSpec(specVersion: SpecVersion):
-    DynamicSchemePalettesDelegate {
-  return specVersion === '2025' ? spec2025 : spec2021;
-}
diff --git a/typescript/dynamiccolor/fixed_dynamic_color_test.ts b/typescript/dynamiccolor/fixed_dynamic_color_test.ts
deleted file mode 100644
index 8a093bbe..00000000
--- a/typescript/dynamiccolor/fixed_dynamic_color_test.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * @license
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import 'jasmine';
-
-import {Hct} from '../hct/hct.js';
-import {SchemeMonochrome} from '../scheme/scheme_monochrome.js';
-import {SchemeTonalSpot} from '../scheme/scheme_tonal_spot.js';
-
-import {MaterialDynamicColors} from './material_dynamic_colors.js';
-
-describe('fixed colors', () => {
-  it('fixed colors in non-monochrome schemes', () => {
-    const scheme = new SchemeTonalSpot(
-        Hct.fromInt(0xFFFF0000),
-        true,
-        0.0,
-    );
-
-    expect(MaterialDynamicColors.primaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(90.0, 0);
-    expect(MaterialDynamicColors.primaryFixedDim.getHct(scheme).tone)
-        .toBeCloseTo(80.0, 0);
-    expect(MaterialDynamicColors.onPrimaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(10.0, 0);
-    expect(MaterialDynamicColors.onPrimaryFixedVariant.getHct(scheme).tone)
-        .toBeCloseTo(30.0, 0);
-    expect(MaterialDynamicColors.secondaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(90.0, 0);
-    expect(MaterialDynamicColors.secondaryFixedDim.getHct(scheme).tone)
-        .toBeCloseTo(80.0, 0);
-    expect(MaterialDynamicColors.onSecondaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(10.0, 0);
-    expect(MaterialDynamicColors.onSecondaryFixedVariant.getHct(scheme).tone)
-        .toBeCloseTo(30.0, 0);
-    expect(MaterialDynamicColors.tertiaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(90.0, 0);
-    expect(MaterialDynamicColors.tertiaryFixedDim.getHct(scheme).tone)
-        .toBeCloseTo(80.0, 0);
-    expect(MaterialDynamicColors.onTertiaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(10.0, 0);
-    expect(MaterialDynamicColors.onTertiaryFixedVariant.getHct(scheme).tone)
-        .toBeCloseTo(30.0, 0);
-  });
-
-  it('fixed ARGB colors in non-monochrome schemes', () => {
-    const scheme = new SchemeTonalSpot(
-        Hct.fromInt(0xFFFF0000),
-        true,
-        0.0,
-    );
-
-    expect(scheme.primaryFixed).toBe(0xFFFFDAD4);
-    expect(scheme.primaryFixedDim).toBe(0xFFFFB4A8);
-    expect(scheme.onPrimaryFixed).toBe(0xFF3A0905);
-    expect(scheme.onPrimaryFixedVariant).toBe(0xFF73342A);
-    expect(scheme.secondaryFixed).toBe(0xFFFFDAD4);
-    expect(scheme.secondaryFixedDim).toBe(0xFFE7BDB6);
-    expect(scheme.onSecondaryFixed).toBe(0xFF2C1512);
-    expect(scheme.onSecondaryFixedVariant).toBe(0xFF5D3F3B);
-    expect(scheme.tertiaryFixed).toBe(0xFFFBDFA6);
-    expect(scheme.tertiaryFixedDim).toBe(0xFFDEC48C);
-    expect(scheme.onTertiaryFixed).toBe(0xFF251A00);
-    expect(scheme.onTertiaryFixedVariant).toBe(0xFF564419);
-  });
-
-  it('fixed colors in light monochrome schemes', () => {
-    const scheme = new SchemeMonochrome(
-        Hct.fromInt(0xFFFF0000),
-        false,
-        0.0,
-    );
-
-    expect(MaterialDynamicColors.primaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(40.0, 0);
-    expect(MaterialDynamicColors.primaryFixedDim.getHct(scheme).tone)
-        .toBeCloseTo(30.0, 0);
-    expect(MaterialDynamicColors.onPrimaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(100.0, 0);
-    expect(MaterialDynamicColors.onPrimaryFixedVariant.getHct(scheme).tone)
-        .toBeCloseTo(90.0, 0);
-    expect(MaterialDynamicColors.secondaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(80.0, 0);
-    expect(MaterialDynamicColors.secondaryFixedDim.getHct(scheme).tone)
-        .toBeCloseTo(70.0, 0);
-    expect(MaterialDynamicColors.onSecondaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(10.0, 0);
-    expect(MaterialDynamicColors.onSecondaryFixedVariant.getHct(scheme).tone)
-        .toBeCloseTo(25.0, 0);
-    expect(MaterialDynamicColors.tertiaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(40.0, 0);
-    expect(MaterialDynamicColors.tertiaryFixedDim.getHct(scheme).tone)
-        .toBeCloseTo(30.0, 0);
-    expect(MaterialDynamicColors.onTertiaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(100.0, 0);
-    expect(MaterialDynamicColors.onTertiaryFixedVariant.getHct(scheme).tone)
-        .toBeCloseTo(90.0, 0);
-  });
-
-  it('fixed colors in dark monochrome schemes', () => {
-    const scheme = new SchemeMonochrome(
-        Hct.fromInt(0xFFFF0000),
-        true,
-        0.0,
-    );
-
-    expect(MaterialDynamicColors.primaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(40.0, 0);
-    expect(MaterialDynamicColors.primaryFixedDim.getHct(scheme).tone)
-        .toBeCloseTo(30.0, 0);
-    expect(MaterialDynamicColors.onPrimaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(100.0, 0);
-    expect(MaterialDynamicColors.onPrimaryFixedVariant.getHct(scheme).tone)
-        .toBeCloseTo(90.0, 0);
-    expect(MaterialDynamicColors.secondaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(80.0, 0);
-    expect(MaterialDynamicColors.secondaryFixedDim.getHct(scheme).tone)
-        .toBeCloseTo(70.0, 0);
-    expect(MaterialDynamicColors.onSecondaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(10.0, 0);
-    expect(MaterialDynamicColors.onSecondaryFixedVariant.getHct(scheme).tone)
-        .toBeCloseTo(25.0, 0);
-    expect(MaterialDynamicColors.tertiaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(40.0, 0);
-    expect(MaterialDynamicColors.tertiaryFixedDim.getHct(scheme).tone)
-        .toBeCloseTo(30.0, 0);
-    expect(MaterialDynamicColors.onTertiaryFixed.getHct(scheme).tone)
-        .toBeCloseTo(100.0, 0);
-    expect(MaterialDynamicColors.onTertiaryFixedVariant.getHct(scheme).tone)
-        .toBeCloseTo(90.0, 0);
-  });
-});
diff --git a/typescript/dynamiccolor/material_dynamic_colors.ts b/typescript/dynamiccolor/material_dynamic_colors.ts
deleted file mode 100644
index 5f3a8e60..00000000
--- a/typescript/dynamiccolor/material_dynamic_colors.ts
+++ /dev/null
@@ -1,557 +0,0 @@
-/**
- * @license
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {DislikeAnalyzer} from '../dislike/dislike_analyzer.js';
-import {Hct} from '../hct/hct.js';
-import {TonalPalette} from '../palettes/tonal_palette.js';
-import * as math from '../utils/math_utils.js';
-
-import {ColorSpecDelegateImpl2025} from './color_spec_2025.js';
-import {ContrastCurve} from './contrast_curve.js';
-import {DynamicColor} from './dynamic_color.js';
-import type {DynamicScheme} from './dynamic_scheme';
-import {ToneDeltaPair} from './tone_delta_pair.js';
-import {Variant} from './variant.js';
-
-/**
- * DynamicColors for the colors in the Material Design system.
- */
-// Material Color Utilities namespaces the various utilities it provides.
-// tslint:disable-next-line:class-as-namespace
-export class MaterialDynamicColors {
-  static contentAccentToneDelta = 15.0;
-
-  private static readonly colorSpec = new ColorSpecDelegateImpl2025();
-
-  highestSurface(s: DynamicScheme): DynamicColor {
-    return MaterialDynamicColors.colorSpec.highestSurface(s);
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Main Palettes                                              //
-  ////////////////////////////////////////////////////////////////
-
-  primaryPaletteKeyColor(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.primaryPaletteKeyColor();
-  }
-
-  secondaryPaletteKeyColor(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.secondaryPaletteKeyColor();
-  }
-
-  tertiaryPaletteKeyColor(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.tertiaryPaletteKeyColor();
-  }
-
-  neutralPaletteKeyColor(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.neutralPaletteKeyColor();
-  }
-
-  neutralVariantPaletteKeyColor(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.neutralVariantPaletteKeyColor();
-  }
-
-  errorPaletteKeyColor(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.errorPaletteKeyColor();
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Surfaces [S]                                               //
-  ////////////////////////////////////////////////////////////////
-
-  background(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.background();
-  }
-
-  onBackground(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.onBackground();
-  }
-
-  surface(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.surface();
-  }
-
-  surfaceDim(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.surfaceDim();
-  }
-
-  surfaceBright(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.surfaceBright();
-  }
-
-  surfaceContainerLowest(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.surfaceContainerLowest();
-  }
-
-  surfaceContainerLow(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.surfaceContainerLow();
-  }
-
-  surfaceContainer(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.surfaceContainer();
-  }
-
-  surfaceContainerHigh(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.surfaceContainerHigh();
-  }
-
-  surfaceContainerHighest(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.surfaceContainerHighest();
-  }
-
-  onSurface(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.onSurface();
-  }
-
-  surfaceVariant(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.surfaceVariant();
-  }
-
-  onSurfaceVariant(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.onSurfaceVariant();
-  }
-
-  outline(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.outline();
-  }
-
-  outlineVariant(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.outlineVariant();
-  }
-
-  inverseSurface(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.inverseSurface();
-  }
-
-  inverseOnSurface(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.inverseOnSurface();
-  }
-
-  shadow(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.shadow();
-  }
-
-  scrim(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.scrim();
-  }
-
-  surfaceTint(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.surfaceTint();
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Primaries [P]                                              //
-  ////////////////////////////////////////////////////////////////
-
-  primary(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.primary();
-  }
-
-  primaryDim(): DynamicColor|undefined {
-    return MaterialDynamicColors.colorSpec.primaryDim();
-  }
-
-  onPrimary(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.onPrimary();
-  }
-
-  primaryContainer(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.primaryContainer();
-  }
-
-  onPrimaryContainer(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.onPrimaryContainer();
-  }
-
-  inversePrimary(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.inversePrimary();
-  }
-
-  /////////////////////////////////////////////////////////////////
-  // Primary Fixed [PF]                                          //
-  /////////////////////////////////////////////////////////////////
-
-  primaryFixed(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.primaryFixed();
-  }
-
-  primaryFixedDim(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.primaryFixedDim();
-  }
-
-  onPrimaryFixed(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.onPrimaryFixed();
-  }
-
-  onPrimaryFixedVariant(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.onPrimaryFixedVariant();
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Secondaries [Q]                                            //
-  ////////////////////////////////////////////////////////////////
-
-  secondary(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.secondary();
-  }
-
-  secondaryDim(): DynamicColor|undefined {
-    return MaterialDynamicColors.colorSpec.secondaryDim();
-  }
-
-  onSecondary(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.onSecondary();
-  }
-
-  secondaryContainer(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.secondaryContainer();
-  }
-
-  onSecondaryContainer(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.onSecondaryContainer();
-  }
-
-  /////////////////////////////////////////////////////////////////
-  // Secondary Fixed [QF]                                        //
-  /////////////////////////////////////////////////////////////////
-
-  secondaryFixed(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.secondaryFixed();
-  }
-
-  secondaryFixedDim(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.secondaryFixedDim();
-  }
-
-  onSecondaryFixed(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.onSecondaryFixed();
-  }
-
-  onSecondaryFixedVariant(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.onSecondaryFixedVariant();
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Tertiaries [T]                                             //
-  ////////////////////////////////////////////////////////////////
-
-  tertiary(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.tertiary();
-  }
-
-  tertiaryDim(): DynamicColor|undefined {
-    return MaterialDynamicColors.colorSpec.tertiaryDim();
-  }
-
-  onTertiary(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.onTertiary();
-  }
-
-  tertiaryContainer(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.tertiaryContainer();
-  }
-
-  onTertiaryContainer(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.onTertiaryContainer();
-  }
-
-  /////////////////////////////////////////////////////////////////
-  // Tertiary Fixed [TF]                                         //
-  /////////////////////////////////////////////////////////////////
-
-  tertiaryFixed(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.tertiaryFixed();
-  }
-
-  tertiaryFixedDim(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.tertiaryFixedDim();
-  }
-
-  onTertiaryFixed(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.onTertiaryFixed();
-  }
-
-  onTertiaryFixedVariant(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.onTertiaryFixedVariant();
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Errors [E]                                                 //
-  ////////////////////////////////////////////////////////////////
-
-  error(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.error();
-  }
-
-  errorDim(): DynamicColor|undefined {
-    return MaterialDynamicColors.colorSpec.errorDim();
-  }
-
-  onError(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.onError();
-  }
-
-  errorContainer(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.errorContainer();
-  }
-
-  onErrorContainer(): DynamicColor {
-    return MaterialDynamicColors.colorSpec.onErrorContainer();
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // All Colors                                                 //
-  ////////////////////////////////////////////////////////////////
-
-  allColors: DynamicColor[] = [
-    this.background(),
-    this.onBackground(),
-    this.surface(),
-    this.surfaceDim(),
-    this.surfaceBright(),
-    this.surfaceContainerLowest(),
-    this.surfaceContainerLow(),
-    this.surfaceContainer(),
-    this.surfaceContainerHigh(),
-    this.surfaceContainerHighest(),
-    this.onSurface(),
-    this.onSurfaceVariant(),
-    this.outline(),
-    this.outlineVariant(),
-    this.inverseSurface(),
-    this.inverseOnSurface(),
-    this.primary(),
-    this.primaryDim(),
-    this.onPrimary(),
-    this.primaryContainer(),
-    this.onPrimaryContainer(),
-    this.primaryFixed(),
-    this.primaryFixedDim(),
-    this.onPrimaryFixed(),
-    this.onPrimaryFixedVariant(),
-    this.inversePrimary(),
-    this.secondary(),
-    this.secondaryDim(),
-    this.onSecondary(),
-    this.secondaryContainer(),
-    this.onSecondaryContainer(),
-    this.secondaryFixed(),
-    this.secondaryFixedDim(),
-    this.onSecondaryFixed(),
-    this.onSecondaryFixedVariant(),
-    this.tertiary(),
-    this.tertiaryDim(),
-    this.onTertiary(),
-    this.tertiaryContainer(),
-    this.onTertiaryContainer(),
-    this.tertiaryFixed(),
-    this.tertiaryFixedDim(),
-    this.onTertiaryFixed(),
-    this.onTertiaryFixedVariant(),
-    this.error(),
-    this.errorDim(),
-    this.onError(),
-    this.errorContainer(),
-    this.onErrorContainer(),
-  ].filter((c) => c !== undefined);
-
-  // Static variables are deprecated. Use the instance methods to get correct
-  // specs based on request.
-
-  /** @deprecated Use highestSurface() instead. */
-  static highestSurface(s: DynamicScheme): DynamicColor {
-    return MaterialDynamicColors.colorSpec.highestSurface(s);
-  }
-
-  /** @deprecated Use primaryPaletteKeyColor() instead. */
-  static primaryPaletteKeyColor =
-      MaterialDynamicColors.colorSpec.primaryPaletteKeyColor();
-
-  /** @deprecated Use secondaryPaletteKeyColor() instead. */
-  static secondaryPaletteKeyColor =
-      MaterialDynamicColors.colorSpec.secondaryPaletteKeyColor();
-
-  /** @deprecated Use tertiaryPaletteKeyColor() instead. */
-  static tertiaryPaletteKeyColor =
-      MaterialDynamicColors.colorSpec.tertiaryPaletteKeyColor();
-
-  /** @deprecated Use neutralPaletteKeyColor() instead. */
-  static neutralPaletteKeyColor =
-      MaterialDynamicColors.colorSpec.neutralPaletteKeyColor();
-
-  /** @deprecated Use neutralVariantPaletteKeyColor() instead. */
-  static neutralVariantPaletteKeyColor =
-      MaterialDynamicColors.colorSpec.neutralVariantPaletteKeyColor();
-
-  /** @deprecated Use background() instead. */
-  static background = MaterialDynamicColors.colorSpec.background();
-
-  /** @deprecated Use background() instead. */
-  static onBackground = MaterialDynamicColors.colorSpec.onBackground();
-
-  /** @deprecated Use surface() instead. */
-  static surface = MaterialDynamicColors.colorSpec.surface();
-
-  /** @deprecated Use surfaceDim() instead. */
-  static surfaceDim = MaterialDynamicColors.colorSpec.surfaceDim();
-
-  /** @deprecated Use surfaceBright() instead. */
-  static surfaceBright = MaterialDynamicColors.colorSpec.surfaceBright();
-
-  /** @deprecated Use surfaceContainerLowest() instead. */
-  static surfaceContainerLowest =
-      MaterialDynamicColors.colorSpec.surfaceContainerLowest();
-
-  /** @deprecated Use surfaceContainerLow() instead. */
-  static surfaceContainerLow =
-      MaterialDynamicColors.colorSpec.surfaceContainerLow();
-
-  /** @deprecated Use surfaceContainer() instead. */
-  static surfaceContainer = MaterialDynamicColors.colorSpec.surfaceContainer();
-
-  /** @deprecated Use surfaceContainerHigh() instead. */
-  static surfaceContainerHigh =
-      MaterialDynamicColors.colorSpec.surfaceContainerHigh();
-
-  /** @deprecated Use surfaceContainerHighest() instead. */
-  static surfaceContainerHighest =
-      MaterialDynamicColors.colorSpec.surfaceContainerHighest();
-
-  /** @deprecated Use onSurface() instead. */
-  static onSurface = MaterialDynamicColors.colorSpec.onSurface();
-
-  /** @deprecated Use surfaceVariant() instead. */
-  static surfaceVariant = MaterialDynamicColors.colorSpec.surfaceVariant();
-
-  /** @deprecated Use onSurfaceVariant() instead. */
-  static onSurfaceVariant = MaterialDynamicColors.colorSpec.onSurfaceVariant();
-
-  /** @deprecated Use inverseSurface() instead. */
-  static inverseSurface = MaterialDynamicColors.colorSpec.inverseSurface();
-
-  /** @deprecated Use inverseOnSurface() instead. */
-  static inverseOnSurface = MaterialDynamicColors.colorSpec.inverseOnSurface();
-
-  /** @deprecated Use outline() instead. */
-  static outline = MaterialDynamicColors.colorSpec.outline();
-
-  /** @deprecated Use outlineVariant() instead. */
-  static outlineVariant = MaterialDynamicColors.colorSpec.outlineVariant();
-
-  /** @deprecated Use shadow() instead. */
-  static shadow = MaterialDynamicColors.colorSpec.shadow();
-
-  /** @deprecated Use scrim() instead. */
-  static scrim = MaterialDynamicColors.colorSpec.scrim();
-
-  /** @deprecated Use surfaceTint() instead. */
-  static surfaceTint = MaterialDynamicColors.colorSpec.surfaceTint();
-
-  /** @deprecated Use primary() instead. */
-  static primary = MaterialDynamicColors.colorSpec.primary();
-
-  /** @deprecated Use onPrimary() instead. */
-  static onPrimary = MaterialDynamicColors.colorSpec.onPrimary();
-
-  /** @deprecated Use primaryContainer() instead. */
-  static primaryContainer = MaterialDynamicColors.colorSpec.primaryContainer();
-
-  /** @deprecated Use onPrimaryContainer() instead. */
-  static onPrimaryContainer =
-      MaterialDynamicColors.colorSpec.onPrimaryContainer();
-
-  /** @deprecated Use inversePrimary() instead. */
-  static inversePrimary = MaterialDynamicColors.colorSpec.inversePrimary();
-
-  /** @deprecated Use secondary() instead. */
-  static secondary = MaterialDynamicColors.colorSpec.secondary();
-
-  /** @deprecated Use onSecondary() instead. */
-  static onSecondary = MaterialDynamicColors.colorSpec.onSecondary();
-
-  /** @deprecated Use secondaryContainer() instead. */
-  static secondaryContainer =
-      MaterialDynamicColors.colorSpec.secondaryContainer();
-
-  /** @deprecated Use onSecondaryContainer() instead. */
-  static onSecondaryContainer =
-      MaterialDynamicColors.colorSpec.onSecondaryContainer();
-
-  /** @deprecated Use tertiary() instead. */
-  static tertiary = MaterialDynamicColors.colorSpec.tertiary();
-
-  /** @deprecated Use onTertiary() instead. */
-  static onTertiary = MaterialDynamicColors.colorSpec.onTertiary();
-
-  /** @deprecated Use tertiaryContainer() instead. */
-  static tertiaryContainer = MaterialDynamicColors.colorSpec.tertiaryContainer();
-
-  /** @deprecated Use onTertiaryContainer() instead. */
-  static onTertiaryContainer =
-      MaterialDynamicColors.colorSpec.onTertiaryContainer();
-
-  /** @deprecated Use error() instead. */
-  static error = MaterialDynamicColors.colorSpec.error();
-
-  /** @deprecated Use onError() instead. */
-  static onError = MaterialDynamicColors.colorSpec.onError();
-
-  /** @deprecated Use errorContainer() instead. */
-  static errorContainer = MaterialDynamicColors.colorSpec.errorContainer();
-
-  /** @deprecated Use onErrorContainer() instead. */
-  static onErrorContainer = MaterialDynamicColors.colorSpec.onErrorContainer();
-
-  /** @deprecated Use primaryFixed() instead. */
-  static primaryFixed = MaterialDynamicColors.colorSpec.primaryFixed();
-
-  /** @deprecated Use primaryFixedDim() instead. */
-  static primaryFixedDim = MaterialDynamicColors.colorSpec.primaryFixedDim();
-
-  /** @deprecated Use onPrimaryFixed() instead. */
-  static onPrimaryFixed = MaterialDynamicColors.colorSpec.onPrimaryFixed();
-
-  /** @deprecated Use onPrimaryFixedVariant() instead. */
-  static onPrimaryFixedVariant =
-      MaterialDynamicColors.colorSpec.onPrimaryFixedVariant();
-
-  /** @deprecated Use secondaryFixed() instead. */
-  static secondaryFixed = MaterialDynamicColors.colorSpec.secondaryFixed();
-
-  /** @deprecated Use secondaryFixedDim() instead. */
-  static secondaryFixedDim = MaterialDynamicColors.colorSpec.secondaryFixedDim();
-
-  /** @deprecated Use onSecondaryFixed() instead. */
-  static onSecondaryFixed = MaterialDynamicColors.colorSpec.onSecondaryFixed();
-
-  /** @deprecated Use onSecondaryFixedVariant() instead. */
-  static onSecondaryFixedVariant =
-      MaterialDynamicColors.colorSpec.onSecondaryFixedVariant();
-
-  /** @deprecated Use tertiaryFixed() instead. */
-  static tertiaryFixed = MaterialDynamicColors.colorSpec.tertiaryFixed();
-
-  /** @deprecated Use tertiaryFixedDim() instead. */
-  static tertiaryFixedDim = MaterialDynamicColors.colorSpec.tertiaryFixedDim();
-
-  /** @deprecated Use onTertiaryFixed() instead. */
-  static onTertiaryFixed = MaterialDynamicColors.colorSpec.onTertiaryFixed();
-
-  /** @deprecated Use onTertiaryFixedVariant() instead. */
-  static onTertiaryFixedVariant =
-      MaterialDynamicColors.colorSpec.onTertiaryFixedVariant();
-}
diff --git a/typescript/dynamiccolor/tone_delta_pair.ts b/typescript/dynamiccolor/tone_delta_pair.ts
deleted file mode 100644
index 11978ead..00000000
--- a/typescript/dynamiccolor/tone_delta_pair.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * @license
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {DynamicColor} from './dynamic_color.js';
-
-/**
- * Describes the different in tone between colors.
- *
- * nearer and farther are deprecated. Use DeltaConstraint instead.
- */
-export type TonePolarity =
-    'darker'|'lighter'|'nearer'|'farther'|'relative_darker'|'relative_lighter';
-
-/**
- * Describes how to fulfill a tone delta pair constraint.
- */
-export type DeltaConstraint = 'exact'|'nearer'|'farther';
-
-/**
- * Documents a constraint between two DynamicColors, in which their tones must
- * have a certain distance from each other.
- *
- * Prefer a DynamicColor with a background, this is for special cases when
- * designers want tonal distance, literally contrast, between two colors that
- * don't have a background / foreground relationship or a contrast guarantee.
- */
-export class ToneDeltaPair {
-  /**
-   * Documents a constraint in tone distance between two DynamicColors.
-   *
-   * The polarity is an adjective that describes "A", compared to "B".
-   *
-   * For instance, ToneDeltaPair(A, B, 15, 'darker', 'exact') states that
-   * A's tone should be exactly 15 darker than B's.
-   *
-   * 'relative_darker' and 'relative_lighter' describes the tone adjustment
-   * relative to the surface color trend (white in light mode; black in dark
-   * mode). For instance, ToneDeltaPair(A, B, 10, 'relative_lighter',
-   * 'farther') states that A should be at least 10 lighter than B in light
-   * mode, and at least 10 darker than B in dark mode.
-   *
-   * @param roleA The first role in a pair.
-   * @param roleB The second role in a pair.
-   * @param delta Required difference between tones. Absolute value, negative
-   * values have undefined behavior.
-   * @param polarity The relative relation between tones of roleA and roleB,
-   * as described above.
-   * @param constraint How to fulfill the tone delta pair constraint.
-   * @param stayTogether Whether these two roles should stay on the same side
-   * of the "awkward zone" (T50-59). This is necessary for certain cases where
-   * one role has two backgrounds.
-   */
-  constructor(
-      readonly roleA: DynamicColor,
-      readonly roleB: DynamicColor,
-      readonly delta: number,
-      readonly polarity: TonePolarity,
-      readonly stayTogether: boolean,
-      readonly constraint?: DeltaConstraint,
-  ) {
-    this.constraint = constraint ?? 'exact';
-  }
-}
diff --git a/typescript/dynamiccolor/variant.ts b/typescript/dynamiccolor/variant.ts
deleted file mode 100644
index a63d2cf5..00000000
--- a/typescript/dynamiccolor/variant.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @license
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Set of themes supported by Dynamic Color.
- * Instantiate the corresponding subclass, ex. SchemeTonalSpot, to create
- * colors corresponding to the theme.
- */
-export enum Variant {
-  MONOCHROME,
-  NEUTRAL,
-  TONAL_SPOT,
-  VIBRANT,
-  EXPRESSIVE,
-  FIDELITY,
-  CONTENT,
-  RAINBOW,
-  FRUIT_SALAD
-}
diff --git a/typescript/hct/cam16.ts b/typescript/hct/cam16.ts
deleted file mode 100644
index ce5634f0..00000000
--- a/typescript/hct/cam16.ts
+++ /dev/null
@@ -1,418 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import * as utils from '../utils/color_utils.js';
-import * as math from '../utils/math_utils.js';
-
-import {ViewingConditions} from './viewing_conditions.js';
-
-/**
- * CAM16, a color appearance model. Colors are not just defined by their hex
- * code, but rather, a hex code and viewing conditions.
- *
- * CAM16 instances also have coordinates in the CAM16-UCS space, called J*, a*,
- * b*, or jstar, astar, bstar in code. CAM16-UCS is included in the CAM16
- * specification, and should be used when measuring distances between colors.
- *
- * In traditional color spaces, a color can be identified solely by the
- * observer's measurement of the color. Color appearance models such as CAM16
- * also use information about the environment where the color was
- * observed, known as the viewing conditions.
- *
- * For example, white under the traditional assumption of a midday sun white
- * point is accurately measured as a slightly chromatic blue by CAM16. (roughly,
- * hue 203, chroma 3, lightness 100)
- */
-export class Cam16 {
-  /**
-   * All of the CAM16 dimensions can be calculated from 3 of the dimensions, in
-   * the following combinations:
-   *      -  {j or q} and {c, m, or s} and hue
-   *      - jstar, astar, bstar
-   * Prefer using a static method that constructs from 3 of those dimensions.
-   * This constructor is intended for those methods to use to return all
-   * possible dimensions.
-   *
-   * @param hue
-   * @param chroma informally, colorfulness / color intensity. like saturation
-   *     in HSL, except perceptually accurate.
-   * @param j lightness
-   * @param q brightness; ratio of lightness to white point's lightness
-   * @param m colorfulness
-   * @param s saturation; ratio of chroma to white point's chroma
-   * @param jstar CAM16-UCS J coordinate
-   * @param astar CAM16-UCS a coordinate
-   * @param bstar CAM16-UCS b coordinate
-   */
-  constructor(
-      readonly hue: number, readonly chroma: number, readonly j: number,
-      readonly q: number, readonly m: number, readonly s: number,
-      readonly jstar: number, readonly astar: number, readonly bstar: number) {}
-
-  /**
-   * CAM16 instances also have coordinates in the CAM16-UCS space, called J*,
-   * a*, b*, or jstar, astar, bstar in code. CAM16-UCS is included in the CAM16
-   * specification, and is used to measure distances between colors.
-   */
-  distance(other: Cam16): number {
-    const dJ = this.jstar - other.jstar;
-    const dA = this.astar - other.astar;
-    const dB = this.bstar - other.bstar;
-    const dEPrime = Math.sqrt(dJ * dJ + dA * dA + dB * dB);
-    const dE = 1.41 * Math.pow(dEPrime, 0.63);
-    return dE;
-  }
-
-  /**
-   * @param argb ARGB representation of a color.
-   * @return CAM16 color, assuming the color was viewed in default viewing
-   *     conditions.
-   */
-  static fromInt(argb: number): Cam16 {
-    return Cam16.fromIntInViewingConditions(argb, ViewingConditions.DEFAULT);
-  }
-
-  /**
-   * @param argb ARGB representation of a color.
-   * @param viewingConditions Information about the environment where the color
-   *     was observed.
-   * @return CAM16 color.
-   */
-  static fromIntInViewingConditions(
-      argb: number, viewingConditions: ViewingConditions): Cam16 {
-    const red = (argb & 0x00ff0000) >> 16;
-    const green = (argb & 0x0000ff00) >> 8;
-    const blue = (argb & 0x000000ff);
-    const redL = utils.linearized(red);
-    const greenL = utils.linearized(green);
-    const blueL = utils.linearized(blue);
-    const x = 0.41233895 * redL + 0.35762064 * greenL + 0.18051042 * blueL;
-    const y = 0.2126 * redL + 0.7152 * greenL + 0.0722 * blueL;
-    const z = 0.01932141 * redL + 0.11916382 * greenL + 0.95034478 * blueL;
-
-    const rC = 0.401288 * x + 0.650173 * y - 0.051461 * z;
-    const gC = -0.250268 * x + 1.204414 * y + 0.045854 * z;
-    const bC = -0.002079 * x + 0.048952 * y + 0.953127 * z;
-
-    const rD = viewingConditions.rgbD[0] * rC;
-    const gD = viewingConditions.rgbD[1] * gC;
-    const bD = viewingConditions.rgbD[2] * bC;
-
-    const rAF = Math.pow((viewingConditions.fl * Math.abs(rD)) / 100.0, 0.42);
-    const gAF = Math.pow((viewingConditions.fl * Math.abs(gD)) / 100.0, 0.42);
-    const bAF = Math.pow((viewingConditions.fl * Math.abs(bD)) / 100.0, 0.42);
-
-    const rA = (math.signum(rD) * 400.0 * rAF) / (rAF + 27.13);
-    const gA = (math.signum(gD) * 400.0 * gAF) / (gAF + 27.13);
-    const bA = (math.signum(bD) * 400.0 * bAF) / (bAF + 27.13);
-
-    const a = (11.0 * rA + -12.0 * gA + bA) / 11.0;
-    const b = (rA + gA - 2.0 * bA) / 9.0;
-    const u = (20.0 * rA + 20.0 * gA + 21.0 * bA) / 20.0;
-    const p2 = (40.0 * rA + 20.0 * gA + bA) / 20.0;
-    const atan2 = Math.atan2(b, a);
-    const atanDegrees = (atan2 * 180.0) / Math.PI;
-    const hue = atanDegrees < 0 ? atanDegrees + 360.0 :
-        atanDegrees >= 360      ? atanDegrees - 360.0 :
-                                  atanDegrees;
-    const hueRadians = (hue * Math.PI) / 180.0;
-
-    const ac = p2 * viewingConditions.nbb;
-    const j = 100.0 *
-        Math.pow(
-            ac / viewingConditions.aw,
-            viewingConditions.c * viewingConditions.z);
-    const q = (4.0 / viewingConditions.c) * Math.sqrt(j / 100.0) *
-        (viewingConditions.aw + 4.0) * viewingConditions.fLRoot;
-    const huePrime = hue < 20.14 ? hue + 360 : hue;
-    const eHue = 0.25 * (Math.cos((huePrime * Math.PI) / 180.0 + 2.0) + 3.8);
-    const p1 =
-        (50000.0 / 13.0) * eHue * viewingConditions.nc * viewingConditions.ncb;
-    const t = (p1 * Math.sqrt(a * a + b * b)) / (u + 0.305);
-    const alpha = Math.pow(t, 0.9) *
-        Math.pow(1.64 - Math.pow(0.29, viewingConditions.n), 0.73);
-    const c = alpha * Math.sqrt(j / 100.0);
-    const m = c * viewingConditions.fLRoot;
-    const s = 50.0 *
-        Math.sqrt((alpha * viewingConditions.c) / (viewingConditions.aw + 4.0));
-    const jstar = ((1.0 + 100.0 * 0.007) * j) / (1.0 + 0.007 * j);
-    const mstar = (1.0 / 0.0228) * Math.log(1.0 + 0.0228 * m);
-    const astar = mstar * Math.cos(hueRadians);
-    const bstar = mstar * Math.sin(hueRadians);
-
-    return new Cam16(hue, c, j, q, m, s, jstar, astar, bstar);
-  }
-
-  /**
-   * @param j CAM16 lightness
-   * @param c CAM16 chroma
-   * @param h CAM16 hue
-   */
-  static fromJch(j: number, c: number, h: number): Cam16 {
-    return Cam16.fromJchInViewingConditions(j, c, h, ViewingConditions.DEFAULT);
-  }
-
-  /**
-   * @param j CAM16 lightness
-   * @param c CAM16 chroma
-   * @param h CAM16 hue
-   * @param viewingConditions Information about the environment where the color
-   *     was observed.
-   */
-  static fromJchInViewingConditions(
-      j: number, c: number, h: number,
-      viewingConditions: ViewingConditions): Cam16 {
-    const q = (4.0 / viewingConditions.c) * Math.sqrt(j / 100.0) *
-        (viewingConditions.aw + 4.0) * viewingConditions.fLRoot;
-    const m = c * viewingConditions.fLRoot;
-    const alpha = c / Math.sqrt(j / 100.0);
-    const s = 50.0 *
-        Math.sqrt((alpha * viewingConditions.c) / (viewingConditions.aw + 4.0));
-    const hueRadians = (h * Math.PI) / 180.0;
-    const jstar = ((1.0 + 100.0 * 0.007) * j) / (1.0 + 0.007 * j);
-    const mstar = (1.0 / 0.0228) * Math.log(1.0 + 0.0228 * m);
-    const astar = mstar * Math.cos(hueRadians);
-    const bstar = mstar * Math.sin(hueRadians);
-    return new Cam16(h, c, j, q, m, s, jstar, astar, bstar);
-  }
-
-  /**
-   * @param jstar CAM16-UCS lightness.
-   * @param astar CAM16-UCS a dimension. Like a* in L*a*b*, it is a Cartesian
-   *     coordinate on the Y axis.
-   * @param bstar CAM16-UCS b dimension. Like a* in L*a*b*, it is a Cartesian
-   *     coordinate on the X axis.
-   */
-  static fromUcs(jstar: number, astar: number, bstar: number): Cam16 {
-    return Cam16.fromUcsInViewingConditions(
-        jstar, astar, bstar, ViewingConditions.DEFAULT);
-  }
-
-  /**
-   * @param jstar CAM16-UCS lightness.
-   * @param astar CAM16-UCS a dimension. Like a* in L*a*b*, it is a Cartesian
-   *     coordinate on the Y axis.
-   * @param bstar CAM16-UCS b dimension. Like a* in L*a*b*, it is a Cartesian
-   *     coordinate on the X axis.
-   * @param viewingConditions Information about the environment where the color
-   *     was observed.
-   */
-  static fromUcsInViewingConditions(
-      jstar: number, astar: number, bstar: number,
-      viewingConditions: ViewingConditions): Cam16 {
-    const a = astar;
-    const b = bstar;
-    const m = Math.sqrt(a * a + b * b);
-    const M = (Math.exp(m * 0.0228) - 1.0) / 0.0228;
-    const c = M / viewingConditions.fLRoot;
-    let h = Math.atan2(b, a) * (180.0 / Math.PI);
-    if (h < 0.0) {
-      h += 360.0;
-    }
-    const j = jstar / (1 - (jstar - 100) * 0.007);
-    return Cam16.fromJchInViewingConditions(j, c, h, viewingConditions);
-  }
-
-  /**
-   *  @return ARGB representation of color, assuming the color was viewed in
-   *     default viewing conditions, which are near-identical to the default
-   *     viewing conditions for sRGB.
-   */
-  toInt(): number {
-    return this.viewed(ViewingConditions.DEFAULT);
-  }
-
-  /**
-   * @param viewingConditions Information about the environment where the color
-   *     will be viewed.
-   * @return ARGB representation of color
-   */
-  viewed(viewingConditions: ViewingConditions): number {
-    const alpha = this.chroma === 0.0 || this.j === 0.0 ?
-        0.0 :
-        this.chroma / Math.sqrt(this.j / 100.0);
-
-    const t = Math.pow(
-        alpha / Math.pow(1.64 - Math.pow(0.29, viewingConditions.n), 0.73),
-        1.0 / 0.9);
-    const hRad = (this.hue * Math.PI) / 180.0;
-
-    const eHue = 0.25 * (Math.cos(hRad + 2.0) + 3.8);
-    const ac = viewingConditions.aw *
-        Math.pow(
-            this.j / 100.0, 1.0 / viewingConditions.c / viewingConditions.z);
-    const p1 =
-        eHue * (50000.0 / 13.0) * viewingConditions.nc * viewingConditions.ncb;
-    const p2 = ac / viewingConditions.nbb;
-
-    const hSin = Math.sin(hRad);
-    const hCos = Math.cos(hRad);
-
-    const gamma = (23.0 * (p2 + 0.305) * t) /
-        (23.0 * p1 + 11.0 * t * hCos + 108.0 * t * hSin);
-    const a = gamma * hCos;
-    const b = gamma * hSin;
-    const rA = (460.0 * p2 + 451.0 * a + 288.0 * b) / 1403.0;
-    const gA = (460.0 * p2 - 891.0 * a - 261.0 * b) / 1403.0;
-    const bA = (460.0 * p2 - 220.0 * a - 6300.0 * b) / 1403.0;
-
-    const rCBase = Math.max(0, (27.13 * Math.abs(rA)) / (400.0 - Math.abs(rA)));
-    const rC = math.signum(rA) * (100.0 / viewingConditions.fl) *
-        Math.pow(rCBase, 1.0 / 0.42);
-    const gCBase = Math.max(0, (27.13 * Math.abs(gA)) / (400.0 - Math.abs(gA)));
-    const gC = math.signum(gA) * (100.0 / viewingConditions.fl) *
-        Math.pow(gCBase, 1.0 / 0.42);
-    const bCBase = Math.max(0, (27.13 * Math.abs(bA)) / (400.0 - Math.abs(bA)));
-    const bC = math.signum(bA) * (100.0 / viewingConditions.fl) *
-        Math.pow(bCBase, 1.0 / 0.42);
-    const rF = rC / viewingConditions.rgbD[0];
-    const gF = gC / viewingConditions.rgbD[1];
-    const bF = bC / viewingConditions.rgbD[2];
-
-    const x = 1.86206786 * rF - 1.01125463 * gF + 0.14918677 * bF;
-    const y = 0.38752654 * rF + 0.62144744 * gF - 0.00897398 * bF;
-    const z = -0.01584150 * rF - 0.03412294 * gF + 1.04996444 * bF;
-
-    const argb = utils.argbFromXyz(x, y, z);
-    return argb;
-  }
-
-  /// Given color expressed in XYZ and viewed in [viewingConditions], convert to
-  /// CAM16.
-  static fromXyzInViewingConditions(
-      x: number, y: number, z: number,
-      viewingConditions: ViewingConditions): Cam16 {
-    // Transform XYZ to 'cone'/'rgb' responses
-
-    const rC = 0.401288 * x + 0.650173 * y - 0.051461 * z;
-    const gC = -0.250268 * x + 1.204414 * y + 0.045854 * z;
-    const bC = -0.002079 * x + 0.048952 * y + 0.953127 * z;
-
-    // Discount illuminant
-    const rD = viewingConditions.rgbD[0] * rC;
-    const gD = viewingConditions.rgbD[1] * gC;
-    const bD = viewingConditions.rgbD[2] * bC;
-
-    // chromatic adaptation
-    const rAF = Math.pow(viewingConditions.fl * Math.abs(rD) / 100.0, 0.42);
-    const gAF = Math.pow(viewingConditions.fl * Math.abs(gD) / 100.0, 0.42);
-    const bAF = Math.pow(viewingConditions.fl * Math.abs(bD) / 100.0, 0.42);
-    const rA = math.signum(rD) * 400.0 * rAF / (rAF + 27.13);
-    const gA = math.signum(gD) * 400.0 * gAF / (gAF + 27.13);
-    const bA = math.signum(bD) * 400.0 * bAF / (bAF + 27.13);
-
-    // redness-greenness
-    const a = (11.0 * rA + -12.0 * gA + bA) / 11.0;
-    // yellowness-blueness
-    const b = (rA + gA - 2.0 * bA) / 9.0;
-
-    // auxiliary components
-    const u = (20.0 * rA + 20.0 * gA + 21.0 * bA) / 20.0;
-    const p2 = (40.0 * rA + 20.0 * gA + bA) / 20.0;
-
-    // hue
-    const atan2 = Math.atan2(b, a);
-    const atanDegrees = atan2 * 180.0 / Math.PI;
-    const hue = atanDegrees < 0 ? atanDegrees + 360.0 :
-        atanDegrees >= 360      ? atanDegrees - 360 :
-                                  atanDegrees;
-    const hueRadians = hue * Math.PI / 180.0;
-
-    // achromatic response to color
-    const ac = p2 * viewingConditions.nbb;
-
-    // CAM16 lightness and brightness
-    const J = 100.0 *
-        Math.pow(
-            ac / viewingConditions.aw,
-            viewingConditions.c * viewingConditions.z);
-    const Q = (4.0 / viewingConditions.c) * Math.sqrt(J / 100.0) *
-        (viewingConditions.aw + 4.0) * (viewingConditions.fLRoot);
-
-    const huePrime = (hue < 20.14) ? hue + 360 : hue;
-    const eHue =
-        (1.0 / 4.0) * (Math.cos(huePrime * Math.PI / 180.0 + 2.0) + 3.8);
-    const p1 =
-        50000.0 / 13.0 * eHue * viewingConditions.nc * viewingConditions.ncb;
-    const t = p1 * Math.sqrt(a * a + b * b) / (u + 0.305);
-    const alpha = Math.pow(t, 0.9) *
-        Math.pow(1.64 - Math.pow(0.29, viewingConditions.n), 0.73);
-    // CAM16 chroma, colorfulness, chroma
-    const C = alpha * Math.sqrt(J / 100.0);
-    const M = C * viewingConditions.fLRoot;
-    const s = 50.0 *
-        Math.sqrt((alpha * viewingConditions.c) / (viewingConditions.aw + 4.0));
-
-    // CAM16-UCS components
-    const jstar = (1.0 + 100.0 * 0.007) * J / (1.0 + 0.007 * J);
-    const mstar = Math.log(1.0 + 0.0228 * M) / 0.0228;
-    const astar = mstar * Math.cos(hueRadians);
-    const bstar = mstar * Math.sin(hueRadians);
-    return new Cam16(hue, C, J, Q, M, s, jstar, astar, bstar);
-  }
-
-  /// XYZ representation of CAM16 seen in [viewingConditions].
-  xyzInViewingConditions(viewingConditions: ViewingConditions): number[] {
-    const alpha = (this.chroma === 0.0 || this.j === 0.0) ?
-        0.0 :
-        this.chroma / Math.sqrt(this.j / 100.0);
-
-    const t = Math.pow(
-        alpha / Math.pow(1.64 - Math.pow(0.29, viewingConditions.n), 0.73),
-        1.0 / 0.9);
-    const hRad = this.hue * Math.PI / 180.0;
-
-    const eHue = 0.25 * (Math.cos(hRad + 2.0) + 3.8);
-    const ac = viewingConditions.aw *
-        Math.pow(
-            this.j / 100.0, 1.0 / viewingConditions.c / viewingConditions.z);
-    const p1 =
-        eHue * (50000.0 / 13.0) * viewingConditions.nc * viewingConditions.ncb;
-
-    const p2 = (ac / viewingConditions.nbb);
-
-    const hSin = Math.sin(hRad);
-    const hCos = Math.cos(hRad);
-
-    const gamma = 23.0 * (p2 + 0.305) * t /
-        (23.0 * p1 + 11 * t * hCos + 108.0 * t * hSin);
-    const a = gamma * hCos;
-    const b = gamma * hSin;
-    const rA = (460.0 * p2 + 451.0 * a + 288.0 * b) / 1403.0;
-    const gA = (460.0 * p2 - 891.0 * a - 261.0 * b) / 1403.0;
-    const bA = (460.0 * p2 - 220.0 * a - 6300.0 * b) / 1403.0;
-
-    const rCBase = Math.max(0, (27.13 * Math.abs(rA)) / (400.0 - Math.abs(rA)));
-    const rC = math.signum(rA) * (100.0 / viewingConditions.fl) *
-        Math.pow(rCBase, 1.0 / 0.42);
-    const gCBase = Math.max(0, (27.13 * Math.abs(gA)) / (400.0 - Math.abs(gA)));
-    const gC = math.signum(gA) * (100.0 / viewingConditions.fl) *
-        Math.pow(gCBase, 1.0 / 0.42);
-    const bCBase = Math.max(0, (27.13 * Math.abs(bA)) / (400.0 - Math.abs(bA)));
-    const bC = math.signum(bA) * (100.0 / viewingConditions.fl) *
-        Math.pow(bCBase, 1.0 / 0.42);
-    const rF = rC / viewingConditions.rgbD[0];
-    const gF = gC / viewingConditions.rgbD[1];
-    const bF = bC / viewingConditions.rgbD[2];
-
-    const x = 1.86206786 * rF - 1.01125463 * gF + 0.14918677 * bF;
-    const y = 0.38752654 * rF + 0.62144744 * gF - 0.00897398 * bF;
-    const z = -0.01584150 * rF - 0.03412294 * gF + 1.04996444 * bF;
-
-    return [x, y, z];
-  }
-}
diff --git a/typescript/hct/hct.ts b/typescript/hct/hct.ts
deleted file mode 100644
index e305f1cc..00000000
--- a/typescript/hct/hct.ts
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * A color system built using CAM16 hue and chroma, and L* from
- * L*a*b*.
- *
- * Using L* creates a link between the color system, contrast, and thus
- * accessibility. Contrast ratio depends on relative luminance, or Y in the XYZ
- * color space. L*, or perceptual luminance can be calculated from Y.
- *
- * Unlike Y, L* is linear to human perception, allowing trivial creation of
- * accurate color tones.
- *
- * Unlike contrast ratio, measuring contrast in L* is linear, and simple to
- * calculate. A difference of 40 in HCT tone guarantees a contrast ratio >= 3.0,
- * and a difference of 50 guarantees a contrast ratio >= 4.5.
- */
-
-import * as utils from '../utils/color_utils.js';
-
-import {Cam16} from './cam16.js';
-import {HctSolver} from './hct_solver.js';
-import {ViewingConditions} from './viewing_conditions.js';
-
-
-/**
- * HCT, hue, chroma, and tone. A color system that provides a perceptually
- * accurate color measurement system that can also accurately render what colors
- * will appear as in different lighting environments.
- */
-export class Hct {
-  /**
-   * @param hue 0 <= hue < 360; invalid values are corrected.
-   * @param chroma 0 <= chroma < ?; Informally, colorfulness. The color
-   *     returned may be lower than the requested chroma. Chroma has a different
-   *     maximum for any given hue and tone.
-   * @param tone 0 <= tone <= 100; invalid values are corrected.
-   * @return HCT representation of a color in default viewing conditions.
-   */
-
-  internalHue: number;
-  internalChroma: number;
-  internalTone: number;
-
-  static from(hue: number, chroma: number, tone: number) {
-    return new Hct(HctSolver.solveToInt(hue, chroma, tone));
-  }
-
-  /**
-   * @param argb ARGB representation of a color.
-   * @return HCT representation of a color in default viewing conditions
-   */
-  static fromInt(argb: number) {
-    return new Hct(argb);
-  }
-
-  toInt(): number {
-    return this.argb;
-  }
-
-  /**
-   * A number, in degrees, representing ex. red, orange, yellow, etc.
-   * Ranges from 0 <= hue < 360.
-   */
-  get hue(): number {
-    return this.internalHue;
-  }
-
-  /**
-   * @param newHue 0 <= newHue < 360; invalid values are corrected.
-   * Chroma may decrease because chroma has a different maximum for any given
-   * hue and tone.
-   */
-  set hue(newHue: number) {
-    this.setInternalState(
-        HctSolver.solveToInt(
-            newHue,
-            this.internalChroma,
-            this.internalTone,
-            ),
-    );
-  }
-
-  get chroma(): number {
-    return this.internalChroma;
-  }
-
-  /**
-   * @param newChroma 0 <= newChroma < ?
-   * Chroma may decrease because chroma has a different maximum for any given
-   * hue and tone.
-   */
-  set chroma(newChroma: number) {
-    this.setInternalState(
-        HctSolver.solveToInt(
-            this.internalHue,
-            newChroma,
-            this.internalTone,
-            ),
-    );
-  }
-
-  /** Lightness. Ranges from 0 to 100. */
-  get tone(): number {
-    return this.internalTone;
-  }
-
-  /**
-   * @param newTone 0 <= newTone <= 100; invalid valids are corrected.
-   * Chroma may decrease because chroma has a different maximum for any given
-   * hue and tone.
-   */
-  set tone(newTone: number) {
-    this.setInternalState(
-        HctSolver.solveToInt(
-            this.internalHue,
-            this.internalChroma,
-            newTone,
-            ),
-    );
-  }
-
-  /** Sets a property of the Hct object. */
-  setValue(propertyName: string, value: number) {
-    (this as any)[propertyName] = value;
-  }
-
-  toString(): string {
-    return `HCT(${this.hue.toFixed(0)}, ${this.chroma.toFixed(0)}, ${
-        this.tone.toFixed(0)})`;
-  }
-
-  static isBlue(hue: number): boolean {
-    return hue >= 250 && hue < 270;
-  }
-
-  static isYellow(hue: number): boolean {
-    return hue >= 105 && hue < 125;
-  }
-
-  static isCyan(hue: number): boolean {
-    return hue >= 170 && hue < 207;
-  }
-
-  private constructor(private argb: number) {
-    const cam = Cam16.fromInt(argb);
-    this.internalHue = cam.hue;
-    this.internalChroma = cam.chroma;
-    this.internalTone = utils.lstarFromArgb(argb);
-    this.argb = argb;
-  }
-
-  private setInternalState(argb: number) {
-    const cam = Cam16.fromInt(argb);
-    this.internalHue = cam.hue;
-    this.internalChroma = cam.chroma;
-    this.internalTone = utils.lstarFromArgb(argb);
-    this.argb = argb;
-  }
-
-  /**
-   * Translates a color into different [ViewingConditions].
-   *
-   * Colors change appearance. They look different with lights on versus off,
-   * the same color, as in hex code, on white looks different when on black.
-   * This is called color relativity, most famously explicated by Josef Albers
-   * in Interaction of Color.
-   *
-   * In color science, color appearance models can account for this and
-   * calculate the appearance of a color in different settings. HCT is based on
-   * CAM16, a color appearance model, and uses it to make these calculations.
-   *
-   * See [ViewingConditions.make] for parameters affecting color appearance.
-   */
-  inViewingConditions(vc: ViewingConditions): Hct {
-    // 1. Use CAM16 to find XYZ coordinates of color in specified VC.
-    const cam = Cam16.fromInt(this.toInt());
-    const viewedInVc = cam.xyzInViewingConditions(vc);
-
-    // 2. Create CAM16 of those XYZ coordinates in default VC.
-    const recastInVc = Cam16.fromXyzInViewingConditions(
-        viewedInVc[0],
-        viewedInVc[1],
-        viewedInVc[2],
-        ViewingConditions.make(),
-    );
-
-    // 3. Create HCT from:
-    // - CAM16 using default VC with XYZ coordinates in specified VC.
-    // - L* converted from Y in XYZ coordinates in specified VC.
-    const recastHct = Hct.from(
-        recastInVc.hue,
-        recastInVc.chroma,
-        utils.lstarFromY(viewedInVc[1]),
-    );
-    return recastHct;
-  }
-}
diff --git a/typescript/hct/hct_round_trip_test.ts b/typescript/hct/hct_round_trip_test.ts
deleted file mode 100644
index 9a5f8375..00000000
--- a/typescript/hct/hct_round_trip_test.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import 'jasmine';
-
-import * as colorUtils from '../utils/color_utils.js';
-
-import {Hct} from './hct.js';
-
-// Testing 512 out of 16_777_216 colors.
-
-describe('HCT roundtrip', () => {
-  it('preserves original color', () => {
-    for (let r = 0; r < 296; r += 37) {
-      for (let g = 0; g < 296; g += 37) {
-        for (let b = 0; b < 296; b += 37) {
-          const argb = colorUtils.argbFromRgb(
-              Math.min(255, r),
-              Math.min(255, g),
-              Math.min(255, b),
-          );
-
-          const hct = Hct.fromInt(argb);
-          const reconstructed = Hct.from(
-              hct.hue,
-              hct.chroma,
-              hct.tone,
-          ).toInt();
-
-          expect(reconstructed).toEqual(argb);
-        }
-      }
-    }
-  });
-});
diff --git a/typescript/hct/hct_solver.ts b/typescript/hct/hct_solver.ts
deleted file mode 100644
index f973000c..00000000
--- a/typescript/hct/hct_solver.ts
+++ /dev/null
@@ -1,554 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// This file is automatically generated. Do not modify it.
-
-import * as colorUtils from '../utils/color_utils.js';
-import * as mathUtils from '../utils/math_utils.js';
-
-import {Cam16} from './cam16.js';
-import {ViewingConditions} from './viewing_conditions.js';
-
-
-// material_color_utilities is designed to have a consistent API across
-// platforms and modular components that can be moved around easily. Using a
-// class as a namespace facilitates this.
-//
-// tslint:disable:class-as-namespace
-/**
- * A class that solves the HCT equation.
- */
-export class HctSolver {
-  static SCALED_DISCOUNT_FROM_LINRGB = [
-    [
-      0.001200833568784504,
-      0.002389694492170889,
-      0.0002795742885861124,
-    ],
-    [
-      0.0005891086651375999,
-      0.0029785502573438758,
-      0.0003270666104008398,
-    ],
-    [
-      0.00010146692491640572,
-      0.0005364214359186694,
-      0.0032979401770712076,
-    ],
-  ];
-
-  static LINRGB_FROM_SCALED_DISCOUNT = [
-    [
-      1373.2198709594231,
-      -1100.4251190754821,
-      -7.278681089101213,
-    ],
-    [
-      -271.815969077903,
-      559.6580465940733,
-      -32.46047482791194,
-    ],
-    [
-      1.9622899599665666,
-      -57.173814538844006,
-      308.7233197812385,
-    ],
-  ];
-
-  static Y_FROM_LINRGB = [0.2126, 0.7152, 0.0722];
-
-  static CRITICAL_PLANES = [
-    0.015176349177441876, 0.045529047532325624, 0.07588174588720938,
-    0.10623444424209313,  0.13658714259697685,  0.16693984095186062,
-    0.19729253930674434,  0.2276452376616281,   0.2579979360165119,
-    0.28835063437139563,  0.3188300904430532,   0.350925934958123,
-    0.3848314933096426,   0.42057480301049466,  0.458183274052838,
-    0.4976837250274023,   0.5391024159806381,   0.5824650784040898,
-    0.6277969426914107,   0.6751227633498623,   0.7244668422128921,
-    0.775853049866786,    0.829304845476233,    0.8848452951698498,
-    0.942497089126609,    1.0022825574869039,   1.0642236851973577,
-    1.1283421258858297,   1.1946592148522128,   1.2631959812511864,
-    1.3339731595349034,   1.407011200216447,    1.4823302800086415,
-    1.5599503113873272,   1.6398909516233677,   1.7221716113234105,
-    1.8068114625156377,   1.8938294463134073,   1.9832442801866852,
-    2.075074464868551,    2.1693382909216234,   2.2660538449872063,
-    2.36523901573795,     2.4669114995532007,   2.5710888059345764,
-    2.6777882626779785,   2.7870270208169257,   2.898822059350997,
-    3.0131901897720907,   3.1301480604002863,   3.2497121605402226,
-    3.3718988244681087,   3.4967242352587946,   3.624204428461639,
-    3.754355295633311,    3.887192587735158,    4.022731918402185,
-    4.160988767090289,    4.301978482107941,    4.445716283538092,
-    4.592217266055746,    4.741496401646282,    4.893568542229298,
-    5.048448422192488,    5.20615066083972,     5.3666897647573375,
-    5.5300801301023865,   5.696336044816294,    5.865471690767354,
-    6.037501145825082,    6.212438385869475,    6.390297286737924,
-    6.571091626112461,    6.7548350853498045,   6.941541251256611,
-    7.131223617812143,    7.323895587840543,    7.5195704746346665,
-    7.7182615035334345,   7.919981813454504,    8.124744458384042,
-    8.332562408825165,    8.543448553206703,    8.757415699253682,
-    8.974476575321063,    9.194643831691977,    9.417930041841839,
-    9.644347703669503,    9.873909240696694,    10.106627003236781,
-    10.342513269534024,   10.58158024687427,    10.8238400726681,
-    11.069304815507364,   11.317986476196008,   11.569896988756009,
-    11.825048221409341,   12.083451977536606,   12.345119996613247,
-    12.610063955123938,   12.878295467455942,   13.149826086772048,
-    13.42466730586372,    13.702830557985108,   13.984327217668513,
-    14.269168601521828,   14.55736596900856,    14.848930523210871,
-    15.143873411576273,   15.44220572664832,    15.743938506781891,
-    16.04908273684337,    16.35764934889634,    16.66964922287304,
-    16.985093187232053,   17.30399201960269,    17.62635644741625,
-    17.95219714852476,    18.281524751807332,   18.614349837764564,
-    18.95068293910138,    19.290534541298456,   19.633915083172692,
-    19.98083495742689,    20.331304511189067,   20.685334046541502,
-    21.042933821039977,   21.404114048223256,   21.76888489811322,
-    22.137256497705877,   22.50923893145328,    22.884842241736916,
-    23.264076429332462,   23.6469514538663,     24.033477234264016,
-    24.42366364919083,    24.817520537484558,   25.21505769858089,
-    25.61628489293138,    26.021211842414342,   26.429848230738664,
-    26.842203703840827,   27.258287870275353,   27.678110301598522,
-    28.10168053274597,    28.529008062403893,   28.96010235337422,
-    29.39497283293396,    29.83362889318845,    30.276079891419332,
-    30.722335150426627,   31.172403958865512,   31.62629557157785,
-    32.08401920991837,    32.54558406207592,    33.010999283389665,
-    33.4802739966603,     33.953417292456834,   34.430438229418264,
-    34.911345834551085,   35.39614910352207,    35.88485700094671,
-    36.37747846067349,    36.87402238606382,    37.37449765026789,
-    37.87891309649659,    38.38727753828926,    38.89959975977785,
-    39.41588851594697,    39.93615253289054,    40.460400508064545,
-    40.98864111053629,    41.520882981230194,   42.05713473317016,
-    42.597404951718396,   43.141702194811224,   43.6900349931913,
-    44.24241185063697,    44.798841244188324,   45.35933162437017,
-    45.92389141541209,    46.49252901546552,    47.065252796817916,
-    47.64207110610409,    48.22299226451468,    48.808024568002054,
-    49.3971762874833,     49.9904556690408,     50.587870934119984,
-    51.189430279724725,   51.79514187861014,    52.40501387947288,
-    53.0190544071392,     53.637271562750364,   54.259673423945976,
-    54.88626804504493,    55.517063457223934,   56.15206766869424,
-    56.79128866487574,    57.43473440856916,    58.08241284012621,
-    58.734331877617365,   59.39049941699807,    60.05092333227251,
-    60.715611475655585,   61.38457167773311,    62.057811747619894,
-    62.7353394731159,     63.417162620860914,   64.10328893648692,
-    64.79372614476921,    65.48848194977529,    66.18756403501224,
-    66.89098006357258,    67.59873767827808,    68.31084450182222,
-    69.02730813691093,    69.74813616640164,    70.47333615344107,
-    71.20291564160104,    71.93688215501312,    72.67524319850172,
-    73.41800625771542,    74.16517879925733,    74.9167682708136,
-    75.67278210128072,    76.43322770089146,    77.1981124613393,
-    77.96744375590167,    78.74122893956174,    79.51947534912904,
-    80.30219030335869,    81.08938110306934,    81.88105503125999,
-    82.67721935322541,    83.4778813166706,     84.28304815182372,
-    85.09272707154808,    85.90692527145302,    86.72564993000343,
-    87.54890820862819,    88.3767072518277,     89.2090541872801,
-    90.04595612594655,    90.88742016217518,    91.73345337380438,
-    92.58406282226491,    93.43925555268066,    94.29903859396902,
-    95.16341895893969,    96.03240364439274,    96.9059996312159,
-    97.78421388448044,    98.6670533535366,     99.55452497210776,
-  ];
-
-  /**
-   * Sanitizes a small enough angle in radians.
-   *
-   * @param angle An angle in radians; must not deviate too much
-   * from 0.
-   * @return A coterminal angle between 0 and 2pi.
-   */
-  private static sanitizeRadians(angle: number): number {
-    return (angle + Math.PI * 8) % (Math.PI * 2);
-  }
-
-  /**
-   * Delinearizes an RGB component, returning a floating-point
-   * number.
-   *
-   * @param rgbComponent 0.0 <= rgb_component <= 100.0, represents
-   * linear R/G/B channel
-   * @return 0.0 <= output <= 255.0, color channel converted to
-   * regular RGB space
-   */
-  private static trueDelinearized(rgbComponent: number): number {
-    const normalized = rgbComponent / 100.0;
-    let delinearized = 0.0;
-    if (normalized <= 0.0031308) {
-      delinearized = normalized * 12.92;
-    } else {
-      delinearized = 1.055 * Math.pow(normalized, 1.0 / 2.4) - 0.055;
-    }
-    return delinearized * 255.0;
-  }
-
-  private static chromaticAdaptation(component: number): number {
-    const af = Math.pow(Math.abs(component), 0.42);
-    return mathUtils.signum(component) * 400.0 * af / (af + 27.13);
-  }
-
-  /**
-   * Returns the hue of a linear RGB color in CAM16.
-   *
-   * @param linrgb The linear RGB coordinates of a color.
-   * @return The hue of the color in CAM16, in radians.
-   */
-  private static hueOf(linrgb: number[]): number {
-    const scaledDiscount =
-        mathUtils.matrixMultiply(linrgb, HctSolver.SCALED_DISCOUNT_FROM_LINRGB);
-    const rA = HctSolver.chromaticAdaptation(scaledDiscount[0]);
-    const gA = HctSolver.chromaticAdaptation(scaledDiscount[1]);
-    const bA = HctSolver.chromaticAdaptation(scaledDiscount[2]);
-    // redness-greenness
-    const a = (11.0 * rA + -12.0 * gA + bA) / 11.0;
-    // yellowness-blueness
-    const b = (rA + gA - 2.0 * bA) / 9.0;
-    return Math.atan2(b, a);
-  }
-
-  private static areInCyclicOrder(a: number, b: number, c: number): boolean {
-    const deltaAB = HctSolver.sanitizeRadians(b - a);
-    const deltaAC = HctSolver.sanitizeRadians(c - a);
-    return deltaAB < deltaAC;
-  }
-
-  /**
-   * Solves the lerp equation.
-   *
-   * @param source The starting number.
-   * @param mid The number in the middle.
-   * @param target The ending number.
-   * @return A number t such that lerp(source, target, t) = mid.
-   */
-  private static intercept(source: number, mid: number, target: number):
-      number {
-    return (mid - source) / (target - source);
-  }
-
-  private static lerpPoint(source: number[], t: number, target: number[]):
-      number[] {
-    return [
-      source[0] + (target[0] - source[0]) * t,
-      source[1] + (target[1] - source[1]) * t,
-      source[2] + (target[2] - source[2]) * t,
-    ];
-  }
-
-  /**
-   * Intersects a segment with a plane.
-   *
-   * @param source The coordinates of point A.
-   * @param coordinate The R-, G-, or B-coordinate of the plane.
-   * @param target The coordinates of point B.
-   * @param axis The axis the plane is perpendicular with. (0: R, 1:
-   * G, 2: B)
-   * @return The intersection point of the segment AB with the plane
-   * R=coordinate, G=coordinate, or B=coordinate
-   */
-  private static setCoordinate(
-      source: number[],
-      coordinate: number,
-      target: number[],
-      axis: number,
-      ): number[] {
-    const t = HctSolver.intercept(source[axis], coordinate, target[axis]);
-    return HctSolver.lerpPoint(source, t, target);
-  }
-
-  private static isBounded(x: number): boolean {
-    return 0.0 <= x && x <= 100.0;
-  }
-
-  /**
-   * Returns the nth possible vertex of the polygonal intersection.
-   *
-   * @param y The Y value of the plane.
-   * @param n The zero-based index of the point. 0 <= n <= 11.
-   * @return The nth possible vertex of the polygonal intersection
-   * of the y plane and the RGB cube, in linear RGB coordinates, if
-   * it exists. If this possible vertex lies outside of the cube,
-   * [-1.0, -1.0, -1.0] is returned.
-   */
-  private static nthVertex(y: number, n: number): number[] {
-    const kR = HctSolver.Y_FROM_LINRGB[0];
-    const kG = HctSolver.Y_FROM_LINRGB[1];
-    const kB = HctSolver.Y_FROM_LINRGB[2];
-    const coordA = n % 4 <= 1 ? 0.0 : 100.0;
-    const coordB = n % 2 === 0 ? 0.0 : 100.0;
-    if (n < 4) {
-      const g = coordA;
-      const b = coordB;
-      const r = (y - g * kG - b * kB) / kR;
-      if (HctSolver.isBounded(r)) {
-        return [r, g, b];
-      } else {
-        return [-1.0, -1.0, -1.0];
-      }
-    } else if (n < 8) {
-      const b = coordA;
-      const r = coordB;
-      const g = (y - r * kR - b * kB) / kG;
-      if (HctSolver.isBounded(g)) {
-        return [r, g, b];
-      } else {
-        return [-1.0, -1.0, -1.0];
-      }
-    } else {
-      const r = coordA;
-      const g = coordB;
-      const b = (y - r * kR - g * kG) / kB;
-      if (HctSolver.isBounded(b)) {
-        return [r, g, b];
-      } else {
-        return [-1.0, -1.0, -1.0];
-      }
-    }
-  }
-
-  /**
-   * Finds the segment containing the desired color.
-   *
-   * @param y The Y value of the color.
-   * @param targetHue The hue of the color.
-   * @return A list of two sets of linear RGB coordinates, each
-   * corresponding to an endpoint of the segment containing the
-   * desired color.
-   */
-  private static bisectToSegment(y: number, targetHue: number): number[][] {
-    let left = [-1.0, -1.0, -1.0];
-    let right = left;
-    let leftHue = 0.0;
-    let rightHue = 0.0;
-    let initialized = false;
-    let uncut = true;
-    for (let n = 0; n < 12; n++) {
-      const mid = HctSolver.nthVertex(y, n);
-      if (mid[0] < 0) {
-        continue;
-      }
-      const midHue = HctSolver.hueOf(mid);
-      if (!initialized) {
-        left = mid;
-        right = mid;
-        leftHue = midHue;
-        rightHue = midHue;
-        initialized = true;
-        continue;
-      }
-      if (uncut || HctSolver.areInCyclicOrder(leftHue, midHue, rightHue)) {
-        uncut = false;
-        if (HctSolver.areInCyclicOrder(leftHue, targetHue, midHue)) {
-          right = mid;
-          rightHue = midHue;
-        } else {
-          left = mid;
-          leftHue = midHue;
-        }
-      }
-    }
-    return [left, right];
-  }
-
-  private static midpoint(a: number[], b: number[]): number[] {
-    return [
-      (a[0] + b[0]) / 2,
-      (a[1] + b[1]) / 2,
-      (a[2] + b[2]) / 2,
-    ];
-  }
-
-  private static criticalPlaneBelow(x: number): number {
-    return Math.floor(x - 0.5);
-  }
-
-  private static criticalPlaneAbove(x: number): number {
-    return Math.ceil(x - 0.5);
-  }
-
-  /**
-   * Finds a color with the given Y and hue on the boundary of the
-   * cube.
-   *
-   * @param y The Y value of the color.
-   * @param targetHue The hue of the color.
-   * @return The desired color, in linear RGB coordinates.
-   */
-  private static bisectToLimit(y: number, targetHue: number): number[] {
-    const segment = HctSolver.bisectToSegment(y, targetHue);
-    let left = segment[0];
-    let leftHue = HctSolver.hueOf(left);
-    let right = segment[1];
-    for (let axis = 0; axis < 3; axis++) {
-      if (left[axis] !== right[axis]) {
-        let lPlane = -1;
-        let rPlane = 255;
-        if (left[axis] < right[axis]) {
-          lPlane = HctSolver.criticalPlaneBelow(
-              HctSolver.trueDelinearized(left[axis]));
-          rPlane = HctSolver.criticalPlaneAbove(
-              HctSolver.trueDelinearized(right[axis]));
-        } else {
-          lPlane = HctSolver.criticalPlaneAbove(
-              HctSolver.trueDelinearized(left[axis]));
-          rPlane = HctSolver.criticalPlaneBelow(
-              HctSolver.trueDelinearized(right[axis]));
-        }
-        for (let i = 0; i < 8; i++) {
-          if (Math.abs(rPlane - lPlane) <= 1) {
-            break;
-          } else {
-            const mPlane = Math.floor((lPlane + rPlane) / 2.0);
-            const midPlaneCoordinate = HctSolver.CRITICAL_PLANES[mPlane];
-            const mid =
-                HctSolver.setCoordinate(left, midPlaneCoordinate, right, axis);
-            const midHue = HctSolver.hueOf(mid);
-            if (HctSolver.areInCyclicOrder(leftHue, targetHue, midHue)) {
-              right = mid;
-              rPlane = mPlane;
-            } else {
-              left = mid;
-              leftHue = midHue;
-              lPlane = mPlane;
-            }
-          }
-        }
-      }
-    }
-    return HctSolver.midpoint(left, right);
-  }
-
-  private static inverseChromaticAdaptation(adapted: number): number {
-    const adaptedAbs = Math.abs(adapted);
-    const base = Math.max(0, 27.13 * adaptedAbs / (400.0 - adaptedAbs));
-    return mathUtils.signum(adapted) * Math.pow(base, 1.0 / 0.42);
-  }
-
-  /**
-   * Finds a color with the given hue, chroma, and Y.
-   *
-   * @param hueRadians The desired hue in radians.
-   * @param chroma The desired chroma.
-   * @param y The desired Y.
-   * @return The desired color as a hexadecimal integer, if found; 0
-   * otherwise.
-   */
-  private static findResultByJ(hueRadians: number, chroma: number, y: number):
-      number {
-    // Initial estimate of j.
-    let j = Math.sqrt(y) * 11.0;
-    // ===========================================================
-    // Operations inlined from Cam16 to avoid repeated calculation
-    // ===========================================================
-    const viewingConditions = ViewingConditions.DEFAULT;
-    const tInnerCoeff =
-        1 / Math.pow(1.64 - Math.pow(0.29, viewingConditions.n), 0.73);
-    const eHue = 0.25 * (Math.cos(hueRadians + 2.0) + 3.8);
-    const p1 =
-        eHue * (50000.0 / 13.0) * viewingConditions.nc * viewingConditions.ncb;
-    const hSin = Math.sin(hueRadians);
-    const hCos = Math.cos(hueRadians);
-    for (let iterationRound = 0; iterationRound < 5; iterationRound++) {
-      // ===========================================================
-      // Operations inlined from Cam16 to avoid repeated calculation
-      // ===========================================================
-      const jNormalized = j / 100.0;
-      const alpha =
-          chroma === 0.0 || j === 0.0 ? 0.0 : chroma / Math.sqrt(jNormalized);
-      const t = Math.pow(alpha * tInnerCoeff, 1.0 / 0.9);
-      const ac = viewingConditions.aw *
-          Math.pow(
-              jNormalized,
-              1.0 / viewingConditions.c / viewingConditions.z,
-          );
-      const p2 = ac / viewingConditions.nbb;
-      const gamma = 23.0 * (p2 + 0.305) * t /
-          (23.0 * p1 + 11 * t * hCos + 108.0 * t * hSin);
-      const a = gamma * hCos;
-      const b = gamma * hSin;
-      const rA = (460.0 * p2 + 451.0 * a + 288.0 * b) / 1403.0;
-      const gA = (460.0 * p2 - 891.0 * a - 261.0 * b) / 1403.0;
-      const bA = (460.0 * p2 - 220.0 * a - 6300.0 * b) / 1403.0;
-      const rCScaled = HctSolver.inverseChromaticAdaptation(rA);
-      const gCScaled = HctSolver.inverseChromaticAdaptation(gA);
-      const bCScaled = HctSolver.inverseChromaticAdaptation(bA);
-      const linrgb = mathUtils.matrixMultiply(
-          [rCScaled, gCScaled, bCScaled],
-          HctSolver.LINRGB_FROM_SCALED_DISCOUNT,
-      );
-      // ===========================================================
-      // Operations inlined from Cam16 to avoid repeated calculation
-      // ===========================================================
-      if (linrgb[0] < 0 || linrgb[1] < 0 || linrgb[2] < 0) {
-        return 0;
-      }
-      const kR = HctSolver.Y_FROM_LINRGB[0];
-      const kG = HctSolver.Y_FROM_LINRGB[1];
-      const kB = HctSolver.Y_FROM_LINRGB[2];
-      const fnj = kR * linrgb[0] + kG * linrgb[1] + kB * linrgb[2];
-      if (fnj <= 0) {
-        return 0;
-      }
-      if (iterationRound === 4 || Math.abs(fnj - y) < 0.002) {
-        if (linrgb[0] > 100.01 || linrgb[1] > 100.01 || linrgb[2] > 100.01) {
-          return 0;
-        }
-        return colorUtils.argbFromLinrgb(linrgb);
-      }
-      // Iterates with Newton method,
-      // Using 2 * fn(j) / j as the approximation of fn'(j)
-      j = j - (fnj - y) * j / (2 * fnj);
-    }
-    return 0;
-  }
-
-  /**
-   * Finds an sRGB color with the given hue, chroma, and L*, if
-   * possible.
-   *
-   * @param hueDegrees The desired hue, in degrees.
-   * @param chroma The desired chroma.
-   * @param lstar The desired L*.
-   * @return A hexadecimal representing the sRGB color. The color
-   * has sufficiently close hue, chroma, and L* to the desired
-   * values, if possible; otherwise, the hue and L* will be
-   * sufficiently close, and chroma will be maximized.
-   */
-  static solveToInt(hueDegrees: number, chroma: number, lstar: number): number {
-    if (chroma < 0.0001 || lstar < 0.0001 || lstar > 99.9999) {
-      return colorUtils.argbFromLstar(lstar);
-    }
-    hueDegrees = mathUtils.sanitizeDegreesDouble(hueDegrees);
-    const hueRadians = hueDegrees / 180 * Math.PI;
-    const y = colorUtils.yFromLstar(lstar);
-    const exactAnswer = HctSolver.findResultByJ(hueRadians, chroma, y);
-    if (exactAnswer !== 0) {
-      return exactAnswer;
-    }
-    const linrgb = HctSolver.bisectToLimit(y, hueRadians);
-    return colorUtils.argbFromLinrgb(linrgb);
-  }
-
-  /**
-   * Finds an sRGB color with the given hue, chroma, and L*, if
-   * possible.
-   *
-   * @param hueDegrees The desired hue, in degrees.
-   * @param chroma The desired chroma.
-   * @param lstar The desired L*.
-   * @return An CAM16 object representing the sRGB color. The color
-   * has sufficiently close hue, chroma, and L* to the desired
-   * values, if possible; otherwise, the hue and L* will be
-   * sufficiently close, and chroma will be maximized.
-   */
-  static solveToCam(hueDegrees: number, chroma: number, lstar: number): Cam16 {
-    return Cam16.fromInt(HctSolver.solveToInt(hueDegrees, chroma, lstar));
-  }
-}
diff --git a/typescript/hct/hct_test.ts b/typescript/hct/hct_test.ts
deleted file mode 100644
index 9d8744c4..00000000
--- a/typescript/hct/hct_test.ts
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import 'jasmine';
-
-import * as colorUtils from '../utils/color_utils.js';
-
-import {Cam16} from './cam16.js';
-import {Hct} from './hct.js';
-import {ViewingConditions} from './viewing_conditions.js';
-
-const RED = 0xffff0000;
-const GREEN = 0xff00ff00;
-const BLUE = 0xff0000ff;
-const WHITE = 0xffffffff;
-const BLACK = 0xff000000;
-
-describe('CAM to ARGB', () => {
-  it('red', () => {
-    const cam = Cam16.fromInt(RED);
-
-    expect(cam.hue).toBeCloseTo(27.408, 3);
-    expect(cam.chroma).toBeCloseTo(113.358, 3);
-    expect(cam.j).toBeCloseTo(46.445, 3);
-    expect(cam.m).toBeCloseTo(89.494, 3);
-    expect(cam.s).toBeCloseTo(91.890, 3);
-    expect(cam.q).toBeCloseTo(105.989, 3);
-  });
-
-  it('green', () => {
-    const cam = Cam16.fromInt(GREEN);
-
-    expect(cam.hue).toBeCloseTo(142.140, 3);
-    expect(cam.chroma).toBeCloseTo(108.410, 3);
-    expect(cam.j).toBeCloseTo(79.332, 3);
-    expect(cam.m).toBeCloseTo(85.588, 3);
-    expect(cam.s).toBeCloseTo(78.605, 3);
-    expect(cam.q).toBeCloseTo(138.520, 3);
-  });
-
-  it('blue', () => {
-    const cam = Cam16.fromInt(BLUE);
-
-    expect(cam.hue).toBeCloseTo(282.788, 3);
-    expect(cam.chroma).toBeCloseTo(87.231, 3);
-    expect(cam.j).toBeCloseTo(25.466, 3);
-    expect(cam.m).toBeCloseTo(68.867, 3);
-    expect(cam.s).toBeCloseTo(93.675, 3);
-    expect(cam.q).toBeCloseTo(78.481, 3);
-  });
-
-  it('white', () => {
-    const cam = Cam16.fromInt(WHITE);
-
-    expect(cam.hue).toBeCloseTo(209.492, 3);
-    expect(cam.chroma).toBeCloseTo(2.869, 3);
-    expect(cam.j).toBeCloseTo(100.0, 3);
-    expect(cam.m).toBeCloseTo(2.265, 3);
-    expect(cam.s).toBeCloseTo(12.068, 3);
-    expect(cam.q).toBeCloseTo(155.521, 3);
-  });
-
-  it('black', () => {
-    const cam = Cam16.fromInt(BLACK);
-
-    expect(cam.hue).toBeCloseTo(0.0, 3);
-    expect(cam.chroma).toBeCloseTo(0.0, 3);
-    expect(cam.j).toBeCloseTo(0.0, 3);
-    expect(cam.m).toBeCloseTo(0.0, 3);
-    expect(cam.s).toBeCloseTo(0.0, 3);
-    expect(cam.q).toBeCloseTo(0.0, 3);
-  });
-});
-
-describe('CAM to ARGB to CAM', () => {
-  it('red', () => {
-    const cam = Cam16.fromInt(RED);
-    const argb = cam.toInt();
-    expect(argb).toEqual(RED);
-  });
-
-  it('green', () => {
-    const cam = Cam16.fromInt(GREEN);
-    const argb = cam.toInt();
-    expect(argb).toEqual(GREEN);
-  });
-
-  it('blue', () => {
-    const cam = Cam16.fromInt(BLUE);
-    const argb = cam.toInt();
-    expect(argb).toEqual(BLUE);
-  });
-});
-
-describe('ARGB to HCT', () => {
-  it('green', () => {
-    const hct = Hct.fromInt(GREEN);
-    expect(hct.hue).toBeCloseTo(142.139, 2);
-    expect(hct.chroma).toBeCloseTo(108.410, 2);
-    expect(hct.tone).toBeCloseTo(87.737, 2);
-  });
-
-  it('blue', () => {
-    const hct = Hct.fromInt(BLUE);
-    expect(hct.hue).toBeCloseTo(282.788, 2);
-    expect(hct.chroma).toBeCloseTo(87.230, 2);
-    expect(hct.tone).toBeCloseTo(32.302, 2);
-  });
-
-  it('blue tone 90', () => {
-    const hct = Hct.from(282.788, 87.230, 90.0);
-    expect(hct.hue).toBeCloseTo(282.239, 2);
-    expect(hct.chroma).toBeCloseTo(19.144, 2);
-    expect(hct.tone).toBeCloseTo(90.035, 2);
-  });
-});
-
-
-describe('viewing conditions', () => {
-  it('default', () => {
-    const vc = ViewingConditions.DEFAULT;
-    expect(vc.n).toBeCloseTo(0.184, 3);
-    expect(vc.aw).toBeCloseTo(29.981, 3);
-    expect(vc.nbb).toBeCloseTo(1.017, 3);
-    expect(vc.ncb).toBeCloseTo(1.017, 3);
-    expect(vc.c).toBeCloseTo(0.69, 3);
-    expect(vc.nc).toBeCloseTo(1.0, 3);
-    expect(vc.rgbD[0]).toBeCloseTo(1.021, 3);
-    expect(vc.rgbD[1]).toBeCloseTo(0.986, 3);
-    expect(vc.rgbD[2]).toBeCloseTo(0.934, 3);
-    expect(vc.fl).toBeCloseTo(0.388, 3);
-    expect(vc.fLRoot).toBeCloseTo(0.789, 3);
-    expect(vc.z).toBeCloseTo(1.909, 3);
-  });
-});
-
-function colorIsOnBoundary(argb: number): boolean {
-  return colorUtils.redFromArgb(argb) === 0 ||
-      colorUtils.redFromArgb(argb) === 255 ||
-      colorUtils.greenFromArgb(argb) === 0 ||
-      colorUtils.greenFromArgb(argb) === 255 ||
-      colorUtils.blueFromArgb(argb) === 0 ||
-      colorUtils.blueFromArgb(argb) === 255;
-}
-
-describe('CamSolver', () => {
-  it('returns a sufficiently close color', () => {
-    for (let hue = 15; hue < 360; hue += 30) {
-      for (let chroma = 0; chroma <= 100; chroma += 10) {
-        for (let tone = 20; tone <= 80; tone += 10) {
-          const hctColor = Hct.from(hue, chroma, tone);
-
-          if (chroma > 0) {
-            expect(Math.abs(hctColor.hue - hue)).toBeLessThanOrEqual(4.0);
-          }
-
-          expect(hctColor.chroma).toBeGreaterThanOrEqual(0);
-          expect(hctColor.chroma).toBeLessThanOrEqual(chroma + 2.5);
-
-          if (hctColor.chroma < chroma - 2.5) {
-            expect(colorIsOnBoundary(hctColor.toInt())).toBe(true);
-          }
-
-          expect(Math.abs(hctColor.tone - tone)).toBeLessThanOrEqual(0.5);
-        }
-      }
-    }
-  });
-});
diff --git a/typescript/hct/viewing_conditions.ts b/typescript/hct/viewing_conditions.ts
deleted file mode 100644
index 87b51cc0..00000000
--- a/typescript/hct/viewing_conditions.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import * as utils from '../utils/color_utils.js';
-import * as math from '../utils/math_utils.js';
-
-/**
- * In traditional color spaces, a color can be identified solely by the
- * observer's measurement of the color. Color appearance models such as CAM16
- * also use information about the environment where the color was
- * observed, known as the viewing conditions.
- *
- * For example, white under the traditional assumption of a midday sun white
- * point is accurately measured as a slightly chromatic blue by CAM16. (roughly,
- * hue 203, chroma 3, lightness 100)
- *
- * This class caches intermediate values of the CAM16 conversion process that
- * depend only on viewing conditions, enabling speed ups.
- */
-export class ViewingConditions {
-  /** sRGB-like viewing conditions.  */
-  static DEFAULT = ViewingConditions.make();
-
-  /**
-   * Create ViewingConditions from a simple, physically relevant, set of
-   * parameters.
-   *
-   * @param whitePoint White point, measured in the XYZ color space.
-   *     default = D65, or sunny day afternoon
-   * @param adaptingLuminance The luminance of the adapting field. Informally,
-   *     how bright it is in the room where the color is viewed. Can be
-   *     calculated from lux by multiplying lux by 0.0586. default = 11.72,
-   *     or 200 lux.
-   * @param backgroundLstar The lightness of the area surrounding the color.
-   *     measured by L* in L*a*b*. default = 50.0
-   * @param surround A general description of the lighting surrounding the
-   *     color. 0 is pitch dark, like watching a movie in a theater. 1.0 is a
-   *     dimly light room, like watching TV at home at night. 2.0 means there
-   *     is no difference between the lighting on the color and around it.
-   *     default = 2.0
-   * @param discountingIlluminant Whether the eye accounts for the tint of the
-   *     ambient lighting, such as knowing an apple is still red in green light.
-   *     default = false, the eye does not perform this process on
-   *       self-luminous objects like displays.
-   */
-  static make(
-      whitePoint = utils.whitePointD65(),
-      adaptingLuminance = (200.0 / Math.PI) * utils.yFromLstar(50.0) / 100.0,
-      backgroundLstar = 50.0, surround = 2.0,
-      discountingIlluminant = false): ViewingConditions {
-    const xyz = whitePoint;
-    const rW = xyz[0] * 0.401288 + xyz[1] * 0.650173 + xyz[2] * -0.051461;
-    const gW = xyz[0] * -0.250268 + xyz[1] * 1.204414 + xyz[2] * 0.045854;
-    const bW = xyz[0] * -0.002079 + xyz[1] * 0.048952 + xyz[2] * 0.953127;
-    const f = 0.8 + surround / 10.0;
-    const c = f >= 0.9 ? math.lerp(0.59, 0.69, (f - 0.9) * 10.0) :
-                         math.lerp(0.525, 0.59, (f - 0.8) * 10.0);
-    let d = discountingIlluminant ?
-        1.0 :
-        f * (1.0 - (1.0 / 3.6) * Math.exp((-adaptingLuminance - 42.0) / 92.0));
-    d = d > 1.0 ? 1.0 : d < 0.0 ? 0.0 : d;
-    const nc = f;
-    const rgbD = [
-      d * (100.0 / rW) + 1.0 - d,
-      d * (100.0 / gW) + 1.0 - d,
-      d * (100.0 / bW) + 1.0 - d,
-    ];
-    const k = 1.0 / (5.0 * adaptingLuminance + 1.0);
-    const k4 = k * k * k * k;
-    const k4F = 1.0 - k4;
-    const fl = k4 * adaptingLuminance +
-        0.1 * k4F * k4F * Math.cbrt(5.0 * adaptingLuminance);
-    const n = utils.yFromLstar(backgroundLstar) / whitePoint[1];
-    const z = 1.48 + Math.sqrt(n);
-    const nbb = 0.725 / Math.pow(n, 0.2);
-    const ncb = nbb;
-    const rgbAFactors = [
-      Math.pow((fl * rgbD[0] * rW) / 100.0, 0.42),
-      Math.pow((fl * rgbD[1] * gW) / 100.0, 0.42),
-      Math.pow((fl * rgbD[2] * bW) / 100.0, 0.42),
-    ];
-    const rgbA = [
-      (400.0 * rgbAFactors[0]) / (rgbAFactors[0] + 27.13),
-      (400.0 * rgbAFactors[1]) / (rgbAFactors[1] + 27.13),
-      (400.0 * rgbAFactors[2]) / (rgbAFactors[2] + 27.13),
-    ];
-    const aw = (2.0 * rgbA[0] + rgbA[1] + 0.05 * rgbA[2]) * nbb;
-    return new ViewingConditions(
-        n, aw, nbb, ncb, c, nc, rgbD, fl, Math.pow(fl, 0.25), z);
-  }
-
-  /**
-   * Parameters are intermediate values of the CAM16 conversion process. Their
-   * names are shorthand for technical color science terminology, this class
-   * would not benefit from documenting them individually. A brief overview
-   * is available in the CAM16 specification, and a complete overview requires
-   * a color science textbook, such as Fairchild's Color Appearance Models.
-   */
-  private constructor(
-      public n: number, public aw: number, public nbb: number,
-      public ncb: number, public c: number, public nc: number,
-      public rgbD: number[], public fl: number, public fLRoot: number,
-      public z: number) {}
-}
diff --git a/typescript/index.ts b/typescript/index.ts
deleted file mode 100644
index f78323d1..00000000
--- a/typescript/index.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export * from './blend/blend.js';
-export * from './contrast/contrast.js';
-export * from './dislike/dislike_analyzer.js';
-export * from './dynamiccolor/dynamic_color.js';
-export * from './dynamiccolor/dynamic_scheme.js';
-export * from './dynamiccolor/material_dynamic_colors.js';
-export * from './dynamiccolor/variant.js';
-export * from './hct/cam16.js';
-export * from './hct/hct.js';
-export * from './hct/viewing_conditions.js';
-export * from './palettes/core_palette.js';
-export * from './palettes/tonal_palette.js';
-export * from './quantize/quantizer_celebi.js';
-export * from './quantize/quantizer_map.js';
-export * from './quantize/quantizer_wsmeans.js';
-export * from './quantize/quantizer_wu.js';
-export * from './scheme/scheme.js';
-export * from './scheme/scheme_android.js';
-export * from './scheme/scheme_content.js';
-export * from './scheme/scheme_expressive.js';
-export * from './scheme/scheme_fidelity.js';
-export * from './scheme/scheme_fruit_salad.js';
-export * from './scheme/scheme_monochrome.js';
-export * from './scheme/scheme_neutral.js';
-export * from './scheme/scheme_rainbow.js';
-export * from './scheme/scheme_tonal_spot.js';
-export * from './scheme/scheme_vibrant.js';
-export * from './score/score.js';
-export * from './temperature/temperature_cache.js';
-export * from './utils/color_utils.js';
-export * from './utils/math_utils.js';
-export * from './utils/string_utils.js';
-export * from './utils/image_utils.js';
-export * from './utils/theme_utils.js';
diff --git a/typescript/package.json b/typescript/package.json
deleted file mode 100644
index a5d07f06..00000000
--- a/typescript/package.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "name": "@material/material-color-utilities",
-  "version": "0.3.1",
-  "publishConfig": {
-    "access": "public"
-  },
-  "description": "Algorithms and utilities that power the Material Design 3 (M3) color system, including choosing theme colors from images and creating tones of colors; all in a new color space.",
-  "keywords": [
-    "material",
-    "material design",
-    "material3",
-    "material you",
-    "color extraction",
-    "theming"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/material-foundation/material-color-utilities.git",
-    "directory": "typescript"
-  },
-  "author": "Material Eng",
-  "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/material-foundation/material-color-utilities/issues"
-  },
-  "homepage": "https://github.com/material-foundation/material-color-utilities/tree/main/typescript",
-  "type": "module",
-  "files": [
-    "**/*.js",
-    "**/*.js.map",
-    "**/*.d.ts",
-    "!**/*_test.*",
-    "!.wireit/**"
-  ],
-  "main": "index.js",
-  "module": "index.js",
-  "types": "index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./index.d.ts",
-      "import": "./index.js",
-      "default": "./index.js"
-    }
-  },
-  "scripts": {
-    "build": "wireit",
-    "build:ts": "wireit",
-    "prepublishOnly": "npm run build"
-  },
-  "wireit": {
-    "build": {
-      "dependencies": ["build:ts"]
-    },
-    "build:ts": {
-      "command": "tsc --pretty",
-      "files": ["tsconfig.json", "**/*.ts", "!**/*.d.ts"],
-      "output": [
-        ".tsbuildinfo",
-        "**/*.js",
-        "**/*.js.map",
-        "**/*.d.ts",
-        "!*.js",
-        "!types/"
-      ],
-      "clean": "if-file-deleted"
-    }
-  },
-  "devDependencies": {
-    "@types/jasmine": "^3.10.3",
-    "@types/node": "^18.7.17",
-    "jasmine": "^4.0.2",
-    "typescript": "^4.5.5",
-    "wireit": "^0.9.5"
-  }
-}
diff --git a/typescript/palettes/core_palette.ts b/typescript/palettes/core_palette.ts
deleted file mode 100644
index 49f4b510..00000000
--- a/typescript/palettes/core_palette.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {Hct} from '../hct/hct.js';
-
-import {TonalPalette} from './tonal_palette.js';
-
-/**
- * @deprecated Use {@link DynamicScheme} for color scheme generation.
- * Use {@link CorePalettes} for core palettes container class.
- */
-export interface CorePaletteColors {
-  primary: number;
-  secondary?: number;
-  tertiary?: number;
-  neutral?: number;
-  neutralVariant?: number;
-  error?: number;
-}
-
-/**
- * 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.
- *
- * @deprecated Use {@link DynamicScheme} for color scheme generation.
- * Use {@link CorePalettes} for core palettes container class.
- */
-export class CorePalette {
-  a1: TonalPalette;
-  a2: TonalPalette;
-  a3: TonalPalette;
-  n1: TonalPalette;
-  n2: TonalPalette;
-  error: TonalPalette;
-
-  /**
-   * @param argb ARGB representation of a color
-   *
-   * @deprecated Use {@link DynamicScheme} for color scheme generation.
-   * Use {@link CorePalettes} for core palettes container class.
-   */
-  static of(argb: number): CorePalette {
-    return new CorePalette(argb, false);
-  }
-
-  /**
-   * @param argb ARGB representation of a color
-   *
-   * @deprecated Use {@link DynamicScheme} for color scheme generation.
-   * Use {@link CorePalettes} for core palettes container class.
-   */
-  static contentOf(argb: number): CorePalette {
-    return new CorePalette(argb, true);
-  }
-
-  /**
-   * Create a [CorePalette] from a set of colors
-   *
-   * @deprecated Use {@link DynamicScheme} for color scheme generation.
-   * Use {@link CorePalettes} for core palettes container class.
-   */
-  static fromColors(colors: CorePaletteColors): CorePalette {
-    return CorePalette.createPaletteFromColors(false, colors);
-  }
-
-  /**
-   * Create a content [CorePalette] from a set of colors
-   *
-   * @deprecated Use {@link DynamicScheme} for color scheme generation.
-   * Use {@link CorePalettes} for core palettes container class.
-   */
-  static contentFromColors(colors: CorePaletteColors): CorePalette {
-    return CorePalette.createPaletteFromColors(true, colors);
-  }
-
-  private static createPaletteFromColors(
-      content: boolean,
-      colors: CorePaletteColors,
-  ) {
-    const palette = new CorePalette(colors.primary, content);
-    if (colors.secondary) {
-      const p = new CorePalette(colors.secondary, content);
-      palette.a2 = p.a1;
-    }
-    if (colors.tertiary) {
-      const p = new CorePalette(colors.tertiary, content);
-      palette.a3 = p.a1;
-    }
-    if (colors.error) {
-      const p = new CorePalette(colors.error, content);
-      palette.error = p.a1;
-    }
-    if (colors.neutral) {
-      const p = new CorePalette(colors.neutral, content);
-      palette.n1 = p.n1;
-    }
-    if (colors.neutralVariant) {
-      const p = new CorePalette(colors.neutralVariant, content);
-      palette.n2 = p.n2;
-    }
-    return palette;
-  }
-
-  private constructor(argb: number, isContent: boolean) {
-    const hct = Hct.fromInt(argb);
-    const hue = hct.hue;
-    const chroma = hct.chroma;
-    if (isContent) {
-      this.a1 = TonalPalette.fromHueAndChroma(hue, chroma);
-      this.a2 = TonalPalette.fromHueAndChroma(hue, chroma / 3);
-      this.a3 = TonalPalette.fromHueAndChroma(hue + 60, chroma / 2);
-      this.n1 = TonalPalette.fromHueAndChroma(hue, Math.min(chroma / 12, 4));
-      this.n2 = TonalPalette.fromHueAndChroma(hue, Math.min(chroma / 6, 8));
-    } else {
-      this.a1 = TonalPalette.fromHueAndChroma(hue, Math.max(48, chroma));
-      this.a2 = TonalPalette.fromHueAndChroma(hue, 16);
-      this.a3 = TonalPalette.fromHueAndChroma(hue + 60, 24);
-      this.n1 = TonalPalette.fromHueAndChroma(hue, 4);
-      this.n2 = TonalPalette.fromHueAndChroma(hue, 8);
-    }
-    this.error = TonalPalette.fromHueAndChroma(25, 84);
-  }
-}
diff --git a/typescript/palettes/core_palettes.ts b/typescript/palettes/core_palettes.ts
deleted file mode 100644
index 752f98ea..00000000
--- a/typescript/palettes/core_palettes.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @license
- * Copyright 2024 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {TonalPalette} from './tonal_palette.js';
-
-/**
- * Comprises foundational palettes to build a color scheme. Generated from a
- * source color, these palettes will then be part of a [DynamicScheme] together
- * with appearance preferences.
- */
-export class CorePalettes {
-  constructor(
-      public primary: TonalPalette, public secondary: TonalPalette,
-      public tertiary: TonalPalette, public neutral: TonalPalette,
-      public neutralVariant: TonalPalette) {}
-}
diff --git a/typescript/palettes/palettes_test.ts b/typescript/palettes/palettes_test.ts
deleted file mode 100644
index bdc1c828..00000000
--- a/typescript/palettes/palettes_test.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import 'jasmine';
-
-import {Hct} from '../hct/hct.js';
-
-import {CorePalette} from './core_palette.js';
-import {TonalPalette} from './tonal_palette.js';
-
-describe('TonalPalette', () => {
-  it('ofBlue', () => {
-    const blue = TonalPalette.fromInt(0xff0000ff);
-
-    expect(blue.tone(100)).toBe(0xffffffff);
-    expect(blue.tone(95)).toBe(0xfff1efff);
-    expect(blue.tone(90)).toBe(0xffe0e0ff);
-    expect(blue.tone(80)).toBe(0xffbec2ff);
-    expect(blue.tone(70)).toBe(0xff9da3ff);
-    expect(blue.tone(60)).toBe(0xff7c84ff);
-    expect(blue.tone(50)).toBe(0xff5a64ff);
-    expect(blue.tone(40)).toBe(0xff343dff);
-    expect(blue.tone(30)).toBe(0xff0000ef);
-    expect(blue.tone(20)).toBe(0xff0001ac);
-    expect(blue.tone(10)).toBe(0xff00006e);
-    expect(blue.tone(0)).toBe(0xff000000);
-  });
-});
-
-describe('CorePalette', () => {
-  it('ofBlue', () => {
-    const core = CorePalette.of(0xff0000ff);
-
-    expect(core.a1.tone(100)).toBe(0xffffffff);
-    expect(core.a1.tone(95)).toBe(0xfff1efff);
-    expect(core.a1.tone(90)).toBe(0xffe0e0ff);
-    expect(core.a1.tone(80)).toBe(0xffbec2ff);
-    expect(core.a1.tone(70)).toBe(0xff9da3ff);
-    expect(core.a1.tone(60)).toBe(0xff7c84ff);
-    expect(core.a1.tone(50)).toBe(0xff5a64ff);
-    expect(core.a1.tone(40)).toBe(0xff343dff);
-    expect(core.a1.tone(30)).toBe(0xff0000ef);
-    expect(core.a1.tone(20)).toBe(0xff0001ac);
-    expect(core.a1.tone(10)).toBe(0xff00006e);
-    expect(core.a1.tone(0)).toBe(0xff000000);
-
-    expect(core.a2.tone(100)).toBe(0xffffffff);
-    expect(core.a2.tone(95)).toBe(0xfff1efff);
-    expect(core.a2.tone(90)).toBe(0xffe1e0f9);
-    expect(core.a2.tone(80)).toBe(0xffc5c4dd);
-    expect(core.a2.tone(70)).toBe(0xffa9a9c1);
-    expect(core.a2.tone(60)).toBe(0xff8f8fa6);
-    expect(core.a2.tone(50)).toBe(0xff75758b);
-    expect(core.a2.tone(40)).toBe(0xff5c5d72);
-    expect(core.a2.tone(30)).toBe(0xff444559);
-    expect(core.a2.tone(20)).toBe(0xff2e2f42);
-    expect(core.a2.tone(10)).toBe(0xff191a2c);
-    expect(core.a2.tone(0)).toBe(0xff000000);
-  });
-
-  it('contentOfBlue', () => {
-    const core = CorePalette.contentOf(0xff0000ff);
-
-    expect(core.a1.tone(100)).toBe(0xffffffff);
-    expect(core.a1.tone(95)).toBe(0xfff1efff);
-    expect(core.a1.tone(90)).toBe(0xffe0e0ff);
-    expect(core.a1.tone(80)).toBe(0xffbec2ff);
-    expect(core.a1.tone(70)).toBe(0xff9da3ff);
-    expect(core.a1.tone(60)).toBe(0xff7c84ff);
-    expect(core.a1.tone(50)).toBe(0xff5a64ff);
-    expect(core.a1.tone(40)).toBe(0xff343dff);
-    expect(core.a1.tone(30)).toBe(0xff0000ef);
-    expect(core.a1.tone(20)).toBe(0xff0001ac);
-    expect(core.a1.tone(10)).toBe(0xff00006e);
-    expect(core.a1.tone(0)).toBe(0xff000000);
-
-    expect(core.a2.tone(100)).toBe(0xffffffff);
-    expect(core.a2.tone(95)).toBe(0xfff1efff);
-    expect(core.a2.tone(90)).toBe(0xffe0e0ff);
-    expect(core.a2.tone(80)).toBe(0xffc1c3f4);
-    expect(core.a2.tone(70)).toBe(0xffa5a7d7);
-    expect(core.a2.tone(60)).toBe(0xff8b8dbb);
-    expect(core.a2.tone(50)).toBe(0xff7173a0);
-    expect(core.a2.tone(40)).toBe(0xff585b86);
-    expect(core.a2.tone(30)).toBe(0xff40436d);
-    expect(core.a2.tone(20)).toBe(0xff2a2d55);
-    expect(core.a2.tone(10)).toBe(0xff14173f);
-    expect(core.a2.tone(0)).toBe(0xff000000);
-  });
-});
-
-describe('KeyColor', () => {
-  it('Key color with exact chroma', () => {
-    // Requested chroma is exactly achievable at a certain tone.
-    const palette = TonalPalette.fromHueAndChroma(50.0, 60.0);
-    const result = palette.keyColor;
-
-    const hueDifference = Math.abs(result.hue - 50.0);
-    expect(hueDifference).toBeLessThan(10.0);
-    const chromaDifference = Math.abs(result.chroma - 60.0);
-    expect(chromaDifference).toBeLessThan(0.5);
-    // Tone might vary, but should be within the range from 0 to 100.
-    expect(result.tone).toBeGreaterThan(0);
-    expect(result.tone).toBeLessThan(100);
-  });
-
-  it('key color with unusually high chroma', () => {
-    // Requested chroma is above what is achievable. For Hue 149, chroma peak
-    // is 89.6 at Tone 87.9. The result key color's chroma should be close to
-    // the chroma peak.
-    const palette = TonalPalette.fromHueAndChroma(149.0, 200.0);
-    const result = palette.keyColor;
-
-    const hueDifference = Math.abs(result.hue - 149.0);
-    expect(hueDifference).toBeLessThan(10.0);
-    expect(result.chroma).toBeGreaterThan(89.0);
-    // Tone might vary, but should be within the range from 0 to 100.
-    expect(result.tone).toBeGreaterThan(0);
-    expect(result.tone).toBeLessThan(100);
-  });
-
-  it('key color with unusually low chroma', () => {
-    // By definition, the key color should be the first tone, starting from
-    // Tone 50, matching the given hue and chroma. When requesting a very low
-    // chroma, the result should be close to Tone 50, since most tones can
-    // produce a low chroma.
-    const palette = TonalPalette.fromHueAndChroma(50.0, 3.0);
-    const result = palette.keyColor;
-
-    const hueDifference = Math.abs(result.hue - 50.0);
-    expect(hueDifference).toBeLessThan(10.0);
-    const chromaDifference = Math.abs(result.chroma - 3.0);
-    expect(chromaDifference).toBeLessThan(0.5);
-    const toneDifference = Math.abs(result.tone - 50.0);
-    expect(toneDifference).toBeLessThan(0.5);
-  });
-})
\ No newline at end of file
diff --git a/typescript/palettes/tonal_palette.ts b/typescript/palettes/tonal_palette.ts
deleted file mode 100644
index cc2f8f6c..00000000
--- a/typescript/palettes/tonal_palette.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {Hct} from '../hct/hct.js';
-
-/**
- *  A convenience class for retrieving colors that are constant in hue and
- *  chroma, but vary in tone.
- */
-export class TonalPalette {
-  private readonly cache = new Map();
-
-  /**
-   * @param argb ARGB representation of a color
-   * @return Tones matching that color's hue and chroma.
-   */
-  static fromInt(argb: number): TonalPalette {
-    const hct = Hct.fromInt(argb);
-    return TonalPalette.fromHct(hct);
-  }
-
-  /**
-   * @param hct Hct
-   * @return Tones matching that color's hue and chroma.
-   */
-  static fromHct(hct: Hct) {
-    return new TonalPalette(hct.hue, hct.chroma, hct);
-  }
-
-  /**
-   * @param hue HCT hue
-   * @param chroma HCT chroma
-   * @return Tones matching hue and chroma.
-   */
-  static fromHueAndChroma(hue: number, chroma: number): TonalPalette {
-    const keyColor = new KeyColor(hue, chroma).create();
-    return new TonalPalette(hue, chroma, keyColor);
-  }
-
-  private constructor(
-      readonly hue: number, readonly chroma: number, readonly keyColor: Hct) {}
-
-  /**
-   * @param tone HCT tone, measured from 0 to 100.
-   * @return ARGB representation of a color with that tone.
-   */
-  tone(tone: number): number {
-    let argb = this.cache.get(tone);
-    if (argb === undefined) {
-      if (tone == 99 && Hct.isYellow(this.hue)) {
-        argb = this.averageArgb(this.tone(98), this.tone(100));
-      } else {
-        argb = Hct.from(this.hue, this.chroma, tone).toInt();
-      }
-      this.cache.set(tone, argb);
-    }
-    return argb;
-  }
-
-  /**
-   * @param tone HCT tone.
-   * @return HCT representation of a color with that tone.
-   */
-  getHct(tone: number): Hct {
-    return Hct.fromInt(this.tone(tone));
-  }
-
-  private averageArgb(argb1: number, argb2: number): number {
-    const red1 = (argb1 >>> 16) & 0xff;
-    const green1 = (argb1 >>> 8) & 0xff;
-    const blue1 = argb1 & 0xff;
-    const red2 = (argb2 >>> 16) & 0xff;
-    const green2 = (argb2 >>> 8) & 0xff;
-    const blue2 = argb2 & 0xff;
-    const red = Math.round((red1 + red2) / 2);
-    const green = Math.round((green1 + green2) / 2);
-    const blue = Math.round((blue1 + blue2) / 2);
-    return (255 << 24 | (red & 255) << 16 | (green & 255) << 8 |
-            (blue & 255)) >>>
-        0;
-  }
-}
-
-/**
- * Key color is a color that represents the hue and chroma of a tonal palette
- */
-class KeyColor {
-  // Cache that maps tone to max chroma to avoid duplicated HCT calculation.
-  private readonly chromaCache = new Map();
-  private readonly maxChromaValue = 200.0;
-
-  constructor(readonly hue: number, readonly requestedChroma: number) {}
-
-  /**
-   * Creates a key color from a [hue] and a [chroma].
-   * The key color is the first tone, starting from T50, matching the given hue
-   * and chroma.
-   *
-   * @return Key color [Hct]
-   */
-  create(): Hct {
-    // Pivot around T50 because T50 has the most chroma available, on
-    // average. Thus it is most likely to have a direct answer.
-    const pivotTone = 50;
-    const toneStepSize = 1;
-    // Epsilon to accept values slightly higher than the requested chroma.
-    const epsilon = 0.01;
-
-    // Binary search to find the tone that can provide a chroma that is closest
-    // to the requested chroma.
-    let lowerTone = 0;
-    let upperTone = 100;
-    while (lowerTone < upperTone) {
-      const midTone = Math.floor((lowerTone + upperTone) / 2);
-      const isAscending =
-          this.maxChroma(midTone) < this.maxChroma(midTone + toneStepSize);
-      const sufficientChroma =
-          this.maxChroma(midTone) >= this.requestedChroma - epsilon;
-
-      if (sufficientChroma) {
-        // Either range [lowerTone, midTone] or [midTone, upperTone] has
-        // the answer, so search in the range that is closer the pivot tone.
-        if (Math.abs(lowerTone - pivotTone) < Math.abs(upperTone - pivotTone)) {
-          upperTone = midTone;
-        } else {
-          if (lowerTone === midTone) {
-            return Hct.from(this.hue, this.requestedChroma, lowerTone);
-          }
-          lowerTone = midTone;
-        }
-      } else {
-        // As there is no sufficient chroma in the midTone, follow the direction
-        // to the chroma peak.
-        if (isAscending) {
-          lowerTone = midTone + toneStepSize;
-        } else {
-          // Keep midTone for potential chroma peak.
-          upperTone = midTone;
-        }
-      }
-    }
-
-    return Hct.from(this.hue, this.requestedChroma, lowerTone);
-  }
-
-  // Find the maximum chroma for a given tone
-  private maxChroma(tone: number): number {
-    if (this.chromaCache.has(tone)) {
-      return this.chromaCache.get(tone)!;
-    }
-    const chroma = Hct.from(this.hue, this.maxChromaValue, tone).chroma;
-    this.chromaCache.set(tone, chroma);
-    return chroma;
-  }
-}
diff --git a/typescript/quantize/lab_point_provider.ts b/typescript/quantize/lab_point_provider.ts
deleted file mode 100644
index 7d0e7437..00000000
--- a/typescript/quantize/lab_point_provider.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import * as utils from '../utils/color_utils.js';
-
-import {PointProvider} from './point_provider.js';
-
-/**
- * Provides conversions needed for K-Means quantization. Converting input to
- * points, and converting the final state of the K-Means algorithm to colors.
- */
-export class LabPointProvider implements PointProvider {
-  /**
-   * Convert a color represented in ARGB to a 3-element array of L*a*b*
-   * coordinates of the color.
-   */
-  fromInt(argb: number): number[] {
-    return utils.labFromArgb(argb);
-  }
-
-  /**
-   * Convert a 3-element array to a color represented in ARGB.
-   */
-  toInt(point: number[]): number {
-    return utils.argbFromLab(point[0], point[1], point[2]);
-  }
-
-  /**
-   * Standard CIE 1976 delta E formula also takes the square root, unneeded
-   * here. This method is used by quantization algorithms to compare distance,
-   * and the relative ordering is the same, with or without a square root.
-   *
-   * This relatively minor optimization is helpful because this method is
-   * called at least once for each pixel in an image.
-   */
-  distance(from: number[], to: number[]): number {
-    const dL = from[0] - to[0];
-    const dA = from[1] - to[1];
-    const dB = from[2] - to[2];
-    return dL * dL + dA * dA + dB * dB;
-  }
-}
diff --git a/typescript/quantize/point_provider.ts b/typescript/quantize/point_provider.ts
deleted file mode 100644
index ab1a8e43..00000000
--- a/typescript/quantize/point_provider.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * An interface to allow use of different color spaces by
- * quantizers.
- */
-
-export declare interface PointProvider {
-  toInt(point: number[]): number;
-  fromInt(argb: number): number[];
-  distance(from: number[], to: number[]): number;
-}
diff --git a/typescript/quantize/quantizer_celebi.ts b/typescript/quantize/quantizer_celebi.ts
deleted file mode 100644
index a249baea..00000000
--- a/typescript/quantize/quantizer_celebi.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {QuantizerWsmeans} from './quantizer_wsmeans.js';
-import {QuantizerWu} from './quantizer_wu.js';
-
-/**
- * An image quantizer that improves on the quality of a standard K-Means
- * algorithm by setting the K-Means initial state to the output of a Wu
- * quantizer, instead of random centroids. Improves on speed by several
- * optimizations, as implemented in Wsmeans, or Weighted Square Means, K-Means
- * with those optimizations.
- *
- * This algorithm was designed by M. Emre Celebi, and was found in their 2011
- * paper, Improving the Performance of K-Means for Color Quantization.
- * https://arxiv.org/abs/1101.0395
- */
-// material_color_utilities is designed to have a consistent API across
-// platforms and modular components that can be moved around easily. Using a
-// class as a namespace facilitates this.
-//
-// tslint:disable-next-line:class-as-namespace
-export class QuantizerCelebi {
-  /**
-   * @param pixels Colors in ARGB format.
-   * @param maxColors The number of colors to divide the image into. A lower
-   *     number of colors may be returned.
-   * @return Map with keys of colors in ARGB format, and values of number of
-   *     pixels in the original image that correspond to the color in the
-   *     quantized image.
-   */
-  static quantize(pixels: number[], maxColors: number): Map {
-    const wu = new QuantizerWu();
-    const wuResult = wu.quantize(pixels, maxColors);
-    return QuantizerWsmeans.quantize(pixels, wuResult, maxColors);
-  }
-}
diff --git a/typescript/quantize/quantizer_celebi_test.ts b/typescript/quantize/quantizer_celebi_test.ts
deleted file mode 100644
index 13e5e7f6..00000000
--- a/typescript/quantize/quantizer_celebi_test.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import 'jasmine';
-
-import {QuantizerCelebi} from './quantizer_celebi.js';
-
-const RED = 0xffff0000;
-const GREEN = 0xff00ff00;
-const BLUE = 0xff0000ff;
-
-describe('QuantizerCelebi', () => {
-  it('1R', () => {
-    const answer = QuantizerCelebi.quantize([RED], 128);
-    expect(answer.size).toBe(1);
-    expect(answer.get(RED)).toBe(1);
-  });
-
-  it('1G', () => {
-    const answer = QuantizerCelebi.quantize([GREEN], 128);
-    expect(answer.size).toBe(1);
-    expect(answer.get(GREEN)).toBe(1);
-  });
-
-  it('1B', () => {
-    const answer = QuantizerCelebi.quantize([BLUE], 128);
-    expect(answer.size).toBe(1);
-    expect(answer.get(BLUE)).toBe(1);
-  });
-
-  it('5B', () => {
-    const answer =
-        QuantizerCelebi.quantize([BLUE, BLUE, BLUE, BLUE, BLUE], 128);
-    expect(answer.size).toBe(1);
-    expect(answer.get(BLUE)).toBe(5);
-  });
-
-  it('2R 3G', () => {
-    const answer =
-        QuantizerCelebi.quantize([RED, RED, GREEN, GREEN, GREEN], 128);
-    expect(answer.size).toBe(2);
-    expect(answer.get(RED)).toBe(2);
-    expect(answer.get(GREEN)).toBe(3);
-  });
-
-  it('1R 1G 1B', () => {
-    const answer = QuantizerCelebi.quantize([RED, GREEN, BLUE], 128);
-    expect(answer.size).toBe(3);
-    expect(answer.get(RED)).toBe(1);
-    expect(answer.get(GREEN)).toBe(1);
-    expect(answer.get(BLUE)).toBe(1);
-  });
-});
diff --git a/typescript/quantize/quantizer_map.ts b/typescript/quantize/quantizer_map.ts
deleted file mode 100644
index b00b17f4..00000000
--- a/typescript/quantize/quantizer_map.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import * as utils from '../utils/color_utils.js';
-
-/**
- * Quantizes an image into a map, with keys of ARGB colors, and values of the
- * number of times that color appears in the image.
- */
-// material_color_utilities is designed to have a consistent API across
-// platforms and modular components that can be moved around easily. Using a
-// class as a namespace facilitates this.
-//
-// tslint:disable-next-line:class-as-namespace
-export class QuantizerMap {
-  /**
-   * @param pixels Colors in ARGB format.
-   * @return A Map with keys of ARGB colors, and values of the number of times
-   *     the color appears in the image.
-   */
-  static quantize(pixels: number[]): Map {
-    const countByColor = new Map();
-    for (let i = 0; i < pixels.length; i++) {
-      const pixel = pixels[i];
-      const alpha = utils.alphaFromArgb(pixel);
-      if (alpha < 255) {
-        continue;
-      }
-      countByColor.set(pixel, (countByColor.get(pixel) ?? 0) + 1);
-    }
-    return countByColor;
-  }
-}
diff --git a/typescript/quantize/quantizer_wsmeans.ts b/typescript/quantize/quantizer_wsmeans.ts
deleted file mode 100644
index b910f6f8..00000000
--- a/typescript/quantize/quantizer_wsmeans.ts
+++ /dev/null
@@ -1,230 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {LabPointProvider} from './lab_point_provider.js';
-
-const MAX_ITERATIONS = 10;
-const MIN_MOVEMENT_DISTANCE = 3.0;
-
-/**
- * An image quantizer that improves on the speed of a standard K-Means algorithm
- * by implementing several optimizations, including deduping identical pixels
- * and a triangle inequality rule that reduces the number of comparisons needed
- * to identify which cluster a point should be moved to.
- *
- * Wsmeans stands for Weighted Square Means.
- *
- * This algorithm was designed by M. Emre Celebi, and was found in their 2011
- * paper, Improving the Performance of K-Means for Color Quantization.
- * https://arxiv.org/abs/1101.0395
- */
-// material_color_utilities is designed to have a consistent API across
-// platforms and modular components that can be moved around easily. Using a
-// class as a namespace facilitates this.
-//
-// tslint:disable-next-line:class-as-namespace
-export class QuantizerWsmeans {
-  /**
-   * @param inputPixels Colors in ARGB format.
-   * @param startingClusters Defines the initial state of the quantizer. Passing
-   *     an empty array is fine, the implementation will create its own initial
-   *     state that leads to reproducible results for the same inputs.
-   *     Passing an array that is the result of Wu quantization leads to higher
-   *     quality results.
-   * @param maxColors The number of colors to divide the image into. A lower
-   *     number of colors may be returned.
-   * @return Colors in ARGB format.
-   */
-  static quantize(
-      inputPixels: number[], startingClusters: number[],
-      maxColors: number): Map {
-    const pixelToCount = new Map();
-    const points = new Array();
-    const pixels = new Array();
-    const pointProvider = new LabPointProvider();
-    let pointCount = 0;
-    for (let i = 0; i < inputPixels.length; i++) {
-      const inputPixel = inputPixels[i];
-      const pixelCount = pixelToCount.get(inputPixel);
-      if (pixelCount === undefined) {
-        pointCount++;
-        points.push(pointProvider.fromInt(inputPixel));
-        pixels.push(inputPixel);
-        pixelToCount.set(inputPixel, 1);
-      } else {
-        pixelToCount.set(inputPixel, pixelCount + 1);
-      }
-    }
-
-    const counts = new Array();
-    for (let i = 0; i < pointCount; i++) {
-      const pixel = pixels[i];
-      const count = pixelToCount.get(pixel);
-      if (count !== undefined) {
-        counts[i] = count;
-      }
-    }
-
-    let clusterCount = Math.min(maxColors, pointCount);
-    if (startingClusters.length > 0) {
-      clusterCount = Math.min(clusterCount, startingClusters.length);
-    }
-
-    const clusters = new Array();
-    for (let i = 0; i < startingClusters.length; i++) {
-      clusters.push(pointProvider.fromInt(startingClusters[i]));
-    }
-    const additionalClustersNeeded = clusterCount - clusters.length;
-    if (startingClusters.length === 0 && additionalClustersNeeded > 0) {
-      for (let i = 0; i < additionalClustersNeeded; i++) {
-        const l = Math.random() * 100.0;
-        const a = Math.random() * (100.0 - (-100.0) + 1) + -100;
-        const b = Math.random() * (100.0 - (-100.0) + 1) + -100;
-
-        clusters.push(new Array(l, a, b));
-      }
-    }
-
-    const clusterIndices = new Array();
-    for (let i = 0; i < pointCount; i++) {
-      clusterIndices.push(Math.floor(Math.random() * clusterCount));
-    }
-
-    const indexMatrix = new Array();
-    for (let i = 0; i < clusterCount; i++) {
-      indexMatrix.push(new Array());
-      for (let j = 0; j < clusterCount; j++) {
-        indexMatrix[i].push(0);
-      }
-    }
-
-    const distanceToIndexMatrix = new Array();
-    for (let i = 0; i < clusterCount; i++) {
-      distanceToIndexMatrix.push(new Array());
-      for (let j = 0; j < clusterCount; j++) {
-        distanceToIndexMatrix[i].push(new DistanceAndIndex());
-      }
-    }
-
-
-    const pixelCountSums = new Array();
-    for (let i = 0; i < clusterCount; i++) {
-      pixelCountSums.push(0);
-    }
-    for (let iteration = 0; iteration < MAX_ITERATIONS; iteration++) {
-      for (let i = 0; i < clusterCount; i++) {
-        for (let j = i + 1; j < clusterCount; j++) {
-          const distance = pointProvider.distance(clusters[i], clusters[j]);
-          distanceToIndexMatrix[j][i].distance = distance;
-          distanceToIndexMatrix[j][i].index = i;
-          distanceToIndexMatrix[i][j].distance = distance;
-          distanceToIndexMatrix[i][j].index = j;
-        }
-        distanceToIndexMatrix[i].sort();
-        for (let j = 0; j < clusterCount; j++) {
-          indexMatrix[i][j] = distanceToIndexMatrix[i][j].index;
-        }
-      }
-
-      let pointsMoved = 0;
-      for (let i = 0; i < pointCount; i++) {
-        const point = points[i];
-        const previousClusterIndex = clusterIndices[i];
-        const previousCluster = clusters[previousClusterIndex];
-        const previousDistance = pointProvider.distance(point, previousCluster);
-        let minimumDistance = previousDistance;
-        let newClusterIndex = -1;
-        for (let j = 0; j < clusterCount; j++) {
-          if (distanceToIndexMatrix[previousClusterIndex][j].distance >=
-              4 * previousDistance) {
-            continue;
-          }
-          const distance = pointProvider.distance(point, clusters[j]);
-          if (distance < minimumDistance) {
-            minimumDistance = distance;
-            newClusterIndex = j;
-          }
-        }
-        if (newClusterIndex !== -1) {
-          const distanceChange = Math.abs(
-              (Math.sqrt(minimumDistance) - Math.sqrt(previousDistance)));
-          if (distanceChange > MIN_MOVEMENT_DISTANCE) {
-            pointsMoved++;
-            clusterIndices[i] = newClusterIndex;
-          }
-        }
-      }
-
-      if (pointsMoved === 0 && iteration !== 0) {
-        break;
-      }
-
-      const componentASums = new Array(clusterCount).fill(0);
-      const componentBSums = new Array(clusterCount).fill(0);
-      const componentCSums = new Array(clusterCount).fill(0);
-
-      for (let i = 0; i < clusterCount; i++) {
-        pixelCountSums[i] = 0;
-      }
-      for (let i = 0; i < pointCount; i++) {
-        const clusterIndex = clusterIndices[i];
-        const point = points[i];
-        const count = counts[i];
-        pixelCountSums[clusterIndex] += count;
-        componentASums[clusterIndex] += (point[0] * count);
-        componentBSums[clusterIndex] += (point[1] * count);
-        componentCSums[clusterIndex] += (point[2] * count);
-      }
-
-      for (let i = 0; i < clusterCount; i++) {
-        const count = pixelCountSums[i];
-        if (count === 0) {
-          clusters[i] = [0.0, 0.0, 0.0];
-          continue;
-        }
-        const a = componentASums[i] / count;
-        const b = componentBSums[i] / count;
-        const c = componentCSums[i] / count;
-        clusters[i] = [a, b, c];
-      }
-    }
-
-    const argbToPopulation = new Map();
-    for (let i = 0; i < clusterCount; i++) {
-      const count = pixelCountSums[i];
-      if (count === 0) {
-        continue;
-      }
-
-      const possibleNewCluster = pointProvider.toInt(clusters[i]);
-      if (argbToPopulation.has(possibleNewCluster)) {
-        continue;
-      }
-
-      argbToPopulation.set(possibleNewCluster, count);
-    }
-    return argbToPopulation;
-  }
-}
-
-/**
- *  A wrapper for maintaining a table of distances between K-Means clusters.
- */
-class DistanceAndIndex {
-  distance: number = -1;
-  index: number = -1;
-}
diff --git a/typescript/quantize/quantizer_wu.ts b/typescript/quantize/quantizer_wu.ts
deleted file mode 100644
index 4a1451c7..00000000
--- a/typescript/quantize/quantizer_wu.ts
+++ /dev/null
@@ -1,411 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import * as utils from '../utils/color_utils.js';
-
-import {QuantizerMap} from './quantizer_map.js';
-
-const INDEX_BITS = 5;
-const SIDE_LENGTH = 33;    // ((1 << INDEX_INDEX_BITS) + 1)
-const TOTAL_SIZE = 35937;  // SIDE_LENGTH * SIDE_LENGTH * SIDE_LENGTH
-
-const directions = {
-  RED: 'red',
-  GREEN: 'green',
-  BLUE: 'blue',
-};
-
-/**
- * An image quantizer that divides the image's pixels into clusters by
- * recursively cutting an RGB cube, based on the weight of pixels in each area
- * of the cube.
- *
- * The algorithm was described by Xiaolin Wu in Graphic Gems II, published in
- * 1991.
- */
-export class QuantizerWu {
-  constructor(
-      private weights: number[] = [], private momentsR: number[] = [],
-      private momentsG: number[] = [], private momentsB: number[] = [],
-      private moments: number[] = [], private cubes: Box[] = []) {}
-
-  /**
-   * @param pixels Colors in ARGB format.
-   * @param maxColors The number of colors to divide the image into. A lower
-   *     number of colors may be returned.
-   * @return Colors in ARGB format.
-   */
-  quantize(pixels: number[], maxColors: number): number[] {
-    this.constructHistogram(pixels);
-    this.computeMoments();
-    const createBoxesResult = this.createBoxes(maxColors);
-    const results = this.createResult(createBoxesResult.resultCount);
-    return results;
-  }
-
-  private constructHistogram(pixels: number[]) {
-    this.weights = Array.from({length: TOTAL_SIZE}).fill(0);
-    this.momentsR = Array.from({length: TOTAL_SIZE}).fill(0);
-    this.momentsG = Array.from({length: TOTAL_SIZE}).fill(0);
-    this.momentsB = Array.from({length: TOTAL_SIZE}).fill(0);
-    this.moments = Array.from({length: TOTAL_SIZE}).fill(0);
-
-    const countByColor = QuantizerMap.quantize(pixels);
-
-    for (const [pixel, count] of countByColor.entries()) {
-      const red = utils.redFromArgb(pixel);
-      const green = utils.greenFromArgb(pixel);
-      const blue = utils.blueFromArgb(pixel);
-
-      const bitsToRemove = 8 - INDEX_BITS;
-      const iR = (red >> bitsToRemove) + 1;
-      const iG = (green >> bitsToRemove) + 1;
-      const iB = (blue >> bitsToRemove) + 1;
-      const index = this.getIndex(iR, iG, iB);
-
-      this.weights[index] = (this.weights[index] ?? 0) + count;
-      this.momentsR[index] += count * red;
-      this.momentsG[index] += count * green;
-      this.momentsB[index] += count * blue;
-      this.moments[index] += count * (red * red + green * green + blue * blue);
-    }
-  }
-
-  private computeMoments() {
-    for (let r = 1; r < SIDE_LENGTH; r++) {
-      const area = Array.from({length: SIDE_LENGTH}).fill(0);
-      const areaR = Array.from({length: SIDE_LENGTH}).fill(0);
-      const areaG = Array.from({length: SIDE_LENGTH}).fill(0);
-      const areaB = Array.from({length: SIDE_LENGTH}).fill(0);
-      const area2 = Array.from({length: SIDE_LENGTH}).fill(0.0);
-      for (let g = 1; g < SIDE_LENGTH; g++) {
-        let line = 0;
-        let lineR = 0;
-        let lineG = 0;
-        let lineB = 0;
-        let line2 = 0.0;
-        for (let b = 1; b < SIDE_LENGTH; b++) {
-          const index = this.getIndex(r, g, b);
-          line += this.weights[index];
-          lineR += this.momentsR[index];
-          lineG += this.momentsG[index];
-          lineB += this.momentsB[index];
-          line2 += this.moments[index];
-
-          area[b] += line;
-          areaR[b] += lineR;
-          areaG[b] += lineG;
-          areaB[b] += lineB;
-          area2[b] += line2;
-
-          const previousIndex = this.getIndex(r - 1, g, b);
-          this.weights[index] = this.weights[previousIndex] + area[b];
-          this.momentsR[index] = this.momentsR[previousIndex] + areaR[b];
-          this.momentsG[index] = this.momentsG[previousIndex] + areaG[b];
-          this.momentsB[index] = this.momentsB[previousIndex] + areaB[b];
-          this.moments[index] = this.moments[previousIndex] + area2[b];
-        }
-      }
-    }
-  }
-
-  private createBoxes(maxColors: number): CreateBoxesResult {
-    this.cubes =
-        Array.from({length: maxColors}).fill(0).map(() => new Box());
-    const volumeVariance = Array.from({length: maxColors}).fill(0.0);
-    this.cubes[0].r0 = 0;
-    this.cubes[0].g0 = 0;
-    this.cubes[0].b0 = 0;
-
-    this.cubes[0].r1 = SIDE_LENGTH - 1;
-    this.cubes[0].g1 = SIDE_LENGTH - 1;
-    this.cubes[0].b1 = SIDE_LENGTH - 1;
-
-    let generatedColorCount = maxColors;
-    let next = 0;
-    for (let i = 1; i < maxColors; i++) {
-      if (this.cut(this.cubes[next], this.cubes[i])) {
-        volumeVariance[next] =
-            this.cubes[next].vol > 1 ? this.variance(this.cubes[next]) : 0.0;
-        volumeVariance[i] =
-            this.cubes[i].vol > 1 ? this.variance(this.cubes[i]) : 0.0;
-      } else {
-        volumeVariance[next] = 0.0;
-        i--;
-      }
-
-      next = 0;
-      let temp = volumeVariance[0];
-      for (let j = 1; j <= i; j++) {
-        if (volumeVariance[j] > temp) {
-          temp = volumeVariance[j];
-          next = j;
-        }
-      }
-      if (temp <= 0.0) {
-        generatedColorCount = i + 1;
-        break;
-      }
-    }
-    return new CreateBoxesResult(maxColors, generatedColorCount);
-  }
-
-  private createResult(colorCount: number): number[] {
-    const colors: number[] = [];
-    for (let i = 0; i < colorCount; ++i) {
-      const cube = this.cubes[i];
-      const weight = this.volume(cube, this.weights);
-      if (weight > 0) {
-        const r = Math.round(this.volume(cube, this.momentsR) / weight);
-        const g = Math.round(this.volume(cube, this.momentsG) / weight);
-        const b = Math.round(this.volume(cube, this.momentsB) / weight);
-        const color = (255 << 24) | ((r & 0x0ff) << 16) | ((g & 0x0ff) << 8) |
-            (b & 0x0ff);
-        colors.push(color);
-      }
-    }
-    return colors;
-  }
-
-  private variance(cube: Box) {
-    const dr = this.volume(cube, this.momentsR);
-    const dg = this.volume(cube, this.momentsG);
-    const db = this.volume(cube, this.momentsB);
-    const xx = this.moments[this.getIndex(cube.r1, cube.g1, cube.b1)] -
-        this.moments[this.getIndex(cube.r1, cube.g1, cube.b0)] -
-        this.moments[this.getIndex(cube.r1, cube.g0, cube.b1)] +
-        this.moments[this.getIndex(cube.r1, cube.g0, cube.b0)] -
-        this.moments[this.getIndex(cube.r0, cube.g1, cube.b1)] +
-        this.moments[this.getIndex(cube.r0, cube.g1, cube.b0)] +
-        this.moments[this.getIndex(cube.r0, cube.g0, cube.b1)] -
-        this.moments[this.getIndex(cube.r0, cube.g0, cube.b0)];
-    const hypotenuse = dr * dr + dg * dg + db * db;
-    const volume = this.volume(cube, this.weights);
-    return xx - hypotenuse / volume;
-  }
-
-  private cut(one: Box, two: Box) {
-    const wholeR = this.volume(one, this.momentsR);
-    const wholeG = this.volume(one, this.momentsG);
-    const wholeB = this.volume(one, this.momentsB);
-    const wholeW = this.volume(one, this.weights);
-
-    const maxRResult = this.maximize(
-        one, directions.RED, one.r0 + 1, one.r1, wholeR, wholeG, wholeB,
-        wholeW);
-    const maxGResult = this.maximize(
-        one, directions.GREEN, one.g0 + 1, one.g1, wholeR, wholeG, wholeB,
-        wholeW);
-    const maxBResult = this.maximize(
-        one, directions.BLUE, one.b0 + 1, one.b1, wholeR, wholeG, wholeB,
-        wholeW);
-
-    let direction;
-    const maxR = maxRResult.maximum;
-    const maxG = maxGResult.maximum;
-    const maxB = maxBResult.maximum;
-    if (maxR >= maxG && maxR >= maxB) {
-      if (maxRResult.cutLocation < 0) {
-        return false;
-      }
-      direction = directions.RED;
-    } else if (maxG >= maxR && maxG >= maxB) {
-      direction = directions.GREEN;
-    } else {
-      direction = directions.BLUE;
-    }
-
-    two.r1 = one.r1;
-    two.g1 = one.g1;
-    two.b1 = one.b1;
-
-    switch (direction) {
-      case directions.RED:
-        one.r1 = maxRResult.cutLocation;
-        two.r0 = one.r1;
-        two.g0 = one.g0;
-        two.b0 = one.b0;
-        break;
-      case directions.GREEN:
-        one.g1 = maxGResult.cutLocation;
-        two.r0 = one.r0;
-        two.g0 = one.g1;
-        two.b0 = one.b0;
-        break;
-      case directions.BLUE:
-        one.b1 = maxBResult.cutLocation;
-        two.r0 = one.r0;
-        two.g0 = one.g0;
-        two.b0 = one.b1;
-        break;
-      default:
-        throw new Error('unexpected direction ' + direction);
-    }
-
-    one.vol = (one.r1 - one.r0) * (one.g1 - one.g0) * (one.b1 - one.b0);
-    two.vol = (two.r1 - two.r0) * (two.g1 - two.g0) * (two.b1 - two.b0);
-    return true;
-  }
-
-  private maximize(
-      cube: Box, direction: string, first: number, last: number, wholeR: number,
-      wholeG: number, wholeB: number, wholeW: number) {
-    const bottomR = this.bottom(cube, direction, this.momentsR);
-    const bottomG = this.bottom(cube, direction, this.momentsG);
-    const bottomB = this.bottom(cube, direction, this.momentsB);
-    const bottomW = this.bottom(cube, direction, this.weights);
-
-    let max = 0.0;
-    let cut = -1;
-
-    let halfR = 0;
-    let halfG = 0;
-    let halfB = 0;
-    let halfW = 0;
-    for (let i = first; i < last; i++) {
-      halfR = bottomR + this.top(cube, direction, i, this.momentsR);
-      halfG = bottomG + this.top(cube, direction, i, this.momentsG);
-      halfB = bottomB + this.top(cube, direction, i, this.momentsB);
-      halfW = bottomW + this.top(cube, direction, i, this.weights);
-      if (halfW === 0) {
-        continue;
-      }
-
-      let tempNumerator = (halfR * halfR + halfG * halfG + halfB * halfB) * 1.0;
-      let tempDenominator = halfW * 1.0;
-      let temp = tempNumerator / tempDenominator;
-
-      halfR = wholeR - halfR;
-      halfG = wholeG - halfG;
-      halfB = wholeB - halfB;
-      halfW = wholeW - halfW;
-      if (halfW === 0) {
-        continue;
-      }
-
-      tempNumerator = (halfR * halfR + halfG * halfG + halfB * halfB) * 1.0;
-      tempDenominator = halfW * 1.0;
-      temp += tempNumerator / tempDenominator;
-
-      if (temp > max) {
-        max = temp;
-        cut = i;
-      }
-    }
-    return new MaximizeResult(cut, max);
-  }
-
-  private volume(cube: Box, moment: number[]) {
-    return (
-        moment[this.getIndex(cube.r1, cube.g1, cube.b1)] -
-        moment[this.getIndex(cube.r1, cube.g1, cube.b0)] -
-        moment[this.getIndex(cube.r1, cube.g0, cube.b1)] +
-        moment[this.getIndex(cube.r1, cube.g0, cube.b0)] -
-        moment[this.getIndex(cube.r0, cube.g1, cube.b1)] +
-        moment[this.getIndex(cube.r0, cube.g1, cube.b0)] +
-        moment[this.getIndex(cube.r0, cube.g0, cube.b1)] -
-        moment[this.getIndex(cube.r0, cube.g0, cube.b0)]);
-  }
-
-  private bottom(cube: Box, direction: string, moment: number[]) {
-    switch (direction) {
-      case directions.RED:
-        return (
-            -moment[this.getIndex(cube.r0, cube.g1, cube.b1)] +
-            moment[this.getIndex(cube.r0, cube.g1, cube.b0)] +
-            moment[this.getIndex(cube.r0, cube.g0, cube.b1)] -
-            moment[this.getIndex(cube.r0, cube.g0, cube.b0)]);
-      case directions.GREEN:
-        return (
-            -moment[this.getIndex(cube.r1, cube.g0, cube.b1)] +
-            moment[this.getIndex(cube.r1, cube.g0, cube.b0)] +
-            moment[this.getIndex(cube.r0, cube.g0, cube.b1)] -
-            moment[this.getIndex(cube.r0, cube.g0, cube.b0)]);
-      case directions.BLUE:
-        return (
-            -moment[this.getIndex(cube.r1, cube.g1, cube.b0)] +
-            moment[this.getIndex(cube.r1, cube.g0, cube.b0)] +
-            moment[this.getIndex(cube.r0, cube.g1, cube.b0)] -
-            moment[this.getIndex(cube.r0, cube.g0, cube.b0)]);
-      default:
-        throw new Error('unexpected direction $direction');
-    }
-  }
-
-  private top(
-      cube: Box, direction: string, position: number, moment: number[]) {
-    switch (direction) {
-      case directions.RED:
-        return (
-            moment[this.getIndex(position, cube.g1, cube.b1)] -
-            moment[this.getIndex(position, cube.g1, cube.b0)] -
-            moment[this.getIndex(position, cube.g0, cube.b1)] +
-            moment[this.getIndex(position, cube.g0, cube.b0)]);
-      case directions.GREEN:
-        return (
-            moment[this.getIndex(cube.r1, position, cube.b1)] -
-            moment[this.getIndex(cube.r1, position, cube.b0)] -
-            moment[this.getIndex(cube.r0, position, cube.b1)] +
-            moment[this.getIndex(cube.r0, position, cube.b0)]);
-      case directions.BLUE:
-        return (
-            moment[this.getIndex(cube.r1, cube.g1, position)] -
-            moment[this.getIndex(cube.r1, cube.g0, position)] -
-            moment[this.getIndex(cube.r0, cube.g1, position)] +
-            moment[this.getIndex(cube.r0, cube.g0, position)]);
-      default:
-        throw new Error('unexpected direction $direction');
-    }
-  }
-
-  private getIndex(r: number, g: number, b: number): number {
-    return (r << (INDEX_BITS * 2)) + (r << (INDEX_BITS + 1)) + r +
-        (g << INDEX_BITS) + g + b;
-  }
-}
-
-/**
- * Keeps track of the state of each box created as the Wu  quantization
- * algorithm progresses through dividing the image's pixels as plotted in RGB.
- */
-class Box {
-  constructor(
-      public r0: number = 0, public r1: number = 0, public g0: number = 0,
-      public g1: number = 0, public b0: number = 0, public b1: number = 0,
-      public vol: number = 0) {}
-}
-
-/**
- * Represents final result of Wu algorithm.
- */
-class CreateBoxesResult {
-  /**
-   * @param requestedCount how many colors the caller asked to be returned from
-   *     quantization.
-   * @param resultCount the actual number of colors achieved from quantization.
-   *     May be lower than the requested count.
-   */
-  constructor(public requestedCount: number, public resultCount: number) {}
-}
-
-/**
- * Represents the result of calculating where to cut an existing box in such
- * a way to maximize variance between the two new boxes created by a cut.
- */
-class MaximizeResult {
-  constructor(public cutLocation: number, public maximum: number) {}
-}
diff --git a/typescript/scheme/dynamic_scheme_test.ts b/typescript/scheme/dynamic_scheme_test.ts
deleted file mode 100644
index 0f50e2b4..00000000
--- a/typescript/scheme/dynamic_scheme_test.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * @license
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import 'jasmine';
-
-import {DynamicScheme} from '../dynamiccolor/dynamic_scheme.js';
-import {Hct} from '../hct/hct.js';
-
-describe('dynamic scheme test', () => {
-  it('0 length input', () => {
-    const hue = DynamicScheme.getRotatedHue(Hct.from(43, 16, 16), [], []);
-    expect(hue).toBeCloseTo(43, 0.4);
-  });
-
-  it('1 length input no rotation', () => {
-    const hue = DynamicScheme.getRotatedHue(Hct.from(43, 16, 16), [0], [0]);
-    expect(hue).toBeCloseTo(43, 0.4);
-  });
-
-  it('input length mismatch asserts', () => {
-    const hue = DynamicScheme.getRotatedHue(Hct.from(43, 16, 16), [0], [0, 1]);
-    expect(hue).toBeCloseTo(43, 0.4);
-  });
-
-  it('on boundary rotation correct', () => {
-    const hue = DynamicScheme.getRotatedHue(
-        Hct.from(43, 16, 16),
-        [0, 42, 360],
-        [0, 15, 0],
-    );
-    expect(hue).toBeCloseTo(43 + 15, 0.4);
-  });
-
-  it('rotation result larger than 360 degrees wraps', () => {
-    const hue = DynamicScheme.getRotatedHue(
-      Hct.from(43, 16, 16),
-      [0, 42, 360],
-      [0, 480, 0],
-    );
-    expect(hue).toBeCloseTo(163, 0.4);
-  });
-});
diff --git a/typescript/scheme/scheme.ts b/typescript/scheme/scheme.ts
deleted file mode 100644
index 942848eb..00000000
--- a/typescript/scheme/scheme.ts
+++ /dev/null
@@ -1,290 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// This file is automatically generated. Do not modify it.
-
-import {CorePalette} from '../palettes/core_palette.js';
-
-/**
- * DEPRECATED. The `Scheme` class is deprecated in favor of `DynamicScheme`.
- * Please see
- * https://github.com/material-foundation/material-color-utilities/blob/main/make_schemes.md
- * for migration guidance.
- *
- * Represents a Material color scheme, a mapping of color roles to colors.
- */
-export class Scheme {
-  get primary(): number {
-    return this.props.primary;
-  }
-
-  get onPrimary(): number {
-    return this.props.onPrimary;
-  }
-
-  get primaryContainer(): number {
-    return this.props.primaryContainer;
-  }
-
-  get onPrimaryContainer(): number {
-    return this.props.onPrimaryContainer;
-  }
-
-  get secondary(): number {
-    return this.props.secondary;
-  }
-
-  get onSecondary(): number {
-    return this.props.onSecondary;
-  }
-
-  get secondaryContainer(): number {
-    return this.props.secondaryContainer;
-  }
-
-  get onSecondaryContainer(): number {
-    return this.props.onSecondaryContainer;
-  }
-
-  get tertiary(): number {
-    return this.props.tertiary;
-  }
-
-  get onTertiary(): number {
-    return this.props.onTertiary;
-  }
-
-  get tertiaryContainer(): number {
-    return this.props.tertiaryContainer;
-  }
-
-  get onTertiaryContainer(): number {
-    return this.props.onTertiaryContainer;
-  }
-
-  get error(): number {
-    return this.props.error;
-  }
-
-  get onError(): number {
-    return this.props.onError;
-  }
-
-  get errorContainer(): number {
-    return this.props.errorContainer;
-  }
-
-  get onErrorContainer(): number {
-    return this.props.onErrorContainer;
-  }
-
-  get background(): number {
-    return this.props.background;
-  }
-
-  get onBackground(): number {
-    return this.props.onBackground;
-  }
-
-  get surface(): number {
-    return this.props.surface;
-  }
-
-  get onSurface(): number {
-    return this.props.onSurface;
-  }
-
-  get surfaceVariant(): number {
-    return this.props.surfaceVariant;
-  }
-
-  get onSurfaceVariant(): number {
-    return this.props.onSurfaceVariant;
-  }
-
-  get outline(): number {
-    return this.props.outline;
-  }
-
-  get outlineVariant(): number {
-    return this.props.outlineVariant;
-  }
-
-  get shadow(): number {
-    return this.props.shadow;
-  }
-
-  get scrim(): number {
-    return this.props.scrim;
-  }
-
-  get inverseSurface(): number {
-    return this.props.inverseSurface;
-  }
-
-  get inverseOnSurface(): number {
-    return this.props.inverseOnSurface;
-  }
-
-  get inversePrimary(): number {
-    return this.props.inversePrimary;
-  }
-
-  /**
-   * @param argb ARGB representation of a color.
-   * @return Light Material color scheme, based on the color's hue.
-   */
-  static light(argb: number): Scheme {
-    return Scheme.lightFromCorePalette(CorePalette.of(argb));
-  }
-
-  /**
-   * @param argb ARGB representation of a color.
-   * @return Dark Material color scheme, based on the color's hue.
-   */
-  static dark(argb: number): Scheme {
-    return Scheme.darkFromCorePalette(CorePalette.of(argb));
-  }
-
-  /**
-   * @param argb ARGB representation of a color.
-   * @return Light Material content color scheme, based on the color's hue.
-   */
-  static lightContent(argb: number): Scheme {
-    return Scheme.lightFromCorePalette(CorePalette.contentOf(argb));
-  }
-
-  /**
-   * @param argb ARGB representation of a color.
-   * @return Dark Material content color scheme, based on the color's hue.
-   */
-  static darkContent(argb: number): Scheme {
-    return Scheme.darkFromCorePalette(CorePalette.contentOf(argb));
-  }
-
-  /**
-   * Light scheme from core palette
-   */
-  static lightFromCorePalette(core: CorePalette): Scheme {
-    return new Scheme({
-      primary: core.a1.tone(40),
-      onPrimary: core.a1.tone(100),
-      primaryContainer: core.a1.tone(90),
-      onPrimaryContainer: core.a1.tone(10),
-      secondary: core.a2.tone(40),
-      onSecondary: core.a2.tone(100),
-      secondaryContainer: core.a2.tone(90),
-      onSecondaryContainer: core.a2.tone(10),
-      tertiary: core.a3.tone(40),
-      onTertiary: core.a3.tone(100),
-      tertiaryContainer: core.a3.tone(90),
-      onTertiaryContainer: core.a3.tone(10),
-      error: core.error.tone(40),
-      onError: core.error.tone(100),
-      errorContainer: core.error.tone(90),
-      onErrorContainer: core.error.tone(10),
-      background: core.n1.tone(99),
-      onBackground: core.n1.tone(10),
-      surface: core.n1.tone(99),
-      onSurface: core.n1.tone(10),
-      surfaceVariant: core.n2.tone(90),
-      onSurfaceVariant: core.n2.tone(30),
-      outline: core.n2.tone(50),
-      outlineVariant: core.n2.tone(80),
-      shadow: core.n1.tone(0),
-      scrim: core.n1.tone(0),
-      inverseSurface: core.n1.tone(20),
-      inverseOnSurface: core.n1.tone(95),
-      inversePrimary: core.a1.tone(80)
-    });
-  }
-
-  /**
-   * Dark scheme from core palette
-   */
-  static darkFromCorePalette(core: CorePalette): Scheme {
-    return new Scheme({
-      primary: core.a1.tone(80),
-      onPrimary: core.a1.tone(20),
-      primaryContainer: core.a1.tone(30),
-      onPrimaryContainer: core.a1.tone(90),
-      secondary: core.a2.tone(80),
-      onSecondary: core.a2.tone(20),
-      secondaryContainer: core.a2.tone(30),
-      onSecondaryContainer: core.a2.tone(90),
-      tertiary: core.a3.tone(80),
-      onTertiary: core.a3.tone(20),
-      tertiaryContainer: core.a3.tone(30),
-      onTertiaryContainer: core.a3.tone(90),
-      error: core.error.tone(80),
-      onError: core.error.tone(20),
-      errorContainer: core.error.tone(30),
-      onErrorContainer: core.error.tone(80),
-      background: core.n1.tone(10),
-      onBackground: core.n1.tone(90),
-      surface: core.n1.tone(10),
-      onSurface: core.n1.tone(90),
-      surfaceVariant: core.n2.tone(30),
-      onSurfaceVariant: core.n2.tone(80),
-      outline: core.n2.tone(60),
-      outlineVariant: core.n2.tone(30),
-      shadow: core.n1.tone(0),
-      scrim: core.n1.tone(0),
-      inverseSurface: core.n1.tone(90),
-      inverseOnSurface: core.n1.tone(20),
-      inversePrimary: core.a1.tone(40)
-    });
-  }
-
-  private constructor(private readonly props: {
-    primary: number,
-    onPrimary: number,
-    primaryContainer: number,
-    onPrimaryContainer: number,
-    secondary: number,
-    onSecondary: number,
-    secondaryContainer: number,
-    onSecondaryContainer: number,
-    tertiary: number,
-    onTertiary: number,
-    tertiaryContainer: number,
-    onTertiaryContainer: number,
-    error: number,
-    onError: number,
-    errorContainer: number,
-    onErrorContainer: number,
-    background: number,
-    onBackground: number,
-    surface: number,
-    onSurface: number,
-    surfaceVariant: number,
-    onSurfaceVariant: number,
-    outline: number,
-    outlineVariant: number,
-    shadow: number,
-    scrim: number,
-    inverseSurface: number,
-    inverseOnSurface: number,
-    inversePrimary: number
-  }) {}
-
-  toJSON() {
-    return {
-      ...this.props
-    };
-  }
-}
diff --git a/typescript/scheme/scheme_android.ts b/typescript/scheme/scheme_android.ts
deleted file mode 100644
index c9e2767c..00000000
--- a/typescript/scheme/scheme_android.ts
+++ /dev/null
@@ -1,257 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {CorePalette} from '../palettes/core_palette.js';
-
-/**
- * Represents an Android 12 color scheme, a mapping of color roles to colors.
- */
-export class SchemeAndroid {
-  get colorAccentPrimary(): number {
-    return this.props.colorAccentPrimary;
-  }
-
-  get colorAccentPrimaryVariant(): number {
-    return this.props.colorAccentPrimaryVariant;
-  }
-
-  get colorAccentSecondary(): number {
-    return this.props.colorAccentSecondary;
-  }
-
-  get colorAccentSecondaryVariant(): number {
-    return this.props.colorAccentSecondaryVariant;
-  }
-
-  get colorAccentTertiary(): number {
-    return this.props.colorAccentTertiary;
-  }
-
-  get colorAccentTertiaryVariant(): number {
-    return this.props.colorAccentTertiaryVariant;
-  }
-
-  get textColorPrimary(): number {
-    return this.props.textColorPrimary;
-  }
-
-  get textColorSecondary(): number {
-    return this.props.textColorSecondary;
-  }
-
-  get textColorTertiary(): number {
-    return this.props.textColorTertiary;
-  }
-
-  get textColorPrimaryInverse(): number {
-    return this.props.textColorPrimaryInverse;
-  }
-
-  get textColorSecondaryInverse(): number {
-    return this.props.textColorSecondaryInverse;
-  }
-
-  get textColorTertiaryInverse(): number {
-    return this.props.textColorTertiaryInverse;
-  }
-
-  get colorBackground(): number {
-    return this.props.colorBackground;
-  }
-
-  get colorBackgroundFloating(): number {
-    return this.props.colorBackgroundFloating;
-  }
-
-  get colorSurface(): number {
-    return this.props.colorSurface;
-  }
-
-  get colorSurfaceVariant(): number {
-    return this.props.colorSurfaceVariant;
-  }
-
-  get colorSurfaceHighlight(): number {
-    return this.props.colorSurfaceHighlight;
-  }
-
-  get surfaceHeader(): number {
-    return this.props.surfaceHeader;
-  }
-
-  get underSurface(): number {
-    return this.props.underSurface;
-  }
-
-  get offState(): number {
-    return this.props.offState;
-  }
-
-  get accentSurface(): number {
-    return this.props.accentSurface;
-  }
-
-  get textPrimaryOnAccent(): number {
-    return this.props.textPrimaryOnAccent;
-  }
-
-  get textSecondaryOnAccent(): number {
-    return this.props.textSecondaryOnAccent;
-  }
-
-  get volumeBackground(): number {
-    return this.props.volumeBackground;
-  }
-
-  get scrim(): number {
-    return this.props.scrim;
-  }
-
-  /**
-   * @param argb ARGB representation of a color.
-   * @return Light Material color scheme, based on the color's hue.
-   */
-  static light(argb: number): SchemeAndroid {
-    const core = CorePalette.of(argb);
-    return SchemeAndroid.lightFromCorePalette(core);
-  }
-
-  /**
-   * @param argb ARGB representation of a color.
-   * @return Dark Material color scheme, based on the color's hue.
-   */
-  static dark(argb: number): SchemeAndroid {
-    const core = CorePalette.of(argb);
-    return SchemeAndroid.darkFromCorePalette(core);
-  }
-
-  /**
-   * @param argb ARGB representation of a color.
-   * @return Light Android color scheme, based on the color's hue.
-   */
-  static lightContent(argb: number): SchemeAndroid {
-    const core = CorePalette.contentOf(argb);
-    return SchemeAndroid.lightFromCorePalette(core);
-  }
-
-  /**
-   * @param argb ARGB representation of a color.
-   * @return Dark Android color scheme, based on the color's hue.
-   */
-  static darkContent(argb: number): SchemeAndroid {
-    const core = CorePalette.contentOf(argb);
-    return SchemeAndroid.darkFromCorePalette(core);
-  }
-
-  /**
-   * Light scheme from core palette
-   */
-  static lightFromCorePalette(core: CorePalette): SchemeAndroid {
-    return new SchemeAndroid({
-      colorAccentPrimary: core.a1.tone(90),
-      colorAccentPrimaryVariant: core.a1.tone(40),
-      colorAccentSecondary: core.a2.tone(90),
-      colorAccentSecondaryVariant: core.a2.tone(40),
-      colorAccentTertiary: core.a3.tone(90),
-      colorAccentTertiaryVariant: core.a3.tone(40),
-      textColorPrimary: core.n1.tone(10),
-      textColorSecondary: core.n2.tone(30),
-      textColorTertiary: core.n2.tone(50),
-      textColorPrimaryInverse: core.n1.tone(95),
-      textColorSecondaryInverse: core.n1.tone(80),
-      textColorTertiaryInverse: core.n1.tone(60),
-      colorBackground: core.n1.tone(95),
-      colorBackgroundFloating: core.n1.tone(98),
-      colorSurface: core.n1.tone(98),
-      colorSurfaceVariant: core.n1.tone(90),
-      colorSurfaceHighlight: core.n1.tone(100),
-      surfaceHeader: core.n1.tone(90),
-      underSurface: core.n1.tone(0),
-      offState: core.n1.tone(20),
-      accentSurface: core.a2.tone(95),
-      textPrimaryOnAccent: core.n1.tone(10),
-      textSecondaryOnAccent: core.n2.tone(30),
-      volumeBackground: core.n1.tone(25),
-      scrim: core.n1.tone(80),
-    });
-  }
-
-  /**
-   * Dark scheme from core palette
-   */
-  static darkFromCorePalette(core: CorePalette): SchemeAndroid {
-    return new SchemeAndroid({
-      colorAccentPrimary: core.a1.tone(90),
-      colorAccentPrimaryVariant: core.a1.tone(70),
-      colorAccentSecondary: core.a2.tone(90),
-      colorAccentSecondaryVariant: core.a2.tone(70),
-      colorAccentTertiary: core.a3.tone(90),
-      colorAccentTertiaryVariant: core.a3.tone(70),
-      textColorPrimary: core.n1.tone(95),
-      textColorSecondary: core.n2.tone(80),
-      textColorTertiary: core.n2.tone(60),
-      textColorPrimaryInverse: core.n1.tone(10),
-      textColorSecondaryInverse: core.n1.tone(30),
-      textColorTertiaryInverse: core.n1.tone(50),
-      colorBackground: core.n1.tone(10),
-      colorBackgroundFloating: core.n1.tone(10),
-      colorSurface: core.n1.tone(20),
-      colorSurfaceVariant: core.n1.tone(30),
-      colorSurfaceHighlight: core.n1.tone(35),
-      surfaceHeader: core.n1.tone(30),
-      underSurface: core.n1.tone(0),
-      offState: core.n1.tone(20),
-      accentSurface: core.a2.tone(95),
-      textPrimaryOnAccent: core.n1.tone(10),
-      textSecondaryOnAccent: core.n2.tone(30),
-      volumeBackground: core.n1.tone(25),
-      scrim: core.n1.tone(80),
-    });
-  }
-
-  private constructor(private readonly props: {
-    colorAccentPrimary: number,
-    colorAccentPrimaryVariant: number,
-    colorAccentSecondary: number,
-    colorAccentSecondaryVariant: number,
-    colorAccentTertiary: number,
-    colorAccentTertiaryVariant: number,
-    textColorPrimary: number,
-    textColorSecondary: number,
-    textColorTertiary: number,
-    textColorPrimaryInverse: number,
-    textColorSecondaryInverse: number,
-    textColorTertiaryInverse: number,
-    colorBackground: number,
-    colorBackgroundFloating: number,
-    colorSurface: number,
-    colorSurfaceVariant: number,
-    colorSurfaceHighlight: number,
-    surfaceHeader: number,
-    underSurface: number,
-    offState: number,
-    accentSurface: number,
-    textPrimaryOnAccent: number,
-    textSecondaryOnAccent: number,
-    volumeBackground: number,
-    scrim: number
-  }) {}
-
-  toJSON() {
-    return {...this.props};
-  }
-}
diff --git a/typescript/scheme/scheme_content.ts b/typescript/scheme/scheme_content.ts
deleted file mode 100644
index 8f4adf45..00000000
--- a/typescript/scheme/scheme_content.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @license
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {SpecVersion} from '../dynamiccolor/color_spec.js';
-import {DynamicScheme, Platform} from '../dynamiccolor/dynamic_scheme';
-import {Variant} from '../dynamiccolor/variant.js';
-import {Hct} from '../hct/hct.js';
-
-/**
- * A scheme that places the source color in `Scheme.primaryContainer`.
- *
- * Primary Container is the source color, adjusted for color relativity.
- * It maintains constant appearance in light mode and dark mode.
- * This adds ~5 tone in light mode, and subtracts ~5 tone in dark mode.
- * Tertiary Container is the complement to the source color, using
- * `TemperatureCache`. It also maintains constant appearance.
- */
-export class SchemeContent extends DynamicScheme {
-  constructor(
-      sourceColorHct: Hct, isDark: boolean, contrastLevel: number,
-      specVersion: SpecVersion = DynamicScheme.DEFAULT_SPEC_VERSION,
-      platform: Platform = DynamicScheme.DEFAULT_PLATFORM) {
-    super({
-      sourceColorHct,
-      variant: Variant.CONTENT,
-      contrastLevel,
-      isDark,
-      platform,
-      specVersion,
-    });
-  }
-}
diff --git a/typescript/scheme/scheme_expressive.ts b/typescript/scheme/scheme_expressive.ts
deleted file mode 100644
index f4e2daee..00000000
--- a/typescript/scheme/scheme_expressive.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @license
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {SpecVersion} from '../dynamiccolor/color_spec.js';
-import {DynamicScheme, Platform} from '../dynamiccolor/dynamic_scheme';
-import {Variant} from '../dynamiccolor/variant.js';
-import {Hct} from '../hct/hct.js';
-
-/**
- * A Dynamic Color theme that is intentionally detached from the source color.
- */
-export class SchemeExpressive extends DynamicScheme {
-  constructor(
-      sourceColorHct: Hct, isDark: boolean, contrastLevel: number,
-      specVersion: SpecVersion = DynamicScheme.DEFAULT_SPEC_VERSION,
-      platform: Platform = DynamicScheme.DEFAULT_PLATFORM) {
-    super({
-      sourceColorHct,
-      variant: Variant.EXPRESSIVE,
-      contrastLevel,
-      isDark,
-      platform,
-      specVersion,
-    });
-  }
-}
diff --git a/typescript/scheme/scheme_fidelity.ts b/typescript/scheme/scheme_fidelity.ts
deleted file mode 100644
index 114129d8..00000000
--- a/typescript/scheme/scheme_fidelity.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @license
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {SpecVersion} from '../dynamiccolor/color_spec.js';
-import {DynamicScheme, Platform} from '../dynamiccolor/dynamic_scheme';
-import {Variant} from '../dynamiccolor/variant.js';
-import {Hct} from '../hct/hct.js';
-
-/**
- * A scheme that places the source color in `Scheme.primaryContainer`.
- *
- * Primary Container is the source color, adjusted for color relativity.
- * It maintains constant appearance in light mode and dark mode.
- * This adds ~5 tone in light mode, and subtracts ~5 tone in dark mode.
- * Tertiary Container is the complement to the source color, using
- * `TemperatureCache`. It also maintains constant appearance.
- */
-export class SchemeFidelity extends DynamicScheme {
-  constructor(
-      sourceColorHct: Hct, isDark: boolean, contrastLevel: number,
-      specVersion: SpecVersion = DynamicScheme.DEFAULT_SPEC_VERSION,
-      platform: Platform = DynamicScheme.DEFAULT_PLATFORM) {
-    super({
-      sourceColorHct,
-      variant: Variant.FIDELITY,
-      contrastLevel,
-      isDark,
-      platform,
-      specVersion,
-    });
-  }
-}
diff --git a/typescript/scheme/scheme_fruit_salad.ts b/typescript/scheme/scheme_fruit_salad.ts
deleted file mode 100644
index ea206579..00000000
--- a/typescript/scheme/scheme_fruit_salad.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @license
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {SpecVersion} from '../dynamiccolor/color_spec.js';
-import {DynamicScheme, Platform} from '../dynamiccolor/dynamic_scheme';
-import {Variant} from '../dynamiccolor/variant.js';
-import {Hct} from '../hct/hct.js';
-
-/**
- * A playful theme - the source color's hue does not appear in the theme.
- */
-export class SchemeFruitSalad extends DynamicScheme {
-  constructor(
-      sourceColorHct: Hct, isDark: boolean, contrastLevel: number,
-      specVersion: SpecVersion = DynamicScheme.DEFAULT_SPEC_VERSION,
-      platform: Platform = DynamicScheme.DEFAULT_PLATFORM) {
-    super({
-      sourceColorHct,
-      variant: Variant.FRUIT_SALAD,
-      contrastLevel,
-      isDark,
-      platform,
-      specVersion,
-    });
-  }
-}
diff --git a/typescript/scheme/scheme_monochrome.ts b/typescript/scheme/scheme_monochrome.ts
deleted file mode 100644
index 0143a5f1..00000000
--- a/typescript/scheme/scheme_monochrome.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * @license
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {SpecVersion} from '../dynamiccolor/color_spec.js';
-import {DynamicScheme, Platform} from '../dynamiccolor/dynamic_scheme';
-import {Variant} from '../dynamiccolor/variant.js';
-import {Hct} from '../hct/hct.js';
-
-/** A Dynamic Color theme that is grayscale. */
-export class SchemeMonochrome extends DynamicScheme {
-  constructor(
-      sourceColorHct: Hct, isDark: boolean, contrastLevel: number,
-      specVersion: SpecVersion = DynamicScheme.DEFAULT_SPEC_VERSION,
-      platform: Platform = DynamicScheme.DEFAULT_PLATFORM) {
-    super({
-      sourceColorHct,
-      variant: Variant.MONOCHROME,
-      contrastLevel,
-      isDark,
-      platform,
-      specVersion,
-    });
-  }
-}
diff --git a/typescript/scheme/scheme_neutral.ts b/typescript/scheme/scheme_neutral.ts
deleted file mode 100644
index fd25d1e2..00000000
--- a/typescript/scheme/scheme_neutral.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * @license
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {SpecVersion} from '../dynamiccolor/color_spec.js';
-import {DynamicScheme, Platform} from '../dynamiccolor/dynamic_scheme';
-import {Variant} from '../dynamiccolor/variant.js';
-import {Hct} from '../hct/hct.js';
-
-/** A Dynamic Color theme that is near grayscale. */
-export class SchemeNeutral extends DynamicScheme {
-  constructor(
-      sourceColorHct: Hct, isDark: boolean, contrastLevel: number,
-      specVersion: SpecVersion = DynamicScheme.DEFAULT_SPEC_VERSION,
-      platform: Platform = DynamicScheme.DEFAULT_PLATFORM) {
-    super({
-      sourceColorHct,
-      variant: Variant.NEUTRAL,
-      contrastLevel,
-      isDark,
-      platform,
-      specVersion,
-    });
-  }
-}
diff --git a/typescript/scheme/scheme_rainbow.ts b/typescript/scheme/scheme_rainbow.ts
deleted file mode 100644
index 22fafe6a..00000000
--- a/typescript/scheme/scheme_rainbow.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @license
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {SpecVersion} from '../dynamiccolor/color_spec.js';
-import {DynamicScheme, Platform} from '../dynamiccolor/dynamic_scheme';
-import {Variant} from '../dynamiccolor/variant.js';
-import {Hct} from '../hct/hct.js';
-
-/**
- * A playful theme - the source color's hue does not appear in the theme.
- */
-export class SchemeRainbow extends DynamicScheme {
-  constructor(
-      sourceColorHct: Hct, isDark: boolean, contrastLevel: number,
-      specVersion: SpecVersion = DynamicScheme.DEFAULT_SPEC_VERSION,
-      platform: Platform = DynamicScheme.DEFAULT_PLATFORM) {
-    super({
-      sourceColorHct,
-      variant: Variant.RAINBOW,
-      contrastLevel,
-      isDark,
-      platform,
-      specVersion,
-    });
-  }
-}
diff --git a/typescript/scheme/scheme_test.ts b/typescript/scheme/scheme_test.ts
deleted file mode 100644
index 7a8edc96..00000000
--- a/typescript/scheme/scheme_test.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import 'jasmine';
-
-import {customMatchers} from '../utils/test_utils.js';
-
-import {SchemeAndroid} from './scheme_android.js';
-
-beforeEach(() => {
-  jasmine.addMatchers(customMatchers);
-});
-
-describe('android scheme', () => {
-  it('blue light scheme', () => {
-    const scheme = SchemeAndroid.light(0xff0000ff);
-    expect(scheme.colorAccentPrimary).matchesColor(0xffe0e0ff);
-  });
-
-  it('blue dark scheme', () => {
-    const scheme = SchemeAndroid.dark(0xff0000ff);
-    expect(scheme.colorAccentPrimary).matchesColor(0xffe0e0ff);
-  });
-
-  it('3rd party light scheme', () => {
-    const scheme = SchemeAndroid.light(0xff6750a4);
-    expect(scheme.colorAccentPrimary).matchesColor(0xffe9ddff);
-    expect(scheme.colorAccentSecondary).matchesColor(0xffe8def8);
-    expect(scheme.colorAccentTertiary).matchesColor(0xffffd9e3);
-    expect(scheme.colorSurface).matchesColor(0xfffdf8fd);
-    expect(scheme.textColorPrimary).matchesColor(0xff1c1b1e);
-  });
-
-  it('3rd party dark scheme', () => {
-    const scheme = SchemeAndroid.dark(0xff6750a4);
-    expect(scheme.colorAccentPrimary).matchesColor(0xffe9ddff);
-    expect(scheme.colorAccentSecondary).matchesColor(0xffe8def8);
-    expect(scheme.colorAccentTertiary).matchesColor(0xffffd9e3);
-    expect(scheme.colorSurface).matchesColor(0xff313033);
-    expect(scheme.textColorPrimary).matchesColor(0xfff4eff4);
-  });
-});
diff --git a/typescript/scheme/scheme_tonal_spot.ts b/typescript/scheme/scheme_tonal_spot.ts
deleted file mode 100644
index 68c2df6f..00000000
--- a/typescript/scheme/scheme_tonal_spot.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @license
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {SpecVersion} from '../dynamiccolor/color_spec.js';
-import {DynamicScheme, Platform} from '../dynamiccolor/dynamic_scheme';
-import {Variant} from '../dynamiccolor/variant.js';
-import {Hct} from '../hct/hct.js';
-
-/**
- * A Dynamic Color theme with low to medium colorfulness and a Tertiary
- * TonalPalette with a hue related to the source color.
- *
- * The default Material You theme on Android 12 and 13.
- */
-export class SchemeTonalSpot extends DynamicScheme {
-  constructor(
-      sourceColorHct: Hct, isDark: boolean, contrastLevel: number,
-      specVersion: SpecVersion = DynamicScheme.DEFAULT_SPEC_VERSION,
-      platform: Platform = DynamicScheme.DEFAULT_PLATFORM) {
-    super({
-      sourceColorHct,
-      variant: Variant.TONAL_SPOT,
-      contrastLevel,
-      isDark,
-      platform,
-      specVersion,
-    });
-  }
-}
diff --git a/typescript/scheme/scheme_vibrant.ts b/typescript/scheme/scheme_vibrant.ts
deleted file mode 100644
index 5a1ae2b9..00000000
--- a/typescript/scheme/scheme_vibrant.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * @license
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {SpecVersion} from '../dynamiccolor/color_spec.js';
-import {DynamicScheme, Platform} from '../dynamiccolor/dynamic_scheme';
-import {Variant} from '../dynamiccolor/variant.js';
-import {Hct} from '../hct/hct.js';
-
-/**
- * A Dynamic Color theme that maxes out colorfulness at each position in the
- * Primary Tonal Palette.
- */
-export class SchemeVibrant extends DynamicScheme {
-  constructor(
-      sourceColorHct: Hct, isDark: boolean, contrastLevel: number,
-      specVersion: SpecVersion = DynamicScheme.DEFAULT_SPEC_VERSION,
-      platform: Platform = DynamicScheme.DEFAULT_PLATFORM) {
-    super({
-      sourceColorHct,
-      variant: Variant.VIBRANT,
-      contrastLevel,
-      isDark,
-      platform,
-      specVersion,
-    });
-  }
-}
diff --git a/typescript/score/score.ts b/typescript/score/score.ts
deleted file mode 100644
index 3b863c25..00000000
--- a/typescript/score/score.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {Hct} from '../hct/hct.js';
-import * as math from '../utils/math_utils.js';
-
-/**
- * Default options for ranking colors based on usage counts.
- * desired: is the max count of the colors returned.
- * fallbackColorARGB: Is the default color that should be used if no
- *                    other colors are suitable.
- * filter: controls if the resulting colors should be filtered to not include
- *         hues that are not used often enough, and colors that are effectively
- *         grayscale.
- */
-declare interface ScoreOptions {
-  desired?: number;
-  fallbackColorARGB?: number;
-  filter?: boolean;
-}
-
-const SCORE_OPTION_DEFAULTS = {
-  desired: 4,  // 4 colors matches what Android wallpaper picker.
-  fallbackColorARGB: 0xff4285f4,  // Google Blue.
-  filter: true,  // Avoid unsuitable colors.
-};
-
-function compare(a: {hct: Hct, score: number}, b: {hct: Hct, score: number}): number {
-  if (a.score > b.score) {
-    return -1;
-  } else if (a.score < b.score) {
-    return 1;
-  }
-  return 0;
-}
-
-/**
- *  Given a large set of colors, remove colors that are unsuitable for a UI
- *  theme, and rank the rest based on suitability.
- *
- *  Enables use of a high cluster count for image quantization, thus ensuring
- *  colors aren't muddied, while curating the high cluster count to a much
- *  smaller number of appropriate choices.
- */
-export class Score {
-  private static readonly TARGET_CHROMA = 48.0;  // A1 Chroma
-  private static readonly WEIGHT_PROPORTION = 0.7;
-  private static readonly WEIGHT_CHROMA_ABOVE = 0.3;
-  private static readonly WEIGHT_CHROMA_BELOW = 0.1;
-  private static readonly CUTOFF_CHROMA = 5.0;
-  private static readonly CUTOFF_EXCITED_PROPORTION = 0.01;
-
-  private constructor() {}
-
-  /**
-   * Given a map with keys of colors and values of how often the color appears,
-   * rank the colors based on suitability for being used for a UI theme.
-   *
-   * @param colorsToPopulation map with keys of colors and values of how often
-   *     the color appears, usually from a source image.
-   * @param {ScoreOptions} options optional parameters.
-   * @return Colors sorted by suitability for a UI theme. The most suitable
-   *     color is the first item, the least suitable is the last. There will
-   *     always be at least one color returned. If all the input colors
-   *     were not suitable for a theme, a default fallback color will be
-   *     provided, Google Blue.
-   */
-  static score(
-    colorsToPopulation: Map, options?: ScoreOptions):
-      number[] {
-    const {desired, fallbackColorARGB, filter} = {...SCORE_OPTION_DEFAULTS, ...options};
-    // Get the HCT color for each Argb value, while finding the per hue count and
-    // total count.
-    const colorsHct: Hct[] = [];
-    const huePopulation = new Array(360).fill(0);
-    let populationSum = 0;
-    for (const [argb, population] of colorsToPopulation.entries()) {
-      const hct = Hct.fromInt(argb);
-      colorsHct.push(hct);
-      const hue = Math.floor(hct.hue);
-      huePopulation[hue] += population;
-      populationSum += population;
-    }
-
-    // Hues with more usage in neighboring 30 degree slice get a larger number.
-    const hueExcitedProportions = new Array(360).fill(0.0);
-    for (let hue = 0; hue < 360; hue++) {
-      const proportion = huePopulation[hue] / populationSum;
-      for (let i = hue - 14; i < hue + 16; i++) {
-        const neighborHue = math.sanitizeDegreesInt(i);
-        hueExcitedProportions[neighborHue] += proportion;
-      }
-    }
-
-    // Scores each HCT color based on usage and chroma, while optionally
-    // filtering out values that do not have enough chroma or usage.
-    const scoredHct = new Array<{hct: Hct, score: number}>();
-    for (const hct of colorsHct) {
-      const hue = math.sanitizeDegreesInt(Math.round(hct.hue));
-      const proportion = hueExcitedProportions[hue];
-      if (filter && (hct.chroma < Score.CUTOFF_CHROMA || proportion <= Score.CUTOFF_EXCITED_PROPORTION)) {
-        continue;
-      }
-
-      const proportionScore = proportion * 100.0 * Score.WEIGHT_PROPORTION;
-      const chromaWeight = hct.chroma < Score.TARGET_CHROMA ? Score.WEIGHT_CHROMA_BELOW : Score.WEIGHT_CHROMA_ABOVE;
-      const chromaScore = (hct.chroma - Score.TARGET_CHROMA) * chromaWeight;
-      const score = proportionScore + chromaScore;
-      scoredHct.push({hct, score});
-    }
-    // Sorted so that colors with higher scores come first.
-    scoredHct.sort(compare);
-
-    // Iterates through potential hue differences in degrees in order to select
-    // the colors with the largest distribution of hues possible. Starting at
-    // 90 degrees(maximum difference for 4 colors) then decreasing down to a
-    // 15 degree minimum.
-    const chosenColors: Hct[] = [];
-    for (let differenceDegrees = 90; differenceDegrees >= 15; differenceDegrees--) {
-      chosenColors.length = 0;
-      for (const {hct} of scoredHct) {
-        const duplicateHue = chosenColors.find(chosenHct => {
-          return math.differenceDegrees(hct.hue, chosenHct.hue) < differenceDegrees;
-        });
-        if (!duplicateHue) {
-          chosenColors.push(hct);
-        }
-        if (chosenColors.length >= desired) break;
-      }
-      if (chosenColors.length >= desired) break;
-    }
-    const colors: number[] = [];
-    if (chosenColors.length === 0) {
-      colors.push(fallbackColorARGB);
-    }
-    for (const chosenHct of chosenColors) {
-      colors.push(chosenHct.toInt());
-    }
-    return colors;
-  }
-}
diff --git a/typescript/score/score_test.ts b/typescript/score/score_test.ts
deleted file mode 100644
index bf281ba8..00000000
--- a/typescript/score/score_test.ts
+++ /dev/null
@@ -1,231 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import 'jasmine';
-
-import {Score} from './score.js';
-
-describe('scoring', () => {
-  it('prioritizes chroma', () => {
-    const colorsToPopulation = new Map();
-    colorsToPopulation.set(0xff000000, 1);
-    colorsToPopulation.set(0xffffffff, 1);
-    colorsToPopulation.set(0xff0000ff, 1);
-
-    const ranked = Score.score(colorsToPopulation, {desired: 4});
-
-    expect(ranked.length).toBe(1);
-    expect(ranked[0]).toBe(0xff0000ff);
-  });
-
-  it('prioritizes chroma when proportions equal', () => {
-    const colorsToPopulation = new Map();
-    colorsToPopulation.set(0xffff0000, 1);
-    colorsToPopulation.set(0xff00ff00, 1);
-    colorsToPopulation.set(0xff0000ff, 1);
-
-    const ranked = Score.score(colorsToPopulation, {desired: 4});
-
-    expect(ranked.length).toBe(3);
-    expect(ranked[0]).toBe(0xffff0000);
-    expect(ranked[1]).toBe(0xff00ff00);
-    expect(ranked[2]).toBe(0xff0000ff);
-  });
-
-  it('generates gBlue when no colors available', () => {
-    const colorsToPopulation = new Map();
-    colorsToPopulation.set(0xff000000, 1);
-
-    const ranked = Score.score(colorsToPopulation, {desired: 4});
-
-    expect(ranked.length).toBe(1);
-    expect(ranked[0]).toBe(0xff4285f4);
-  });
-
-  it('dedupes nearby hues', () => {
-    const colorsToPopulation = new Map();
-    colorsToPopulation.set(0xff008772, 1);  // H 180 C 42 T 50
-    colorsToPopulation.set(0xff318477, 1);  // H 184 C 35 T 50
-
-    const ranked = Score.score(colorsToPopulation, {desired: 4});
-
-    expect(ranked.length).toBe(1);
-    expect(ranked[0]).toBe(0xff008772);
-  });
-
-  it('maximizes hue distance', () => {
-    const colorsToPopulation = new Map();
-    colorsToPopulation.set(0xff008772, 1);  // H 180 C 42 T 50
-    colorsToPopulation.set(0xff008587, 1);  // H 198 C 50 T 50
-    colorsToPopulation.set(0xff007ebc, 1);  // H 245 C 50 T 50
-
-    const ranked = Score.score(colorsToPopulation, {desired: 2});
-
-    expect(ranked.length).toBe(2);
-    expect(ranked[0]).toBe(0xff007ebc);
-    expect(ranked[1]).toBe(0xff008772);
-  });
-
-  it('passes generated scenario one', () => {
-    const colorsToPopulation = new Map();
-    colorsToPopulation.set(0xff7ea16d, 67);
-    colorsToPopulation.set(0xffd8ccae, 67);
-    colorsToPopulation.set(0xff835c0d, 49);
-  
-    const ranked = Score.score(colorsToPopulation, {desired: 3, fallbackColorARGB: 0xff8d3819, filter: false});
-  
-    expect(ranked.length).toBe(3);
-    expect(ranked[0]).toBe(0xff7ea16d);
-    expect(ranked[1]).toBe(0xffd8ccae);
-    expect(ranked[2]).toBe(0xff835c0d);
-  });
-  
-  it('passes generated scenario two', () => {
-    const colorsToPopulation = new Map();
-    colorsToPopulation.set(0xffd33881, 14);
-    colorsToPopulation.set(0xff3205cc, 77);
-    colorsToPopulation.set(0xff0b48cf, 36);
-    colorsToPopulation.set(0xffa08f5d, 81);
-  
-    const ranked = Score.score(colorsToPopulation, {desired: 4, fallbackColorARGB: 0xff7d772b, filter: true});
-  
-    expect(ranked.length).toBe(3);
-    expect(ranked[0]).toBe(0xff3205cc);
-    expect(ranked[1]).toBe(0xffa08f5d);
-    expect(ranked[2]).toBe(0xffd33881);
-  });
-  
-  it('passes generated scenario three', () => {
-    const colorsToPopulation = new Map();
-    colorsToPopulation.set(0xffbe94a6, 23);
-    colorsToPopulation.set(0xffc33fd7, 42);
-    colorsToPopulation.set(0xff899f36, 90);
-    colorsToPopulation.set(0xff94c574, 82);
-  
-    const ranked = Score.score(colorsToPopulation, {desired: 3, fallbackColorARGB: 0xffaa79a4, filter: true});
-  
-    expect(ranked.length).toBe(3);
-    expect(ranked[0]).toBe(0xff94c574);
-    expect(ranked[1]).toBe(0xffc33fd7);
-    expect(ranked[2]).toBe(0xffbe94a6);
-  });
-  
-  it('passes generated scenario four', () => {
-    const colorsToPopulation = new Map();
-    colorsToPopulation.set(0xffdf241c, 85);
-    colorsToPopulation.set(0xff685859, 44);
-    colorsToPopulation.set(0xffd06d5f, 34);
-    colorsToPopulation.set(0xff561c54, 27);
-    colorsToPopulation.set(0xff713090, 88);
-  
-    const ranked = Score.score(colorsToPopulation, {desired: 5, fallbackColorARGB: 0xff58c19c, filter: false});
-  
-    expect(ranked.length).toBe(2);
-    expect(ranked[0]).toBe(0xffdf241c);
-    expect(ranked[1]).toBe(0xff561c54);
-  });
-  
-  it('passes generated scenario five', () => {
-    const colorsToPopulation = new Map();
-    colorsToPopulation.set(0xffbe66f8, 41);
-    colorsToPopulation.set(0xff4bbda9, 88);
-    colorsToPopulation.set(0xff80f6f9, 44);
-    colorsToPopulation.set(0xffab8017, 43);
-    colorsToPopulation.set(0xffe89307, 65);
-  
-    const ranked = Score.score(colorsToPopulation, {desired: 3, fallbackColorARGB: 0xff916691, filter: false});
-  
-    expect(ranked.length).toBe(3);
-    expect(ranked[0]).toBe(0xffab8017);
-    expect(ranked[1]).toBe(0xff4bbda9);
-    expect(ranked[2]).toBe(0xffbe66f8);
-  });
-  
-  it('passes generated scenario six', () => {
-    const colorsToPopulation = new Map();
-    colorsToPopulation.set(0xff18ea8f, 93);
-    colorsToPopulation.set(0xff327593, 18);
-    colorsToPopulation.set(0xff066a18, 53);
-    colorsToPopulation.set(0xfffa8a23, 74);
-    colorsToPopulation.set(0xff04ca1f, 62);
-  
-    const ranked = Score.score(colorsToPopulation, {desired: 2, fallbackColorARGB: 0xff4c377a, filter: false});
-  
-    expect(ranked.length).toBe(2);
-    expect(ranked[0]).toBe(0xff18ea8f);
-    expect(ranked[1]).toBe(0xfffa8a23);
-  });
-  
-  it('passes generated scenario seven', () => {
-    const colorsToPopulation = new Map();
-    colorsToPopulation.set(0xff2e05ed, 23);
-    colorsToPopulation.set(0xff153e55, 90);
-    colorsToPopulation.set(0xff9ab220, 23);
-    colorsToPopulation.set(0xff153379, 66);
-    colorsToPopulation.set(0xff68bcc3, 81);
-  
-    const ranked = Score.score(colorsToPopulation, {desired: 2, fallbackColorARGB: 0xfff588dc, filter: true});
-  
-    expect(ranked.length).toBe(2);
-    expect(ranked[0]).toBe(0xff2e05ed);
-    expect(ranked[1]).toBe(0xff9ab220);
-  });
-  
-  it('passes generated scenario eight', () => {
-    const colorsToPopulation = new Map();
-    colorsToPopulation.set(0xff816ec5, 24);
-    colorsToPopulation.set(0xff6dcb94, 19);
-    colorsToPopulation.set(0xff3cae91, 98);
-    colorsToPopulation.set(0xff5b542f, 25);
-  
-    const ranked = Score.score(colorsToPopulation, {desired: 1, fallbackColorARGB: 0xff84b0fd, filter: false});
-  
-    expect(ranked.length).toBe(1);
-    expect(ranked[0]).toBe(0xff3cae91);
-  });
-  
-  it('passes generated scenario nine', () => {
-    const colorsToPopulation = new Map();
-    colorsToPopulation.set(0xff206f86, 52);
-    colorsToPopulation.set(0xff4a620d, 96);
-    colorsToPopulation.set(0xfff51401, 85);
-    colorsToPopulation.set(0xff2b8ebf, 3);
-    colorsToPopulation.set(0xff277766, 59);
-  
-    const ranked = Score.score(colorsToPopulation, {desired: 3, fallbackColorARGB: 0xff02b415, filter: true});
-  
-    expect(ranked.length).toBe(3);
-    expect(ranked[0]).toBe(0xfff51401);
-    expect(ranked[1]).toBe(0xff4a620d);
-    expect(ranked[2]).toBe(0xff2b8ebf);
-  });
-  
-  it('passes generated scenario ten', () => {
-    const colorsToPopulation = new Map();
-    colorsToPopulation.set(0xff8b1d99, 54);
-    colorsToPopulation.set(0xff27effe, 43);
-    colorsToPopulation.set(0xff6f558d, 2);
-    colorsToPopulation.set(0xff77fdf2, 78);
-  
-    const ranked = Score.score(colorsToPopulation, {desired: 4, fallbackColorARGB: 0xff5e7a10, filter: true});
-  
-    expect(ranked.length).toBe(3);
-    expect(ranked[0]).toBe(0xff27effe);
-    expect(ranked[1]).toBe(0xff8b1d99);
-    expect(ranked[2]).toBe(0xff6f558d);
-  });
-});
diff --git a/typescript/temperature/temperature_cache.ts b/typescript/temperature/temperature_cache.ts
deleted file mode 100644
index a72e37ee..00000000
--- a/typescript/temperature/temperature_cache.ts
+++ /dev/null
@@ -1,302 +0,0 @@
-/**
- * @license
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// This file is automatically generated. Do not modify it.
-
-import {Hct} from '../hct/hct.js';
-import * as colorUtils from '../utils/color_utils.js';
-import * as mathUtils from '../utils/math_utils.js';
-
-/**
- * Design utilities using color temperature theory.
- *
- * Analogous colors, complementary color, and cache to efficiently, lazily,
- * generate data for calculations when needed.
- */
-export class TemperatureCache {
-  constructor(public input: Hct) {}
-
-  hctsByTempCache: Hct[] = [];
-  hctsByHueCache: Hct[] = [];
-  tempsByHctCache = new Map();
-  inputRelativeTemperatureCache: number = -1.0;
-  complementCache: Hct|null = null;
-
-  get hctsByTemp(): Hct[] {
-    if (this.hctsByTempCache.length > 0) {
-      return this.hctsByTempCache;
-    }
-
-    const hcts = this.hctsByHue.concat([this.input]);
-    const temperaturesByHct = this.tempsByHct;
-    hcts.sort((a, b) => temperaturesByHct.get(a)! - temperaturesByHct.get(b)!);
-    this.hctsByTempCache = hcts;
-    return hcts;
-  }
-
-  get warmest(): Hct {
-    return this.hctsByTemp[this.hctsByTemp.length - 1];
-  }
-
-  get coldest(): Hct {
-    return this.hctsByTemp[0];
-  }
-
-  /**
-   * A set of colors with differing hues, equidistant in temperature.
-   *
-   * In art, this is usually described as a set of 5 colors on a color wheel
-   * divided into 12 sections. This method allows provision of either of those
-   * values.
-   *
-   * Behavior is undefined when [count] or [divisions] is 0.
-   * When divisions < count, colors repeat.
-   *
-   * [count] The number of colors to return, includes the input color.
-   * [divisions] The number of divisions on the color wheel.
-   */
-  analogous(count = 5, divisions = 12): Hct[] {
-    const startHue = Math.round(this.input.hue);
-    const startHct = this.hctsByHue[startHue];
-    let lastTemp = this.relativeTemperature(startHct);
-    const allColors = [startHct];
-
-    let absoluteTotalTempDelta = 0.0;
-    for (let i = 0; i < 360; i++) {
-      const hue = mathUtils.sanitizeDegreesInt(startHue + i);
-      const hct = this.hctsByHue[hue];
-      const temp = this.relativeTemperature(hct);
-      const tempDelta = Math.abs(temp - lastTemp);
-      lastTemp = temp;
-      absoluteTotalTempDelta += tempDelta;
-    }
-    let hueAddend = 1;
-    const tempStep = absoluteTotalTempDelta / divisions;
-    let totalTempDelta = 0.0;
-    lastTemp = this.relativeTemperature(startHct);
-    while (allColors.length < divisions) {
-      const hue = mathUtils.sanitizeDegreesInt(startHue + hueAddend);
-      const hct = this.hctsByHue[hue];
-      const temp = this.relativeTemperature(hct);
-      const tempDelta = Math.abs(temp - lastTemp);
-      totalTempDelta += tempDelta;
-
-      const desiredTotalTempDeltaForIndex = allColors.length * tempStep;
-      let indexSatisfied = totalTempDelta >= desiredTotalTempDeltaForIndex;
-      let indexAddend = 1;
-      // Keep adding this hue to the answers until its temperature is
-      // insufficient. This ensures consistent behavior when there aren't
-      // [divisions] discrete steps between 0 and 360 in hue with [tempStep]
-      // delta in temperature between them.
-      //
-      // For example, white and black have no analogues: there are no other
-      // colors at T100/T0. Therefore, they should just be added to the array
-      // as answers.
-      while (indexSatisfied && allColors.length < divisions) {
-        allColors.push(hct);
-        const desiredTotalTempDeltaForIndex =
-            ((allColors.length + indexAddend) * tempStep);
-        indexSatisfied = totalTempDelta >= desiredTotalTempDeltaForIndex;
-        indexAddend++;
-      }
-      lastTemp = temp;
-      hueAddend++;
-      if (hueAddend > 360) {
-        while (allColors.length < divisions) {
-          allColors.push(hct);
-        }
-        break;
-      }
-    }
-
-    const answers = [this.input];
-
-    // First, generate analogues from rotating counter-clockwise.
-    const increaseHueCount = Math.floor((count - 1) / 2.0);
-    for (let i = 1; i < (increaseHueCount + 1); i++) {
-      let index = 0 - i;
-      while (index < 0) {
-        index = allColors.length + index;
-      }
-      if (index >= allColors.length) {
-        index = index % allColors.length;
-      }
-      answers.splice(0, 0, allColors[index]);
-    }
-
-    // Second, generate analogues from rotating clockwise.
-    const decreaseHueCount = count - increaseHueCount - 1;
-    for (let i = 1; i < (decreaseHueCount + 1); i++) {
-      let index = i;
-      while (index < 0) {
-        index = allColors.length + index;
-      }
-      if (index >= allColors.length) {
-        index = index % allColors.length;
-      }
-      answers.push(allColors[index]);
-    }
-
-    return answers;
-  }
-
-  /**
-   * A color that complements the input color aesthetically.
-   *
-   * In art, this is usually described as being across the color wheel.
-   * History of this shows intent as a color that is just as cool-warm as the
-   * input color is warm-cool.
-   */
-  get complement(): Hct {
-    if (this.complementCache != null) {
-      return this.complementCache;
-    }
-
-    const coldestHue = this.coldest.hue;
-    const coldestTemp = this.tempsByHct.get(this.coldest)!;
-
-    const warmestHue = this.warmest.hue;
-    const warmestTemp = this.tempsByHct.get(this.warmest)!;
-    const range = warmestTemp - coldestTemp;
-    const startHueIsColdestToWarmest =
-        TemperatureCache.isBetween(this.input.hue, coldestHue, warmestHue);
-    const startHue = startHueIsColdestToWarmest ? warmestHue : coldestHue;
-    const endHue = startHueIsColdestToWarmest ? coldestHue : warmestHue;
-    const directionOfRotation = 1.0;
-    let smallestError = 1000.0;
-    let answer = this.hctsByHue[Math.round(this.input.hue)];
-
-    const complementRelativeTemp = 1.0 - this.inputRelativeTemperature;
-    // Find the color in the other section, closest to the inverse percentile
-    // of the input color. This is the complement.
-    for (let hueAddend = 0.0; hueAddend <= 360.0; hueAddend += 1.0) {
-      const hue = mathUtils.sanitizeDegreesDouble(
-          startHue + directionOfRotation * hueAddend);
-      if (!TemperatureCache.isBetween(hue, startHue, endHue)) {
-        continue;
-      }
-      const possibleAnswer = this.hctsByHue[Math.round(hue)];
-      const relativeTemp =
-          (this.tempsByHct.get(possibleAnswer)! - coldestTemp) / range;
-      const error = Math.abs(complementRelativeTemp - relativeTemp);
-      if (error < smallestError) {
-        smallestError = error;
-        answer = possibleAnswer;
-      }
-    }
-    this.complementCache = answer;
-    return this.complementCache;
-  }
-
-  /**
-   * Temperature relative to all colors with the same chroma and tone.
-   * Value on a scale from 0 to 1.
-   */
-  relativeTemperature(hct: Hct): number {
-    const range =
-        this.tempsByHct.get(this.warmest)! - this.tempsByHct.get(this.coldest)!;
-    const differenceFromColdest =
-        this.tempsByHct.get(hct)! - this.tempsByHct.get(this.coldest)!;
-    // Handle when there's no difference in temperature between warmest and
-    // coldest: for example, at T100, only one color is available, white.
-    if (range === 0.0) {
-      return 0.5;
-    }
-    return differenceFromColdest / range;
-  }
-
-  /** Relative temperature of the input color. See [relativeTemperature]. */
-  get inputRelativeTemperature(): number {
-    if (this.inputRelativeTemperatureCache >= 0.0) {
-      return this.inputRelativeTemperatureCache;
-    }
-
-    this.inputRelativeTemperatureCache = this.relativeTemperature(this.input);
-    return this.inputRelativeTemperatureCache;
-  }
-
-  /** A Map with keys of HCTs in [hctsByTemp], values of raw temperature. */
-  get tempsByHct(): Map {
-    if (this.tempsByHctCache.size > 0) {
-      return this.tempsByHctCache;
-    }
-    const allHcts = this.hctsByHue.concat([this.input]);
-    const temperaturesByHct = new Map();
-    for (const e of allHcts) {
-      temperaturesByHct.set(e, TemperatureCache.rawTemperature(e));
-    }
-    this.tempsByHctCache = temperaturesByHct;
-    return temperaturesByHct;
-  }
-
-  /**
-   * HCTs for all hues, with the same chroma/tone as the input.
-   * Sorted ascending, hue 0 to 360.
-   */
-  get hctsByHue(): Hct[] {
-    if (this.hctsByHueCache.length > 0) {
-      return this.hctsByHueCache;
-    }
-    const hcts: Hct[] = [];
-    for (let hue = 0.0; hue <= 360.0; hue += 1.0) {
-      const colorAtHue = Hct.from(hue, this.input.chroma, this.input.tone);
-      hcts.push(colorAtHue);
-    }
-    this.hctsByHueCache = hcts;
-    return this.hctsByHueCache;
-  }
-
-  /** Determines if an angle is between two other angles, rotating clockwise. */
-  static isBetween(angle: number, a: number, b: number): boolean {
-    if (a < b) {
-      return a <= angle && angle <= b;
-    }
-    return a <= angle || angle <= b;
-  }
-
-  /**
-   * Value representing cool-warm factor of a color.
-   * Values below 0 are considered cool, above, warm.
-   *
-   * Color science has researched emotion and harmony, which art uses to select
-   * colors. Warm-cool is the foundation of analogous and complementary colors.
-   * See:
-   * - Li-Chen Ou's Chapter 19 in Handbook of Color Psychology (2015).
-   * - Josef Albers' Interaction of Color chapters 19 and 21.
-   *
-   * Implementation of Ou, Woodcock and Wright's algorithm, which uses
-   * L*a*b* / LCH color space.
-   * Return value has these properties:
-   * - Values below 0 are cool, above 0 are warm.
-   * - Lower bound: -0.52 - (chroma ^ 1.07 / 20). L*a*b* chroma is infinite.
-   *   Assuming max of 130 chroma, -9.66.
-   * - Upper bound: -0.52 + (chroma ^ 1.07 / 20). L*a*b* chroma is infinite.
-   *   Assuming max of 130 chroma, 8.61.
-   */
-  static rawTemperature(color: Hct): number {
-    const lab = colorUtils.labFromArgb(color.toInt());
-    const hue = mathUtils.sanitizeDegreesDouble(
-        Math.atan2(lab[2], lab[1]) * 180.0 / Math.PI);
-    const chroma = Math.sqrt((lab[1] * lab[1]) + (lab[2] * lab[2]));
-    const temperature = -0.5 +
-        0.02 * Math.pow(chroma, 1.07) *
-            Math.cos(
-                mathUtils.sanitizeDegreesDouble(hue - 50.0) * Math.PI / 180.0,
-            );
-    return temperature;
-  }
-}
diff --git a/typescript/temperature/temperature_cache_test.ts b/typescript/temperature/temperature_cache_test.ts
deleted file mode 100644
index dec3cab5..00000000
--- a/typescript/temperature/temperature_cache_test.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * @license
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import 'jasmine';
-
-import {Hct} from '../hct/hct.js';
-
-import {TemperatureCache} from './temperature_cache.js';
-
-describe('TemperatureCache', () => {
-  it('computes raw temperatures correctly', () => {
-    const blueTemp = TemperatureCache.rawTemperature(Hct.fromInt(0xff0000ff));
-    expect(blueTemp).toBeCloseTo(-1.393, 3);
-
-    const redTemp = TemperatureCache.rawTemperature(Hct.fromInt(0xffff0000));
-    expect(redTemp).toBeCloseTo(2.351, 3);
-
-    const greenTemp = TemperatureCache.rawTemperature(Hct.fromInt(0xff00ff00));
-    expect(greenTemp).toBeCloseTo(-0.267, 3);
-
-    const whiteTemp = TemperatureCache.rawTemperature(Hct.fromInt(0xffffffff));
-    expect(whiteTemp).toBeCloseTo(-0.5, 3);
-
-    const blackTemp = TemperatureCache.rawTemperature(Hct.fromInt(0xff000000));
-    expect(blackTemp).toBeCloseTo(-0.5, 3);
-  });
-
-  it('relative temperature', () => {
-    const blueTemp =
-        new TemperatureCache(Hct.fromInt(0xff0000ff)).inputRelativeTemperature;
-    expect(blueTemp).toBeCloseTo(0.0, 3);
-
-    const redTemp =
-        new TemperatureCache(Hct.fromInt(0xffff0000)).inputRelativeTemperature;
-    expect(redTemp).toBeCloseTo(1.0, 3);
-
-    const greenTemp =
-        new TemperatureCache(Hct.fromInt(0xff00ff00)).inputRelativeTemperature;
-    expect(greenTemp).toBeCloseTo(0.467, 3);
-
-    const whiteTemp =
-        new TemperatureCache(Hct.fromInt(0xffffffff)).inputRelativeTemperature;
-    expect(whiteTemp).toBeCloseTo(0.5, 3);
-
-    const blackTemp =
-        new TemperatureCache(Hct.fromInt(0xff000000)).inputRelativeTemperature;
-    expect(blackTemp).toBeCloseTo(0.5, 3);
-  });
-
-  it('complement', () => {
-    const blueComplement =
-        new TemperatureCache(Hct.fromInt(0xff0000ff)).complement.toInt();
-    expect(blueComplement).toBe(0xff9d0002);
-
-    const redComplement =
-        new TemperatureCache(Hct.fromInt(0xffff0000)).complement.toInt();
-    expect(redComplement).toBe(0xff007bfc);
-
-    const greenComplement =
-        new TemperatureCache(Hct.fromInt(0xff00ff00)).complement.toInt();
-    expect(greenComplement).toBe(0xffffd2c9);
-
-    const whiteComplement =
-        new TemperatureCache(Hct.fromInt(0xffffffff)).complement.toInt();
-    expect(whiteComplement).toBe(0xffffffff);
-
-    const blackComplement =
-        new TemperatureCache(Hct.fromInt(0xff000000)).complement.toInt();
-    expect(blackComplement).toBe(0xff000000);
-  });
-
-  it('analogous', () => {
-    const blueAnalogous = new TemperatureCache(Hct.fromInt(0xff0000ff))
-                              .analogous()
-                              .map((e) => e.toInt());
-    expect(blueAnalogous[0]).toBe(0xff00590c);
-    expect(blueAnalogous[1]).toBe(0xff00564e);
-    expect(blueAnalogous[2]).toBe(0xff0000ff);
-    expect(blueAnalogous[3]).toBe(0xff6700cc);
-    expect(blueAnalogous[4]).toBe(0xff81009f);
-
-    const redAnalogous = new TemperatureCache(Hct.fromInt(0xffff0000))
-                             .analogous()
-                             .map((e) => e.toInt());
-    expect(redAnalogous[0]).toBe(0xfff60082);
-    expect(redAnalogous[1]).toBe(0xfffc004c);
-    expect(redAnalogous[2]).toBe(0xffff0000);
-    expect(redAnalogous[3]).toBe(0xffd95500);
-    expect(redAnalogous[4]).toBe(0xffaf7200);
-
-    const greenAnalogous = new TemperatureCache(Hct.fromInt(0xff00ff00))
-                               .analogous()
-                               .map((e) => e.toInt());
-    expect(greenAnalogous[0]).toBe(0xffcee900);
-    expect(greenAnalogous[1]).toBe(0xff92f500);
-    expect(greenAnalogous[2]).toBe(0xff00ff00);
-    expect(greenAnalogous[3]).toBe(0xff00fd6f);
-    expect(greenAnalogous[4]).toBe(0xff00fab3);
-
-    const blackAnalogous = new TemperatureCache(Hct.fromInt(0xff000000))
-                               .analogous()
-                               .map((e) => e.toInt());
-    expect(blackAnalogous[0]).toBe(0xff000000);
-    expect(blackAnalogous[1]).toBe(0xff000000);
-    expect(blackAnalogous[2]).toBe(0xff000000);
-    expect(blackAnalogous[3]).toBe(0xff000000);
-    expect(blackAnalogous[4]).toBe(0xff000000);
-
-    const whiteAnalogous = new TemperatureCache(Hct.fromInt(0xffffffff))
-                               .analogous()
-                               .map((e) => e.toInt());
-    expect(whiteAnalogous[0]).toBe(0xffffffff);
-    expect(whiteAnalogous[1]).toBe(0xffffffff);
-    expect(whiteAnalogous[2]).toBe(0xffffffff);
-    expect(whiteAnalogous[3]).toBe(0xffffffff);
-    expect(whiteAnalogous[4]).toBe(0xffffffff);
-  });
-});
diff --git a/typescript/tsconfig.json b/typescript/tsconfig.json
deleted file mode 100644
index f603e467..00000000
--- a/typescript/tsconfig.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "compilerOptions": {
-    "allowUnreachableCode": false,
-    "baseUrl": ".",
-    "declaration": true,
-    "declarationMap": false,
-    "downlevelIteration": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "importHelpers": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "noFallthroughCasesInSwitch": true,
-    "noImplicitAny": true,
-    "noImplicitOverride": true,
-    "noImplicitReturns": true,
-    "noImplicitThis": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noUnusedLocals": true,
-    "sourceMap": true,
-    "inlineSources": true,
-    "strict": true,
-    "strictNullChecks": false,
-    "target": "es2020",
-    "types": [
-      "jasmine"
-    ]
-  },
-  "include": [
-    "**/*.ts"
-  ],
-  "exclude": [
-    "**/*_test.ts"
-  ]
-}
\ No newline at end of file
diff --git a/typescript/utils/color_utils.ts b/typescript/utils/color_utils.ts
deleted file mode 100644
index c3db1860..00000000
--- a/typescript/utils/color_utils.ts
+++ /dev/null
@@ -1,299 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// This file is automatically generated. Do not modify it.
-
-import * as mathUtils from './math_utils.js';
-
-/**
- * Color science utilities.
- *
- * Utility methods for color science constants and color space
- * conversions that aren't HCT or CAM16.
- */
-
-const SRGB_TO_XYZ = [
-  [0.41233895, 0.35762064, 0.18051042],
-  [0.2126, 0.7152, 0.0722],
-  [0.01932141, 0.11916382, 0.95034478],
-];
-
-const XYZ_TO_SRGB = [
-  [
-    3.2413774792388685,
-    -1.5376652402851851,
-    -0.49885366846268053,
-  ],
-  [
-    -0.9691452513005321,
-    1.8758853451067872,
-    0.04156585616912061,
-  ],
-  [
-    0.05562093689691305,
-    -0.20395524564742123,
-    1.0571799111220335,
-  ],
-];
-
-const WHITE_POINT_D65 = [95.047, 100.0, 108.883];
-
-/**
- * Converts a color from RGB components to ARGB format.
- */
-export function argbFromRgb(red: number, green: number, blue: number): number {
-  return (255 << 24 | (red & 255) << 16 | (green & 255) << 8 | blue & 255) >>>
-      0;
-}
-
-/**
- * Converts a color from linear RGB components to ARGB format.
- */
-export function argbFromLinrgb(linrgb: number[]): number {
-  const r = delinearized(linrgb[0]);
-  const g = delinearized(linrgb[1]);
-  const b = delinearized(linrgb[2]);
-  return argbFromRgb(r, g, b);
-}
-
-/**
- * Returns the alpha component of a color in ARGB format.
- */
-export function alphaFromArgb(argb: number): number {
-  return argb >> 24 & 255;
-}
-
-/**
- * Returns the red component of a color in ARGB format.
- */
-export function redFromArgb(argb: number): number {
-  return argb >> 16 & 255;
-}
-
-/**
- * Returns the green component of a color in ARGB format.
- */
-export function greenFromArgb(argb: number): number {
-  return argb >> 8 & 255;
-}
-
-/**
- * Returns the blue component of a color in ARGB format.
- */
-export function blueFromArgb(argb: number): number {
-  return argb & 255;
-}
-
-/**
- * Returns whether a color in ARGB format is opaque.
- */
-export function isOpaque(argb: number): boolean {
-  return alphaFromArgb(argb) >= 255;
-}
-
-/**
- * Converts a color from ARGB to XYZ.
- */
-export function argbFromXyz(x: number, y: number, z: number): number {
-  const matrix = XYZ_TO_SRGB;
-  const linearR = matrix[0][0] * x + matrix[0][1] * y + matrix[0][2] * z;
-  const linearG = matrix[1][0] * x + matrix[1][1] * y + matrix[1][2] * z;
-  const linearB = matrix[2][0] * x + matrix[2][1] * y + matrix[2][2] * z;
-  const r = delinearized(linearR);
-  const g = delinearized(linearG);
-  const b = delinearized(linearB);
-  return argbFromRgb(r, g, b);
-}
-
-/**
- * Converts a color from XYZ to ARGB.
- */
-export function xyzFromArgb(argb: number): number[] {
-  const r = linearized(redFromArgb(argb));
-  const g = linearized(greenFromArgb(argb));
-  const b = linearized(blueFromArgb(argb));
-  return mathUtils.matrixMultiply([r, g, b], SRGB_TO_XYZ);
-}
-
-/**
- * Converts a color represented in Lab color space into an ARGB
- * integer.
- */
-export function argbFromLab(l: number, a: number, b: number): number {
-  const whitePoint = WHITE_POINT_D65;
-  const fy = (l + 16.0) / 116.0;
-  const fx = a / 500.0 + fy;
-  const fz = fy - b / 200.0;
-  const xNormalized = labInvf(fx);
-  const yNormalized = labInvf(fy);
-  const zNormalized = labInvf(fz);
-  const x = xNormalized * whitePoint[0];
-  const y = yNormalized * whitePoint[1];
-  const z = zNormalized * whitePoint[2];
-  return argbFromXyz(x, y, z);
-}
-
-/**
- * Converts a color from ARGB representation to L*a*b*
- * representation.
- *
- * @param argb the ARGB representation of a color
- * @return a Lab object representing the color
- */
-export function labFromArgb(argb: number): number[] {
-  const linearR = linearized(redFromArgb(argb));
-  const linearG = linearized(greenFromArgb(argb));
-  const linearB = linearized(blueFromArgb(argb));
-  const matrix = SRGB_TO_XYZ;
-  const x =
-      matrix[0][0] * linearR + matrix[0][1] * linearG + matrix[0][2] * linearB;
-  const y =
-      matrix[1][0] * linearR + matrix[1][1] * linearG + matrix[1][2] * linearB;
-  const z =
-      matrix[2][0] * linearR + matrix[2][1] * linearG + matrix[2][2] * linearB;
-  const whitePoint = WHITE_POINT_D65;
-  const xNormalized = x / whitePoint[0];
-  const yNormalized = y / whitePoint[1];
-  const zNormalized = z / whitePoint[2];
-  const fx = labF(xNormalized);
-  const fy = labF(yNormalized);
-  const fz = labF(zNormalized);
-  const l = 116.0 * fy - 16;
-  const a = 500.0 * (fx - fy);
-  const b = 200.0 * (fy - fz);
-  return [l, a, b];
-}
-
-/**
- * Converts an L* value to an ARGB representation.
- *
- * @param lstar L* in L*a*b*
- * @return ARGB representation of grayscale color with lightness
- * matching L*
- */
-export function argbFromLstar(lstar: number): number {
-  const y = yFromLstar(lstar);
-  const component = delinearized(y);
-  return argbFromRgb(component, component, component);
-}
-
-/**
- * Computes the L* value of a color in ARGB representation.
- *
- * @param argb ARGB representation of a color
- * @return L*, from L*a*b*, coordinate of the color
- */
-export function lstarFromArgb(argb: number): number {
-  const y = xyzFromArgb(argb)[1];
-  return 116.0 * labF(y / 100.0) - 16.0;
-}
-
-/**
- * Converts an L* value to a Y value.
- *
- * L* in L*a*b* and Y in XYZ measure the same quantity, luminance.
- *
- * L* measures perceptual luminance, a linear scale. Y in XYZ
- * measures relative luminance, a logarithmic scale.
- *
- * @param lstar L* in L*a*b*
- * @return Y in XYZ
- */
-export function yFromLstar(lstar: number): number {
-  return 100.0 * labInvf((lstar + 16.0) / 116.0);
-}
-
-/**
- * Converts a Y value to an L* value.
- *
- * L* in L*a*b* and Y in XYZ measure the same quantity, luminance.
- *
- * L* measures perceptual luminance, a linear scale. Y in XYZ
- * measures relative luminance, a logarithmic scale.
- *
- * @param y Y in XYZ
- * @return L* in L*a*b*
- */
-export function lstarFromY(y: number): number {
-  return labF(y / 100.0) * 116.0 - 16.0;
-}
-
-/**
- * Linearizes an RGB component.
- *
- * @param rgbComponent 0 <= rgb_component <= 255, represents R/G/B
- * channel
- * @return 0.0 <= output <= 100.0, color channel converted to
- * linear RGB space
- */
-export function linearized(rgbComponent: number): number {
-  const normalized = rgbComponent / 255.0;
-  if (normalized <= 0.040449936) {
-    return normalized / 12.92 * 100.0;
-  } else {
-    return Math.pow((normalized + 0.055) / 1.055, 2.4) * 100.0;
-  }
-}
-
-/**
- * Delinearizes an RGB component.
- *
- * @param rgbComponent 0.0 <= rgb_component <= 100.0, represents
- * linear R/G/B channel
- * @return 0 <= output <= 255, color channel converted to regular
- * RGB space
- */
-export function delinearized(rgbComponent: number): number {
-  const normalized = rgbComponent / 100.0;
-  let delinearized = 0.0;
-  if (normalized <= 0.0031308) {
-    delinearized = normalized * 12.92;
-  } else {
-    delinearized = 1.055 * Math.pow(normalized, 1.0 / 2.4) - 0.055;
-  }
-  return mathUtils.clampInt(0, 255, Math.round(delinearized * 255.0));
-}
-
-/**
- * Returns the standard white point; white on a sunny day.
- *
- * @return The white point
- */
-export function whitePointD65(): number[] {
-  return WHITE_POINT_D65;
-}
-
-function labF(t: number): number {
-  const e = 216.0 / 24389.0;
-  const kappa = 24389.0 / 27.0;
-  if (t > e) {
-    return Math.pow(t, 1.0 / 3.0);
-  } else {
-    return (kappa * t + 16) / 116;
-  }
-}
-
-function labInvf(ft: number): number {
-  const e = 216.0 / 24389.0;
-  const kappa = 24389.0 / 27.0;
-  const ft3 = ft * ft * ft;
-  if (ft3 > e) {
-    return ft3;
-  } else {
-    return (116 * ft - 16) / kappa;
-  }
-}
diff --git a/typescript/utils/image_utils.ts b/typescript/utils/image_utils.ts
deleted file mode 100644
index 5dbc8e79..00000000
--- a/typescript/utils/image_utils.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {QuantizerCelebi} from '../quantize/quantizer_celebi.js';
-import {Score} from '../score/score.js';
-
-import {argbFromRgb} from './color_utils.js';
-
-/**
- * Get the source color from an image.
- *
- * @param image The image element
- * @return Source color - the color most suitable for creating a UI theme
- */
-export async function sourceColorFromImage(image: HTMLImageElement) {
-  // Convert Image data to Pixel Array
-  const imageBytes = await new Promise((resolve, reject) => {
-    const canvas = document.createElement('canvas');
-    const context = canvas.getContext('2d');
-    if (!context) {
-      reject(new Error('Could not get canvas context'));
-      return;
-    }
-    const loadCallback = () => {
-      canvas.width = image.width;
-      canvas.height = image.height;
-      context.drawImage(image, 0, 0);
-      let rect = [0, 0, image.width, image.height];
-      const area = image.dataset['area'];
-      if (area && /^\d+(\s*,\s*\d+){3}$/.test(area)) {
-        rect = area.split(/\s*,\s*/).map(s => {
-          // tslint:disable-next-line:ban
-          return parseInt(s, 10);
-        });
-      }
-      const [sx, sy, sw, sh] = rect;
-      resolve(context.getImageData(sx, sy, sw, sh).data);
-    };
-    const errorCallback = () => {
-      reject(new Error('Image load failed'));
-    };
-    if (image.complete) {
-      loadCallback();
-    } else {
-      image.onload = loadCallback;
-      image.onerror = errorCallback;
-    }
-  });
-
-  return sourceColorFromImageBytes(imageBytes);
-}
-
-/**
- * Get the source color from image bytes.
- *
- * @param imageBytes The image bytes
- * @return Source color - the color most suitable for creating a UI theme
- */
-export function sourceColorFromImageBytes(imageBytes: Uint8ClampedArray) {
-  // Convert Image data to Pixel Array
-  const pixels: number[] = [];
-  for (let i = 0; i < imageBytes.length; i += 4) {
-    const r = imageBytes[i];
-    const g = imageBytes[i + 1];
-    const b = imageBytes[i + 2];
-    const a = imageBytes[i + 3];
-    if (a < 255) {
-      continue;
-    }
-    const argb = argbFromRgb(r, g, b);
-    pixels.push(argb);
-  }
-
-  // Convert Pixels to Material Colors
-  const result = QuantizerCelebi.quantize(pixels, 128);
-  const ranked = Score.score(result);
-  const top = ranked[0];
-  return top;
-}
diff --git a/typescript/utils/math_utils.ts b/typescript/utils/math_utils.ts
deleted file mode 100644
index e7a79fac..00000000
--- a/typescript/utils/math_utils.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// This file is automatically generated. Do not modify it.
-
-/**
- * Utility methods for mathematical operations.
- */
-
-/**
- * The signum function.
- *
- * @return 1 if num > 0, -1 if num < 0, and 0 if num = 0
- */
-export function signum(num: number): number {
-  if (num < 0) {
-    return -1;
-  } else if (num === 0) {
-    return 0;
-  } else {
-    return 1;
-  }
-}
-
-/**
- * The linear interpolation function.
- *
- * @return start if amount = 0 and stop if amount = 1
- */
-export function lerp(start: number, stop: number, amount: number): number {
-  return (1.0 - amount) * start + amount * stop;
-}
-
-/**
- * Clamps an integer between two integers.
- *
- * @return input when min <= input <= max, and either min or max
- * otherwise.
- */
-export function clampInt(min: number, max: number, input: number): number {
-  if (input < min) {
-    return min;
-  } else if (input > max) {
-    return max;
-  }
-
-  return input;
-}
-
-/**
- * Clamps an integer between two floating-point numbers.
- *
- * @return input when min <= input <= max, and either min or max
- * otherwise.
- */
-export function clampDouble(min: number, max: number, input: number): number {
-  if (input < min) {
-    return min;
-  } else if (input > max) {
-    return max;
-  }
-
-  return input;
-}
-
-/**
- * Sanitizes a degree measure as an integer.
- *
- * @return a degree measure between 0 (inclusive) and 360
- * (exclusive).
- */
-export function sanitizeDegreesInt(degrees: number): number {
-  degrees = degrees % 360;
-  if (degrees < 0) {
-    degrees = degrees + 360;
-  }
-  return degrees;
-}
-
-/**
- * Sanitizes a degree measure as a floating-point number.
- *
- * @return a degree measure between 0.0 (inclusive) and 360.0
- * (exclusive).
- */
-export function sanitizeDegreesDouble(degrees: number): number {
-  degrees = degrees % 360.0;
-  if (degrees < 0) {
-    degrees = degrees + 360.0;
-  }
-  return degrees;
-}
-
-/**
- * Sign of direction change needed to travel from one angle to
- * another.
- *
- * For angles that are 180 degrees apart from each other, both
- * directions have the same travel distance, so either direction is
- * shortest. The value 1.0 is returned in this case.
- *
- * @param from The angle travel starts from, in degrees.
- * @param to The angle travel ends at, in degrees.
- * @return -1 if decreasing from leads to the shortest travel
- * distance, 1 if increasing from leads to the shortest travel
- * distance.
- */
-export function rotationDirection(from: number, to: number): number {
-  const increasingDifference = sanitizeDegreesDouble(to - from);
-  return increasingDifference <= 180.0 ? 1.0 : -1.0;
-}
-
-/**
- * Distance of two points on a circle, represented using degrees.
- */
-export function differenceDegrees(a: number, b: number): number {
-  return 180.0 - Math.abs(Math.abs(a - b) - 180.0);
-}
-
-/**
- * Multiplies a 1x3 row vector with a 3x3 matrix.
- */
-export function matrixMultiply(row: number[], matrix: number[][]): number[] {
-  const a =
-      row[0] * matrix[0][0] + row[1] * matrix[0][1] + row[2] * matrix[0][2];
-  const b =
-      row[0] * matrix[1][0] + row[1] * matrix[1][1] + row[2] * matrix[1][2];
-  const c =
-      row[0] * matrix[2][0] + row[1] * matrix[2][1] + row[2] * matrix[2][2];
-  return [a, b, c];
-}
diff --git a/typescript/utils/string_utils.ts b/typescript/utils/string_utils.ts
deleted file mode 100644
index 7677fc8e..00000000
--- a/typescript/utils/string_utils.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import * as colorUtils from './color_utils.js';
-
-/**
- * Utility methods for hexadecimal representations of colors.
- */
-
-/**
- * @param argb ARGB representation of a color.
- * @return Hex string representing color, ex. #ff0000 for red.
- */
-export function hexFromArgb(argb: number) {
-  const r = colorUtils.redFromArgb(argb);
-  const g = colorUtils.greenFromArgb(argb);
-  const b = colorUtils.blueFromArgb(argb);
-  const outParts = [r.toString(16), g.toString(16), b.toString(16)];
-
-  // Pad single-digit output values
-  for (const [i, part] of outParts.entries()) {
-    if (part.length === 1) {
-      outParts[i] = '0' + part;
-    }
-  }
-
-  return '#' + outParts.join('');
-}
-
-/**
- * @param hex String representing color as hex code. Accepts strings with or
- *     without leading #, and string representing the color using 3, 6, or 8
- *     hex characters.
- * @return ARGB representation of color.
- */
-export function argbFromHex(hex: string) {
-  hex = hex.replace('#', '');
-  const isThree = hex.length === 3;
-  const isSix = hex.length === 6;
-  const isEight = hex.length === 8;
-  if (!isThree && !isSix && !isEight) {
-    throw new Error('unexpected hex ' + hex);
-  }
-  let r = 0;
-  let g = 0;
-  let b = 0;
-  if (isThree) {
-    r = parseIntHex(hex.slice(0, 1).repeat(2));
-    g = parseIntHex(hex.slice(1, 2).repeat(2));
-    b = parseIntHex(hex.slice(2, 3).repeat(2));
-  } else if (isSix) {
-    r = parseIntHex(hex.slice(0, 2));
-    g = parseIntHex(hex.slice(2, 4));
-    b = parseIntHex(hex.slice(4, 6));
-  } else if (isEight) {
-    r = parseIntHex(hex.slice(2, 4));
-    g = parseIntHex(hex.slice(4, 6));
-    b = parseIntHex(hex.slice(6, 8));
-  }
-
-  return (
-      ((255 << 24) | ((r & 0x0ff) << 16) | ((g & 0x0ff) << 8) | (b & 0x0ff)) >>>
-      0);
-}
-
-function parseIntHex(value: string) {
-  // tslint:disable-next-line:ban
-  return parseInt(value, 16);
-}
diff --git a/typescript/utils/test_utils.ts b/typescript/utils/test_utils.ts
deleted file mode 100644
index 35360d47..00000000
--- a/typescript/utils/test_utils.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import 'jasmine';
-
-import {hexFromArgb} from './string_utils.js';
-
-declare global {
-  namespace jasmine {
-    interface Matchers {
-      matchesColor(expected: number): boolean;
-    }
-  }
-}
-
-/**
- * Exports a matcher called `matchesColor` that takes two numbers, and logs
- * the equivalent hex codes on failure.
- *
- * To use, add to your test file:
- *  beforeEach(() => {
- *    jasmine.addMatchers(customMatchers);
- *  });
- *
- * Then it can be used as a standard matcher:
- *  expect(scheme.onSurface).matchesColor(0xff000000);
- */
-export const customMatchers: jasmine.CustomMatcherFactories = {
-  matchesColor(
-      util: jasmine.MatchersUtil,
-      customEqualityTesters: readonly jasmine.CustomEqualityTester[]) {
-    return {
-      compare(actual: number, expected: number) {
-        const pass = util.equals(actual, expected);
-        return {
-          pass,
-          message: `Expected color ${hexFromArgb(actual)} to ${
-              pass ? 'NOT' : ''} match: ${hexFromArgb(expected)}`,
-        };
-      },
-    };
-  },
-};
diff --git a/typescript/utils/theme_utils.ts b/typescript/utils/theme_utils.ts
deleted file mode 100644
index 51421d2c..00000000
--- a/typescript/utils/theme_utils.ts
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {Blend} from '../blend/blend.js';
-import {CorePalette} from '../palettes/core_palette.js';
-import {TonalPalette} from '../palettes/tonal_palette.js';
-import {Scheme} from '../scheme/scheme.js';
-
-import {sourceColorFromImage} from './image_utils.js';
-import {hexFromArgb} from './string_utils.js';
-
-/**
- * Custom color used to pair with a theme
- */
-export interface CustomColor {
-  value: number;
-  name: string;
-  blend: boolean;
-}
-
-/**
- * Color group
- */
-export interface ColorGroup {
-  color: number;
-  onColor: number;
-  colorContainer: number;
-  onColorContainer: number;
-}
-
-/**
- * Custom Color Group
- */
-export interface CustomColorGroup {
-  color: CustomColor;
-  value: number;
-  light: ColorGroup;
-  dark: ColorGroup;
-}
-
-/**
- * Theme
- */
-export interface Theme {
-  source: number;
-  schemes: {light: Scheme; dark: Scheme;};
-  palettes: {
-    primary: TonalPalette; secondary: TonalPalette; tertiary: TonalPalette;
-    neutral: TonalPalette;
-    neutralVariant: TonalPalette;
-    error: TonalPalette;
-  };
-  customColors: CustomColorGroup[];
-}
-
-/**
- * Generate a theme from a source color
- *
- * @param source Source color
- * @param customColors Array of custom colors
- * @return Theme object
- */
-export function themeFromSourceColor(
-    source: number, customColors: CustomColor[] = []): Theme {
-  const palette = CorePalette.of(source);
-  return {
-    source,
-    schemes: {
-      light: Scheme.light(source),
-      dark: Scheme.dark(source),
-    },
-    palettes: {
-      primary: palette.a1,
-      secondary: palette.a2,
-      tertiary: palette.a3,
-      neutral: palette.n1,
-      neutralVariant: palette.n2,
-      error: palette.error,
-    },
-    customColors: customColors.map((c) => customColor(source, c)),
-  };
-}
-
-/**
- * Generate a theme from an image source
- *
- * @param image Image element
- * @param customColors Array of custom colors
- * @return Theme object
- */
-export async function themeFromImage(
-    image: HTMLImageElement, customColors: CustomColor[] = []) {
-  const source = await sourceColorFromImage(image);
-  return themeFromSourceColor(source, customColors);
-}
-
-/**
- * Generate custom color group from source and target color
- *
- * @param source Source color
- * @param color Custom color
- * @return Custom color group
- *
- * @link https://m3.material.io/styles/color/the-color-system/color-roles
- */
-export function customColor(
-    source: number, color: CustomColor): CustomColorGroup {
-  let value = color.value;
-  const from = value;
-  const to = source;
-  if (color.blend) {
-    value = Blend.harmonize(from, to);
-  }
-  const palette = CorePalette.of(value);
-  const tones = palette.a1;
-  return {
-    color,
-    value,
-    light: {
-      color: tones.tone(40),
-      onColor: tones.tone(100),
-      colorContainer: tones.tone(90),
-      onColorContainer: tones.tone(10),
-    },
-    dark: {
-      color: tones.tone(80),
-      onColor: tones.tone(20),
-      colorContainer: tones.tone(30),
-      onColorContainer: tones.tone(90),
-    },
-  };
-}
-
-/**
- * Apply a theme to an element
- *
- * @param theme Theme object
- * @param options Options
- */
-export function applyTheme(theme: Theme, options?: {
-  dark?: boolean,
-  target?: HTMLElement,
-  brightnessSuffix?: boolean,
-  paletteTones?: number[],
-}) {
-  const target = options?.target || document.body;
-  const isDark = options?.dark ?? false;
-  const scheme = isDark ? theme.schemes.dark : theme.schemes.light;
-  setSchemeProperties(target, scheme);
-  if (options?.brightnessSuffix) {
-    setSchemeProperties(target, theme.schemes.dark, '-dark');
-    setSchemeProperties(target, theme.schemes.light, '-light');
-  }
-  if (options?.paletteTones) {
-    const tones = options?.paletteTones ?? [];
-    for (const [key, palette] of Object.entries(theme.palettes)) {
-      const paletteKey = key.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
-      for (const tone of tones) {
-        const token = `--md-ref-palette-${paletteKey}-${paletteKey}${tone}`;
-        const color = hexFromArgb(palette.tone(tone));
-        target.style.setProperty(token, color);
-      }
-    }
-  }
-}
-
-function setSchemeProperties(
-    target: HTMLElement,
-    scheme: Scheme,
-    suffix: string = '',
-) {
-  for (const [key, value] of Object.entries(scheme.toJSON())) {
-    const token = key.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
-    const color = hexFromArgb(value);
-    target.style.setProperty(`--md-sys-color-${token}${suffix}`, color);
-  }
-}
\ No newline at end of file
diff --git a/typescript/utils/utils_test.ts b/typescript/utils/utils_test.ts
deleted file mode 100644
index 189b7aee..00000000
--- a/typescript/utils/utils_test.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import 'jasmine';
-
-import * as colorUtils from './color_utils.js';
-import * as mathUtils from './math_utils.js';
-
-describe('argbFromRgb', () => {
-  it('returns correct value for black', () => {
-    expect(colorUtils.argbFromRgb(255, 255, 255)).toBe(0xffffffff);
-    expect(colorUtils.argbFromRgb(255, 255, 255)).toBe(4294967295);
-  });
-
-  it('returns correct value for white', () => {
-    expect(colorUtils.argbFromRgb(0, 0, 0)).toBe(0xff000000);
-    expect(colorUtils.argbFromRgb(0, 0, 0)).toBe(4278190080);
-  });
-
-  it('returns correct value for random color', () => {
-    expect(colorUtils.argbFromRgb(50, 150, 250)).toBe(0xff3296fa);
-    expect(colorUtils.argbFromRgb(50, 150, 250)).toBe(4281505530);
-  });
-});
-
-function rotationDirection(from: number, to: number): number {
-  const a = to - from;
-  const b = to - from + 360.0;
-  const c = to - from - 360.0;
-  const aAbs = Math.abs(a);
-  const bAbs = Math.abs(b);
-  const cAbs = Math.abs(c);
-  if (aAbs <= bAbs && aAbs <= cAbs) {
-    return a >= 0.0 ? 1.0 : -1.0;
-  } else if (bAbs <= aAbs && bAbs <= cAbs) {
-    return b >= 0.0 ? 1.0 : -1.0;
-  } else {
-    return c >= 0.0 ? 1.0 : -1.0;
-  }
-}
-
-describe('rotationDirection', () => {
-  it('is identical to the original implementation', () => {
-    for (let from = 0.0; from < 360.0; from += 15.0) {
-      for (let to = 7.5; to < 360.0; to += 15.0) {
-        const expectedAnswer = rotationDirection(from, to);
-        const actualAnswer = mathUtils.rotationDirection(from, to);
-        expect(actualAnswer).toBe(expectedAnswer);
-        expect(Math.abs(actualAnswer)).toBe(1.0);
-      }
-    }
-  });
-});
-
-describe('yFromLstar', () => {
-  it('satisfies given values', () => {
-    expect(colorUtils.yFromLstar(0.0)).toBeCloseTo(0.0, 5);
-    expect(colorUtils.yFromLstar(0.1)).toBeCloseTo(0.0110705, 5);
-    expect(colorUtils.yFromLstar(0.2)).toBeCloseTo(0.0221411, 5);
-    expect(colorUtils.yFromLstar(0.3)).toBeCloseTo(0.0332116, 5);
-    expect(colorUtils.yFromLstar(0.4)).toBeCloseTo(0.0442822, 5);
-    expect(colorUtils.yFromLstar(0.5)).toBeCloseTo(0.0553528, 5);
-    expect(colorUtils.yFromLstar(1.0)).toBeCloseTo(0.1107056, 5);
-    expect(colorUtils.yFromLstar(2.0)).toBeCloseTo(0.2214112, 5);
-    expect(colorUtils.yFromLstar(3.0)).toBeCloseTo(0.3321169, 5);
-    expect(colorUtils.yFromLstar(4.0)).toBeCloseTo(0.4428225, 5);
-    expect(colorUtils.yFromLstar(5.0)).toBeCloseTo(0.5535282, 5);
-    expect(colorUtils.yFromLstar(8.0)).toBeCloseTo(0.8856451, 5);
-    expect(colorUtils.yFromLstar(10.0)).toBeCloseTo(1.1260199, 5);
-    expect(colorUtils.yFromLstar(15.0)).toBeCloseTo(1.9085832, 5);
-    expect(colorUtils.yFromLstar(20.0)).toBeCloseTo(2.9890524, 5);
-    expect(colorUtils.yFromLstar(25.0)).toBeCloseTo(4.4154767, 5);
-    expect(colorUtils.yFromLstar(30.0)).toBeCloseTo(6.2359055, 5);
-    expect(colorUtils.yFromLstar(40.0)).toBeCloseTo(11.2509737, 5);
-    expect(colorUtils.yFromLstar(50.0)).toBeCloseTo(18.4186518, 5);
-    expect(colorUtils.yFromLstar(60.0)).toBeCloseTo(28.1233342, 5);
-    expect(colorUtils.yFromLstar(70.0)).toBeCloseTo(40.7494157, 5);
-    expect(colorUtils.yFromLstar(80.0)).toBeCloseTo(56.6812907, 5);
-    expect(colorUtils.yFromLstar(90.0)).toBeCloseTo(76.3033539, 5);
-    expect(colorUtils.yFromLstar(95.0)).toBeCloseTo(87.6183294, 5);
-    expect(colorUtils.yFromLstar(99.0)).toBeCloseTo(97.4360239, 5);
-    expect(colorUtils.yFromLstar(100.0)).toBeCloseTo(100.0, 5);
-  });
-
-  it('is inverse of lstarFromY', () => {
-    for (let y = 0.0; y <= 100.0; y += 0.1) {
-      const lstar = colorUtils.lstarFromY(y);
-      const reconstructedY = colorUtils.yFromLstar(lstar);
-      expect(reconstructedY).toBeCloseTo(y, 8);
-    }
-  });
-});
-
-describe('lstarFromY', () => {
-  it('satisfies given values', () => {
-    expect(colorUtils.lstarFromY(0.0)).toBeCloseTo(0.0, 5);
-    expect(colorUtils.lstarFromY(0.1)).toBeCloseTo(0.9032962, 5);
-    expect(colorUtils.lstarFromY(0.2)).toBeCloseTo(1.8065925, 5);
-    expect(colorUtils.lstarFromY(0.3)).toBeCloseTo(2.7098888, 5);
-    expect(colorUtils.lstarFromY(0.4)).toBeCloseTo(3.6131851, 5);
-    expect(colorUtils.lstarFromY(0.5)).toBeCloseTo(4.5164814, 5);
-    expect(colorUtils.lstarFromY(0.8856451)).toBeCloseTo(8.0, 5);
-    expect(colorUtils.lstarFromY(1.0)).toBeCloseTo(8.9914424, 5);
-    expect(colorUtils.lstarFromY(2.0)).toBeCloseTo(15.4872443, 5);
-    expect(colorUtils.lstarFromY(3.0)).toBeCloseTo(20.0438970, 5);
-    expect(colorUtils.lstarFromY(4.0)).toBeCloseTo(23.6714419, 5);
-    expect(colorUtils.lstarFromY(5.0)).toBeCloseTo(26.7347653, 5);
-    expect(colorUtils.lstarFromY(10.0)).toBeCloseTo(37.8424304, 5);
-    expect(colorUtils.lstarFromY(15.0)).toBeCloseTo(45.6341970, 5);
-    expect(colorUtils.lstarFromY(20.0)).toBeCloseTo(51.8372115, 5);
-    expect(colorUtils.lstarFromY(25.0)).toBeCloseTo(57.0754208, 5);
-    expect(colorUtils.lstarFromY(30.0)).toBeCloseTo(61.6542222, 5);
-    expect(colorUtils.lstarFromY(40.0)).toBeCloseTo(69.4695307, 5);
-    expect(colorUtils.lstarFromY(50.0)).toBeCloseTo(76.0692610, 5);
-    expect(colorUtils.lstarFromY(60.0)).toBeCloseTo(81.8381891, 5);
-    expect(colorUtils.lstarFromY(70.0)).toBeCloseTo(86.9968642, 5);
-    expect(colorUtils.lstarFromY(80.0)).toBeCloseTo(91.6848609, 5);
-    expect(colorUtils.lstarFromY(90.0)).toBeCloseTo(95.9967686, 5);
-    expect(colorUtils.lstarFromY(95.0)).toBeCloseTo(98.0335184, 5);
-    expect(colorUtils.lstarFromY(99.0)).toBeCloseTo(99.6120372, 5);
-    expect(colorUtils.lstarFromY(100.0)).toBeCloseTo(100.0, 5);
-  });
-
-  it('is inverse of yFromLstar', () => {
-    for (let lstar = 0.0; lstar <= 100.0; lstar += 0.1) {
-      const y = colorUtils.yFromLstar(lstar);
-      const reconstructedLstar = colorUtils.lstarFromY(y);
-      expect(reconstructedLstar).toBeCloseTo(lstar, 8);
-    }
-  });
-});