Merge pull request #51 from vineetchoudhary/development

Release 1.1.0
getappbox · Jan 20, 2017 · a3b6cc9 · a3b6cc9
2 parents 4e28aa4 + 716c411
commit a3b6cc9
Show file tree

Hide file tree

Showing 22 changed files with 374 additions and 63 deletions.
diff --git a/AppBox.xcodeproj/project.pbxproj b/AppBox.xcodeproj/project.pbxproj
@@ -43,6 +43,7 @@
 		E1902B601E1661BE00C3E0F6 /* UpdateHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = E1902B5F1E1661BE00C3E0F6 /* UpdateHandler.m */; };
 		E1902B641E16633A00C3E0F6 /* KeychainHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = E1902B631E16633A00C3E0F6 /* KeychainHandler.m */; };
 		E1AA0F441E2F328300BA81A1 /* QRCodeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E1AA0F431E2F328300BA81A1 /* QRCodeViewController.m */; };
+		E1AA0F481E2F94F700BA81A1 /* WindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = E1AA0F471E2F94F700BA81A1 /* WindowController.m */; };
 		E1CFC65E1D7E7FEA005872BE /* Common.m in Sources */ = {isa = PBXBuildFile; fileRef = E1CFC65D1D7E7FEA005872BE /* Common.m */; };
 /* End PBXBuildFile section */
 
@@ -127,6 +128,8 @@
 		E191F7C31E1E7B3B00D2A590 /* XcodeAppStoreUpload.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = XcodeAppStoreUpload.sh; sourceTree = "<group>"; };
 		E1AA0F421E2F328300BA81A1 /* QRCodeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QRCodeViewController.h; sourceTree = "<group>"; };
 		E1AA0F431E2F328300BA81A1 /* QRCodeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QRCodeViewController.m; sourceTree = "<group>"; };
+		E1AA0F461E2F94F700BA81A1 /* WindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowController.h; sourceTree = "<group>"; };
+		E1AA0F471E2F94F700BA81A1 /* WindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WindowController.m; sourceTree = "<group>"; };
 		E1AF8FD71E266CC000A57633 /* DropboxKeys.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DropboxKeys.h; sourceTree = "<group>"; };
 		E1CFC65C1D7E7FEA005872BE /* Common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Common.h; sourceTree = "<group>"; };
 		E1CFC65D1D7E7FEA005872BE /* Common.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Common.m; sourceTree = "<group>"; };
@@ -260,6 +263,7 @@
 			children = (
 				E16437ED1D743ABE00CE8B7E /* Storyboard */,
 				E14F332E1E1A3D1300C3DD34 /* MenuHandler */,
+				E1AA0F451E2F94C500BA81A1 /* WindowController */,
 				E167245D1E1D2ABF00346502 /* CIViewController */,
 				E16018ED1DEC0BA600E3A377 /* DropboxViewController */,
 				E16437F01D743B3600CE8B7E /* HomeViewController */,
@@ -455,6 +459,15 @@
 			path = QRCodeViewController;
 			sourceTree = "<group>";
 		};
