rollback appearance preferences

duckduckgo · Nov 14, 2024 · e6cb52b · e6cb52b
1 parent 457b59d
commit e6cb52b
Show file tree

Hide file tree

Showing 10 changed files with 201 additions and 60 deletions.
diff --git a/DuckDuckGo/Assets.xcassets/Images/HomePage/RocketGrayscale.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/HomePage/RocketGrayscale.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Rocket-16.svg",
+      "idiom" : "universal",
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Images/HomePage/RocketGrayscale.imageset/Rocket-16.svg b/DuckDuckGo/Assets.xcassets/Images/HomePage/RocketGrayscale.imageset/Rocket-16.svg
diff --git a/DuckDuckGo/Common/Localizables/UserText.swift b/DuckDuckGo/Common/Localizables/UserText.swift
@@ -1145,6 +1145,7 @@ struct UserText {
     static let newTabBottomPopoverTitle = NSLocalizedString("newTab.bottom.popover.title", value: "New Tab Page", comment: "Title of the popover that appears when pressing the bottom right button")
     static let newTabMenuItemShowSearchBar = NSLocalizedString("newTab.menu.item.show.search.bar", value: "Show Search Box", comment: "Title of the menu item in the home page to show/hide search box (search field)")
     static let newTabMenuItemShowFavorite = NSLocalizedString("newTab.menu.item.show.favorite", value: "Show Favorites", comment: "Title of the menu item in the home page to show/hide favorite section")
+    static let newTabMenuItemShowContinuteSetUp = NSLocalizedString("newTab.menu.item.show.continue.setup", value: "Show Next Steps", comment: "Title of the menu item in the home page to show/hide continue setup section")
     static let newTabMenuItemShowRecentActivity = NSLocalizedString("newTab.menu.item.show.recent.activity", value: "Show Recent Activity", comment: "Title of the menu item in the home page to show/hide recent activity section")
 
     // Search Bar

diff --git a/DuckDuckGo/HomePage/View/HomePageSettings/HomeContentSectionsView.swift b/DuckDuckGo/HomePage/View/HomePageSettings/HomeContentSectionsView.swift
@@ -21,6 +21,7 @@ import SwiftUIExtensions
 extension HomePage.Views {
 
     struct HomeContentSectionsView: View {
+        let includeContinueSetUpCards: Bool
         @EnvironmentObject var model: AppearancePreferences
         @EnvironmentObject var addressBarModel: HomePage.Models.AddressBarModel
         @EnvironmentObject var continueSetUpModel: HomePage.Models.ContinueSetUpModel
@@ -41,6 +42,19 @@ extension HomePage.Views {
                     .toggleStyle(.switch)
                 }
 
+                if includeContinueSetUpCards {
+                    Toggle(isOn: $model.isContinueSetUpVisible) {
+                        HStack {
+                            Image(.rocketGrayscale)
+                                .frame(width: iconSize, height: iconSize)
+                            Text(UserText.newTabSetUpSectionTitle)
+                            Spacer()
+                        }
+                    }
+                    .toggleStyle(.switch)
+                    .visibility(continueSetUpModel.hasContent ? .visible : .gone)
+                }
+
                 Toggle(isOn: $model.isFavoriteVisible) {
                     HStack {
                         Image(.favorite)

diff --git a/DuckDuckGo/HomePage/View/HomePageSettings/HomePageSettingsView.swift b/DuckDuckGo/HomePage/View/HomePageSettings/HomePageSettingsView.swift
@@ -32,6 +32,7 @@ extension HomePage.Views {
             static let sectionSpacing = 36.0
         }
 
+        let includingContinueSetUpCards: Bool
         @EnvironmentObject var model: HomePage.Models.SettingsModel
         @EnvironmentObject var appearancePreferences: AppearancePreferences
         @EnvironmentObject var continueSetUpModel: HomePage.Models.ContinueSetUpModel
@@ -174,7 +175,7 @@ extension HomePage.Views {
                 ThemePicker()
             }
             SettingsSection(title: UserText.homePageSections) {
-                HomeContentSectionsView()
+                HomeContentSectionsView(includeContinueSetUpCards: includingContinueSetUpCards)
             }
             rootViewFooter
         }
@@ -232,13 +233,42 @@ extension HomePage.Views.BackgroundCategoryView {
 }
 
 #if DEBUG
-#Preview {
+#Preview("including continue set up cards") {
     @State var isSettingsVisible: Bool = true
 
     let settingsModel = HomePage.Models.SettingsModel()
     settingsModel.customBackground = .solidColor(.color10)
 
-    return HomePage.Views.SettingsView( isSettingsVisible: $isSettingsVisible)
+    return HomePage.Views.SettingsView(includingContinueSetUpCards: true, isSettingsVisible: $isSettingsVisible)
+        .frame(width: 236, height: 600)
+        .environmentObject(settingsModel)
+        .environmentObject(AppearancePreferences.shared)
+        .environmentObject(HomePage.Models.ContinueSetUpModel(
+            defaultBrowserProvider: SystemDefaultBrowserProvider(),
+            dockCustomizer: DockCustomizer(),
+            dataImportProvider: BookmarksAndPasswordsImportStatusProvider(),
+            tabCollectionViewModel: TabCollectionViewModel(),
+            duckPlayerPreferences: DuckPlayerPreferencesUserDefaultsPersistor()
+        ))
+        .environmentObject(HomePage.Models.FavoritesModel(
+            open: { _, _ in },
+            removeFavorite: { _ in },
+            deleteBookmark: { _ in },
+            add: {},
+            edit: { _ in },
+            moveFavorite: { _, _ in },
+            onFaviconMissing: {}
+        ))
+        .environmentObject(HomePage.Models.AddressBarModel(tabCollectionViewModel: TabCollectionViewModel(), privacyConfigurationManager: MockPrivacyConfigurationManager()))
+}
+
+#Preview("no continue set up cards") {
+    @State var isSettingsVisible: Bool = true
+
+    let settingsModel = HomePage.Models.SettingsModel()
+    settingsModel.customBackground = .solidColor(.color10)
+
+    return HomePage.Views.SettingsView(includingContinueSetUpCards: false, isSettingsVisible: $isSettingsVisible)
         .frame(width: 236, height: 600)
         .environmentObject(settingsModel)
         .environmentObject(AppearancePreferences.shared)

diff --git a/DuckDuckGo/HomePage/View/HomePageView.swift b/DuckDuckGo/HomePage/View/HomePageView.swift
@@ -104,7 +104,8 @@ extension HomePage.Views {
                         .contextMenu(menuItems: sectionsVisibilityContextMenuItems)
 
                         if settingsVisibilityModel.isSettingsVisible {
-                            SettingsView(isSettingsVisible: $settingsVisibilityModel.isSettingsVisible)
+                            SettingsView(includingContinueSetUpCards: model.isContinueSetUpAvailable && !model.isContinueSetUpCardsViewOutdated,
+                                         isSettingsVisible: $settingsVisibilityModel.isSettingsVisible)
                                 .frame(width: Self.settingsPanelWidth)
                                 .transition(.move(edge: .trailing))
                                 .layoutPriority(1)
@@ -239,6 +240,11 @@ extension HomePage.Views {
                 Toggle(UserText.newTabMenuItemShowSearchBar, isOn: $model.isSearchBarVisible)
                     .toggleStyle(.checkbox)
             }
+            if model.isContinueSetUpAvailable && !model.isContinueSetUpCardsViewOutdated {
+                Toggle(UserText.newTabMenuItemShowContinuteSetUp, isOn: $model.isContinueSetUpVisible)
+                    .toggleStyle(.checkbox)
+                    .visibility(continueSetUpModel.hasContent ? .visible : .gone)
+            }
             Toggle(UserText.newTabMenuItemShowFavorite, isOn: $model.isFavoriteVisible)
                 .toggleStyle(.checkbox)
             Toggle(UserText.newTabMenuItemShowRecentActivity, isOn: $model.isRecentActivityVisible)