Add support for background customization in HTML New Tab Page

DuckDuckGo/Assets.xcassets/Images/HomePage/Gradients/HomePageBackgroundGradient02+01.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "GradientTone02+01.jpg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Freemium/DBP/Extensions/PromotionView+FreemiumDBP.swift

@@ -19,7 +19,7 @@
 import Foundation
 
 extension PromotionViewModel {
-    static func freemiumDBPPromotion(proceedAction: @escaping () -> Void,
+    static func freemiumDBPPromotion(proceedAction: @escaping () async -> Void,
                                      closeAction: @escaping () -> Void) -> PromotionViewModel {
 
         let title = UserText.homePagePromotionFreemiumDBPTitle
@@ -41,7 +41,7 @@ extension PromotionViewModel {
 
     static func freemiumDBPPromotionScanEngagementResults(resultCount: Int,
                                                           brokerCount: Int,
-                                                          proceedAction: @escaping () -> Void,
+                                                          proceedAction: @escaping () async -> Void,
                                                           closeAction: @escaping () -> Void) -> PromotionViewModel {
 
         var description = ""
@@ -65,7 +65,7 @@ extension PromotionViewModel {
                                   closeAction: closeAction)
     }
 
-    static func freemiumDBPPromotionScanEngagementNoResults(proceedAction: @escaping () -> Void,
+    static func freemiumDBPPromotionScanEngagementNoResults(proceedAction: @escaping () async -> Void,
                                                             closeAction: @escaping () -> Void) -> PromotionViewModel {
 
         let description = UserText.homePagePromotionFreemiumDBPPostScanEngagementNoResultsDescription

DuckDuckGo/Freemium/DBP/FreemiumDBPPromotionViewCoordinator.swift

@@ -25,17 +25,14 @@ import Common
 
 /// Default implementation of `FreemiumDBPPromotionViewCoordinating`, responsible for managing
 /// the visibility of the promotion and responding to user interactions with the promotion view.
-@MainActor
 final class FreemiumDBPPromotionViewCoordinator: ObservableObject {
 
     /// Published property that determines whether the promotion is visible on the home page.
     @Published var isHomePagePromotionVisible: Bool = false
 
     /// The view model representing the promotion, which updates based on the user's state. Returns `nil` if the feature is not enabled
-    var viewModel: PromotionViewModel? {
-        guard freemiumDBPFeature.isAvailable else { return nil }
-        return createViewModel()
-    }
+    @Published
+    private(set) var viewModel: PromotionViewModel?
 
     /// Stores whether the user has dismissed the home page promotion.
     private var didDismissHomePagePromotion: Bool {
@@ -89,13 +86,14 @@ final class FreemiumDBPPromotionViewCoordinator: ObservableObject {
         setInitialPromotionVisibilityState()
         subscribeToFeatureAvailabilityUpdates()
         observeFreemiumDBPNotifications()
+        setUpViewModelRefreshing()
     }
 }
 
 private extension FreemiumDBPPromotionViewCoordinator {
 
     /// Action to be executed when the user proceeds with the promotion (e.g opens DBP)
-    var proceedAction: () -> Void {
+    var proceedAction: () async -> Void {
         { [weak self] in
             guard let self else { return }
 
@@ -107,7 +105,7 @@ private extension FreemiumDBPPromotionViewCoordinator {
                 self.freemiumDBPExperimentPixelHandler.fire(FreemiumDBPExperimentPixel.newTabScanClick)
             })
 
-            showFreemiumDBP()
+            await showFreemiumDBP()
             dismissHomePagePromotion()
         }
     }
@@ -130,6 +128,7 @@ private extension FreemiumDBPPromotionViewCoordinator {
     }
 
     /// Shows the Freemium DBP user interface via the presenter.
+    @MainActor
     func showFreemiumDBP() {
         freemiumDBPPresenter.showFreemiumDBPAndSetActivated(windowControllerManager: WindowControllersManager.shared)
     }
@@ -148,7 +147,10 @@ private extension FreemiumDBPPromotionViewCoordinator {
     /// Creates the view model for the promotion, updating based on the user's scan results.
     ///
     /// - Returns: The `PromotionViewModel` that represents the current state of the promotion.
-    func createViewModel() -> PromotionViewModel {
+    func createViewModel() -> PromotionViewModel? {
+        guard freemiumDBPFeature.isAvailable, isHomePagePromotionVisible else {
+            return nil
+        }
 
         if let results = freemiumDBPUserStateManager.firstScanResults {
             if results.matchesCount > 0 {
@@ -172,12 +174,24 @@ private extension FreemiumDBPPromotionViewCoordinator {
         }
     }
 
+    /// This method defines the entry point to updating `viewModel` which is every change to `isHomePagePromotionVisible`.
+    func setUpViewModelRefreshing() {
+        $isHomePagePromotionVisible.dropFirst().asVoid()
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] in
+                self?.viewModel = self?.createViewModel()
+            }
+            .store(in: &cancellables)
+    }
+
     /// Subscribes to feature availability updates from the `freemiumDBPFeature`'s availability publisher.
     ///
     /// This method listens to the `isAvailablePublisher` of the `freemiumDBPFeature`, which publishes
     /// changes to the feature's availability. It performs the following actions when an update is received:
     func subscribeToFeatureAvailabilityUpdates() {
         freemiumDBPFeature.isAvailablePublisher
+            .prepend(freemiumDBPFeature.isAvailable)
+            .removeDuplicates()
             .receive(on: DispatchQueue.main)
             .sink { [weak self] isAvailable in
                 guard let self else { return }

DuckDuckGo/HomePage/Model/HomePageSettings/CustomBackgrounds/GradientBackground.swift

@@ -26,6 +26,7 @@ enum GradientBackground: String, Equatable, Identifiable, CaseIterable, ColorSch
 
     case gradient01
     case gradient02
+    case gradient0201 = "gradient02.01"
     case gradient03
     case gradient04
     case gradient05
@@ -46,6 +47,8 @@ enum GradientBackground: String, Equatable, Identifiable, CaseIterable, ColorSch
                 Gradient01()
             case .gradient02:
                 Gradient02()
+            case .gradient0201:
+                Gradient0201()
             case .gradient03:
                 Gradient03()
             case .gradient04:
@@ -68,6 +71,8 @@ enum GradientBackground: String, Equatable, Identifiable, CaseIterable, ColorSch
             Image(nsImage: .homePageBackgroundGradient01)
         case .gradient02:
             Image(nsImage: .homePageBackgroundGradient02)
+        case .gradient0201:
+            Image(nsImage: .homePageBackgroundGradient0201)
         case .gradient03:
             Image(nsImage: .homePageBackgroundGradient03)
         case .gradient04:
@@ -83,7 +88,7 @@ enum GradientBackground: String, Equatable, Identifiable, CaseIterable, ColorSch
 
     var colorScheme: ColorScheme {
         switch self {
-        case .gradient01, .gradient02, .gradient03:
+        case .gradient01, .gradient02, .gradient0201, .gradient03:
                 .light
         case .gradient04, .gradient05, .gradient06, .gradient07:
                 .dark
@@ -191,6 +196,35 @@ private struct Gradient02: View {
     }
 }
 
+@available(macOS 12.0, *)
+private struct Gradient0201: View {
+    var body: some View {
+        ZStack {
+            EllipticalGradient(
+                colors: [Color(red: 1, green: 0.8, blue: 0.2).opacity(0.8), .clear],
+                center: UnitPoint(x: 1.04, y: 1.08),
+                endRadiusFraction: 1
+            )
+
+            EllipticalGradient(
+                colors: [
+                    Color(red: 1, green: 0.84, blue: 0.36).opacity(0.7),
+                    Color(red: 1, green: 0.84, blue: 0.8).opacity(0.2)
+                ],
+                center: UnitPoint(x: 0.56, y: 0.5),
+                endRadiusFraction: 1
+            )
+
+            EllipticalGradient(
+                colors: [Color(red: 0.95, green: 0.63, blue: 0.54).opacity(0.6), .clear],
+                center: UnitPoint(x: -0.26, y: 0.5),
+                endRadiusFraction: 1
+            )
+        }
+        .background(Color(red: 1, green: 0.87, blue: 0.48))
+    }
+}
+
 @available(macOS 12.0, *)
 private struct Gradient03: View {
     var body: some View {
@@ -320,6 +354,7 @@ private struct Gradient06: View {
         .background(Color(red: 0.07, green: 0.01, blue: 0.21))
     }
 }
+
 @available(macOS 12.0, *)
 private struct Gradient07: View {
     var body: some View {
@@ -358,6 +393,8 @@ private struct Gradient07: View {
             .frame(width: 640, height: 400)
         GradientBackground.gradient02.view
             .frame(width: 640, height: 400)
+        GradientBackground.gradient0201.view
+            .frame(width: 640, height: 400)
         GradientBackground.gradient03.view
             .frame(width: 640, height: 400)
         GradientBackground.gradient04.view

DuckDuckGo/HomePage/Model/HomePageSettings/HomePageSettingsModel.swift

@@ -18,6 +18,7 @@
 
 import Combine
 import Foundation
+import NewTabPage
 import os.log
 import PixelKit
 import SwiftUI
@@ -59,7 +60,7 @@ extension HomePage.Models {
     final class SettingsModel: ObservableObject {
 
         enum Const {
-            static let maximumNumberOfUserImages = 4
+            static let maximumNumberOfUserImages = 8
             static let defaultColorPickerColor = NSColor.white
         }
 
@@ -88,6 +89,7 @@ extension HomePage.Models {
         let userColorProvider: () -> UserColorProviding
         let showAddImageFailedAlert: () -> Void
         let navigator: HomePageSettingsModelNavigator
+        let customizerOpener = NewTabPageCustomizerOpener()
 
         @Published var settingsButtonWidth: CGFloat = .infinity
         @Published private(set) var availableUserBackgroundImages: [UserBackgroundImage] = []
@@ -244,8 +246,13 @@ extension HomePage.Models {
         @Published var customBackground: CustomBackground? {
             didSet {
                 appearancePreferences.homePageCustomBackground = customBackground
-                if case .userImage(let userBackgroundImage) = customBackground {
+                switch customBackground {
+                case .solidColor(let solidColorBackground) where solidColorBackground.predefinedColorName == nil:
+                    lastPickedCustomColor = solidColorBackground.color
+                case .userImage(let userBackgroundImage):
                     customImagesManager?.updateSelectedTimestamp(for: userBackgroundImage)
+                default:
+                    break
                 }
                 if let customBackground {
                     Logger.homePageSettings.debug("Home page background updated: \(customBackground), color scheme: \(customBackground.colorScheme)")
@@ -298,9 +305,6 @@ extension HomePage.Models {
             provider.showColorPanel(with: lastPickedCustomColorHexValue.flatMap(NSColor.init(hex:)) ?? Const.defaultColorPickerColor)
 
             userColorCancellable = provider.colorPublisher
-                .handleEvents(receiveOutput: { [weak self] color in
-                    self?.lastPickedCustomColor = color
-                })
                 .map { CustomBackground.solidColor(.init(color: $0)) }
                 .assign(to: \.customBackground, onWeaklyHeld: self)
         }

DuckDuckGo/HomePage/Model/PromotionViewModel.swift

@@ -27,10 +27,10 @@ extension HomePage.Models {
         let title: String?
         let description: String
         let proceedButtonText: String
-        let proceedAction: () -> Void
+        let proceedAction: () async -> Void
         let closeAction: () -> Void
 
-        init(image: ImageResource, title: String? = nil, description: String, proceedButtonText: String, proceedAction: @escaping () -> Void, closeAction: @escaping () -> Void) {
+        init(image: ImageResource, title: String? = nil, description: String, proceedButtonText: String, proceedAction: @escaping () async -> Void, closeAction: @escaping () -> Void) {
             self.image = image
             self.title = title
             self.description = description

DuckDuckGo/HomePage/View/PromotionView.swift

@@ -108,7 +108,11 @@ extension HomePage.Views {
 
         private var button: some View {
             Group {
-                Button(action: viewModel.proceedAction) {
+                Button {
+                    Task { @MainActor in
+                        await viewModel.proceedAction()
+                    }
+                } label: {
                     Text(verbatim: viewModel.proceedButtonText)
                 }
                 .controlSize(.large)

DuckDuckGo/NewTabPage/DefaultHomePageSettingsModelNavigator+NewTabPageLinkOpening.swift

@@ -0,0 +1,29 @@
+//
+//  DefaultHomePageSettingsModelNavigator+NewTabPageLinkOpening.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  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.
+//
+
+import NewTabPage
+
+extension DefaultHomePageSettingsModelNavigator: NewTabPageLinkOpening {
+
+    func openLink(_ target: NewTabPageDataModel.OpenAction.Target) async {
+        switch target {
+        case .settings:
+            openAppearanceSettings()
+        }
+    }
+}

DuckDuckGo/NewTabPage/NewTabPageActionsManagerExtension.swift

@@ -41,9 +41,18 @@ extension NewTabPageActionsManager {
             getLegacyIsViewExpandedSetting: UserDefaultsWrapper<Bool>(key: .homePageShowAllFavorites, defaultValue: false).wrappedValue
         )
 
+        let customizationProvider = NewTabPageCustomizationProvider(homePageSettingsModel: NSApp.delegateTyped.homePageSettingsModel)
+        let freemiumDBPBannerProvider = NewTabPageFreemiumDBPBannerProvider(model: NSApp.delegateTyped.freemiumDBPPromotionViewCoordinator)
+
         self.init(scriptClients: [
-            NewTabPageConfigurationClient(sectionsVisibilityProvider: appearancePreferences),
+            NewTabPageConfigurationClient(
+                sectionsVisibilityProvider: appearancePreferences,
+                customBackgroundProvider: customizationProvider,
+                linkOpener: DefaultHomePageSettingsModelNavigator()
+            ),
+            NewTabPageCustomBackgroundClient(model: customizationProvider),
             NewTabPageRMFClient(remoteMessageProvider: activeRemoteMessageModel),
+            NewTabPageFreemiumDBPClient(provider: freemiumDBPBannerProvider),
             NewTabPageNextStepsCardsClient(model: NewTabPageNextStepsCardsProvider(continueSetUpModel: HomePage.Models.ContinueSetUpModel(tabOpener: NewTabPageTabOpener()))),
             NewTabPageFavoritesClient(favoritesModel: favoritesModel, preferredFaviconSize: Int(Favicon.SizeCategory.medium.rawValue)),
             NewTabPagePrivacyStatsClient(model: privacyStatsModel)