From c69bc2b8b70ac8384d95e037f829bb624a9b9a77 Mon Sep 17 00:00:00 2001 From: Alex Taffe Date: Tue, 27 Nov 2018 19:51:05 -0500 Subject: [PATCH] Add initial sparkle build --- .gitignore | 1 + BetteReddit.xcodeproj/project.pbxproj | 10 +++++-- BetteReddit/AppDelegate.m | 9 ++++-- BetteReddit/Base.lproj/Main.storyboard | 11 ++++++- BetteReddit/Info.plist | 40 ++++++++++++++++++++++++++ Podfile | 1 + dsa_pub.pem | 36 +++++++++++++++++++++++ 7 files changed, 103 insertions(+), 5 deletions(-) create mode 100644 dsa_pub.pem diff --git a/.gitignore b/.gitignore index 6cea4d7..8a8e7fe 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ fastlane/test_output iOSInjectionProject/ config.plist +dsa_priv.pem diff --git a/BetteReddit.xcodeproj/project.pbxproj b/BetteReddit.xcodeproj/project.pbxproj index a1e1fe5..74130db 100644 --- a/BetteReddit.xcodeproj/project.pbxproj +++ b/BetteReddit.xcodeproj/project.pbxproj @@ -14,6 +14,7 @@ FA0D1B29219CE75D00050BB0 /* ContentSplitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA0D1B28219CE75D00050BB0 /* ContentSplitViewController.m */; }; FA0D1B2C219CE7CA00050BB0 /* CommentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA0D1B2B219CE7CA00050BB0 /* CommentViewController.m */; }; FA0D1B30219CE8A600050BB0 /* ContentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA0D1B2E219CE8A600050BB0 /* ContentViewController.m */; }; + FA26B8C421AE08BF006549B9 /* Preferences.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FA26B8C321AE08BF006549B9 /* Preferences.storyboard */; }; FA4CA82321A8871600181389 /* NSString+NumberShortner.m in Sources */ = {isa = PBXBuildFile; fileRef = FA4CA82221A8871600181389 /* NSString+NumberShortner.m */; }; FA4CA82621A9195F00181389 /* NSImage+Resize.m in Sources */ = {isa = PBXBuildFile; fileRef = FA4CA82521A9195F00181389 /* NSImage+Resize.m */; }; FA4FE6E8219F5264004CC677 /* CommentTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FA4FE6E7219F5264004CC677 /* CommentTableViewCell.m */; }; @@ -70,6 +71,7 @@ FA0D1B2B219CE7CA00050BB0 /* CommentViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CommentViewController.m; sourceTree = ""; }; FA0D1B2D219CE8A600050BB0 /* ContentViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContentViewController.h; sourceTree = ""; }; FA0D1B2E219CE8A600050BB0 /* ContentViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ContentViewController.m; sourceTree = ""; }; + FA26B8C321AE08BF006549B9 /* Preferences.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Preferences.storyboard; sourceTree = ""; }; FA4CA82121A8871600181389 /* NSString+NumberShortner.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+NumberShortner.h"; sourceTree = ""; }; FA4CA82221A8871600181389 /* NSString+NumberShortner.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+NumberShortner.m"; sourceTree = ""; }; FA4CA82421A9195F00181389 /* NSImage+Resize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSImage+Resize.h"; sourceTree = ""; }; @@ -276,6 +278,7 @@ FA8F394D20BB759C007CAC55 /* AppDelegate.h */, FA8F394E20BB759C007CAC55 /* AppDelegate.m */, FA8F395820BB759E007CAC55 /* Main.storyboard */, + FA26B8C321AE08BF006549B9 /* Preferences.storyboard */, FA8F395620BB759E007CAC55 /* Assets.xcassets */, FA8F395B20BB759E007CAC55 /* Info.plist */, FA8F395C20BB759E007CAC55 /* main.m */, @@ -422,6 +425,7 @@ FA8F395720BB759E007CAC55 /* Assets.xcassets in Resources */, FA8F395A20BB759E007CAC55 /* Main.storyboard in Resources */, FA08A278219BB65E00E49E71 /* config.plist in Resources */, + FA26B8C421AE08BF006549B9 /* Preferences.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -450,12 +454,13 @@ inputFileListPaths = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-BetteReddit/Pods-BetteReddit-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-BetteReddit/Pods-BetteReddit-frameworks.sh", "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", "${BUILT_PRODUCTS_DIR}/AppAuth/AppAuth.framework", "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework", "${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework", "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", + "${PODS_ROOT}/Sparkle/Sparkle.framework", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( @@ -466,10 +471,11 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sparkle.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-BetteReddit/Pods-BetteReddit-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-BetteReddit/Pods-BetteReddit-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; F27456B90D3392B0F17399AF /* [CP] Check Pods Manifest.lock */ = { diff --git a/BetteReddit/AppDelegate.m b/BetteReddit/AppDelegate.m index 10a5c8f..d2185b8 100644 --- a/BetteReddit/AppDelegate.m +++ b/BetteReddit/AppDelegate.m @@ -116,6 +116,11 @@ - (IBAction)refreshFeed:(id)sender { - (IBAction)refreshPost:(id)sender { } +- (IBAction)showPreferences:(id)sender { + NSStoryboard *storyboard = [NSStoryboard storyboardWithName:@"Preferences" bundle:nil]; + NSWindowController *window = [storyboard instantiateInitialController]; + [window showWindow:self]; +} - (void)applicationWillTerminate:(NSNotification *)aNotification { // Insert code here to tear down your application @@ -125,8 +130,8 @@ - (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisible if(flag){ return false; } else { - NSStoryboard *storyBoard = [NSStoryboard storyboardWithName:@"Main" bundle:nil]; - NSWindowController *window = [storyBoard instantiateInitialController]; + NSStoryboard *storyboard = [NSStoryboard storyboardWithName:@"Main" bundle:nil]; + NSWindowController *window = [storyboard instantiateInitialController]; [window showWindow:self]; return true; } diff --git a/BetteReddit/Base.lproj/Main.storyboard b/BetteReddit/Base.lproj/Main.storyboard index 683439e..426aa8d 100644 --- a/BetteReddit/Base.lproj/Main.storyboard +++ b/BetteReddit/Base.lproj/Main.storyboard @@ -25,8 +25,15 @@ + + + - + + + + + @@ -712,6 +719,8 @@ + + diff --git a/BetteReddit/Info.plist b/BetteReddit/Info.plist index fb0e2a7..af847db 100644 --- a/BetteReddit/Info.plist +++ b/BetteReddit/Info.plist @@ -39,5 +39,45 @@ Main NSPrincipalClass NSApplication + SUFeedURL + https://raw.githubusercontent.com/alex-taffe/BetteReddit/master/appcast.xml + SUPublicEDKey + -----BEGIN PUBLIC KEY----- +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 +9qD6OAGNrGJGTZoZytSd1FA2nBRq9lTTkiW4 +-----END PUBLIC KEY----- + diff --git a/Podfile b/Podfile index a28b525..9744ef4 100644 --- a/Podfile +++ b/Podfile @@ -7,4 +7,5 @@ target 'BetteReddit' do pod 'SAMKeychain' pod 'SDWebImage' pod 'Masonry' + pod 'Sparkle' end diff --git a/dsa_pub.pem b/dsa_pub.pem new file mode 100644 index 0000000..6208266 --- /dev/null +++ b/dsa_pub.pem @@ -0,0 +1,36 @@ +-----BEGIN PUBLIC KEY----- +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 +9qD6OAGNrGJGTZoZytSd1FA2nBRq9lTTkiW4 +-----END PUBLIC KEY-----