From bd386580214597c5b6ce66a8cc0f16f5670c2cad Mon Sep 17 00:00:00 2001 From: Mikhail Kulaha Date: Tue, 19 Mar 2024 19:40:54 +0000 Subject: [PATCH] Making Chip with Slots and LongClick public (#2149) Public api is required for animating in and outs of the chip content. --- compose-material/api/current.api | 2 ++ .../com/google/android/horologist/compose/material/Chip.kt | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compose-material/api/current.api b/compose-material/api/current.api index 96f85653da..bd623f9e8f 100644 --- a/compose-material/api/current.api +++ b/compose-material/api/current.api @@ -55,6 +55,8 @@ package com.google.android.horologist.compose.material { method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void Chip(@StringRes int labelId, kotlin.jvm.functions.Function0 onClick, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? onLongClick, optional @StringRes Integer? secondaryLabel, optional com.google.android.horologist.compose.material.IconRtlMode iconRtlMode, optional com.google.android.horologist.images.base.paintable.Paintable? icon, optional boolean largeIcon, optional androidx.wear.compose.material.ChipColors colors, optional boolean enabled); method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void Chip(String label, kotlin.jvm.functions.Function0 onClick, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? onLongClick, optional String? secondaryLabel, optional com.google.android.horologist.compose.material.IconRtlMode iconRtlMode, optional com.google.android.horologist.images.base.paintable.Paintable? icon, optional boolean largeIcon, optional androidx.wear.compose.material.ChipColors colors, optional boolean enabled); method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void Chip(String label, kotlin.jvm.functions.Function0 onClick, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? onLongClick, optional String? secondaryLabel, optional kotlin.jvm.functions.Function1? icon, optional boolean largeIcon, optional androidx.wear.compose.material.ChipColors colors, optional boolean enabled); + method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void Chip(kotlin.jvm.functions.Function0 onClick, androidx.wear.compose.material.ChipColors colors, androidx.wear.compose.material.ChipBorder border, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? onLongClick, optional boolean enabled, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional int role, kotlin.jvm.functions.Function1 content); + method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void Chip(kotlin.jvm.functions.Function1 label, kotlin.jvm.functions.Function0 onClick, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? onLongClick, optional kotlin.jvm.functions.Function1? secondaryLabel, optional kotlin.jvm.functions.Function1? icon, optional androidx.wear.compose.material.ChipColors colors, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.graphics.Shape shape, optional androidx.wear.compose.material.ChipBorder border); } public final class CompactChipKt { diff --git a/compose-material/src/main/java/com/google/android/horologist/compose/material/Chip.kt b/compose-material/src/main/java/com/google/android/horologist/compose/material/Chip.kt index b59f0f1712..4716ea74c0 100644 --- a/compose-material/src/main/java/com/google/android/horologist/compose/material/Chip.kt +++ b/compose-material/src/main/java/com/google/android/horologist/compose/material/Chip.kt @@ -279,8 +279,9 @@ public fun Chip( * Temporary copy of Wear Compose Material Chip with support for * onLongClick. */ +@ExperimentalHorologistApi @Composable -internal fun Chip( +public fun Chip( label: @Composable RowScope.() -> Unit, onClick: () -> Unit, modifier: Modifier = Modifier, @@ -363,8 +364,9 @@ internal fun Chip( * Temporary copy of Wear Compose Material Chip with support for * onLongClick. */ +@ExperimentalHorologistApi @Composable -internal fun Chip( +public fun Chip( onClick: () -> Unit, colors: ChipColors, border: ChipBorder,