FatttSnake/oxygen-android
1
0
Fork 0
Code Pull Requests Activity

Feat(Tool): Launch tool by scheme

Browse Source
This commit is contained in:
Fat Snake
2024-05-11 19:00:41 +08:00
parent 3a91e834b7
commit 3338522d40
5 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/component/scrollbar/Scrollbar.kt
View File

@@ -250,11 +250,11 @@ fun Scrollbar(
draggedOffset = offset
}
val onDragEnd: () -> Unit = {
dragInteraction?.let { interactionSource?.tryEmit(DragInteraction.Stop(it)) }
dragInteraction?.run { interactionSource?.tryEmit(DragInteraction.Stop(this)) }
draggedOffset = Offset.Unspecified
}
val onDragCancel: () -> Unit = {
dragInteraction?.let { interactionSource?.tryEmit(DragInteraction.Cancel(it)) }
dragInteraction?.run { interactionSource?.tryEmit(DragInteraction.Cancel(this)) }
draggedOffset = Offset.Unspecified
}
val onDrag: (change: PointerInputChange, dragAmount: Float) -> Unit =

7
app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolViewScreen.kt
View File

@@ -9,11 +9,8 @@ import androidx.compose.animation.core.tween
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.safeDrawingPadding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
@@ -45,7 +42,7 @@ internal fun ToolViewRoute(
val toolViewUiState by viewModel.toolViewUiState.collectAsStateWithLifecycle()
ToolViewScreen(
modifier = modifier.safeDrawingPadding(),
modifier = modifier,
onBackClick = onBackClick,
toolViewUiState = toolViewUiState
)
@@ -63,7 +60,7 @@ internal fun ToolViewScreen(
val infiniteTransition = rememberInfiniteTransition(label = "infiniteTransition")
Box(
modifier = modifier.windowInsetsPadding(WindowInsets(0, 0, 0, 0)),
modifier = modifier,
) {
OxygenTopAppBar(
modifier = Modifier.zIndex(100f),