Android: fix up forcing dark mode (#413)

This commit is contained in:
NullVector 2026-10-11 22:14:25 +10:30 committed by GitHub
parent e169491bd6
commit c4dbf526bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 0 deletions

View File

@ -1,4 +1,5 @@
:root {
color-scheme: light;
--bg: #ffffff;
--text: #111111;
--muted: #4a555c;
@ -11,6 +12,7 @@
@media (prefers-color-scheme: dark) {
:root {
color-scheme: dark;
--bg: #121212;
--text: #e8e8e8;
--muted: #b4bcc2;
@ -20,6 +22,7 @@
}
html.dark {
color-scheme: dark;
--bg: #121212;
--text: #e8e8e8;
--muted: #b4bcc2;
@ -27,6 +30,7 @@ html.dark {
}
html.light {
color-scheme: light;
--bg: #ffffff;
--text: #111111;
--muted: #4a555c;

View File

@ -1,9 +1,11 @@
package org.nxemu.ui.main
import android.app.Activity
import android.content.Context
import android.content.Intent
import android.hardware.input.InputManager
import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.util.Log
import android.view.InputDevice
@ -12,6 +14,7 @@ import android.view.MotionEvent
import android.webkit.ConsoleMessage
import android.webkit.JsResult
import android.webkit.WebChromeClient
import android.webkit.WebSettings
import android.webkit.WebView
import androidx.activity.ComponentActivity
import androidx.activity.OnBackPressedCallback
@ -96,6 +99,13 @@ open class MainActivity : ComponentActivity() {
webView = WebView(this).apply {
setBackgroundColor(ThemeHelper.backgroundColor(this@MainActivity))
settings.javaScriptEnabled = true
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
@Suppress("DEPRECATION")
settings.forceDark = WebSettings.FORCE_DARK_OFF
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
settings.isAlgorithmicDarkeningAllowed = false
}
webChromeClient = object : WebChromeClient() {
override fun onConsoleMessage(msg: ConsoleMessage): Boolean {
Log.d("NxEmu-JS", "${msg.message()} [${msg.sourceId()}:${msg.lineNumber()}]")