Fix 01-CreateViewWithTCA tutorial

kalupas226 · Feb 18, 2024 · deebca9 · deebca9
1 parent f208ae4
commit deebca9
Show file tree

Hide file tree

Showing 12 changed files with 141 additions and 165 deletions.
diff --git a/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-01-code-0001.swift b/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-01-code-0001.swift
@@ -2,6 +2,7 @@ import ComposableArchitecture
 import Entity
 import Foundation
 
-public struct RepositoryList: Reducer {
+@Reducer
+public struct RepositoryList {
   public init() {}
 }
diff --git a/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-01-code-0002.swift b/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-01-code-0002.swift
@@ -2,7 +2,9 @@ import ComposableArchitecture
 import Entity
 import Foundation
 
-public struct RepositoryList: Reducer {
+@Reducer
+public struct RepositoryList {
+  @ObservableState
   public struct State: Equatable {
     var repositories: [Repository] = []
     var isLoading: Bool = false

diff --git a/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-01-code-0003.swift b/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-01-code-0003.swift
@@ -2,15 +2,17 @@ import ComposableArchitecture
 import Entity
 import Foundation
 
-public struct RepositoryList: Reducer {
+@Reducer
+public struct RepositoryList {
+  @ObservableState
   public struct State: Equatable {
     var repositories: [Repository] = []
     var isLoading: Bool = false
 
     public init() {}
   }
 
-  public enum Action: Equatable {
+  public enum Action {
     case onAppear
   }
 

diff --git a/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-01-code-0004.swift b/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-01-code-0004.swift
@@ -2,17 +2,19 @@ import ComposableArchitecture
 import Entity
 import Foundation
 
-public struct RepositoryList: Reducer {
+@Reducer
+public struct RepositoryList {
+  @ObservableState
   public struct State: Equatable {
     var repositories: [Repository] = []
     var isLoading: Bool = false
 
     public init() {}
   }
 
-  public enum Action: Equatable {
+  public enum Action {
     case onAppear
-    case searchRepositoriesResponse(TaskResult<[Repository]>)
+    case searchRepositoriesResponse(Result<[Repository], Error>)
   }
 
   public init() {}

diff --git a/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-01-code-0005.swift b/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-01-code-0005.swift
@@ -2,17 +2,19 @@ import ComposableArchitecture
 import Entity
 import Foundation
 
-public struct RepositoryList: Reducer {
+@Reducer
+public struct RepositoryList {
+  @ObservableState
   public struct State: Equatable {
     var repositories: [Repository] = []
     var isLoading: Bool = false
 
     public init() {}
   }
 
-  public enum Action: Equatable {
+  public enum Action {
     case onAppear
-    case searchRepositoriesResponse(TaskResult<[Repository]>)
+    case searchRepositoriesResponse(Result<[Repository], Error>)
   }
 
   public init() {}

diff --git a/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-01-code-0006.swift b/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-01-code-0006.swift
@@ -2,17 +2,19 @@ import ComposableArchitecture
 import Entity
 import Foundation
 
-public struct RepositoryList: Reducer {
+@Reducer
+public struct RepositoryList {
+  @ObservableState
   public struct State: Equatable {
     var repositories: [Repository] = []
     var isLoading: Bool = false
 
     public init() {}
   }
 
-  public enum Action: Equatable {
+  public enum Action {
     case onAppear
-    case searchRepositoriesResponse(TaskResult<[Repository]>)
+    case searchRepositoriesResponse(Result<[Repository], Error>)
   }
 
   public init() {}
@@ -25,7 +27,7 @@ public struct RepositoryList: Reducer {
         return .run { send in
           await send(
             .searchRepositoriesResponse(
-              TaskResult {
+              Result {
                 let query = "composable"
                 let url = URL(
                   string: "https://api.github.com/search/repositories?q=\(query)&sort=stars"

diff --git a/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-01-code-0007.swift b/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-01-code-0007.swift
@@ -2,15 +2,17 @@ import ComposableArchitecture
 import Entity
 import Foundation
 
-public struct RepositoryList: Reducer {
+@Reducer
+public struct RepositoryList {
+  @ObservableState
   public struct State: Equatable {
     var repositories: [Repository] = []
     var isLoading: Bool = false
 
     public init() {}
   }
 
-  public enum Action: Equatable {
+  public enum Action {
     case onAppear
     case searchRepositoriesResponse(TaskResult<[Repository]>)
   }
@@ -25,7 +27,7 @@ public struct RepositoryList: Reducer {
         return .run { send in
           await send(
             .searchRepositoriesResponse(
-              TaskResult {
+              Result {
                 let query = "composable"
                 let url = URL(
                   string: "https://api.github.com/search/repositories?q=\(query)&sort=stars"

diff --git a/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-02-code-0003.swift b/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-02-code-0003.swift
@@ -5,14 +5,20 @@ import SwiftUI
 
 public struct RepositoryListView: View {
   let store: StoreOf<RepositoryList>
-  
+
   public init(store: StoreOf<RepositoryList>) {
     self.store = store
   }
-  
+
   public var body: some View {
-    WithViewStore(store, observe: { $0 }) { viewStore in
-
+    Group {
+      if store.isLoading {
+        ProgressView()
+      } else {
+      }
+    }
+    .onAppear {
+      store.send(.onAppear)
     }
   }
 }
diff --git a/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-02-code-0004.swift b/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-02-code-0004.swift
@@ -5,22 +5,58 @@ import SwiftUI
 
 public struct RepositoryListView: View {
   let store: StoreOf<RepositoryList>
-  
+
   public init(store: StoreOf<RepositoryList>) {
     self.store = store
   }
-  
+
   public var body: some View {
-    WithViewStore(store, observe: { $0 }) { viewStore in
-      Group {
-        if viewStore.isLoading {
-          ProgressView()
-        } else {
+    Group {
+      if store.isLoading {
+        ProgressView()
+      } else {
+        List {
+          ForEach(store.repositories, id: \.id) { repository in
+            Button {
+            } label: {
+              VStack(alignment: .leading, spacing: 8) {
+                Text(repository.fullName)
+                  .font(.title2.bold())
+                Text(repository.description ?? "")
+                  .font(.body)
+                  .lineLimit(2)
+                HStack(alignment: .center, spacing: 32) {
+                  Label(
+                    title: {
+                      Text("\(repository.stargazersCount)")
+                        .font(.callout)
+                    },
+                    icon: {
+                      Image(systemName: "star.fill")
+                        .foregroundStyle(.yellow)
+                    }
+                  )
+                  Label(
+                    title: {
+                      Text(repository.language ?? "")
+                        .font(.callout)
+                    },
+                    icon: {
+                      Image(systemName: "text.word.spacing")
+                        .foregroundStyle(.gray)
+                    }
+                  )
+                }
+              }
+              .frame(maxWidth: .infinity, alignment: .leading)
+            }
+            .buttonStyle(.plain)
+          }
         }
       }
-      .onAppear {
-        viewStore.send(.onAppear)
-      }
+    }
+    .onAppear {
+      store.send(.onAppear)
     }
   }
 }
diff --git a/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-02-code-0005.swift b/Sources/Docs/Documentation.docc/Resources/01-CreateViewWithTCA/01-02-code-0005.swift