Skip to content

Commit 4797bfb

Browse files
authored
Copy Jetpack Compose Material3 1.5.0-alpha10 and Adaptive 1.3.0-alpha05 (#2621)
| GroupId | ReleaseVersion | ReleaseSHA | ReleaseBuildId | ReleaseDate | | --- | --- | --- | --- | --- | | androidx.compose.material3 | 1.5.0-alpha10 | deb9649 | 14504571 | 12/3/2025 | | androidx.compose.material3.adaptive | 1.3.0-alpha05 | deb9649 | 14504571 | 12/3/2025 | Fixes [CMP-9378](https://youtrack.jetbrains.com/issue/CMP-9378) Follow up tasks: - https://youtrack.jetbrains.com/issue/CMP-9305 ## Testing N/A ## Release Notes N/A
2 parents 602b39c + f134662 commit 4797bfb

File tree

48 files changed

+1498
-430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1498
-430
lines changed

compose/material3/material3/api/current.txt

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -601,10 +601,10 @@ package androidx.compose.material3 {
601601

602602
@androidx.compose.runtime.Immutable public final class CheckboxColors {
603603
ctor @KotlinOnly @Deprecated public CheckboxColors(androidx.compose.ui.graphics.Color checkedCheckmarkColor, androidx.compose.ui.graphics.Color uncheckedCheckmarkColor, androidx.compose.ui.graphics.Color checkedBoxColor, androidx.compose.ui.graphics.Color uncheckedBoxColor, androidx.compose.ui.graphics.Color disabledCheckedBoxColor, androidx.compose.ui.graphics.Color disabledUncheckedBoxColor, androidx.compose.ui.graphics.Color disabledIndeterminateBoxColor, androidx.compose.ui.graphics.Color checkedBorderColor, androidx.compose.ui.graphics.Color uncheckedBorderColor, androidx.compose.ui.graphics.Color disabledBorderColor, androidx.compose.ui.graphics.Color disabledUncheckedBorderColor, androidx.compose.ui.graphics.Color disabledIndeterminateBorderColor);
604-
ctor @KotlinOnly public CheckboxColors(androidx.compose.ui.graphics.Color checkedCheckmarkColor, androidx.compose.ui.graphics.Color uncheckedCheckmarkColor, androidx.compose.ui.graphics.Color disabledCheckmarkColor, androidx.compose.ui.graphics.Color checkedBoxColor, androidx.compose.ui.graphics.Color uncheckedBoxColor, androidx.compose.ui.graphics.Color disabledCheckedBoxColor, androidx.compose.ui.graphics.Color disabledUncheckedBoxColor, androidx.compose.ui.graphics.Color disabledIndeterminateBoxColor, androidx.compose.ui.graphics.Color checkedBorderColor, androidx.compose.ui.graphics.Color uncheckedBorderColor, androidx.compose.ui.graphics.Color disabledBorderColor, androidx.compose.ui.graphics.Color disabledUncheckedBorderColor, androidx.compose.ui.graphics.Color disabledIndeterminateBorderColor);
604+
ctor @KotlinOnly public CheckboxColors(androidx.compose.ui.graphics.Color checkedCheckmarkColor, androidx.compose.ui.graphics.Color uncheckedCheckmarkColor, androidx.compose.ui.graphics.Color checkedBoxColor, androidx.compose.ui.graphics.Color uncheckedBoxColor, androidx.compose.ui.graphics.Color disabledCheckedBoxColor, androidx.compose.ui.graphics.Color disabledUncheckedBoxColor, androidx.compose.ui.graphics.Color disabledIndeterminateBoxColor, androidx.compose.ui.graphics.Color checkedBorderColor, androidx.compose.ui.graphics.Color uncheckedBorderColor, androidx.compose.ui.graphics.Color disabledBorderColor, androidx.compose.ui.graphics.Color disabledUncheckedBorderColor, androidx.compose.ui.graphics.Color disabledIndeterminateBorderColor, androidx.compose.ui.graphics.Color disabledCheckmarkColor);
605605
ctor @BytecodeOnly @Deprecated public CheckboxColors(long, long, long, long, long, long, long, long, long, long, long, long, kotlin.jvm.internal.DefaultConstructorMarker!);
606606
ctor @BytecodeOnly public CheckboxColors(long, long, long, long, long, long, long, long, long, long, long, long, long, kotlin.jvm.internal.DefaultConstructorMarker!);
607-
method @KotlinOnly public androidx.compose.material3.CheckboxColors copy(optional androidx.compose.ui.graphics.Color checkedCheckmarkColor, optional androidx.compose.ui.graphics.Color uncheckedCheckmarkColor, optional androidx.compose.ui.graphics.Color disabledCheckmarkColor, optional androidx.compose.ui.graphics.Color checkedBoxColor, optional androidx.compose.ui.graphics.Color uncheckedBoxColor, optional androidx.compose.ui.graphics.Color disabledCheckedBoxColor, optional androidx.compose.ui.graphics.Color disabledUncheckedBoxColor, optional androidx.compose.ui.graphics.Color disabledIndeterminateBoxColor, optional androidx.compose.ui.graphics.Color checkedBorderColor, optional androidx.compose.ui.graphics.Color uncheckedBorderColor, optional androidx.compose.ui.graphics.Color disabledBorderColor, optional androidx.compose.ui.graphics.Color disabledUncheckedBorderColor, optional androidx.compose.ui.graphics.Color disabledIndeterminateBorderColor);
607+
method @KotlinOnly public androidx.compose.material3.CheckboxColors copy(optional androidx.compose.ui.graphics.Color checkedCheckmarkColor, optional androidx.compose.ui.graphics.Color uncheckedCheckmarkColor, optional androidx.compose.ui.graphics.Color checkedBoxColor, optional androidx.compose.ui.graphics.Color uncheckedBoxColor, optional androidx.compose.ui.graphics.Color disabledCheckedBoxColor, optional androidx.compose.ui.graphics.Color disabledUncheckedBoxColor, optional androidx.compose.ui.graphics.Color disabledIndeterminateBoxColor, optional androidx.compose.ui.graphics.Color checkedBorderColor, optional androidx.compose.ui.graphics.Color uncheckedBorderColor, optional androidx.compose.ui.graphics.Color disabledBorderColor, optional androidx.compose.ui.graphics.Color disabledUncheckedBorderColor, optional androidx.compose.ui.graphics.Color disabledIndeterminateBorderColor, optional androidx.compose.ui.graphics.Color disabledCheckmarkColor);
608608
method @BytecodeOnly @Deprecated public androidx.compose.material3.CheckboxColors! copy-2qZNXz8(long, long, long, long, long, long, long, long, long, long, long, long);
609609
method @BytecodeOnly @Deprecated public static androidx.compose.material3.CheckboxColors! copy-2qZNXz8$default(androidx.compose.material3.CheckboxColors!, long, long, long, long, long, long, long, long, long, long, long, long, int, Object!);
610610
method @BytecodeOnly public androidx.compose.material3.CheckboxColors copy-daRQuJA(long, long, long, long, long, long, long, long, long, long, long, long, long);
@@ -658,9 +658,6 @@ package androidx.compose.material3 {
658658
method @BytecodeOnly @androidx.compose.runtime.Composable @androidx.compose.runtime.ComposableTarget(applier="androidx.compose.ui.UiComposable") public static void TriStateCheckbox(androidx.compose.ui.state.ToggleableState, kotlin.jvm.functions.Function0<kotlin.Unit!>?, androidx.compose.ui.graphics.drawscope.Stroke, androidx.compose.ui.graphics.drawscope.Stroke, androidx.compose.ui.Modifier?, boolean, androidx.compose.material3.CheckboxColors?, androidx.compose.foundation.interaction.MutableInteractionSource?, androidx.compose.runtime.Composer?, int, int);
659659
method @KotlinOnly @androidx.compose.runtime.Composable public static void TriStateCheckbox(androidx.compose.ui.state.ToggleableState state, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.material3.CheckboxColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource);
660660
method @BytecodeOnly @androidx.compose.runtime.Composable @androidx.compose.runtime.ComposableTarget(applier="androidx.compose.ui.UiComposable") public static void TriStateCheckbox(androidx.compose.ui.state.ToggleableState, kotlin.jvm.functions.Function0<kotlin.Unit!>?, androidx.compose.ui.Modifier?, boolean, androidx.compose.material3.CheckboxColors?, androidx.compose.foundation.interaction.MutableInteractionSource?, androidx.compose.runtime.Composer?, int, int);
661-
method @InaccessibleFromKotlin @SuppressCompatibility @androidx.compose.material3.ExperimentalMaterial3Api public static boolean isCheckboxStylingFixEnabled();
662-
method @InaccessibleFromKotlin @SuppressCompatibility @androidx.compose.material3.ExperimentalMaterial3Api public static void setCheckboxStylingFixEnabled(boolean);
663-
property @SuppressCompatibility @androidx.compose.material3.ExperimentalMaterial3Api public static boolean isCheckboxStylingFixEnabled;
664661
}
665662

666663
@Deprecated @androidx.compose.runtime.Immutable public final class ChipBorder {
@@ -867,8 +864,10 @@ package androidx.compose.material3 {
867864
}
868865

869866
@SuppressCompatibility @androidx.compose.material3.ExperimentalMaterial3Api public final class ComposeMaterial3Flags {
867+
property public boolean isCheckboxStylingFixEnabled;
870868
property public boolean isPrecisionPointerComponentSizingEnabled;
871869
field public static final androidx.compose.material3.ComposeMaterial3Flags INSTANCE;
870+
field public static boolean isCheckboxStylingFixEnabled;
872871
field public static boolean isPrecisionPointerComponentSizingEnabled;
873872
}
874873

@@ -4941,6 +4940,37 @@ package androidx.compose.material3.carousel {
49414940
method @BytecodeOnly @SuppressCompatibility @androidx.compose.material3.ExperimentalMaterial3Api @androidx.compose.runtime.Composable public static androidx.compose.material3.carousel.CarouselState rememberCarouselState(int, kotlin.jvm.functions.Function0<java.lang.Integer!>, androidx.compose.runtime.Composer?, int, int);
49424941
}
49434942

4943+
@SuppressCompatibility @androidx.compose.material3.ExperimentalMaterial3Api public sealed nonexhaustive interface MultiAspectCarouselItemDrawInfo {
4944+
method @InaccessibleFromKotlin public int getIndex();
4945+
method @InaccessibleFromKotlin @androidx.compose.runtime.annotation.FrequentlyChangingValue public float getMaskEnd();
4946+
method @InaccessibleFromKotlin @androidx.compose.runtime.annotation.FrequentlyChangingValue public float getMaskStart();
4947+
method @InaccessibleFromKotlin public float getMaxSize();
4948+
method @InaccessibleFromKotlin public float getMinSize();
4949+
method @InaccessibleFromKotlin @androidx.compose.runtime.annotation.FrequentlyChangingValue public float getParallax();
4950+
method @InaccessibleFromKotlin @androidx.compose.runtime.annotation.FrequentlyChangingValue public float getSize();
4951+
method @InaccessibleFromKotlin public boolean isHorizontal();
4952+
property public abstract int index;
4953+
property public abstract boolean isHorizontal;
4954+
property @androidx.compose.runtime.annotation.FrequentlyChangingValue public abstract float maskEnd;
4955+
property @androidx.compose.runtime.annotation.FrequentlyChangingValue public abstract float maskStart;
4956+
property public abstract float maxSize;
4957+
property public abstract float minSize;
4958+
property @androidx.compose.runtime.annotation.FrequentlyChangingValue public abstract float parallax;
4959+
property @androidx.compose.runtime.annotation.FrequentlyChangingValue public abstract float size;
4960+
}
4961+
4962+
public final class MultiAspectCarouselKt {
4963+
method @SuppressCompatibility @androidx.compose.material3.ExperimentalMaterial3Api public static androidx.compose.material3.carousel.MultiAspectCarouselItemDrawInfo MultiAspectCarouselItemDrawInfo(int index, androidx.compose.foundation.lazy.LazyListState state);
4964+
method @KotlinOnly @androidx.compose.runtime.Composable public static void MultiAspectCarouselScope(kotlin.jvm.functions.Function1<androidx.compose.material3.carousel.MultiAspectCarouselScope,kotlin.Unit> content);
4965+
method @BytecodeOnly @androidx.compose.runtime.Composable public static void MultiAspectCarouselScope(kotlin.jvm.functions.Function3<? super androidx.compose.material3.carousel.MultiAspectCarouselScope!,? super androidx.compose.runtime.Composer!,? super java.lang.Integer!,kotlin.Unit!>, androidx.compose.runtime.Composer?, int);
4966+
}
4967+
4968+
public interface MultiAspectCarouselScope {
4969+
method @KotlinOnly @SuppressCompatibility @androidx.compose.material3.ExperimentalMaterial3Api @androidx.compose.runtime.Composable public androidx.compose.ui.Modifier maskBorder(androidx.compose.ui.Modifier, androidx.compose.foundation.BorderStroke border, androidx.compose.ui.graphics.Shape shape, androidx.compose.material3.carousel.MultiAspectCarouselItemDrawInfo multiAspectItemDrawInfo);
4970+
method @BytecodeOnly @SuppressCompatibility @androidx.compose.material3.ExperimentalMaterial3Api @androidx.compose.runtime.Composable public androidx.compose.ui.Modifier maskBorder(androidx.compose.ui.Modifier, androidx.compose.foundation.BorderStroke, androidx.compose.ui.graphics.Shape, androidx.compose.material3.carousel.MultiAspectCarouselItemDrawInfo, androidx.compose.runtime.Composer?, int);
4971+
method @SuppressCompatibility @androidx.compose.material3.ExperimentalMaterial3Api public androidx.compose.ui.Modifier maskClip(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Shape shape, androidx.compose.material3.carousel.MultiAspectCarouselItemDrawInfo multiAspectItemDrawInfo);
4972+
}
4973+
49444974
}
49454975

49464976
package androidx.compose.material3.pulltorefresh {

compose/material3/material3/api/desktop/material3.api

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ public final class androidx/compose/material3/ComposableSingletons$ModalBottomSh
456456
public static final field INSTANCE Landroidx/compose/material3/ComposableSingletons$ModalBottomSheetKt;
457457
public fun <init> ()V
458458
public final fun getLambda$1121996006$material3 ()Lkotlin/jvm/functions/Function2;
459-
public final fun getLambda$1716959002$material3 ()Lkotlin/jvm/functions/Function2;
459+
public final fun getLambda$2132285819$material3 ()Lkotlin/jvm/functions/Function2;
460460
}
461461

462462
public final class androidx/compose/material3/ComposableSingletons$ScaffoldKt {
@@ -2179,6 +2179,13 @@ public final class androidx/compose/material3/WideNavigationRailValue : java/lan
21792179
public static fun values ()[Landroidx/compose/material3/WideNavigationRailValue;
21802180
}
21812181

2182+
public final class androidx/compose/material3/carousel/MultiAspectCarouselKt {
2183+
public static final fun MultiAspectCarouselScope (Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V
2184+
}
2185+
2186+
public abstract interface class androidx/compose/material3/carousel/MultiAspectCarouselScope {
2187+
}
2188+
21822189
public final class androidx/compose/material3/pulltorefresh/PullToRefreshDefaults {
21832190
public static final field $stable I
21842191
public static final field INSTANCE Landroidx/compose/material3/pulltorefresh/PullToRefreshDefaults;

compose/material3/material3/api/material3.klib.api

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ final enum class androidx.compose.material3/WideNavigationRailValue : kotlin/Enu
7676
final fun values(): kotlin/Array<androidx.compose.material3/WideNavigationRailValue> // androidx.compose.material3/WideNavigationRailValue.values|values#static(){}[0]
7777
}
7878

79+
abstract interface androidx.compose.material3.carousel/MultiAspectCarouselScope // androidx.compose.material3.carousel/MultiAspectCarouselScope|null[0]
80+
7981
abstract interface androidx.compose.material3.pulltorefresh/PullToRefreshState { // androidx.compose.material3.pulltorefresh/PullToRefreshState|null[0]
8082
abstract val distanceFraction // androidx.compose.material3.pulltorefresh/PullToRefreshState.distanceFraction|{}distanceFraction[0]
8183
abstract fun <get-distanceFraction>(): kotlin/Float // androidx.compose.material3.pulltorefresh/PullToRefreshState.distanceFraction.<get-distanceFraction>|<get-distanceFraction>(){}[0]
@@ -2292,6 +2294,7 @@ final fun (androidx.compose.material3/SingleChoiceSegmentedButtonRowScope).andro
22922294
final fun (androidx.compose.material3/SingleChoiceSegmentedButtonRowScope).androidx.compose.material3/SegmentedButton(kotlin/Boolean, kotlin/Function0<kotlin/Unit>, androidx.compose.ui.graphics/Shape, androidx.compose.ui/Modifier?, kotlin/Boolean, androidx.compose.material3/SegmentedButtonColors?, androidx.compose.foundation/BorderStroke?, androidx.compose.foundation.layout/PaddingValues?, androidx.compose.foundation.interaction/MutableInteractionSource?, kotlin/Function2<androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>?, kotlin/Function2<androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int, kotlin/Int) // androidx.compose.material3/SegmentedButton|SegmentedButton@androidx.compose.material3.SingleChoiceSegmentedButtonRowScope(kotlin.Boolean;kotlin.Function0<kotlin.Unit>;androidx.compose.ui.graphics.Shape;androidx.compose.ui.Modifier?;kotlin.Boolean;androidx.compose.material3.SegmentedButtonColors?;androidx.compose.foundation.BorderStroke?;androidx.compose.foundation.layout.PaddingValues?;androidx.compose.foundation.interaction.MutableInteractionSource?;kotlin.Function2<androidx.compose.runtime.Composer,kotlin.Int,kotlin.Unit>?;kotlin.Function2<androidx.compose.runtime.Composer,kotlin.Int,kotlin.Unit>;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int;kotlin.Int){}[0]
22932295
final fun (androidx.compose.ui/Modifier).androidx.compose.material3.pulltorefresh/pullToRefresh(kotlin/Boolean, androidx.compose.material3.pulltorefresh/PullToRefreshState, kotlin/Boolean = ..., androidx.compose.ui.unit/Dp = ..., kotlin/Function0<kotlin/Unit>): androidx.compose.ui/Modifier // androidx.compose.material3.pulltorefresh/pullToRefresh|[email protected](kotlin.Boolean;androidx.compose.material3.pulltorefresh.PullToRefreshState;kotlin.Boolean;androidx.compose.ui.unit.Dp;kotlin.Function0<kotlin.Unit>){}[0]
22942296
final fun (androidx.compose.ui/Modifier).androidx.compose.material3/minimumInteractiveComponentSize(): androidx.compose.ui/Modifier // androidx.compose.material3/minimumInteractiveComponentSize|[email protected](){}[0]
2297+
final fun androidx.compose.material3.carousel/MultiAspectCarouselScope(kotlin/Function3<androidx.compose.material3.carousel/MultiAspectCarouselScope, androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>, androidx.compose.runtime/Composer?, kotlin/Int) // androidx.compose.material3.carousel/MultiAspectCarouselScope|MultiAspectCarouselScope(kotlin.Function3<androidx.compose.material3.carousel.MultiAspectCarouselScope,androidx.compose.runtime.Composer,kotlin.Int,kotlin.Unit>;androidx.compose.runtime.Composer?;kotlin.Int){}[0]
22952298
final fun androidx.compose.material3.carousel/androidx_compose_material3_carousel_CarouselDefaults$stableprop_getter(): kotlin/Int // androidx.compose.material3.carousel/androidx_compose_material3_carousel_CarouselDefaults$stableprop_getter|androidx_compose_material3_carousel_CarouselDefaults$stableprop_getter(){}[0]
22962299
final fun androidx.compose.material3.carousel/androidx_compose_material3_carousel_CarouselState$stableprop_getter(): kotlin/Int // androidx.compose.material3.carousel/androidx_compose_material3_carousel_CarouselState$stableprop_getter|androidx_compose_material3_carousel_CarouselState$stableprop_getter(){}[0]
22972300
final fun androidx.compose.material3.internal/androidx_compose_material3_internal_AnchorAlignmentOffsetPosition_Horizontal$stableprop_getter(): kotlin/Int // androidx.compose.material3.internal/androidx_compose_material3_internal_AnchorAlignmentOffsetPosition_Horizontal$stableprop_getter|androidx_compose_material3_internal_AnchorAlignmentOffsetPosition_Horizontal$stableprop_getter(){}[0]

0 commit comments

Comments
 (0)