Skip to content

Commit 0b578fd

Browse files
pekingmeleticiarossi
pekingme
authored and
leticiarossi
committed
[SearchBar] Added Expressive styles.
PiperOrigin-RevId: 752568935
1 parent 2aadbd1 commit 0b578fd

File tree

5 files changed

+85
-0
lines changed

5 files changed

+85
-0
lines changed

‎lib/java/com/google/android/material/appbar/res/values/styles.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
-->
1717
<resources xmlns:tools="http://schemas.android.com/tools">
1818

19+
<!-- M3 Expressive AppBarLayout styles -->
20+
<style name="Widget.Material3Expressive.AppBarLayout" parent="Widget.Material3.AppBarLayout"/>
21+
1922
<!-- M3 Expressive CollapsingToolbarLayout styles. -->
2023
<style name="Widget.Material3Expressive.CollapsingToolbar" parent="Widget.Material3.CollapsingToolbar">
2124
<item name="collapsedTitleTextAppearance">@macro/m3_comp_app_bar_small_title_font</item>

‎lib/java/com/google/android/material/dialog/res/values/themes_base.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,13 @@
3333
<item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3Expressive.MaterialAlertDialog</item>
3434

3535
<!-- Widget styles. -->
36+
<item name="appBarLayoutStyle">@style/Widget.Material3Expressive.AppBarLayout</item>
3637
<item name="collapsingToolbarLayoutStyle">@style/Widget.Material3Expressive.CollapsingToolbar</item>
3738
<item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3Expressive.CollapsingToolbar.Medium</item>
3839
<item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3Expressive.CollapsingToolbar.Large</item>
3940

41+
<item name="materialSearchBarStyle">@style/Widget.Material3Expressive.SearchBar</item>
42+
4043
<!--
4144
Default as primary container FABs. Unlisted FAB style attributes are not updated in Material3Expressive.
4245
Please use the corresponding themeoverlay for other color variants via materialThemeOverlay.
@@ -89,10 +92,13 @@
8992
<item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3Expressive.MaterialAlertDialog</item>
9093

9194
<!-- Widget styles. -->
95+
<item name="appBarLayoutStyle">@style/Widget.Material3Expressive.AppBarLayout</item>
9296
<item name="collapsingToolbarLayoutStyle">@style/Widget.Material3Expressive.CollapsingToolbar</item>
9397
<item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3Expressive.CollapsingToolbar.Medium</item>
9498
<item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3Expressive.CollapsingToolbar.Large</item>
9599

100+
<item name="materialSearchBarStyle">@style/Widget.Material3Expressive.SearchBar</item>
101+
96102
<!--
97103
Default as primary container FABs. Unlisted FAB style attributes are not updated in Material3Expressive.
98104
Please use the corresponding themeoverlay for other color variants via materialThemeOverlay.

‎lib/java/com/google/android/material/search/res-public/values/public.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,10 @@
4141
<public name="Widget.Material3.Search.ActionButton.Overflow" type="style"/>
4242
<public name="Widget.Material3.Search.Toolbar.Button.Navigation" type="style"/>
4343
<public name="searchbar_scrolling_view_behavior" type="string"/>
44+
<public name="Widget.Material3Expressive.SearchBar" type="style"/>
45+
<public name="Widget.Material3Expressive.SearchBar.CenteredText" type="style"/>
46+
<public name="Widget.Material3Expressive.SearchBar.Outlined" type="style"/>
47+
<public name="Widget.Material3Expressive.SearchView" type="style"/>
48+
<public name="Widget.Material3Expressive.SearchBar.CenteredText.AppBarWithSearch" type="style"/>
49+
<public name="Widget.Material3Expressive.SearchBar.AppBarWithSearch" type="style"/>
4450
</resources>

‎lib/java/com/google/android/material/search/res/values/styles.xml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,70 @@
1616
-->
1717
<resources xmlns:tools="http://schemas.android.com/tools">
1818

