Skip to content

fix(tooltip): hide when bill is active #553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmc08gt merged 1 commit into from
Sep 9, 2024
Merged

fix(tooltip): hide when bill is active #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/java/com/getcode/view/main/scanner/DecorView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ internal fun DecorView(
.padding(horizontal = CodeTheme.dimens.grid.x3)
.align(Alignment.TopStart)
.popoverTip(
visible = dataState.billState.bill == null,
tip = tips.downloadCodeTip,
alignment = Alignment.BottomStart
)
Expand Down
7 changes: 7 additions & 0 deletions vendor/tipkit/tipkit-m2/src/main/kotlin/dev/bmcreations/tipkit/Modifier.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@ import kotlinx.coroutines.flow.onEach
* centered horizontally, whereas [Alignment.TopStart] implies that the tip will render above and to the left
* of the anchor.
* @param padding The space between the anchor and aligned tip.
* @param visible If the tip should be visible, this can be used to temporarily hide an active tip.
*/
fun Modifier.popoverTip(
tip: Tip,
visible: Boolean = true,
alignment: Alignment = TipDefaultAlignment,
padding: PaddingValues = TipDefaultPadding,
) = composed {
Expand Down Expand Up @@ -77,7 +79,12 @@ fun Modifier.popoverTip(
.filter { it }
.onEach { tipProvider.show(data) }
.launchIn(this)
}

LaunchedEffect(tip, visible) {
if (!visible) {
tipProvider.dismiss(eventDriven = false)
}
}

return@composed Modifier.onPlaced {
Expand Down
6 changes: 4 additions & 2 deletions vendor/tipkit/tipkit-m2/src/main/kotlin/dev/bmcreations/tipkit/TipScaffold.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,13 @@ fun TipScaffold(
emission = data
}

override fun dismiss() {
override fun dismiss(eventDriven: Boolean) {
composeScope.launch {
val tip = emission?.tip
emission = null
tip?.dismiss()
if (eventDriven) {
tip?.dismiss()
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions vendor/tipkit/tipkit/src/main/kotlin/dev/bmcreations/tipkit/TipProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ val LocalTipProvider =

abstract class TipProvider {
abstract fun show(data: TipPresentation)
abstract fun dismiss()
abstract fun dismiss(eventDriven: Boolean = true)
abstract fun onActionClicked(action: TipAction)

open val isTipShowing: Boolean = false
Expand All @@ -26,7 +26,7 @@ abstract class TipProvider {

class NoOpTipProvider : TipProvider() {
override fun show(data: TipPresentation) = Unit
override fun dismiss() = Unit
override fun dismiss(eventDriven: Boolean) = Unit

override fun onActionClicked(action: TipAction) = Unit
}