feat: improvement preview data

Author: makinosp

harmonie/Previews/Models/Friend.swift

@@ -28,8 +28,36 @@ extension PreviewData {
 }
 
 extension PreviewData.FriendSet {
+    /// Initialize from world information
     init(
-        id: UUID,
+        id: UUID = UUID(),
+        profile: PreviewData.Profile? = PreviewData.Profile.random,
+        world: World,
+        status: UserStatus
+    ) {
+        let location: Location = .id(PreviewData.instanceId(world))
+        self.init(
+            friend: Friend(
+                id: id,
+                profile: profile,
+                location: location,
+                status: status
+            ),
+            userDetail: PreviewData.userDetail(
+                id: id,
+                profile: profile,
+                location: location,
+                state: status == .offline ? .offline : .active,
+                status: status
+            )
+        )
+    }
+}
+
+extension PreviewData.FriendSet {
+    /// Initialize from world information
+    init(
+        id: UUID = UUID(),
         profile: PreviewData.Profile? = PreviewData.Profile.random,
         location: Location,
         status: UserStatus

harmonie/Previews/Models/Instance.swift

@@ -13,19 +13,28 @@ extension PreviewData {
         Instance(world: bar)
     }
 
-    static func instance() -> Instance {
+    static var instance: Instance {
         Instance(world: bar)
     }
 
-    static let instance1 = Instance(world: bar)
-    static let instance2 = Instance(world: casino)
+    static func instanceId(_ world: World) -> Instance.ID {
+        "\(world.id):0"
+    }
+
+    static let instanceMap: [Instance.ID: Instance] = [
+        instanceId(bar): Instance(world: bar, userCount: 25),
+        instanceId(casino): Instance(world: casino, userCount: 25),
+        instanceId(fuji): Instance(world: fuji, userCount: 25),
+        instanceId(chinatown): Instance(world: chinatown, userCount: 25),
+        instanceId(nightCity): Instance(world: nightCity, userCount: 25),
+    ]
 }
 
 private extension Instance {
-    init(world: World, instanceId: Int = 0) {
+    init(world: World, instanceId: Int = 0, capacity: Int = 32, userCount: Int = 0) {
         self.init(
             active: true,
-            capacity: 32,
+            capacity: capacity,
             full: false,
             groupAccessType: nil,
             id: "\(world.id):\(instanceId)",
@@ -35,11 +44,11 @@ private extension Instance {
             ownerId: "usr_\(UUID().uuidString)",
             permanent: false,
             platforms: Platforms(),
-            recommendedCapacity: 32,
+            recommendedCapacity: capacity,
             region: Region.allCases.randomElement() ?? .us,
             tags: [],
             type: [.public, .friends].randomElement() ?? .public,
-            userCount: 0,
+            userCount: userCount,
             world: world
         )
     }

harmonie/Previews/PreviewData.swift

@@ -18,28 +18,17 @@ final class PreviewData: Sendable {
     static let iconImageUrl = URL(string: "\(imageBaseURL)/44/8f/IQToHkKa_o.jpg")
 
     private init() {
-        let onlineFriendsSet: [FriendSet] = (0..<50).map { count in
-            let id = UUID()
-            return switch count {
-            case ..<5:
-                FriendSet(id: id, location: .id(Self.instance1.id), status: .active)
-            case ..<10:
-                FriendSet(id: id, location: .id(Self.instance2.id), status: .active)
-            case ..<15:
-                FriendSet(id: id, location: .id(Self.instance2.id), status: .joinMe)
-            case ..<20:
-                FriendSet(id: id, location: .private, status: .askMe)
-            case ..<25:
-                FriendSet(id: id, location: .id(Self.instance1.id), status: .joinMe)
-            case ..<30:
-                FriendSet(id: id, location: .private, status: .busy)
-            default:
-                FriendSet(id: id, location: .offline, status: .offline)
-            }
-        }
+        let onlineFriendsSet: [FriendSet] = [
+            (0..<10).map { _ in FriendSet(world: Self.bar, status: .joinMe) },
+            (0..<5).map { _ in FriendSet(world: Self.casino, status: .active) },
+            (0..<3).map { _ in FriendSet(world: Self.fuji, status: .joinMe) },
+            (0..<2).map { _ in FriendSet(world: Self.chinatown, status: .active) },
+            [FriendSet(world: Self.nightCity, status: .joinMe)],
+            (0..<25).map { _ in FriendSet(location: .private, status: .busy) }
+        ].flatMap { $0 }
 
         var userDetails = onlineFriendsSet.map(\.userDetail)
-        userDetails.append(PreviewData.userDetail(id: previewUserId, instance: Self.instance1))
+        userDetails.append(PreviewData.userDetail(id: previewUserId, instance: Self.instance))
 
         self.userDetails = userDetails
         self.friends = onlineFriendsSet.map(\.friend)

harmonie/Previews/Services/InstancePreviewService.swift

@@ -13,24 +13,10 @@ final actor InstancePreviewService: APIService, InstanceServiceProtocol {
     let client: APIClient
 
     func fetchInstance(location: String) async throws -> Instance {
-        switch location {
-        case PreviewData.instance1.id:
-            PreviewData.instance1
-        case PreviewData.instance2.id:
-            PreviewData.instance2
-        default:
-            PreviewData.instance1
-        }
+        PreviewData.instanceMap[location] ?? PreviewData.instance
     }
 
     func fetchInstance(worldId: String, instanceId: String) async throws -> Instance {
-        switch instanceId {
-        case PreviewData.instance1.instanceId:
-            PreviewData.instance1
-        case PreviewData.instance2.instanceId:
-            PreviewData.instance2
-        default:
-            PreviewData.instance1
-        }
+        PreviewData.instanceMap["\(worldId):\(instanceId)"] ?? PreviewData.instance
     }
 }

harmonie/Views/Location/LocationCardView.swift

@@ -21,7 +21,7 @@ struct LocationCardView: View {
         if isFailure {
             EmptyView()
         } else {
-            locationCardContent(instance: instance ?? PreviewData.instance())
+            locationCardContent(instance: instance ?? PreviewData.instance)
                 .redacted(reason: isRequesting ? .placeholder : [])
                 .task {
                     if case let .id(id) = location.location {