Skip to content

Commit 30ea33e

Browse files
pekingmedsn5ft
pekingme
authored and
dsn5ft
committed
[Datepicker] Integrated tokens.
PiperOrigin-RevId: 519201395
1 parent 5f542c8 commit 30ea33e

File tree

2 files changed

+78
-20
lines changed

2 files changed

+78
-20
lines changed

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

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@
211211
<item name="yearStyle">@style/Widget.Material3.MaterialCalendar.Year</item>
212212
<item name="yearSelectedStyle">@style/Widget.Material3.MaterialCalendar.Year.Selected</item>
213213
<item name="yearTodayStyle">@style/Widget.Material3.MaterialCalendar.Year.Today</item>
214-
<item name="rangeFillColor">?attr/colorSurfaceVariant</item>
215-
<item name="shapeAppearance">?attr/shapeAppearanceCornerExtraLarge</item>
214+
<item name="rangeFillColor">@macro/m3_comp_date_picker_modal_range_selection_active_indicator_container_color</item>
215+
<item name="shapeAppearance">@macro/m3_comp_date_picker_modal_container_shape</item>
216216
</style>
217217

218218
<style name="Widget.Material3.MaterialCalendar.Fullscreen">
@@ -221,30 +221,31 @@
221221
</style>
222222

223223
<style name="Widget.Material3.MaterialCalendar.HeaderLayout" parent="Widget.MaterialComponents.MaterialCalendar.HeaderLayout">
224+
<item name="android:layout_height">@dimen/m3_comp_date_picker_modal_header_container_height</item>
224225
<item name="android:background">@android:color/transparent</item>
225226
</style>
226227

227228
<style name="Widget.Material3.MaterialCalendar.HeaderLayout.Fullscreen">
228-
<item name="android:layout_height">@dimen/mtrl_calendar_header_height_fullscreen</item>
229+
<item name="android:layout_height">@dimen/m3_comp_date_picker_modal_range_selection_header_container_height</item>
229230
</style>
230231

231232
<style name="Widget.Material3.MaterialCalendar.HeaderDivider" parent="Widget.MaterialComponents.MaterialCalendar.HeaderDivider">
232233
<item name="android:visibility">gone</item>
233234
</style>
234235

235236
<style name="Widget.Material3.MaterialCalendar.HeaderTitle" parent="Widget.MaterialComponents.MaterialCalendar.HeaderTitle">
236-
<item name="android:textColor">?attr/colorOnSurfaceVariant</item>
237-
<item name="android:textAppearance">?attr/textAppearanceLabelLarge</item>
237+
<item name="android:textColor">@macro/m3_comp_date_picker_modal_header_supporting_text_color</item>
238+
<item name="android:textAppearance">@macro/m3_comp_date_picker_modal_header_supporting_text_type</item>
238239
<item name="autoSizeMaxTextSize">14sp</item>
239240
</style>
240241

241242
<style name="Widget.Material3.MaterialCalendar.HeaderSelection" parent="Widget.MaterialComponents.MaterialCalendar.HeaderSelection">
242-
<item name="android:textAppearance">?attr/textAppearanceHeadlineLarge</item>
243-
<item name="android:textColor">?attr/colorOnSurface</item>
243+
<item name="android:textAppearance">@macro/m3_comp_date_picker_modal_header_headline_type</item>
244+
<item name="android:textColor">@macro/m3_comp_date_picker_modal_header_headline_color</item>
244245
</style>
245246

246247
<style name="Widget.Material3.MaterialCalendar.HeaderSelection.Fullscreen">
247-
<item name="android:textAppearance">?attr/textAppearanceHeadlineSmall</item>
248+
<item name="android:textAppearance">@macro/m3_comp_date_picker_modal_range_selection_header_headline_type</item>
248249
<item name="android:maxLines">1</item>
249250
<item name="autoSizeMaxTextSize">20sp</item>
250251
</style>
@@ -259,17 +260,17 @@
259260
</style>
260261

261262
<style name="Widget.Material3.MaterialCalendar.DayOfWeekLabel" parent="Widget.MaterialComponents.MaterialCalendar.DayOfWeekLabel">
262-
<item name="android:textAppearance">?attr/textAppearanceBodyLarge</item>
263-
<item name="android:textColor">?attr/colorOnSurfaceVariant</item>
263+
<item name="android:textAppearance">@macro/m3_comp_date_picker_modal_weekdays_label_text_type</item>
264+
<item name="android:textColor">@macro/m3_comp_date_picker_modal_weekdays_label_text_color</item>
264265
</style>
265266

