combine type and content into single enum

Author: joshua-journey-apps

Demo/PowerSyncExample/Components/SearchResultRow.swift

@@ -6,45 +6,78 @@ struct SearchResultRow: View {
     var body: some View {
         HStack {
 
-            Image(systemName: item.type == .list ? "list.bullet" : "checkmark.circle")
-                .foregroundColor(.secondary)
+            Image(
+                systemName: {
+                    switch item.content {
+                    case .list:
+                        return "list.bullet"
+                    case .todo:
+                        return "checkmark.circle"
+                    }
+                }()
+            )
+            .foregroundColor(.secondary)
+            
+            switch item.content {
+            case .list(let listContent):
+                Text(listContent.name)
 
-            if let list = item.listContent {
-                Text(list.name)
-            } else if let todo = item.todo {
+            case .todo(let todo):
                 Text(todo.description)
                     .strikethrough(todo.isComplete, color: .secondary)
                     .foregroundColor(todo.isComplete ? .secondary : .primary)
-            } else {
-                Text("Unknown item")
             }
 
             Spacer()
 
-             Image(systemName: "chevron.right")
-                 .font(.caption.weight(.bold))
-                 .foregroundColor(.secondary.opacity(0.5))
+            Image(systemName: "chevron.right")
+                .font(.caption.weight(.bold))
+                .foregroundColor(.secondary.opacity(0.5))
         }
         .contentShape(Rectangle())
     }
 }
 
 #Preview {
     List {
-        SearchResultRow(item: SearchResultItem(
-            id: UUID().uuidString,
-            type: .list,
-            content: ListContent(id: UUID().uuidString, name: "Groceries", createdAt: "now", ownerId: "user1")
-        ))
-        SearchResultRow(item: SearchResultItem(
-            id: UUID().uuidString,
-            type: .todo,
-            content: Todo(id: UUID().uuidString, listId: "list1", description: "Buy milk", isComplete: false)
-        ))
-        SearchResultRow(item: SearchResultItem(
-            id: UUID().uuidString,
-            type: .todo,
-            content: Todo(id: UUID().uuidString, listId: "list1", description: "Walk the dog", isComplete: true)
-        ))
+        SearchResultRow(
+            item: SearchResultItem(
+                id: UUID().uuidString,
+                content: .list(
+                    ListContent(
+                        id: UUID().uuidString,
+                        name: "Groceries",
+                        createdAt: "now",
+                        ownerId: "user1"
+                    )
+                )
+            )
+        )
+        SearchResultRow(
+            item: SearchResultItem(
+                id: UUID().uuidString,
+                content: .todo(
+                    Todo(
+                        id: UUID().uuidString,
+                        listId: "list1",
+                        description: "Buy milk",
+                        isComplete: false
+                    )
+                )
+            )
+        )
+        SearchResultRow(
+            item: SearchResultItem(
+                id: UUID().uuidString,
+                content: .todo(
+                    Todo(
+                        id: UUID().uuidString,
+                        listId: "list1",
+                        description: "Walk the dog",
+                        isComplete: true
+                    )
+                )
+            )
+        )
     }
 }

Demo/PowerSyncExample/PowerSync/SearchResultItem.swift

@@ -1,29 +1,20 @@
 import Foundation
 
-enum SearchResultType {
-    case list
-    case todo
+enum SearchResultContent: Hashable {
+    case list(ListContent)
+    case todo(Todo)
 }
 
 struct SearchResultItem: Identifiable, Hashable {
     let id: String
-    let type: SearchResultType
-    let content: AnyHashable
-
-    var listContent: ListContent? {
-        content as? ListContent
-    }
-
-    var todo: Todo? {
-        content as? Todo
-    }
+    let content: SearchResultContent
 
     func hash(into hasher: inout Hasher) {
         hasher.combine(id)
-        hasher.combine(type)
+        hasher.combine(content)
     }
 
     static func == (lhs: SearchResultItem, rhs: SearchResultItem) -> Bool {
-        lhs.id == rhs.id && lhs.type == rhs.type
+        lhs.id == rhs.id && lhs.content == rhs.content
     }
 }

Demo/PowerSyncExample/Screens/SearchScreen.swift

@@ -75,9 +75,9 @@ struct SearchScreen: View {
 
                 self.searchResults = results.compactMap { item in
                     if let list = item as? ListContent {
-                        return SearchResultItem(id: list.id, type: .list, content: list)
+                        return SearchResultItem(id: list.id, content: .list(list))
                     } else if let todo = item as? Todo {
-                        return SearchResultItem(id: todo.id, type: .todo, content: todo)
+                        return SearchResultItem(id: todo.id, content: .todo(todo))
                     }
                     return nil
                 }