Merge pull request #216 from makinosp/develop

update: bump up to 1.0.0
makinosp · Nov 16, 2024 · 76161c1 · 76161c1
2 parents 1dcbb4f + 6b4aada
commit 76161c1
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
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/Models/WorldDetailLabelStacks.swift → ...e/Components/WorldDetailLabelStacks.swift b/harmonie/Models/WorldDetailLabelStacks.swift → ...e/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