Skip to content

Commit

Permalink
[M3][Color] Added ColorGrid classes for color harmonization demo.
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 445883341
(cherry picked from commit 0347587)
  • Loading branch information
Material Design Team authored and dsn5ft committed May 4, 2022
1 parent 207cb53 commit fcc1091
Show file tree
Hide file tree
Showing 6 changed files with 293 additions and 3 deletions.
102 changes: 102 additions & 0 deletions catalog/java/io/material/catalog/color/ColorGrid.java
@@ -0,0 +1,102 @@
/*
* Copyright 2022 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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 io.material.catalog.color;

import io.material.catalog.R;

import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import com.google.android.material.color.ColorRoles;

/** A class to form side-by-side color palettes. */
final class ColorGrid {

@NonNull private final MaterialColorSpec materialColorSpecAccent;
@NonNull private final MaterialColorSpec materialColorSpecOnAccent;
@NonNull private final MaterialColorSpec materialColorSpecAccentContainer;
@NonNull private final MaterialColorSpec materialColorSpecOnAccentContainer;

static ColorGrid createFromColorGridData(Context context, ColorGridData colorGridData) {
ColorRoles colorRoles = colorGridData.getColorRoles();
ColorRoleNames colorRoleNames = colorGridData.getColorRoleNames();
MaterialColorSpec[] materialColorSpecs =
new MaterialColorSpec[] {
MaterialColorSpec.createFromColorValue(
colorRoleNames.getAccentName(), colorRoles.getAccent()),
MaterialColorSpec.createFromColorValue(
colorRoleNames.getOnAccentName(), colorRoles.getOnAccent()),
MaterialColorSpec.createFromColorValue(
colorRoleNames.getAccentContainerName(), colorRoles.getAccentContainer()),
MaterialColorSpec.createFromColorValue(
colorRoleNames.getOnAccentContainerName(), colorRoles.getOnAccentContainer()),
};
return new ColorGrid(
materialColorSpecs[0], materialColorSpecs[1], materialColorSpecs[2], materialColorSpecs[3]);
}

static ColorGrid createFromAttrResId(Context context, String[] colorNames, int[] attrResIds) {
if (colorNames.length < 4 || colorNames.length != attrResIds.length) {
throw new IllegalArgumentException(
"Color names need to be at least four and correspond to attribute resource ids.");
}
return new ColorGrid(
MaterialColorSpec.createFromAttrResId(context, colorNames[0], attrResIds[0]),
MaterialColorSpec.createFromAttrResId(context, colorNames[1], attrResIds[1]),
MaterialColorSpec.createFromAttrResId(context, colorNames[2], attrResIds[2]),
MaterialColorSpec.createFromAttrResId(context, colorNames[3], attrResIds[3]));
}

private ColorGrid(
@NonNull MaterialColorSpec materialColorSpecAccent,
@NonNull MaterialColorSpec materialColorSpecOnAccent,
@NonNull MaterialColorSpec materialColorSpecAccentContainer,
@NonNull MaterialColorSpec materialColorSpecOnAccentContainer) {
this.materialColorSpecAccent = materialColorSpecAccent;
this.materialColorSpecOnAccent = materialColorSpecOnAccent;
this.materialColorSpecAccentContainer = materialColorSpecAccentContainer;
this.materialColorSpecOnAccentContainer = materialColorSpecOnAccentContainer;
}

View renderView(Context context, ViewGroup container) {
View catalogColorsGrid =
LayoutInflater.from(context)
.inflate(R.layout.cat_colors_grid, container, /* attachToRoot= */ false);

bindColorSpecItem(catalogColorsGrid, R.id.cat_color_accent, materialColorSpecAccent);
bindColorSpecItem(catalogColorsGrid, R.id.cat_color_on_accent, materialColorSpecOnAccent);
bindColorSpecItem(
catalogColorsGrid, R.id.cat_color_accent_container, materialColorSpecAccentContainer);
bindColorSpecItem(
catalogColorsGrid, R.id.cat_color_on_accent_container, materialColorSpecOnAccentContainer);

return catalogColorsGrid;
}

private static void bindColorSpecItem(
View gridView, @IdRes int textViewId, MaterialColorSpec materialColorSpec) {
TextView colorSpec = gridView.findViewById(textViewId);

colorSpec.setText(materialColorSpec.getDescription());
colorSpec.setTextColor(ColorDemoUtils.getTextColor(materialColorSpec.getColorValue()));
colorSpec.setBackgroundColor(materialColorSpec.getColorValue());
}
}
58 changes: 58 additions & 0 deletions catalog/java/io/material/catalog/color/ColorGridData.java
@@ -0,0 +1,58 @@
/*
* Copyright 2022 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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 io.material.catalog.color;

import android.content.Context;
import androidx.annotation.ArrayRes;
import androidx.annotation.ColorInt;
import androidx.annotation.ColorRes;
import com.google.android.material.color.ColorRoles;
import com.google.android.material.color.MaterialColors;

/** A class that provides data for {@link ColorGrid}. */
final class ColorGridData {

private final ColorRoles colorRoles;
private final ColorRoleNames colorRoleNames;

static ColorGridData createFromColorResId(
Context context, @ColorRes int colorResourceId, @ArrayRes int colorNameIds) {
return createFromColorValue(
context, context.getResources().getColor(colorResourceId), colorNameIds);
}

static ColorGridData createFromColorValue(
Context context, @ColorInt int seedColorValue, @ArrayRes int colorNameIds) {
String[] colorNames = context.getResources().getStringArray(colorNameIds);
return new ColorGridData(
MaterialColors.getColorRoles(context, seedColorValue),
new ColorRoleNames(colorNames[0], colorNames[1], colorNames[2], colorNames[3]));
}

private ColorGridData(ColorRoles colorRoles, ColorRoleNames colorRoleNames) {
this.colorRoles = colorRoles;
this.colorRoleNames = colorRoleNames;
}

ColorRoles getColorRoles() {
return colorRoles;
}

ColorRoleNames getColorRoleNames() {
return colorRoleNames;
}
}
57 changes: 57 additions & 0 deletions catalog/java/io/material/catalog/color/ColorRoleNames.java
@@ -0,0 +1,57 @@
/*
* Copyright (C) 2022 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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 io.material.catalog.color;

/** A class defines the name for color role. */
final class ColorRoleNames {

private final String accentName;
private final String onAccentName;
private final String accentContainerName;
private final String onAccentContainerName;

public ColorRoleNames(
String accentName,
String onAccentName,
String accentContainerName,
String onAccentContainerName) {
this.accentName = accentName;
this.onAccentName = onAccentName;
this.accentContainerName = accentContainerName;
this.onAccentContainerName = onAccentContainerName;
}

/** Returns the accent color name. */
public String getAccentName() {
return accentName;
}

/** Returns the on_accent color name. */
public String getOnAccentName() {
return onAccentName;
}

/** Returns the accent_container color name. */
public String getAccentContainerName() {
return accentContainerName;
}

/** Returns the on_accent_container color name. */
public String getOnAccentContainerName() {
return onAccentContainerName;
}
}
14 changes: 11 additions & 3 deletions catalog/java/io/material/catalog/color/MaterialColorSpec.java
Expand Up @@ -17,10 +17,11 @@
package io.material.catalog.color;

