Merge branch 'hotfix/5.203.1'

Author: nalcalag

app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt

@@ -2270,6 +2270,11 @@ class BrowserTabFragment :
     @SuppressLint("SetJavaScriptEnabled")
     private fun configureWebView() {
         binding.daxDialogOnboardingCtaContent.layoutTransition.enableTransitionType(LayoutTransition.CHANGING)
+        if (appTheme.isLightModeEnabled()) {
+            newBrowserTab.browserBackground.setBackgroundResource(R.drawable.onboarding_experiment_background_bitmap_light)
+        } else {
+            newBrowserTab.browserBackground.setBackgroundResource(R.drawable.onboarding_experiment_background_bitmap_dark)
+        }
 
         webView = layoutInflater.inflate(
             R.layout.include_duckduckgo_browser_webview,
@@ -3872,6 +3877,13 @@ class BrowserTabFragment :
                     viewModel.onUserClickCtaOkButton()
                 }
             }
+            if (appTheme.isLightModeEnabled()) {
+                binding.includeOnboardingDaxDialog.onboardingDaxDialogBackground
+                    .setBackgroundResource(R.drawable.onboarding_experiment_background_bitmap_light)
+            } else {
+                binding.includeOnboardingDaxDialog.onboardingDaxDialogBackground
+                    .setBackgroundResource(R.drawable.onboarding_experiment_background_bitmap_dark)
+            }
             binding.webViewContainer.setOnClickListener { daxDialogIntroBubbleCta.dialogTextCta.finishAnimation() }
             viewModel.onCtaShown()
         }

app/src/main/java/com/duckduckgo/app/onboarding/ui/page/WelcomePage.kt

@@ -47,6 +47,7 @@ import com.duckduckgo.app.onboarding.ui.page.WelcomePageViewModel.Command.ShowCo
 import com.duckduckgo.app.onboarding.ui.page.WelcomePageViewModel.Command.ShowDefaultBrowserDialog
 import com.duckduckgo.app.onboarding.ui.page.WelcomePageViewModel.Command.ShowSuccessDialog
 import com.duckduckgo.appbuildconfig.api.AppBuildConfig
+import com.duckduckgo.common.ui.store.AppTheme
 import com.duckduckgo.common.ui.view.gone
 import com.duckduckgo.common.ui.view.show
 import com.duckduckgo.common.ui.viewbinding.viewBinding
@@ -68,6 +69,9 @@ class WelcomePage : OnboardingPageFragment(R.layout.content_onboarding_welcome_p
     @Inject
     lateinit var appBuildConfig: AppBuildConfig
 
+    @Inject
+    lateinit var appTheme: AppTheme
+
     private val binding: ContentOnboardingWelcomePageBinding by viewBinding()
     private val viewModel by lazy {
         ViewModelProvider(this, viewModelFactory)[WelcomePageViewModel::class.java]
@@ -94,6 +98,11 @@ class WelcomePage : OnboardingPageFragment(R.layout.content_onboarding_welcome_p
         savedInstanceState: Bundle?,
     ): View {
         val binding = ContentOnboardingWelcomePageBinding.inflate(inflater, container, false)
+        if (appTheme.isLightModeEnabled()) {
+            binding.sceneBg.setBackgroundResource(R.drawable.onboarding_experiment_background_bitmap_light)
+        } else {
+            binding.sceneBg.setBackgroundResource(R.drawable.onboarding_experiment_background_bitmap_dark)
+        }
         viewModel.commands.flowWithLifecycle(lifecycle, Lifecycle.State.STARTED).onEach {
             when (it) {
                 is ShowComparisonChart -> configureDaxCta(COMPARISON_CHART)

app/src/main/res/drawable-night/onboarding_background_experiment_large.jpg

@@ -15,5 +15,5 @@
   -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/onboarding_experiment_background_large"
+    android:src="@drawable/onboarding_experiment_background_large_dark"
     android:tileMode="clamp" />

app/src/main/res/drawable-nodpi/onboarding_background_experiment_large.jpg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2024 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/onboarding_experiment_background_large_light"
+    android:tileMode="clamp" />

app/src/main/res/drawable-w600dp/onboarding_experiment_background_bitmap.xml renamed to app/src/main/res/drawable-w600dp/onboarding_experiment_background_bitmap_dark.xml

@@ -17,4 +17,4 @@
 
 <bitmap
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/onboarding_experiment_background_large"/>
+    android:src="@drawable/onboarding_experiment_background_large_light"/>

app/src/main/res/drawable-w600dp/onboarding_experiment_background_bitmap_light.xml

@@ -16,5 +16,5 @@
 
 <bitmap
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/onboarding_experiment_background_small"
+    android:src="@drawable/onboarding_experiment_background_small_dark"
     android:tileMode="clamp" />

app/src/main/res/drawable-w600dp/onboarding_experiment_background.xml renamed to app/src/main/res/drawable-w600dp/onboarding_experiment_background_light.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2024 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<bitmap
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/onboarding_experiment_background_small_light"
+    android:tileMode="clamp" />