GT-1719 favorites drag and drop

godtools/App/Features/Dashboard/Data-DomainInterface/FavoritedToolsLatestToolDownloader.swift

@@ -30,7 +30,7 @@ class FavoritedToolsLatestToolDownloader: FavoritedToolsLatestToolDownloaderInte
         )
         .flatMap({ (resourcesChanged: Void, favoritedResourcesChanged: Void) -> AnyPublisher<[FavoritedResourceDataModel], Never> in
 
-            let favoritedTools: [FavoritedResourceDataModel] = self.favoritedResourcesRepository.getFavoritedResourcesSortedByCreatedAt(ascendingOrder: false)
+            let favoritedTools: [FavoritedResourceDataModel] = self.favoritedResourcesRepository.getFavoritedResourcesSortedByPosition(ascendingOrder: false)
 
             return Just(favoritedTools)
                 .eraseToAnyPublisher()

godtools/App/Features/Dashboard/Data-DomainInterface/StoreInitialFavoritedTools.swift

@@ -29,13 +29,5 @@ class StoreInitialFavoritedTools: StoreInitialFavoritedToolsInterface {
 
         return favoritedResourcesRepository
             .storeFavoritedResourcesPublisher(ids: favoritedResourceIdsToStore)
-            .catch { _ in
-                return Just([])
-                    .eraseToAnyPublisher()
-            }
-            .map { _ in
-                Void()
-            }
-            .eraseToAnyPublisher()
     }
 }

godtools/App/Features/Favorites/Data-DomainInterface/GetYourFavoritedToolsRepository.swift

@@ -29,16 +29,15 @@ class GetYourFavoritedToolsRepository: GetYourFavoritedToolsRepositoryInterface
     func getToolsPublisher(translateInLanguage: AppLanguageDomainModel, maxCount: Int?) -> AnyPublisher<[YourFavoritedToolDomainModel], Never> {
 
         return Publishers.CombineLatest3(
-            favoritedResourcesRepository.getFavoritedResourcesChangedPublisher(),
             resourcesRepository.getResourcesChangedPublisher(),
-            getToolListItemInterfaceStringsRepository.getStringsPublisher(translateInLanguage: translateInLanguage)
+            getToolListItemInterfaceStringsRepository.getStringsPublisher(translateInLanguage: translateInLanguage),
+            favoritedResourcesRepository.getFavoritedResourcesSortedByPositionPublisher()
         )
-        .flatMap({ (favoritedResourcesChanged: Void, resourcesChanged: Void, interfaceStrings: ToolListItemInterfaceStringsDomainModel) -> AnyPublisher<[YourFavoritedToolDomainModel], Never> in
+        .flatMap({ (resourcesChanged: Void, interfaceStrings: ToolListItemInterfaceStringsDomainModel, favoritedResourceModels: [FavoritedResourceDataModel]) -> AnyPublisher<[YourFavoritedToolDomainModel], Never> in
 
             let numberOfFavoritedTools: Int = self.favoritedResourcesRepository.getNumberOfFavoritedResources()
 
-            let favoritedResources: [ResourceModel] = self.favoritedResourcesRepository
-                .getFavoritedResourcesSortedByCreatedAt(ascendingOrder: false)
+            let favoritedResources: [ResourceModel] = favoritedResourceModels
                 .prefix(maxCount ?? numberOfFavoritedTools)
                 .compactMap({
                     self.resourcesRepository.getResource(id: $0.id)

godtools/App/Features/Favorites/Data-DomainInterface/ReorderFavoritedToolRepository.swift

@@ -0,0 +1,30 @@
+//
+//  ReorderFavoritedToolRepository.swift
+//  godtools
+//
+//  Created by Rachael Skeath on 3/19/25.
+//  Copyright © 2025 Cru. All rights reserved.
+//
+
+import Foundation
+import Combine
+
+class ReorderFavoritedToolRepository: ReorderFavoritedToolRepositoryInterface {
+
+    private let favoritedResourcesRepository: FavoritedResourcesRepository
+
+    init(favoritedResourcesRepository: FavoritedResourcesRepository) {
+        self.favoritedResourcesRepository = favoritedResourcesRepository
+    }
+
+    func reorderFavoritedToolPubilsher(toolId: String, originalPosition: Int, newPosition: Int) -> AnyPublisher<[ReorderFavoritedToolDomainModel], Error> {
+
+        return favoritedResourcesRepository.reorderFavoritedResourcePublisher(id: toolId, originalPosition: originalPosition, newPosition: newPosition)
+            .map { favoritesReordered in
+                return favoritesReordered.map {
+                    ReorderFavoritedToolDomainModel(dataModelId: $0.id, position: $0.position)
+                }
+            }
+            .eraseToAnyPublisher()
+    }
+}

godtools/App/Features/Favorites/Data-DomainInterface/ToggleToolFavoritedRepository.swift

@@ -37,10 +37,6 @@ class ToggleToolFavoritedRepository: ToggleToolFavoritedRepositoryInterface {
         else {
 
             return favoritedResourcesRepository.storeFavoritedResourcesPublisher(ids: [toolId])
-                .catch { _ in
-                    return Just([])
-                        .eraseToAnyPublisher()
-                }
                 .map { _ in
                     ToolIsFavoritedDomainModel(dataModelId: toolId, isFavorited: true)
                 }

godtools/App/Features/Favorites/DependencyContainer/FavoritesDataLayerDependencies.swift

@@ -46,6 +46,12 @@ class FavoritesDataLayerDependencies {
         )
     }
 
+    func getReorderFavoritedToolRepository() -> ReorderFavoritedToolRepositoryInterface {
+        return ReorderFavoritedToolRepository(
+            favoritedResourcesRepository: coreDataLayer.getFavoritedResourcesRepository()
+        )
+    }
+
     func getToggleToolFavoritedRepository() -> ToggleToolFavoritedRepositoryInterface {
         return ToggleToolFavoritedRepository(
             favoritedResourcesRepository: coreDataLayer.getFavoritedResourcesRepository()

godtools/App/Features/Favorites/DependencyContainer/FavoritesDomainLayerDependencies.swift

@@ -23,6 +23,12 @@ class FavoritesDomainLayerDependencies {
         )
     }
 
+    func getReorderFavoritedToolUseCase() -> ReorderFavoritedToolUseCase {
+        return ReorderFavoritedToolUseCase(
+            reorderFavoritedToolRepository: dataLayer.getReorderFavoritedToolRepository()
+        )
+    }
+
     func getToggleFavoritedToolUseCase() -> ToggleToolFavoritedUseCase {
         return ToggleToolFavoritedUseCase(
             toggleToolFavoritedRepository: dataLayer.getToggleToolFavoritedRepository()

godtools/App/Features/Favorites/Domain/Entities/ReorderFavoritedToolDomainModel.swift

@@ -0,0 +1,22 @@
+//
+//  ReorderFavoritedToolDomainModel.swift
+//  godtools
+//
+//  Created by Rachael Skeath on 3/28/25.
+//  Copyright © 2025 Cru. All rights reserved.
+//
+
+import Foundation
+
+struct ReorderFavoritedToolDomainModel {
+
+    let dataModelId: String
+    let position: Int
+}
+
+extension ReorderFavoritedToolDomainModel: Identifiable {
+
+    var id: String {
+        return dataModelId
+    }
+}

godtools/App/Features/Favorites/Domain/Interface/ReorderFavoritedToolRepositoryInterface.swift

@@ -0,0 +1,15 @@
+//
+//  ReorderFavoritedToolRepositoryInterface.swift
+//  godtools
+//
+//  Created by Rachael Skeath on 3/19/25.
+//  Copyright © 2025 Cru. All rights reserved.
+//
+
+import Foundation
+import Combine
+
+protocol ReorderFavoritedToolRepositoryInterface {
+
+    func reorderFavoritedToolPubilsher(toolId: String, originalPosition: Int, newPosition: Int) -> AnyPublisher<[ReorderFavoritedToolDomainModel], Error>
+}

godtools/App/Features/Favorites/Domain/UseCases/ReorderFavoritedToolUseCase.swift

@@ -0,0 +1,24 @@
+//
+//  ReorderFavoritedToolUseCase.swift
+//  godtools
+//
+//  Created by Rachael Skeath on 3/19/25.
+//  Copyright © 2025 Cru. All rights reserved.
+//
+
+import Foundation
+import Combine
+
+class ReorderFavoritedToolUseCase {
+
+    private let reorderFavoritedToolRepository: ReorderFavoritedToolRepositoryInterface
+
+    init(reorderFavoritedToolRepository: ReorderFavoritedToolRepositoryInterface) {
+        self.reorderFavoritedToolRepository = reorderFavoritedToolRepository
+    }
+
+    func reorderFavoritedToolPublisher(toolId: String, originalPosition: Int, newPosition: Int) -> AnyPublisher<[ReorderFavoritedToolDomainModel], Error> {
+
+        return reorderFavoritedToolRepository.reorderFavoritedToolPubilsher(toolId: toolId, originalPosition: originalPosition, newPosition: newPosition)
+    }
+}

godtools/App/Features/Favorites/Presentation/AllYourFavoriteTools/AllYourFavoriteToolsView.swift

@@ -25,53 +25,47 @@ struct AllYourFavoriteToolsView: View {
     var body: some View {
 
         GeometryReader { geometry in
-
-            PullToRefreshScrollView(showsIndicators: true) {
-
-                VStack(alignment: .leading, spacing: 0) {
 
+            VStack(alignment: .leading, spacing: 0) {
+                List {
                     Text(viewModel.sectionTitle)
                         .font(FontLibrary.sfProTextRegular.font(size: 22))
                         .foregroundColor(ColorPalette.gtGrey.color)
-                        .padding(.top, 30)
-                        .padding(.leading, contentHorizontalInsets)
-                                        
-                    LazyVStack(alignment: .center, spacing: toolCardSpacing) {
-
-                        ForEach(viewModel.favoritedTools) { (tool: YourFavoritedToolDomainModel) in
-
-                            ToolCardView(
-                                viewModel: viewModel.getToolViewModel(tool: tool),
-                                geometry: geometry,
-                                layout: .landscape,
-                                showsCategory: true,
-                                navButtonTitleHorizontalPadding: YourFavoriteToolsView.toolCardNavButtonTitleHorizontalPadding,
-                                accessibility: .favoriteTool,
-                                favoriteTappedClosure: {
-                                    
-                                    viewModel.unfavoriteToolTapped(tool: tool)
-                                },
-                                toolDetailsTappedClosure: {
-                                    
-                                    viewModel.toolDetailsTapped(tool: tool)
-                                },
-                                openToolTappedClosure: {
-                                    
-                                    viewModel.openToolTapped(tool: tool)
-                                },
-                                toolTappedClosure: {
-                                    
-                                    viewModel.toolTapped(tool: tool)
-                                }
-                            )
-                        }
+                        .listRowSeparator(.hidden)
+
+                    ForEach(viewModel.favoritedTools) { (tool: YourFavoritedToolDomainModel) in
+                        ToolCardView(
+                            viewModel: viewModel.getToolViewModel(tool: tool),
+                            geometry: geometry,
+                            layout: .landscape,
+                            showsCategory: true,
+                            navButtonTitleHorizontalPadding: YourFavoriteToolsView.toolCardNavButtonTitleHorizontalPadding,
+                            accessibility: .favoriteTool,
+                            favoriteTappedClosure: {
+
+                                viewModel.unfavoriteToolTapped(tool: tool)
+                            },
+                            toolDetailsTappedClosure: {
+
+                                viewModel.toolDetailsTapped(tool: tool)
+                            },
+                            openToolTappedClosure: {
+
+                                viewModel.openToolTapped(tool: tool)
+                            },
+                            toolTappedClosure: {
+
+                                viewModel.toolTapped(tool: tool)
+                            }
+                        )
+                        .buttonStyle(.plain)
+                        .listRowSeparator(.hidden)
+                    }
+                    .onMove { from, to in
+                        viewModel.toolMoved(fromOffsets: from, toOffset: to)
                     }
-                    .padding([.top], toolCardSpacing)
-                    .padding([.bottom], DashboardView.scrollViewBottomSpacingToTabBar)
                 }
-
-            } refreshHandler: {
-
+                .listStyle(.plain)
             }
         }
         .navigationBarBackButtonHidden(true)
@@ -95,6 +89,7 @@ struct AllYourFavoriteToolsView_Preview: PreviewProvider {
             viewAllYourFavoritedToolsUseCase: appDiContainer.feature.favorites.domainLayer.getViewAllYourFavoritedToolsUseCase(),
             getCurrentAppLanguageUseCase: appDiContainer.feature.appLanguage.domainLayer.getCurrentAppLanguageUseCase(),
             getToolIsFavoritedUseCase: appDiContainer.feature.favorites.domainLayer.getToolIsFavoritedUseCase(),
+            reorderFavoritedToolUseCase: appDiContainer.feature.favorites.domainLayer.getReorderFavoritedToolUseCase(),
             attachmentsRepository: appDiContainer.dataLayer.getAttachmentsRepository(),
             trackScreenViewAnalyticsUseCase: appDiContainer.domainLayer.getTrackScreenViewAnalyticsUseCase(),
             trackActionAnalyticsUseCase: appDiContainer.domainLayer.getTrackActionAnalyticsUseCase()

godtools/App/Features/Favorites/Presentation/AllYourFavoriteTools/AllYourFavoriteToolsViewModel.swift

@@ -15,11 +15,13 @@ class AllYourFavoriteToolsViewModel: ObservableObject {
     private let viewAllYourFavoritedToolsUseCase: ViewAllYourFavoritedToolsUseCase
     private let getCurrentAppLanguageUseCase: GetCurrentAppLanguageUseCase
     private let getToolIsFavoritedUseCase: GetToolIsFavoritedUseCase
+    private let reorderFavoritedToolUseCase: ReorderFavoritedToolUseCase
     private let attachmentsRepository: AttachmentsRepository
     private let trackScreenViewAnalyticsUseCase: TrackScreenViewAnalyticsUseCase
     private let trackActionAnalyticsUseCase: TrackActionAnalyticsUseCase
     private let didConfirmToolRemovalSubject: PassthroughSubject<Void, Never> = PassthroughSubject()
 
+    private static var backgroundCancellables: Set<AnyCancellable> = Set()
     private var cancellables: Set<AnyCancellable> = Set()
 
     private weak var flowDelegate: FlowDelegate?
@@ -29,12 +31,13 @@ class AllYourFavoriteToolsViewModel: ObservableObject {
     @Published var sectionTitle: String = ""
     @Published var favoritedTools: [YourFavoritedToolDomainModel] = Array()
 
-    init(flowDelegate: FlowDelegate?, viewAllYourFavoritedToolsUseCase: ViewAllYourFavoritedToolsUseCase, getCurrentAppLanguageUseCase: GetCurrentAppLanguageUseCase, getToolIsFavoritedUseCase: GetToolIsFavoritedUseCase, attachmentsRepository: AttachmentsRepository, trackScreenViewAnalyticsUseCase: TrackScreenViewAnalyticsUseCase, trackActionAnalyticsUseCase: TrackActionAnalyticsUseCase) {
+    init(flowDelegate: FlowDelegate?, viewAllYourFavoritedToolsUseCase: ViewAllYourFavoritedToolsUseCase, getCurrentAppLanguageUseCase: GetCurrentAppLanguageUseCase, getToolIsFavoritedUseCase: GetToolIsFavoritedUseCase, reorderFavoritedToolUseCase: ReorderFavoritedToolUseCase, attachmentsRepository: AttachmentsRepository, trackScreenViewAnalyticsUseCase: TrackScreenViewAnalyticsUseCase, trackActionAnalyticsUseCase: TrackActionAnalyticsUseCase) {
 
         self.flowDelegate = flowDelegate
         self.viewAllYourFavoritedToolsUseCase = viewAllYourFavoritedToolsUseCase
         self.getCurrentAppLanguageUseCase = getCurrentAppLanguageUseCase
         self.getToolIsFavoritedUseCase = getToolIsFavoritedUseCase
+        self.reorderFavoritedToolUseCase = reorderFavoritedToolUseCase
         self.attachmentsRepository = attachmentsRepository
         self.trackScreenViewAnalyticsUseCase = trackScreenViewAnalyticsUseCase
         self.trackActionAnalyticsUseCase = trackActionAnalyticsUseCase
@@ -190,4 +193,28 @@ extension AllYourFavoriteToolsViewModel {
 
         flowDelegate?.navigate(step: .toolTappedFromAllYourFavoritedTools(tool: tool))
     }
+
+    func toolMoved(fromOffsets source: IndexSet, toOffset destination: Int) {
+        for index in source {
+            guard index < favoritedTools.count else { continue }
+            let toolToMove = favoritedTools[index]
+
+            var newIndex: Int
+            if index < destination {
+                newIndex = destination - 1
+            } else {
+                newIndex = destination
+            }
+
+            reorderFavoritedToolUseCase
+                .reorderFavoritedToolPublisher(toolId: toolToMove.id, originalPosition: index, newPosition: newIndex)
+                .sink { _ in
+
+                } receiveValue: { _ in
+
+                }
+                .store(in: &AllYourFavoriteToolsViewModel.backgroundCancellables)
+
+        }
+    }
 }

godtools/App/Features/ToolShortcutLinks/Data-DomainInterface/GetToolShortcutLinksRepository.swift

@@ -25,7 +25,7 @@ class GetToolShortcutLinksRepository: GetToolShortcutLinksRepositoryInterface {
 
     func getLinksPublisher(appLanguage: AppLanguageDomainModel) -> AnyPublisher<[ToolShortcutLinkDomainModel], Never> {
 
-        return favoritedResourcesRepository.getFavoritedResourcesSortedByCreatedAtPublisher(ascendingOrder: false)
+        return favoritedResourcesRepository.getFavoritedResourcesSortedByPositionPublisher(ascendingOrder: false)
             .flatMap({ (favoritedResources: [FavoritedResourceDataModel]) -> AnyPublisher<[ToolShortcutLinkDomainModel], Never> in
 
                 let toolShortcutLinks: [ToolShortcutLinkDomainModel] = favoritedResources

godtools/App/Flows/App/AppFlow.swift

@@ -947,6 +947,7 @@ extension AppFlow {
             viewAllYourFavoritedToolsUseCase: appDiContainer.feature.favorites.domainLayer.getViewAllYourFavoritedToolsUseCase(),
             getCurrentAppLanguageUseCase: appDiContainer.feature.appLanguage.domainLayer.getCurrentAppLanguageUseCase(),
             getToolIsFavoritedUseCase: appDiContainer.feature.favorites.domainLayer.getToolIsFavoritedUseCase(),
+            reorderFavoritedToolUseCase: appDiContainer.feature.favorites.domainLayer.getReorderFavoritedToolUseCase(),
             attachmentsRepository: appDiContainer.dataLayer.getAttachmentsRepository(),
             trackScreenViewAnalyticsUseCase: appDiContainer.domainLayer.getTrackScreenViewAnalyticsUseCase(),
             trackActionAnalyticsUseCase: appDiContainer.domainLayer.getTrackActionAnalyticsUseCase()

godtools/App/Share/Data/FavoritedResourcesRepository/Cache/Models/RealmFavoritedResource.swift

@@ -13,14 +13,9 @@ class RealmFavoritedResource: Object {
 
     @objc dynamic var createdAt: Date = Date()
     @objc dynamic var resourceId: String = ""
+    @objc dynamic var position: Int = 0
 
     override static func primaryKey() -> String? {
         return "resourceId"
     }
-
-    func mapFrom(dataModel: FavoritedResourceDataModel) {
-
-        createdAt = dataModel.createdAt
-        resourceId = dataModel.id
-    }
 }