Skip to content
Snippets Groups Projects
Verified Commit 210aca00 authored by Torsten Grote's avatar Torsten Grote Committed by Mikolai Gütschow
Browse files

Allow null as Tooltip composable text

parent bae8c286
No related branches found
No related tags found
1 merge request!357Blog navigation + Let unread FABs info depend on (unread) posts
Pipeline #15270 passed
...@@ -208,7 +208,7 @@ private fun RepeatAuthorView( ...@@ -208,7 +208,7 @@ private fun RepeatAuthorView(
modifier = modifier, modifier = modifier,
) { ) {
Tooltip( Tooltip(
text = authorClickTooltip ?: "", text = authorClickTooltip,
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
) { ) {
Row( Row(
......
/* /*
* Briar Desktop * Briar Desktop
* Copyright (C) 2021-2022 The Briar Project * Copyright (C) 2021-2023 The Briar Project
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as * it under the terms of the GNU Affero General Public License as
...@@ -21,6 +21,7 @@ package org.briarproject.briar.desktop.ui ...@@ -21,6 +21,7 @@ package org.briarproject.briar.desktop.ui
import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.TooltipArea import androidx.compose.foundation.TooltipArea
import androidx.compose.foundation.TooltipPlacement import androidx.compose.foundation.TooltipPlacement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Surface import androidx.compose.material.Surface
...@@ -34,14 +35,20 @@ import androidx.compose.ui.unit.dp ...@@ -34,14 +35,20 @@ import androidx.compose.ui.unit.dp
@Composable @Composable
@OptIn(ExperimentalFoundationApi::class) @OptIn(ExperimentalFoundationApi::class)
fun Tooltip( fun Tooltip(
text: String, text: String?,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
delayMillis: Int = 500, delayMillis: Int = 500,
tooltipPlacement: TooltipPlacement = TooltipPlacement.CursorPoint( tooltipPlacement: TooltipPlacement = TooltipPlacement.CursorPoint(
offset = DpOffset(0.dp, 16.dp) offset = DpOffset(0.dp, 16.dp)
), ),
content: @Composable () -> Unit, content: @Composable () -> Unit,
) = TooltipArea( ) {
if (text.isNullOrEmpty()) {
Box(modifier = modifier) {
content()
}
} else {
TooltipArea(
tooltip = { tooltip = {
Surface( Surface(
modifier = Modifier.shadow(4.dp), modifier = Modifier.shadow(4.dp),
...@@ -58,3 +65,5 @@ fun Tooltip( ...@@ -58,3 +65,5 @@ fun Tooltip(
modifier = modifier, // todo: use tooltip text for semantic description modifier = modifier, // todo: use tooltip text for semantic description
content = content, content = content,
) )
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment