Skip to content

[Internal] Update naming of base styles #4554

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
+64 −189
Open

[Internal] Update naming of base styles #4554

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
16 changes: 4 additions & 12 deletions lib/java/com/google/android/material/bottomsheet/res/values/themes_base.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,29 @@
~ limitations under the License.
-->
<resources>
<style name="Base.V14.Theme.Material3.Light.BottomSheetDialog" parent="Theme.Material3.Light.Dialog">
<style name="Base.Theme.Material3.Light.BottomSheetDialog" parent="Theme.Material3.Light.Dialog">
<item name="android:windowIsFloating">false</item>
<item name="android:windowSoftInputMode">adjustResize</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowAnimationStyle">@style/Animation.Material3.BottomSheetDialog</item>
<item name="bottomSheetStyle">@style/Widget.Material3.BottomSheet.Modal</item>
</style>

<style name="Base.V14.Theme.Material3.Dark.BottomSheetDialog" parent="Theme.Material3.Dark.Dialog">
<style name="Base.Theme.Material3.Dark.BottomSheetDialog" parent="Theme.Material3.Dark.Dialog">
<item name="android:windowIsFloating">false</item>
<item name="android:windowSoftInputMode">adjustResize</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowAnimationStyle">@style/Animation.Material3.BottomSheetDialog</item>
<item name="bottomSheetStyle">@style/Widget.Material3.BottomSheet.Modal</item>
</style>

<style name="Base.V14.ThemeOverlay.Material3.BottomSheetDialog" parent="Base.ThemeOverlay.Material3.Dialog">
<style name="Base.ThemeOverlay.Material3.BottomSheetDialog" parent="Base.ThemeOverlay.Material3.Dialog">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowIsFloating">false</item>
<item name="android:windowSoftInputMode">adjustResize</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowAnimationStyle">@style/Animation.Material3.BottomSheetDialog</item>
<item name="bottomSheetStyle">@style/Widget.Material3.BottomSheet.Modal</item>
<item name="enableEdgeToEdge">true</item>
</style>

<style name="Base.V21.ThemeOverlay.Material3.BottomSheetDialog"
parent="Base.V14.ThemeOverlay.Material3.BottomSheetDialog">
<item name="android:statusBarColor">@android:color/transparent</item>
</style>

<style name="Base.Theme.Material3.Light.BottomSheetDialog" parent="Base.V14.Theme.Material3.Light.BottomSheetDialog"/>
<style name="Base.Theme.Material3.Dark.BottomSheetDialog" parent="Base.V14.Theme.Material3.Dark.BottomSheetDialog"/>
<style name="Base.ThemeOverlay.Material3.BottomSheetDialog" parent="Base.V21.ThemeOverlay.Material3.BottomSheetDialog"/>
</resources>
28 changes: 0 additions & 28 deletions lib/java/com/google/android/material/dialog/res/values-v24/themes_base.xml
View file
Open in desktop

This file was deleted.

46 changes: 16 additions & 30 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 @@ -16,9 +16,6 @@
-->
<resources xmlns:tools="http://schemas.android.com/tools">

<!-- All new attributes should be set in the follow four Base.V14 themes. -->
<eat-comment/>

<!-- Base themes of Theme.Material3Expressive themes for dialogs. -->

<style name="Base.Theme.Material3Expressive.Light.Dialog" parent="Theme.Material3.Light.Dialog">
Expand Down Expand Up @@ -160,7 +157,7 @@

<!-- Base themes of Theme.Material3 themes for dialogs. -->

<style name="Base.V14.Theme.Material3.Light.Dialog" parent="Theme.MaterialComponents.Light.Dialog">
<style name="Base.Theme.Material3.Light.Dialog" parent="Theme.MaterialComponents.Light.Dialog">
<item name="isMaterial3Theme">true</item>

<!-- Color palettes -->
Expand Down Expand Up @@ -249,6 +246,7 @@
<item name="collapsingToolbarLayoutStyle">@style/Widget.Material3.CollapsingToolbar</item>
<item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3.CollapsingToolbar.Medium</item>
<item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3.CollapsingToolbar.Large</item>
<item name="android:contextPopupMenuStyle" tools:targetApi="n">@style/Widget.Material3.PopupMenu.ContextMenu</item>
<item name="dockedToolbarStyle">@style/Widget.Material3.DockedToolbar</item>
<item name="dockedToolbarVibrantStyle">@style/Widget.Material3.DockedToolbar.Vibrant</item>
<item name="drawerLayoutStyle">@style/Widget.Material3.DrawerLayout</item>
Expand Down Expand Up @@ -461,7 +459,7 @@
<item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3.DynamicColors.Light</item>
</style>

