Merge pull request #90 from vineetchoudhary/development

Development
getappbox · Jan 7, 2018 · 704c567 · 704c567
2 parents 78ee55e + 4b3e32d
commit 704c567
Show file tree

Hide file tree

Showing 29 changed files with 892 additions and 2,617 deletions.
diff --git a/AppBox.xcodeproj/project.pbxproj b/AppBox.xcodeproj/project.pbxproj
@@ -23,6 +23,11 @@
 		DB45B45B1F6EC5EE0041EB42 /* PythonServer.sh in Resources */ = {isa = PBXBuildFile; fileRef = DB3D7CC81F64501F00217096 /* PythonServer.sh */; };
 		DB45B45C1F6EC5F10041EB42 /* SwitchXcode.sh in Resources */ = {isa = PBXBuildFile; fileRef = DB45B4591F6EC3B80041EB42 /* SwitchXcode.sh */; };
 		DB5F8E991FB880FB009C3BD0 /* XcodeVersion.sh in Resources */ = {isa = PBXBuildFile; fileRef = DB5F8E981FB87C79009C3BD0 /* XcodeVersion.sh */; };
+		DB831BCB1FF6B5780065B646 /* ABHudViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DB831BC91FF6B5780065B646 /* ABHudViewController.m */; };
+		DB831BCC1FF6B5780065B646 /* ABHudViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DB831BCA1FF6B5780065B646 /* ABHudViewController.xib */; };
+		DB8CE5F81FF77199003FEB65 /* DisabledView.m in Sources */ = {isa = PBXBuildFile; fileRef = DB8CE5F71FF77199003FEB65 /* DisabledView.m */; };
+		DB8CE5FF1FF796A8003FEB65 /* Ads.m in Sources */ = {isa = PBXBuildFile; fileRef = DB8CE5FE1FF796A8003FEB65 /* Ads.m */; };
+		DB8CE6051FF7AA6A003FEB65 /* AdStore.m in Sources */ = {isa = PBXBuildFile; fileRef = DB8CE6041FF7AA6A003FEB65 /* AdStore.m */; };
 		DBA66CF11FDCF4A60002A956 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DBA66CF01FDCF4A60002A956 /* Main.storyboard */; };
 		DBA66CF61FDD08E60002A956 /* LocalServerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DBA66CF41FDD08E60002A956 /* LocalServerViewController.m */; };
 		DBDCFBBE1F99C7860022097B /* UploadManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DBDCFBBD1F99C7860022097B /* UploadManager.m */; };
@@ -92,7 +97,6 @@
 		E1D12EEC1EC31AC80065E59A /* AccountPreferencesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E1D12EEB1EC31AC80065E59A /* AccountPreferencesViewController.xib */; };
 		E1D12EEE1EC320760065E59A /* HelpPreferencesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E1D12EED1EC320760065E59A /* HelpPreferencesViewController.xib */; };
 		E1D479C41E4AE4BC00BBC838 /* GitRepoDetails.m in Sources */ = {isa = PBXBuildFile; fileRef = E1D479C31E4AE4BC00BBC838 /* GitRepoDetails.m */; };
-		E1DC25FD1ECDBC16001EF106 /* MBProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = E1DC25FC1ECDBC16001EF106 /* MBProgressHUD.m */; };
 		E1DC26001ECDBCA8001EF106 /* MBProgressHUD+ProgressHud.m in Sources */ = {isa = PBXBuildFile; fileRef = E1DC25FF1ECDBCA8001EF106 /* MBProgressHUD+ProgressHud.m */; };
 		E1E215B71E869BDF0091565D /* ITCLoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E1E215B61E869BDF0091565D /* ITCLoginViewController.m */; };
 		E1E215BB1E869BF70091565D /* ITCLogin.m in Sources */ = {isa = PBXBuildFile; fileRef = E1E215BA1E869BF70091565D /* ITCLogin.m */; };
