mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-07-22 10:54:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert/set force dark again for webview (#2989)

Browse source
This commit is contained in:
Joris Pelgröm 2022-10-25 23:10:51 +02:00 committed by GitHub
parent a0c149ad55
commit a64565108b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/io/homeassistant/companion/android/onboarding/authentication/AuthenticationFragment.kt
View file

@ -66,7 +66,7 @@ class AuthenticationFragment : Fragment() {
MdcTheme {
AndroidView({
WebView(requireContext()).apply {
themesManager.setThemeForWebView()
themesManager.setThemeForWebView(requireContext(), settings)
settings.javaScriptEnabled = true
settings.domStorageEnabled = true
settings.userAgentString = settings.userAgentString + " ${HomeAssistantApis.USER_AGENT_STRING}"

38
app/src/main/java/io/homeassistant/companion/android/themes/ThemesManager.kt
View file

@ -1,7 +1,12 @@
package io.homeassistant.companion.android.themes
import android.content.Context
import android.content.res.Configuration
import android.os.Build
import android.webkit.WebSettings
import androidx.appcompat.app.AppCompatDelegate
import androidx.webkit.WebSettingsCompat
import androidx.webkit.WebViewFeature
import io.homeassistant.companion.android.common.data.prefs.PrefsRepository
import kotlinx.coroutines.runBlocking
import javax.inject.Inject
@ -35,9 +40,40 @@ class ThemesManager @Inject constructor(
}
}
fun setThemeForWebView() {
@Suppress("DEPRECATION")
fun setThemeForWebView(context: Context, webSettings: WebSettings) {
val theme = getCurrentTheme()
setNightModeBasedOnTheme(theme)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU &&
WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK) &&
WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)
) {
// While an up-to-date official WebView respects the app light/dark theme automatically,
// some users are running forks where this doesn't seem to work or are reportedly
// unable to update. These deprecated settings are set to preserve compatibility for
// those users. Issue: https://github.com/home-assistant/android/issues/2985
WebSettingsCompat.setForceDarkStrategy(
webSettings, WebSettingsCompat.DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
)
when (theme) {
"dark" -> {
WebSettingsCompat.setForceDark(webSettings, WebSettingsCompat.FORCE_DARK_ON)
}
"android", "system" -> {
val nightModeFlags =
context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
if (nightModeFlags == Configuration.UI_MODE_NIGHT_YES) {
WebSettingsCompat.setForceDark(webSettings, WebSettingsCompat.FORCE_DARK_ON)
} else {
WebSettingsCompat.setForceDark(webSettings, WebSettingsCompat.FORCE_DARK_OFF)
}
}
else -> {
WebSettingsCompat.setForceDark(webSettings, WebSettingsCompat.FORCE_DARK_OFF)
}
}
}
}
private fun setNightModeBasedOnTheme(theme: String?) {

2
app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt
View file

@ -637,7 +637,7 @@ class WebViewActivity : BaseActivity(), io.homeassistant.companion.android.webvi
// This enables the ability to have the launch screen behind the WebView until the web frontend gets rendered
binding.webview.setBackgroundColor(Color.TRANSPARENT)
themesManager.setThemeForWebView()
themesManager.setThemeForWebView(this, webView.settings)
val cookieManager = CookieManager.getInstance()
cookieManager.setAcceptCookie(true)