diff --git a/src/android/app/src/main/assets/ui.css b/src/android/app/src/main/assets/ui.css index 565b374f..69a5c41d 100644 --- a/src/android/app/src/main/assets/ui.css +++ b/src/android/app/src/main/assets/ui.css @@ -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; diff --git a/src/android/app/src/main/java/org/nxemu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/nxemu/ui/main/MainActivity.kt index 3b2c6cec..3e00cdbd 100644 --- a/src/android/app/src/main/java/org/nxemu/ui/main/MainActivity.kt +++ b/src/android/app/src/main/java/org/nxemu/ui/main/MainActivity.kt @@ -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()}]")