<style name="Base.V14.Theme.Material3.Dark.Dialog" parent="Theme.MaterialComponents.Dialog">
<style name="Base.Theme.Material3.Dark.Dialog" parent="Theme.MaterialComponents.Dialog">
<item name="isMaterial3Theme">true</item>

<!-- Color palettes -->
Expand Down Expand Up @@ -550,6 +548,7 @@
<item name="collapsingToolbarLayoutStyle">@style/Widget.Material3.CollapsingToolbar</item>
<item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3.CollapsingToolbar.Medium</item>
<item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3.CollapsingToolbar.Large</item>
<item name="android:contextPopupMenuStyle" tools:targetApi="n">@style/Widget.Material3.PopupMenu.ContextMenu</item>
<item name="dockedToolbarStyle">@style/Widget.Material3.DockedToolbar</item>
<item name="dockedToolbarVibrantStyle">@style/Widget.Material3.DockedToolbar.Vibrant</item>
<item name="drawerLayoutStyle">@style/Widget.Material3.DrawerLayout</item>
Expand Down Expand Up @@ -762,9 +761,6 @@
<item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3.DynamicColors.Dark</item>
</style>

<style name="Base.Theme.Material3.Light.Dialog" parent="Base.V14.Theme.Material3.Light.Dialog"/>
<style name="Base.Theme.Material3.Dark.Dialog" parent="Base.V14.Theme.Material3.Dark.Dialog"/>

<style name="Base.Theme.Material3.Light.Dialog.FixedSize">
<item name="windowFixedWidthMajor">@dimen/abc_dialog_fixed_width_major</item>
<item name="windowFixedWidthMinor">@dimen/abc_dialog_fixed_width_minor</item>
Expand All @@ -779,7 +775,15 @@
<item name="windowFixedHeightMinor">@dimen/abc_dialog_fixed_height_minor</item>
</style>

<style name="Base.V14.Theme.MaterialComponents.Dialog" parent="Base.V14.Theme.MaterialComponents.Dialog.Bridge">
<!-- Themes in the "Base.Theme" family vary based on the current platform
version to provide the correct basis on each device. You probably don't
want to use them directly in your apps.

Themes in the "Theme.MaterialComponents" family are meant to be extended or used
directly by apps. -->
<eat-comment/>

<style name="Base.Theme.MaterialComponents.Dialog" parent="Base.Theme.MaterialComponents.Dialog.Bridge">
<item name="viewInflaterClass">com.google.android.material.theme.MaterialComponentsViewInflater</item>

<item name="colorPrimary">@color/design_dark_default_color_primary</item>
Expand Down Expand Up @@ -825,18 +829,15 @@
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar</item>

<item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert</item>
<item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert.Framework</item>
<item name="materialAlertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog</item>

<!-- Type styles -->
<item name="textAppearanceLargePopupMenu">?attr/textAppearanceSubtitle1</item>
<item name="textAppearanceSmallPopupMenu">?attr/textAppearanceSubtitle1</item>
</style>

<style name="Base.V21.Theme.MaterialComponents.Dialog" parent="Base.V14.Theme.MaterialComponents.Dialog">
<item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert.Framework</item>
</style>

<style name="Base.V14.Theme.MaterialComponents.Light.Dialog" parent="Base.V14.Theme.MaterialComponents.Light.Dialog.Bridge">
<style name="Base.Theme.MaterialComponents.Light.Dialog" parent="Base.Theme.MaterialComponents.Light.Dialog.Bridge">
<item name="viewInflaterClass">com.google.android.material.theme.MaterialComponentsViewInflater</item>

<!-- Colors -->
Expand Down Expand Up @@ -882,29 +883,14 @@
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar</item>

<item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert</item>
<item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Light.Dialog.Alert.Framework</item>
<item name="materialAlertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog</item>

<!-- Type styles -->
<item name="textAppearanceLargePopupMenu">?attr/textAppearanceSubtitle1</item>
<item name="textAppearanceSmallPopupMenu">?attr/textAppearanceSubtitle1</item>
</style>

<style name="Base.V21.Theme.MaterialComponents.Light.Dialog" parent="Base.V14.Theme.MaterialComponents.Light.Dialog">
<item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Light.Dialog.Alert.Framework</item>
</style>

<!-- Themes in the "Base.Theme" family vary based on the current platform
version to provide the correct basis on each device. You probably don't
want to use them directly in your apps.

Themes in the "Theme.MaterialComponents" family are meant to be extended or used
directly by apps. -->
<eat-comment/>

