Skip to content

Commit

Permalink
Updates for Beta 2
Browse files Browse the repository at this point in the history
  • Loading branch information
@brunocastello
brunocastello committed Jul 3, 2023
1 parent f2bc570 commit b544a5a
Show file tree
Hide file tree
Showing 23 changed files with 1,092 additions and 1,127 deletions.
24 changes: 11 additions & 13 deletions Swift86.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
DE2AF0F62A467F130060CEAF /* ButtonStyles.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE2AF0F52A467F130060CEAF /* ButtonStyles.swift */; };
DE2AF0F82A467F5F0060CEAF /* PathControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE2AF0F72A467F5E0060CEAF /* PathControl.swift */; };
DE2AF0FA2A467F980060CEAF /* Machine.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE2AF0F92A467F980060CEAF /* Machine.swift */; };
DE2AF0FD2A467FEA0060CEAF /* SettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE2AF0FB2A467FEA0060CEAF /* SettingsViewModel.swift */; };
DE2AF0FE2A467FEA0060CEAF /* MachineViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE2AF0FC2A467FEA0060CEAF /* MachineViewModel.swift */; };
DE2AF1082A46800D0060CEAF /* AppearanceSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE2AF0FF2A46800C0060CEAF /* AppearanceSettingsView.swift */; };
DE2AF1092A46800D0060CEAF /* AddMachineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE2AF1002A46800C0060CEAF /* AddMachineView.swift */; };
DE2AF10A2A46800D0060CEAF /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE2AF1012A46800C0060CEAF /* ContentView.swift */; };
Expand All @@ -26,6 +24,7 @@
DE2AF10E2A46800D0060CEAF /* SidebarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE2AF1052A46800D0060CEAF /* SidebarView.swift */; };
DE2AF10F2A46800D0060CEAF /* WelcomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE2AF1062A46800D0060CEAF /* WelcomeView.swift */; };
DE2AF1102A46800D0060CEAF /* MachineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE2AF1072A46800D0060CEAF /* MachineView.swift */; };
DEE74D412A531D860029615E /* Store.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEE74D402A531D860029615E /* Store.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -39,8 +38,6 @@
DE2AF0F52A467F130060CEAF /* ButtonStyles.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonStyles.swift; sourceTree = "<group>"; };
DE2AF0F72A467F5E0060CEAF /* PathControl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PathControl.swift; sourceTree = "<group>"; };
DE2AF0F92A467F980060CEAF /* Machine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Machine.swift; sourceTree = "<group>"; };
DE2AF0FB2A467FEA0060CEAF /* SettingsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsViewModel.swift; sourceTree = "<group>"; };
DE2AF0FC2A467FEA0060CEAF /* MachineViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MachineViewModel.swift; sourceTree = "<group>"; };
DE2AF0FF2A46800C0060CEAF /* AppearanceSettingsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppearanceSettingsView.swift; sourceTree = "<group>"; };
DE2AF1002A46800C0060CEAF /* AddMachineView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddMachineView.swift; sourceTree = "<group>"; };
DE2AF1012A46800C0060CEAF /* ContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
Expand All @@ -50,6 +47,7 @@
DE2AF1052A46800D0060CEAF /* SidebarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SidebarView.swift; sourceTree = "<group>"; };
DE2AF1062A46800D0060CEAF /* WelcomeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WelcomeView.swift; sourceTree = "<group>"; };
DE2AF1072A46800D0060CEAF /* MachineView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MachineView.swift; sourceTree = "<group>"; };
DEE74D402A531D860029615E /* Store.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Store.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -83,7 +81,7 @@
isa = PBXGroup;
children = (
DE2AF0F02A467E5C0060CEAF /* Views */,
DE2AF0EF2A467E570060CEAF /* ViewModels */,
DE2AF0EF2A467E570060CEAF /* Data */,
DE2AF0EE2A467E500060CEAF /* Models */,
DE2AF0ED2A467E490060CEAF /* Helpers */,
DE2AF0EC2A467E440060CEAF /* Styles */,
Expand Down Expand Up @@ -129,13 +127,12 @@
path = Models;
sourceTree = "<group>";
};
DE2AF0EF2A467E570060CEAF /* ViewModels */ = {
DE2AF0EF2A467E570060CEAF /* Data */ = {
isa = PBXGroup;
children = (
DE2AF0FB2A467FEA0060CEAF /* SettingsViewModel.swift */,
DE2AF0FC2A467FEA0060CEAF /* MachineViewModel.swift */,
DEE74D402A531D860029615E /* Store.swift */,
);
path = ViewModels;
path = Data;
sourceTree = "<group>";
};
DE2AF0F02A467E5C0060CEAF /* Views */ = {
Expand Down Expand Up @@ -225,10 +222,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
DEE74D412A531D860029615E /* Store.swift in Sources */,
DE2AF0F22A467E8B0060CEAF /* AppDelegate.swift in Sources */,
DE2AF0F62A467F130060CEAF /* ButtonStyles.swift in Sources */,
DE2AF10C2A46800D0060CEAF /* EditMachineView.swift in Sources */,
DE2AF0FE2A467FEA0060CEAF /* MachineViewModel.swift in Sources */,
DE2AF1082A46800D0060CEAF /* AppearanceSettingsView.swift in Sources */,
DE2AF10B2A46800D0060CEAF /* GeneralSettingsView.swift in Sources */,
DE2AF1092A46800D0060CEAF /* AddMachineView.swift in Sources */,
Expand All @@ -239,7 +236,6 @@
DE2AF0DE2A467E120060CEAF /* Swift86App.swift in Sources */,
DE2AF1102A46800D0060CEAF /* MachineView.swift in Sources */,
DE2AF0FA2A467F980060CEAF /* Machine.swift in Sources */,
DE2AF0FD2A467FEA0060CEAF /* SettingsViewModel.swift in Sources */,
DE2AF10D2A46800D0060CEAF /* SettingsView.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -368,7 +364,7 @@
CODE_SIGN_ENTITLEMENTS = Swift86/Swift86.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = Beta;
CURRENT_PROJECT_VERSION = "Beta 2";
DEVELOPMENT_ASSET_PATHS = "\"Swift86/Preview Content\"";
DEVELOPMENT_TEAM = 53AGWD6XKH;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -381,6 +377,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.castellodesigns.Swift86;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -397,7 +394,7 @@
CODE_SIGN_ENTITLEMENTS = Swift86/Swift86.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = Beta;
CURRENT_PROJECT_VERSION = "Beta 2";
DEVELOPMENT_ASSET_PATHS = "\"Swift86/Preview Content\"";
DEVELOPMENT_TEAM = 53AGWD6XKH;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -410,6 +407,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.castellodesigns.Swift86;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
Binary file modified ...deproj/project.xcworkspace/xcuserdata/bruninho.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
38 changes: 24 additions & 14 deletions Swift86/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,39 @@ class AppDelegate: NSObject, NSApplicationDelegate {

// MARK: - Methods

// Function to set the application appearance
func applicationShouldSetAppearance() {
// Retrieve the theme preference from UserDefaults
if let settings = UserDefaults.standard.dictionary(forKey: SettingsKeys.settings.rawValue),
let appearance = settings[SettingsKeys.appearance.rawValue] as? String,
let appearanceValue = AppearanceKeys(rawValue: appearance) {
// Set the appearance based on the selected theme
NSApp.appearance = NSAppearance(named: NSAppearance.Name(rawValue: appearanceValue.rawValue))
}
}

// Function called when the application has finished launching
func applicationDidFinishLaunching(_ notification: Notification) {
// Disables the automatic tabbing behavior for windows
NSWindow.allowsAutomaticWindowTabbing = false

// Set default values for UserDefaults
let settings: [String: Any] = [
"EmulatorPath": "/Applications/86Box.app",
"MachinesPath": ("~/Documents" as NSString).expandingTildeInPath,
"RomsPath": ("~/Library/Application Support/net.86box.86Box/roms" as NSString).expandingTildeInPath,
"CustomROMs": false,
"Appearance": ""
]

// Set application appearance
applicationShouldSetAppearance()
// Check if any of the keys in the settings dictionary is empty and update its value if necessary
for (key, value) in settings {
if UserDefaults.standard.object(forKey: key) == nil {
UserDefaults.standard.set(value, forKey: key)
}
}

// Register default values for UserDefaults
UserDefaults.standard.register(defaults: settings)

// Set application user appearance preference
if let theme = UserDefaults.standard.object(forKey: "Appearance") as? String {
NSApp.appearance = NSAppearance(named: NSAppearance.Name(rawValue: theme))
}
}

// Function called when the application becomes active
func applicationDidBecomeActive(_ notification: Notification) {
// NSApp.mainWindow?.makeKeyAndOrderFront(self)
NSApp.mainWindow?.makeKeyAndOrderFront(self)
}

// Function to terminate the application after last window closed
Expand Down
Binary file removed Swift86/Assets.xcassets/86Box.imageset/[email protected]
View file
Binary file not shown.
Binary file removed Swift86/Assets.xcassets/86Box.imageset/[email protected]
View file
Binary file not shown.
Binary file removed Swift86/Assets.xcassets/86Box.imageset/[email protected]
View file
Binary file not shown.
23 changes: 0 additions & 23 deletions Swift86/Assets.xcassets/86Box.imageset/Contents.json
View file

This file was deleted.

Loading

0 comments on commit b544a5a

Please sign in to comment.