Add notification permission bottom sheet

app/src/debug/kotlin/io/homeassistant/companion/android/developer/catalog/HATextAndBannersScreen.kt

@@ -44,6 +44,11 @@ private fun LazyListScope.textStyles() {
                 style = HATextStyle.Headline,
                 modifier = Modifier.fillMaxWidth(),
             )
+            Text(
+                text = "HeadlineMedium",
+                style = HATextStyle.HeadlineMedium,
+                modifier = Modifier.fillMaxWidth(),
+            )
             Text(
                 text = "Body",
                 style = HATextStyle.Body,

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

@@ -185,7 +185,7 @@ private fun OneServerFound(
             ) {
                 Text(
                     text = serverDiscovered.name,
-                    style = HATextStyle.Headline,
+                    style = HATextStyle.HeadlineMedium,
                 )
                 Icon(
                     imageVector = Icons.Default.Storage,

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

@@ -54,6 +54,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.DpSize
@@ -259,6 +260,13 @@ class WebViewActivity :
     private var playerLeft = mutableStateOf(0.dp)
     private var statusBarColor = mutableStateOf<Color?>(null)
     private var backgroundColor = mutableStateOf<Color?>(null)
+
+    /**
+     * Flag to know when the webview has been fully initialized (loadUrl called).
+     * It is important to know to avoid opening a full screen dialog that
+     * could prevent the loading of the webview.
+     */
+    private var webViewInitialized = mutableStateOf(false)
     private var failedConnection = "external"
     private var clearHistory = false
     private var moreInfoEntity = ""
@@ -309,6 +317,7 @@ class WebViewActivity :
         }
 
         setContent {
+            val coroutineScope = rememberCoroutineScope()
             val player by remember { exoPlayer }
             val playerSize by remember { playerSize }
             val playerTop by remember { playerTop }
@@ -319,9 +328,12 @@ class WebViewActivity :
             val backgroundColor by remember { backgroundColor }
             var nightModeTheme by remember { mutableStateOf<NightModeTheme?>(null) }
             val snackbarHostState = remember { snackbarHostState }
+            var webViewInitialized by remember { webViewInitialized }
+            var shouldAskNotificationPermission by remember { mutableStateOf(false) }
 
             LaunchedEffect(Unit) {
                 nightModeTheme = nightModeManager.getCurrentNightMode()
+                shouldAskNotificationPermission = presenter.shouldAskNotificationPermission()
             }
 
             WebViewContentScreen(
@@ -333,13 +345,22 @@ class WebViewActivity :
                 playerLeft = playerLeft,
                 currentAppLocked,
                 customViewFromWebView,
+                shouldAskNotificationPermission = shouldAskNotificationPermission,
+                webViewInitialized = webViewInitialized,
                 nightModeTheme = nightModeTheme,
                 statusBarColor = statusBarColor,
                 backgroundColor = backgroundColor,
-            ) { isFullScreen ->
-                isExoFullScreen = isFullScreen
-                if (isFullScreen) hideSystemUI() else showSystemUI()
-            }
+                onFullscreenClicked = { isFullScreen ->
+                    isExoFullScreen = isFullScreen
+                    if (isFullScreen) hideSystemUI() else showSystemUI()
+                },
+                onNotificationPermissionResult = { granted ->
+                    coroutineScope.launch {
+                        presenter.onNotificationPermissionResult(granted)
+                        shouldAskNotificationPermission = false
+                    }
+                },
+            )
         }
 
         authenticator = Authenticator(this, this, ::authenticationResult)
@@ -401,6 +422,7 @@ class WebViewActivity :
                 }
 
                 override fun onPageFinished(view: WebView?, url: String?) {
+                    webViewInitialized.value = true
                     if (clearHistory) {
                         webView.clearHistory()
                         clearHistory = false

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

@@ -1,9 +1,13 @@
 package io.homeassistant.companion.android.webview
 
+import android.Manifest
 import android.annotation.SuppressLint
+import android.os.Build
 import android.view.View
 import android.webkit.WebView
+import androidx.annotation.RequiresApi
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -22,29 +26,48 @@ 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.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberStandardBottomSheetState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.media3.common.Player
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.PermissionStatus
+import com.google.accompanist.permissions.rememberPermissionState
 import dev.chrisbanes.haze.hazeEffect
 import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi
 import dev.chrisbanes.haze.materials.HazeMaterials
 import io.homeassistant.companion.android.common.R as commonR
+import io.homeassistant.companion.android.common.compose.composable.HAAccentButton
+import io.homeassistant.companion.android.common.compose.composable.HAModalBottomSheet
+import io.homeassistant.companion.android.common.compose.composable.HAPlainButton
+import io.homeassistant.companion.android.common.compose.theme.HADimens
+import io.homeassistant.companion.android.common.compose.theme.HATextStyle
+import io.homeassistant.companion.android.common.compose.theme.HATheme
 import io.homeassistant.companion.android.common.data.prefs.NightModeTheme
-import io.homeassistant.companion.android.util.compose.HomeAssistantAppTheme
 import io.homeassistant.companion.android.util.compose.media.player.HAMediaPlayer
 import io.homeassistant.companion.android.util.compose.webview.HAWebView
+import kotlinx.coroutines.launch
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @OptIn(ExperimentalHazeMaterialsApi::class)
@@ -58,18 +81,21 @@ internal fun WebViewContentScreen(
     playerLeft: Dp,
     currentAppLocked: Boolean,
     customViewFromWebView: View?,
+    shouldAskNotificationPermission: Boolean,
+    webViewInitialized: Boolean,
+    onFullscreenClicked: (isFullscreen: Boolean) -> Unit,
+    onNotificationPermissionResult: (Boolean) -> Unit,
     nightModeTheme: NightModeTheme? = null,
     statusBarColor: Color? = null,
     backgroundColor: Color? = null,
-    onFullscreenClicked: (isFullscreen: Boolean) -> Unit,
+    supportsNotificationPermission: Boolean = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU,
 ) {
-    HomeAssistantAppTheme {
+    HATheme {
         Scaffold(
             snackbarHost = {
                 SnackbarHost(
                     snackbarHostState,
-                    modifier =
-                    Modifier.windowInsetsPadding(WindowInsets.safeDrawing),
+                    modifier = Modifier.windowInsetsPadding(WindowInsets.safeDrawing),
                 )
             },
             // Delegate the insets handling to the webview
@@ -107,6 +133,10 @@ internal fun WebViewContentScreen(
                 }
             }
         }
+        if (webViewInitialized && shouldAskNotificationPermission && supportsNotificationPermission) {
+            @SuppressLint("InlinedApi")
+            NotificationPermission(onNotificationPermissionResult)
+        }
     }
 }
 
@@ -165,8 +195,91 @@ private fun SafeHAWebView(
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalPermissionsApi::class)
 @Composable
-private fun Color.Overlay(modifier: Modifier) {
+@RequiresApi(Build.VERSION_CODES.TIRAMISU)
+private fun NotificationPermission(onPermissionResult: (Boolean) -> Unit) {
+    val bottomSheetState = rememberStandardBottomSheetState(skipHiddenState = false)
+    val coroutineScope = rememberCoroutineScope()
+
+    // Track whether the bottom sheet has been dismissed to completely remove it from composition.
+    // This is necessary because Material 3's ModalBottomSheet creates a Dialog window that,
+    // even when hidden, can block touch events to underlying views like the WebView.
+    // By removing the composable entirely when dismissed (checking !isClosed), we ensure
+    // the Dialog window is destroyed and the WebView remains fully interactive.
+    var isClosed by remember { mutableStateOf(false) }
+
+    fun closeSheet() {
+        coroutineScope.launch {
+            bottomSheetState.hide()
+            isClosed = true
+        }
+    }
+
+    // By default on lower API the bottom sheet won't be displayed
+    val notificationPermission = rememberPermissionState(
+        permission = Manifest.permission.POST_NOTIFICATIONS,
+        previewPermissionStatus = PermissionStatus.Denied(true),
+        onPermissionResult = {
+            onPermissionResult(it)
+            closeSheet()
+        },
+    )
+
+    if (notificationPermission.status is PermissionStatus.Denied && !isClosed) {
+        HAModalBottomSheet(
+            bottomSheetState = bottomSheetState,
+            onDismissRequest = {
+                closeSheet()
+            },
+        ) {
+            Column(
+                modifier = Modifier
+                    .padding(horizontal = HADimens.SPACE6)
+                    .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom))
+                    .fillMaxWidth(),
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.spacedBy(HADimens.SPACE6),
+            ) {
+                Text(
+                    text = stringResource(commonR.string.notification_permission_dialog_title),
+                    style = HATextStyle.HeadlineMedium,
+                )
+                Text(
+                    text = stringResource(commonR.string.notification_permission_dialog_content),
+                    style = HATextStyle.Body,
+                )
+                Column(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.spacedBy(HADimens.SPACE4),
+                ) {
+                    HAAccentButton(
+                        text = stringResource(commonR.string.notification_permission_dialog_allow),
+                        onClick = {
+                            notificationPermission.launchPermissionRequest()
+                        },
+                        modifier = Modifier.fillMaxWidth(),
+                    )
+
+                    HAPlainButton(
+                        text = stringResource(commonR.string.notification_permission_dialog_deny),
+                        onClick = {
+                            onPermissionResult(false)
+                            closeSheet()
+                        },
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(bottom = HADimens.SPACE6),
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun Color.Overlay(modifier: Modifier = Modifier) {
     Spacer(
         modifier = modifier
             .background(this),
@@ -184,6 +297,10 @@ private fun WebViewContentScreenPreview() {
         playerTop = 0.dp,
         playerLeft = 0.dp,
         currentAppLocked = false,
+        shouldAskNotificationPermission = false,
+        webViewInitialized = true,
         customViewFromWebView = null,
-    ) { }
+        onFullscreenClicked = {},
+        onDiscardNotificationPermission = {},
+    )
 }

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

@@ -80,4 +80,7 @@ interface WebViewPresenter {
     /** @return `true` if the app tried starting scanning or `false` if it was missing permissions */
     fun startScanningForImprov(): Boolean
     fun stopScanningForImprov(force: Boolean)
+
+    suspend fun onNotificationPermissionResult(granted: Boolean)
+    suspend fun shouldAskNotificationPermission(): Boolean
 }

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

@@ -11,6 +11,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.toColorInt
 import androidx.core.net.toUri
 import dagger.hilt.android.qualifiers.ActivityContext
+import io.homeassistant.companion.android.BuildConfig
 import io.homeassistant.companion.android.common.R as commonR
 import io.homeassistant.companion.android.common.data.authentication.SessionState
 import io.homeassistant.companion.android.common.data.prefs.PrefsRepository
@@ -19,6 +20,10 @@ import io.homeassistant.companion.android.common.util.DisabledLocationHandler
 import io.homeassistant.companion.android.common.util.GestureAction
 import io.homeassistant.companion.android.common.util.GestureDirection
 import io.homeassistant.companion.android.common.util.HAGesture
+import io.homeassistant.companion.android.database.settings.SensorUpdateFrequencySetting
+import io.homeassistant.companion.android.database.settings.Setting
+import io.homeassistant.companion.android.database.settings.SettingsDao
+import io.homeassistant.companion.android.database.settings.WebsocketSetting
 import io.homeassistant.companion.android.improv.ImprovRepository
 import io.homeassistant.companion.android.matter.MatterManager
 import io.homeassistant.companion.android.thread.ThreadManager
@@ -54,6 +59,7 @@ class WebViewPresenterImpl @Inject constructor(
     private val prefsRepository: PrefsRepository,
     private val matterUseCase: MatterManager,
     private val threadUseCase: ThreadManager,
+    private val settingsDao: SettingsDao,
 ) : WebViewPresenter {
 
     private val view = context as WebView
@@ -581,4 +587,21 @@ class WebViewPresenterImpl @Inject constructor(
             improvJob?.cancel()
         }
     }
+
+    override suspend fun onNotificationPermissionResult(granted: Boolean) {
+        if (granted && BuildConfig.FLAVOR != "full") {
+            settingsDao.insert(
+                Setting(
+                    serverId,
+                    WebsocketSetting.ALWAYS,
+                    SensorUpdateFrequencySetting.NORMAL,
+                ),
+            )
+        }
+        prefsRepository.setAskNotificationPermission(false)
+    }
+
+    override suspend fun shouldAskNotificationPermission(): Boolean {
+        return prefsRepository.shouldAskNotificationPermission()
+    }
 }