19+
<!-- Styles for M3 Expressive SearchBar. -->
20+
21+
<style name="Widget.Material3Expressive.SearchBar" parent="Widget.Material3.SearchBar">
22+
<item name="backgroundTint">?attr/colorSurfaceContainer</item>
23+
<item name="liftOnScrollColor">?attr/colorSurfaceContainerHighest</item>
24+
<item name="liftOnScroll">true</item>
25+
<item name="contentInsetStart">24dp</item>
26+
<item name="android:paddingEnd">4dp</item>
27+
<item name="android:maxWidth">720dp</item>
28+
</style>
29+
30+
<style name="Widget.Material3Expressive.SearchBar.CenteredText">
31+
<item name="contentInsetStart">0dp</item>
32+
<item name="android:paddingStart">4dp</item>
33+
<item name="hideNavigationIcon">true</item>
34+
<item name="textCentered">true</item>
35+
</style>
36+
37+
<style name="Widget.Material3Expressive.SearchBar.Outlined" parent="Widget.Material3.SearchBar.Outlined">
38+
<item name="backgroundTint">?attr/colorSurfaceContainer</item>
39+
<item name="liftOnScrollColor">?attr/colorSurfaceContainerHighest</item>
40+
<item name="liftOnScroll">true</item>
41+
</style>
42+
43+
<style name="Widget.Material3Expressive.SearchView" parent="Widget.Material3.SearchView"/>
44+
45+
<style name="Widget.Material3Expressive.SearchBar.CenteredText.AppBarWithSearch">
46+
<item name="android:maxWidth">312dp</item>
47+
<item name="defaultMarginsEnabled">false</item>
48+
<item name="android:layout_gravity">center</item>
49+
<item name="android:layout_marginStart">8dp</item>
50+
<item name="android:layout_marginEnd">8dp</item>
51+
</style>
52+
53+
<style name="Widget.Material3Expressive.SearchBar.AppBarWithSearch">
54+
<item name="android:maxWidth">312dp</item>
55+
<item name="defaultMarginsEnabled">false</item>
56+
<item name="hideNavigationIcon">true</item>
57+
<item name="android:layout_gravity">center</item>
58+
<item name="android:layout_marginStart">8dp</item>
59+
<item name="android:layout_marginEnd">8dp</item>
60+
</style>
61+
62+
<style name="Widget.Material3Expressive.AppBarLayout.AppBarWithSearch">
63+
<item name="android:paddingStart">4dp</item>
64+
<item name="android:paddingEnd">4dp</item>
65+
<item name="android:minHeight">64dp</item>
66+
</style>
67+
68+
<style name="Widget.Material3Expressive.Toolbar.AppBarWithSearch">
69+
<item name="buttonGravity">center_vertical</item>
70+
<item name="android:layout_marginEnd">0dp</item>
71+
<item name="layout_scrollFlags">scroll|snap|enterAlways</item>
72+
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Search</item>
73+
</style>
74+
75+
<style name="ThemeOverlay.Material3Expressive.AppBarWithSearch" parent="">
76+
<item name="appBarLayoutStyle">@style/Widget.Material3Expressive.AppBarLayout.AppBarWithSearch</item>
77+
<item name="toolbarStyle">@style/Widget.Material3Expressive.Toolbar.AppBarWithSearch</item>
78+
<item name="materialSearchBarStyle">@style/Widget.Material3Expressive.SearchBar.CenteredText.AppBarWithSearch</item>
79+
</style>
80+
81+
<!-- Styles for M3 SearchBar. -->
82+
1983
<style name="Widget.Material3.SearchBar" parent="android:Widget">
2084
<item name="backgroundTint">@macro/m3_comp_search_bar_container_color</item>
2185
<item name="enforceMaterialTheme">true</item>

‎lib/java/com/google/android/material/theme/res/values/themes_base.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,13 @@
3333
<item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3Expressive.MaterialAlertDialog</item>
3434

3535
<!-- Widget styles. -->
36+
<item name="appBarLayoutStyle">@style/Widget.Material3Expressive.AppBarLayout</item>
3637
<item name="collapsingToolbarLayoutStyle">@style/Widget.Material3Expressive.CollapsingToolbar</item>
3738
<item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3Expressive.CollapsingToolbar.Medium</item>
3839
<item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3Expressive.CollapsingToolbar.Large</item>
3940

41+
<item name="materialSearchBarStyle">@style/Widget.Material3Expressive.SearchBar</item>
42+
4043
<!--
4144
Default as primary container FABs. Unlisted FAB style attributes are not updated in Material3Expressive.
4245
Please use the corresponding themeoverlay for other color variants via materialThemeOverlay.
@@ -96,10 +99,13 @@
9699
<item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3Expressive.MaterialAlertDialog</item>
97100

98101
<!-- Widget styles. -->
102+
<item name="appBarLayoutStyle">@style/Widget.Material3Expressive.AppBarLayout</item>
99103
<item name="collapsingToolbarLayoutStyle">@style/Widget.Material3Expressive.CollapsingToolbar</item>
100104
<item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3Expressive.CollapsingToolbar.Medium</item>
101105
<item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3Expressive.CollapsingToolbar.Large</item>
102106

107+
<item name="materialSearchBarStyle">@style/Widget.Material3Expressive.SearchBar</item>
108+
103109
<!--
104110
Default as primary container FABs. Unlisted FAB style attributes are not updated in Material3Expressive.
105111
Please use the corresponding themeoverlay for other color varaints via materialThemeOverlay.

0 commit comments

Comments
 (0)