266267
<style name="Widget.Material3.MaterialCalendar.DayTextView" parent="Widget.MaterialComponents.MaterialCalendar.DayTextView">
267-
<item name="android:textAppearance">?attr/textAppearanceBodyLarge</item>
268+
<item name="android:textAppearance">@macro/m3_comp_date_picker_modal_date_label_text_type</item>
268269
</style>
269270

270271
<style name="Widget.Material3.MaterialCalendar.MonthTextView" parent="Widget.MaterialComponents.MaterialCalendar.MonthTextView">
271-
<item name="android:textAppearance">?attr/textAppearanceTitleSmall</item>
272-
<item name="android:textColor">?attr/colorOnSurfaceVariant</item>
272+
<item name="android:textAppearance">@macro/m3_comp_date_picker_modal_range_selection_month_subhead_type</item>
273+
<item name="android:textColor">@macro/m3_comp_date_picker_modal_range_selection_month_subhead_color</item>
273274
</style>
274275

275276
<style name="Widget.Material3.MaterialCalendar.Item" parent="">
@@ -281,12 +282,14 @@
281282
</style>
282283

283284
<style name="Widget.Material3.MaterialCalendar.Day" parent="Widget.Material3.MaterialCalendar.Item">
285+
<item name="itemShapeAppearance">@style/ShapeAppearance.M3.Comp.DatePicker.Modal.Date.Container.Shape</item>
284286
<item name="android:width">@dimen/mtrl_calendar_day_width</item>
285287
<item name="android:height">@dimen/mtrl_calendar_day_height</item>
286288
<item name="android:insetTop">@dimen/mtrl_calendar_day_vertical_padding</item>
287289
<item name="android:insetBottom">@dimen/mtrl_calendar_day_vertical_padding</item>
288290
<item name="android:insetLeft">@dimen/mtrl_calendar_day_horizontal_padding</item>
289291
<item name="android:insetRight">@dimen/mtrl_calendar_day_horizontal_padding</item>
292+
<item name="itemTextColor">@macro/m3_comp_date_picker_modal_date_unselected_label_text_color</item>
290293
</style>
291294

292295
<style name="Widget.Material3.MaterialCalendar.Day.Invalid">
@@ -295,15 +298,15 @@
295298
</style>
296299

297300
<style name="Widget.Material3.MaterialCalendar.Day.Selected">
298-
<item name="itemFillColor">?attr/colorPrimary</item>
299-
<item name="itemTextColor">?attr/colorOnPrimary</item>
301+
<item name="itemFillColor">@macro/m3_comp_date_picker_modal_date_selected_container_color</item>
302+
<item name="itemTextColor">@macro/m3_comp_date_picker_modal_date_selected_label_text_color</item>
300303
<item name="itemStrokeWidth">0dp</item>
301304
</style>
302305

303306
<style name="Widget.Material3.MaterialCalendar.Day.Today">
304-
<item name="itemTextColor">?attr/colorPrimary</item>
305-
<item name="itemStrokeColor">?attr/colorPrimary</item>
306-
<item name="itemStrokeWidth">@dimen/mtrl_calendar_day_today_stroke</item>
307+
<item name="itemTextColor">@macro/m3_comp_date_picker_modal_date_today_label_text_color</item>
308+
<item name="itemStrokeColor">@macro/m3_comp_date_picker_modal_date_today_container_outline_color</item>
309+
<item name="itemStrokeWidth">@dimen/m3_comp_date_picker_modal_date_today_container_outline_width</item>
307310
</style>
308311

309312
<style name="Widget.Material3.MaterialCalendar.Year" parent="Widget.Material3.MaterialCalendar.Item">
@@ -313,11 +316,12 @@
313316
<item name="android:insetBottom">@dimen/mtrl_calendar_year_vertical_padding</item>
314317
<item name="android:insetLeft">@dimen/mtrl_calendar_year_horizontal_padding</item>
315318
<item name="android:insetRight">@dimen/mtrl_calendar_year_horizontal_padding</item>
319+
<item name="itemTextColor">@macro/m3_comp_date_picker_modal_year_selection_year_unselected_label_text_color</item>
316320
</style>
317321

