Merge pull request #15 from EmeraldLoc/dev

Merge Dev

sm_osx.xcodeproj/project.pbxproj

@@ -23,14 +23,15 @@
 		96A3D83A29B52328007AF78A /* ImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96A3D83929B52328007AF78A /* ImagePicker.swift */; };
 		96AC85B1286670B800CCFF58 /* MenuBarCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96AC85B0286670B800CCFF58 /* MenuBarCommands.swift */; };
 		96BB22E327E274F700057915 /* RepoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BB22E227E274F700057915 /* RepoView.swift */; };
-		96BDA2F3283D216500A4DFF3 /* General View.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BDA2F2283D216500A4DFF3 /* General View.swift */; };
+		96BDA2F3283D216500A4DFF3 /* GeneralView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BDA2F2283D216500A4DFF3 /* GeneralView.swift */; };
 		96BDA2F5283D221700A4DFF3 /* DeveloperView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BDA2F4283D221700A4DFF3 /* DeveloperView.swift */; };
 		96BDA2F7283D283200A4DFF3 /* CrashView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BDA2F6283D283200A4DFF3 /* CrashView.swift */; };
 		96BDA2F9283D29E300A4DFF3 /* LogView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BDA2F8283D29E300A4DFF3 /* LogView.swift */; };
 		96BEADAE2839986200FF72E3 /* CompilationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BEADAD2839986200FF72E3 /* CompilationView.swift */; };
 		96C54E6D285930D7003B4A2D /* GlobalFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96C54E6C285930D7003B4A2D /* GlobalFunctions.swift */; };
 		96CF3D4227DBD8C7008A26F5 /* CompilationSpeed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CF3D4127DBD8C7008A26F5 /* CompilationSpeed.swift */; };
 		96DE71D327EB9C170090E7A0 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DE71D227EB9C170090E7A0 /* SettingsView.swift */; };
+		96EBED1329BA51970033771E /* UpdatesSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96EBED1229BA51970033771E /* UpdatesSettingsView.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -52,7 +53,7 @@
 		96A3D83929B52328007AF78A /* ImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePicker.swift; sourceTree = "<group>"; };
 		96AC85B0286670B800CCFF58 /* MenuBarCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuBarCommands.swift; sourceTree = "<group>"; };
 		96BB22E227E274F700057915 /* RepoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepoView.swift; sourceTree = "<group>"; };
-		96BDA2F2283D216500A4DFF3 /* General View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "General View.swift"; sourceTree = "<group>"; };
+		96BDA2F2283D216500A4DFF3 /* GeneralView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralView.swift; sourceTree = "<group>"; };
 		96BDA2F4283D221700A4DFF3 /* DeveloperView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeveloperView.swift; sourceTree = "<group>"; };
 		96BDA2F6283D283200A4DFF3 /* CrashView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrashView.swift; sourceTree = "<group>"; };
 		96BDA2F8283D29E300A4DFF3 /* LogView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogView.swift; sourceTree = "<group>"; };
@@ -61,6 +62,7 @@
 		96CF3D4127DBD8C7008A26F5 /* CompilationSpeed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompilationSpeed.swift; sourceTree = "<group>"; };
 		96DE71D227EB9C170090E7A0 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
 		96DE71D427EB9C7D0090E7A0 /* sm-osx-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "sm-osx-Info.plist"; sourceTree = SOURCE_ROOT; };
+		96EBED1229BA51970033771E /* UpdatesSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdatesSettingsView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -110,7 +112,7 @@
 				963F238427F8B942004E010E /* DataStore.xcdatamodeld */,
 				963F238727F8BA01004E010E /* DataController.swift */,
 				96BEADAD2839986200FF72E3 /* CompilationView.swift */,
-				96BDA2F2283D216500A4DFF3 /* General View.swift */,
+				96BDA2F2283D216500A4DFF3 /* GeneralView.swift */,
 				96BDA2F4283D221700A4DFF3 /* DeveloperView.swift */,
 				96BDA2F6283D283200A4DFF3 /* CrashView.swift */,
 				96BDA2F8283D29E300A4DFF3 /* LogView.swift */,
