Add favorites using autocomplete from New Tab Page

Core/BookmarksModelsErrorHandling.swift

@@ -78,22 +78,42 @@ public extension BookmarkEditorViewModel {
     convenience init(editingEntityID: NSManagedObjectID,
                      bookmarksDatabase: CoreDataDatabase,
                      favoritesDisplayMode: FavoritesDisplayMode,
-                     syncService: DDGSyncing?) {
+                     syncService: DDGSyncing?,
+                     sanitization: BookmarkSanitization? = nil) {
         self.init(editingEntityID: editingEntityID,
                   bookmarksDatabase: bookmarksDatabase,
                   favoritesDisplayMode: favoritesDisplayMode,
-                  errorEvents: BookmarksModelsErrorHandling(syncService: syncService))
+                  errorEvents: BookmarksModelsErrorHandling(syncService: syncService),
+                  sanitization: sanitization)
 
     }
 
     convenience init(creatingFolderWithParentID parentFolderID: NSManagedObjectID?,
                      bookmarksDatabase: CoreDataDatabase,
                      favoritesDisplayMode: FavoritesDisplayMode,
-                     syncService: DDGSyncing?) {
+                     syncService: DDGSyncing?,
+                     sanitization: BookmarkSanitization? = nil) {
         self.init(creatingFolderWithParentID: parentFolderID,
                   bookmarksDatabase: bookmarksDatabase,
                   favoritesDisplayMode: favoritesDisplayMode,
-                  errorEvents: BookmarksModelsErrorHandling(syncService: syncService))
+                  errorEvents: BookmarksModelsErrorHandling(syncService: syncService),
+                  sanitization: sanitization)
+    }
+
+    convenience init(addingBookmarkWith url: String,
+                     title: String,
+                     toFolderWithID folderID: NSManagedObjectID?,
+                     bookmarksDatabase: CoreDataDatabase,
+                     favoritesDisplayMode: FavoritesDisplayMode,
+                     syncService: DDGSyncing?,
+                     sanitization: BookmarkSanitization? = nil) {
+        self.init(addingBookmarkWith: url,
+                  title: title,
+                  toFolderWithID: folderID,
+                  bookmarksDatabase: bookmarksDatabase,
+                  favoritesDisplayMode: favoritesDisplayMode,
+                  errorEvents: BookmarksModelsErrorHandling(syncService: syncService),
+                  sanitization: sanitization)
     }
 }
 

Core/UserDefaultsPropertyWrapper.swift

