Code formatting and added tabview delegate

Author: vineetchoudhary

AppBox/Base.lproj/Main.storyboard

@@ -417,6 +417,9 @@
                                                 </view>
                                             </tabViewItem>
                                         </tabViewItems>
+                                        <connections>
+                                            <outlet property="delegate" destination="lct-wo-jYo" id="GsN-fY-tSl"/>
+                                        </connections>
                                     </tabView>
                                     <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="sgg-Iy-WMT">
                                         <rect key="frame" x="0.0" y="263" width="800" height="5"/>
@@ -634,6 +637,7 @@
                         <outlet property="pathIPAFile" destination="dVX-NT-rjH" id="1fw-fx-eph"/>
                         <outlet property="pathProject" destination="sWE-nW-t4X" id="5es-lc-EuA"/>
                         <outlet property="progressIndicator" destination="Iw6-ha-Sj1" id="N0m-Ok-NsH"/>
+                        <outlet property="tabView" destination="ay9-ED-rIF" id="eI7-2C-0MP"/>
                         <outlet property="textFieldBundleIdentifier" destination="8m1-af-Iwh" id="lIi-e1-oco"/>
                         <outlet property="textFieldEmail" destination="RKc-Si-2CZ" id="NwO-S6-73O"/>
                         <outlet property="textFieldMessage" destination="BAA-rE-fh4" id="ACK-7P-3CG"/>

AppBox/ViewController/HomeViewController/HomeViewController.h

@@ -11,10 +11,13 @@
 #import "DropboxViewController.h"
 #import "ShowLinkViewController.h"
 
-@interface HomeViewController : NSViewController <DBRestClientDelegate, DBSessionDelegate, MailDelegate>{
+@interface HomeViewController : NSViewController <DBRestClientDelegate, DBSessionDelegate, MailDelegate, NSTabViewDelegate>{
     //Dropbox
     DBRestClient *restClient;
 
+    //Tab
+    IBOutlet NSTabView *tabView;
+    
     //Build
     IBOutlet NSPathControl *pathProject;
     IBOutlet NSPathControl *pathBuild;
@@ -38,7 +41,6 @@
     IBOutlet NSTextField *labelStatus;
     IBOutlet NSView *viewProgressStatus;
     IBOutlet NSProgressIndicator *progressIndicator;
-
 }
 
 - (DBRestClient *)restClient;

AppBox/ViewController/HomeViewController/HomeViewController.m

@@ -48,12 +48,12 @@ - (void)viewWillAppear{
 }
 
 
-#pragma mark - Project / IPA Controls Action
+#pragma mark - Controls Action Handler -
+#pragma mark → Project / Workspace Controls Action
 //Project Path Handler
 - (IBAction)projectPathHandler:(NSPathControl *)sender {
     if (![project.fullPath isEqualTo:sender.URL]){
         [project setFullPath: sender.URL];
-        [buttonAction setTitle:@"Build Project and Upload IPA"];
         [self runGetSchemeScript];
     }
 }
@@ -67,7 +67,7 @@ - (IBAction)buildPathHandler:(NSPathControl *)sender {
 
 //Scheme Value Changed
 - (IBAction)comboBuildSchemeValueChanged:(NSComboBox *)sender {
-    [self updateBuildButtonState];
+    [self updateViewState];
 }
 
 //Team Value Changed
@@ -80,34 +80,45 @@ - (IBAction)comboTeamIdValueChanged:(NSComboBox *)sender {
     }else{
         [project setTeamId: sender.stringValue];
     }
-    [self updateBuildButtonState];
+    [self updateViewState];
 }
 
 //Build Type Changed
 - (IBAction)comboBuildTypeValueChanged:(NSComboBox *)sender {
     if (![project.buildType isEqualToString:sender.stringValue]){
         [project setBuildType: sender.stringValue];
-        [self updateBuildButtonState];
+        [self updateViewState];
     }
 }
 
-#pragma mark - IPA File Controlles Actions
+#pragma mark → IPA File Controlles Actions
 //IPA File Path Handler
 - (IBAction)ipaFilePathHandle:(NSPathControl *)sender {
-    project.ipaFullPath = sender.URL;
-    [buttonAction setTitle:@"Upload IPA"];
-    [self updateBuildButtonState];
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self getIPAInfoFromLocalURL:project.ipaFullPath];
-    });
+    if (![project.fullPath isEqual:sender.URL]){
+        project.ipaFullPath = sender.URL;
+        [self updateViewState];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [self getIPAInfoFromLocalURL:project.ipaFullPath];
+        });
+    }
 }
 
 - (IBAction)buttonUniqueLinkTapped:(NSButton *)sender{
     //NOT required
 }
 