@@ -119,6 +121,7 @@
 				960A559629B29DC600F5CC37 /* PlayHover.swift */,
 				960A559829B2A50100F5CC37 /* LauncherEditView.swift */,
 				96A3D83929B52328007AF78A /* ImagePicker.swift */,
+				96EBED1229BA51970033771E /* UpdatesSettingsView.swift */,
 			);
 			path = sm_osx;
 			sourceTree = "<group>";
@@ -161,7 +164,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1330;
-				LastUpgradeCheck = 1400;
+				LastUpgradeCheck = 1420;
 				TargetAttributes = {
 					9669DC5727D5565000DE5FAB = {
 						CreatedOnToolsVersion = 13.2.1;
@@ -215,10 +218,11 @@
 				96A3D83A29B52328007AF78A /* ImagePicker.swift in Sources */,
 				96BDA2F9283D29E300A4DFF3 /* LogView.swift in Sources */,
 				9669DC7127D55F4700DE5FAB /* RomView.swift in Sources */,
-				96BDA2F3283D216500A4DFF3 /* General View.swift in Sources */,
+				96BDA2F3283D216500A4DFF3 /* GeneralView.swift in Sources */,
 				96DE71D327EB9C170090E7A0 /* SettingsView.swift in Sources */,
 				96C54E6D285930D7003B4A2D /* GlobalFunctions.swift in Sources */,
 				960D46F627D6850D0056E393 /* BuildingSteps.swift in Sources */,
+				96EBED1329BA51970033771E /* UpdatesSettingsView.swift in Sources */,
 				960A559729B29DC600F5CC37 /* PlayHover.swift in Sources */,
 				96BDA2F7283D283200A4DFF3 /* CrashView.swift in Sources */,
 				960A559929B2A50100F5CC37 /* LauncherEditView.swift in Sources */,
@@ -267,6 +271,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -330,6 +335,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -362,9 +368,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"sm_osx/Preview Content\"";
 				DEVELOPMENT_TEAM = 25RK3JMVLT;
-				ENABLE_HARDENED_RUNTIME = NO;
+				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "sm-osx-Info.plist";
@@ -375,7 +382,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.2.6.1;
+				MARKETING_VERSION = 1.2.7;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.CubingStudios.sm-osx";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -394,9 +401,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"sm_osx/Preview Content\"";
 				DEVELOPMENT_TEAM = 25RK3JMVLT;
-				ENABLE_HARDENED_RUNTIME = NO;
+				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "sm-osx-Info.plist";
@@ -407,7 +415,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.2.6.1;
+				MARKETING_VERSION = 1.2.7;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.CubingStudios.sm-osx";
 				PRODUCT_NAME = "$(TARGET_NAME)";

sm_osx.xcodeproj/xcshareddata/xcschemes/sm_osx.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1420"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

sm_osx/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,68 +1,68 @@
 {
   "images" : [
     {
-      "filename" : "[email protected]",
       "idiom" : "mac",
+      "size" : "16x16",
       "scale" : "1x",
-      "size" : "16x16"
+      "filename" : "[email protected]"
     },
     {
-      "filename" : "[email protected]",
       "idiom" : "mac",
+      "size" : "16x16",
       "scale" : "2x",
-      "size" : "16x16"
+      "filename" : "[email protected]"
     },
     {
-      "filename" : "[email protected]",
       "idiom" : "mac",
+      "size" : "32x32",
       "scale" : "1x",
-      "size" : "32x32"
+      "filename" : "[email protected]"
     },
     {
-      "filename" : "[email protected]",
       "idiom" : "mac",
+      "size" : "32x32",
       "scale" : "2x",
-      "size" : "32x32"
+      "filename" : "[email protected]"
     },
     {
-      "filename" : "[email protected]",
       "idiom" : "mac",
+      "size" : "128x128",
       "scale" : "1x",
-      "size" : "128x128"
+      "filename" : "[email protected]"
     },
     {
-      "filename" : "[email protected]",
       "idiom" : "mac",
+      "size" : "128x128",
       "scale" : "2x",
-      "size" : "128x128"
+      "filename" : "[email protected]"
     },
     {
-      "filename" : "[email protected]",
       "idiom" : "mac",
+      "size" : "256x256",
       "scale" : "1x",
-      "size" : "256x256"
+      "filename" : "[email protected]"
     },
     {
-      "filename" : "[email protected]",
       "idiom" : "mac",
+      "size" : "256x256",
       "scale" : "2x",
-      "size" : "256x256"
+      "filename" : "[email protected]"
     },
     {
-      "filename" : "[email protected]",
       "idiom" : "mac",
+      "size" : "512x512",
       "scale" : "1x",
-      "size" : "512x512"
+      "filename" : "[email protected]"
     },
     {
-      "filename" : "[email protected]",
       "idiom" : "mac",
+      "size" : "512x512",
       "scale" : "2x",
-      "size" : "512x512"
+      "filename" : "[email protected]"
     }
   ],
   "info" : {
-    "author" : "xcode",
-    "version" : 1
+    "version" : 1,
+    "author" : "xcode"
   }
-}
+}

sm_osx/Assets.xcassets/menu_bar_icon.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Menu Bar Icon.svg",
+      "filename" : "sm_osx.pdf",
       "idiom" : "universal"
     }
   ],
