"Event" -> "Activity" (#221)

Author: Daggerpov

Spawn-App-iOS-SwiftUI/Assets.xcassets/EventNotFound.imageset/EventNotFound.png renamed to Spawn-App-iOS-SwiftUI/Assets.xcassets/ActivityNotFound.imageset/ActivityNotFound.png

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "EventNotFound.png",
+      "filename" : "ActivityNotFound.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "EventNotFound2.png",
+      "filename" : "ActivityNotFound2.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "EventNotFound3.png",
+      "filename" : "ActivityNotFound3.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Spawn-App-iOS-SwiftUI/Assets.xcassets/EventNotFound.imageset/EventNotFound2.png renamed to Spawn-App-iOS-SwiftUI/Assets.xcassets/ActivityNotFound.imageset/ActivityNotFound2.png

@@ -9,7 +9,7 @@ import SwiftUI
 
 struct ContentView: View {
     var user: BaseUserDTO
-    @State private var showEventCreationDrawer: Bool = false
+    @State private var showActivityCreationDrawer: Bool = false
     @State private var selectedTab: Int = 0
 
     var body: some View {
@@ -74,7 +74,7 @@ struct ContentView: View {
                         let previousTab = selectedTab
                         // Return to previous tab (but avoid returning to the create tab itself)
                         selectedTab = previousTab == 2 ? 0 : previousTab
-                        showEventCreationDrawer = true
+                        showActivityCreationDrawer = true
                     }
                 }
             }
@@ -87,11 +87,11 @@ struct ContentView: View {
                 UITabBar.appearance().unselectedItemTintColor = UIColor.black
             }
         }