+		E1AA0F451E2F94C500BA81A1 /* WindowController */ = {
+			isa = PBXGroup;
+			children = (
+				E1AA0F461E2F94F700BA81A1 /* WindowController.h */,
+				E1AA0F471E2F94F700BA81A1 /* WindowController.m */,
+			);
+			path = WindowController;
+			sourceTree = "<group>";
+		};
 		E1CFC65B1D7E7FD9005872BE /* Common */ = {
 			isa = PBXGroup;
 			children = (
@@ -509,7 +522,7 @@
 				TargetAttributes = {
 					E16437CE1D743A4E00CE8B7E = {
 						CreatedOnToolsVersion = 7.3.1;
-						DevelopmentTeam = M8HBL5W4VV;
+						DevelopmentTeam = 4F7SW76LL6;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -617,6 +630,7 @@
 				E1902B541E16617B00C3E0F6 /* UserData.m in Sources */,
 				E188EA121D78485900EBCA52 /* Tiny.m in Sources */,
 				E16437DD1D743A4E00CE8B7E /* AppBox.xcdatamodeld in Sources */,
+				E1AA0F481E2F94F700BA81A1 /* WindowController.m in Sources */,
 				E16437D71D743A4E00CE8B7E /* main.m in Sources */,
 				E1902B481E16423200C3E0F6 /* ProjectAdvancedViewController.m in Sources */,
 				E16018F01DEC0BC200E3A377 /* DropboxViewController.m in Sources */,
@@ -748,7 +762,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = M8HBL5W4VV;
+				DEVELOPMENT_TEAM = 4F7SW76LL6;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/AppBox/Framworks",
@@ -774,7 +788,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = M8HBL5W4VV;
+				DEVELOPMENT_TEAM = 4F7SW76LL6;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/AppBox/Framworks",

diff --git a/AppBox/AppDelegate.h b/AppBox/AppDelegate.h
@@ -22,6 +22,7 @@
 @property (nonatomic) BOOL processing;
 @property (nonatomic, weak) IBOutlet NSMenuItem *gmailLogoutButton;
 @property (nonatomic, weak) IBOutlet NSMenuItem *dropboxLogoutButton;
+@property (nonatomic, weak) IBOutlet NSMenuItem *dropboxSpaceButton;
 
 @end
 
diff --git a/AppBox/AppDelegate.m b/AppBox/AppDelegate.m
@@ -21,9 +21,8 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     [center setDelegate:self];
     self.sessionLog = [[NSMutableString alloc] init];
 
-    //Check Dropbox Keys and Setup Dropbox
+    //Check Dropbox Keys
     [Common checkDropboxKeys];
-    [DropboxClientsManager setupWithAppKeyDesktop:abDbAppkey];
 
 
     //Init Crashlytics

diff --git a/AppBox/Base.lproj/Main.storyboard b/AppBox/Base.lproj/Main.storyboard
@@ -23,8 +23,18 @@
                                                 <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
                                             </connections>
                                         </menuItem>
+                                        <menuItem title="Check for Update" id="g39-wl-Zom">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="checkForUpdateTapped:" target="hnw-xV-0zn" id="4xk-T8-ukX"/>
+                                            </connections>
+                                        </menuItem>
                                         <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
-                                        <menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
+                                        <menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW">
+                                            <connections>
+                                                <action selector="preferencesTapped:" target="hnw-xV-0zn" id="HsC-MP-RVP"/>
+                                            </connections>
+                                        </menuItem>
                                         <menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
                                         <menuItem title="Hide AppBox" keyEquivalent="h" id="Olw-nP-bQN">
                                             <connections>
@@ -62,21 +72,7 @@
                                                 <segue destination="6aM-eF-B0k" kind="show" id="jTU-hR-7QO"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="sqY-cu-265"/>
-                                        <menuItem title="Logout Gmail" id="K8O-EO-3yr" userLabel="Logout Gmail">
-                                            <attributedString key="attributedTitle"/>
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="logoutGmailTapped:" target="hnw-xV-0zn" id="ALm-bb-htk"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Logout Dropbox" id="JOb-fc-01Z" userLabel="Logout Dropbox">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="logoutDropBoxTapped:" target="hnw-xV-0zn" id="PTN-tn-E2A"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="m54-Is-iLE"/>
+                                        <menuItem isSeparatorItem="YES" id="yd4-k6-avg"/>
                                         <menuItem title="Close" keyEquivalent="w" id="DVo-aG-piG">
                                             <connections>
                                                 <action selector="performClose:" target="Ady-hI-5gd" id="HmO-Ls-i7Q"/>
@@ -118,6 +114,30 @@
                                     </items>
                                 </menu>
                             </menuItem>
+                            <menuItem title="Accounts" id="yI9-UO-Ljk">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Accounts" autoenablesItems="NO" id="hsO-Yp-DDN">
+                                    <items>
+                                        <menuItem title="Logout Gmail" id="Ki8-ab-eaa" userLabel="Logout Gmail">
+                                            <attributedString key="attributedTitle"/>
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="logoutGmailTapped:" target="hnw-xV-0zn" id="T7V-V1-sxI"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Logout Dropbox" id="sBp-fs-Uyn" userLabel="Logout Dropbox">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="logoutDropBoxTapped:" target="hnw-xV-0zn" id="pVf-rO-G1A"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="m54-Is-iLE"/>
+                                        <menuItem title="Dropbox Space" enabled="NO" id="Ug8-0u-jHy" userLabel="Dropbox Space">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
                             <menuItem title="Window" id="4eX-h0-ncF">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Window" systemMenu="window" id="QBC-m6-GiV">
@@ -150,13 +170,26 @@
                                     <items>
                                         <menuItem title="Help" keyEquivalent="?" id="szq-4P-EAe">
                                             <connections>
-                                                <action selector="showHelp:" target="Ady-hI-5gd" id="UAk-rJ-xgB"/>
+                                                <action selector="helpButtonTapped:" target="hnw-xV-0zn" id="zVs-9o-ymg"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Check for Update" id="g39-wl-Zom">
+                                        <menuItem title="Latest News" id="Ihi-lf-Us8" userLabel="Twitter">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="latestNewsTapped:" target="hnw-xV-0zn" id="JyJ-JJ-mF0"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="06t-UF-iUY"/>
+                                        <menuItem title="License" id="PlJ-Qd-CU4">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="licenseTapped:" target="hnw-xV-0zn" id="eEz-ck-IqW"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Release Notes" id="0SD-c8-F3Y">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
-                                                <action selector="showHelp:" target="Ady-hI-5gd" id="Bga-c2-gZa"/>
+                                                <action selector="releaseNotesTapped:" target="hnw-xV-0zn" id="a7A-K3-sX0"/>
                                             </connections>
                                         </menuItem>
                                     </items>
@@ -170,25 +203,29 @@
                 </application>
                 <customObject id="Voe-Tx-rLC" customClass="AppDelegate">
                     <connections>
-                        <outlet property="dropboxLogoutButton" destination="JOb-fc-01Z" id="8aA-3e-Rg0"/>
-                        <outlet property="gmailLogoutButton" destination="K8O-EO-3yr" id="9xt-xT-w9T"/>
+                        <outlet property="dropboxLogoutButton" destination="sBp-fs-Uyn" id="afh-vo-oE7"/>
+                        <outlet property="dropboxSpaceButton" destination="Ug8-0u-jHy" id="n5f-5O-Xw1"/>
+                        <outlet property="gmailLogoutButton" destination="Ki8-ab-eaa" id="xPA-We-vFM"/>
                     </connections>
                 </customObject>
                 <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
                 <userDefaultsController representsSharedInstance="YES" id="BRM-Lk-bJm"/>
             </objects>
-            <point key="canvasLocation" x="904" y="-152"/>
+            <point key="canvasLocation" x="904" y="-169"/>
         </scene>
         <!--Window Controller-->
         <scene sceneID="R2V-B0-nI4">
             <objects>
-                <windowController id="B8D-0N-5wS" sceneMemberID="viewController">
+                <windowController id="B8D-0N-5wS" customClass="WindowController" sceneMemberID="viewController">
                     <window key="window" title="AppBox - Build, Test and Distribute iOS Apps" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
                         <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
                         <rect key="contentRect" x="538" y="299" width="800" height="500"/>
                         <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
                         <value key="minSize" type="size" width="800" height="500"/>
                         <value key="minFullScreenContentSize" type="size" width="800" height="500"/>
+                        <connections>
+                            <outlet property="delegate" destination="B8D-0N-5wS" id="1ep-9C-Hpp"/>
+                        </connections>
                     </window>
                     <connections>
                         <segue destination="lct-wo-jYo" kind="relationship" relationship="window.shadowedContentViewController" id="Nga-je-HB2"/>
@@ -672,9 +709,9 @@
                         <rect key="frame" x="0.0" y="0.0" width="780" height="369"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kbJ-uL-Hq6">
+                            <scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="kbJ-uL-Hq6">
                                 <rect key="frame" x="0.0" y="0.0" width="780" height="369"/>
-                                <clipView key="contentView" id="EQ4-Ej-Nlf">
+                                <clipView key="contentView" copiesOnScroll="NO" id="EQ4-Ej-Nlf">
                                     <rect key="frame" x="1" y="1" width="778" height="367"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>

diff --git a/AppBox/Commands/ProjectBuildScript.sh b/AppBox/Commands/ProjectBuildScript.sh
@@ -14,7 +14,7 @@ cd "${1}"
 #{3} - VisualStudioMobileCenterDemo
 #{4} - /Users/emp195/Desktop/VisualStudioMobileCenterDemoGitHub/VisualStudioMobileCenterDemo/build/VSMCD.xcarchive
 
-xcodebuild clean -workspace "${2}" -scheme "${3}" archive -archivePath "${4}"
+xcodebuild clean -project "${2}" -scheme "${3}" archive -archivePath "${4}"
 
 
 

diff --git a/AppBox/Common/Constants.h b/AppBox/Common/Constants.h
@@ -12,9 +12,14 @@
 //Base URL's
 #define abMailerBaseURL @"https://appboxapi.github.io/mail"
 #define abInstallWebAppBaseURL @"https://tryapp.github.io"
+#define abGitHubReleaseBaseURL @"https://github.com/vineetchoudhary/AppBox-iOSAppsWirelessInstallation/releases/tag/"
+
+//Other URL's
 #define abDefaultLatestDownloadURL @"https://tryappbox.github.io/download"
-#define abGitHubLatestRelease @"https://api.github.com/repos/vineetchoudhary/AppBox-iOSAppsWirelessInstallation/releases/latest"
+#define abDocumentationURL @"https://iosappswirelessinstallation.codeplex.com/documentation"
 #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"
 
 //Serives Key
 #define abGoogleTiny @"AIzaSyD5c0jmblitp5KMZy2crCbueTU-yB1jMqI"
@@ -33,19 +38,22 @@
 //team id constants
 #define abiPhoneDeveloper @"iphone developer"
 #define abiPhoneDistribution @"iphone distribution"
+
+#define abTeamId @"teamId"
 #define abFullName @"fullName"
 #define abTeamName @"teamName"
-#define abTeamId @"teamId"
 #define abExpiryDate @"expiryDate"
 
 //default setting
 #define abBuildLocation @"~/Desktop"
 
 //others
-#define abTeamIdLength 10
-#define abEndOfSessionLog @"abEndOfSessionLog"
 #define abEmptyString @""
+#define abTeamIdLength 10
+#define abBytesToMB (1024 * 1024)
+#define abDropboxOutOfSpaceWarningSize 150 
 #define abAppInfoFileName @"appinfo.json"
+#define abEndOfSessionLog @"abEndOfSessionLog"
 
 
 //enums

diff --git a/AppBox/Common/KeychainHandler/KeychainHandler.m b/AppBox/Common/KeychainHandler/KeychainHandler.m
@@ -28,7 +28,7 @@ + (NSArray *)getAllTeamId{
 
         //filter developer, distribution cert and valid team id
         if (![teamId containsString:@" "] && teamId.length == abTeamIdLength &&
-            ([fullName.lowercaseString containsString:abiPhoneDistribution])){
+            ([fullName.lowercaseString containsString:abiPhoneDistribution] || [fullName.lowercaseString containsString:abiPhoneDeveloper])){
 
             //better name
             fullName = [NSString stringWithFormat:@"%@ (%@)",teamName, teamId];

diff --git a/AppBox/Common/UpdateHandler/UpdateHandler.h b/AppBox/Common/UpdateHandler/UpdateHandler.h
@@ -10,6 +10,7 @@
 
 @interface UpdateHandler : NSObject
 
++ (void)showAlreadyUptoDateAlert;
 + (void)showUpdateAlertWithUpdateURL:(NSURL *)url;
 + (void)isNewVersionAvailableCompletion:(void (^)(bool available, NSURL *url))completion;