@@ -10,6 +10,7 @@
     "version" : 1
   },
   "properties" : {
+    "compression-type" : "automatic",
     "preserves-vector-representation" : true,
     "template-rendering-intent" : "template"
   }

sm_osx/CompilationView.swift

@@ -12,14 +12,15 @@ struct CompilationView: View {
 
     @Binding var compileCommands: String
     @State var compilationStatus = CompStatus.nothing
+    @State var compilationStatusString = " "
     @State var compilesSucess = false
     @Binding var repo: Repo
     @Binding var execPath: String
     @Binding var doLauncher: Bool
     @State var shell = Shell()
-    @State var log = "Starting..."
+    @State var log = ""
     @State var totalLog = ""
-    @State var height = 100
+    @State var height = 125
     @Environment(\.dismiss) var dismiss
     @Environment(\.managedObjectContext) var moc
 
@@ -44,6 +45,29 @@ struct CompilationView: View {
                 .progressViewStyle(.linear)
                 .padding(.horizontal, 7)
 
+            Text(compilationStatusString)
+                .onChange(of: compilationStatus) { _ in
+                    switch compilationStatus {
+                    case .instDependencies:
+                        compilationStatusString = "Installing Dependencies..."
+                    case .instRepo:
+                        compilationStatusString = "Downloading Repo..."
+                    case .patching:
+                        compilationStatusString = "Patching..."
+                    case .copyingFiles:
+                        compilationStatusString = "Copying Required Files..."
+                    case .compiling:
+                        compilationStatusString = "Compiling..."
+                    case .finishingUp:
+                        compilationStatusString = "Finishing..."
+                    case .finished:
+                        compilationStatusString = "Finished..."
+                    case .nothing:
+                        compilationStatusString = "Starting..."
+                    }
+
+                }
+
             if compilesSucess == false && compilationStatus == .finished {
 
                 TextEditor(text: .constant(totalLog))
@@ -243,7 +267,7 @@ struct CompilationView: View {
 
                             compilesSucess = false
 
-                            height = 550
+                            height = 575
 
                             try? shell.shell("cd ~/SM64Repos && rm -rf \(execPath)", false)
                             try? shell.shell("cd ~/SM64Repos && rm -rf \(repo)", false)

sm_osx/DeveloperView.swift

@@ -14,14 +14,8 @@ struct DeveloperView: View {
     var body: some View {
         List {
             Toggle(isOn: $devMode) {
-                Text("Enable dev repos (Not recommended)")
+                Text("Enable development repos (Not recommended)")
             }
         }
     }
 }
-
-struct DeveloperView_Previews: PreviewProvider {
-    static var previews: some View {
-        DeveloperView()
-    }
-}