Merge pull request #185 from makinosp/develop

Develop

Author: makinosp

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

@@ -72,6 +72,9 @@ enum IconSet {
     static var logout: some Iconizable {
         Icon("rectangle.portrait.and.arrow.forward")
     }
+    static var platform: some Iconizable {
+        Icon("square.stack.3d.up")
+    }
     static var plusCircleFilled: some Iconizable {
         Icon("plus.circle.fill")
     }

harmonie/Components/IconSet.swift

@@ -0,0 +1,25 @@
+//
+//  Favorite.swift
+//  Harmonie
+//
+//  Created by makinosp on 2024/11/04.
+//
+
+import Foundation
+import VRCKit
+
+extension PreviewData {
+    static let favoriteGroups = FavoriteType.allCases.flatMap { type in
+        (1...3).map { number in
+            FavoriteGroup(
+                id: "fvgrp_\(UUID().uuidString)",
+                displayName: "\(type.rawValue.capitalized) Group \(number)",
+                name: "group_\(number)",
+                ownerId: PreviewData.shared.previewUser.id,
+                tags: [],
+                type: type,
+                visibility: .private
+            )
+        }
+    }
+}

harmonie/Previews/Models/Favorite.swift

@@ -43,7 +43,7 @@ private extension Instance {
             name: world.name,
             ownerId: "usr_\(UUID().uuidString)",
             permanent: false,
-            platforms: Platforms(),
+            platforms: Platforms([.android, .standalonewindows]),
             recommendedCapacity: capacity,
             region: Region.allCases.randomElement() ?? .us,
             tags: [],

harmonie/Previews/Models/Instance.swift

@@ -18,11 +18,11 @@ final actor WorldPreviewService: APIService, WorldServiceProtocol {
     }
 
     func fetchFavoritedWorlds() async throws -> [FavoriteWorld] {
-        (0..<100).map { number in
+        [PreviewData.casino, PreviewData.nightCity, PreviewData.chinatown].map { world in
             FavoriteWorld(
-                world: PreviewData.casino,
+                world: world,
                 favoriteId: "fvrt_\(UUID())",
-                favoriteGroup: number.description
+                favoriteGroup: PreviewData.favoriteGroups[0].name
             )
         }
     }

harmonie/Previews/Services/WorldPreviewService.swift

@@ -36,20 +36,16 @@ struct WorldView: View {
     }
 
     private var topOverlay: some View {
-        Label {
-            Text(world.platform.description)
-        } icon: {
-            Image(systemName: "vision.pro.fill")
-        }
-        .font(.footnote.bold())
-        .padding(.horizontal, 12)
-        .padding(.vertical, 4)
-        .background(.thinMaterial)
-        .cornerRadius(8)
-        .foregroundStyle(.white)
-        .frame(maxWidth: .infinity, alignment: .trailing)
-        .padding(.vertical, 8)
-        .padding(.horizontal, 12)
+        Label(world.platform.description, systemImage: IconSet.platform.systemName)
+            .font(.footnote.bold())
+            .padding(.horizontal, 12)
+            .padding(.vertical, 4)
+            .background(.thinMaterial)
+            .cornerRadius(8)
+            .foregroundStyle(.white)
+            .frame(maxWidth: .infinity, alignment: .trailing)
+            .padding(.vertical, 8)
+            .padding(.horizontal, 12)
     }
 
     private var bottomOverlay: some View {