Fix code formatting issues

duckduckgo · Oct 9, 2024 · cf30363 · cf30363
1 parent b6d3d56
commit cf30363
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 10 deletions.
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
@@ -3831,8 +3831,10 @@ class BrowserTabViewModel @Inject constructor(
 
     private fun getBackgroundResource(lightModeEnabled: Boolean): Int {
         return when {
-            lightModeEnabled && highlightsOnboardingExperimentManager.isHighlightsEnabled() -> R.drawable.onboarding_experiment_background_bitmap_light
-            !lightModeEnabled && highlightsOnboardingExperimentManager.isHighlightsEnabled() -> R.drawable.onboarding_experiment_background_bitmap_dark
+            lightModeEnabled && highlightsOnboardingExperimentManager.isHighlightsEnabled() ->
+                R.drawable.onboarding_experiment_background_bitmap_light
+            !lightModeEnabled && highlightsOnboardingExperimentManager.isHighlightsEnabled() ->
+                R.drawable.onboarding_experiment_background_bitmap_dark
             lightModeEnabled -> R.drawable.onboarding_background_bitmap_light
             else -> R.drawable.onboarding_background_bitmap_dark
         }

diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/WelcomePageViewModel.kt b/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/WelcomePageViewModel.kt
@@ -199,8 +199,10 @@ class WelcomePageViewModel @Inject constructor(
 
     fun setBackgroundResource(lightModeEnabled: Boolean) {
         val backgroundRes = when {
-            lightModeEnabled && highlightsOnboardingExperimentManager.isHighlightsEnabled() -> R.drawable.onboarding_experiment_background_bitmap_light
-            !lightModeEnabled && highlightsOnboardingExperimentManager.isHighlightsEnabled() -> R.drawable.onboarding_experiment_background_bitmap_dark
+            lightModeEnabled && highlightsOnboardingExperimentManager.isHighlightsEnabled() ->
+                R.drawable.onboarding_experiment_background_bitmap_light
+            !lightModeEnabled && highlightsOnboardingExperimentManager.isHighlightsEnabled() ->
+                R.drawable.onboarding_experiment_background_bitmap_dark
             lightModeEnabled -> R.drawable.onboarding_background_bitmap_light
             else -> R.drawable.onboarding_background_bitmap_dark
         }

diff --git a/...nboarding_experiment_background_light.xml → ...0dp/onboarding_background_bitmap_dark.xml b/...nboarding_experiment_background_light.xml → ...0dp/onboarding_background_bitmap_dark.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2022 DuckDuckGo
+<?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.
@@ -15,6 +14,6 @@
   ~ limitations under the License.
   -->
 
-<bitmap
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/onboarding_experiment_background_large_light"/>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/onboarding_background_large_dark"
+    android:tileMode="clamp" />
diff --git a/app/src/main/res/drawable-w600dp/onboarding_background_bitmap_light.xml b/app/src/main/res/drawable-w600dp/onboarding_background_bitmap_light.xml
@@ -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_background_large_light"
+    android:tileMode="clamp" />