Merge pull request #135 from makinosp/develop

Develop
makinosp · Sep 23, 2024 · 9e4714f · 9e4714f
2 parents faecabf + 8336bcd
commit 9e4714f
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 40 deletions.
diff --git a/Harmonie.xcodeproj/project.pbxproj b/Harmonie.xcodeproj/project.pbxproj
@@ -470,7 +470,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.7.2;
+				MARKETING_VERSION = 0.7.3;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.mknn.harmonie;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -506,7 +506,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.7.2;
+				MARKETING_VERSION = 0.7.3;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.mknn.harmonie;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/Harmonie.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Harmonie.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -106,7 +106,7 @@
       "location" : "https://github.com/makinosp/vrckit",
       "state" : {
         "branch" : "develop",
-        "revision" : "3e8473947c3044297be4647d8230381c16921090"
+        "revision" : "bc261c16c86f2738501799f3c86d1d581f5f2cb9"
       }
     },
     {

diff --git a/harmonie/Models/FavoriteFriendModel.swift b/harmonie/Models/FavoriteFriendModel.swift
diff --git a/harmonie/Models/FavoriteModel.swift b/harmonie/Models/FavoriteModel.swift
@@ -0,0 +1,22 @@
+//
+//  FavoriteModel.swift
+//  Harmonie
+//
+//  Created by makinosp on 2024/09/16.
+//
+
+import VRCKit
+
+struct FavoriteFriend: Sendable, Hashable {
+    let favoriteGroupId: String
+    var friends: [Friend]
+}
+
+struct FavoriteWorld: Sendable, Hashable {
+    let group: FavoriteGroup?
+    var worlds: [World]
+}
+
+extension FavoriteWorld: Identifiable {
+    var id: Int { hashValue }
+}
diff --git a/harmonie/ViewModels/FavoriteViewModel.swift b/harmonie/ViewModels/FavoriteViewModel.swift
@@ -23,6 +23,14 @@ final class FavoriteViewModel {
         favoriteGroups.filter { $0.type == .friend }
     }
 
+    func getFavoriteGroup(id: String) -> FavoriteGroup? {
+        favoriteGroups.first { $0.id == id }
+    }
+
+    func getFavoriteGroup(name: String) -> FavoriteGroup? {
+        favoriteGroups.first { $0.name == name }
+    }
+
     /// Asynchronously fetches and updates the favorite groups and their details.
     /// - Throws: An error if any network request or decoding operation fails.
     func fetchFavorite(service: FavoriteServiceProtocol, friendVM: FriendViewModel) async throws {
@@ -119,6 +127,17 @@ final class FavoriteViewModel {
     }
 
     func fetchFavoritedWorlds(service: WorldServiceProtocol) async throws {
-        favoriteWorlds = try await service.fetchFavoritedWorlds()
+        favoriteWorlds = try await service.fetchFavoritedWorlds(n: 100)
+    }
+
+    var groupedFavoriteWorlds: [FavoriteWorld] {
+        Dictionary(grouping: favoriteWorlds, by: { $0.favoriteGroup ?? "Unknown" })
+            .sorted { $0.key < $1.key }
+            .map { dictionary in
+                FavoriteWorld(
+                    group: getFavoriteGroup(name: dictionary.key),
+                    worlds: dictionary.value
+                )
+            }
     }
 }
diff --git a/harmonie/Views/Favorite/FavoriteFriendListView.swift b/harmonie/Views/Favorite/FavoriteFriendListView.swift
@@ -19,7 +19,7 @@ struct FavoriteFriendListView: View {
     var body: some View {
         List(favoriteVM.favoriteFriendGroups, selection: $selected) { group in
             if let friends = favoriteVM.getFavoriteFriends(group.id) {
-                Section(header: Text(group.displayName)) {
+                DisclosureGroup(group.displayName) {
                     ForEach(friends) { friend in
                         NavigationLabel {
                             Label {

diff --git a/harmonie/Views/Favorite/FavoriteWorldListView.swift b/harmonie/Views/Favorite/FavoriteWorldListView.swift
@@ -17,10 +17,10 @@ struct FavoriteWorldListView: View {
     }
 
     var body: some View {
-        List(groupedWorlds.keys.sorted(), id: \.hashValue, selection: $selected) { group in
-            if let worlds = groupedWorlds[group] {
-                Section(header: Text(group)) {
-                    ForEach(worlds) { world in
+        List(favoriteVM.groupedFavoriteWorlds, selection: $selected) { favoriteWorlds in
+            if let group = favoriteWorlds.group {
+                DisclosureGroup(group.displayName) {
+                    ForEach(favoriteWorlds.worlds) { world in
                         worldItem(world)
                             .tag(Selected(id: world.id))
                     }
@@ -29,10 +29,6 @@ struct FavoriteWorldListView: View {
         }
     }
 
-    private var groupedWorlds: [String: [World]] {
-        Dictionary(grouping: favoriteVM.favoriteWorlds, by: { $0.favoriteGroup ?? "Unknown" })
-    }
-
     private func worldItem(_ world: World) -> some View {
         HStack(spacing: 12) {
             SquareURLImage(

diff --git a/harmonie/Views/Favorite/FavoritesView.swift b/harmonie/Views/Favorite/FavoritesView.swift
@@ -13,24 +13,24 @@ struct FavoritesView: View {
     @State private var selected: Selected?
 
     var body: some View {
+        @Bindable var favoriteVM = favoriteVM
         NavigationSplitView(columnVisibility: .constant(.all)) {
-            Group {
-                if favoriteVM.segment == .friend {
-                    FavoriteFriendListView(selected: $selected)
-                } else if favoriteVM.segment == .world {
-                    FavoriteWorldListView(selected: $selected)
+            VStack {
+                Picker("", selection: $favoriteVM.segment) {
+                    ForEach(Segment.allCases) { segment in
+                        Text(segment.description).tag(segment)
+                    }
                 }
-            }
-            .toolbar {
-                ToolbarItem(placement: .status) {
-                    @Bindable var favoriteVM = favoriteVM
-                    Picker("", selection: $favoriteVM.segment) {
-                        ForEach(Segment.allCases) { segment in
-                            Text(segment.description).tag(segment)
-                        }
+                .pickerStyle(.segmented)
+                .padding(.horizontal, 20)
+                Group {
+                    if favoriteVM.segment == .friend {
+                        FavoriteFriendListView(selected: $selected)
+                    } else if favoriteVM.segment == .world {
+                        FavoriteWorldListView(selected: $selected)
                     }
-                    .pickerStyle(SegmentedPickerStyle())
                 }
+                .contentMargins(.top, 0)
             }
             .navigationTitle("Favorites")
         } detail: {

diff --git a/harmonie/Views/Friend/FriendsView.swift b/harmonie/Views/Friend/FriendsView.swift
@@ -52,6 +52,7 @@ struct FriendsView: View {
     let friendVM = FriendViewModel(user: PreviewDataProvider.shared.previewUser)
     let favoriteVM = FavoriteViewModel()
     FriendsView()
+        .environment(appVM)
         .environment(friendVM)
         .environment(favoriteVM)
         .task {