import android.content.Context;
import androidx.annotation.AttrRes;
import androidx.annotation.ColorInt;
import androidx.annotation.ColorRes;
import androidx.annotation.StringRes;
import androidx.core.content.ContextCompat;
import com.google.android.material.color.MaterialColors;

/**
* Represents a color value as defined in the Material Spec.
Expand Down Expand Up @@ -51,7 +52,14 @@ static MaterialColorSpec createFromResource(Context context, @ColorRes int color
}

static MaterialColorSpec createFromColorValue(
Context context, @StringRes int colorNameResId, @ColorInt int colorValue) {
return new MaterialColorSpec(context.getString(colorNameResId), colorValue);
String colorNameResource, @ColorInt int colorValue) {
return new MaterialColorSpec(colorNameResource, colorValue);
}

static MaterialColorSpec createFromAttrResId(
Context context, String colorNameResource, @AttrRes int attrRes) {
return createFromColorValue(
colorNameResource,
MaterialColors.getColor(context, attrRes, colorNameResource + "cannot be resolved."));
}
}
@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2021 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >

<TextView
android:id="@+id/cat_color_accent"
android:padding="@dimen/cat_colors_grid_item_padding"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="@dimen/cat_colors_grid_item_height" />

<TextView
android:id="@+id/cat_color_on_accent"
android:padding="@dimen/cat_colors_grid_item_padding"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="@dimen/cat_colors_grid_item_height" />
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >

<TextView
android:id="@+id/cat_color_accent_container"
android:padding="@dimen/cat_colors_grid_item_padding"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="@dimen/cat_colors_grid_item_height" />

<TextView
android:id="@+id/cat_color_on_accent_container"
android:padding="@dimen/cat_colors_grid_item_padding"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="@dimen/cat_colors_grid_item_height" />
</LinearLayout>
</LinearLayout>
2 changes: 2 additions & 0 deletions catalog/java/io/material/catalog/color/res/values/dimens.xml
Expand Up @@ -17,4 +17,6 @@

<resources>
<dimen name="cat_colors_header_space">32dp</dimen>
<dimen name="cat_colors_grid_item_padding">4dp</dimen>
<dimen name="cat_colors_grid_item_height">60dp</dimen>
</resources>

0 comments on commit fcc1091

Please sign in to comment.