-        .sheet(isPresented: $showEventCreationDrawer) {
-            EventCreationView(
+        .sheet(isPresented: $showActivityCreationDrawer) {
+            ActivityCreationView(
                 creatingUser: user,
                 closeCallback: {
-                    showEventCreationDrawer = false
+                    showActivityCreationDrawer = false
                 }
             )
             .presentationDragIndicator(.visible)

Spawn-App-iOS-SwiftUI/Assets.xcassets/EventNotFound.imageset/EventNotFound3.png renamed to Spawn-App-iOS-SwiftUI/Assets.xcassets/ActivityNotFound.imageset/ActivityNotFound3.png

@@ -7,6 +7,6 @@ extension Notification.Name {
     // Notification sent when user logs out
     static let userDidLogout = Notification.Name("userDidLogout")
 
-    // Notification for event creation
-    static let eventCreated = Notification.Name("eventCreated")
+    // Notification for activity creation
+    static let activityCreated = Notification.Name("activityCreated")
 }

Spawn-App-iOS-SwiftUI/Assets.xcassets/EventNotFound.imageset/Contents.json renamed to Spawn-App-iOS-SwiftUI/Assets.xcassets/ActivityNotFound.imageset/Contents.json

@@ -1,29 +1,30 @@
 //
-//  Event.swift
+//  Activity.swift
 //  Spawn-App-iOS-SwiftUI
 //
 //  Created by Daniel Agapov on 11/4/24.
 //
 
 import Foundation
 
-class Event: Identifiable, Codable {
+class Activity: Identifiable, Codable {
 	var id: UUID
 	var title: String?
 
 	// MARK: Info
 	var startTime: Date?
 	var endTime: Date?
 	var location: Location?
-	var note: String?  // this corresponds to Figma design "my place at 10? I'm cooking guys" note in event
+	var note: String?  // this corresponds to Figma design "my place at 10? I'm cooking guys" note in activity
+	var createdAt: Date?
 
 	// MARK: Relations
 	var creatorUser: UserDTO?
 
-	// tech note: I'll be able to check if current user is in an event's partipants to determine which symbol to show in feed
+	// tech note: I'll be able to check if current user is in an activity's partipants to determine which symbol to show in feed
 	var participantUsers: [UserDTO]?
 	var invitedUsers: [UserDTO]?
-	var chatMessages: [FullEventChatMessageDTO]?
+	var chatMessages: [FullActivityChatMessageDTO]?
 	var participationStatus: ParticipationStatus?
 
 	init(
@@ -36,8 +37,9 @@ class Event: Identifiable, Codable {
 		creatorUser: UserDTO? = UserDTO.danielAgapov,
 		participantUsers: [UserDTO]? = nil,
 		invitedUsers: [UserDTO]? = nil,
-		chatMessages: [FullEventChatMessageDTO]? = nil,
-		participationStatus: ParticipationStatus? = nil
+		chatMessages: [FullActivityChatMessageDTO]? = nil,
+		participationStatus: ParticipationStatus? = nil,
+		createdAt: Date? = nil
 	) {
 		self.id = id
 		self.title = title
@@ -50,10 +52,11 @@ class Event: Identifiable, Codable {
 		self.invitedUsers = invitedUsers
 		self.chatMessages = chatMessages
 		self.participationStatus = participationStatus
+		self.createdAt = createdAt
 	}
 }
 
-extension Event {
+extension Activity {
 
 	static func dateFromTimeString(_ timeString: String) -> Date? {
 		let dateFormatter = DateFormatter()
@@ -74,7 +77,7 @@ extension Event {
 		return nil
 	}
 
-	static let mockDinnerEvent: Event = Event(
+	static let mockDinnerActivity: Activity = Activity(
 		id: UUID(),
 		title: "Dinner time!!!!!!",
 		startTime: dateFromTimeString("10:00 PM"),
@@ -92,9 +95,9 @@ extension Event {
 		]
 	)
 
-	static let mockEvents: [Event] = [
-		mockDinnerEvent,
-		Event(
+	static let mockActivities: [Activity] = [
+		mockDinnerActivity,
+		Activity(
 			id: UUID(),
 			title: "wanna run 5k with me?",
 			startTime: Date(),
@@ -107,23 +110,23 @@ extension Event {
 				UserDTO.danielLee,
 			],
 			chatMessages: [
-				FullEventChatMessageDTO(
+				FullActivityChatMessageDTO(
 					id: UUID(),
 					content: "yo guys, wya?",
 					timestamp: Date().addingTimeInterval(-30),  // 30 seconds ago
 					senderUser: BaseUserDTO.danielAgapov,
-					eventId: mockDinnerEvent.id
+					activityId: mockDinnerActivity.id
 				),
-				FullEventChatMessageDTO(
+				FullActivityChatMessageDTO(
 					id: UUID(),
 					content: "I just saw you",
 					timestamp: Date().addingTimeInterval(-120),  // 2 minutes ago
 					senderUser: BaseUserDTO.danielLee,
-					eventId: mockDinnerEvent.id
+					activityId: mockDinnerActivity.id
 				),
 			]
 		),
-		Event(
+		Activity(
 			id: UUID(),
 			title: "playing basketball!!!",
 			endTime: Date(),
@@ -133,7 +136,7 @@ extension Event {
 			note: "let's play basketball!",
 			creatorUser: UserDTO.danielAgapov
 		),
-		Event(
+		Activity(
 			id: UUID(),
 			title: "Im painting rn lol",
 			startTime: Date(),
@@ -144,7 +147,7 @@ extension Event {
 			creatorUser: UserDTO.shannon,
 			participantUsers: [UserDTO.danielLee]
 		),
-		Event(
+		Activity(
 			id: UUID(),
 			title: "Grabbing Udon",
 			startTime: Date(),
@@ -154,7 +157,7 @@ extension Event {
 				longitude: -123.11026665974741),
 			creatorUser: UserDTO.danielAgapov
 		),
-		Event(
+		Activity(
 			id: UUID(),
 			title: "Calendar Party",
 			startTime: Date(),
@@ -164,7 +167,7 @@ extension Event {
 				longitude: -123.25036565366581),
 			creatorUser: UserDTO.danielLee
 		),
-		Event(
+		Activity(
 			id: UUID(),
 			title: "Gym - Leg Day",
 			startTime: Date(),
@@ -175,4 +178,4 @@ extension Event {
 			creatorUser: UserDTO.michael
 		),
 	]
-}
+} 

Spawn-App-iOS-SwiftUI/ContentView.swift

@@ -1,14 +1,14 @@
 //
-//  EventCreationDTO.swift
+//  ActivityCreationDTO.swift
 //  Spawn-App-iOS-SwiftUI
 //
 //  Created by Daniel Agapov on 2025-02-04.
 //
 
 import Foundation
 
-// Should match `EventCreationDTO`, as written in back-end:
-class EventCreationDTO: Identifiable, Codable {
+// Should match `ActivityCreationDTO`, as written in back-end:
+class ActivityCreationDTO: Identifiable, Codable {
 	var id: UUID
 	var title: String?
 
@@ -21,8 +21,7 @@ class EventCreationDTO: Identifiable, Codable {
 	   This is the literal emoji character, not a shortcode or description.
 	   It's rendered directly in the UI and stored as a single UTF-8 string in the database. */
 	var icon: String?
-	var category: EventCategory = .general
-	var createdAt: Date?
+	var category: ActivityCategory = .general
 
 	// MARK: Relations
 	var creatorUserId: UUID
@@ -36,10 +35,9 @@ class EventCreationDTO: Identifiable, Codable {
 		location: Location? = nil,
 		note: String? = nil,
 		icon: String? = nil,
-		category: EventCategory = .general,
+		category: ActivityCategory = .general,
 		creatorUserId: UUID,
-		invitedFriendUserIds: [UUID]? = nil,
-		createdAt: Date? = nil
+		invitedFriendUserIds: [UUID]? = nil
 	) {
 		self.id = id
 		self.title = title
@@ -51,6 +49,5 @@ class EventCreationDTO: Identifiable, Codable {
 		self.category = category
 		self.creatorUserId = creatorUserId
 		self.invitedFriendUserIds = invitedFriendUserIds
-		self.createdAt = createdAt
 	}
-}
+} 

Spawn-App-iOS-SwiftUI/Extensions/NotificationNameExtensions.swift

@@ -1,16 +1,14 @@
 //
-//  FullFeedEventDTO.swift
+//  FullFeedActivityDTO.swift
 //  Spawn-App-iOS-SwiftUI
 //
 //  Created by Daniel Agapov on 2025-02-27.
 //
 
-/// updated to match back-end's `FullFeedEventDTO`, after Shane's PR here: https://github.com/Daggerpov/Spawn-App-Back-End/pull/222/files
-
 import Foundation
 
-class FullFeedEventDTO: Identifiable, Codable, Equatable {
-	static func == (lhs: FullFeedEventDTO, rhs: FullFeedEventDTO) -> Bool {
+class FullFeedActivityDTO: Identifiable, Codable, Equatable {
+	static func == (lhs: FullFeedActivityDTO, rhs: FullFeedActivityDTO) -> Bool {
 		return lhs.id == rhs.id
 	}
 
@@ -21,21 +19,21 @@ class FullFeedEventDTO: Identifiable, Codable, Equatable {
 	var startTime: Date?
 	var endTime: Date?
 	var location: Location?
-	var note: String?  // this corresponds to Figma design "my place at 10? I'm cooking guys" note in event
+	var note: String?  // this corresponds to Figma design "my place at 10? I'm cooking guys" note in activity
 	/* The icon is stored as a Unicode emoji character string (e.g. "⭐️", "🎉", "🏀").
 	   This is the literal emoji character, not a shortcode or description.
 	   It's rendered directly in the UI and stored as a single UTF-8 string in the database. */
 	var icon: String?
-	var category: EventCategory = .general
+	var category: ActivityCategory = .general
 	var createdAt: Date?
 
 	// MARK: Relations
 	var creatorUser: BaseUserDTO
 
-	// tech note: I'll be able to check if current user is in an event's partipants to determine which symbol to show in feed
+	// tech note: I'll be able to check if current user is in an activity's partipants to determine which symbol to show in feed
 	var participantUsers: [BaseUserDTO]?
 	var invitedUsers: [BaseUserDTO]?
-	var chatMessages: [FullEventChatMessageDTO]?
+	var chatMessages: [FullActivityChatMessageDTO]?
 	var participationStatus: ParticipationStatus?
 	var isSelfOwned: Bool?
 
@@ -47,11 +45,11 @@ class FullFeedEventDTO: Identifiable, Codable, Equatable {
 		location: Location? = nil,
 		note: String? = nil,
 		icon: String? = nil,
-		category: EventCategory = .general,
+		category: ActivityCategory = .general,
 		creatorUser: BaseUserDTO,
 		participantUsers: [BaseUserDTO]? = nil,
 		invitedUsers: [BaseUserDTO]? = nil,
-		chatMessages: [FullEventChatMessageDTO]? = nil,
+		chatMessages: [FullActivityChatMessageDTO]? = nil,
 		participationStatus: ParticipationStatus? = nil,
 		isSelfOwned: Bool? = nil,
 		createdAt: Date? = nil
@@ -74,7 +72,7 @@ class FullFeedEventDTO: Identifiable, Codable, Equatable {
 	}
 }
 
-extension FullFeedEventDTO {
+extension FullFeedActivityDTO {
 
 	static func dateFromTimeString(_ timeString: String) -> Date? {
 		let dateFormatter = DateFormatter()
@@ -95,7 +93,7 @@ extension FullFeedEventDTO {
 		return nil
 	}
 
-	static let mockDinnerEvent: FullFeedEventDTO = FullFeedEventDTO(
+	static let mockDinnerActivity: FullFeedActivityDTO = FullFeedActivityDTO(
 		id: UUID(),
 		title: "Dinner time!!!!!!",
 		startTime: dateFromTimeString("10:00 PM"),
@@ -112,7 +110,7 @@ extension FullFeedEventDTO {
 			BaseUserDTO.michael,
 		]
 	)
-    static let mockSelfOwnedEvent: FullFeedEventDTO = FullFeedEventDTO(
+    static let mockSelfOwnedActivity: FullFeedActivityDTO = FullFeedActivityDTO(
         id: UUID(),
         title: "Dinner time!!!!!!",
         startTime: dateFromTimeString("10:00 PM"),
@@ -130,7 +128,7 @@ extension FullFeedEventDTO {
         ],
         isSelfOwned: true
     )
-    static let mockSelfOwnedEvent2: FullFeedEventDTO = FullFeedEventDTO(
+    static let mockSelfOwnedActivity2: FullFeedActivityDTO = FullFeedActivityDTO(
         id: UUID(),
         title: "Dinner time!!!!!!",
         startTime: dateFromTimeString("10:00 PM"),
@@ -143,4 +141,4 @@ extension FullFeedEventDTO {
         participantUsers: [],
         isSelfOwned: true
     )
-}
+}