<style name="Base.Theme.MaterialComponents.Dialog" parent="Base.V21.Theme.MaterialComponents.Dialog"/>

<style name="Base.Theme.MaterialComponents.Light.Dialog" parent="Base.V21.Theme.MaterialComponents.Light.Dialog"/>

<style name="Base.Theme.MaterialComponents.Dialog.Alert">
<item name="android:windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
<item name="android:windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
Expand Down
23 changes: 8 additions & 15 deletions lib/java/com/google/android/material/dialog/res/values/themes_base_bridge.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,15 @@

<style name="Platform.MaterialComponents.Light.Dialog" parent="Theme.AppCompat.Light.Dialog"/>

<!-- All new attributes should be set in the following four Base.V14 themes. -->
<!-- Themes in the "Base.Theme" family vary based on the current platform
version to provide the correct basis on each device. You probably don't
want to use them directly in your apps.

Themes in the "Theme.MaterialComponents" family are meant to be extended or used
directly by apps. -->
<eat-comment/>

<style name="Base.V14.Theme.MaterialComponents.Dialog.Bridge" parent="Platform.MaterialComponents.Dialog">
<style name="Base.Theme.MaterialComponents.Dialog.Bridge" parent="Platform.MaterialComponents.Dialog">
<item name="isMaterialTheme">true</item>

<item name="colorPrimaryVariant">@color/design_dark_default_color_primary_variant</item>
Expand Down Expand Up @@ -113,7 +118,7 @@
<item name="elevationOverlayColor">?attr/colorOnSurface</item>
</style>

<style name="Base.V14.Theme.MaterialComponents.Light.Dialog.Bridge" parent="Platform.MaterialComponents.Light.Dialog">
<style name="Base.Theme.MaterialComponents.Light.Dialog.Bridge" parent="Platform.MaterialComponents.Light.Dialog">
<item name="isMaterialTheme">true</item>

<item name="colorPrimaryVariant">@color/design_default_color_primary_variant</item>
Expand Down Expand Up @@ -196,16 +201,4 @@
<item name="elevationOverlayColor">?attr/colorOnSurface</item>
</style>

<!-- Themes in the "Base.Theme" family vary based on the current platform
version to provide the correct basis on each device. You probably don't
want to use them directly in your apps.

Themes in the "Theme.MaterialComponents" family are meant to be extended or used
directly by apps. -->
<eat-comment/>

<style name="Base.Theme.MaterialComponents.Dialog.Bridge" parent="Base.V14.Theme.MaterialComponents.Dialog.Bridge"/>

<style name="Base.Theme.MaterialComponents.Light.Dialog.Bridge" parent="Base.V14.Theme.MaterialComponents.Light.Dialog.Bridge"/>

</resources>
14 changes: 4 additions & 10 deletions lib/java/com/google/android/material/dialog/res/values/themes_overlay.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,17 +128,18 @@

<!-- Dialog theme overlays for M2. -->

<style name="Base.V14.ThemeOverlay.MaterialComponents.Dialog" parent="ThemeOverlay.AppCompat.Dialog">
<style name="Base.ThemeOverlay.MaterialComponents.Dialog" parent="ThemeOverlay.AppCompat.Dialog">
<item name="android:windowBackground">@drawable/mtrl_dialog_background</item>
<!-- Widget styles -->
<item name="materialButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog.Flush</item>
</style>

<style name="Base.V14.ThemeOverlay.MaterialComponents.Dialog.Alert" parent="ThemeOverlay.AppCompat.Dialog.Alert">
<style name="Base.ThemeOverlay.MaterialComponents.Dialog.Alert" parent="ThemeOverlay.AppCompat.Dialog.Alert">
<!-- Widget styles -->
<item name="buttonBarButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog.Flush</item>
</style>

<style name="Base.V14.ThemeOverlay.MaterialComponents.MaterialAlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
<style name="Base.ThemeOverlay.MaterialComponents.MaterialAlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
<!-- Widget styles -->
<item name="materialAlertDialogButtonSpacerVisibility">@integer/mtrl_view_invisible</item>
<item name="alertDialogStyle">@style/MaterialAlertDialog.MaterialComponents</item>
Expand All @@ -152,13 +153,6 @@
<item name="materialAlertDialogBodyTextStyle">@style/MaterialAlertDialog.MaterialComponents.Body.Text</item>
</style>

<style name="Base.ThemeOverlay.MaterialComponents.Dialog" parent="Base.V14.ThemeOverlay.MaterialComponents.Dialog">
<item name="android:windowBackground">@drawable/mtrl_dialog_background</item>
</style>

