Merge pull request #326 from /issues/321

fix: test URLs button is hidden behind keyboard
ooni · Dec 3, 2024 · 9c8fd59 · 9c8fd59
2 parents ae89807 + 9011567
commit 9c8fd59
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/composeApp/src/androidMain/AndroidManifest.xml b/composeApp/src/androidMain/AndroidManifest.xml
@@ -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" />

diff --git a/composeApp/src/commonMain/kotlin/org/ooni/probe/ui/choosewebsites/ChooseWebsitesScreen.kt b/composeApp/src/commonMain/kotlin/org/ooni/probe/ui/choosewebsites/ChooseWebsitesScreen.kt
@@ -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
@@ -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)) },
@@ -71,6 +71,7 @@ fun ChooseWebsitesScreen(
 
         Box(Modifier.fillMaxSize()) {
             LazyColumn(
+                modifier = Modifier.imePadding(),
                 contentPadding = PaddingValues(
                     bottom = WindowInsets.navigationBars.asPaddingValues()
                         .calculateBottomPadding() + 64.dp,
@@ -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(