Merge pull request #84 from makinosp/develop

makinosp · web-flow · commit 720f2238df8a · 2024-08-18T18:27:01.000+09:00
diff --git a/Harmonie.xcodeproj/project.pbxproj b/Harmonie.xcodeproj/project.pbxproj
@@ -32,6 +32,7 @@
 		205B3BF22C00D51A0097D62A /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 205B3BF12C00D51A0097D62A /* SettingsView.swift */; };
 		205B3BF42C00D8BF0097D62A /* ProgressScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 205B3BF32C00D8BF0097D62A /* ProgressScreen.swift */; };
 		205C9DAF2C20612500E3782C /* Binding+NilCoalescing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 205C9DAE2C20612500E3782C /* Binding+NilCoalescing.swift */; };
+		205D81A62C71B9D70047C1CC /* SwiftUIIntrospect in Frameworks */ = {isa = PBXBuildFile; productRef = 205D81A52C71B9D70047C1CC /* SwiftUIIntrospect */; };
 		206088E92C48079900626DDC /* LocationDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 206088E82C48079900626DDC /* LocationDetailView.swift */; };
 		206AC9012BFA07AA00E0D5AE /* AsyncSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 206AC9002BFA07AA00E0D5AE /* AsyncSwiftUI */; };
 		207FC6352C4256E60018E605 /* View+SizeModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 207FC6322C4256E60018E605 /* View+SizeModifier.swift */; };
@@ -138,6 +139,7 @@
 				2096016D2C4BD30100D905AF /* VRCKit in Frameworks */,
 				206AC9012BFA07AA00E0D5AE /* AsyncSwiftUI in Frameworks */,
 				2052C7AE2C4BC97100B341D1 /* VRCKit in Frameworks */,
+				205D81A62C71B9D70047C1CC /* SwiftUIIntrospect in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -363,6 +365,7 @@
 				208899AA2C4BB26D00BCE9C5 /* VRCKit */,
 				2052C7AD2C4BC97100B341D1 /* VRCKit */,
 				2096016C2C4BD30100D905AF /* VRCKit */,
+				205D81A52C71B9D70047C1CC /* SwiftUIIntrospect */,
 			);
 			productName = harmonie;
 			productReference = 20395D912B945CD700003921 /* Harmonie.app */;
@@ -446,6 +449,7 @@
 				201B430E2C27F48E00879A2F /* XCRemoteSwiftPackageReference "LicenseList" */,
 				20592B012C45640D00E1C8B8 /* XCRemoteSwiftPackageReference "async-swift-ui" */,
 				2096016B2C4BD30100D905AF /* XCRemoteSwiftPackageReference "vrckit" */,
+				205D81A42C71B9D70047C1CC /* XCRemoteSwiftPackageReference "swiftui-introspect" */,
 			);
 			productRefGroup = 20395D922B945CD700003921 /* Products */;
 			projectDirPath = "";
@@ -883,6 +887,14 @@
 				kind = branch;
 			};
 		};
+		205D81A42C71B9D70047C1CC /* XCRemoteSwiftPackageReference "swiftui-introspect" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/siteline/swiftui-introspect";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.3.0;
+			};
+		};
 		2096016B2C4BD30100D905AF /* XCRemoteSwiftPackageReference "vrckit" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/makinosp/vrckit";
@@ -928,6 +940,11 @@
 			package = 20592B012C45640D00E1C8B8 /* XCRemoteSwiftPackageReference "async-swift-ui" */;
 			productName = AsyncSwiftUI;
 		};
+		205D81A52C71B9D70047C1CC /* SwiftUIIntrospect */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 205D81A42C71B9D70047C1CC /* XCRemoteSwiftPackageReference "swiftui-introspect" */;
+			productName = SwiftUIIntrospect;
+		};
 		206AC9002BFA07AA00E0D5AE /* AsyncSwiftUI */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = AsyncSwiftUI;