@@ -141,6 +145,15 @@
 		DB425C041F8A517D008CB032 /* DefaultSettings.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DefaultSettings.m; sourceTree = "<group>"; };
 		DB45B4591F6EC3B80041EB42 /* SwitchXcode.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = SwitchXcode.sh; sourceTree = "<group>"; };
 		DB5F8E981FB87C79009C3BD0 /* XcodeVersion.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = XcodeVersion.sh; sourceTree = "<group>"; };
+		DB831BC81FF6B5780065B646 /* ABHudViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ABHudViewController.h; sourceTree = "<group>"; };
+		DB831BC91FF6B5780065B646 /* ABHudViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ABHudViewController.m; sourceTree = "<group>"; };
+		DB831BCA1FF6B5780065B646 /* ABHudViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ABHudViewController.xib; sourceTree = "<group>"; };
+		DB8CE5F61FF77199003FEB65 /* DisabledView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DisabledView.h; sourceTree = "<group>"; };
+		DB8CE5F71FF77199003FEB65 /* DisabledView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DisabledView.m; sourceTree = "<group>"; };
+		DB8CE5FD1FF796A8003FEB65 /* Ads.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Ads.h; sourceTree = "<group>"; };
+		DB8CE5FE1FF796A8003FEB65 /* Ads.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Ads.m; sourceTree = "<group>"; };
+		DB8CE6031FF7AA6A003FEB65 /* AdStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AdStore.h; sourceTree = "<group>"; };
+		DB8CE6041FF7AA6A003FEB65 /* AdStore.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AdStore.m; sourceTree = "<group>"; };
 		DBA66CF01FDCF4A60002A956 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
 		DBA66CF31FDD08E60002A956 /* LocalServerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LocalServerViewController.h; sourceTree = "<group>"; };
 		DBA66CF41FDD08E60002A956 /* LocalServerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LocalServerViewController.m; sourceTree = "<group>"; };
@@ -266,8 +279,6 @@
 		E1D479C21E4AE4BC00BBC838 /* GitRepoDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GitRepoDetails.h; sourceTree = "<group>"; };
 		E1D479C31E4AE4BC00BBC838 /* GitRepoDetails.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GitRepoDetails.m; sourceTree = "<group>"; };
 		E1DC25F91ECD826C001EF106 /* OtherServicesKeys.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OtherServicesKeys.h; sourceTree = "<group>"; };
-		E1DC25FB1ECDBC16001EF106 /* MBProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBProgressHUD.h; sourceTree = "<group>"; };
-		E1DC25FC1ECDBC16001EF106 /* MBProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBProgressHUD.m; sourceTree = "<group>"; };
 		E1DC25FE1ECDBCA8001EF106 /* MBProgressHUD+ProgressHud.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MBProgressHUD+ProgressHud.h"; sourceTree = "<group>"; };
 		E1DC25FF1ECDBCA8001EF106 /* MBProgressHUD+ProgressHud.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MBProgressHUD+ProgressHud.m"; sourceTree = "<group>"; };
 		E1E215B51E869BDF0091565D /* ITCLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ITCLoginViewController.h; sourceTree = "<group>"; };
@@ -348,6 +359,45 @@
 			path = DefaultSettings;
 			sourceTree = "<group>";
 		};
+		DB831BC21FF6B5240065B646 /* ABHudViewController */ = {
+			isa = PBXGroup;
+			children = (
+				DB8CE5F51FF77185003FEB65 /* DisabledView */,
+				DB831BC81FF6B5780065B646 /* ABHudViewController.h */,
+				DB831BC91FF6B5780065B646 /* ABHudViewController.m */,
+				DB831BCA1FF6B5780065B646 /* ABHudViewController.xib */,
+			);
+			path = ABHudViewController;
+			sourceTree = "<group>";
+		};
+		DB8CE5F51FF77185003FEB65 /* DisabledView */ = {
+			isa = PBXGroup;
+			children = (
+				DB8CE5F61FF77199003FEB65 /* DisabledView.h */,
+				DB8CE5F71FF77199003FEB65 /* DisabledView.m */,
+			);
+			path = DisabledView;
+			sourceTree = "<group>";
+		};
+		DB8CE5FB1FF7966E003FEB65 /* WebModel */ = {
+			isa = PBXGroup;
+			children = (
+				DB8CE5FC1FF79677003FEB65 /* Ads */,
+			);
+			path = WebModel;
+			sourceTree = "<group>";
+		};
+		DB8CE5FC1FF79677003FEB65 /* Ads */ = {
+			isa = PBXGroup;
+			children = (
+				DB8CE5FD1FF796A8003FEB65 /* Ads.h */,
+				DB8CE5FE1FF796A8003FEB65 /* Ads.m */,
+				DB8CE6031FF7AA6A003FEB65 /* AdStore.h */,
+				DB8CE6041FF7AA6A003FEB65 /* AdStore.m */,
+			);
+			path = Ads;
+			sourceTree = "<group>";
+		};
 		DBA66CEF1FDCF4A60002A956 /* Storyboard */ = {
 			isa = PBXGroup;
 			children = (
@@ -573,6 +623,7 @@
 		E16437EA1D743A8800CE8B7E /* ViewController */ = {
 			isa = PBXGroup;
 			children = (
+				DB831BC21FF6B5240065B646 /* ABHudViewController */,
 				DBA66CEF1FDCF4A60002A956 /* Storyboard */,
 				E14F332E1E1A3D1300C3DD34 /* MenuHandler */,
 				E167245D1E1D2ABF00346502 /* CIViewController */,
@@ -593,6 +644,7 @@
 		E16437EB1D743A9300CE8B7E /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				DB8CE5FB1FF7966E003FEB65 /* WebModel */,
 				E139460F1DF2AFC200B3FAD0 /* ProjectModel */,
 				E12A9AAA1E49F360002DDA3C /* CoreDataModel */,
 				E16437DB1D743A4E00CE8B7E /* AppBox.xcdatamodeld */,
@@ -924,8 +976,6 @@
 		E1DC25FA1ECDBC16001EF106 /* ProgressHUD */ = {
 			isa = PBXGroup;
 			children = (
-				E1DC25FB1ECDBC16001EF106 /* MBProgressHUD.h */,
-				E1DC25FC1ECDBC16001EF106 /* MBProgressHUD.m */,
 				E1DC25FE1ECDBCA8001EF106 /* MBProgressHUD+ProgressHud.h */,
 				E1DC25FF1ECDBCA8001EF106 /* MBProgressHUD+ProgressHud.m */,
 			);
@@ -1033,6 +1083,7 @@
 				E1D12EEE1EC320760065E59A /* HelpPreferencesViewController.xib in Resources */,
 				DBA66CF11FDCF4A60002A956 /* Main.storyboard in Resources */,
 				E1D12EEC1EC31AC80065E59A /* AccountPreferencesViewController.xib in Resources */,
+				DB831BCC1FF6B5780065B646 /* ABHudViewController.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1114,19 +1165,23 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DB8CE5FF1FF796A8003FEB65 /* Ads.m in Sources */,
+				DB8CE6051FF7AA6A003FEB65 /* AdStore.m in Sources */,
 				DBFEEA601FA5BD1A00F09ECD /* ProvisioningProfile+CoreDataClass.m in Sources */,
 				E1902B541E16617B00C3E0F6 /* UserData.m in Sources */,
 				E188EA121D78485900EBCA52 /* Tiny.m in Sources */,
 				DBFEEA611FA5BD1A00F09ECD /* ProvisioningProfile+CoreDataProperties.m in Sources */,
 				E16437DD1D743A4E00CE8B7E /* AppBox.xcdatamodeld in Sources */,
 				E16437D71D743A4E00CE8B7E /* main.m in Sources */,
+				DB831BCB1FF6B5780065B646 /* ABHudViewController.m in Sources */,
 				E1902B481E16423200C3E0F6 /* ProjectAdvancedViewController.m in Sources */,
 				DBF290D71FA64A590046D5CE /* ProvisioningDetailsViewController.m in Sources */,
 				E16018F01DEC0BC200E3A377 /* DropboxViewController.m in Sources */,
 				E16437D41D743A4E00CE8B7E /* AppDelegate.m in Sources */,
 				E1D479C41E4AE4BC00BBC838 /* GitRepoDetails.m in Sources */,
 				E1902B571E16619800C3E0F6 /* GitHandler.m in Sources */,
 				E16724601E1D2AE000346502 /* CIViewController.m in Sources */,
+				DB8CE5F81FF77199003FEB65 /* DisabledView.m in Sources */,
 				E16D72DC1E88FA230031FB7C /* XCHandler.m in Sources */,
 				E1902B531E16617B00C3E0F6 /* NetworkHandler.m in Sources */,
 				E14A441F1F277590006A9102 /* XCArchiveResult.m in Sources */,
@@ -1157,7 +1212,6 @@
 				E16437F31D743B6800CE8B7E /* HomeViewController.m in Sources */,
 				E1AA0F441E2F328300BA81A1 /* QRCodeViewController.m in Sources */,
 				DB26297B1F95ED9A00C4C647 /* NSDate+Date.m in Sources */,
-				E1DC25FD1ECDBC16001EF106 /* MBProgressHUD.m in Sources */,
 				E1E215BB1E869BF70091565D /* ITCLogin.m in Sources */,
 				DB2629741F95E38C00C4C647 /* Project+CoreDataClass.m in Sources */,
 				E1902B641E16633A00C3E0F6 /* KeychainHandler.m in Sources */,

diff --git a/AppBox/AppDelegate.h b/AppBox/AppDelegate.h
@@ -9,6 +9,7 @@
 #import <Cocoa/Cocoa.h>
 #import <Foundation/Foundation.h>
 
+#import "AdStore.h"
 #import "DefaultSettings.h"
 
 @interface AppDelegate : NSObject <NSApplicationDelegate, NSUserNotificationCenterDelegate>

diff --git a/AppBox/AppDelegate.m b/AppBox/AppDelegate.m
@@ -58,6 +58,9 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
             [self addSessionLog:[NSString stringWithFormat:@"Normal Run"]];
         }
     }
+
+    //Load Ads
+    [AdStore loadAds];
 }
 
 - (void)applicationWillTerminate:(NSNotification *)aNotification {

diff --git a/AppBox/Commands/ProjectBuildScript.sh b/AppBox/Commands/ProjectBuildScript.sh
@@ -64,9 +64,9 @@ echo "Creating IPA..."
 #check either selected xcode is 9 or higher
 if [[ "${7}" > "9" || "${7}" == "9" ]]
 then
-    echo "Creatomg IPA with Xcode 9"
+    echo "Creating IPA with Xcode 9"
     xcodebuild -exportArchive -archivePath "${4}" -exportPath "${5}" -exportOptionsPlist "${6}" -allowProvisioningUpdates -allowProvisioningDeviceRegistration
 else
-    echo "Creatomg IPA with Xcode 8"
+    echo "Creating IPA with Xcode 8"
     xcodebuild -exportArchive -archivePath "${4}" -exportPath "${5}" -exportOptionsPlist "${6}"
 fi
diff --git a/AppBox/Common/Constants.h b/AppBox/Common/Constants.h
@@ -22,13 +22,15 @@
 #define abMailGunFromEmail @"AppBox Build <[email protected]>"
 
 //Other URL's
+#define abAppBoxAdsURL @"https://appbox-ads.firebaseio.com/ads.json"
 #define abDefaultLatestDownloadURL @"https://tryappbox.github.io/download"
 #define abDocumentationURL @"https://tryappbox.github.io/help/"
 #define abLicenseURL @"https://github.com/vineetchoudhary/AppBox-iOSAppsWirelessInstallation#user-content-license"
 #define abGitHubLatestRelease @"https://api.github.com/repos/vineetchoudhary/AppBox-iOSAppsWirelessInstallation/releases/latest"
 #define abTwitterURL @"https://twitter.com/tryappbox"
 #define abSlackImage @"https://s3-us-west-2.amazonaws.com/slack-files2/avatars/2017-04-06/165993935268_ec0c0ba40483382c7192_512.png"
 #define abWebHookSetupURL @"https://my.slack.com/apps/new/A0F7XDUAZ-incoming-webhooks"
+#define abShareXcodeProjectSchemeURL @"http://www.tryappbox.com/features/faq/HowToShareXcodeProjectSchemes.html"
 
 //Unique links
 static NSString *const UNIQUE_LINK_SHARED = @"uniqueLinkShared";
@@ -51,6 +53,7 @@ static NSString *const FILE_NAME_UNIQUE_JSON = @"appinfo.json";
 #define abBuildRepoNotification @"BuildRepoNotification"
 #define abAppBoxReadyToBuildNotification @"AppBoxReadyToBuildNotification"
 #define abStopAppBoxLocalServer @"StopAppBoxLocalServer"
+#define abAdsLoadCompleted @"AdsLoadCompleted"
 
 //messages
 #define abKeepSameLinkHelpTitle @"What is keep same link for all future upload?"

diff --git a/AppBox/Common/EventTracker/EventTracker.h b/AppBox/Common/EventTracker/EventTracker.h
@@ -19,6 +19,7 @@ typedef enum : NSUInteger {
     LogEventTypeShortURLFailedInSecondRequest,
     LogEventTypeShortURLSuccessInFirstRequest,
     LogEventTypeShortURLSuccessInSecondRequest,
+    LogEventTypeShortURLElseBlockExecuted,
     LogEventTypeExternalLinkTwitter,
     LogEventTypeExternalLinkHelp,
     LogEventTypeExternalLinkReleaseNote,
@@ -35,7 +36,8 @@ typedef enum : NSUInteger {
 typedef enum : NSUInteger {
     LogEventSettingTypeUploadIPA,
     LogEventSettingTypeArchiveAndUpload,
-    LogEventSettingTypeUploadIPASuccess
+    LogEventSettingTypeUploadIPASuccess,
+    LogEventAdsClicked
 } LogEventSettingTypes;
 
 @interface EventTracker : NSObject {

diff --git a/AppBox/Common/EventTracker/EventTracker.m b/AppBox/Common/EventTracker/EventTracker.m
@@ -74,6 +74,11 @@ +(void)logEventWithType:(LogEventTypes)eventType{
                                     action:@"Request No" label:@"2" value:@1];
         }break;
 
+        case LogEventTypeShortURLElseBlockExecuted: {
+            [EventTracker logEventWithName:@"Short URL Else Block Executed" customAttributes:@{@"Request No":@1}
+                                    action:@"Request No" label:@"1" value:@1];
+        }break;
+
         case LogEventTypeExternalLinkHelp:{
             [EventTracker logEventWithName:@"External Links" customAttributes:@{@"title":@"Help"} action:@"title" label:@"Help" value:@1];
         }break;
@@ -122,6 +127,7 @@ +(void)logEventWithType:(LogEventTypes)eventType{
             NSString *name = @"Dashboard open from Show Link";
             [EventTracker logEventWithName:name customAttributes:@{name:@1} action:name label:name value:@1];
         }break;
+
 
         default:
             break;
@@ -141,6 +147,12 @@ +(void)logEventSettingWithType:(LogEventSettingTypes)eventType andSettings:(NSDi
         case LogEventSettingTypeUploadIPASuccess: {
             [EventTracker logEventWithName:@"IPA Uploaded Success" customAttributes:currentSetting action:@"Uploaded to" label:@"AppStore" value:@1];
         }break;
+
+        case LogEventAdsClicked:{
+            NSString *name = @"Ad Clicked";
+            [EventTracker logEventWithName:name customAttributes:currentSetting action:@"Ad Clicked" label:@"AppBox-Native" value:@1];
+        }break;
+
         default:
             break;
     }

diff --git a/AppBox/Common/MailHandler/MailHandler.m b/AppBox/Common/MailHandler/MailHandler.m
@@ -33,6 +33,11 @@ + (NSString *)parseMessage:(NSString *)message forProject:(XCProject *)project {
     messageCopy = [messageCopy stringByReplacingOccurrencesOfString:@"{PROJECT_NAME}" withString:project.name];
     messageCopy = [messageCopy stringByReplacingOccurrencesOfString:@"{BUILD_NUMBER}" withString:project.build];
     messageCopy = [messageCopy stringByReplacingOccurrencesOfString:@"{BUILD_VERSION}" withString:project.version];
+    if (project.selectedSchemes) {
+        messageCopy = [messageCopy stringByReplacingOccurrencesOfString:@"{PROJECT_SCHEME}" withString:project.selectedSchemes];
+    } else {
+        messageCopy = [messageCopy stringByReplacingOccurrencesOfString:@"{PROJECT_SCHEME}" withString:@"Default"];
+    }
     return messageCopy;
 }
 

diff --git a/AppBox/Common/ProgressHUD/MBProgressHUD+ProgressHud.h b/AppBox/Common/ProgressHUD/MBProgressHUD+ProgressHud.h
@@ -6,9 +6,9 @@
 //  Copyright © 2017 Developer Insider. All rights reserved.
 //
 
-#import "MBProgressHUD.h"
+#import "ABHudViewController.h"
 
-@interface MBProgressHUD (ProgressHud)
+@interface ABHudViewController (ProgressHud)
 
 +(void)showStatus:(NSString *)status onView:(NSView *)view;
 +(void)showOnlyStatus:(NSString *)status onView:(NSView *)view;