Skip to content

[Dialog] Add default shape styles in dialog themes #4771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Dialog] Add default shape styles in dialog themes #4771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions lib/java/com/google/android/material/dialog/res/values/themes_base.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,11 +394,22 @@

<!-- Shape attributes. -->
<item name="shapeCornerFamily">@integer/m3_sys_shape_corner_full_corner_family</item>
<item name="shapeCornerSizeExtraSmall">@dimen/m3_sys_shape_corner_value_extra_small</item>
<item name="shapeCornerSizeSmall">@dimen/m3_sys_shape_corner_value_small</item>
<item name="shapeCornerSizeMedium">@dimen/m3_sys_shape_corner_value_medium</item>
<item name="shapeCornerSizeLarge">@dimen/m3_sys_shape_corner_value_large</item>
<item name="shapeCornerSizeLargeIncreased">@dimen/m3_sys_shape_corner_value_large_increased</item>
<item name="shapeCornerSizeExtraLarge">@dimen/m3_sys_shape_corner_value_extra_large</item>
<item name="shapeCornerSizeExtraLargeIncreased">@dimen/m3_sys_shape_corner_value_extra_large_increased</item>
<item name="shapeCornerSizeExtraExtraLarge">@dimen/m3_sys_shape_corner_value_extra_extra_large</item>
<item name="shapeAppearanceCornerExtraSmall">@style/ShapeAppearance.Material3.Corner.ExtraSmall</item>
<item name="shapeAppearanceCornerSmall">@style/ShapeAppearance.Material3.Corner.Small</item>
<item name="shapeAppearanceCornerMedium">@style/ShapeAppearance.Material3.Corner.Medium</item>
<item name="shapeAppearanceCornerLarge">@style/ShapeAppearance.Material3.Corner.Large</item>
<item name="shapeAppearanceCornerLargeIncreased">@style/ShapeAppearance.Material3.Corner.LargeIncreased</item>
<item name="shapeAppearanceCornerExtraLarge">@style/ShapeAppearance.Material3.Corner.ExtraLarge</item>
<item name="shapeAppearanceCornerExtraLargeIncreased">@style/ShapeAppearance.Material3.Corner.ExtraLargeIncreased</item>
<item name="shapeAppearanceCornerExtraExtraLarge">@style/ShapeAppearance.Material3.Corner.ExtraExtraLarge</item>

<!-- Deprecated shape styles. -->
<item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.Material3.SmallComponent</item>
Expand Down Expand Up @@ -695,11 +706,22 @@

<!-- Shape attributes. -->
<item name="shapeCornerFamily">@integer/m3_sys_shape_corner_full_corner_family</item>
<item name="shapeCornerSizeExtraSmall">@dimen/m3_sys_shape_corner_value_extra_small</item>
<item name="shapeCornerSizeSmall">@dimen/m3_sys_shape_corner_value_small</item>
<item name="shapeCornerSizeMedium">@dimen/m3_sys_shape_corner_value_medium</item>
<item name="shapeCornerSizeLarge">@dimen/m3_sys_shape_corner_value_large</item>
<item name="shapeCornerSizeLargeIncreased">@dimen/m3_sys_shape_corner_value_large_increased</item>
<item name="shapeCornerSizeExtraLarge">@dimen/m3_sys_shape_corner_value_extra_large</item>
<item name="shapeCornerSizeExtraLargeIncreased">@dimen/m3_sys_shape_corner_value_extra_large_increased</item>
<item name="shapeCornerSizeExtraExtraLarge">@dimen/m3_sys_shape_corner_value_extra_extra_large</item>
<item name="shapeAppearanceCornerExtraSmall">@style/ShapeAppearance.Material3.Corner.ExtraSmall</item>
<item name="shapeAppearanceCornerSmall">@style/ShapeAppearance.Material3.Corner.Small</item>
<item name="shapeAppearanceCornerMedium">@style/ShapeAppearance.Material3.Corner.Medium</item>
<item name="shapeAppearanceCornerLarge">@style/ShapeAppearance.Material3.Corner.Large</item>
<item name="shapeAppearanceCornerLargeIncreased">@style/ShapeAppearance.Material3.Corner.LargeIncreased</item>
<item name="shapeAppearanceCornerExtraLarge">@style/ShapeAppearance.Material3.Corner.ExtraLarge</item>
<item name="shapeAppearanceCornerExtraLargeIncreased">@style/ShapeAppearance.Material3.Corner.ExtraLargeIncreased</item>
<item name="shapeAppearanceCornerExtraExtraLarge">@style/ShapeAppearance.Material3.Corner.ExtraExtraLarge</item>