diff --git a/Harmonie.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Harmonie.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/harmonie/Extensions/Status+color.swift b/harmonie/Extensions/Status+color.swift
@@ -11,16 +11,11 @@ import VRCKit
 extension UserStatus {
     var color: Color {
         switch self {
-        case .joinMe:
-            return .cyan
-        case .active:
-            return .green
-        case .askMe:
-            return .orange
-        case .busy:
-            return .red
-        case .offline:
-            return .gray
+        case .joinMe: .cyan
+        case .active: .green
+        case .askMe: .orange
+        case .busy: .red
+        case .offline: .gray
         }
     }
 }
diff --git a/harmonie/Utils/DateUtil.swift b/harmonie/Utils/DateUtil.swift
@@ -24,6 +24,11 @@ class DateUtil {
         return dateFormatter
     }()
 
+    func formattedDateTime(from date: Date) -> String {
+        [formatToyyyyMMdd(from: date), formatToHHmm(from: date)]
+            .joined(separator: " ")
+    }
+
     func formatToyyyyMMdd(from date: Date) -> String {
         return yyyyMMddDateFormatter.string(from: date)
     }
diff --git a/harmonie/ViewModels/FavoriteViewModel.swift b/harmonie/ViewModels/FavoriteViewModel.swift
@@ -16,8 +16,13 @@ typealias FavoriteFriend = (favoriteGroupId: String, friends: [Friend])
 class FavoriteViewModel: ObservableObject {
     @Published var favoriteGroups: [FavoriteGroup] = []
     @Published var favoriteFriends: [FavoriteFriend] = []
+    @Published var segment: Segment = .friend
     let friendVM: FriendViewModel
     let service: any FavoriteServiceProtocol
+    
+    enum Segment {
+        case friend, world
+    }
 
     /// Initializes the view model with the specified HTTP client.
     /// - Parameter client: The `APIClient` instance used for making network requests.
@@ -128,3 +133,22 @@ class FavoriteViewModel: ObservableObject {
         }
     }
 }
+
+extension FavoriteViewModel.Segment: Identifiable {
+    var id: Int { hashValue }
+}
+
+extension FavoriteViewModel.Segment: CaseIterable {
+    var allCases: [FavoriteViewModel.Segment] {
+        [.friend, .world]
+    }
+}
+
+extension FavoriteViewModel.Segment: CustomStringConvertible {
+    var description: String {
+        switch self {
+        case .friend: "Friend"
+        case .world: "World"
+        }
+    }
+}
diff --git a/harmonie/ViewModels/FriendViewModel+Filters.swift b/harmonie/ViewModels/FriendViewModel+Filters.swift
@@ -93,9 +93,9 @@ extension FriendViewModel.FilterUserStatus: CustomStringConvertible {
     var description: String {
         switch self {
         case .all:
-            return "All"
+            "All"
         case .status(let status):
-            return status.description
+            status.description
         }
     }
 }
diff --git a/harmonie/Views/Favorite/FavoritesView.swift b/harmonie/Views/Favorite/FavoritesView.swift
@@ -32,6 +32,16 @@ struct FavoritesView: View {
                         .presentationDetents([.medium, .large])
                         .presentationBackground(Color(UIColor.systemGroupedBackground))
                 }
