Merge remote-tracking branch 'origin/dev'

Merge Dev again
EmeraldLoc · Apr 13, 2023 · c254824 · c254824
2 parents 817024a + 01faa7c
commit c254824
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 13 deletions.
diff --git a/sm_osx.xcodeproj/project.pbxproj b/sm_osx.xcodeproj/project.pbxproj
@@ -419,7 +419,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"sm_osx/Preview Content\"";
 				DEVELOPMENT_TEAM = 25RK3JMVLT;
@@ -435,7 +435,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.2.9;
+				MARKETING_VERSION = 1.3.0;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.CubingStudios.sm-osx";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -453,7 +453,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"sm_osx/Preview Content\"";
 				DEVELOPMENT_TEAM = 25RK3JMVLT;
@@ -469,7 +469,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.2.9;
+				MARKETING_VERSION = 1.3.0;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.CubingStudios.sm-osx";
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/sm_osx/FirstLaunchView.swift b/sm_osx/FirstLaunchView.swift
@@ -18,7 +18,6 @@ struct FirstLaunchView: View {
                     .frame(minWidth: 150, maxWidth: 150, minHeight: 150, maxHeight: 150)
                     .transition(.scale)
             }
-
 
             if status == .starting {
                 Text("Starting...")
@@ -46,16 +45,17 @@ struct FirstLaunchView: View {
                     }.onReceive(timer, perform: { _ in
                         //some people hate this timer, but if you make a pr, im not accepting it, because I like it :)
 
-                        startingTimer += 1
-
-                        if startingTimer >= 2 {
-                            withAnimation {
-                                startingTimer = 0
-
-                                status = .launcherView
+                        if !showAppNotInApplicationsFolderAlert {
+                            startingTimer += 1
+
+                            if startingTimer >= 2 {
+                                withAnimation {
+                                    startingTimer = 0
+
+                                    status = .launcherView
+                                }
                             }
                         }
-
                     })
             } else if status == .launcherView {
                 VStack {

diff --git a/sm_osx/sm_osxApp.swift b/sm_osx/sm_osxApp.swift
@@ -101,6 +101,14 @@ struct sm_osxApp: App {
                     }
             }
         }.commands {
+            if firstLaunch {
+                CommandGroup(replacing: .appSettings) {
+                    Text("Settings..")
+                        .keyboardShortcut(".")
+                        .disabled(true)
+                }
+            }
+
             CommandGroup(replacing: .saveItem) {}
         }
 
@@ -114,6 +122,14 @@ struct sm_osxApp: App {
                     }
             }
         }.commands {
+            if firstLaunch {
+                CommandGroup(replacing: .appSettings) {
+                    Text("Settings..")
+                        .keyboardShortcut(".")
+                        .disabled(true)
+                }
+            }
+
             CommandGroup(replacing: .saveItem) {}
         }
 
@@ -126,6 +142,14 @@ struct sm_osxApp: App {
                     }
             }
         }.commands {
+            if firstLaunch {
+                CommandGroup(replacing: .appSettings) {
+                    Text("Settings..")
+                        .keyboardShortcut(".")
+                        .disabled(true)
+                }
+            }
+
             CommandGroup(replacing: .saveItem) {}
         }
 
@@ -144,6 +168,14 @@ struct sm_osxApp: App {
                     }
                 }.frame(width: 400, height: 250)
         }.windowResizability(.contentSize).windowStyle(.hiddenTitleBar).commands {
+            if firstLaunch {
+                CommandGroup(replacing: .appSettings) {
+                    Text("Settings..")
+                        .keyboardShortcut(".")
+                        .disabled(true)
+                }
+            }
+
             CommandGroup(replacing: .saveItem) {}
         }
 
@@ -155,6 +187,13 @@ struct sm_osxApp: App {
                     NSWindow.allowsAutomaticWindowTabbing = false
                 }
         }.commands {
+            if firstLaunch {
+                CommandGroup(replacing: .appSettings) {
+                    Text("Settings..")
+                        .disabled(true)
+                }
+            }
+
             CommandGroup(replacing: .saveItem) {}
         }