Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ import androidx.compose.animation.graphics.vector.AnimatedImageVector
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.HelpOutline
import androidx.compose.material3.SnackbarDuration
import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.SnackbarResult
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
Expand Down Expand Up @@ -101,7 +103,12 @@ data object LibraryTab : Tab {
category != null -> MR.strings.updating_category
else -> MR.strings.updating_library
}
snackbarHostState.showSnackbar(context.stringResource(msgRes))
val actionLabel = context.stringResource(MR.strings.action_cancel).takeIf { started }
val snackBarResult =
snackbarHostState.showSnackbar(context.stringResource(msgRes), actionLabel, duration = SnackbarDuration.Short)
if (snackBarResult == SnackbarResult.ActionPerformed) {
LibraryUpdateJob.stop(context)
}
}
started
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ class UpdatesScreenModel(
return started
}

fun cancelLibraryUpdate() = LibraryUpdateJob.stop(Injekt.get<Application>())

/**
* Update status of chapters.
*
Expand Down
13 changes: 12 additions & 1 deletion app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package eu.kanade.tachiyomi.ui.updates
import androidx.compose.animation.graphics.res.animatedVectorResource
import androidx.compose.animation.graphics.res.rememberAnimatedVectorPainter
import androidx.compose.animation.graphics.vector.AnimatedImageVector
import androidx.compose.material3.SnackbarDuration
import androidx.compose.material3.SnackbarResult
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect
Expand Down Expand Up @@ -109,7 +111,16 @@ data object UpdatesTab : Tab {
} else {
MR.strings.update_already_running
}
screenModel.snackbarHostState.showSnackbar(context.stringResource(msg))
val actionLabel = context.stringResource(MR.strings.action_cancel).takeIf { event.started }
val snackbarResult =
screenModel.snackbarHostState.showSnackbar(
context.stringResource(msg),
actionLabel,
duration = SnackbarDuration.Short
)
if (snackbarResult == SnackbarResult.ActionPerformed) {
screenModel.cancelLibraryUpdate()
}
}
}
}
Expand Down