Merge pull request #179 from makinosp/develop

makinosp · web-flow · commit a2085112b1d8 · 2024-10-30T23:26:48.000+09:00
update: bump up to 0.9.6
diff --git a/Harmonie.xcodeproj/project.pbxproj b/Harmonie.xcodeproj/project.pbxproj
@@ -237,6 +237,7 @@
 				en,
 				ja,
 				"zh-Hans",
+				Base,
 			);
 			mainGroup = 20395D882B945CD700003921;
 			packageReferences = (
@@ -473,7 +474,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.5;
+				MARKETING_VERSION = 0.9.6;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.mknn.harmonie;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -509,7 +510,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.5;
+				MARKETING_VERSION = 0.9.6;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.mknn.harmonie;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
diff --git a/harmonie/Extensions/FavoriteType+LocalizedStringKey.swift b/harmonie/Extensions/FavoriteType+LocalizedStringKey.swift
@@ -0,0 +1,22 @@
+//
+//  FavoriteType+LocalizedStringKey.swift
+//  Harmonie
+//
+//  Created by makinosp on 2024/10/30.
+//
+
+import VRCKit
+import SwiftUICore
+
+extension FavoriteType {
+    var localizedStringKey: LocalizedStringKey {
+        switch self {
+        case .world:
+            LocalizedStringKey("World")
+        case .avatar:
+            LocalizedStringKey("Avatar")
+        case .friend:
+            LocalizedStringKey("Friend")
+        }
+    }
+}
diff --git a/harmonie/Localization/Localizable.xcstrings b/harmonie/Localization/Localizable.xcstrings
@@ -143,6 +143,22 @@
         }
       }
     },
+    "Avatar" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "アバター"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "模型"
+          }
+        }
+      }
+    },
     "Build" : {
       "localizations" : {
         "ja" : {
@@ -223,22 +239,6 @@
         }
       }
     },
-    "Code" : {
-      "localizations" : {
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "コード"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "代码"
-          }
-        }
-      }
-    },
     "Confirm" : {
       "localizations" : {
         "ja" : {
@@ -544,6 +544,22 @@
         }
       }
     },
