Skip to content

Commit

Permalink
v2.3
Browse files Browse the repository at this point in the history 
Moved to Sparkle 2
  • Loading branch information
@nbolar
nbolar committed Feb 11, 2022
1 parent 0ce7b2e commit 48a3623
Show file tree
Hide file tree
Showing 11 changed files with 253 additions and 283 deletions.
104 changes: 97 additions & 7 deletions PlayStatus.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
Expand All @@ -18,14 +18,16 @@
4E825237227C3A8C003B8296 /* AboutVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E825236227C3A8C003B8296 /* AboutVC.swift */; };
4E8D52B322C2C6EF0062E6DB /* SearchVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E8D52B222C2C6EF0062E6DB /* SearchVC.swift */; };
4E917F17241B340A002469FF /* MusicController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E917F16241B340A002469FF /* MusicController.swift */; };
4E9E4204258DAFF000AC6964 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E9E4202258DAFD400AC6964 /* Sparkle.framework */; };
4E9E420D258DB11800AC6964 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4E9E4202258DAFD400AC6964 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4E9F8E7B22719AB500B87B4A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E9F8E7A22719AB500B87B4A /* AppDelegate.swift */; };
4E9F8E7F22719AB600B87B4A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4E9F8E7E22719AB600B87B4A /* Assets.xcassets */; };
4E9F8E8222719AB600B87B4A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4E9F8E8022719AB600B87B4A /* Main.storyboard */; };
4E9F8E8B2271EECF00B87B4A /* MusicVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E9F8E8A2271EECF00B87B4A /* MusicVC.swift */; };
4EA0AAE02442C0780047F9E7 /* ScrollingTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EA0AADF2442C0780047F9E7 /* ScrollingTextView.swift */; };
4EAD2B5A272DD6AC00575FEB /* LaunchAtLogin in Frameworks */ = {isa = PBXBuildFile; productRef = 4EAD2B59272DD6AC00575FEB /* LaunchAtLogin */; };
4EAD2B5D272DD6DC00575FEB /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 4EAD2B5C272DD6DC00575FEB /* Sparkle */; };
4EC07811259A9A5A00989B8C /* Variables.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EC07810259A9A5A00989B8C /* Variables.swift */; };
4EC7E8D1272DDA4600DAF681 /* KeyboardShortcuts in Frameworks */ = {isa = PBXBuildFile; productRef = 4EC7E8D0272DDA4600DAF681 /* KeyboardShortcuts */; };
4EC7E8D6272F348D00DAF681 /* CircularProgress in Frameworks */ = {isa = PBXBuildFile; productRef = 4EC7E8D5272F348D00DAF681 /* CircularProgress */; };
730A35C05EC3242F6C170242 /* Pods_PlayStatus.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ACD7ADCA35EC88A555549D8F /* Pods_PlayStatus.framework */; settings = {ATTRIBUTES = (Required, ); }; };
/* End PBXBuildFile section */

