Refactor(ToolView): Automatically raise the view when opening the keyboard

This commit is contained in:
2024-08-21 12:07:16 +08:00
parent 0e5b6d7f98
commit 893131fe02

View File

@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.WindowInsetsSides
import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.only import androidx.compose.foundation.layout.only
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.safeDrawing import androidx.compose.foundation.layout.safeDrawing
@@ -31,7 +32,6 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.kevinnzou.web.WebView import com.kevinnzou.web.WebView
@@ -87,7 +87,6 @@ internal fun ToolViewScreen(
) )
) { ) {
OxygenTopAppBar( OxygenTopAppBar(
modifier = Modifier.zIndex(100f),
title = { title = {
Text( Text(
text = when (toolViewUiState) { text = when (toolViewUiState) {
@@ -147,11 +146,14 @@ internal fun ToolViewScreen(
data = toolViewUiState.htmlData, data = toolViewUiState.htmlData,
) )
WebView( WebView(
modifier = Modifier.fillMaxSize(), modifier = Modifier
.fillMaxSize()
.imePadding(),
state = webViewState, state = webViewState,
onCreated = { onCreated = {
it.settings.javaScriptEnabled = true it.settings.javaScriptEnabled = true
}) }
)
} }
} }
} }