318322
<style name="Widget.Material3.MaterialCalendar.Year.Selected">
319-
<item name="itemFillColor">?attr/colorPrimary</item>
320-
<item name="itemTextColor">?attr/colorOnPrimary</item>
323+
<item name="itemFillColor">@macro/m3_comp_date_picker_modal_year_selection_year_selected_container_color</item>
324+
<item name="itemTextColor">@macro/m3_comp_date_picker_modal_year_selection_year_selected_label_text_color</item>
321325
<item name="itemStrokeWidth">0dp</item>
322326
</style>
323327

‎lib/java/com/google/android/material/datepicker/res/values/tokens.xml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ Copyright (C) 2023 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.162 -->
19+
20+
<resources>
21+
22+
<!-- Generated from token set (md.comp.date-picker.modal) in context (platform=android, audience=3p). -->
23+
<!-- Enabled - Container -->
24+
<macro name="m3_comp_date_picker_modal_container_shape">?attr/shapeAppearanceCornerExtraLarge</macro>
25+
<style name="ShapeAppearance.M3.Comp.DatePicker.Modal.Date.Container.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.Full"/>
26+
<macro name="m3_comp_date_picker_modal_date_today_container_outline_color">?attr/colorPrimary</macro>
27+
<dimen name="m3_comp_date_picker_modal_date_today_container_outline_width">1dp</dimen>
28+
<macro name="m3_comp_date_picker_modal_date_selected_container_color">?attr/colorPrimary</macro>
29+
<macro name="m3_comp_date_picker_modal_range_selection_active_indicator_container_color">?attr/colorSecondaryContainer</macro>
30+
<macro name="m3_comp_date_picker_modal_year_selection_year_selected_container_color">?attr/colorPrimary</macro>
31+
<dimen name="m3_comp_date_picker_modal_header_container_height">120dp</dimen>
32+
<dimen name="m3_comp_date_picker_modal_range_selection_header_container_height">128dp</dimen>
33+
<!-- Enabled - Label text -->
34+
<macro name="m3_comp_date_picker_modal_weekdays_label_text_color">?attr/colorOnSurface</macro>
35+
<macro name="m3_comp_date_picker_modal_weekdays_label_text_type">?attr/textAppearanceBodyLarge</macro>
36+
<macro name="m3_comp_date_picker_modal_date_label_text_type">?attr/textAppearanceBodyLarge</macro>
37+
<macro name="m3_comp_date_picker_modal_date_unselected_label_text_color">?attr/colorOnSurface</macro>
38+
<macro name="m3_comp_date_picker_modal_date_today_label_text_color">?attr/colorPrimary</macro>
39+
<macro name="m3_comp_date_picker_modal_date_selected_label_text_color">?attr/colorOnPrimary</macro>
40+
<macro name="m3_comp_date_picker_modal_year_selection_year_selected_label_text_color">?attr/colorOnPrimary</macro>
41+
<macro name="m3_comp_date_picker_modal_year_selection_year_unselected_label_text_color">?attr/colorOnSurfaceVariant</macro>
42+
<!-- Enabled - Subhead -->
43+
<macro name="m3_comp_date_picker_modal_range_selection_month_subhead_color">?attr/colorOnSurfaceVariant</macro>
44+
<macro name="m3_comp_date_picker_modal_range_selection_month_subhead_type">?attr/textAppearanceTitleSmall</macro>
45+
<!-- Enabled - Headline -->
46+
<macro name="m3_comp_date_picker_modal_header_headline_color">?attr/colorOnSurfaceVariant</macro>
47+
<macro name="m3_comp_date_picker_modal_header_headline_type">?attr/textAppearanceHeadlineLarge</macro>
48+
<macro name="m3_comp_date_picker_modal_range_selection_header_headline_type">?attr/textAppearanceTitleLarge</macro>
49+
<!-- Enabled - Supporting text -->
50+
<macro name="m3_comp_date_picker_modal_header_supporting_text_type">?attr/textAppearanceLabelLarge</macro>
51+
<!-- Enabled - Header -->
52+
<macro name="m3_comp_date_picker_modal_header_supporting_text_color">?attr/colorOnSurfaceVariant</macro>
53+
54+
</resources>

0 commit comments

Comments
 (0)