Merge pull request #101 from makinosp/develop

Develop

Author: makinosp

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

@@ -40,10 +40,12 @@ struct LocationCardView: View {
         }
         .frame(minHeight: 120)
         .task {
-            do {
-                instance = try await service.fetchInstance(location: location.location)
-            } catch {
-                appVM.handleError(error)
+            if case let .id(id) = location.location {
+                do {
+                    instance = try await service.fetchInstance(location: id)
+                } catch {
+                    appVM.handleError(error)
+                }
             }
         }
     }

harmonie/Views/Location/LocationCardView.swift

@@ -8,12 +8,14 @@
 import VRCKit
 
 extension UserDetailView {
-    func fetchInstance() async {
+    func fetchInstance(id: String) async {
         let service = appVM.isDemoMode
         ? InstancePreviewService(client: appVM.client)
         : InstanceService(client: appVM.client)
         do {
-            instance = try await service.fetchInstance(location: user.location)
+            defer { isRequesting = false }
+            isRequesting = true
+            instance = try await service.fetchInstance(location: id)
         } catch {
             appVM.handleError(error)
         }

harmonie/Views/UserDetail/UserDetailView+Actions.swift

@@ -13,24 +13,40 @@ extension UserDetailView {
     var locationDescription: String {
         if let instance = instance {
             instance.world.name
-        } else if !user.isVisible {
-            user.location.capitalized
+        } else if user.location == .offline {
+            "Offline"
+        } else if user.location == .private {
+            "Private World"
         } else if isRequesting {
             String(repeating: " ", count: 15)
         } else {
             ""
         }
     }
 
+    var locationImageUrl: URL? {
+        if user.isVisible {
+            return instance?.imageUrl(.x256)
+        }
+        return switch user.location {
+        case .offline:
+            Const.offlineImageUrl
+        case .private, .traveling:
+            Const.privateWorldImageUrl
+        default:
+            nil
+        }
+    }
+
     var locationSection: some View {
         SectionView {
             Text("Location")
                 .font(.subheadline)
                 .foregroundStyle(Color.gray)
             HStack {
-                SquareURLImage(url: instance?.world.imageUrl(.x256))
+                SquareURLImage(url: locationImageUrl)
                 Text(locationDescription)
-                    .font(.body)
+                    .font(.headline)
             }
             .redacted(reason: isRequesting ? .placeholder : [])
         }

harmonie/Views/UserDetail/UserDetailView+LocationSection.swift

@@ -38,11 +38,9 @@ struct UserDetailView: View {
         .navigationBarTitleDisplayMode(.inline)
         .toolbar { toolbar }
         .task {
-            isRequesting = true
-            if user.isVisible {
-                await fetchInstance()
+            if case let .id(id) = user.location {
+                await fetchInstance(id: id)
             }
-            isRequesting = false
         }
     }