Merge pull request #174 from makinosp/develop

Develop

Author: makinosp

Harmonie.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -6,6 +6,12 @@
 //
 
 enum IconSet {
+    static var at: some Iconizable {
+        Icon("at")
+    }
+    static var calendar: some Iconizable {
+        Icon("calendar")
+    }
     static var check: some Iconizable {
         Icon("checkmark")
     }
@@ -81,6 +87,9 @@ enum IconSet {
     static var social: some Iconizable {
         Icon("person.3.fill")
     }
+    static var stopwatch: some Iconizable {
+        Icon("stopwatch")
+    }
     static var unfriend: some Iconizable {
         Icon("person.fill.xmark")
     }

harmonie/Components/IconSet.swift

@@ -0,0 +1,12 @@
+//
+//  PresentationDetent+small.swift
+//  Harmonie
+//
+//  Created by makinosp on 2024/10/24.
+//
+
+import SwiftUI
+
+extension PresentationDetent {
+    static let small = Self.fraction(1/3)
+}

harmonie/Extensions/PresentationDetent+small.swift

@@ -31,3 +31,14 @@ extension SortType: CustomStringConvertible {
         }
     }
 }
+
+extension SortType {
+    var icon: Iconizable {
+        switch self {
+        case .latest, .oldest: IconSet.stopwatch
+        case .name: IconSet.at
+        case .loginLatest, .loginOldest: IconSet.calendar
+        case .status: IconSet.circleFilled
+        }
+    }
+}

harmonie/Models/SortType.swift

@@ -0,0 +1,78 @@
+//
+//  Friend.swift
+//  Harmonie
+//
+//  Created by makinosp on 2024/10/21.
+//
+
+import Foundation
+import VRCKit
+
+extension PreviewDataProvider {
+    typealias FriendSet = (friend: Friend, userDetail: UserDetail)
+
+    var onlineFriends: [Friend] {
+        friends.filter { $0.status != .offline }
+    }
+
+    var offlineFriends: [Friend] {
+        friends.filter { $0.status == .offline }
+    }
+
+    static func friend(id: UUID, location: Location, status: UserStatus) -> Friend {
+        Friend(id: id, location: location, status: status)
+    }
+
+    static var friend: Friend {
+        Friend(id: UUID(), location: .offline, status: .offline)
+    }
+
+    static func friendSet(
+        id: UUID,
+        location: Location,
+        status: UserStatus
+    ) -> FriendSet {
+        (
+            Friend(
+                id: id,
+                location: location,
+                status: status
+            ),
+            PreviewDataProvider.userDetail(
+                id: id,
+                location: location,
+                state: status == .offline ? .offline : .active,
+                status: status
+            )
+        )
+    }
+}
+
+private extension Friend {
+    init(
+        id: UUID,
+        displayName: String = PreviewString.Name.randomValue,
+        location: Location,
+        status: UserStatus
+    ) {
+        self.init(
+            bio: "Biography",
+            bioLinks: SafeDecodingArray(),
+            avatarImageUrl: PreviewDataProvider.iconImageUrl,
+            avatarThumbnailUrl: PreviewDataProvider.iconImageUrl,
+            displayName: displayName,
+            id: "usr_\(id.uuidString)",
+            isFriend: true,
+            lastLogin: Date(),
+            lastPlatform: "standalonewindows",
+            platform: .blank,
+            profilePicOverride: PreviewDataProvider.iconImageUrl,
+            status: status,
+            statusDescription: "",
+            tags: UserTags(),
+            userIcon: PreviewDataProvider.iconImageUrl,
+            location: location,
+            friendKey: ""
+        )
+    }
+}

harmonie/Previews/Friend.swift

@@ -0,0 +1,43 @@
+//
+//  Instance.swift
+//  Harmonie
+//
+//  Created by makinosp on 2024/10/21.
+//
+
+import Foundation
+import VRCKit
+
+extension PreviewDataProvider {
+    static func instance(worldId: UUID, instanceId: Int) -> Instance {
+        Instance(worldId: worldId, instanceId: instanceId)
+    }
+
+    static func instance() -> Instance {
+        Instance(worldId: UUID(), instanceId: 0)
+    }
+}
+
+private extension Instance {
+    init(worldId: UUID, instanceId: Int) {
+        self.init(
+            active: true,
+            capacity: 32,
+            full: false,
+            groupAccessType: nil,
+            id: "wrld_\(worldId):\(instanceId)",
+            instanceId: instanceId.description,
+            location: .id("wrld_\(worldId.uuidString)"),
+            name: "DummyInstance_\(instanceId)",
+            ownerId: "usr_\(UUID().uuidString)",
+            permanent: false,
+            platforms: Platforms(),
+            recommendedCapacity: 32,
+            region: Region.allCases.randomElement() ?? .us,
+            tags: [],
+            type: [.public, .friends].randomElement() ?? .public,
+            userCount: 0,
+            world: PreviewDataProvider.generateWorld(worldId: worldId)
+        )
+    }
+}

harmonie/Previews/Instance.swift

@@ -45,7 +45,7 @@ extension PreviewContainer where Content: View {
     }
 
     init(@ViewBuilder content: (_ user: UserDetail) -> Content) {
-        let userDetail = PreviewDataProvider.generateUserDetail(
+        let userDetail = PreviewDataProvider.userDetail(
             id: UUID(),
             location: .private,
             state: .active,