home-assistant · TimoPtr · Jun 24, 2025 · Jun 17, 2025 · Jun 17, 2025 · Jun 17, 2025
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -26,6 +26,11 @@ android {
         }
     }
 
+    lint {
+        // Until we fully migrate to Material3 this lint issue is too verbose https://github.com/home-assistant/android/issues/5420
+        disable += listOf("UsingMaterialAndMaterial3Libraries")
+    }
+
     experimentalProperties["android.experimental.enableScreenshotTest"] = true
 
     screenshotTests {

diff --git a/app/gradle.lockfile b/app/gradle.lockfile
diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
diff --git a/app/src/debug/res/layout/activity_demo_exo_player.xml b/app/src/debug/res/layout/activity_demo_exo_player.xml
diff --git a/...ndroid/webview/WebViewContentScreenScreenshotTest/WebView with app locked_0.png b/...ndroid/webview/WebViewContentScreenScreenshotTest/WebView with app locked_0.png
diff --git a/...roid/webview/WebViewContentScreenScreenshotTest/WebView with app unlocked_0.png b/...roid/webview/WebViewContentScreenScreenshotTest/WebView with app unlocked_0.png
diff --git a/...on/android/webview/WebViewContentScreenScreenshotTest/WebView with player_0.png b/...on/android/webview/WebViewContentScreenScreenshotTest/WebView with player_0.png
diff --git a/...in/io/homeassistant/companion/android/onboarding/authentication/AuthenticationFragment.kt b/...in/io/homeassistant/companion/android/onboarding/authentication/AuthenticationFragment.kt
@@ -1,7 +1,6 @@
 package io.homeassistant.companion.android.onboarding.authentication
 
 import android.annotation.SuppressLint
-import android.net.Uri
 import android.net.http.SslError
 import android.os.Build
 import android.os.Bundle
@@ -18,7 +17,7 @@ import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AlertDialog
 import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.viewinterop.AndroidView
+import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import dagger.hilt.android.AndroidEntryPoint
@@ -32,6 +31,7 @@ import io.homeassistant.companion.android.onboarding.integration.MobileAppIntegr
 import io.homeassistant.companion.android.themes.ThemesManager
 import io.homeassistant.companion.android.util.TLSWebViewClient
 import io.homeassistant.companion.android.util.compose.HomeAssistantAppTheme
+import io.homeassistant.companion.android.util.compose.webview.HAWebView
 import io.homeassistant.companion.android.util.isStarted
 import javax.inject.Inject
 import javax.inject.Named
@@ -66,15 +66,19 @@ class AuthenticationFragment : Fragment() {
         return ComposeView(requireContext()).apply {
             setContent {
                 HomeAssistantAppTheme {
-                    AndroidView({
-                        WebView(requireContext()).apply {
+                    HAWebView(
+                        configure = {
                             themesManager.setThemeForWebView(requireContext(), settings)
                             settings.javaScriptEnabled = true
                             settings.domStorageEnabled = true
-                            settings.userAgentString = settings.userAgentString + " ${HomeAssistantApis.USER_AGENT_STRING}"
+                            settings.userAgentString =
+                                settings.userAgentString + " ${HomeAssistantApis.USER_AGENT_STRING}"
                             webViewClient = object : TLSWebViewClient(keyChainRepository) {
                                 @Deprecated("Deprecated in Java")
-                                override fun shouldOverrideUrlLoading(view: WebView?, url: String): Boolean {
+                                override fun shouldOverrideUrlLoading(
+                                    view: WebView?,
+                                    url: String
+                                ): Boolean {
                                     return onRedirect(url)
                                 }
 
@@ -96,7 +100,7 @@ class AuthenticationFragment : Fragment() {
                                                 if (error?.description.isNullOrBlank()) {
                                                     commonR.string.no_description
                                                 } else {
-                                                    error?.description
+                                                    error.description
                                                 }
                                             ),
                                             null,
@@ -135,7 +139,7 @@ class AuthenticationFragment : Fragment() {
                                                     if (errorResponse?.reasonPhrase.isNullOrBlank()) {
                                                         requireContext().getString(commonR.string.no_description)
                                                     } else {
-                                                        errorResponse?.reasonPhrase
+                                                        errorResponse.reasonPhrase
                                                     }
                                                 ),
                                                 null,
@@ -158,7 +162,7 @@ class AuthenticationFragment : Fragment() {
                             authUrl = buildAuthUrl(viewModel.manualUrl.value)
                             loadUrl(authUrl!!)
                         }
-                    })
+                    )
                 }
             }
         }
@@ -191,7 +195,7 @@ class AuthenticationFragment : Fragment() {
     }
 
     private fun onRedirect(url: String): Boolean {
-        val code = Uri.parse(url).getQueryParameter("code")
+        val code = url.toUri().getQueryParameter("code")
         return if (url.startsWith(AUTH_CALLBACK) && !code.isNullOrBlank()) {
             viewModel.registerAuthCode(code)
             parentFragmentManager

diff --git a/...main/kotlin/io/homeassistant/companion/android/util/compose/media/player/HAMediaPlayer.kt b/...main/kotlin/io/homeassistant/companion/android/util/compose/media/player/HAMediaPlayer.kt
@@ -94,6 +94,7 @@ fun HAMediaPlayer(
     contentScale: ContentScale,
     modifier: Modifier = Modifier,
     fullscreenModifier: Modifier = Modifier,
+    onFullscreenClicked: (isFullscreen: Boolean) -> Unit = {},
 ) {
     var showControls by remember { mutableStateOf(true) }
 
@@ -106,7 +107,7 @@ fun HAMediaPlayer(
 
     HAMediaPlayer(player, showControls, contentScale, modifier, fullscreenModifier, onPlayerClicked = {
         showControls = !showControls
-    })
+    }, onFullscreenClicked = onFullscreenClicked)
 }
 
 /**
@@ -122,6 +123,7 @@ fun HAMediaPlayer(
  * @param modifier The `Modifier` to be applied to the main player container.
  * @param fullscreenModifier The `Modifier` to be applied to the player container when it is in fullscreen mode.
  * @param onPlayerClicked Callback invoked when the player's surface (outside of controls) is clicked.
+ * @param onFullscreenClicked Callback invoked when the fullscreen button is clicked `isFullscreen` indicates the new state.
  */
 @Composable
 @OptIn(UnstableApi::class)
@@ -132,6 +134,7 @@ fun HAMediaPlayer(
     modifier: Modifier = Modifier,
     fullscreenModifier: Modifier = Modifier,
     onPlayerClicked: () -> Unit = {},
+    onFullscreenClicked: (isFullscreen: Boolean) -> Unit = {},
 ) {
     var isFullscreen by remember { mutableStateOf(false) }
     val presentationState = rememberPresentationState(player)
@@ -150,6 +153,7 @@ fun HAMediaPlayer(
             isFullScreen = isFullscreen,
             onClickFullscreen = {
                 isFullscreen = !isFullscreen
+                onFullscreenClicked(isFullscreen)
             },
             onPlayerClicked = onPlayerClicked,
         )

diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/util/compose/webview/HAWebView.kt b/app/src/main/kotlin/io/homeassistant/companion/android/util/compose/webview/HAWebView.kt
@@ -0,0 +1,42 @@
+package io.homeassistant.companion.android.util.compose.webview
+
+import android.webkit.WebView
+import android.widget.FrameLayout
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.viewinterop.AndroidView
+
+/**
+ * A composable that displays a WebView.
+ *
+ * This function provides a convenient way to embed a WebView in a Jetpack Compose UI.
+ * It allows for customization of the WebView through the `configure` lambda,
+ * and provides a callback for when the WebView is released via the `onRelease` lambda.
+ *
+ * @param modifier The modifier to be applied to the WebView.
+ * @param configure A lambda that allows for configuration of the WebView instance.
+ *                  This is called when the WebView is created.
+ * @param factory A lambda that creates the WebView instance. If this returns null, a new
+ *                WebView will be created with the current context.
+ */
+@Composable
+fun HAWebView(
+    modifier: Modifier = Modifier,
+    configure: WebView.() -> Unit = {},
+    factory: () -> WebView? = { null },
+) {
+    AndroidView(
+        factory = { context ->
+            (factory() ?: WebView(context)).apply {
+                // We want the modifier to determine the size so the WebView should match the parent
+                this.layoutParams = FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.MATCH_PARENT,
+                    FrameLayout.LayoutParams.MATCH_PARENT
+                )
+
+                configure(this)
+            }
+        },
+        modifier = modifier,
+    )
+}