Skip to content

Commit

Permalink
🚀 Rewrote UI.
Browse files Browse the repository at this point in the history
  • Loading branch information
@sunsetsonwheels
sunsetsonwheels committed Apr 23, 2022
1 parent bfd60d3 commit 02d54d4
Show file tree
Hide file tree
Showing 27 changed files with 498 additions and 419 deletions.
72 changes: 45 additions & 27 deletions AppleMusicDiscordRPC/AppleMusicDiscordRPC.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@
/* Begin PBXBuildFile section */
2E6E06E42711BD880028F77D /* SwordRPC in Frameworks */ = {isa = PBXBuildFile; productRef = 2E6E06E32711BD880028F77D /* SwordRPC */; };
2EA352FD26D5201900271909 /* MusicScriptingBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EA352FC26D5201900271909 /* MusicScriptingBridge.swift */; };
2EEA817B26D74993009360AF /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EEA817A26D74993009360AF /* SettingsView.swift */; };
2EEA817D26D74D21009360AF /* SettingsEnums.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EEA817C26D74D21009360AF /* SettingsEnums.swift */; };
2EEA817B26D74993009360AF /* PreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EEA817A26D74993009360AF /* PreferencesView.swift */; };
2EF0AC312813E5F600EEDC5F /* RootNavigationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EF0AC302813E5F600EEDC5F /* RootNavigationView.swift */; };
2EF39E0D268D912200299C7F /* AMDiscordRPCApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EF39E0C268D912200299C7F /* AMDiscordRPCApp.swift */; };
2EF39E0F268D912200299C7F /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EF39E0E268D912200299C7F /* ContentView.swift */; };
2EF39E0F268D912200299C7F /* RPCStatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EF39E0E268D912200299C7F /* RPCStatusView.swift */; };
2EF39E11268D912300299C7F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2EF39E10268D912300299C7F /* Assets.xcassets */; };
2EF39E14268D912300299C7F /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2EF39E13268D912300299C7F /* Preview Assets.xcassets */; };
2EF39E1D268D913A00299C7F /* DiscordRichPresence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EF39E1C268D913A00299C7F /* DiscordRichPresence.swift */; };
2EF39E1D268D913A00299C7F /* DiscordRPCObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EF39E1C268D913A00299C7F /* DiscordRPCObservable.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
2EA352FC26D5201900271909 /* MusicScriptingBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MusicScriptingBridge.swift; sourceTree = "<group>"; };
2EEA817A26D74993009360AF /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
2EEA817C26D74D21009360AF /* SettingsEnums.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsEnums.swift; sourceTree = "<group>"; };
2EF39E09268D912200299C7F /* AppleMusicDiscordRPC.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AppleMusicDiscordRPC.app; sourceTree = BUILT_PRODUCTS_DIR; };
2EEA817A26D74993009360AF /* PreferencesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesView.swift; sourceTree = "<group>"; };
2EF0AC302813E5F600EEDC5F /* RootNavigationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootNavigationView.swift; sourceTree = "<group>"; };
2EF39E09268D912200299C7F /* Apple Music Discord RPC.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Apple Music Discord RPC.app"; sourceTree = BUILT_PRODUCTS_DIR; };
2EF39E0C268D912200299C7F /* AMDiscordRPCApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AMDiscordRPCApp.swift; sourceTree = "<group>"; };
2EF39E0E268D912200299C7F /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
2EF39E0E268D912200299C7F /* RPCStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RPCStatusView.swift; sourceTree = "<group>"; };
2EF39E10268D912300299C7F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
2EF39E13268D912300299C7F /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
2EF39E15268D912300299C7F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2EF39E16268D912300299C7F /* AppleMusicDiscordRPC.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AppleMusicDiscordRPC.entitlements; sourceTree = "<group>"; };
2EF39E1C268D913A00299C7F /* DiscordRichPresence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiscordRichPresence.swift; sourceTree = "<group>"; };
2EF39E1C268D913A00299C7F /* DiscordRPCObservable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiscordRPCObservable.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -44,6 +44,25 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
2EF0AC322813EBB100EEDC5F /* Modals */ = {
isa = PBXGroup;
children = (
2EA352FC26D5201900271909 /* MusicScriptingBridge.swift */,
2EF39E1C268D913A00299C7F /* DiscordRPCObservable.swift */,
);
path = Modals;
sourceTree = "<group>";
};
2EF0AC332813EBC000EEDC5F /* Views */ = {
isa = PBXGroup;
children = (
2EF39E0E268D912200299C7F /* RPCStatusView.swift */,
2EEA817A26D74993009360AF /* PreferencesView.swift */,
2EF0AC302813E5F600EEDC5F /* RootNavigationView.swift */,
);
path = Views;
sourceTree = "<group>";
};
2EF39E00268D912200299C7F = {
isa = PBXGroup;
children = (
Expand All @@ -55,20 +74,17 @@
2EF39E0A268D912200299C7F /* Products */ = {
isa = PBXGroup;
children = (
2EF39E09268D912200299C7F /* AppleMusicDiscordRPC.app */,
2EF39E09268D912200299C7F /* Apple Music Discord RPC.app */,
);
name = Products;
sourceTree = "<group>";
};
2EF39E0B268D912200299C7F /* AppleMusicDiscordRPC */ = {
isa = PBXGroup;
children = (
2EA352FC26D5201900271909 /* MusicScriptingBridge.swift */,
2EEA817C26D74D21009360AF /* SettingsEnums.swift */,
2EF39E1C268D913A00299C7F /* DiscordRichPresence.swift */,
2EF0AC322813EBB100EEDC5F /* Modals */,
2EF0AC332813EBC000EEDC5F /* Views */,
2EF39E0C268D912200299C7F /* AMDiscordRPCApp.swift */,
2EF39E0E268D912200299C7F /* ContentView.swift */,
2EEA817A26D74993009360AF /* SettingsView.swift */,
2EF39E10268D912300299C7F /* Assets.xcassets */,
2EF39E15268D912300299C7F /* Info.plist */,
2EF39E16268D912300299C7F /* AppleMusicDiscordRPC.entitlements */,
Expand All @@ -88,9 +104,9 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
2EF39E08268D912200299C7F /* AppleMusicDiscordRPC */ = {
2EF39E08268D912200299C7F /* Apple Music Discord RPC */ = {
isa = PBXNativeTarget;
buildConfigurationList = 2EF39E19268D912300299C7F /* Build configuration list for PBXNativeTarget "AppleMusicDiscordRPC" */;
buildConfigurationList = 2EF39E19268D912300299C7F /* Build configuration list for PBXNativeTarget "Apple Music Discord RPC" */;
buildPhases = (
2EF39E05268D912200299C7F /* Sources */,
2EF39E06268D912200299C7F /* Frameworks */,
Expand All @@ -100,12 +116,12 @@
);
dependencies = (
);
name = AppleMusicDiscordRPC;
name = "Apple Music Discord RPC";
packageProductDependencies = (
2E6E06E32711BD880028F77D /* SwordRPC */,
);
productName = AppleMusicRichPresence;
productReference = 2EF39E09268D912200299C7F /* AppleMusicDiscordRPC.app */;
productReference = 2EF39E09268D912200299C7F /* Apple Music Discord RPC.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
Expand Down Expand Up @@ -138,7 +154,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
2EF39E08268D912200299C7F /* AppleMusicDiscordRPC */,
2EF39E08268D912200299C7F /* Apple Music Discord RPC */,
);
};
/* End PBXProject section */
Expand All @@ -160,10 +176,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
2EEA817B26D74993009360AF /* SettingsView.swift in Sources */,
2EF39E0F268D912200299C7F /* ContentView.swift in Sources */,
2EF39E1D268D913A00299C7F /* DiscordRichPresence.swift in Sources */,
2EEA817D26D74D21009360AF /* SettingsEnums.swift in Sources */,
2EF0AC312813E5F600EEDC5F /* RootNavigationView.swift in Sources */,
2EEA817B26D74993009360AF /* PreferencesView.swift in Sources */,
2EF39E0F268D912200299C7F /* RPCStatusView.swift in Sources */,
2EF39E1D268D913A00299C7F /* DiscordRPCObservable.swift in Sources */,
2EA352FD26D5201900271909 /* MusicScriptingBridge.swift in Sources */,
2EF39E0D268D912200299C7F /* AMDiscordRPCApp.swift in Sources */,
);
Expand Down Expand Up @@ -296,6 +312,7 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_ASSET_PATHS = "\"AppleMusicDiscordRPC/Preview Content\"";
DEVELOPMENT_TEAM = 2VZNUT7D2E;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -306,7 +323,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.3;
MARKETING_VERSION = 1.0.0;
MARKETING_VERSION = 1.1.0;
PRODUCT_BUNDLE_IDENTIFIER = me.jkelol111.AppleMusicDiscordRPC;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All @@ -322,6 +339,7 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_ASSET_PATHS = "\"AppleMusicDiscordRPC/Preview Content\"";
DEVELOPMENT_TEAM = 2VZNUT7D2E;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -332,7 +350,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.3;
MARKETING_VERSION = 1.0.0;
MARKETING_VERSION = 1.1.0;
PRODUCT_BUNDLE_IDENTIFIER = me.jkelol111.AppleMusicDiscordRPC;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All @@ -351,7 +369,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
2EF39E19268D912300299C7F /* Build configuration list for PBXNativeTarget "AppleMusicDiscordRPC" */ = {
2EF39E19268D912300299C7F /* Build configuration list for PBXNativeTarget "Apple Music Discord RPC" */ = {
isa = XCConfigurationList;
buildConfigurations = (
2EF39E1A268D912300299C7F /* Debug */,
Expand Down
6 changes: 3 additions & 3 deletions ...rdRPC/AppleMusicDiscordRPC.xcodeproj/xcshareddata/xcschemes/AppleMusicDiscordRPC.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "2EF39E08268D912200299C7F"
BuildableName = "AppleMusicDiscordRPC.app"
BlueprintName = "AppleMusicDiscordRPC"
BlueprintName = "Apple Music Discord RPC"
ReferencedContainer = "container:AppleMusicDiscordRPC.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand Down Expand Up @@ -46,7 +46,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "2EF39E08268D912200299C7F"
BuildableName = "AppleMusicDiscordRPC.app"
BlueprintName = "AppleMusicDiscordRPC"
BlueprintName = "Apple Music Discord RPC"
ReferencedContainer = "container:AppleMusicDiscordRPC.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
Expand All @@ -63,7 +63,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "2EF39E08268D912200299C7F"
BuildableName = "AppleMusicDiscordRPC.app"
BlueprintName = "AppleMusicDiscordRPC"
BlueprintName = "Apple Music Discord RPC"
ReferencedContainer = "container:AppleMusicDiscordRPC.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
Expand Down
28 changes: 21 additions & 7 deletions AppleMusicDiscordRPC/AppleMusicDiscordRPC/AMDiscordRPCApp.swift
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,33 @@
import SwiftUI

enum AppView {
case rpcStatus
case preferences
}

@main
struct AMDiscordRPCApp: App {
@StateObject var rpcObservable: DiscordRPCObservable = DiscordRPCObservable()
@StateObject private var rpcObservable: DiscordRPCObservable = DiscordRPCObservable()

@State private var selectedView: AppView? = .rpcStatus

var body: some Scene {
WindowGroup {
ContentView().environmentObject(self.rpcObservable)
}.commands {
RootNavigationView(selectedView: self.$selectedView)
.environmentObject(self.rpcObservable)
.onReceive(NotificationCenter.default.publisher(for: NSApplication.willTerminateNotification)) { output in
self.rpcObservable.disconnectFromDiscord()
}
}
.commands {
CommandGroup(replacing: .appSettings) {
Button("Preferences...") {
self.selectedView = .preferences
}
.keyboardShortcut(",")
}
CommandGroup(replacing: .newItem) {}
CommandGroup(replacing: .help) {}
}

Settings {
SettingsView().environmentObject(self.rpcObservable)
}
}
}
9 changes: 9 additions & 0 deletions AppleMusicDiscordRPC/AppleMusicDiscordRPC/Assets.xcassets/AccentColor.colorset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x44",
"green" : "0x3C",
"red" : "0xFC"
}
},
"idiom" : "universal"
}
],
Expand Down
10 changes: 10 additions & 0 deletions AppleMusicDiscordRPC/AppleMusicDiscordRPC/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -1,51 +1,61 @@
{
"images" : [
{
"filename" : "icon_16x16.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "16x16"
},
{
"filename" : "icon_16x16@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "16x16"
},
{
"filename" : "icon_32x32.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "32x32"
},
{
"filename" : "icon_32x32@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "32x32"
},
{
"filename" : "icon_128x128.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "128x128"
},
{
"filename" : "icon_128x128@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "128x128"
},
{
"filename" : "icon_256x256.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "256x256"
},
{
"filename" : "icon_256x256@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "256x256"
},
{
"filename" : "icon_512x512.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "512x512"
},
{
"filename" : "icon_512x512@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "512x512"
Expand Down
Binary file added ...ordRPC/AppleMusicDiscordRPC/Assets.xcassets/AppIcon.appiconset/icon_128x128.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...RPC/AppleMusicDiscordRPC/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...scordRPC/AppleMusicDiscordRPC/Assets.xcassets/AppIcon.appiconset/icon_16x16.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...rdRPC/AppleMusicDiscordRPC/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ordRPC/AppleMusicDiscordRPC/Assets.xcassets/AppIcon.appiconset/icon_256x256.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...RPC/AppleMusicDiscordRPC/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...scordRPC/AppleMusicDiscordRPC/Assets.xcassets/AppIcon.appiconset/icon_32x32.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...rdRPC/AppleMusicDiscordRPC/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ordRPC/AppleMusicDiscordRPC/Assets.xcassets/AppIcon.appiconset/icon_512x512.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...RPC/AppleMusicDiscordRPC/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions AppleMusicDiscordRPC/AppleMusicDiscordRPC/Assets.xcassets/NoArtwork.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "No Album Artwork.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...PC/AppleMusicDiscordRPC/Assets.xcassets/NoArtwork.imageset/No Album Artwork.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 02d54d4

Please sign in to comment.