Implement requested changes

mlemgroup · Oct 8, 2023 · 10c6147 · 10c6147
1 parent 45bac5f
commit 10c6147
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/Mlem/Extensions/Swipey Actions.swift b/Mlem/Extensions/Swipey Actions.swift
@@ -363,4 +363,11 @@ extension View {
             )
         )
     }
+
+    @ViewBuilder
+    func addSwipeyActions(_ configuration: SwipeConfiguration) -> some View {
+        modifier(
+        SwipeyView(configuration: configuration)
+        )
+    }
 }
diff --git a/Mlem/Views/Tabs/Search/RecentSearchesView.swift b/Mlem/Views/Tabs/Search/RecentSearchesView.swift
@@ -75,13 +75,16 @@ struct RecentSearchesView: View {
                     CommunityResultView(
                         community: community,
                         showTypeLabel: true,
-                        hasSwipeActions: false
+                        swipeActions: .init(trailingActions: [deleteSwipeAction(contentModel)])
                     )
                 } else if let user = contentModel.wrappedValue as? UserModel {
-                    UserResultView(user: user, showTypeLabel: true)
+                    UserResultView(
+                        user: user,
+                        showTypeLabel: true,
+                        swipeActions: .init(trailingActions: [deleteSwipeAction(contentModel)])
+                    )
                 }
             }
-            .addSwipeyActions(trailing: [deleteSwipeAction(contentModel)])
             .simultaneousGesture(TapGesture().onEnded {
                 recentSearchesTracker.addRecentSearch(contentModel, accountId: appState.currentActiveAccount?.stableIdString)
             })

diff --git a/Mlem/Views/Tabs/Search/Results/CommunityResultView.swift b/Mlem/Views/Tabs/Search/Results/CommunityResultView.swift
@@ -13,10 +13,20 @@ struct CommunityResultView: View {
     @Dependency(\.hapticManager) var hapticManager
 
     @EnvironmentObject var contentTracker: ContentTracker<AnyContentModel>
+
     let community: CommunityModel
     let showTypeLabel: Bool
+    var swipeActions: SwipeConfiguration = .init()
 
-    var hasSwipeActions: Bool = true
+    init(
+        community: CommunityModel,
+        showTypeLabel: Bool = false,
+        swipeActions: SwipeConfiguration? = nil
+    ) {
+        self.community = community
+        self.showTypeLabel = showTypeLabel
+        self.swipeActions = swipeActions ?? .init(trailingActions: [subscribeSwipeAction])
+    }
 
     var subscribeSwipeAction: SwipeAction {
         let (emptySymbolName, fullSymbolName) = community.subscribed
@@ -52,14 +62,6 @@ struct CommunityResultView: View {
     }
 
     var body: some View {
-        if hasSwipeActions {
-            content
-                .addSwipeyActions(trailing: [subscribeSwipeAction])
-        } else {
-            content
-        }
-    }
-    var content: some View {
         NavigationLink(value: NavigationRoute.apiCommunity(community.community)) {
             HStack(spacing: 10) {
                 AvatarView(community: community.community, avatarSize: 48)
@@ -110,5 +112,6 @@ struct CommunityResultView: View {
                     systemImage: community.subscribed ? Icons.unsubscribe : Icons.subscribe)
             }
         }
+        .addSwipeyActions(swipeActions)
     }
 }
diff --git a/Mlem/Views/Tabs/Search/Results/UserResultView.swift b/Mlem/Views/Tabs/Search/Results/UserResultView.swift
@@ -13,8 +13,10 @@ struct UserResultView: View {
     @Dependency(\.hapticManager) var hapticManager
 
     @EnvironmentObject var contentTracker: ContentTracker<AnyContentModel>
+
     let user: UserModel
     let showTypeLabel: Bool
+    var swipeActions: SwipeConfiguration = .init()
 
     var caption: String {
         if let host = user.user.actorId.host {
@@ -87,5 +89,6 @@ struct UserResultView: View {
             .background(.background)
             .clipShape(RoundedRectangle(cornerRadius: 8))
         }
+        .addSwipeyActions(swipeActions)
     }
 }