Expand All @@ -36,7 +38,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
4E9E420D258DB11800AC6964 /* Sparkle.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -55,7 +56,6 @@
4E825236227C3A8C003B8296 /* AboutVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutVC.swift; sourceTree = "<group>"; };
4E8D52B222C2C6EF0062E6DB /* SearchVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchVC.swift; sourceTree = "<group>"; };
4E917F16241B340A002469FF /* MusicController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MusicController.swift; sourceTree = "<group>"; };
4E9E4202258DAFD400AC6964 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
4E9F8E7722719AB500B87B4A /* PlayStatus.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PlayStatus.app; sourceTree = BUILT_PRODUCTS_DIR; };
4E9F8E7A22719AB500B87B4A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
4E9F8E7E22719AB600B87B4A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
Expand All @@ -74,8 +74,11 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
4EC7E8D6272F348D00DAF681 /* CircularProgress in Frameworks */,
4EAD2B5D272DD6DC00575FEB /* Sparkle in Frameworks */,
4EC7E8D1272DDA4600DAF681 /* KeyboardShortcuts in Frameworks */,
4EAD2B5A272DD6AC00575FEB /* LaunchAtLogin in Frameworks */,
730A35C05EC3242F6C170242 /* Pods_PlayStatus.framework in Frameworks */,
4E9E4204258DAFF000AC6964 /* Sparkle.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -162,7 +165,6 @@
993F83FD21DA739CF51E5585 /* Frameworks */ = {
isa = PBXGroup;
children = (
4E9E4202258DAFD400AC6964 /* Sparkle.framework */,
ACD7ADCA35EC88A555549D8F /* Pods_PlayStatus.framework */,
);
name = Frameworks;
Expand All @@ -182,12 +184,19 @@
523BD086F7D8D7EA53FB2D99 /* [CP] Embed Pods Frameworks */,
4E883F73240D96FC0097F5AF /* ShellScript */,
4E9E420C258DB0FA00AC6964 /* CopyFiles */,
4EAD2B57272DCD7900575FEB /* ShellScript */,
);
buildRules = (
);
dependencies = (
);
name = PlayStatus;
packageProductDependencies = (
4EAD2B59272DD6AC00575FEB /* LaunchAtLogin */,
4EAD2B5C272DD6DC00575FEB /* Sparkle */,
4EC7E8D0272DDA4600DAF681 /* KeyboardShortcuts */,
4EC7E8D5272F348D00DAF681 /* CircularProgress */,
);
productName = PlayStatus;
productReference = 4E9F8E7722719AB500B87B4A /* PlayStatus.app */;
productType = "com.apple.product-type.application";
Expand Down Expand Up @@ -225,6 +234,12 @@
Base,
);
mainGroup = 4E9F8E6E22719AB500B87B4A;
packageReferences = (
4EAD2B58272DD6AC00575FEB /* XCRemoteSwiftPackageReference "LaunchAtLogin" */,
4EAD2B5B272DD6DC00575FEB /* XCRemoteSwiftPackageReference "Sparkle" */,
4EC7E8CF272DDA4600DAF681 /* XCRemoteSwiftPackageReference "KeyboardShortcuts" */,
4EC7E8D4272F348D00DAF681 /* XCRemoteSwiftPackageReference "CircularProgress" */,
);
productRefGroup = 4E9F8E7822719AB500B87B4A /* Products */;
projectDirPath = "";
projectRoot = "";
Expand Down Expand Up @@ -261,6 +276,23 @@
shellScript = "
";
};
4EAD2B57272DCD7900575FEB /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\"${BUILT_PRODUCTS_DIR}/LaunchAtLogin_LaunchAtLogin.bundle/Contents/Resources/copy-helper-swiftpm.sh\"\n";
};
523BD086F7D8D7EA53FB2D99 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -541,6 +573,64 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
4EAD2B58272DD6AC00575FEB /* XCRemoteSwiftPackageReference "LaunchAtLogin" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/sindresorhus/LaunchAtLogin";
requirement = {
branch = main;
kind = branch;
};
};
4EAD2B5B272DD6DC00575FEB /* XCRemoteSwiftPackageReference "Sparkle" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/sparkle-project/Sparkle";
requirement = {
branch = 2.x;
kind = branch;
};
};
4EC7E8CF272DDA4600DAF681 /* XCRemoteSwiftPackageReference "KeyboardShortcuts" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/sindresorhus/KeyboardShortcuts";
requirement = {
branch = main;
kind = branch;
};
};
4EC7E8D4272F348D00DAF681 /* XCRemoteSwiftPackageReference "CircularProgress" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/sindresorhus/CircularProgress";
requirement = {
branch = main;
kind = branch;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
4EAD2B59272DD6AC00575FEB /* LaunchAtLogin */ = {
isa = XCSwiftPackageProductDependency;
package = 4EAD2B58272DD6AC00575FEB /* XCRemoteSwiftPackageReference "LaunchAtLogin" */;
productName = LaunchAtLogin;
};
4EAD2B5C272DD6DC00575FEB /* Sparkle */ = {
isa = XCSwiftPackageProductDependency;
package = 4EAD2B5B272DD6DC00575FEB /* XCRemoteSwiftPackageReference "Sparkle" */;
productName = Sparkle;
};
4EC7E8D0272DDA4600DAF681 /* KeyboardShortcuts */ = {
isa = XCSwiftPackageProductDependency;
package = 4EC7E8CF272DDA4600DAF681 /* XCRemoteSwiftPackageReference "KeyboardShortcuts" */;
productName = KeyboardShortcuts;
};
4EC7E8D5272F348D00DAF681 /* CircularProgress */ = {
isa = XCSwiftPackageProductDependency;
package = 4EC7E8D4272F348D00DAF681 /* XCRemoteSwiftPackageReference "CircularProgress" */;
productName = CircularProgress;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 4E9F8E6F22719AB500B87B4A /* Project object */;
}
2 changes: 1 addition & 1 deletion PlayStatus.xcodeproj/xcuserdata/nikhilbolar.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>PlayStatus.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
<integer>2</integer>
</dict>
</dict>
</dict>
Expand Down
17 changes: 12 additions & 5 deletions PlayStatus/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,18 @@

