Skip to content

Commit 2d318a8

Browse files
EmeraldLocEmeraldLoc
committed
Lots of ui changes for macOS Tahoe, new icon that kinda looks bad, should change later, and some pretty nice bug fixes
1 parent 8c8d1c4 commit 2d318a8

35 files changed

+414
-545
lines changed

‎sm_osx.xcodeproj/project.pbxproj‎

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
960A559729B29DC600F5CC37 /* PlayHover.swift in Sources */ = {isa = PBXBuildFile; fileRef = 960A559629B29DC600F5CC37 /* PlayHover.swift */; };
1313
960A559929B2A50100F5CC37 /* LauncherEditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 960A559829B2A50100F5CC37 /* LauncherEditView.swift */; };
1414
961C0A5129E9C6E000D50A80 /* Enums.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961C0A5029E9C6E000D50A80 /* Enums.swift */; };
15-
961C0A5329E9D29C00D50A80 /* AppearenceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961C0A5229E9D29C00D50A80 /* AppearenceView.swift */; };
1615
9621F4DB29E4A441007BE51D /* FirstLaunchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9621F4DA29E4A441007BE51D /* FirstLaunchView.swift */; };
1716
9621F4ED29E4C33F007BE51D /* HomebrewInstaller.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 9621F4EC29E4C33F007BE51D /* HomebrewInstaller.scpt */; };
1817
9621F4EF29E4CCBC007BE51D /* IntelHomebrewInstaller.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 9621F4EE29E4CCBC007BE51D /* IntelHomebrewInstaller.scpt */; };
@@ -33,8 +32,6 @@
3332
96A3D83A29B52328007AF78A /* ImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96A3D83929B52328007AF78A /* ImagePicker.swift */; };
3433
96AC85B1286670B800CCFF58 /* MenuCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96AC85B0286670B800CCFF58 /* MenuCommands.swift */; };
3534
96BB22E327E274F700057915 /* RepoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BB22E227E274F700057915 /* RepoView.swift */; };
36-
96BDA2F3283D216500A4DFF3 /* GeneralView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BDA2F2283D216500A4DFF3 /* GeneralView.swift */; };
37-
96BDA2F5283D221700A4DFF3 /* DeveloperView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BDA2F4283D221700A4DFF3 /* DeveloperView.swift */; };
3835
96BDA2F7283D283200A4DFF3 /* CrashView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BDA2F6283D283200A4DFF3 /* CrashView.swift */; };
3936
96BDA2F9283D29E300A4DFF3 /* LogView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BDA2F8283D29E300A4DFF3 /* LogView.swift */; };
4037
96BEADAE2839986200FF72E3 /* CompilationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BEADAD2839986200FF72E3 /* CompilationView.swift */; };
@@ -43,7 +40,6 @@
4340
96CCFB7729E7158B00BE8CC7 /* LaunchScriptCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CCFB7629E7158B00BE8CC7 /* LaunchScriptCommand.swift */; };
4441
96DE71D327EB9C170090E7A0 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DE71D227EB9C170090E7A0 /* SettingsView.swift */; };
4542
96E529D729C511F000E8E14D /* InternetChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E529D629C511F000E8E14D /* InternetChecker.swift */; };
46-
96EBED1329BA51970033771E /* UpdatesSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96EBED1229BA51970033771E /* UpdatesSettingsView.swift */; };
4743
96F79CC62AC622CE009FC622 /* CustomRepoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F79CC52AC622CE009FC622 /* CustomRepoView.swift */; };
4844
96F79CC82AC6388F009FC622 /* Repos.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F79CC72AC6388F009FC622 /* Repos.swift */; };
4945
96FA91072CE80449004BFD60 /* Patches.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96FA91062CE80446004BFD60 /* Patches.swift */; };
@@ -67,7 +63,6 @@
6763
960A559629B29DC600F5CC37 /* PlayHover.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayHover.swift; sourceTree = "<group>"; };
6864
960A559829B2A50100F5CC37 /* LauncherEditView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LauncherEditView.swift; sourceTree = "<group>"; };
6965
961C0A5029E9C6E000D50A80 /* Enums.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Enums.swift; sourceTree = "<group>"; };
70-
961C0A5229E9D29C00D50A80 /* AppearenceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppearenceView.swift; sourceTree = "<group>"; };
7166
9621F4DA29E4A441007BE51D /* FirstLaunchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirstLaunchView.swift; sourceTree = "<group>"; };
7267
9621F4EC29E4C33F007BE51D /* HomebrewInstaller.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; path = HomebrewInstaller.scpt; sourceTree = "<group>"; };
7368
9621F4EE29E4CCBC007BE51D /* IntelHomebrewInstaller.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; path = IntelHomebrewInstaller.scpt; sourceTree = "<group>"; };
@@ -92,8 +87,6 @@
9287
96A3D83929B52328007AF78A /* ImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePicker.swift; sourceTree = "<group>"; };
9388
96AC85B0286670B800CCFF58 /* MenuCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuCommands.swift; sourceTree = "<group>"; };
9489
96BB22E227E274F700057915 /* RepoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepoView.swift; sourceTree = "<group>"; };
95-
96BDA2F2283D216500A4DFF3 /* GeneralView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralView.swift; sourceTree = "<group>"; };
96-
96BDA2F4283D221700A4DFF3 /* DeveloperView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeveloperView.swift; sourceTree = "<group>"; };
9790
96BDA2F6283D283200A4DFF3 /* CrashView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrashView.swift; sourceTree = "<group>"; };
9891
96BDA2F8283D29E300A4DFF3 /* LogView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogView.swift; sourceTree = "<group>"; };
9992
96BEADAD2839986200FF72E3 /* CompilationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompilationView.swift; sourceTree = "<group>"; };
@@ -103,7 +96,6 @@
10396
96DE71D227EB9C170090E7A0 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
10497
96DE71D427EB9C7D0090E7A0 /* sm-osx-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "sm-osx-Info.plist"; sourceTree = SOURCE_ROOT; };
10598
96E529D629C511F000E8E14D /* InternetChecker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InternetChecker.swift; sourceTree = "<group>"; };
106-
96EBED1229BA51970033771E /* UpdatesSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdatesSettingsView.swift; sourceTree = "<group>"; };
10799
96F79CC52AC622CE009FC622 /* CustomRepoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomRepoView.swift; sourceTree = "<group>"; };
108100
96F79CC72AC6388F009FC622 /* Repos.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Repos.swift; sourceTree = "<group>"; };
109101
96FA91062CE80446004BFD60 /* Patches.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Patches.swift; sourceTree = "<group>"; };
@@ -157,18 +149,14 @@
157149
96DE71D427EB9C7D0090E7A0 /* sm-osx-Info.plist */,
158150
9669DC6427D5565100DE5FAB /* sm_osx.entitlements */,
159151
9669DC5B27D5565000DE5FAB /* sm_osxApp.swift */,
160-
96AC85B0286670B800CCFF58 /* MenuCommands.swift */,
161-
96DE71D227EB9C170090E7A0 /* SettingsView.swift */,
162-
96BDA2F2283D216500A4DFF3 /* GeneralView.swift */,
163-
961C0A5229E9D29C00D50A80 /* AppearenceView.swift */,
164-
96EBED1229BA51970033771E /* UpdatesSettingsView.swift */,
165-
96BDA2F4283D221700A4DFF3 /* DeveloperView.swift */,
166-
963F238227F8B211004E010E /* LauncherView.swift */,
167-
96BB22E227E274F700057915 /* RepoView.swift */,
152+
96BEADAD2839986200FF72E3 /* CompilationView.swift */,
168153
96F79CC52AC622CE009FC622 /* CustomRepoView.swift */,
154+
963F238227F8B211004E010E /* LauncherView.swift */,
169155
9669DC6E27D55D5300DE5FAB /* PatchesView.swift */,
156+
96BB22E227E274F700057915 /* RepoView.swift */,
170157
9669DC7027D55F4700DE5FAB /* RomView.swift */,
171-
96BEADAD2839986200FF72E3 /* CompilationView.swift */,
158+
96DE71D227EB9C170090E7A0 /* SettingsView.swift */,
159+
96AC85B0286670B800CCFF58 /* MenuCommands.swift */,
172160
966A0E8C2ACF4A8C00199378 /* DevelopmentEnvironment.swift */,
173161
96BDA2F6283D283200A4DFF3 /* CrashView.swift */,
174162
96BDA2F8283D29E300A4DFF3 /* LogView.swift */,
@@ -291,14 +279,11 @@
291279
9669DC7127D55F4700DE5FAB /* RomView.swift in Sources */,
292280
966A0E8D2ACF4A8C00199378 /* DevelopmentEnvironment.swift in Sources */,
293281
96F79CC82AC6388F009FC622 /* Repos.swift in Sources */,
294-
96BDA2F3283D216500A4DFF3 /* GeneralView.swift in Sources */,
295282
96DE71D327EB9C170090E7A0 /* SettingsView.swift in Sources */,
296283
96C54E6D285930D7003B4A2D /* GlobalFunctions.swift in Sources */,
297-
96EBED1329BA51970033771E /* UpdatesSettingsView.swift in Sources */,
298284
960A559729B29DC600F5CC37 /* PlayHover.swift in Sources */,
299285
96BDA2F7283D283200A4DFF3 /* CrashView.swift in Sources */,
300286
960A559929B2A50100F5CC37 /* LauncherEditView.swift in Sources */,
301-
961C0A5329E9D29C00D50A80 /* AppearenceView.swift in Sources */,
302287
96E529D729C511F000E8E14D /* InternetChecker.swift in Sources */,
303288
9601BB1C29CB82240060BD24 /* UpdaterView.swift in Sources */,
304289
9669DC6F27D55D5300DE5FAB /* PatchesView.swift in Sources */,
@@ -308,7 +293,6 @@
308293
9669DC5C27D5565000DE5FAB /* sm_osxApp.swift in Sources */,
309294
96FA91072CE80449004BFD60 /* Patches.swift in Sources */,
310295
96CCFB7729E7158B00BE8CC7 /* LaunchScriptCommand.swift in Sources */,
311-
96BDA2F5283D221700A4DFF3 /* DeveloperView.swift in Sources */,
312296
);
313297
runOnlyForDeploymentPostprocessing = 0;
314298
};
@@ -445,9 +429,10 @@
445429
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
446430
CODE_SIGN_ENTITLEMENTS = sm_osx/sm_osx.entitlements;
447431
CODE_SIGN_IDENTITY = "Apple Development";
432+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
448433
CODE_SIGN_STYLE = Automatic;
449434
COMBINE_HIDPI_IMAGES = YES;
450-
CURRENT_PROJECT_VERSION = 18;
435+
CURRENT_PROJECT_VERSION = 19;
451436
DEAD_CODE_STRIPPING = YES;
452437
DEVELOPMENT_ASSET_PATHS = "\"sm_osx/Preview Content\"";
453438
DEVELOPMENT_TEAM = 6K864V7HLM;
@@ -463,7 +448,7 @@
463448
"@executable_path/../Frameworks",
464449
);
465450
MACOSX_DEPLOYMENT_TARGET = 13.0;
466-
MARKETING_VERSION = 1.3.5;
451+
MARKETING_VERSION = 1.3.6;
467452
ONLY_ACTIVE_ARCH = NO;
468453
PRODUCT_BUNDLE_IDENTIFIER = "com.CubingStudios.sm-osx";
469454
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -481,9 +466,10 @@
481466
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
482467
CODE_SIGN_ENTITLEMENTS = sm_osx/sm_osx.entitlements;
483468
CODE_SIGN_IDENTITY = "Apple Development";
469+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
484470
CODE_SIGN_STYLE = Automatic;
485471
COMBINE_HIDPI_IMAGES = YES;
486-
CURRENT_PROJECT_VERSION = 18;
472+
CURRENT_PROJECT_VERSION = 19;
487473
DEAD_CODE_STRIPPING = YES;
488474
DEVELOPMENT_ASSET_PATHS = "\"sm_osx/Preview Content\"";
489475
DEVELOPMENT_TEAM = 6K864V7HLM;
@@ -499,7 +485,7 @@
499485
"@executable_path/../Frameworks",
500486
);
501487
MACOSX_DEPLOYMENT_TARGET = 13.0;
502-
MARKETING_VERSION = 1.3.5;
488+
MARKETING_VERSION = 1.3.6;
503489
ONLY_ACTIVE_ARCH = NO;
504490
PRODUCT_BUNDLE_IDENTIFIER = "com.CubingStudios.sm-osx";
505491
PRODUCT_NAME = "$(TARGET_NAME)";

