From a922c0a2453fd0c21eda12b5bcc5b1889e6137d7 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Fri, 22 Nov 2024 13:11:27 -0500 Subject: [PATCH 1/3] Updated to latest Zendesk --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 049e547969d7..bf7bf631115c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -105,7 +105,7 @@ wordpress-persistent-edittext = '1.0.2' wordpress-rs = 'trunk-50f703a7f677084157d02f05d4d477d7eaf960b1' wordpress-utils = '3.14.0' automattic-ucrop = '2.2.10' -zendesk = '5.1.2' +zendesk = '5.3.1' [libraries] airbnb-lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref = "airbnb-lottie" } From 08b9a1f45a928ab53a5005bdf5d067843b198ef3 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Fri, 22 Nov 2024 14:29:33 -0500 Subject: [PATCH 2/3] Use setAlgorithmicDarkeningAllowed --- .../org/wordpress/android/support/SupportWebViewActivity.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/WordPress/src/main/java/org/wordpress/android/support/SupportWebViewActivity.kt b/WordPress/src/main/java/org/wordpress/android/support/SupportWebViewActivity.kt index a9ce5141c07c..54775236ae88 100644 --- a/WordPress/src/main/java/org/wordpress/android/support/SupportWebViewActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/support/SupportWebViewActivity.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.Intent import android.content.pm.ApplicationInfo import android.net.Uri +import android.os.Build import android.os.Bundle import android.util.Log import android.view.Menu @@ -145,6 +146,11 @@ class SupportWebViewActivity : WPWebViewActivity(), SupportWebViewClient.Support .addPathHandler("/assets/", AssetsPathHandler(this)) .addPathHandler("/res/", ResourcesPathHandler(this)) .build() + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + mWebView.settings.setAlgorithmicDarkeningAllowed(true) + } + mWebView.webViewClient = SupportWebViewClient(this, assetLoader) // Setup debugging; See https://developers.google.com/web/tools/chrome-devtools/remote-debugging/webviews From 6b7ea67885fcf2ebcba0fcd5b295af69bc18f1ae Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Fri, 22 Nov 2024 16:22:56 -0500 Subject: [PATCH 3/3] Reverted Zendesk library update --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bf7bf631115c..049e547969d7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -105,7 +105,7 @@ wordpress-persistent-edittext = '1.0.2' wordpress-rs = 'trunk-50f703a7f677084157d02f05d4d477d7eaf960b1' wordpress-utils = '3.14.0' automattic-ucrop = '2.2.10' -zendesk = '5.3.1' +zendesk = '5.1.2' [libraries] airbnb-lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref = "airbnb-lottie" }