Skip to content

fix: remove next item trigger from timed sheet dismiss #562

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
ovitrif merged 1 commit into from
Dec 30, 2025
Merged

fix: remove next item trigger from timed sheet dismiss #562

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
6 changes: 3 additions & 3 deletions app/src/main/java/to/bitkit/ui/nav/entries/SheetEntries.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ private fun EntryProviderScope<NavKey>.sheetFlowEntries(
}
BackgroundPaymentsIntroSheet(
onContinue = {
appViewModel.dismissTimedSheet(skipQueue = true)
appViewModel.dismissTimedSheet()
navigator.navigate(Routes.BackgroundPayments.Settings)
},
)
Expand All @@ -759,7 +759,7 @@ private fun EntryProviderScope<NavKey>.sheetFlowEntries(
}
QuickPayIntroSheet(
onContinue = {
appViewModel.dismissTimedSheet(skipQueue = true)
appViewModel.dismissTimedSheet()
navigator.navigate(Routes.QuickPay.Settings)
},
)
Expand All @@ -777,7 +777,7 @@ private fun EntryProviderScope<NavKey>.sheetFlowEntries(
learnMoreClick = {
val intent = Intent(Intent.ACTION_VIEW, Env.STORING_BITCOINS_URL.toUri())
context.startActivity(intent)
appViewModel.dismissTimedSheet(skipQueue = true)
appViewModel.dismissTimedSheet()
navigator.goBack()
},
)
Expand Down
9 changes: 2 additions & 7 deletions app/src/main/java/to/bitkit/utils/timedsheets/TimedSheetManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,15 @@ class TimedSheetManager(private val scope: CoroutineScope) {
checkJob = null
}

fun dismissCurrentSheet(skipQueue: Boolean = false) {
fun dismissCurrentSheet() {
if (currentTimedSheet == null) return

scope.launch {
currentTimedSheet?.onDismissed()
_currentSheet.value = null
currentTimedSheet = null

if (skipQueue) {
Logger.debug("Clearing timed sheet queue", context = TAG)
} else {
delay(CHECK_DELAY_MILLIS)
checkAndShowNextSheet()
}
Logger.debug("Clearing timed sheet queue", context = TAG)
}
}

Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1736,8 +1736,7 @@ class AppViewModel @Inject constructor(

fun onLeftHome() = timedSheetManager.onHomeScreenExited()

fun dismissTimedSheet(skipQueue: Boolean = false) =
timedSheetManager.dismissCurrentSheet(skipQueue)
fun dismissTimedSheet() = timedSheetManager.dismissCurrentSheet()

private suspend fun checkCriticalAppUpdate() = withContext(bgDispatcher) {
delay(SCREEN_TRANSITION_DELAY_MS)
Expand Down
4 changes: 2 additions & 2 deletions app/src/test/java/to/bitkit/utils/timedsheets/TimedSheetManagerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class TimedSheetManagerTest : BaseUnitTest() {

assertEquals(TimedSheetType.APP_UPDATE, sut.currentSheet.value)

sut.dismissCurrentSheet(skipQueue = true)
sut.dismissCurrentSheet()
testScope.advanceTimeBy(100)

assertNull(sut.currentSheet.value)
Expand Down Expand Up @@ -139,7 +139,7 @@ class TimedSheetManagerTest : BaseUnitTest() {

assertEquals(TimedSheetType.BACKUP, sut.currentSheet.value)

sut.dismissCurrentSheet(skipQueue = false)
sut.dismissCurrentSheet()
testScope.advanceTimeBy(100)

assertNull(sut.currentSheet.value)
Expand Down
Loading