Merge pull request #47 from vineetchoudhary/development

Fixes

Author: vineetchoudhary

AppBox/Base.lproj/Main.storyboard

@@ -220,11 +220,11 @@
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Lbq-OO-sRU">
-                                                            <rect key="frame" x="8" y="178" width="457" height="21"/>
+                                                            <rect key="frame" x="8" y="178" width="191" height="21"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="21" id="nld-pk-Cgs"/>
                                                             </constraints>
-                                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Archive and Upload IPA (Beta, Req- Xcode 8+ as Default)" placeholderString="" id="vjW-hx-Zky">
+                                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Archive and Upload IPA" placeholderString="" id="vjW-hx-Zky">
                                                                 <font key="font" metaFont="systemSemibold" size="17"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>

AppBox/Common/Common.m

@@ -56,11 +56,16 @@ + (void)checkDropboxKeys{
     if ([abDbAppkey isEqualToString: abEmptyString] && [abDbScreatkey isEqualToString: abEmptyString]){
         NSAlert *alert = [[NSAlert alloc] init];
         [alert setMessageText: @"Dropbox app key and screat not found."];
-        [alert setInformativeText:@"Please input your dropbox app key and screat in \"AppBox>Common>DropboxKeys.h\" header file.\n\nAlso, please comply with the license."];
+        [alert setInformativeText:@"Please input your dropbox app key and screat in \"AppBox>Common>DropboxKeys.h\" header file. Or you can download the executable file of appbox by clicking button Download Appbox. \n\nAlso, please comply with the license."];
         [alert setAlertStyle:NSInformationalAlertStyle];
+        [alert addButtonWithTitle:@"Download Appbox"];
         [alert addButtonWithTitle:@"Read License"];
         [alert addButtonWithTitle:@"OK"];
-        if ([alert runModal] == NSAlertFirstButtonReturn){
+        NSModalResponse response = [alert runModal];
+        if (response == NSAlertFirstButtonReturn){
+            [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:abDefaultLatestDownloadURL]];
+        }
+        if (response == NSAlertSecondButtonReturn){
             [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:abLicenseURL]];
         }
     }

AppBox/ViewController/HomeViewController/HomeViewController.m

@@ -135,11 +135,12 @@ - (IBAction)sendMailMacOptionValueChanged:(NSButton *)sender {
 
 //email id text field
 - (IBAction)textFieldMailValueChanged:(NSTextField *)sender {
+    [sender setStringValue: [sender.stringValue stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]];
     [buttonShutdownMac setEnabled:[MailHandler isValidEmail:sender.stringValue]];
     if ([MailHandler isValidEmail:sender.stringValue]){
         [UserData setUserEmail:sender.stringValue];
-    }else{
-        [buttonShutdownMac setState:NSOffState];
+    }else if (sender.stringValue.length > 0){
+        [Common showAlertWithTitle:@"Invalid email address" andMessage:@"The email address entered was invalid. Please reenter it (Example: [email protected])."];
     }
 }