Merge pull request #234 from makinosp/develop

makinosp · web-flow · commit 6073c46b90c5 · 2025-07-05T13:53:48.000+09:00
feat: bump up to 1.0.4
diff --git a/Harmonie.xcodeproj/project.pbxproj b/Harmonie.xcodeproj/project.pbxproj
@@ -475,7 +475,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.4;
+				MARKETING_VERSION = 1.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.mknn.harmonie;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -511,7 +511,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.4;
+				MARKETING_VERSION = 1.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.mknn.harmonie;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -647,7 +647,7 @@
 			repositoryURL = "https://github.com/cybozu/LicenseList.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 0.7.0;
+				minimumVersion = 2.0.1;
 			};
 		};
 		20592B012C45640D00E1C8B8 /* XCRemoteSwiftPackageReference "async-swift-ui" */ = {
diff --git a/Harmonie.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Harmonie.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
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/GeometricScreen.swift b/harmonie/Components/GeometricScreen.swift
@@ -5,7 +5,7 @@
 //  Created by makinosp on 2024/11/15.
 //
 
-import SwiftUICore
+import SwiftUI
 
 struct GeometricScreen<Content>: View where Content: View {
     private let content: () -> Content
diff --git a/harmonie/Components/LabelItem.swift b/harmonie/Components/LabelItem.swift
@@ -6,7 +6,7 @@
 //
 
 import MemberwiseInit
-import SwiftUICore
+import SwiftUI
 
 @MemberwiseInit
 struct LabelItem: Identifiable {
diff --git a/harmonie/Extensions/Binding+NilCoalescing.swift b/harmonie/Extensions/Binding+NilCoalescing.swift
@@ -5,7 +5,7 @@
 //  Created by makinosp on 2024/06/17.
 //
 
-import SwiftUICore
+import SwiftUI
 
 extension Binding where Value: Sendable {
     static func ?? <T>(optional: Self, defaultValue: T) -> Binding<T> where Value == T? {
diff --git a/harmonie/Extensions/Binding+containsBinding.swift b/harmonie/Extensions/Binding+containsBinding.swift
@@ -5,7 +5,7 @@
 //  Created by makinosp on 2024/10/20.
 //
 
-import SwiftUICore
+import SwiftUI
 
 extension Binding where Value: SetAlgebra & Sendable, Value.Element: Sendable {
     func containsBinding(for value: Value.Element) -> Binding<Bool> {
diff --git a/harmonie/Extensions/FavoriteType+LocalizedStringKey.swift b/harmonie/Extensions/FavoriteType+LocalizedStringKey.swift
@@ -6,7 +6,7 @@
 //
 
 import VRCKit
-import SwiftUICore
+import SwiftUI
 
 extension FavoriteType {
     var localizedStringKey: LocalizedStringKey {
diff --git a/harmonie/Extensions/GeometryProxy+Equatable.swift b/harmonie/Extensions/GeometryProxy+Equatable.swift
@@ -5,7 +5,7 @@
 //  Created by makinosp on 2024/11/04.
 //
 
-import SwiftUICore
+import SwiftUI
 
 extension GeometryProxy: @retroactive Equatable {
     public static func == (lhs: GeometryProxy, rhs: GeometryProxy) -> Bool {
diff --git a/harmonie/Extensions/Status+ColorRepresentable.swift b/harmonie/Extensions/Status+ColorRepresentable.swift
@@ -5,7 +5,7 @@
 //  Created by makinosp on 2024/04/07.
 //
 
-import SwiftUICore
+import SwiftUI
 import VRCKit
 
 extension UserStatus: ColorRepresentable {
diff --git a/harmonie/Extensions/TrustRank+ColorRepresentable.swift b/harmonie/Extensions/TrustRank+ColorRepresentable.swift
@@ -5,7 +5,7 @@
 //  Created by makinosp on 2024/09/27.
 //
 
-import SwiftUICore
+import SwiftUI
 import VRCKit
 
 extension TrustRank: ColorRepresentable {
diff --git a/harmonie/Previews/Models/UserDetail.swift b/harmonie/Previews/Models/UserDetail.swift
@@ -46,6 +46,8 @@ private extension UserDetail {
         lastActivity: Date = Date()
     ) {
         self.init(
+            ageVerificationStatus: .hidden,
+            ageVerified: false,
             bio: bio,
             bioLinks: SafeDecodingArray(),
             avatarImageUrl: profile?.imageUrl(),
diff --git a/harmonie/Previews/PreviewData.swift b/harmonie/Previews/PreviewData.swift
@@ -37,6 +37,8 @@ final class PreviewData: Sendable {
     var previewUser: User {
         User(
             activeFriends: [],
+            ageVerificationStatus: .hidden,
+            ageVerified: false,
             allowAvatarCopying: false,
             bio: "This is the demo user.",
             bioLinks: SafeDecodingArray(),
@@ -65,7 +67,7 @@ final class PreviewData: Sendable {
             userIcon: PreviewData.iconImageUrl,
             userLanguage: nil,
             userLanguageCode: nil,
-            presence: Presence()
+            presence: Presence(),
         )
     }
 }
diff --git a/harmonie/Protocols/ColorRepresentable.swift b/harmonie/Protocols/ColorRepresentable.swift
@@ -5,7 +5,7 @@
 //  Created by makinosp on 2024/09/27.
 //
 
-import SwiftUICore
+import SwiftUI
 
 protocol ColorRepresentable {
     var color: Color { get }
diff --git a/harmonie/Views/Friend/FriendsListView.swift b/harmonie/Views/Friend/FriendsListView.swift
@@ -14,8 +14,8 @@ struct FriendsListView: View {
     @Environment(AppViewModel.self) var appVM
     @Environment(FriendViewModel.self) var friendVM
     @Environment(FavoriteViewModel.self) var favoriteVM
-    @InitWrapper(.internal, type: Binding<String?>)
-    @Binding private var selected: String?
+    @InitWrapper(.internal, default: Binding<String?>.constant(nil), type: Binding<String?>.self)
+    @Binding var selected: String?
     @State var isPresentedSheet = false
 
     var body: some View {
diff --git a/harmonie/Views/Location/LocationDetailView.swift b/harmonie/Views/Location/LocationDetailView.swift
@@ -12,8 +12,13 @@ import VRCKit
 
 @MemberwiseInit
 struct LocationDetailView: View {
-    @InitWrapper(.internal, label: "_", type: Binding<SegmentIdSelection?>)
-    @Binding private var selection: SegmentIdSelection?
+    @InitWrapper(
+        .internal,
+        default: Binding<SegmentIdSelection?>.constant(nil),
+        label: "_",
+        type: Binding<SegmentIdSelection?>.self
+    )
+    @Binding var selection: SegmentIdSelection?
     @Init(.internal) private let location: FriendsLocation
     @Init(.internal) private let instance: Instance
 
diff --git a/harmonie/Views/Location/PrivateLocationView.swift b/harmonie/Views/Location/PrivateLocationView.swift
@@ -11,7 +11,12 @@ import VRCKit
 
 @MemberwiseInit
 struct PrivateLocationView: View {
-    @InitWrapper(.internal, label: "_", type: Binding<SegmentIdSelection?>)
+    @InitWrapper(
+        .internal,
+        default: Binding<SegmentIdSelection?>.constant(nil),
+        label: "_",
+        type: Binding<SegmentIdSelection?>.self
+    )
     @Binding private var selection: SegmentIdSelection?
     @Init(.internal) private let friends: [Friend]
 
