Enable edge-to-edge support for BaseActivity (#5387)

Author: TimoPtr

app/src/main/kotlin/io/homeassistant/companion/android/BaseActivity.kt

@@ -6,6 +6,7 @@ import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.content.pm.PackageManager
 import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.lifecycle.Lifecycle
@@ -28,6 +29,7 @@ open class BaseActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         lifecycleScope.launch {
             lifecycle.repeatOnLifecycle(Lifecycle.State.RESUMED) {
                 permissionRequestMediator.eventFlow.collect { permissionToRequest ->

app/src/main/kotlin/io/homeassistant/companion/android/assist/AssistActivity.kt

@@ -5,13 +5,10 @@ import android.app.KeyguardManager
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.view.WindowManager
-import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
@@ -56,13 +53,9 @@ class AssistActivity : BaseActivity() {
 
     private val requestPermission = registerForActivityResult(
         ActivityResultContracts.RequestPermission(),
-        { viewModel.onPermissionResult(it) },
-    )
+    ) { viewModel.onPermissionResult(it) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        enableEdgeToEdge(
-            navigationBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT),
-        )
         super.onCreate(savedInstanceState)
         updateShowWhenLocked()
 

app/src/main/kotlin/io/homeassistant/companion/android/barcode/BarcodeScannerActivity.kt

@@ -8,7 +8,6 @@ import android.os.Bundle
 import android.provider.Settings
 import androidx.activity.addCallback
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AlertDialog
@@ -57,7 +56,6 @@ class BarcodeScannerActivity : BaseActivity() {
     private var requestSilently by mutableStateOf(true)
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
         val messageId = intent.getIntExtra(EXTRA_MESSAGE_ID, -1)

app/src/main/kotlin/io/homeassistant/companion/android/nfc/NfcSetupActivity.kt

@@ -8,7 +8,6 @@ import android.nfc.NfcAdapter
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
@@ -62,8 +61,6 @@ class NfcSetupActivity : BaseActivity() {
             viewModel.writeNewTagSimple(it)
         }
 
-        enableEdgeToEdge()
-
         setContent {
             HomeAssistantAppTheme {
                 LoadNfcView(

app/src/main/kotlin/io/homeassistant/companion/android/nfc/views/TagReaderView.kt

@@ -2,9 +2,12 @@ package io.homeassistant.companion.android.nfc.views
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -21,6 +24,7 @@ fun TagReaderView() {
     Column(
         modifier = Modifier
             .fillMaxSize()
+            .windowInsetsPadding(WindowInsets.safeDrawing)
             .padding(all = 16.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center,

app/src/main/kotlin/io/homeassistant/companion/android/onboarding/OnboardingViews.kt

@@ -5,12 +5,15 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -36,6 +39,7 @@ fun OnboardingScreen(modifier: Modifier = Modifier, content: @Composable ColumnS
         val screenWidth = screenWidth()
         Column(
             modifier = modifier
+                .windowInsetsPadding(WindowInsets.safeDrawing)
                 .padding(all = 16.dp)
                 .width(min(screenWidth.value, STEP_SCREEN_MAX_WIDTH_DP).dp)
                 .align(Alignment.Center),

app/src/main/kotlin/io/homeassistant/companion/android/settings/SettingsActivity.kt

@@ -6,7 +6,6 @@ import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import androidx.activity.enableEdgeToEdge
 import androidx.biometric.BiometricManager
 import androidx.fragment.app.commit
 import dagger.hilt.EntryPoint
@@ -51,7 +50,6 @@ class SettingsActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         val entryPoint = EntryPointAccessors.fromActivity(this, SettingsFragmentFactoryEntryPoint::class.java)
         supportFragmentManager.fragmentFactory = entryPoint.getSettingsFragmentFactory()
-        enableEdgeToEdge()
 
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)

app/src/main/kotlin/io/homeassistant/companion/android/webview/WebViewActivity.kt

@@ -43,7 +43,6 @@ import android.widget.FrameLayout
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.IntentSenderRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.OptIn
@@ -252,7 +251,6 @@ class WebViewActivity :
         }
 
         super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
 
         if (intent.extras?.containsKey(EXTRA_SERVER) == true) {
             intent.extras?.getInt(EXTRA_SERVER)?.let {

app/src/main/kotlin/io/homeassistant/companion/android/widgets/BaseWidgetConfigureActivity.kt

@@ -1,14 +1,12 @@
 package io.homeassistant.companion.android.widgets
 
 import android.appwidget.AppWidgetManager
-import android.os.Bundle
 import android.view.View
 import android.widget.AdapterView
 import android.widget.AdapterView.OnItemSelectedListener
 import android.widget.ArrayAdapter
 import android.widget.Spinner
 import android.widget.Toast
-import androidx.activity.enableEdgeToEdge
 import io.homeassistant.companion.android.BaseActivity
 import io.homeassistant.companion.android.common.R
 import io.homeassistant.companion.android.common.data.servers.ServerManager
@@ -29,11 +27,6 @@ abstract class BaseWidgetConfigureActivity : BaseActivity() {
 
     var selectedServerId: Int? = null
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        enableEdgeToEdge()
-        super.onCreate(savedInstanceState)
-    }
-
     protected fun setupServerSelect(widgetServerId: Int?) {
         val servers = serverManager.defaultServers
         val activeServerId = serverManager.getServer()?.id

app/src/main/kotlin/io/homeassistant/companion/android/widgets/assist/AssistShortcutView.kt

@@ -32,6 +32,8 @@ import io.homeassistant.companion.android.common.data.websocket.impl.entities.As
 import io.homeassistant.companion.android.database.server.Server
 import io.homeassistant.companion.android.util.compose.ExposedDropdownMenu
 import io.homeassistant.companion.android.util.compose.ServerExposedDropdownMenu
+import io.homeassistant.companion.android.util.safeBottomPaddingValues
+import io.homeassistant.companion.android.util.safeTopWindowInsets
 
 @Composable
 fun AssistShortcutView(
@@ -48,10 +50,16 @@ fun AssistShortcutView(
                 title = { Text(stringResource(commonR.string.assist_shortcut)) },
                 backgroundColor = colorResource(commonR.color.colorBackground),
                 contentColor = colorResource(commonR.color.colorOnBackground),
+                windowInsets = safeTopWindowInsets(),
             )
         },
     ) { padding ->
-        Box(modifier = Modifier.padding(padding).verticalScroll(rememberScrollState())) {
+        Box(
+            modifier = Modifier
+                .verticalScroll(rememberScrollState())
+                .padding(safeBottomPaddingValues())
+                .padding(padding),
+        ) {
             Column(modifier = Modifier.padding(all = 16.dp)) {
                 val assist = stringResource(commonR.string.assist)
                 var name by rememberSaveable { mutableStateOf(assist) }