Skip to content

Commit

Permalink
Merge pull request #13 from vineetchoudhary/development
Browse files Browse the repository at this point in the history 
Email bug fixes and added help button for keep same link
  • Loading branch information
@vineetchoudhary
vineetchoudhary authored Dec 19, 2016
2 parents 87a89f2 + 73b2126 commit 583d830
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 12 deletions.
2 changes: 1 addition & 1 deletion AppBox.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,9 @@
E1CFC65B1D7E7FD9005872BE /* Common */ = {
isa = PBXGroup;
children = (
E16018F11DEC0EB700E3A377 /* Constants.h */,
E1CFC65C1D7E7FEA005872BE /* Common.h */,
E1CFC65D1D7E7FEA005872BE /* Common.m */,
E16018F11DEC0EB700E3A377 /* Constants.h */,
E18DCB1B1DFED95000BD7F11 /* UserData.h */,
E18DCB1C1DFED95000BD7F11 /* UserData.m */,
E1A3965B1E040C9E0065FC7F /* NetworkHandler.h */,
Expand Down
24 changes: 18 additions & 6 deletions AppBox/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,11 +364,11 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yWS-VV-dkg">
<rect key="frame" x="8" y="49" width="200" height="21"/>
<rect key="frame" x="8" y="49" width="133" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="Shg-8h-5DW"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Upload IPA Only (Stable)" placeholderString="" id="8Nv-5P-LUi">
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Upload IPA Only" placeholderString="" id="8Nv-5P-LUi">
<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"/>
Expand Down Expand Up @@ -423,11 +423,11 @@
</constraints>
</box>
<button translatesAutoresizingMaskIntoConstraints="NO" id="7vC-wN-Vuz">
<rect key="frame" x="8" y="222" width="200" height="25"/>
<rect key="frame" x="8" y="222" width="402" height="25"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="ckO-EF-Bjd"/>
</constraints>
<buttonCell key="cell" type="check" title="Unique Link (Optional)" bezelStyle="regularSquare" imagePosition="right" alignment="justified" inset="2" id="8kG-jS-Crv">
<buttonCell key="cell" type="check" title="Keep Same Link for All Future Upload (Optional)" bezelStyle="regularSquare" imagePosition="right" alignment="justified" imageScaling="proportionallyDown" inset="2" id="8kG-jS-Crv">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="systemSemibold" size="17"/>
</buttonCell>
Expand All @@ -445,7 +445,7 @@
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8m1-af-Iwh">
<rect key="frame" x="206" y="188" width="579" height="24"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Default: Bundle Identifier " drawsBackground="YES" id="di6-9v-uDZ">
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" enabled="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Default: Bundle Identifier " drawsBackground="YES" id="di6-9v-uDZ">
<font key="font" metaFont="systemLight" size="15"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
Expand Down Expand Up @@ -565,6 +565,16 @@
<action selector="actionButtonTapped:" target="lct-wo-jYo" id="P46-nN-7f9"/>
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VAU-Tg-Nmj">
<rect key="frame" x="421" y="221" width="25" height="25"/>
<buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Wr3-Z9-aCa">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="buttonSameLinkHelpTapped:" target="lct-wo-jYo" id="G4k-Wc-jjF"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="HNZ-et-sSs" firstAttribute="leading" secondItem="RTB-1n-lrJ" secondAttribute="leading" id="1hd-8r-yGb"/>
Expand All @@ -584,6 +594,7 @@
<constraint firstItem="HNZ-et-sSs" firstAttribute="top" secondItem="52J-8G-TcO" secondAttribute="bottom" id="GoY-LY-jko"/>
<constraint firstItem="8Cf-Xv-IKb" firstAttribute="leading" secondItem="RTB-1n-lrJ" secondAttribute="leading" constant="15" id="Hus-mm-MeC"/>
<constraint firstItem="sgg-Iy-WMT" firstAttribute="top" secondItem="ay9-ED-rIF" secondAttribute="bottom" constant="10" id="J4D-Nw-cPk"/>
<constraint firstItem="7vC-wN-Vuz" firstAttribute="centerY" secondItem="VAU-Tg-Nmj" secondAttribute="centerY" id="KpF-km-Bm2"/>
<constraint firstAttribute="trailing" secondItem="sgg-Iy-WMT" secondAttribute="trailing" id="NHV-UA-boz"/>
<constraint firstItem="52J-8G-TcO" firstAttribute="top" secondItem="BAA-rE-fh4" secondAttribute="bottom" constant="20" id="OeP-za-bOt"/>
<constraint firstAttribute="trailing" secondItem="RKc-Si-2CZ" secondAttribute="trailing" constant="15" id="Oqx-R6-h3K"/>
Expand All @@ -599,6 +610,7 @@
<constraint firstAttribute="trailing" secondItem="52J-8G-TcO" secondAttribute="trailing" id="cEm-Xc-WUs"/>
<constraint firstItem="MlA-j9-hh1" firstAttribute="leading" secondItem="RTB-1n-lrJ" secondAttribute="leading" constant="12" id="ckD-Z6-JVU"/>
<constraint firstAttribute="trailing" secondItem="cfm-Bd-TVp" secondAttribute="trailing" constant="15" id="czi-vA-lno"/>
<constraint firstItem="VAU-Tg-Nmj" firstAttribute="leading" secondItem="7vC-wN-Vuz" secondAttribute="trailing" constant="15" id="eMq-xm-pZI"/>
<constraint firstItem="DAM-Ui-aXb" firstAttribute="trailing" secondItem="XfN-M3-4z8" secondAttribute="trailing" id="fLd-8x-Tf5"/>
<constraint firstItem="3gF-GO-Agw" firstAttribute="leading" secondItem="RTB-1n-lrJ" secondAttribute="leading" id="fxl-ww-4Lw"/>
<constraint firstItem="3gF-GO-Agw" firstAttribute="top" secondItem="8m1-af-Iwh" secondAttribute="bottom" constant="20" id="h7W-sG-0Yt"/>
Expand Down Expand Up @@ -666,7 +678,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<size key="minSize" width="778" height="367"/>
<size key="maxSize" width="778" height="10000000"/>
<size key="maxSize" width="780" height="10000000"/>
<color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
</textView>
</subviews>
Expand Down
4 changes: 4 additions & 0 deletions AppBox/Common/Constants.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
//notification
#define SessionLogUpdated @"SessionLogUpdated"

//messages
#define KeepSameLinkHelpTitle @"What is keep same link for all future upload?"
#define KeepSameLinkHelpMessage @"This feature will keep same short url for all future build/ipa uploaded with same bundle identifier, this means old build/ipa url will replaced by new ipa file. You can change the link by changing the Dropbox app folder name below. \n\nWe are working on this feature, Once we fineshed this you will be able to install previous build/ipa also."


//enums
typedef enum : NSUInteger {
Expand Down
17 changes: 12 additions & 5 deletions AppBox/ViewController/HomeViewController/HomeViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

static NSString *const UNIQUE_LINK_SHARED = @"uniqueLinkShared";
static NSString *const UNIQUE_LINK_SHORT = @"uniqueLinkShort";
static NSString *const FILE_NAME_UNIQUE_JSON = @"UniqueLink.json";
static NSString *const FILE_NAME_UNIQUE_JSON = @"appinfo.json";

@implementation HomeViewController{
XCProject *project;
Expand Down Expand Up @@ -102,7 +102,11 @@ - (IBAction)ipaFilePathHandle:(NSPathControl *)sender {
}

- (IBAction)buttonUniqueLinkTapped:(NSButton *)sender{
//NOT required
[textFieldBundleIdentifier setEnabled:(sender.state == NSOnState)];
}

- (IBAction)buttonSameLinkHelpTapped:(NSButton *)sender {
[Common showAlertWithTitle:KeepSameLinkHelpTitle andMessage:KeepSameLinkHelpMessage];
}


Expand Down Expand Up @@ -133,7 +137,9 @@ - (IBAction)textFieldMailValueChanged:(NSTextField *)sender {

//developer message text field
- (IBAction)textFieldDevMessageValueChanged:(NSTextField *)sender {
[UserData setUserMessage:sender.stringValue];
if (sender.stringValue.length > 0){
[UserData setUserMessage:sender.stringValue];
}
}

#pragma mark → Final Action Button (Build/IPA)
Expand Down Expand Up @@ -700,12 +706,13 @@ -(void)enableMailField:(BOOL)enable{
[textFieldMessage setEnabled:enable];

//Get last time valid data
[textFieldEmail setStringValue:[UserData userEmail]];
[textFieldMessage setStringValue:[UserData userMessage]];
[textFieldEmail setStringValue: enable ? [UserData userEmail] : @""];
[textFieldMessage setStringValue: enable ? [UserData userMessage] : @""];

//Just for confirm changes
[self textFieldMailValueChanged:textFieldEmail];
[self textFieldDevMessageValueChanged:textFieldMessage];

}

#pragma mark - TabView Delegate
Expand Down

0 comments on commit 583d830

Please sign in to comment.