‎sm_osx.xcodeproj/project.xcworkspace/xcuserdata/calebelm.xcuserdatad/UserInterfaceState.xcuserstate‎

86.9 KB
Binary file not shown.

‎sm_osx/AppearenceView.swift‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎sm_osx/Assets.xcassets/AccentColor.colorset/Contents.json‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
{
22
"images" : [
33
{
4-
"filename" : "[email protected]",
54
"idiom" : "mac",
5+
"size" : "16x16",
66
"scale" : "1x",
7-
"size" : "16x16"
7+
"filename" : "[email protected]"
88
},
99
{
10-
"filename" : "[email protected]",
1110
"idiom" : "mac",
11+
"size" : "16x16",
1212
"scale" : "2x",
13-
"size" : "16x16"
13+
"filename" : "[email protected]"
1414
},
1515
{
16-
"filename" : "[email protected]",
1716
"idiom" : "mac",
17+
"size" : "32x32",
1818
"scale" : "1x",
19-
"size" : "32x32"
19+
"filename" : "[email protected]"
2020
},
2121
{
22-
"filename" : "[email protected]",
2322
"idiom" : "mac",
23+
"size" : "32x32",
2424
"scale" : "2x",
25-
"size" : "32x32"
25+
"filename" : "[email protected]"
2626
},
2727
{
28-
"filename" : "[email protected]",
2928
"idiom" : "mac",
29+
"size" : "128x128",
3030
"scale" : "1x",
31-
"size" : "128x128"
31+
"filename" : "[email protected]"
3232
},
3333
{
34-
"filename" : "[email protected]",
3534
"idiom" : "mac",
35+
"size" : "128x128",
3636
"scale" : "2x",
37-
"size" : "128x128"
37+
"filename" : "[email protected]"
3838
},
3939
{
40-
"filename" : "[email protected]",
4140
"idiom" : "mac",
41+
"size" : "256x256",
4242
"scale" : "1x",
43-
"size" : "256x256"
43+
"filename" : "[email protected]"
4444
},
4545
{
46-
"filename" : "[email protected]",
4746
"idiom" : "mac",
47+
"size" : "256x256",
4848
"scale" : "2x",
49-
"size" : "256x256"
49+
"filename" : "[email protected]"
5050
},
5151
{
52-
"filename" : "[email protected]",
5352
"idiom" : "mac",
53+
"size" : "512x512",
5454
"scale" : "1x",
55-
"size" : "512x512"
55+
"filename" : "[email protected]"
5656
},
5757
{
58-
"filename" : "[email protected]",
5958
"idiom" : "mac",
59+
"size" : "512x512",
6060
"scale" : "2x",
61-
"size" : "512x512"
61+
"filename" : "[email protected]"
6262
}
6363
],
6464
"info" : {
65-
"author" : "xcode",
66-
"version" : 1
65+
"version" : 1,
66+
"author" : "xcode"
6767
}
68-
}
68+
}

‎sm_osx/Assets.xcassets/AppIcon.appiconset/[email protected]‎

1.03 KB
Loading

‎sm_osx/Assets.xcassets/AppIcon.appiconset/[email protected]‎

2.74 KB
Loading

‎sm_osx/Assets.xcassets/AppIcon.appiconset/[email protected]‎

-34 Bytes
Loading

‎sm_osx/Assets.xcassets/AppIcon.appiconset/[email protected]‎

-59 Bytes
Loading

‎sm_osx/Assets.xcassets/AppIcon.appiconset/[email protected]‎

2.74 KB
Loading

0 commit comments

Comments
 (0)