import Cocoa
import KeyboardShortcuts
import Sparkle



class AppDelegate: NSObject, NSApplicationDelegate, CAAnimationDelegate {

var songName: String!
var artistName: String!
var artistName: String!
var out: NSAppleEventDescriptor?

let updaterController: SPUStandardUpdaterController

private var lastStatusTitle: String = ""
let popoverView = NSPopover()
lazy var aboutView: NSWindowController? = NSStoryboard(name: "Main", bundle: nil).instantiateController(withIdentifier: "aboutWindowController") as? NSWindowController
Expand Down Expand Up @@ -76,6 +79,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, CAAnimationDelegate {
}
}

override init() {
updaterController = SPUStandardUpdaterController(startingUpdater: true, updaterDelegate: nil, userDriverDelegate: nil)
}



func applicationDidFinishLaunching(_ aNotification: Notification) {
Expand Down Expand Up @@ -386,10 +393,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, CAAnimationDelegate {

contentView.addSubview(scrollingStatusItemView)
NSLayoutConstraint.activate([
scrollingStatusItemView.topAnchor.constraint(equalTo: contentView.topAnchor),
scrollingStatusItemView.leftAnchor.constraint(equalTo: contentView.leftAnchor),
scrollingStatusItemView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
scrollingStatusItemView.rightAnchor.constraint(equalTo: contentView.rightAnchor)])
scrollingStatusItemView.topAnchor.constraint(equalTo: contentView.topAnchor),
scrollingStatusItemView.leftAnchor.constraint(equalTo: contentView.leftAnchor),
scrollingStatusItemView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
scrollingStatusItemView.rightAnchor.constraint(equalTo: contentView.rightAnchor)])
}