+                .toolbar {
+                    ToolbarItem(placement: .principal) {
+                        Picker("", selection: $favoriteVM.segment) {
+                            ForEach(FavoriteViewModel.Segment.allCases) { segment in
+                                Text(segment.description).tag(segment)
+                            }
+                        }
+                        .pickerStyle(SegmentedPickerStyle())
+                    }
+                }
                 .navigationTitle("Favorites")
             } else {
                 ProgressScreen()
@@ -45,7 +55,7 @@ struct FavoritesView: View {
     func rowView(_ friend: Friend) -> some View {
         HStack {
             CircleURLImage(
-                imageUrl: friend.userIconUrl,
+                imageUrl: friend.thumbnailUrl,
                 size: Constants.IconSize.thumbnail
             )
             Text(friend.displayName)
diff --git a/harmonie/Views/Friend/FriendsView.swift b/harmonie/Views/Friend/FriendsView.swift
@@ -45,7 +45,7 @@ struct FriendsView: View {
                             .foregroundStyle(friend.status.color)
                             .frame(size: Constants.IconSize.thumbnailOutside)
                         CircleURLImage(
-                            imageUrl: friend.userIconUrl,
+                            imageUrl: friend.thumbnailUrl,
                             size: Constants.IconSize.thumbnail
                         )
                     }
diff --git a/harmonie/Views/Location/LocationCardView.swift b/harmonie/Views/Location/LocationCardView.swift
@@ -17,10 +17,19 @@ struct LocationCardView: View {
     let location: FriendsLocation
     let frameWidth: CGFloat = 120
 
+    var backGroundColor: Color {
+        switch UIDevice.current.userInterfaceIdiom {
+        case .pad:
+            Color(UIColor.tertiarySystemGroupedBackground)
+        default:
+            Color(UIColor.secondarySystemGroupedBackground)
+        }
+    }
+
     var body: some View {
         ZStack {
             RoundedRectangle(cornerRadius: 16)
-                .foregroundStyle(Color(UIColor.tertiarySystemGroupedBackground))
+                .foregroundStyle(backGroundColor)
             if let instance = instance {
                 locationCardContent(instance: instance)
                     .onTapGesture {
@@ -62,7 +71,7 @@ struct LocationCardView: View {
                                     .foregroundStyle(friend.status.color)
                                     .frame(size: Constants.IconSize.thumbnailOutside)
                                 CircleURLImage(
-                                    imageUrl: friend.userIconUrl,
+                                    imageUrl: friend.thumbnailUrl,
                                     size: Constants.IconSize.thumbnail
                                 )
                             }
@@ -79,11 +88,9 @@ struct LocationCardView: View {
     }
 
     func personAmount(_ instance: Instance) -> String {
-        [
-            location.friends.count.description,
-            instance.userCount.description,
-            instance.capacity.description
-        ].joined(separator: " / ")
+        [location.friends.count, instance.userCount, instance.capacity]
+            .map { $0.description }
+            .joined(separator: " / ")
     }
 
     func locationThumbnail(_ url: URL?) -> some View {
diff --git a/harmonie/Views/Location/LocationDetailView.swift b/harmonie/Views/Location/LocationDetailView.swift
@@ -56,7 +56,7 @@ struct LocationDetailView: View {
                             .foregroundStyle(friend.status.color)
                             .frame(size: Constants.IconSize.thumbnailOutside)
                         CircleURLImage(
-                            imageUrl: friend.userIconUrl,
+                            imageUrl: friend.thumbnailUrl,
                             size: Constants.IconSize.thumbnail
                         )
                     }
diff --git a/harmonie/Views/Location/LocationsView.swift b/harmonie/Views/Location/LocationsView.swift
@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import SwiftUIIntrospect
 import VRCKit
 
 struct InstanceLocation: Hashable, Identifiable {
@@ -23,10 +24,19 @@ struct LocationsView: View {
         appVM.isDemoMode ? InstancePreviewService(client: appVM.client) : InstanceService(client: appVM.client)
     }
 
+    var backGroundColor: Color {
+        switch UIDevice.current.userInterfaceIdiom {
+        case .pad:
+            Color(UIColor.secondarySystemGroupedBackground)
+        default:
+            Color(UIColor.systemGroupedBackground)
+        }
+    }
+
     var body: some View {
         NavigationSplitView(columnVisibility: .constant(.all)) {
             locationList
-                .background(Color(UIColor.secondarySystemGroupedBackground))
+                .background(backGroundColor)
                 .navigationTitle("Locations")
                 .navigationDestination(item: $selected) { selected in
                     LocationDetailView(
@@ -40,13 +50,18 @@ struct LocationsView: View {
             }
         }
         .navigationSplitViewStyle(.balanced)
+        .padding(.horizontal, UIDevice.current.userInterfaceIdiom == .pad ? 8 : .zero)
         .refreshable {
             do {
                 try await friendVM.fetchAllFriends()
             } catch {
                 appVM.handleError(error)
             }
         }
+        .introspect(.navigationSplitView, on: .iOS(.v17, .v18)) { splitView in
+            splitView.maximumPrimaryColumnWidth = .infinity
+            splitView.preferredPrimaryColumnWidthFraction = 1 / 2
+        }
     }
 
     var locationList: some View {
diff --git a/harmonie/Views/Setting/SettingsView.swift b/harmonie/Views/Setting/SettingsView.swift
@@ -56,7 +56,7 @@ struct SettingsView: View {
                     } label: {
                         HStack {
                             CircleURLImage(
-                                imageUrl: user.userIconUrl,
+                                imageUrl: user.thumbnailUrl,
                                 size: Constants.IconSize.ll
                             )
                             Text(user.displayName)
diff --git a/harmonie/Views/UserDetail/UserDetailView+ActivitySection.swift b/harmonie/Views/UserDetail/UserDetailView+ActivitySection.swift
@@ -15,14 +15,14 @@ extension UserDetailView {
                     Text("Last Login")
                         .font(.subheadline)
                         .foregroundStyle(Color.gray)
-                    Text(lastLoginText)
+                    Text(DateUtil.shared.formattedDateTime(from: user.lastLogin))
                         .font(.body)
                 }
                 VStack(alignment: .leading) {
                     Text("Last Activity")
                         .font(.subheadline)
                         .foregroundStyle(Color.gray)
-                    Text(lastActivityText)
+                    Text(DateUtil.shared.formattedDateTime(from: user.lastActivity))
                         .font(.body)
                 }
                 if let dateJoined = user.dateJoined {
@@ -37,18 +37,4 @@ extension UserDetailView {
             }
         }
     }
-
-    var lastLoginText: String {
-        [
-            DateUtil.shared.formatToyyyyMMdd(from: user.lastLogin),
-            DateUtil.shared.formatToHHmm(from: user.lastLogin)
-        ].joined(separator: " ")
-    }
-
-    var lastActivityText: String {
-        [
-            DateUtil.shared.formatToyyyyMMdd(from: user.lastActivity),
-            DateUtil.shared.formatToHHmm(from: user.lastActivity)
-        ].joined(separator: " ")
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -93,9 +93,9 @@ extension FriendViewModel.FilterUserStatus: CustomStringConvertible {`
`93`	`93`	`var description: String {`
`94`	`94`	`switch self {`
`95`	`95`	`case .all:`
`96`		`- return "All"`
	`96`	`+ "All"`
`97`	`97`	`case .status(let status):`
`98`		`- return status.description`
	`98`	`+ status.description`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ struct FriendsView: View {`
`45`	`45`	`.foregroundStyle(friend.status.color)`
`46`	`46`	`.frame(size: Constants.IconSize.thumbnailOutside)`
`47`	`47`	`CircleURLImage(`
`48`		`- imageUrl: friend.userIconUrl,`
	`48`	`+ imageUrl: friend.thumbnailUrl,`
`49`	`49`	`size: Constants.IconSize.thumbnail`
`50`	`50`	`)`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ struct LocationDetailView: View {`
`56`	`56`	`.foregroundStyle(friend.status.color)`
`57`	`57`	`.frame(size: Constants.IconSize.thumbnailOutside)`
`58`	`58`	`CircleURLImage(`
`59`		`- imageUrl: friend.userIconUrl,`
	`59`	`+ imageUrl: friend.thumbnailUrl,`
`60`	`60`	`size: Constants.IconSize.thumbnail`
`61`	`61`	`)`
`62`	`62`	`}`