Merge pull request #134 from makinosp/develop

Develop
makinosp · Sep 23, 2024 · faecabf · faecabf
2 parents 52c4700 + 8f72489
commit faecabf
Show file tree

Hide file tree

Showing 29 changed files with 126 additions and 124 deletions.
diff --git a/Harmonie.xcodeproj/project.pbxproj b/Harmonie.xcodeproj/project.pbxproj
@@ -474,8 +474,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = jp.mknn.harmonie;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_STRICT_CONCURRENCY = minimal;
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -510,8 +510,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = jp.mknn.harmonie;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_STRICT_CONCURRENCY = minimal;
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};

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" : "8a41adc2b663853c33d9c2d7c2000d0f6b499ecb"
+        "revision" : "3e8473947c3044297be4647d8230381c16921090"
       }
     },
     {

diff --git a/harmonie/Components/NavigationLabel.swift b/harmonie/Components/NavigationLabel.swift
@@ -0,0 +1,27 @@
+//
+//  NavigationLabel.swift
+//  Harmonie
+//
+//  Created by makinosp on 2024/09/22.
+//
+
+import SwiftUI
+
+struct NavigationLabel<Label>: View where Label: View {
+    private let label: () -> Label
+
+    init(label: @escaping () -> Label) {
+        self.label = label
+    }
+
+    var body: some View {
+        LabeledContent(content: content, label: label)
+    }
+
+    @ViewBuilder
+    func content() -> some View {
+        if UIDevice.current.userInterfaceIdiom != .pad {
+            Constants.Icon.forward
+        }
+    }
+}
diff --git a/harmonie/Components/StatusIndicator.swift b/harmonie/Components/StatusIndicator.swift
@@ -10,20 +10,29 @@ import SwiftUI
 struct StatusIndicator<S>: View where S: ShapeStyle {
     private let content: S
     private let isCutOut: Bool
+    private let size: CGSize?
     private let outerSize: CGSize
 
     init(_ content: S, outerSize: CGSize, isCutOut: Bool = false) {
         self.content = content
         self.outerSize = outerSize
         self.isCutOut = isCutOut
+        self.size = nil
+    }
+
+    init(_ content: S, size: CGSize, isCutOut: Bool = false) {
+        self.content = content
+        self.outerSize = .zero
+        self.isCutOut = isCutOut
+        self.size = size
     }
 
     private var frameSize: CGSize {
-        outerSize * 0.3
+        size ?? outerSize * 0.3
     }
 
     private var cutoutSize: CGSize {
-        outerSize * 0.15
+        frameSize * 0.5
     }
 
     private var offset: CGSize {

diff --git a/harmonie/Protocols/AuthenticationServicePresentable.swift b/harmonie/Protocols/AuthenticationServicePresentable.swift
@@ -7,12 +7,12 @@
 
 import VRCKit
 
+@MainActor
 protocol AuthenticationServicePresentable {
     var appVM: AppViewModel { get }
 }
 
 extension AuthenticationServicePresentable {
-    @MainActor
     var authenticationService: AuthenticationServiceProtocol {
         appVM.isPreviewMode
         ? AuthenticationPreviewService(client: appVM.client)

diff --git a/harmonie/Protocols/FavoriteServicePresentable.swift b/harmonie/Protocols/FavoriteServicePresentable.swift
@@ -7,12 +7,12 @@
 
 import VRCKit
 
+@MainActor
 protocol FavoriteServicePresentable {
     var appVM: AppViewModel { get }
 }
 
 extension FavoriteServicePresentable {
-    @MainActor
     var favoriteService: FavoriteServiceProtocol {
         appVM.isPreviewMode
         ? FavoritePreviewService(client: appVM.client)

diff --git a/harmonie/Protocols/FriendServicePresentable.swift b/harmonie/Protocols/FriendServicePresentable.swift
@@ -7,12 +7,12 @@
 
 import VRCKit
 
+@MainActor
 protocol FriendServicePresentable {
     var appVM: AppViewModel { get }
 }
 
 extension FriendServicePresentable {
-    @MainActor
     var friendService: FriendServiceProtocol {
         appVM.isPreviewMode
         ? FriendPreviewService(client: appVM.client)

diff --git a/harmonie/Protocols/InstanceServicePresentable.swift b/harmonie/Protocols/InstanceServicePresentable.swift
@@ -7,12 +7,12 @@
 
 import VRCKit
 
+@MainActor
 protocol InstanceServicePresentable {
     var appVM: AppViewModel { get }
 }
 
 extension InstanceServicePresentable {
-    @MainActor
     var instanceService: InstanceServiceProtocol {
         appVM.isPreviewMode
         ? InstancePreviewService(client: appVM.client)

diff --git a/harmonie/Protocols/UserServicePresentable.swift b/harmonie/Protocols/UserServicePresentable.swift
@@ -7,12 +7,12 @@
 
 import VRCKit
 
+@MainActor
 protocol UserServicePresentable {
     var appVM: AppViewModel { get }
 }
 
 extension UserServicePresentable {
-    @MainActor
     var userService: UserServiceProtocol {
         appVM.isPreviewMode
         ? UserPreviewService(client: appVM.client)

diff --git a/harmonie/Protocols/WorldServicePresentable.swift b/harmonie/Protocols/WorldServicePresentable.swift
@@ -7,12 +7,12 @@
 
 import VRCKit
 
+@MainActor
 protocol WorldServicePresentable {
     var appVM: AppViewModel { get }
 }
 
 extension WorldServicePresentable {
-    @MainActor
     var worldService: WorldServiceProtocol {
         appVM.isPreviewMode
         ? WorldPreviewService(client: appVM.client)

diff --git a/harmonie/Utils/Constants.swift b/harmonie/Utils/Constants.swift
@@ -69,6 +69,7 @@ enum Constants {
 
     enum IconSize {
         static let thumbnail = CGSize(width: 32, height: 32)
+        static let indicator = CGSize(width: 20, height: 20)
         static let ll = CGSize(width: 44, height: 44)
     }
 

diff --git a/harmonie/Utils/WindowUtil.swift b/harmonie/Utils/WindowUtil.swift
@@ -7,7 +7,7 @@
 
 import UIKit
 
-enum WindowUtil {
+@MainActor enum WindowUtil {
     static var window: UIWindowScene? {
         UIApplication.shared.connectedScenes.first as? UIWindowScene
     }

diff --git a/harmonie/ViewModels/AppViewModel.swift b/harmonie/ViewModels/AppViewModel.swift
@@ -28,7 +28,7 @@ final class AppViewModel {
     /// - Returns: Depending on the status, either `loggingIn` or `done` is returned.
     func setup(service: AuthenticationServiceProtocol) async -> Step {
         // check local data
-        guard !client.cookieManager.cookies.isEmpty else {
+        guard await !client.cookieManager.cookies.isEmpty else {
             return .loggingIn
         }
         do {
@@ -51,23 +51,23 @@ final class AppViewModel {
 
     private func setCredential(username: String, password: String, isSavedOnKeyChain: Bool) async {
         isPreviewMode = isPreviewUser(username: username, password: password)
-        client.setCledentials(username: username, password: password)
+        await client.setCledentials(username: username, password: password)
         if isSavedOnKeyChain {
             _ = await KeychainUtil.shared.savePassword(password, for: username)
         }
     }
 
     func login(username: String, password: String, isSavedOnKeyChain: Bool) async -> VerifyType? {
         isPreviewMode = isPreviewUser(username: username, password: password)
-        client.setCledentials(username: username, password: password)
+        await client.setCledentials(username: username, password: password)
         if isSavedOnKeyChain {
             _ = await KeychainUtil.shared.savePassword(password, for: username)
         }
         return await login()
     }
 
     func login() async -> VerifyType? {
-        let service = isPreviewMode
+        let service: AuthenticationServiceProtocol = isPreviewMode
         ? AuthenticationPreviewService(client: client)
         : AuthenticationService(client: client)
         do {

diff --git a/...nd/FriendViewModel+FilterUserStatus.swift → ...nd/FriendViewModel+FilterConditions.swift b/...nd/FriendViewModel+FilterUserStatus.swift → ...nd/FriendViewModel+FilterConditions.swift
@@ -1,5 +1,5 @@
 //
-//  FriendViewModel+FilterUserStatus.swift
+//  FriendViewModel+FilterConditions.swift
 //  Harmonie
 //
 //  Created by makinosp on 2024/09/16.
@@ -12,6 +12,16 @@ extension FriendViewModel {
         case all, status(UserStatus)
         var id: Int { hashValue }
     }
+
+    enum FilterFavoriteGroups: Hashable, Identifiable {
+        case all, favoriteGroup(FavoriteGroup)
+        var id: Int { hashValue }
+    }
+
+    enum SortType: String, Hashable, Identifiable, CaseIterable {
+        case `default`, displayName, lastLogin, status
+        var id: Int { hashValue }
+    }
 }
 
 extension FriendViewModel.FilterUserStatus: CustomStringConvertible {
@@ -37,3 +47,13 @@ extension FriendViewModel.FilterUserStatus: CaseIterable {
         ]
     }
 }
+
+extension FriendViewModel.SortType: CustomStringConvertible {
+    var description: String {
+        switch self {
+        case .displayName: "Name"
+        case .lastLogin: "Last Login"
+        default: rawValue.localizedCapitalized
+        }
+    }
+}
diff --git a/harmonie/ViewModels/Friend/FriendViewModel+FilterFavoriteGroups.swift b/harmonie/ViewModels/Friend/FriendViewModel+FilterFavoriteGroups.swift
diff --git a/harmonie/ViewModels/Friend/FriendViewModel+Filters.swift b/harmonie/ViewModels/Friend/FriendViewModel+Filters.swift
@@ -8,7 +8,7 @@
 import VRCKit
 
 extension FriendViewModel {
-    func setFavoriteFriends(favoriteFriends: [FavoriteFriend]) {
+    func setFavoriteFriends(_ favoriteFriends: [FavoriteFriend]) {
         self.favoriteFriends = favoriteFriends
     }
 

diff --git a/harmonie/ViewModels/Friend/FriendViewModel+SortType.swift b/harmonie/ViewModels/Friend/FriendViewModel+SortType.swift
diff --git a/harmonie/ViewModels/Friend/FriendViewModel.swift b/harmonie/ViewModels/Friend/FriendViewModel.swift
@@ -46,7 +46,7 @@ final class FriendViewModel {
     }
 
     /// Fetch friends from API
-    func fetchAllFriends(service: FriendServiceProtocol) async throws {
+    func fetchAllFriends<T: FriendServiceProtocol>(service: T) async throws where T: Sendable {
         async let onlineFriendsTask = service.fetchFriends(
             count: user.onlineFriends.count + user.activeFriends.count,
             offline: false
@@ -57,7 +57,7 @@ final class FriendViewModel {
         )
         onlineFriends = try await onlineFriendsTask
         offlineFriends = try await offlineFriendsTask
-        friendsLocations = service.friendsGroupedByLocation(onlineFriends)
+        friendsLocations = await service.friendsGroupedByLocation(onlineFriends)
         applyFilters()
     }
 }
diff --git a/harmonie/Views/Favorite/FavoriteFriendListView.swift b/harmonie/Views/Favorite/FavoriteFriendListView.swift
@@ -21,8 +21,14 @@ struct FavoriteFriendListView: View {
             if let friends = favoriteVM.getFavoriteFriends(group.id) {
                 Section(header: Text(group.displayName)) {
                     ForEach(friends) { friend in
-                        friendItem(friend)
-                            .tag(Selected(id: friend.id))
+                        NavigationLabel {
+                            Label {
+                                Text(friend.displayName)
+                            } icon: {
+                                UserIcon(user: friend, size: Constants.IconSize.thumbnail)
+                            }
+                        }
+                        .tag(Selected(id: friend.id))
                     }
                 }
             }
@@ -39,18 +45,4 @@ struct FavoriteFriendListView: View {
             }
         }
     }
-
-    private func friendItem(_ friend: Friend) -> some View {
-        LabeledContent {
-            Constants.Icon.forward
-        } label: {
-            Label {
-                Text(friend.displayName)
-            } icon: {
-                UserIcon(user: friend, size: Constants.IconSize.thumbnail)
-            }
-        }
-        .frame(maxWidth: .infinity, alignment: .leading)
-        .contentShape(Rectangle())
-    }
 }
diff --git a/harmonie/Views/Friend/FriendsListView.swift b/harmonie/Views/Friend/FriendsListView.swift
@@ -21,11 +21,7 @@ struct FriendsListView: View, FriendServicePresentable {
     var body: some View {
         List(friendVM.filterResultFriends, selection: $selected) { friend in
             Label {
-                LabeledContent {
-                    if UIDevice.current.userInterfaceIdiom == .phone {
-                        Constants.Icon.forward
-                    }
-                } label: {
+                NavigationLabel {
                     Text(friend.displayName)
                 }
             } icon: {