Skip to content
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

fix: test URLs button is hidden behind keyboard #326

Merged
merged 2 commits into from
Dec 3, 2024
Merged

fix: test URLs button is hidden behind keyboard #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed31ff1
fix: keyboard error
aanorbel Dec 2, 2024
9011567
Fix inset issues
sdsantos Dec 3, 2024
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
1 change: 1 addition & 0 deletions composeApp/src/androidMain/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
android:name=".MainActivity"
android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mnc|colorMode|density|fontScale|fontWeightAdjustment|keyboard|layoutDirection|locale|mcc|navigation|smallestScreenSize|touchscreen|uiMode"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustNothing"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
10 changes: 6 additions & 4 deletions composeApp/src/commonMain/kotlin/org/ooni/probe/ui/choosewebsites/ChooseWebsitesScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
Expand Down Expand Up @@ -53,9 +55,7 @@ fun ChooseWebsitesScreen(
onEvent: (ChooseWebsitesViewModel.Event) -> Unit,
) {
Column(
modifier = Modifier
.padding(WindowInsets.navigationBars.asPaddingValues())
.background(MaterialTheme.colorScheme.background),
modifier = Modifier.background(MaterialTheme.colorScheme.background),
) {
TopBar(
title = { Text(stringResource(Res.string.Settings_Websites_CustomURL_Title)) },
Expand All @@ -71,6 +71,7 @@ fun ChooseWebsitesScreen(

Box(Modifier.fillMaxSize()) {
LazyColumn(
modifier = Modifier.imePadding(),
contentPadding = PaddingValues(
bottom = WindowInsets.navigationBars.asPaddingValues()
.calculateBottomPadding() + 64.dp,
Expand Down Expand Up @@ -137,7 +138,8 @@ fun ChooseWebsitesScreen(
onClick = { onEvent(ChooseWebsitesViewModel.Event.RunClicked) },
modifier = Modifier
.align(Alignment.BottomCenter)
.padding(WindowInsets.navigationBars.asPaddingValues())
.imePadding()
.navigationBarsPadding()
.padding(bottom = 16.dp),
) {
Icon(
Expand Down