Adding edge to edge support (#1607)

* Adding edge to edge support * Addressing PR comments. --------- Co-authored-by: Maarten Vercruysse <[email protected]>
LemmyNet · Sep 2, 2024 · 4720509 · 4720509
1 parent ee5263d
commit 4720509
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 52 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -114,6 +114,7 @@ dependencies {
 
     val composeBom = platform("dev.chrisbanes.compose:compose-bom:2024.07.00-alpha02")
     api(composeBom)
+    implementation("androidx.activity:activity-ktx")
     implementation("androidx.activity:activity-compose")
     implementation("androidx.appcompat:appcompat:1.7.0")
     androidTestApi(composeBom)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
         android:label="@string/app_name"
         android:localeConfig="@xml/locales_config"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Jerboa"
+        android:theme="@style/Theme.AppCompat.NoActionBar"
         tools:targetApi="33">
         <profileable android:shell="true"/>
 
@@ -40,7 +40,7 @@
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize"
             android:exported="true"
-            android:theme="@style/Theme.Jerboa"
+            android:theme="@style/Theme.AppCompat.NoActionBar"
             android:launchMode="standard"
             android:allowTaskReparenting="true"
             android:windowSoftInputMode="adjustResize"

diff --git a/app/src/main/java/com/jerboa/MainActivity.kt b/app/src/main/java/com/jerboa/MainActivity.kt
@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.util.Patterns
 import android.widget.TextView
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.EnterTransition
@@ -92,6 +93,7 @@ class MainActivity : AppCompatActivity() {
 
     @OptIn(ExperimentalLayoutApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         setContent {
             val ctx = LocalContext.current
@@ -329,7 +331,6 @@ class MainActivity : AppCompatActivity() {
                             markAsReadOnScroll = appSettings.markAsReadOnScroll,
                             postActionBarMode = appSettings.postActionBarMode.toEnum(),
                             swipeToActionPreset = appSettings.swipeToActionPreset.toEnum(),
-                            padding = null,
                         )
                     }
 
@@ -369,7 +370,6 @@ class MainActivity : AppCompatActivity() {
                             markAsReadOnScroll = appSettings.markAsReadOnScroll,
                             postActionBarMode = appSettings.postActionBarMode.toEnum(),
                             swipeToActionPreset = appSettings.swipeToActionPreset.toEnum(),
-                            padding = null,
                         )
                     }
 

diff --git a/app/src/main/java/com/jerboa/ui/components/home/BottomNavScreen.kt b/app/src/main/java/com/jerboa/ui/components/home/BottomNavScreen.kt
@@ -294,16 +294,6 @@ fun BottomNavScreen(
                         )
                     }
 
-                    composable(route = NavTab.RegistrationApplications.name) {
-                        RegistrationApplicationsScreen(
-                            appState = appState,
-                            accountViewModel = accountViewModel,
-                            siteViewModel = siteViewModel,
-                            drawerState = drawerState,
-                            padding = padding,
-                        )
-                    }
-
                     composable(route = NavTab.Reports.name) {
                         ReportsScreen(
                             appState = appState,

diff --git a/app/src/main/java/com/jerboa/ui/components/home/HomeActivity.kt b/app/src/main/java/com/jerboa/ui/components/home/HomeActivity.kt
@@ -5,7 +5,9 @@ import androidx.activity.compose.ReportDrawn
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Add
@@ -93,7 +95,7 @@ fun HomeScreen(
     markAsReadOnScroll: Boolean,
     postActionBarMode: PostActionBarMode,
     swipeToActionPreset: SwipeToActionPreset,
-    padding: PaddingValues? = null,
+    padding: PaddingValues,
 ) {
     Log.d("jerboa", "got to home screen")
 
@@ -128,12 +130,11 @@ fun HomeScreen(
         }
     }
 
-    val baseModifier = if (padding == null) {
+    val baseModifier =
         Modifier
-    } else {
-        // Only do bottom padding else it will apply status bar padding twice due nested scaffold
-        Modifier.padding(bottom = padding.calculateBottomPadding())
-    }
+            .padding(padding)
+            .consumeWindowInsets(padding)
+            .systemBarsPadding()
 
     Scaffold(
         modifier =

diff --git a/app/src/main/java/com/jerboa/ui/components/inbox/InboxScreen.kt b/app/src/main/java/com/jerboa/ui/components/inbox/InboxScreen.kt
@@ -6,8 +6,10 @@ import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -92,8 +94,12 @@ fun InboxScreen(
     val baseModifier = if (padding == null) {
         Modifier
     } else {
-        // Only do bottom padding else it will apply status bar padding twice due nested scaffold
-        Modifier.padding(bottom = padding.calculateBottomPadding())
+        // https://issuetracker.google.com/issues/249727298
+        // Else it also applies the padding above the ime (keyboard)
+        Modifier
+            .padding(padding)
+            .consumeWindowInsets(padding)
+            .systemBarsPadding()
     }
 
     Scaffold(

diff --git a/app/src/main/java/com/jerboa/ui/components/person/PersonProfileScreen.kt b/app/src/main/java/com/jerboa/ui/components/person/PersonProfileScreen.kt
@@ -5,8 +5,10 @@ import android.util.Log
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
@@ -121,7 +123,7 @@ fun PersonProfileScreen(
     postActionBarMode: PostActionBarMode,
     onBack: (() -> Unit)?,
     swipeToActionPreset: SwipeToActionPreset,
-    padding: PaddingValues?,
+    padding: PaddingValues? = null,
 ) {
     Log.d("jerboa", "got to person screen")
 
@@ -166,8 +168,12 @@ fun PersonProfileScreen(
     val baseModifier = if (padding == null) {
         Modifier
     } else {
-        // Only do bottom padding else it will apply status bar padding twice due nested scaffold
-        Modifier.padding(bottom = padding.calculateBottomPadding())
+        // https://issuetracker.google.com/issues/249727298
+        // Else it also applies the padding above the ime (keyboard)
+        Modifier
+            .padding(padding)
+            .consumeWindowInsets(padding)
+            .systemBarsPadding()
     }
 
     Scaffold(

diff --git a/.../java/com/jerboa/ui/components/registrationapplications/RegistrationApplicationsScreen.kt b/.../java/com/jerboa/ui/components/registrationapplications/RegistrationApplicationsScreen.kt
@@ -2,7 +2,9 @@ package com.jerboa.ui.components.registrationapplications
 
 import android.util.Log
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.material3.DrawerState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
@@ -51,8 +53,12 @@ fun RegistrationApplicationsScreen(
     val baseModifier = if (padding == null) {
         Modifier
     } else {
-        // Only do bottom padding else it will apply status bar padding twice due nested scaffold
-        Modifier.padding(bottom = padding.calculateBottomPadding())
+        // https://issuetracker.google.com/issues/249727298
+        // Else it also applies the padding above the ime (keyboard)
+        Modifier
+            .padding(padding)
+            .consumeWindowInsets(padding)
+            .systemBarsPadding()
     }
 
     Scaffold(

diff --git a/app/src/main/java/com/jerboa/ui/components/reports/ReportsScreen.kt b/app/src/main/java/com/jerboa/ui/components/reports/ReportsScreen.kt
@@ -5,8 +5,10 @@ import android.util.Log
 import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -78,8 +80,12 @@ fun ReportsScreen(
     val baseModifier = if (padding == null) {
         Modifier
     } else {
-        // Only do bottom padding else it will apply status bar padding twice due nested scaffold
-        Modifier.padding(bottom = padding.calculateBottomPadding())
+        // https://issuetracker.google.com/issues/249727298
+        // Else it also applies the padding above the ime (keyboard)
+        Modifier
+            .padding(padding)
+            .consumeWindowInsets(padding)
+            .systemBarsPadding()
     }
 
     Scaffold(

diff --git a/app/src/main/java/com/jerboa/ui/theme/Theme.kt b/app/src/main/java/com/jerboa/ui/theme/Theme.kt
@@ -16,7 +16,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.graphics.ColorUtils
-import androidx.core.view.WindowCompat
 import com.jerboa.ThemeColor
 import com.jerboa.ThemeMode
 import com.jerboa.db.entity.AppSettings
@@ -107,27 +106,13 @@ fun JerboaTheme(
     }
 
     val view = LocalView.current
-
     val window = (view.context as Activity).window
-    val insets = WindowCompat.getInsetsController(window, view)
-
-    val isLight =
-        when (themeMode) {
-            ThemeMode.Black, ThemeMode.Dark -> false
-            ThemeMode.System, ThemeMode.SystemBlack -> !isSystemInDarkTheme()
-            else -> true
-        }
-
     if (appSettings.secureWindow) {
         window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
     } else {
         window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
     }
 
-    // The navigation bar color is set on BottomAppBarAll
-    insets.isAppearanceLightStatusBars = isLight
-    insets.isAppearanceLightNavigationBars = isLight
-
     // Set up a provider to allow access to the custom color scheme from any child element
     CompositionLocalProvider(LocalColorScheme provides colors) {
         // Set up the default MaterialTheme provider

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml