Merge pull request #102 from makinosp/develop

makinosp · web-flow · commit 4d844dc67f38 · 2024-09-08T13:34:58.000+09:00
Develop
diff --git a/Harmonie.xcodeproj/project.pbxproj b/Harmonie.xcodeproj/project.pbxproj
@@ -16,6 +16,7 @@
 		204709A52C7B47E100A56DF8 /* VRCKit in Frameworks */ = {isa = PBXBuildFile; productRef = 2096016C2C4BD30100D905AF /* VRCKit */; };
 		204709A62C7B47E100A56DF8 /* SwiftUIIntrospect in Frameworks */ = {isa = PBXBuildFile; productRef = 205D81A52C71B9D70047C1CC /* SwiftUIIntrospect */; };
 		20592B032C45640D00E1C8B8 /* AsyncSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 20592B022C45640D00E1C8B8 /* AsyncSwiftUI */; };
+		20593CD92C8D4A8000D1305B /* Shimmer in Frameworks */ = {isa = PBXBuildFile; productRef = 20593CD82C8D4A8000D1305B /* Shimmer */; };
 		206AC9012BFA07AA00E0D5AE /* AsyncSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 206AC9002BFA07AA00E0D5AE /* AsyncSwiftUI */; };
 		2094C4002C43BBC100F88986 /* VRCKit in Frameworks */ = {isa = PBXBuildFile; productRef = 2094C3FF2C43BBC100F88986 /* VRCKit */; };
 		20C7F8BB2C480E6800AC7A56 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 20C7F89E2C480E6800AC7A56 /* LICENSE */; };
@@ -78,6 +79,7 @@
 				20395DC22B945EEF00003921 /* VRCKit in Frameworks */,
 				2014A0B32C3832690019C638 /* VRCKit in Frameworks */,
 				20DC3C292C422786001101DB /* VRCKit in Frameworks */,
+				20593CD92C8D4A8000D1305B /* Shimmer in Frameworks */,
 				206AC9012BFA07AA00E0D5AE /* AsyncSwiftUI in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -151,6 +153,7 @@
 				2052C7AD2C4BC97100B341D1 /* VRCKit */,
 				2096016C2C4BD30100D905AF /* VRCKit */,
 				205D81A52C71B9D70047C1CC /* SwiftUIIntrospect */,
+				20593CD82C8D4A8000D1305B /* Shimmer */,
 			);
 			productName = harmonie;
 			productReference = 20395D912B945CD700003921 /* Harmonie.app */;
@@ -235,6 +238,7 @@
 				20592B012C45640D00E1C8B8 /* XCRemoteSwiftPackageReference "async-swift-ui" */,
 				2096016B2C4BD30100D905AF /* XCRemoteSwiftPackageReference "vrckit" */,
 				205D81A42C71B9D70047C1CC /* XCRemoteSwiftPackageReference "swiftui-introspect" */,
+				20593CD72C8D4A8000D1305B /* XCRemoteSwiftPackageReference "SwiftUI-Shimmer" */,
 			);
 			productRefGroup = 20395D922B945CD700003921 /* Products */;
 			projectDirPath = "";
@@ -635,6 +639,14 @@
 				kind = branch;
 			};
 		};
+		20593CD72C8D4A8000D1305B /* XCRemoteSwiftPackageReference "SwiftUI-Shimmer" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/markiv/SwiftUI-Shimmer";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.5.1;
+			};
+		};
 		205D81A42C71B9D70047C1CC /* XCRemoteSwiftPackageReference "swiftui-introspect" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/siteline/swiftui-introspect";
@@ -688,6 +700,11 @@
 			package = 20592B012C45640D00E1C8B8 /* XCRemoteSwiftPackageReference "async-swift-ui" */;
 			productName = AsyncSwiftUI;
 		};
+		20593CD82C8D4A8000D1305B /* Shimmer */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 20593CD72C8D4A8000D1305B /* XCRemoteSwiftPackageReference "SwiftUI-Shimmer" */;
+			productName = Shimmer;
+		};
 		205D81A52C71B9D70047C1CC /* SwiftUIIntrospect */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 205D81A42C71B9D70047C1CC /* XCRemoteSwiftPackageReference "swiftui-introspect" */;
diff --git a/Harmonie.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Harmonie.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/harmonie/Components/SquareURLImage.swift b/harmonie/Components/SquareURLImage.swift
@@ -6,6 +6,7 @@
 //
 
 import NukeUI
+import Shimmer
 import SwiftUI
 
 struct SquareURLImage: View {
@@ -25,7 +26,10 @@ struct SquareURLImage: View {
     }
 
     var placeholder: some View {
-        rect.fill(.gray).frame(width: frameWidth, height: frameWidth * 3/4)
+        rect
+            .frame(width: frameWidth, height: frameWidth * 3/4)
+            .redacted(reason: .placeholder)
+            .shimmering()
     }
 
     var body: some View {
@@ -40,11 +44,10 @@ struct SquareURLImage: View {
             } else {
                 placeholder
                     .onDisappear {
-                        isImageLoaded = true
+                        withAnimation { isImageLoaded = true }
                     }
             }
         }
         .frame(width: frameWidth, height: frameWidth * 3/4)
-        .redacted(reason: isImageLoaded ? [] : .placeholder)
     }
 }
diff --git a/harmonie/Utils/Constants.swift b/harmonie/Utils/Constants.swift
@@ -52,6 +52,9 @@ enum Constants {
         static var setting: some View {
             Image(systemName: "gear")
         }
+        static var shield: some View {
+            Image(systemName: "shield.fill")
+        }
         static var sort: some View {
             Image(systemName: "arrow.up.arrow.down")
         }
diff --git a/harmonie/ViewModels/FriendViewModel.swift b/harmonie/ViewModels/FriendViewModel.swift
@@ -12,11 +12,13 @@ import VRCKit
 class FriendViewModel {
     var onlineFriends: [Friend] = []
     var offlineFriends: [Friend] = []
+    var friendsLocations: [FriendsLocation] = []
     var filterUserStatus: Set<UserStatus> = []
     var filterFavoriteGroups: Set<FavoriteGroup> = []
     var filterText: String = ""
     var sortType: SortType = .default
     var sortOrder: SortOrder = .asc
+    var isRequesting = true
     @ObservationIgnored let user: User
     @ObservationIgnored private let service: any FriendServiceProtocol
 
@@ -33,10 +35,6 @@ class FriendViewModel {
         allFriends.first { $0.id == id }
     }
 
-    var friendsLocations: [FriendsLocation] {
-        service.friendsGroupedByLocation(onlineFriends)
-    }
-
     /// Returns a list of matches for either `onlineFriends` or `offlineFriends`
     /// for each id of reversed order friend list.
     /// - Returns a list of recentry friends
@@ -58,5 +56,6 @@ class FriendViewModel {
         )
         onlineFriends = try await onlineFriendsTask
         offlineFriends = try await offlineFriendsTask
+        friendsLocations = service.friendsGroupedByLocation(onlineFriends)
     }
 }
diff --git a/harmonie/Views/Location/LocationCardView.swift b/harmonie/Views/Location/LocationCardView.swift
@@ -6,13 +6,15 @@
 //
 
 import NukeUI