+    "Friend" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "フレンド"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "好友"
+          }
+        }
+      }
+    },
     "Friend Locations" : {
       "localizations" : {
         "ja" : {
diff --git a/harmonie/Models/InstanceLocationModel.swift b/harmonie/Models/InstanceLocationModel.swift
@@ -9,9 +9,17 @@ import VRCKit
 
 struct InstanceLocation: Hashable {
     let location: FriendsLocation
-    let instance: Instance
+    let instance: Instance?
 }
 
 extension InstanceLocation: Identifiable {
     var id: Int { hashValue }
 }
+
+extension InstanceLocation {
+    /// Initialize as private instance
+    init(friends: [Friend]) {
+        let location = FriendsLocation(location: .private, friends: friends)
+        self.init(location: location, instance: nil)
+    }
+}
diff --git a/harmonie/Views/Authentication/OtpView.swift b/harmonie/Views/Authentication/OtpView.swift
@@ -18,7 +18,7 @@ struct OtpView: View {
             Text("Two-step verification")
                 .font(.headline)
             VStack {
-                TextField("Code", text: $code)
+                TextField(text: $code) { Text(verbatim: "000000") }
                     .multilineTextAlignment(TextAlignment.center)
                     .keyboardType(.decimalPad)
                     .textFieldStyle(.roundedBorder)
diff --git a/harmonie/Views/Location/LocationCardView.swift b/harmonie/Views/Location/LocationCardView.swift
@@ -18,24 +18,22 @@ struct LocationCardView: View {
     let location: FriendsLocation
 
     var body: some View {
-        Group {
-            if isFailure {
-                EmptyView()
-            } else {
-                locationCardContent(instance: instance ?? PreviewDataProvider.instance())
-            }
-        }
-        .redacted(reason: isRequesting ? .placeholder : [])
-        .task {
-            if case let .id(id) = location.location {
-                do {
-                    defer { withAnimation { isRequesting = false } }
-                    let service = appVM.services.instanceService
-                    instance = try await service.fetchInstance(location: id)
-                } catch {
-                    isFailure = true
+        if isFailure {
+            EmptyView()
+        } else {
+            locationCardContent(instance: instance ?? PreviewDataProvider.instance())
+                .redacted(reason: isRequesting ? .placeholder : [])
+                .task {
+                    if case let .id(id) = location.location {
+                        do {
+                            defer { withAnimation { isRequesting = false } }
+                            let service = appVM.services.instanceService
+                            instance = try await service.fetchInstance(location: id)
+                        } catch {
+                            isFailure = true
+                        }
+                    }
                 }
-            }
         }
     }
 
diff --git a/harmonie/Views/Location/LocationDetailView.swift b/harmonie/Views/Location/LocationDetailView.swift
@@ -12,12 +12,10 @@ import VRCKit
 
 @MemberwiseInit
 struct LocationDetailView: View {
-    @InitWrapper(.internal, type: Binding<SegmentIdSelection?>)
+    @InitWrapper(.internal, label: "_", type: Binding<SegmentIdSelection?>)
     @Binding private var selection: SegmentIdSelection?
-    @Init(.internal) private let instanceLocation: InstanceLocation
-
-    private var location: FriendsLocation { instanceLocation.location }
-    private var instance: Instance { instanceLocation.instance }
+    @Init(.internal) private let location: FriendsLocation
+    @Init(.internal) private let instance: Instance
 
     private typealias InformationItem = (title: String, value: String)
     private var information: [InformationItem] {
@@ -62,17 +60,6 @@ struct LocationDetailView: View {
         .navigationBarTitleDisplayMode(.inline)
     }
 
-    private var bottomBar: some View {
-        VStack(alignment: .leading) {
-            Text(instance.world.name)
-                .font(.headline)
-        }
-        .frame(maxWidth: .infinity, alignment: .leading)
-        .padding(.vertical, 8)
-        .padding(.horizontal, 12)
-        .foregroundStyle(Color.white)
-    }
-
     private var friendList: ForEach<[Friend], Friend.ID, some View> {
         ForEach(location.friends) { friend in
             NavigationLabel {
diff --git a/harmonie/Views/Location/LocationsView.swift b/harmonie/Views/Location/LocationsView.swift
@@ -13,6 +13,7 @@ struct LocationsView: View {
     @Environment(FriendViewModel.self) var friendVM
     @State private var columnVisibility: NavigationSplitViewVisibility = .all
     @State private var selectedInstance: InstanceLocation?
+    @State private var isSelectedPrivate = false
     @State private var selection: SegmentIdSelection?
 
     var body: some View {
@@ -53,11 +54,11 @@ struct LocationsView: View {
 
     private var content: some View {
         Group {
-            if let selectedInstance = selectedInstance {
-                LocationDetailView(
-                    selection: $selection,
-                    instanceLocation: selectedInstance
-                )
+            if let location = selectedInstance?.location,
+               let instance = selectedInstance?.instance {
+                LocationDetailView($selection, location: location, instance: instance)
+            } else if let instance = selectedInstance, instance.location.location == .private {
+                PrivateLocationView($selection, friends: instance.location.friends)
             }
         }
         .overlay {
@@ -96,7 +97,7 @@ struct LocationsView: View {
         .setColumn()
     }
 
-    @ViewBuilder private var friendLocations: some View {
+    private var friendLocations: some View {
         Section {
             if friendVM.isFetchingAllFriends {
                 ForEach(0...7, id: \.self) { _ in
@@ -143,6 +144,7 @@ struct LocationsView: View {
                 }
                 .padding(.top, 4)
             }
+            .tag(InstanceLocation(friends: friendVM.friendsInPrivate))
         }
     }
 }
diff --git a/harmonie/Views/Location/PrivateLocationView.swift b/harmonie/Views/Location/PrivateLocationView.swift
@@ -0,0 +1,37 @@
+//
+//  PrivateLocationView.swift
+//  Harmonie
+//
+//  Created by makinosp on 2024/10/30.
+//
+
+import MemberwiseInit
+import SwiftUI
+import VRCKit
+
+@MemberwiseInit
+struct PrivateLocationView: View {
+    @InitWrapper(.internal, label: "_", type: Binding<SegmentIdSelection?>)
+    @Binding private var selection: SegmentIdSelection?
+    @Init(.internal) private let friends: [Friend]
+
+    var body: some View {
+        List(selection: $selection) {
+            Section("Friends") {
+                ForEach(friends) { friend in
+                    NavigationLabel {
+                        Label {
+                            Text(friend.displayName)
+                        } icon: {
+                            UserIcon(user: friend, size: Constants.IconSize.thumbnail)
+                        }
+                    }
+                    .tag(SegmentIdSelection(friendId: friend.id))
+                }
+            }
+        }
+        .listStyle(.insetGrouped)
+        .navigationTitle("Private")
+        .navigationBarTitleDisplayMode(.inline)
+    }
+}
diff --git a/harmonie/Views/Setting/FavoriteGroups/FavoriteGroupsEditView.swift b/harmonie/Views/Setting/FavoriteGroups/FavoriteGroupsEditView.swift
@@ -12,6 +12,7 @@ struct FavoriteGroupsEditView: View {
     @Environment(AppViewModel.self) var appVM
     @Environment(FavoriteViewModel.self) var favoriteVM
     @Environment(\.dismiss) private var dismiss
+    @FocusState var isFocusedTextField
     @State private var displayName: String
     @State private var visibility: FavoriteGroup.Visibility
     @State private var isRequesting = false
@@ -28,10 +29,14 @@ struct FavoriteGroupsEditView: View {
             Form {
                 Section("Display Name") {
                     TextField("", text: $displayName)
+                        .focused($isFocusedTextField)
                 }
             }
             .toolbar { toolbarItems }
         }
+        .task {
+            isFocusedTextField = true
+        }
     }
 
     @ToolbarContentBuilder var toolbarItems: some ToolbarContent {
diff --git a/harmonie/Views/Setting/FavoriteGroups/FavoriteGroupsListView.swift b/harmonie/Views/Setting/FavoriteGroups/FavoriteGroupsListView.swift
@@ -16,7 +16,7 @@ struct FavoriteGroupsListView: View {
         List {
             let types: [FavoriteType] = [.friend, .world]
             ForEach(types, id: \.hashValue) { type in
-                Section(type.rawValue) {
+                Section(type.localizedStringKey) {
                     ForEach(favoriteVM.favoriteGroups(type)) { group in
                         Button {
                             selected = group
@@ -30,6 +30,7 @@ struct FavoriteGroupsListView: View {
         }
         .sheet(item: $selected) { group in
             FavoriteGroupsEditView(favoriteGroup: group)
+                .presentationDetents([.small])
         }
         .navigationTitle("Edit favorite groups")
         .navigationBarTitleDisplayMode(.inline)
diff --git a/harmonie/Views/UserDetail/NoteEditView.swift b/harmonie/Views/UserDetail/NoteEditView.swift
@@ -11,7 +11,7 @@ import VRCKit
 struct NoteEditView: View {
     @Environment(AppViewModel.self) var appVM
     @Environment(\.dismiss) private var dismiss
-    @FocusState var isFocusedNoteField
+    @FocusState var isFocusedTextField
     @State private var text: String
     @State private var isRequesting = false
     private let userId: String
@@ -28,7 +28,7 @@ struct NoteEditView: View {
             Form {
                 TextField("Enter note", text: $text, axis: .vertical)
                     .lineLimit(5...10)
-                    .focused($isFocusedNoteField)
+                    .focused($isFocusedTextField)
             }
             .scrollDisabled(true)
             .contentMargins(.vertical, .zero)
@@ -37,7 +37,7 @@ struct NoteEditView: View {
             .navigationBarTitleDisplayMode(.inline)
         }
         .task {
-            isFocusedNoteField = true
+            isFocusedTextField = true
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ struct LocationsView: View {`
`13`	`13`	`@Environment(FriendViewModel.self) var friendVM`
`14`	`14`	`@State private var columnVisibility: NavigationSplitViewVisibility = .all`
`15`	`15`	`@State private var selectedInstance: InstanceLocation?`
	`16`	`+ @State private var isSelectedPrivate = false`
`16`	`17`	`@State private var selection: SegmentIdSelection?`
`17`	`18`
`18`	`19`	`var body: some View {`
`@@ -53,11 +54,11 @@ struct LocationsView: View {`
`53`	`54`
`54`	`55`	`private var content: some View {`
`55`	`56`	`Group {`
`56`		`- if let selectedInstance = selectedInstance {`
`57`		`- LocationDetailView(`
`58`		`- selection: $selection,`
`59`		`- instanceLocation: selectedInstance`
`60`		`- )`
	`57`	`+ if let location = selectedInstance?.location,`
	`58`	`+ let instance = selectedInstance?.instance {`
	`59`	`+ LocationDetailView($selection, location: location, instance: instance)`
	`60`	`+ } else if let instance = selectedInstance, instance.location.location == .private {`
	`61`	`+ PrivateLocationView($selection, friends: instance.location.friends)`
`61`	`62`	`}`
`62`	`63`	`}`
`63`	`64`	`.overlay {`
`@@ -96,7 +97,7 @@ struct LocationsView: View {`
`96`	`97`	`.setColumn()`
`97`	`98`	`}`
`98`	`99`
`99`		`- @ViewBuilder private var friendLocations: some View {`
	`100`	`+ private var friendLocations: some View {`
`100`	`101`	`Section {`
`101`	`102`	`if friendVM.isFetchingAllFriends {`
`102`	`103`	`ForEach(0...7, id: \.self) { _ in`
`@@ -143,6 +144,7 @@ struct LocationsView: View {`
`143`	`144`	`}`
`144`	`145`	`.padding(.top, 4)`
`145`	`146`	`}`
	`147`	`+ .tag(InstanceLocation(friends: friendVM.friendsInPrivate))`
`146`	`148`	`}`
`147`	`149`	`}`
`148`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ struct FavoriteGroupsEditView: View {`
`12`	`12`	`@Environment(AppViewModel.self) var appVM`
`13`	`13`	`@Environment(FavoriteViewModel.self) var favoriteVM`
`14`	`14`	`@Environment(\.dismiss) private var dismiss`
	`15`	`+ @FocusState var isFocusedTextField`
`15`	`16`	`@State private var displayName: String`
`16`	`17`	`@State private var visibility: FavoriteGroup.Visibility`
`17`	`18`	`@State private var isRequesting = false`
`@@ -28,10 +29,14 @@ struct FavoriteGroupsEditView: View {`
`28`	`29`	`Form {`
`29`	`30`	`Section("Display Name") {`
`30`	`31`	`TextField("", text: $displayName)`
	`32`	`+ .focused($isFocusedTextField)`
`31`	`33`	`}`
`32`	`34`	`}`
`33`	`35`	`.toolbar { toolbarItems }`
`34`	`36`	`}`
	`37`	`+ .task {`
	`38`	`+ isFocusedTextField = true`
	`39`	`+ }`
`35`	`40`	`}`
`36`	`41`
`37`	`42`	`@ToolbarContentBuilder var toolbarItems: some ToolbarContent {`