DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge bfe29a9d953b19a756fd81490c1b109bb4465716 into 9c5ccb76cad3072090a3c772dd613a197498be90

Browse Source
This commit is contained in:
nakamura 2026-02-13 03:22:39 +00:00 committed by GitHub
commit c19fcdf883
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/java/com/google/android/material/datepicker/MaterialCalendar.java
View File

@ -248,7 +248,7 @@ public final class MaterialCalendar<S> extends PickerFragment<S> {
int columns =
themedContext.getResources().getInteger(R.integer.mtrl_calendar_year_selector_span);
yearSelector = root.findViewById(R.id.mtrl_calendar_year_selector_frame);
yearSelector = root.findViewById(R.id.mtrl_calendar_year_selector);
if (yearSelector != null) {
yearSelector.setHasFixedSize(true);
yearSelector.setLayoutManager(

32
lib/java/com/google/android/material/datepicker/res/layout/mtrl_calendar_horizontal.xml
View File

@ -26,18 +26,40 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
<LinearLayout
android:id="@+id/mtrl_calendar_year_selector_frame"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:scrollbars="none"/>
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/mtrl_calendar_year_selector"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_gravity="center_horizontal"
android:scrollbars="none"
android:paddingStart="@dimen/mtrl_calendar_content_padding"
android:paddingEnd="@dimen/mtrl_calendar_content_padding"
android:paddingLeft="@dimen/mtrl_calendar_content_padding"
android:paddingRight="@dimen/mtrl_calendar_content_padding"/>
<View
style="?attr/materialCalendarHeaderDivider"
android:layout_width="match_parent"
android:layout_height="@dimen/mtrl_calendar_header_divider_thickness"/>
</LinearLayout>
<LinearLayout
android:id="@+id/mtrl_calendar_day_selector_frame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:paddingStart="@dimen/mtrl_calendar_content_padding"
android:paddingEnd="@dimen/mtrl_calendar_content_padding"
android:paddingLeft="@dimen/mtrl_calendar_content_padding"
android:paddingRight="@dimen/mtrl_calendar_content_padding">
<include layout="@layout/mtrl_calendar_days_of_week"/>

6
lib/java/com/google/android/material/datepicker/res/layout/mtrl_calendar_month_navigation.xml
View File

@ -22,7 +22,11 @@
android:layout_height="wrap_content"
android:paddingTop="@dimen/mtrl_calendar_navigation_top_padding"
android:paddingBottom="@dimen/mtrl_calendar_navigation_bottom_padding"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingStart="@dimen/mtrl_calendar_content_padding"
android:paddingEnd="@dimen/mtrl_calendar_content_padding"
android:paddingLeft="@dimen/mtrl_calendar_content_padding"
android:paddingRight="@dimen/mtrl_calendar_content_padding">
<FrameLayout
android:layout_width="0dp"

11
lib/java/com/google/android/material/datepicker/res/layout/mtrl_calendar_vertical.xml
View File

@ -18,15 +18,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center">
android:gravity="center"
android:paddingStart="@dimen/mtrl_calendar_content_padding"
android:paddingEnd="@dimen/mtrl_calendar_content_padding"
android:paddingLeft="@dimen/mtrl_calendar_content_padding"
android:paddingRight="@dimen/mtrl_calendar_content_padding">
<include layout="@layout/mtrl_calendar_days_of_week"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?attr/colorOnSurface"/>
<include layout="@layout/mtrl_calendar_months"/>
</LinearLayout>

6
lib/java/com/google/android/material/datepicker/res/layout/mtrl_picker_dialog.xml
View File

@ -33,11 +33,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:paddingBottom="@dimen/mtrl_calendar_bottom_padding"
android:paddingStart="@dimen/mtrl_calendar_content_padding"
android:paddingEnd="@dimen/mtrl_calendar_content_padding"
android:paddingLeft="@dimen/mtrl_calendar_content_padding"
android:paddingRight="@dimen/mtrl_calendar_content_padding"/>
android:paddingBottom="@dimen/mtrl_calendar_bottom_padding"/>
<include
layout="@layout/mtrl_picker_actions"

3
lib/java/com/google/android/material/datepicker/res/values/styles.xml
View File

@ -247,7 +247,8 @@
</style>
<style name="Widget.Material3.MaterialCalendar.HeaderDivider" parent="Widget.MaterialComponents.MaterialCalendar.HeaderDivider">
<item name="android:visibility">gone</item>
<item name="android:visibility">visible</item>
<item name="android:background">?attr/colorOutlineVariant</item>
</style>
<style name="Widget.Material3.MaterialCalendar.HeaderTitle" parent="Widget.MaterialComponents.MaterialCalendar.HeaderTitle">