Add padding for navigationBars when fully scrolled (Fixes #45)

soupslurpr · Jan 5, 2024 · bea6e2d · bea6e2d
1 parent 37c3dad
commit bea6e2d
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 0 deletions.
diff --git a/app/src/main/kotlin/dev/soupslurpr/appverifier/ui/AppListScreen.kt b/app/src/main/kotlin/dev/soupslurpr/appverifier/ui/AppListScreen.kt
@@ -5,6 +5,11 @@ import android.content.pm.PackageManager
 import android.graphics.drawable.Drawable
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -76,6 +81,9 @@ fun AppListScreen(
                 )
             }
         }
+        item {
+            Spacer(Modifier.padding(WindowInsets.navigationBars.asPaddingValues()))
+        }
     }
 }
 

diff --git a/app/src/main/kotlin/dev/soupslurpr/appverifier/ui/CreditsScreen.kt b/app/src/main/kotlin/dev/soupslurpr/appverifier/ui/CreditsScreen.kt
@@ -1,6 +1,10 @@
 package dev.soupslurpr.appverifier.ui
 
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.icons.Icons
@@ -1148,6 +1152,12 @@ fun CreditsScreen() {
                 dependencyLicense = APACHE2LICENSE,
             )
         }
+
+
+        // This MUST stay at the bottom or else when fully scrolled some credits will be blocked.
+        item {
+            Spacer(Modifier.padding(WindowInsets.navigationBars.asPaddingValues()))
+        }
     }
 }
 

diff --git a/app/src/main/kotlin/dev/soupslurpr/appverifier/ui/LicenseScreen.kt b/app/src/main/kotlin/dev/soupslurpr/appverifier/ui/LicenseScreen.kt
@@ -1,6 +1,10 @@
 package dev.soupslurpr.appverifier.ui
 
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -20,5 +24,7 @@ fun LicenseScreen() {
             modifier = Modifier.padding(horizontal = 15.dp),
             text = stringResource(R.string.full_license)
         )
+
+        Spacer(Modifier.padding(WindowInsets.navigationBars.asPaddingValues()))
     }
 }
diff --git a/app/src/main/kotlin/dev/soupslurpr/appverifier/ui/PrivacyPolicyScreen.kt b/app/src/main/kotlin/dev/soupslurpr/appverifier/ui/PrivacyPolicyScreen.kt
@@ -1,6 +1,10 @@
 package dev.soupslurpr.appverifier.ui
 
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -20,5 +24,7 @@ fun PrivacyPolicyScreen() {
             modifier = Modifier.padding(horizontal = 15.dp),
             text = stringResource(R.string.full_privacy_policy)
         )
+
+        Spacer(Modifier.padding(WindowInsets.navigationBars.asPaddingValues()))
     }
 }
diff --git a/app/src/main/kotlin/dev/soupslurpr/appverifier/ui/SettingsScreen.kt b/app/src/main/kotlin/dev/soupslurpr/appverifier/ui/SettingsScreen.kt
@@ -3,6 +3,10 @@ package dev.soupslurpr.appverifier.ui
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.selection.toggleable
@@ -131,6 +135,8 @@ fun SettingsScreen(
                 }
             )
         }
+
+        Spacer(Modifier.padding(WindowInsets.navigationBars.asPaddingValues()))
     }
 }
 

diff --git a/app/src/main/kotlin/dev/soupslurpr/appverifier/ui/StartupScreen.kt b/app/src/main/kotlin/dev/soupslurpr/appverifier/ui/StartupScreen.kt
@@ -112,5 +112,7 @@ fun StartupScreen(
             Spacer(modifier = modifier.width(8.dp))
             Text(stringResource(R.string.settings))
         }
+
+        Spacer(Modifier.padding(WindowInsets.navigationBars.asPaddingValues()))
     }
 }
diff --git a/app/src/main/kotlin/dev/soupslurpr/appverifier/ui/VerifyAppScreen.kt b/app/src/main/kotlin/dev/soupslurpr/appverifier/ui/VerifyAppScreen.kt
@@ -8,9 +8,12 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+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.height
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -191,6 +194,8 @@ fun VerifyAppScreen(
                 }
             }
         }
+
+        Spacer(Modifier.padding(WindowInsets.navigationBars.asPaddingValues()))
     }
 
     if (showMoreInfoAboutInternalDatabaseStatusDialog) {