Skip to content

Commit 18de54b

Browse files
authored
Merge pull request #2
refactor: 改进界面以支持边到边显示
2 parents 78215b1 + 5a3c170 commit 18de54b

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

app/src/main/java/io/github/vvb2060/ims/ui/MainActivity.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@ import androidx.activity.viewModels
1010
import androidx.compose.foundation.layout.Column
1111
import androidx.compose.foundation.layout.Row
1212
import androidx.compose.foundation.layout.Spacer
13+
import androidx.compose.foundation.layout.WindowInsets
14+
import androidx.compose.foundation.layout.navigationBars
15+
import androidx.compose.foundation.layout.consumeWindowInsets
1316
import androidx.compose.foundation.layout.fillMaxSize
1417
import androidx.compose.foundation.layout.fillMaxWidth
1518
import androidx.compose.foundation.layout.height
1619
import androidx.compose.foundation.layout.padding
1720
import androidx.compose.foundation.layout.width
21+
import androidx.compose.foundation.layout.windowInsetsBottomHeight
1822
import androidx.compose.foundation.rememberScrollState
1923
import androidx.compose.foundation.selection.selectable
2024
import androidx.compose.foundation.verticalScroll
@@ -103,6 +107,7 @@ class MainActivity : ComponentActivity() {
103107

104108
Scaffold(
105109
modifier = Modifier.fillMaxSize(),
110+
contentWindowInsets = WindowInsets(0.dp),
106111
topBar = {
107112
CenterAlignedTopAppBar(
108113
title = {
@@ -134,6 +139,7 @@ class MainActivity : ComponentActivity() {
134139
Column(
135140
modifier = Modifier
136141
.padding(innerPadding)
142+
.consumeWindowInsets(innerPadding)
137143
.verticalScroll(rememberScrollState())
138144
) {
139145
SystemInfoCard(
@@ -155,6 +161,7 @@ class MainActivity : ComponentActivity() {
155161
viewModel.onApplyConfiguration(context, selectedSim!!)
156162
}
157163
Tips()
164+
Spacer(modifier = Modifier.windowInsetsBottomHeight(WindowInsets.navigationBars))
158165

159166
if (showSimSelectionDialog) {
160167
SimSelectionDialog(

0 commit comments

Comments
 (0)