<!-- Deprecated shape styles. -->
<item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.Material3.SmallComponent</item>
Expand Down
41 changes: 41 additions & 0 deletions lib/javatests/com/google/android/material/theme/ThemeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,12 @@ public class ThemeTest {
.addAll(MATERIAL_NON_BRIDGE_WIDGET_STYLE_ATTRIBUTES)
.build();

private static final ImmutableList<Integer> MATERIAL_BRIDGE_SHAPE_ATTRIBUTES =
ImmutableList.of(
R.attr.shapeAppearanceSmallComponent,
R.attr.shapeAppearanceMediumComponent,
R.attr.shapeAppearanceLargeComponent);

/**
* These are all the attributes where the light bridge theme should match the light full theme and
* the dark bridge theme should match the dark full theme.
Expand All @@ -219,6 +225,7 @@ public class ThemeTest {
ImmutableList.<Integer>builder()
.addAll(MATERIAL_BRIDGE_COLOR_ATTRIBUTES)
.addAll(MATERIAL_BRIDGE_WIDGET_STYLE_ATTRIBUTES)
.addAll(MATERIAL_BRIDGE_SHAPE_ATTRIBUTES)
.addAll(MATERIAL_MOTION_ATTRIBUTES)
.addAll(DEPRECATED_TYPOGRAPHY_ATTRIBUTES)
.build();
Expand All @@ -231,6 +238,7 @@ public class ThemeTest {
ImmutableList.<Integer>builder()
.addAll(MATERIAL_FULL_COLOR_ATTRIBUTES)
.addAll(MATERIAL_MOTION_ATTRIBUTES)
.addAll(MATERIAL_BRIDGE_SHAPE_ATTRIBUTES)
.addAll(MATERIAL_COMMON_WIDGET_STYLE_ATTRIBUTES)
.build();

Expand Down Expand Up @@ -363,6 +371,32 @@ public class ThemeTest {
.addAll(DEFAULT_FRAMEWORK_TEXT_STYLE_ATTRIBUTES)
.build();

private static final ImmutableList<Integer> M3_SHAPE_ATTRIBUTES =
ImmutableList.of(
R.attr.shapeCornerFamily,
R.attr.shapeCornerSizeExtraSmall,
R.attr.shapeCornerSizeSmall,
R.attr.shapeCornerSizeMedium,
R.attr.shapeCornerSizeLarge,
R.attr.shapeCornerSizeLargeIncreased,
R.attr.shapeCornerSizeExtraLarge,
R.attr.shapeCornerSizeExtraLargeIncreased,
R.attr.shapeCornerSizeExtraExtraLarge,
R.attr.shapeAppearanceCornerExtraSmall,
R.attr.shapeAppearanceCornerSmall,
R.attr.shapeAppearanceCornerMedium,
R.attr.shapeAppearanceCornerLarge,
R.attr.shapeAppearanceCornerLargeIncreased,
R.attr.shapeAppearanceCornerExtraLarge,
R.attr.shapeAppearanceCornerExtraLargeIncreased,
R.attr.shapeAppearanceCornerExtraExtraLarge);

private static final ImmutableList<Integer> M3_FULL_SHAPE_ATTRIBUTES =
ImmutableList.<Integer>builder()
.addAll(MATERIAL_BRIDGE_SHAPE_ATTRIBUTES)
.addAll(M3_SHAPE_ATTRIBUTES)
.build();

private static final ImmutableList<Integer> M3_ACTIVE_MOTION_ATTRIBUTES =
ImmutableList.of(
R.attr.motionSpringFastSpatial,
Expand Down Expand Up @@ -484,6 +518,7 @@ public class ThemeTest {
ImmutableList.<Integer>builder()
.addAll(M3_FULL_COLOR_ATTRIBUTES)
.addAll(M3_FULL_TYPOGRAPHY_ATTRIBUTES)
.addAll(M3_FULL_SHAPE_ATTRIBUTES)
.addAll(M3_FULL_MOTION_ATTRIBUTES)
.addAll(M3_COMMON_WIDGET_STYLE_ATTRIBUTES)
.build();
Expand Down Expand Up @@ -609,6 +644,12 @@ public static ImmutableList<Object[]> getTestData() {
R.style.Theme_Material3_Dark,
R.style.Theme_Material3_Light,
M3_FULL_TYPOGRAPHY_ATTRIBUTES))
// Compare M3 Light and Dark themes - they should have the same shape styles.
.addAll(
createTestData(
R.style.Theme_Material3_Dark,
R.style.Theme_Material3_Light,
M3_FULL_SHAPE_ATTRIBUTES))
// Compare M3 Light and Dark themes - they should have the same motion styles.
.addAll(
createTestData(
Expand Down