[M3][Color] Refactored ColorHarmonizationDemoFragment to DemoActivity

PiperOrigin-RevId: 448907753

Author: Material Design Team

…/ColorHarmonizationDemoFragmentTest.java …/ColorHarmonizationDemoActivityTest.javacatalog/androidTest/javatests/io/material/catalog/color/ColorHarmonizationDemoFragmentTest.java renamed to catalog/androidTest/javatests/io/material/catalog/color/ColorHarmonizationDemoActivityTest.java catalog/androidTest/javatests/io/material/catalog/color/ColorHarmonizationDemoFragmentTest.java renamed to catalog/androidTest/javatests/io/material/catalog/color/ColorHarmonizationDemoActivityTest.java

@@ -22,39 +22,21 @@
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 
-import androidx.fragment.app.Fragment;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import io.material.catalog.main.MainActivity;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-/** Tests for {@link ColorHarmonizationDemoFragment} */
+/** Tests for {@link ColorHarmonizationDemoActivity} */
 @MediumTest
 @RunWith(AndroidJUnit4.class)
-public class ColorHarmonizationDemoFragmentTest {
+public class ColorHarmonizationDemoActivityTest {
 
   @Rule
-  public final ActivityScenarioRule<MainActivity> activityScenarioRule =
-      new ActivityScenarioRule<>(MainActivity.class);
-
-  @Before
-  public void setUpAndLaunchFragment() {
-    Fragment fragment = new ColorHarmonizationDemoFragment();
-
-    activityScenarioRule
-        .getScenario()
-        .onActivity(
-            activity ->
-                activity
-                    .getSupportFragmentManager()
-                    .beginTransaction()
-                    .replace(io.material.catalog.feature.R.id.container, fragment)
-                    .commit());
-  }
+  public final ActivityScenarioRule<ColorHarmonizationDemoActivity> activityScenarioRule =
+      new ActivityScenarioRule<>(ColorHarmonizationDemoActivity.class);
 
   @Test
   public void checkButtonsAreShown() {

catalog/java/io/material/catalog/AndroidManifest.xml

@@ -94,6 +94,9 @@
     <activity
       android:name="io.material.catalog.adaptive.AdaptiveSupportingPanelDemoActivity"
       android:exported="true" />
+    <activity
+      android:name="io.material.catalog.color.ColorHarmonizationDemoActivity"
+      android:exported="true" />
   </application>
 
 </manifest>

…olor/ColorHarmonizationDemoFragment.java …olor/ColorHarmonizationDemoActivity.javacatalog/java/io/material/catalog/color/ColorHarmonizationDemoFragment.java renamed to catalog/java/io/material/catalog/color/ColorHarmonizationDemoActivity.java catalog/java/io/material/catalog/color/ColorHarmonizationDemoFragment.java renamed to catalog/java/io/material/catalog/color/ColorHarmonizationDemoActivity.java

@@ -27,15 +27,16 @@
 import androidx.annotation.IdRes;
 import androidx.annotation.Nullable;
 import com.google.android.material.color.DynamicColors;
+import com.google.android.material.color.HarmonizedColorAttributes;
 import com.google.android.material.color.HarmonizedColors;
 import com.google.android.material.color.HarmonizedColorsOptions;
 import com.google.android.material.switchmaterial.SwitchMaterial;
-import io.material.catalog.feature.DemoFragment;
+import io.material.catalog.feature.DemoActivity;
 import java.util.ArrayList;
 import java.util.List;
 
 /** A fragment that displays the Color Harmonization demo for the Catalog app. */
-public class ColorHarmonizationDemoFragment extends DemoFragment {
+public class ColorHarmonizationDemoActivity extends DemoActivity {
 
   private static final HarmonizableButtonData[] HARMONIZABLE_BUTTON_DATA_LIST =
       new HarmonizableButtonData[] {
@@ -56,14 +57,18 @@ public class ColorHarmonizationDemoFragment extends DemoFragment {
         new HarmonizableButtonData(
             R.id.blue_button_light, R.color.blue_reference, /* isLightButton= */ true),
       };
-  // TODO(b/231143697): Refactor this class to a DemoActivity and showcase harmonization using
-  // error color attributes.
+
   private static final ColorHarmonizationGridRowData[] HARMONIZATION_GRID_ROW_DATA_LIST =
       new ColorHarmonizationGridRowData[] {
         new ColorHarmonizationGridRowData(
             R.id.cat_colors_error,
             R.id.cat_colors_harmonized_error,
-            R.color.error_reference,
+            new int[] {
+              R.attr.colorError,
+              R.attr.colorOnError,
+              R.attr.colorErrorContainer,
+              R.attr.colorOnErrorContainer
+            },
             R.array.cat_error_strings),
         new ColorHarmonizationGridRowData(
             R.id.cat_colors_yellow,
@@ -98,16 +103,14 @@ public View onCreateDemoView(
         layoutInflater.inflate(
             R.layout.cat_colors_harmonization_fragment, viewGroup, false /* attachToRoot */);
 
-    dynamicColorsContext = DynamicColors.wrapContextIfAvailable(requireContext());
+    dynamicColorsContext = DynamicColors.wrapContextIfAvailable(this);
     HarmonizedColorsOptions options =
         new HarmonizedColorsOptions.Builder()
             .setColorResourceIds(
                 new int[] {
-                  R.color.error_reference,
-                  R.color.yellow_reference,
-                  R.color.blue_reference,
-                  R.color.green_reference,
+                  R.color.yellow_reference, R.color.blue_reference, R.color.green_reference,
                 })
+            .setColorAttributes(HarmonizedColorAttributes.createMaterialDefaults())
             .build();
     harmonizedContext = HarmonizedColors.wrapContextIfAvailable(dynamicColorsContext, options);
 
@@ -132,20 +135,39 @@ public View onCreateDemoView(
     return demoView;
   }
 
+  // This will disable app-wide color harmonization, to not have conflicts with the harmonization
+  // logic within this demo.
+  @Override
+  public boolean isColorHarmonizationEnabled() {
+    return false;
+  }
+
   private void createColorGridAndPopulateLayout(
       Context context,
       ColorHarmonizationGridRowData colorHarmonizationGridRowData,
       @IdRes int layoutId) {
-    ColorGrid colorGrid =
-        ColorGrid.createFromColorGridData(
-            ColorGridData.createFromColorResId(
-                context,
-                colorHarmonizationGridRowData.getColorResId(),
-                colorHarmonizationGridRowData.getColorNameIds()));
+    ColorGrid colorGrid = createColorGrid(context, colorHarmonizationGridRowData);
     LinearLayout layout = demoView.findViewById(layoutId);
     layout.addView(colorGrid.renderView(context, layout));
   }
 
+  private ColorGrid createColorGrid(
+      Context context, ColorHarmonizationGridRowData colorHarmonizationGridRowData) {
+    if (colorHarmonizationGridRowData.getColorAttributeResIds().length > 0
+        && colorHarmonizationGridRowData.getColorResId() == 0) {
+      return ColorGrid.createFromAttrResId(
+          context,
+          getResources().getStringArray(colorHarmonizationGridRowData.getColorNameIds()),
+          colorHarmonizationGridRowData.getColorAttributeResIds());
+    } else {
+      return ColorGrid.createFromColorGridData(
+          ColorGridData.createFromColorResId(
+              context,
+              colorHarmonizationGridRowData.getColorResId(),
+              colorHarmonizationGridRowData.getColorNameIds()));
+    }
+  }
+
   private void updateButtons(boolean harmonize) {
     for (HarmonizableButton button : harmonizableButtonList) {
       button.updateColors(harmonize);

catalog/java/io/material/catalog/color/ColorHarmonizationGridRowData.java

@@ -27,6 +27,7 @@ final class ColorHarmonizationGridRowData {
   @IdRes private final int rightLayoutId;
   @ColorRes private final int colorResId;
   @ArrayRes private final int colorNameIds;
+  private final int[] colorAttributeResIds;
 
   ColorHarmonizationGridRowData(
       @IdRes int leftLayoutId,
@@ -36,6 +37,19 @@ final class ColorHarmonizationGridRowData {
     this.leftLayoutId = leftLayoutId;
     this.rightLayoutId = rightLayoutId;
     this.colorResId = colorResId;
+    this.colorAttributeResIds = new int[] {};
+    this.colorNameIds = colorNameIds;
+  }
+
+  ColorHarmonizationGridRowData(
+      @IdRes int leftLayoutId,
+      @IdRes int rightLayoutId,
+      int[] colorAttributeResIds,
+      @ArrayRes int colorNameIds) {
+    this.leftLayoutId = leftLayoutId;
+    this.rightLayoutId = rightLayoutId;
+    this.colorResId = 0;
+    this.colorAttributeResIds = colorAttributeResIds;
     this.colorNameIds = colorNameIds;
   }
 
@@ -58,4 +72,8 @@ int getColorResId() {
   int getColorNameIds() {
     return colorNameIds;
   }
+
+  int[] getColorAttributeResIds() {
+    return colorAttributeResIds;
+  }
 }

catalog/java/io/material/catalog/color/ColorsFragment.java

@@ -18,9 +18,11 @@
 
 import io.material.catalog.R;
 
+import android.content.Intent;
 import androidx.fragment.app.Fragment;
 import androidx.annotation.NonNull;
 import com.google.android.material.color.DynamicColors;
+import com.google.android.material.color.HarmonizedColors;
 import dagger.Provides;
 import dagger.android.ContributesAndroidInjector;
 import dagger.multibindings.IntoSet;
@@ -69,13 +71,15 @@ public Fragment createFragment() {
             }
           });
     }
-    additionalDemos.add(
-        new Demo(R.string.cat_color_harmonization) {
-          @Override
-          public Fragment createFragment() {
-            return new ColorHarmonizationDemoFragment();
-          }
-        });
+    if (HarmonizedColors.isHarmonizedColorAvailable()) {
+      additionalDemos.add(
+          new Demo(R.string.cat_color_harmonization) {
+            @Override
+            public Intent createActivityIntent() {
+              return new Intent(getContext(), ColorHarmonizationDemoActivity.class);
+            }
+          });
+    }
     return additionalDemos;
   }
 

catalog/java/io/material/catalog/preferences/BaseCatalogActivity.java

@@ -41,6 +41,11 @@ public boolean isPreferencesEnabled() {
     return false;
   }
 
+  /** Returns {@code true} if color harmonization is enabled. */
+  public boolean isColorHarmonizationEnabled() {
+    return true;
+  }
+
   @Override
   public AndroidInjector<Object> androidInjector() {
     return androidInjector;

catalog/java/io/material/catalog/preferences/DynamicColorPreference.java

@@ -94,9 +94,13 @@ private void applyDynamicColorsWithMaterialDefaultHarmonization(@NonNull Context
         new DynamicColorsOptions.Builder()
             .setPrecondition(precondition)
             .setOnAppliedCallback(
-                activity ->
+                activity -> {
+                  if ((activity instanceof BaseCatalogActivity)
+                      && ((BaseCatalogActivity) activity).isColorHarmonizationEnabled()) {
                     HarmonizedColors.applyToContextIfAvailable(
-                        activity, HarmonizedColorsOptions.createMaterialDefaults()))
+                        activity, HarmonizedColorsOptions.createMaterialDefaults());
+                  }
+                })
             .build());
   }
 }