<style name="Base.ThemeOverlay.MaterialComponents.Dialog.Alert" parent="Base.V14.ThemeOverlay.MaterialComponents.Dialog.Alert"/>
<style name="Base.ThemeOverlay.MaterialComponents.MaterialAlertDialog" parent="Base.V14.ThemeOverlay.MaterialComponents.MaterialAlertDialog"/>

<!--
MaterialComponents ThemeOverlays for Framework Alert Dialogs.
-->
Expand Down
16 changes: 4 additions & 12 deletions lib/java/com/google/android/material/sidesheet/res/values/themes_base.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,25 @@
~ limitations under the License.
-->
<resources>
<style name="Base.V14.Theme.Material3.Light.SideSheetDialog" parent="Theme.Material3.Light.Dialog">
<style name="Base.Theme.Material3.Light.SideSheetDialog" parent="Theme.Material3.Light.Dialog">
<item name="android:windowIsFloating">false</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowAnimationStyle">@style/Animation.Material3.SideSheetDialog</item>
<item name="sideSheetModalStyle">@style/Widget.Material3.SideSheet.Modal</item>
</style>

<style name="Base.V14.Theme.Material3.Dark.SideSheetDialog" parent="Theme.Material3.Dark.Dialog">
<style name="Base.Theme.Material3.Dark.SideSheetDialog" parent="Theme.Material3.Dark.Dialog">
<item name="android:windowIsFloating">false</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowAnimationStyle">@style/Animation.Material3.SideSheetDialog</item>
<item name="sideSheetModalStyle">@style/Widget.Material3.SideSheet.Modal</item>
</style>

<style name="Base.V14.ThemeOverlay.Material3.SideSheetDialog" parent="Base.ThemeOverlay.Material3.Dialog">
<style name="Base.ThemeOverlay.Material3.SideSheetDialog" parent="Base.ThemeOverlay.Material3.Dialog">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowIsFloating">false</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowAnimationStyle">@style/Animation.Material3.SideSheetDialog</item>
<item name="sideSheetModalStyle">@style/Widget.Material3.SideSheet.Modal</item>
</style>

<style name="Base.V21.ThemeOverlay.Material3.SideSheetDialog"
parent="Base.V14.ThemeOverlay.Material3.SideSheetDialog">
<item name="android:statusBarColor">@android:color/transparent</item>
</style>

<style name="Base.Theme.Material3.Light.SideSheetDialog" parent="Base.V14.Theme.Material3.Light.SideSheetDialog"/>
<style name="Base.Theme.Material3.Dark.SideSheetDialog" parent="Base.V14.Theme.Material3.Dark.SideSheetDialog"/>
<style name="Base.ThemeOverlay.Material3.SideSheetDialog" parent="Base.V21.ThemeOverlay.Material3.SideSheetDialog"/>
</resources>
9 changes: 3 additions & 6 deletions lib/java/com/google/android/material/textfield/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@
<item name="android:paddingBottom">13dp</item>
</style>

<!-- Base styles for AutoCompleteTextView. You should use one of the sub-styles instead. -->
<style name="Base.V14.Widget.MaterialComponents.AutoCompleteTextView" parent="Widget.AppCompat.AutoCompleteTextView">
<!-- Base style for AutoCompleteTextView. You should use one of the sub-styles instead. -->
<style name="Base.Widget.MaterialComponents.AutoCompleteTextView" parent="Widget.AppCompat.AutoCompleteTextView">
<item name="enforceMaterialTheme">true</item>
<item name="enforceTextAppearance">true</item>
<item name="android:background">@null</item>
Expand All @@ -218,11 +218,8 @@
<item name="android:paddingBottom">17dp</item>
<item name="android:textAppearance">?attr/textAppearanceSubtitle1</item>
<item name="android:dropDownVerticalOffset">@dimen/mtrl_exposed_dropdown_menu_popup_vertical_offset</item>
<item name="android:popupElevation">@dimen/mtrl_exposed_dropdown_menu_popup_elevation</item>
</style>

<style name="Base.Widget.MaterialComponents.AutoCompleteTextView" parent="Base.V14.Widget.MaterialComponents.AutoCompleteTextView">
<item name="android:popupBackground">@null</item>
<item name="android:popupElevation">@dimen/mtrl_exposed_dropdown_menu_popup_elevation</item>
</style>

<!-- Styles for the AutocompleteTextView to be used if an ExposedDropdownMenu style is being used. -->
Expand Down
28 changes: 0 additions & 28 deletions lib/java/com/google/android/material/theme/res/values-v24/themes_base.xml
View file
Open in desktop

This file was deleted.

Loading