+import Shimmer
 import SwiftUI
 import VRCKit
 
 struct LocationCardView: View {
     @Environment(AppViewModel.self) private var appVM: AppViewModel
     @Binding var selected: InstanceLocation?
     @State private var instance: Instance?
+    @State private var isRequesting = true
     let service: any InstanceServiceProtocol
     let location: FriendsLocation
 
@@ -29,19 +31,22 @@ struct LocationCardView: View {
         ZStack {
             RoundedRectangle(cornerRadius: 16)
                 .foregroundStyle(backGroundColor)
-            if let instance = instance {
+            if isRequesting {
+                locationCardContent(instance: PreviewDataProvider.generateInstance())
+                    .redacted(reason: .placeholder)
+                    .shimmering()
+            } else if let instance = instance {
                 locationCardContent(instance: instance)
                     .onTapGesture {
                         selected = InstanceLocation(location: location, instance: instance)
                     }
-            } else {
-                ProgressView()
             }
         }
         .frame(minHeight: 120)
         .task {
             if case let .id(id) = location.location {
                 do {
+                    defer { withAnimation { isRequesting = false } }
                     instance = try await service.fetchInstance(location: id)
                 } catch {
                     appVM.handleError(error)
diff --git a/harmonie/Views/Location/LocationsView.swift b/harmonie/Views/Location/LocationsView.swift
@@ -70,7 +70,9 @@ struct LocationsView: View {
             .padding(.horizontal, 8)
         }
         .overlay {
-            if friendVM.friendsLocations.isEmpty {
+            if friendVM.isRequesting {
+                ProgressScreen()
+            } else if friendVM.friendsLocations.isEmpty {
                 ContentUnavailableView {
                     Label {
                         Text("No Friend Location")
diff --git a/harmonie/Views/MainTabView.swift b/harmonie/Views/MainTabView.swift
@@ -26,7 +26,12 @@ struct MainTabView: View {
         }
         .task {
             do {
+                defer { friendVM.isRequesting = false }
                 try await friendVM.fetchAllFriends()
+            } catch {
+                appVM.handleError(error)
+            }
+            do {
                 try await favoriteVM.fetchFavorite(friendVM: friendVM)
             } catch {
                 appVM.handleError(error)
diff --git a/harmonie/Views/UserDetail/UserDetailView+ProfileImageContainer.swift b/harmonie/Views/UserDetail/UserDetailView+ProfileImageContainer.swift
@@ -22,42 +22,52 @@ extension UserDetailView {
     }
 
     var bottomBar: some View {
-        HStack {
-            HStack(alignment: .bottom) {
-                Label {
-                    Text(user.displayName)
-                } icon: {
-                    Constants.Icon.circleFilled
-                        .foregroundStyle(statusColor)
-                }
+        VStack(alignment: .leading) {
+            Text(user.displayName)
                 .font(.headline)
+            HStack {
                 statusDescription
+                Spacer()
+                trustRankLabel
             }
-            .frame(maxWidth: .infinity, alignment: .leading)
         }
+        .frame(maxWidth: .infinity, alignment: .leading)
         .padding(.vertical, 8)
         .padding(.horizontal, 12)
     }
 
     var statusDescription: some View {
-        Text(user.statusDescription)
-            .lineLimit(1)
-            .font(.subheadline)
+        Label {
+            Text(user.statusDescription.isEmpty ?  user.status.description : user.statusDescription)
+        } icon: {
+            Constants.Icon.circleFilled
+                .foregroundStyle(statusColor)
+        }
+        .lineLimit(1)
+        .font(.subheadline)
     }
 
-    var displayStatusAndName: some View {
-        HStack(alignment: .bottom) {
-            Label {
-                Text(user.displayName)
-            } icon: {
-                Constants.Icon.circleFilled
-                    .foregroundStyle(user.status.color)
-            }
-            .font(.headline)
-            Text(user.statusDescription)
-                .font(.subheadline)
-            Spacer()
+    var trustRankLabel: some View {
+        Label {
+            Text(user.trustRank.description)
+        } icon: {
+            Constants.Icon.shield
+        }
+        .font(.footnote.bold())
+        .padding(.horizontal, 12)
+        .padding(.vertical, 4)
+        .background(trustRankColor(user.trustRank).opacity(0.5))
+        .background(.thinMaterial)
+        .cornerRadius(8)
+    }
+
+    func trustRankColor(_ trustRank: TrustRank) -> Color {
+        switch trustRank {
+        case .trusted: .indigo
+        case .known: .orange
+        case .user: .green
+        case .newUser: .blue
+        case .visitor, .unknown: .gray
         }
-        .padding(8)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`//`
`7`	`7`
`8`	`8`	`import NukeUI`
	`9`	`+import Shimmer`
`9`	`10`	`import SwiftUI`
`10`	`11`
`11`	`12`	`struct SquareURLImage: View {`
`@@ -25,7 +26,10 @@ struct SquareURLImage: View {`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`var placeholder: some View {`
`28`		`- rect.fill(.gray).frame(width: frameWidth, height: frameWidth * 3/4)`
	`29`	`+ rect`
	`30`	`+ .frame(width: frameWidth, height: frameWidth * 3/4)`
	`31`	`+ .redacted(reason: .placeholder)`
	`32`	`+ .shimmering()`
`29`	`33`	`}`
`30`	`34`
`31`	`35`	`var body: some View {`
`@@ -40,11 +44,10 @@ struct SquareURLImage: View {`
`40`	`44`	`} else {`
`41`	`45`	`placeholder`
`42`	`46`	`.onDisappear {`
`43`		`- isImageLoaded = true`
	`47`	`+ withAnimation { isImageLoaded = true }`
`44`	`48`	`}`
`45`	`49`	`}`
`46`	`50`	`}`
`47`	`51`	`.frame(width: frameWidth, height: frameWidth * 3/4)`
`48`		`- .redacted(reason: isImageLoaded ? [] : .placeholder)`
`49`	`52`	`}`
`50`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,9 @@ enum Constants {`
`52`	`52`	`static var setting: some View {`
`53`	`53`	`Image(systemName: "gear")`
`54`	`54`	`}`
	`55`	`+ static var shield: some View {`
	`56`	`+ Image(systemName: "shield.fill")`
	`57`	`+ }`
`55`	`58`	`static var sort: some View {`
`56`	`59`	`Image(systemName: "arrow.up.arrow.down")`
`57`	`60`	`}`