adds categories view, fixes blinking on categoriesAdmin, adds ScheduleListItem view, adds a bunch of Widgets

Author: loloop

app/LandinhoLib/Sources/Categories/Categories.swift

@@ -5,40 +5,77 @@
 //  Created by Mauricio Cardozo on 12/11/23.
 //
 
+import APIClient
+import Common
 import Foundation
 import ComposableArchitecture
 import SwiftUI
 
+// TODO: On tap of a category, @PresentationState present a ScheduleList
+
 public struct Categories: Reducer {
   public init() {}
 
   public struct State: Equatable {
     public init() {}
+
+    public var categoriesState = APIClient<[RaceCategory]>.State(endpoint: "category")
   }
 
   public enum Action: Equatable {
     case onAppear
+    case categoriesRequest(APIClient<[RaceCategory]>.Action)
   }
 
   public var body: some ReducerOf<Self> {
     Reduce { state, action in
       switch action {
       case .onAppear:
-        #warning("TODO call API")
+        return .none
+      case .categoriesRequest:
         return .none
       }
     }
+
+    Scope(state: \.categoriesState, action: /Action.categoriesRequest) {
+      APIClient()
+    }
   }
 }
 
-
 public struct CategoriesView: View {
-  public init() {}
+  public init(store: StoreOf<Categories>) {
+    self.store = store
+  }
+
+  let store: StoreOf<Categories>
+
   public var body: some View {
-    VStack {
-      Text("Placeholder for category list")
+    WithViewStore(store, observe: { $0 }) { viewStore in
+      switch viewStore.categoriesState.response {
+      case .idle:
+        Text("Idle")
+      case .loading:
+        ProgressView()
+      case .reloading(let categories), .finished(.success(let categories)):
+        List(categories) { category in
+          HStack {
+            VStack(alignment: .leading) {
+              Text(category.title)
+                .font(.headline)
+              // TODO: Request next race for a given category and display it here
+              Text("We should show what's the next race here, and its time")
+                .font(.caption)
+            }
+            Spacer()
+            // TODO: Add a way to favorite categories
+            Image(systemName: "heart")
+          }
+        }
+      case .finished(.failure(let error)):
+        APIErrorView(error: error)
+      }
     }
-    .padding()
   }
 }
 

app/LandinhoLib/Sources/CategoriesAdmin/Views/CategoriesAdminView.swift

@@ -20,7 +20,13 @@ public struct CategoriesAdminView: View {
   public var body: some View {
     WithViewStore(store, observe: { $0 }) { viewStore in
       switch viewStore.categoryList.response {
-      case .idle, .loading, .reloading:
+      case .idle:
+        Color(.systemBackground)
+          .opacity(0.01)
+          .onAppear {
+            store.send(.onAppear)
+          }
+      case .loading, .reloading:
         ProgressView()
       case .finished(.failure(let error)):
         APIErrorView(error: error)
@@ -57,9 +63,6 @@ public struct CategoriesAdminView: View {
     }
     .navigationTitle("Categories")
     .navigationBarTitleDisplayMode(.large)
-    .onAppear {
-      store.send(.onAppear)
-    }
     .toolbar {
       ToolbarItem {
         Button(action: {

app/LandinhoLib/Sources/Common/Race.swift

@@ -8,6 +8,12 @@
 import Foundation
 
 public struct Race: Codable, Equatable, Identifiable, Hashable {
+  public init(id: UUID, title: String, events: [RaceEvent]) {
+    self.id = id
+    self.title = title
+    self.events = events
+  }
+
   public let id: UUID
   public let title: String
   public let events: [RaceEvent]

app/LandinhoLib/Sources/Common/RaceEvent.swift

@@ -8,6 +8,12 @@
 import Foundation
 
 public struct RaceEvent: Codable, Equatable, Identifiable, Hashable {
+  public init(id: UUID, title: String, date: Date) {
+    self.id = id
+    self.title = title
+    self.date = date
+  }
+  
   public let id: UUID
   public let title: String
   public let date: Date

app/LandinhoLib/Sources/ScheduleList/ScheduleList.swift

@@ -22,13 +22,13 @@ public struct ScheduleList: Reducer {
 
     let categoryTag: String?
 
-    var racesState = APIClient<Race>.State(endpoint: "next-race")
+    public var racesState = APIClient<ScheduleListResponse>.State(endpoint: "next-race")
   }
 
   public enum Action: Equatable {
     case onAppear
 
-    case racesRequest(APIClient<Race>.Action)
+    case racesRequest(APIClient<ScheduleListResponse>.Action)
   }
 
   public var body: some ReducerOf<Self> {
@@ -45,6 +45,16 @@ public struct ScheduleList: Reducer {
       APIClient()
     }
   }
+
+  public struct ScheduleListResponse: Codable, Equatable {
+    public init(categoryComment: String, nextRace: Race) {
+      self.categoryComment = categoryComment
+      self.nextRace = nextRace
+    }
+    
+    public let categoryComment: String
+    public let nextRace: Race
+  }
 }
 
 public struct ScheduleListView: View {
@@ -56,18 +66,17 @@ public struct ScheduleListView: View {
 
   public var body: some View {
     WithViewStore(store, observe: { $0 }) { viewStore in
-      ScrollView {
-        VStack {
-          switch viewStore.racesState.response {
-          case .idle:
-            Text("idle")
-          case .loading:
-            Text("loading")
-          case .reloading(let race), .finished(.success(let race)):
-            Text("finished or reloading - \(race.title)")
-          case .finished(.failure(let error)):
-            APIErrorView(error: error)
-          }
+      List {
+        switch viewStore.racesState.response {
+        case .idle:
+          EmptyView()
+        case .loading:
+          ProgressView()
+        case .reloading(let response), .finished(.success(let response)):
+          ScheduleListItem(response)
+            .padding(.vertical)
+        case .finished(.failure(let error)):
+          APIErrorView(error: error)
         }
       }
     }
@@ -77,3 +86,41 @@ public struct ScheduleListView: View {
   }
 }
 
+// TODO: This should not take in an 'internal' model
+public struct ScheduleListItem: View {
+  public init(_ response: ScheduleList.ScheduleListResponse) {
+    self.response = response
+  }
+
+  let response: ScheduleList.ScheduleListResponse
+
+  public var body: some View {
+    VStack(alignment: .leading) {
+      Text("Category title")
+        .font(.callout)
+
+      Text(response.nextRace.title)
+        .font(.title3)
+
+      HStack {
+        RoundedRectangle(cornerRadius: 25.0, style: .continuous)
+          .frame(maxWidth: 100)
+
+        Spacer()
+        VStack(alignment: .leading) {
+
+
+          ForEach(response.nextRace.events) { event in
+            HStack {
+              Text(event.title)
+              Text(event.date.formatted())
+            }
+            .font(.caption)
+          }
+        }
+      }
+    }
+  }
+}
+
+

app/LandinhoLib/Sources/Settings/Settings.swift

@@ -10,6 +10,8 @@ import Foundation
 import ComposableArchitecture
 import SwiftUI
 
+
+
 public struct Settings: Reducer {
   public init() {}
 
@@ -45,6 +47,7 @@ public struct SettingsView: View {
   let store: StoreOf<Settings>
 
   public var body: some View {
+    // TODO: Create an actual settings view instead of just encapsulating Admin
     AdminView(store: store.scope(
       state: \.adminState,
       action: Settings.Action.admin)

app/VroomVroom copy-Info.plist

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>