Merge pull request #216 from makinosp/develop

makinosp · web-flow · commit 76161c149b0f · 2024-11-16T16:26:44.000+09:00
update: bump up to 1.0.0
diff --git a/Harmonie.xcodeproj/project.pbxproj b/Harmonie.xcodeproj/project.pbxproj
@@ -474,7 +474,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.10.0;
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.mknn.harmonie;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -510,7 +510,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.10.0;
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.mknn.harmonie;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
diff --git a/harmonie/Components/IconSet.swift b/harmonie/Components/IconSet.swift
@@ -33,9 +33,6 @@ enum IconSet {
     static var edit: some Iconizable {
         Icon("pencil")
     }
-    static var eye: some Iconizable {
-        Icon("eye")
-    }
     static var favorite: some Iconizable {
         Icon("star")
     }
@@ -57,6 +54,9 @@ enum IconSet {
     static var friends: some Iconizable {
         Icon("person.2")
     }
+    static var friendsFilled: some Iconizable {
+        Icon("person.2.fill")
+    }
     static var heart: some Iconizable {
         Icon("heart.fill")
     }
@@ -93,6 +93,9 @@ enum IconSet {
     static var plusCircleFilled: some Iconizable {
         Icon("plus.circle.fill")
     }
+    static var `private`: some Iconizable {
+        Icon("person.fill.questionmark")
+    }
     static var setting: some Iconizable {
         Icon("gear")
     }
@@ -103,6 +106,9 @@ enum IconSet {
         Icon("arrow.up.arrow.down")
     }
     static var social: some Iconizable {
+        Icon("person.3")
+    }
+    static var socialFilled: some Iconizable {
         Icon("person.3.fill")
     }
     static var stopwatch: some Iconizable {
@@ -115,10 +121,10 @@ enum IconSet {
         Icon("arrow.up")
     }
     static var upload: some Iconizable {
-        Icon("square.and.arrow.up")
+        Icon("square.and.arrow.up.fill")
     }
-    static var widebrim: some Iconizable {
-        Icon("hat.widebrim.fill")
+    static var walk: some Iconizable {
+        Icon("figure.walk")
     }
     static var world: some Iconizable {
         Icon("globe.desk")
diff --git a/harmonie/Components/LabelItem.swift b/harmonie/Components/LabelItem.swift
@@ -9,15 +9,12 @@ import MemberwiseInit
 import SwiftUICore
 
 @MemberwiseInit
-struct LabelItem {
+struct LabelItem: Identifiable {
     @Init(label: "_") let value: String
     @Init let caption: String
     @Init let systemName: String
     @Init(default: Font.body) let fontSize: Font
-}
-
-extension LabelItem: Identifiable {
-    var id: UUID { UUID() }
+    @Init(default: UUID()) let id: UUID
 }
 
 extension LabelItem {
@@ -27,12 +24,9 @@ extension LabelItem {
 }
 
 @MemberwiseInit
-struct LabelItems {
+struct LabelItems: Identifiable {
     @Init(label: "_") let items: [LabelItem]
-}
-
-extension LabelItems: Identifiable {
-    var id: UUID { UUID() }
+    @Init(default: UUID()) let id: UUID
 }
 
 extension LabelItem: View {
diff --git a/harmonie/Components/WorldDetailLabelStacks.swift b/harmonie/Components/WorldDetailLabelStacks.swift
@@ -10,14 +10,14 @@ import VRCKit
 extension World {
     var labelItemStacks: [LabelItems] {[
         LabelItems([
-            LabelItem(visits.description, caption: "Visits", icon: IconSet.eye),
+            LabelItem(visits.description, caption: "Visits", icon: IconSet.walk),
             LabelItem(favorites.text, caption: "Favorites", icon: IconSet.favoriteFilled),
             LabelItem(popularity.description, caption: "Popularity", icon: IconSet.heart)
         ]),
         LabelItems([
-            LabelItem(capacity.description, caption: "Capacity", icon: IconSet.eye),
-            LabelItem(occupants.text, caption: "Public", icon: IconSet.social),
-            LabelItem(privateOccupants.text, caption: "Private", icon: IconSet.widebrim)
+            LabelItem(capacity.description, caption: "Capacity", icon: IconSet.friendsFilled),
+            LabelItem(occupants.text, caption: "Public", icon: IconSet.socialFilled),
+            LabelItem(privateOccupants.text, caption: "Private", icon: IconSet.private)
         ]),
         LabelItems([
             LabelItem(publicationDate.formatted, caption: "Published", icon: IconSet.megaphone, fontSize: .footnote),
@@ -33,6 +33,6 @@ private extension OptionalISO8601Date {
 }
 
 private extension Optional<Int> {
-    var unwrappedValue: Int { self ?? 0 }
+    private var unwrappedValue: Int { self ?? 0 }
     var text: String { unwrappedValue.description }
 }
diff --git a/harmonie/Views/MainTabView.swift b/harmonie/Views/MainTabView.swift
@@ -40,7 +40,7 @@ struct MainTabView: View {
 }
 
 @MainActor
-extension MainTabViewSegment {
+private extension MainTabViewSegment {
     @ViewBuilder var content: some View {
         switch self {
         case .social: LocationsView()
@@ -51,7 +51,7 @@ extension MainTabViewSegment {
     }
 }
 
-extension MainTabView {
+private extension MainTabView {
     private func changedScenePhaseHandler(_ before: ScenePhase, _ after: ScenePhase) {
         switch (before, after) {
         case (.background, .inactive):
@@ -73,7 +73,7 @@ extension MainTabView {
 }
 
 @MainActor
-extension MainTabView {
+private extension MainTabView {
     private var tabViewLegacy: some View {
         TabView(selection: $selection) {
             ForEach(MainTabViewSegment.allCases) { tabSegment in

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,6 @@ enum IconSet {`
`33`	`33`	`static var edit: some Iconizable {`
`34`	`34`	`Icon("pencil")`
`35`	`35`	`}`
`36`		`- static var eye: some Iconizable {`
`37`		`- Icon("eye")`
`38`		`- }`
`39`	`36`	`static var favorite: some Iconizable {`
`40`	`37`	`Icon("star")`
`41`	`38`	`}`
`@@ -57,6 +54,9 @@ enum IconSet {`
`57`	`54`	`static var friends: some Iconizable {`
`58`	`55`	`Icon("person.2")`
`59`	`56`	`}`
	`57`	`+ static var friendsFilled: some Iconizable {`
	`58`	`+ Icon("person.2.fill")`
	`59`	`+ }`
`60`	`60`	`static var heart: some Iconizable {`
`61`	`61`	`Icon("heart.fill")`
`62`	`62`	`}`
`@@ -93,6 +93,9 @@ enum IconSet {`
`93`	`93`	`static var plusCircleFilled: some Iconizable {`
`94`	`94`	`Icon("plus.circle.fill")`
`95`	`95`	`}`
	`96`	+ static var `private`: some Iconizable {
	`97`	`+ Icon("person.fill.questionmark")`
	`98`	`+ }`
`96`	`99`	`static var setting: some Iconizable {`
`97`	`100`	`Icon("gear")`
`98`	`101`	`}`
`@@ -103,6 +106,9 @@ enum IconSet {`
`103`	`106`	`Icon("arrow.up.arrow.down")`
`104`	`107`	`}`
`105`	`108`	`static var social: some Iconizable {`
	`109`	`+ Icon("person.3")`
	`110`	`+ }`
	`111`	`+ static var socialFilled: some Iconizable {`
`106`	`112`	`Icon("person.3.fill")`
`107`	`113`	`}`
`108`	`114`	`static var stopwatch: some Iconizable {`
`@@ -115,10 +121,10 @@ enum IconSet {`
`115`	`121`	`Icon("arrow.up")`
`116`	`122`	`}`
`117`	`123`	`static var upload: some Iconizable {`
`118`		`- Icon("square.and.arrow.up")`
	`124`	`+ Icon("square.and.arrow.up.fill")`
`119`	`125`	`}`
`120`		`- static var widebrim: some Iconizable {`
`121`		`- Icon("hat.widebrim.fill")`
	`126`	`+ static var walk: some Iconizable {`
	`127`	`+ Icon("figure.walk")`
`122`	`128`	`}`
`123`	`129`	`static var world: some Iconizable {`
`124`	`130`	`Icon("globe.desk")`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ struct MainTabView: View {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@MainActor`
`43`		`-extension MainTabViewSegment {`
	`43`	`+private extension MainTabViewSegment {`
`44`	`44`	`@ViewBuilder var content: some View {`
`45`	`45`	`switch self {`
`46`	`46`	`case .social: LocationsView()`
`@@ -51,7 +51,7 @@ extension MainTabViewSegment {`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`-extension MainTabView {`
	`54`	`+private extension MainTabView {`
`55`	`55`	`private func changedScenePhaseHandler(_ before: ScenePhase, _ after: ScenePhase) {`
`56`	`56`	`switch (before, after) {`
`57`	`57`	`case (.background, .inactive):`
`@@ -73,7 +73,7 @@ extension MainTabView {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`@MainActor`
`76`		`-extension MainTabView {`
	`76`	`+private extension MainTabView {`
`77`	`77`	`private var tabViewLegacy: some View {`
`78`	`78`	`TabView(selection: $selection) {`
`79`	`79`	`ForEach(MainTabViewSegment.allCases) { tabSegment in`