Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7073c762 authored by Ale Nijamkin's avatar Ale Nijamkin
Browse files

[flexiglass] Animate dual shade edu tooltip 

Turns out I was holding the API correctly. The TooltipBox needs to be
shown at all times in order to animate the tooltip in/out.

Bug: 406213664
Test: manually verified that it appears and disappears using an
animation
Flag: com.android.systemui.scene_container

Change-Id: I9219457fc2429384f488ba75a20080e1edd6509c
parent 81cbca86

packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/DualShadeEducationalTooltips.kt

+23 −14
Original line number Diff line number Diff line
@@ -49,14 +49,15 @@ fun DualShadeEducationalTooltips( 
            viewModelFactory.create(context)

        }



    val visibleTooltip = viewModel.visibleTooltip ?: return

    val visibleTooltip = viewModel.visibleTooltip



    Layout(

        content = {

            AnchoredTooltip(

                text = visibleTooltip.text,

                onShown = visibleTooltip.onShown,

                onDismissed = visibleTooltip.onDismissed,

                isVisible = visibleTooltip != null,

                text = visibleTooltip?.text,

                onShown = visibleTooltip?.onShown,

                onDismissed = visibleTooltip?.onDismissed,

            )

        },

        modifier = modifier.fillMaxSize(),
@@ -65,14 +66,14 @@ fun DualShadeEducationalTooltips( 
        val placeable =

            measurables[0].measure(

                Constraints.fixed(

                    width = visibleTooltip.anchorBounds.width,

                    height = visibleTooltip.anchorBounds.height,

                    width = visibleTooltip?.anchorBounds?.width ?: 0,

                    height = visibleTooltip?.anchorBounds?.height ?: 0,

                )

            )

        layout(constraints.maxWidth, constraints.maxHeight) {

            placeable.place(

                x = visibleTooltip.anchorBounds.left,

                y = visibleTooltip.anchorBounds.top,

                x = visibleTooltip?.anchorBounds?.left ?: 0,

                y = visibleTooltip?.anchorBounds?.top ?: 0,

            )

        }

    }
@@ -80,14 +81,22 @@ fun DualShadeEducationalTooltips( 


@Composable

private fun AnchoredTooltip(

    text: String,

    onShown: () -> Unit,

    onDismissed: () -> Unit,

    isVisible: Boolean,

    text: String?,

    onShown: (() -> Unit)?,

    onDismissed: (() -> Unit)?,

    modifier: Modifier = Modifier,

) {

    val tooltipState = rememberTooltipState(initialIsVisible = true, isPersistent = true)

    val tooltipState = rememberTooltipState(initialIsVisible = false, isPersistent = true)



    LaunchedEffect(Unit) { onShown() }

    LaunchedEffect(isVisible) {

        if (isVisible) {

            tooltipState.show()

            onShown?.invoke()

        } else {

            tooltipState.dismiss()

        }

    }



    TooltipBox(

        positionProvider = TooltipDefaults.rememberTooltipPositionProvider(),
@@ -101,7 +110,7 @@ private fun AnchoredTooltip( 
                caretSize = TooltipDefaults.caretSize,

                shadowElevation = 2.dp,

            ) {

                Text(text = text, modifier = Modifier.padding(8.dp))

                Text(text = text ?: "", modifier = Modifier.padding(8.dp))

            }

        },

        state = tooltipState,