Change macOS app category from Social Networking to Utilities and bump version to 2.0.1 (7)

Nostash.xcodeproj/project.pbxproj

@@ -788,7 +788,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = S99A5B637C;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "iOS (Extension)/Info.plist";
@@ -801,7 +801,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -820,7 +820,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = S99A5B637C;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "iOS (Extension)/Info.plist";
@@ -833,7 +833,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -855,7 +855,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = S99A5B637C;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "iOS (App)/Info.plist";
@@ -871,7 +871,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -896,7 +896,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = S99A5B637C;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "iOS (App)/Info.plist";
@@ -912,7 +912,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -937,7 +937,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "macOS (Extension)/nostash.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = S99A5B637C;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -952,7 +952,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -971,7 +971,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "macOS (Extension)/nostash.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = S99A5B637C;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -986,7 +986,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -1007,21 +1007,21 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "macOS (App)/nostash.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = S99A5B637C;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Nostash--macOS--Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = Nostash;
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				INFOPLIST_KEY_NSPrincipalClass = NSApplication;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -1043,21 +1043,21 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "macOS (App)/nostash.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = S99A5B637C;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Nostash--macOS--Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = Nostash;
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				INFOPLIST_KEY_NSPrincipalClass = NSApplication;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,

Nostash.xcodeproj/xcshareddata/xcschemes/Nostash (iOS).xcscheme

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1630"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "941B03AE296FA90400CA291E"
+               BuildableName = "Nostash.app"
+               BlueprintName = "Nostash (iOS)"
+               ReferencedContainer = "container:Nostash.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "941B03AE296FA90400CA291E"
+            BuildableName = "Nostash.app"
+            BlueprintName = "Nostash (iOS)"
+            ReferencedContainer = "container:Nostash.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "941B03AE296FA90400CA291E"
+            BuildableName = "Nostash.app"
+            BlueprintName = "Nostash (iOS)"
+            ReferencedContainer = "container:Nostash.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Shared (App)/MainView.swift

@@ -9,51 +9,54 @@ import SwiftUI
 
 struct MainView: View {
     var body: some View {
-        VStack {
+        NavigationStack {
-            NavigationStack {
+            Image("bigicon").resizable().frame(width: 150.0, height: 150.0)
-                Image("bigicon").resizable().frame(width: 150.0, height: 150.0)
+            Text("Nostash").font(.title)
-                Text("Nostash").font(.title)
+            Text("A Safari Nostr Extension").font(.title2)
-                Text("A Safari Nostr Extension").font(.title2)
+            NavigationLink("Privacy Policy") {
-                NavigationLink("Privacy Policy") {
+                PrivacyPolicyView()
-                    PrivacyPolicyView()
-                }
-                #if macOS
-                .buttonStyle(.link)
-                #endif
-                .padding(.all, 3.0)
-                
-                NavigationLink("Getting Started: iPhone") {
-                    GettingStartediPhone()
-                }
-                #if macOS
-                .buttonStyle(.link)
-                #endif
-                .padding(.all, 3.0)
-                
-                NavigationLink("Getting Started: iPad") {
-                    GettingStartediPad()
-                }
-                #if macOS
-                .buttonStyle(.link)
-                #endif
-                .padding(.all, 3.0)
-                
-                NavigationLink("Getting Started: Mac") {
-                    GettingStartedMac()
-                }
-                #if macOS
-                .buttonStyle(.link)
-                #endif
-                .padding(.all, 3.0)
-
-                NavigationLink("Tips and Tricks") {
-                    TipsAndTricks()
-                }
-                #if macOS
-                .buttonStyle(.link)
-                #endif
-                .padding(.all, 3.0)
             }
+#if os(macOS)
+            .buttonStyle(.link)
+#endif
+            .padding(.all, 3.0)
+
+            NavigationLink("Getting Started: iPhone") {
+                GettingStartediPhone()
+            }
+#if os(macOS)
+            .buttonStyle(.link)
+#endif
+            .padding(.all, 3.0)
+
+            NavigationLink("Getting Started: iPad") {
+                GettingStartediPad()
+            }
+#if os(macOS)
+            .buttonStyle(.link)
+#endif
+            .padding(.all, 3.0)
+
+            NavigationLink("Getting Started: Mac") {
+                GettingStartedMac()
+            }
+#if os(macOS)
+            .buttonStyle(.link)
+#endif
+            .padding(.all, 3.0)
+
+            NavigationLink("Tips and Tricks") {
+                TipsAndTricks()
+            }
+#if os(macOS)
+            .buttonStyle(.link)
+#endif
+            .padding(.all, 3.0)
+        }
+        .toolbar {
+            // There is a macOS bug where the back button overlaps the title in the navigation bar.
+            // Adding an empty Text element fixes the issue apparently.
+            Text("")
         }
     }
 }

Shared (App)/NostashApp.swift

@@ -10,11 +10,11 @@ import SwiftUI
 @main
 struct NostashApp: App {
     var body: some Scene {
-        WindowGroup("Nostash") {
+        WindowGroup {
             MainView()
         }
-        #if macOS
+#if os(macOS)
         .defaultSize(width: 400, height: 500)
-        #endif
+#endif
     }
 }