diff --git a/build.gradle b/build.gradle index c2ead36c3..da4bb6202 100644 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,7 @@ repositories { } dependencies { + implementation 'androidx.webkit:webkit:1.4.0' implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'com.google.android.material:material:1.2.0' diff --git a/src/org/thoughtcrime/securesms/WebViewActivity.java b/src/org/thoughtcrime/securesms/WebViewActivity.java index 193c10d95..ebd9ddd52 100644 --- a/src/org/thoughtcrime/securesms/WebViewActivity.java +++ b/src/org/thoughtcrime/securesms/WebViewActivity.java @@ -15,6 +15,8 @@ import android.widget.ImageView; import android.widget.Toast; import androidx.appcompat.widget.SearchView; +import androidx.webkit.WebSettingsCompat; +import androidx.webkit.WebViewFeature; import org.thoughtcrime.securesms.util.DynamicLanguage; import org.thoughtcrime.securesms.util.DynamicTheme; @@ -41,6 +43,10 @@ public class WebViewActivity extends PassphraseRequiredActionBarActivity getSupportActionBar().setDisplayHomeAsUpEnabled(true); webView = findViewById(R.id.webview); + if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) { + WebSettingsCompat.setForceDark(webView.getSettings(), + DynamicTheme.isDarkTheme(this) ? WebSettingsCompat.FORCE_DARK_ON : WebSettingsCompat.FORCE_DARK_OFF); + } webView.setWebViewClient(new WebViewClient() { // `shouldOverrideUrlLoading()` is called when the user clicks a URL, // returning `true` means, the URL is passed to `loadUrl()`, `false` aborts loading.