Skip to content

Commit e474cf4

Browse files
imhappihunterstich
authored andcommittedOct 25, 2022
[BottomSheet] Token integration
PiperOrigin-RevId: 482901648
1 parent df9fdaf commit e474cf4

File tree

2 files changed

+33
-2
lines changed

2 files changed

+33
-2
lines changed
 

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,10 @@
7373
<item name="paddingTopSystemWindowInsets">true</item>
7474
<item name="paddingLeftSystemWindowInsets">false</item>
7575
<item name="paddingRightSystemWindowInsets">false</item>
76-
<item name="shapeAppearance">?attr/shapeAppearanceCornerExtraLarge</item>
76+
<item name="shapeAppearance">@macro/m3_comp_sheet_bottom_docked_container_shape</item>
7777
<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Material3.Corner.Top</item>
7878
<item name="shouldRemoveExpandedCorners">false</item>
79+
<item name="backgroundTint">@macro/m3_comp_sheet_bottom_docked_container_color</item>
7980
</style>
8081

8182
<style name="Widget.Material3.BottomSheet.Modal">
@@ -90,6 +91,6 @@
9091
<item name="android:minHeight">@dimen/mtrl_min_touch_target_size</item>
9192
<item name="android:paddingBottom">@dimen/m3_bottom_sheet_drag_handle_bottom_padding</item>
9293
<item name="srcCompat">@drawable/mtrl_bottomsheet_drag_handle</item>
93-
<item name="tint">?attr/colorOnSurfaceVariant</item>
94+
<item name="tint">@macro/m3_comp_sheet_bottom_docked_drag_handle_color</item>
9495
</style>
9596
</resources>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ Copyright (C) 2022 The Android Open Source Project
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
18+
<!-- Version: v0.126 -->
19+
20+
<resources>
21+
<!-- Generated from token set (md.comp.sheet.bottom) in default context. -->
22+
<!-- Enabled - Container -->
23+
<macro name="m3_comp_sheet_bottom_docked_container_color">?attr/colorSurface</macro>
24+
<dimen name="m3_comp_sheet_bottom_docked_modal_container_elevation">@dimen/m3_sys_elevation_level1</dimen>
25+
<dimen name="m3_comp_sheet_bottom_docked_standard_container_elevation">@dimen/m3_sys_elevation_level1</dimen>
26+
<!-- Please use this with the top shape appearance overlay in styles. -->
27+
<macro name="m3_comp_sheet_bottom_docked_container_shape">?attr/shapeAppearanceCornerExtraLarge</macro>
28+
<!-- Enabled - Drag handle -->
29+
<macro name="m3_comp_sheet_bottom_docked_drag_handle_color">?attr/colorOnSurfaceVariant</macro>
30+
</resources>

0 commit comments

Comments
 (0)
Please sign in to comment.