+#pragma mark → Final Action Button (Build/IPA)
+//Build Button Action
+- (IBAction)actionButtonTapped:(NSButton *)sender {
+    if (project.fullPath){
+        [project setIsBuildOnly:NO];
+        [self runBuildScript];
+    }else if (project.ipaFullPath){
+        [self uploadIPAFileWithLocalURL:project.ipaFullPath];
+    }
+}
 
-#pragma mark - Mail and Shutdown controls action
+#pragma mark → Mail Controls Action
 //Send mail option
 - (IBAction)sendMailOptionValueChanged:(NSButton *)sender {
     if (sender.state == NSOnState && ![UserData isGmailLoggedIn]){
@@ -138,19 +149,8 @@ - (IBAction)textFieldDevMessageValueChanged:(NSTextField *)sender {
 }
 
 
-#pragma mark - Final Action Button (Build/IPA)
-//Build Button Action
-- (IBAction)actionButtonTapped:(NSButton *)sender {
-    if (project.fullPath){
-        [project setIsBuildOnly:NO];
-        [self runBuildScript];
-    }else if (project.ipaFullPath){
-        [self uploadIPAFileWithLocalURL:project.ipaFullPath];
-    }
-}
-
-
-#pragma mark - Task
+#pragma mark - NSTask (Scheme, TeamId and Archive) -
+#pragma mark → Task
 
 - (void)runGetSchemeScript{
     [self showStatus:@"Getting project scheme..." andShowProgressBar:YES withProgress:-1];
@@ -205,7 +205,7 @@ - (void)runBuildScript{
     [self runTaskWithLaunchPath:buildScriptPath andArgument:buildArgument];
 }
 
-#pragma mark - Capture task data
+#pragma mark → Run and Capture task data
 
 - (void)runTaskWithLaunchPath:(NSString *)launchPath andArgument:(NSArray *)arguments{
     NSTask *task = [[NSTask alloc] init];
@@ -304,6 +304,8 @@ - (void)captureStandardOutputWithTask:(NSTask *)task{
     }];
 }
 
+#pragma mark - Get IPA Info -
+
 -(void)checkIPACreated{
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         if ([[NSFileManager defaultManager] fileExistsAtPath:project.ipaFullPath.resourceSpecifier]){
@@ -314,8 +316,6 @@ -(void)checkIPACreated{
     });
 }
 
-#pragma mark - Get IPA Info
-
 - (void)getIPAInfoFromLocalURL:(NSURL *)ipaFileURL{
     NSString *fromPath = [ipaFileURL.resourceSpecifier stringByRemovingPercentEncoding];
     if ([[NSFileManager defaultManager] fileExistsAtPath:fromPath]) {
@@ -374,7 +374,7 @@ -(void)uploadIPAFileWithLocalURL:(NSURL *)ipaURL{
     NSLog(@"Temporaray folder %@",NSTemporaryDirectory());
 }
 
-#pragma mark - Updating Unique Link
+#pragma mark - Updating Unique Link -
 -(void)updateUniquLinkDictinory:(NSMutableDictionary *)dictUniqueLink{
     if(![dictUniqueLink isKindOfClass:[NSDictionary class]])
         dictUniqueLink = [NSMutableDictionary new];
@@ -428,11 +428,13 @@ -(void)handleAfterUniqueJsonMetaDataLoaded{
     }
 }
 
-#pragma mark - DB Delegate
+#pragma mark - DB and RestClient Delegate -
+#pragma mark → DB Delegate
 - (void)sessionDidReceiveAuthorizationFailure:(DBSession *)session userId:(NSString *)userId{
+    
 }
 
-#pragma mark - RestClient Delegate
+#pragma mark →RestClient Delegate
 - (void)restClient:(DBRestClient*)client loadedMetadata:(DBMetadata*)metadata{
     NSLog(@"Loaded Meta Data %@",metadata);
     if([metadata.path isEqualToString:project.bundleDirectory.absoluteString]){
@@ -480,7 +482,7 @@ -(void)restClient:(DBRestClient *)client uploadedFile:(NSString *)destPath from:
         }
     }
     else if (fileType == FileTypeIPA){
-        [self disableEmailFields];
+        
     }
     [restClient loadSharableLinkForFile:metadata.path shortUrl:NO];
     NSString *status = [NSString stringWithFormat:@"Creating Sharable Link for %@",(fileType == FileTypeIPA)?@"IPA":@"Manifest"];
@@ -541,7 +543,26 @@ -(void)restClient:(DBRestClient *)restClientLocal loadedSharableLink:(NSString *
     }
 }
 
-#pragma mark - Create ShortSharable URL
+#pragma mark → Dropbox Helper
+- (void)authHelperStateChangedNotification:(NSNotification *)notification {
+    if ([[DBSession sharedSession] isLinked]) {
+        [self progressCompletedViewState];
+    }
+}
+
+- (void)getUrl:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent {
+    // This gets called when the user clicks Show "App name". You don't need to do anything for Dropbox here
+}
+
+- (DBRestClient *)restClient {
+    if (!restClient) {
+        restClient = [[DBRestClient alloc] initWithSession:[DBSession sharedSession]];
+        restClient.delegate = self;
+    }
+    return restClient;
+}
+
+#pragma mark - Create ShortSharable URL -
 -(void)createUniqueShortSharableUrl{
     NSString *originalURL = [project.uniquelinkShareableURL.absoluteString componentsSeparatedByString:@"dropbox.com"][1];
     //create short url
@@ -569,46 +590,12 @@ -(void)createManifestShortSharableUrl{
     }];
 }
 
-#pragma mark - Completion Process
--(void)showURL{
-    NSString *status = [NSString stringWithFormat:@"App URL - %@",project.appShortShareableURL.absoluteString];
-    [self showStatus:status andShowProgressBar:NO withProgress:0];
-    if (textFieldEmail.stringValue.length > 0 && [Common isValidEmail:textFieldEmail.stringValue]) {
-        [self performSegueWithIdentifier:@"MailView" sender:self];
-    }else{
-        [self performSegueWithIdentifier:@"ShowLink" sender:self];
-    }
-    [self progressCompletedViewState];
-}
-
-#pragma mark - Dropbox Helper
-- (void)authHelperStateChangedNotification:(NSNotification *)notification {
-    if ([[DBSession sharedSession] isLinked]) {
-        [self progressCompletedViewState];
-    }
-}
-
-- (void)getUrl:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent {
-    // This gets called when the user clicks Show "App name". You don't need to do anything for Dropbox here
-}
-
-- (DBRestClient *)restClient {
-    if (!restClient) {
-        restClient = [[DBRestClient alloc] initWithSession:[DBSession sharedSession]];
-        restClient.delegate = self;
-    }
-    return restClient;
-}
 
-#pragma mark - Controller Helper
+#pragma mark - Controller Helpers -
 -(void)progressCompletedViewState{
 
 }
 
--(void)disableEmailFields{
-    
-}
-
 -(void)resetBuildOptions{
     [comboTeamId removeAllItems];
     [comboBuildScheme removeAllItems];
@@ -637,13 +624,21 @@ -(void)showStatus:(NSString *)status andShowProgressBar:(BOOL)showProgressBar wi
     }
 }
 
--(void)updateBuildButtonState{
-    BOOL enable = ((comboBuildScheme.stringValue != nil && comboBuildType.stringValue.length > 0 &&
-                    comboBuildType.stringValue != nil && comboBuildType.stringValue.length > 0) || project.ipaFullPath != nil);
+-(void)updateViewState{
+    //update action button
+    BOOL enable = ((comboBuildScheme.stringValue != nil && comboBuildType.stringValue.length > 0 && //build scheme
+                    comboBuildType.stringValue != nil && comboBuildType.stringValue.length > 0 && //build type
+                    comboTeamId.stringValue != nil && comboTeamId.stringValue.length > 0 && //team id
+                    tabView.selectedTabViewItem.tabState == NSSelectedTab) ||
+                   
+                   //if ipa selected
+                   (project.ipaFullPath != nil && tabView.selectedTabViewItem.tabState == NSSelectedTab));
     [buttonAction setEnabled:enable];
+    [buttonAction setTitle:(tabView.selectedTabViewItem.label)];
+    
 }
 
-#pragma mark - MailDelegate
+#pragma mark - MailDelegate -
 -(void)mailViewLoadedWithWebView:(WebView *)webView{
 
 }
@@ -653,6 +648,8 @@ -(void)mailSentWithWebView:(WebView *)webView{
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(60 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             [Common shutdownSystem];
         });
+    }else{
+        [self performSegueWithIdentifier:@"ShowLink" sender:self];
     }
 }
 
@@ -681,6 +678,17 @@ -(void)enableMailField:(BOOL)enable{
 }
 
 #pragma mark - Navigation
+-(void)showURL{
+    NSString *status = [NSString stringWithFormat:@"App URL - %@",project.appShortShareableURL.absoluteString];
+    [self showStatus:status andShowProgressBar:NO withProgress:0];
+    if (textFieldEmail.stringValue.length > 0 && [Common isValidEmail:textFieldEmail.stringValue]) {
+        [self performSegueWithIdentifier:@"MailView" sender:self];
+    }else{
+        [self performSegueWithIdentifier:@"ShowLink" sender:self];
+    }
+    [self progressCompletedViewState];
+}
+
 -(void)prepareForSegue:(NSStoryboardSegue *)segue sender:(id)sender{
     if ([segue.destinationController isKindOfClass:[ShowLinkViewController class]]) {
         ((ShowLinkViewController *)segue.destinationController).appLink = project.appShortShareableURL.absoluteString;
@@ -695,4 +703,5 @@ -(void)prepareForSegue:(NSStoryboardSegue *)segue sender:(id)sender{
         }
     }
 }
+
 @end