@@ -170,7 +170,7 @@ public struct UserDefaultsWrapper<T> {
         // Debug keys
         case debugNewTabPageSectionsEnabledKey = "com.duckduckgo.ios.debug.newTabPageSectionsEnabled"
         case debugOnboardingHighlightsEnabledKey = "com.duckduckgo.ios.debug.onboardingHighlightsEnabled"
-        
+
         // Duck Player Pixel Experiment
         case duckPlayerPixelExperimentInstalled = "com.duckduckgo.ios.duckplayer.pixel.experiment.installed.v2"
         case duckPlayerPixelExperimentCohort = "com.duckduckgo.ios.duckplayer.pixel.experiment.cohort.v2"
@@ -179,7 +179,6 @@ public struct UserDefaultsWrapper<T> {
         case duckPlayerPixelExperimentLastDayPixelFired = "com.duckduckgo.ios.duckplayer.pixel.experiment.last.day.pixel.fired.v2"
         case duckPlayerPixelExperimentLastVideoIDRendered = "com.duckduckgo.ios.duckplayer.pixel.experiment.last.videoID.rendered.v2"
         case duckPlayerPixelExperimentOverride = "com.duckduckgo.ios.duckplayer.pixel.experiment.override.v2"
-
     }
 
     private let key: Key

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
       "state" : {
-        "revision" : "5b59c2790a7f7c69bf1f6793152bdb4ea344b1b4",
-        "version" : "198.1.1"
+        "branch" : "mariusz/ntp-favorites-autocomplete",
+        "revision" : "31505ed55ad8524b0225583253fd15b08e74124c"
       }
     },
     {

DuckDuckGo/AddFavoriteURLMatcher.swift

@@ -0,0 +1,58 @@
+//
+//  AddFavoriteURLMatcher.swift
+//  DuckDuckGo
+//
+//  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 Foundation
+import Common
+import Core
+
+enum AddFavoriteURLMatch: Hashable {
+    case exactFavorite
+    case exactBookmark
+    case partialFavorite(matchedURL: URL)
+    case partialBookmark(matchedURL: URL)
+}
+
+protocol AddFavoriteURLMatching {
+    @MainActor
+    func favoriteMatch(for url: URL) -> AddFavoriteURLMatch?
+}
+
+struct AddFavoriteURLMatcher: AddFavoriteURLMatching {
+    let bookmarksSearch: BookmarksStringSearch
+
+    @MainActor
+    func favoriteMatch(for url: URL) -> AddFavoriteURLMatch? {
+        let searchTerm = url.nakedString ?? url.absoluteString
+
+        let results = bookmarksSearch.search(query: searchTerm)
+        guard !results.isEmpty else {
+            return nil
+        }
+
+        if let match = results.first(where: { $0.url.absoluteString == url.absoluteString }) {
+            return match.isFavorite ? .exactFavorite : .exactBookmark
+        }
+
+        if let match = results.first(where: { $0.url.absoluteString.contains(searchTerm) }) {
+            return match.isFavorite ? .partialFavorite(matchedURL: match.url) : .partialBookmark(matchedURL: match.url)
+        }
+
+        return nil
+    }
+}

DuckDuckGo/AddFavoriteView.swift

@@ -0,0 +1,171 @@
+//
+//  AddFavoriteView.swift
+//  DuckDuckGo
+//
+//  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 SwiftUI
+import Bookmarks
+import Combine
+import DuckUI
+import Core
+
+struct AddFavoriteView: View {
+    @Environment(\.dismiss) var dismiss
+
+    @ObservedObject private(set) var viewModel: AddFavoriteViewModel
+
+    @FocusState private var isFocused: Bool
+
+    var body: some View {
+        VStack(alignment: .center, spacing: 8) {
+
+            Group {
+                headerView
+                searchInputField
+                    .padding(.top, 24)
+            }
+            .padding(.horizontal, Metrics.horizontalPadding)
+
+            if !viewModel.searchTerm.isEmpty {
+                searchList
+                    .applyBackground()
+                    .padding(24)
+
+                customEntryButton
+            }
+
+            Spacer()
+
+        }
+        .background(Color(designSystemColor: .background))
+        .frame(maxWidth: .infinity)
+        .toolbar {
+            ToolbarItem(placement: .topBarLeading) {
+                Button(role: .cancel) {
+                    dismiss()
+                } label: {
+                    Text(verbatim: "Cancel")
+                }
+            }
+        }
+        .tintIfAvailable(Color(designSystemColor: .textPrimary))
+        .onAppear {
+            isFocused = true
+        }
+        .onDisappear {
+            viewModel.clear()
+        }
+    }
+
+    private var customEntryButton: some View {
+        Button {
+            viewModel.addCustomWebsite()
+        } label: {
+            Text(UserText.addFavoriteCustomWebsiteButtonTitle)
+        }
+        .buttonStyle(SecondaryButtonStyle(compact: true, fullWidth: false))
+    }
+
+    @ViewBuilder
+    private var searchList: some View {
+        LazyVStack {
+            if !viewModel.results.isEmpty {
+                ForEach(viewModel.results) { result in
+                    Button {
+                        Task {
+                            await viewModel.addFavorite(for: result)
+                        }
+                        dismiss()
+                    } label: {
+                        FavoriteSearchResultItemView(result: result, isDisabled: !result.isActionable)
+                    }
+                    .disabled(!result.isActionable)
+                }
+            } else if viewModel.wasSearchCompleted {
+                FavoriteNoResultsItemView()
+                    .disabled(true)
+            }
+        }
+    }
+
+    private var searchInputField: some View {
+        HStack(spacing: 8) {
+            Group {
+                TextField(text: $viewModel.searchTerm) {
+                    Text(UserText.addFavoriteSearchPlaceholder)
+                }
+                .foregroundStyle(Color(designSystemColor: .textPrimary))
+                .daxBodyRegular()
+                .focused($isFocused)
+                .textInputAutocapitalization(.never)
+                .keyboardType(.URL)
+                .autocorrectionDisabled()
+                .textFieldStyle(.automatic)
+
+                if !viewModel.searchTerm.isEmpty {
+                    Button {
+                        viewModel.clear()
+                    } label: {
+                        Image(.clear16)
+                            .resizable()
+                            .aspectRatio(1, contentMode: .fit)
+                            .frame(width: 16)
+                    }
+                }
+            }
+            .padding(.vertical, 12)
+            .padding(.horizontal, 16)
+        }
+        .background {
+            RoundedRectangle(cornerRadius: 8, style: .continuous)
+                .inset(by: 1)
+                .stroke(Color(designSystemColor: .accent), lineWidth: 2)
+                .foregroundStyle(Color(designSystemColor: .panel))
+        }
+    }
+
+    @ViewBuilder
+    private var headerView: some View {
+        Image(.favoritesAdd128)
+
+        Text(UserText.addFavoriteHeader)
+            .daxTitle2()
+            .multilineTextAlignment(.center)
+            .foregroundStyle(Color(designSystemColor: .textPrimary))
+
+        Text(UserText.addFavoriteSubheader)
+            .daxBodyRegular()
+            .multilineTextAlignment(.center)
+            .foregroundStyle(Color(designSystemColor: .textSecondary))
+    }
+
+    private struct Metrics {
+        static let horizontalPadding: CGFloat = 24
+        static let listHorizontalPadding: CGFloat = 8
+    }
+}
+
+#Preview {
+    AddFavoriteView(viewModel: .preview)
+}
+
+struct PreviewBookmarksSearch: BookmarksStringSearch {
+    let hasData: Bool = false
+    func search(query: String) -> [any BookmarksStringSearchResult] {
+        []
+    }
+}