Expand Down
46 changes: 35 additions & 11 deletions PlayStatus/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19162"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19455"/>
<capability name="Image references" minToolsVersion="12.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down Expand Up @@ -703,7 +703,7 @@
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="PlayStatus" customModuleProvider="target"/>
<customObject id="YLy-65-1bz" customClass="NSFontManager"/>
<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
<customObject id="1UC-nn-hWm" customClass="SUUpdater"/>
<customObject id="u98-0q-W9o" customClass="SUUpdater"/>
</objects>
<point key="canvasLocation" x="75" y="0.0"/>
</scene>
Expand Down Expand Up @@ -794,13 +794,28 @@
<objects>
<viewController title="SearchVC" storyboardIdentifier="SearchVC" id="79J-r4-55O" customClass="SearchVC" customModule="PlayStatus" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="mSI-99-gHe">
<rect key="frame" x="0.0" y="0.0" width="300" height="25"/>
<rect key="frame" x="0.0" y="0.0" width="300" height="45"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="M7M-hu-IQJ">
<rect key="frame" x="0.0" y="0.0" width="304" height="20"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" placeholderString="Search to play a song from your iTunes library" id="QCQ-NO-9Wq">
<segmentedControl verticalHuggingPriority="750" springLoaded="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HkO-qC-Hsy">
<rect key="frame" x="-2" y="22" width="306" height="24"/>
<segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="0Hi-QB-SaF">
<font key="font" metaFont="system"/>
<segments>
<segment label="Library" width="149" selected="YES"/>
<segment label="Apple Music" width="148" tag="1"/>
</segments>
</segmentedCell>
<connections>
<action selector="segmentedButtonClicked:" target="79J-r4-55O" id="wGj-8o-IQm"/>
</connections>
</segmentedControl>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="M7M-hu-IQJ">
<rect key="frame" x="0.0" y="0.0" width="304" height="23"/>
<constraints>
<constraint firstAttribute="height" constant="23" id="AWX-YM-Ldy"/>
</constraints>
<textFieldCell key="cell" lineBreakMode="charWrapping" selectable="YES" editable="YES" alignment="left" placeholderString="Search to play a song" id="QCQ-NO-9Wq">
<font key="font" size="13" name="AvenirNext-Regular"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="displayP3"/>
Expand All @@ -815,6 +830,13 @@
</connections>
</textField>
</subviews>
<constraints>
<constraint firstItem="M7M-hu-IQJ" firstAttribute="top" secondItem="HkO-qC-Hsy" secondAttribute="bottom" id="1kQ-BB-xOj"/>
<constraint firstItem="HkO-qC-Hsy" firstAttribute="leading" secondItem="mSI-99-gHe" secondAttribute="leading" id="KcL-Mc-SvB"/>
<constraint firstItem="M7M-hu-IQJ" firstAttribute="leading" secondItem="mSI-99-gHe" secondAttribute="leading" constant="2" id="N9J-ah-D7I"/>
<constraint firstItem="HkO-qC-Hsy" firstAttribute="trailing" secondItem="M7M-hu-IQJ" secondAttribute="trailing" id="gei-hZ-DSf"/>
<constraint firstItem="HkO-qC-Hsy" firstAttribute="top" secondItem="mSI-99-gHe" secondAttribute="top" id="ufC-aN-uIX"/>
</constraints>
</view>
<connections>
<outlet property="searchTextField" destination="M7M-hu-IQJ" id="mpY-4P-P3x"/>
Expand Down Expand Up @@ -1349,6 +1371,8 @@
</connections>
</viewController>
<customObject id="hkX-AP-kdW" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
<userDefaultsController representsSharedInstance="YES" id="aIr-nW-rpE"/>
<customObject id="eBE-w5-mby" customClass="SPUStandardUpdaterController"/>
</objects>
<point key="canvasLocation" x="179.5" y="1459.5"/>
</scene>
Expand Down Expand Up @@ -1840,7 +1864,7 @@
</connections>
</button>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HjA-sr-knX">
<rect key="frame" x="131" y="136.5" width="40" height="57"/>
<rect key="frame" x="131" y="137" width="39.5" height="57"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="bevel" bezelStyle="rounded" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="Ctf-af-aXf">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
Expand Down Expand Up @@ -1925,9 +1949,9 @@
</scene>
</scenes>
<inferredMetricsTieBreakers>
<segue reference="77f-Fg-fLF"/>
<segue reference="Lr2-gf-hK7"/>
<segue reference="gCT-AH-W7T"/>
<segue reference="fYK-Gu-LlM"/>
<segue reference="DER-JH-wxt"/>
</inferredMetricsTieBreakers>
<resources>
<image name="NSActionTemplate" width="15" height="15"/>
Expand Down
2 changes: 1 addition & 1 deletion PlayStatus/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@
<key>SUFeedURL</key>
<string>https://s3.us-east-2.amazonaws.com/com.bolar.playstatus/appcast.xml</string>
<key>SUPublicEDKey</key>
<string>lbELfQlgydFvJuuiUviUq1UBXHbO/7JDGhsuy37MBF8=</string>
<string>3Fr24AIxySTikKQQhbRTMa+VZB9ntNu1fucFvodGeUE=</string>
</dict>
</plist>
Loading

0 comments on commit 48a3623

Please sign in to comment.