Skip to content

Commit

Permalink
Merge branch 'master' of github.com:binarybucks/mqttitude
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Rust committed Sep 19, 2013
2 parents c6e1066 + f803978 commit 82a867b
Show file tree
Hide file tree
Showing 9 changed files with 129 additions and 173 deletions.
Binary file modified apps/ios/mqttitude/dist/Ad Hoc/MQTTitude.ipa
View file
Binary file not shown.
6 changes: 0 additions & 6 deletions apps/ios/mqttitude/mqttitude.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
84BDE1C617C7B46F00C47B65 /* icon_144x144.png in Resources */ = {isa = PBXBuildFile; fileRef = 84BDE1C417C7B46F00C47B65 /* icon_144x144.png */; };
84C50F4217E04B7D00726FD5 /* mqttitudeStatusTVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 84C50F4117E04B7D00726FD5 /* mqttitudeStatusTVC.m */; };
84C50F4517E0540200726FD5 /* mqttitudeAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 84C50F4417E0540200726FD5 /* mqttitudeAlertView.m */; };
84C50F4817E062EC00726FD5 /* mqttitudeIndicatorButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 84C50F4717E062EC00726FD5 /* mqttitudeIndicatorButton.m */; };
84C50F4C17E06B1F00726FD5 /* location.png in Resources */ = {isa = PBXBuildFile; fileRef = 84C50F4B17E06B1F00726FD5 /* location.png */; };
84C50F4E17E06C9C00726FD5 /* connection.png in Resources */ = {isa = PBXBuildFile; fileRef = 84C50F4D17E06C9C00726FD5 /* connection.png */; };
84CF9A0917BEED5B00E1333C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84CF9A0817BEED5B00E1333C /* UIKit.framework */; };
Expand Down Expand Up @@ -98,8 +97,6 @@
84C50F4117E04B7D00726FD5 /* mqttitudeStatusTVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mqttitudeStatusTVC.m; sourceTree = "<group>"; };
84C50F4317E0540200726FD5 /* mqttitudeAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mqttitudeAlertView.h; sourceTree = "<group>"; };
84C50F4417E0540200726FD5 /* mqttitudeAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mqttitudeAlertView.m; sourceTree = "<group>"; };
84C50F4617E062EC00726FD5 /* mqttitudeIndicatorButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mqttitudeIndicatorButton.h; sourceTree = SOURCE_ROOT; };
84C50F4717E062EC00726FD5 /* mqttitudeIndicatorButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mqttitudeIndicatorButton.m; sourceTree = SOURCE_ROOT; };
84C50F4B17E06B1F00726FD5 /* location.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = location.png; sourceTree = "<group>"; };
84C50F4D17E06C9C00726FD5 /* connection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = connection.png; sourceTree = "<group>"; };
84CF9A0517BEED5B00E1333C /* MQTTitude.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MQTTitude.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -227,8 +224,6 @@
848A037017E5BB9D00152C26 /* mqttitudeFriendAnnotationView.m */,
84C50F4017E04B7D00726FD5 /* mqttitudeStatusTVC.h */,
84C50F4117E04B7D00726FD5 /* mqttitudeStatusTVC.m */,
84C50F4617E062EC00726FD5 /* mqttitudeIndicatorButton.h */,
84C50F4717E062EC00726FD5 /* mqttitudeIndicatorButton.m */,
84F93C0517C029580060E809 /* Localizable.strings */,
84CF9A0F17BEED5B00E1333C /* Supporting Files */,
);
Expand Down Expand Up @@ -352,7 +347,6 @@
84540E3317D2D1EE0088DF92 /* Annotations.m in Sources */,
84C50F4217E04B7D00726FD5 /* mqttitudeStatusTVC.m in Sources */,
84C50F4517E0540200726FD5 /* mqttitudeAlertView.m in Sources */,
84C50F4817E062EC00726FD5 /* mqttitudeIndicatorButton.m in Sources */,
848A037117E5BB9D00152C26 /* mqttitudeFriendAnnotationView.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
87 changes: 41 additions & 46 deletions apps/ios/mqttitude/mqttitude/Base.lproj/MainStoryboard_iPad.storyboard
View file

Large diffs are not rendered by default.

50 changes: 22 additions & 28 deletions apps/ios/mqttitude/mqttitude/Base.lproj/MainStoryboard_iPhone.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,71 +17,58 @@
<toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ADW-aD-LPR">
<rect key="frame" x="0.0" y="460" width="320" height="44"/>
<items>
<barButtonItem image="location.png" id="BCW-Nj-aGy">
<barButtonItem image="location.png" style="plain" id="BCW-Nj-aGy">
<color key="tintColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<connections>
<action selector="location:" destination="HII-kF-avN" id="bfx-yV-UHP"/>
</connections>
</barButtonItem>
<barButtonItem image="move.png" id="ZGI-5D-f3y">
<barButtonItem image="move.png" style="plain" id="ZGI-5D-f3y">
<color key="tintColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<connections>
<action selector="move:" destination="HII-kF-avN" id="QwW-be-nXh"/>
</connections>
</barButtonItem>
<barButtonItem style="plain" systemItem="flexibleSpace" id="iAt-gI-5ll"/>
<barButtonItem image="center.png" id="8yY-FE-dno">
<barButtonItem image="center.png" style="plain" id="8yY-FE-dno">
<color key="tintColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<connections>
<action selector="showCenter:" destination="HII-kF-avN" id="VaW-hG-zZz"/>
</connections>
</barButtonItem>
<barButtonItem image="send.png" id="qW5-G0-fsd">
<barButtonItem image="send.png" style="plain" id="qW5-G0-fsd">
<color key="tintColor" red="0.059433083980000002" green="0.2648856342" blue="0.4038336575" alpha="1" colorSpace="calibratedRGB"/>
<connections>
<action selector="action:" destination="HII-kF-avN" id="ukg-CB-JB6"/>
</connections>
</barButtonItem>
<barButtonItem image="friends.png" id="cHH-1Y-Pca">
<barButtonItem image="friends.png" style="plain" id="cHH-1Y-Pca">
<color key="tintColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<connections>
<action selector="showAll:" destination="HII-kF-avN" id="dia-TY-i71"/>
</connections>
</barButtonItem>
<barButtonItem style="plain" systemItem="flexibleSpace" id="At2-n2-Ea3"/>
<barButtonItem image="connection.png" id="cxz-ek-1bc">
<barButtonItem image="connection.png" style="plain" id="cxz-ek-1bc">
<color key="tintColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<connections>
<action selector="connection:" destination="HII-kF-avN" id="Kdr-7F-KNs"/>
<segue destination="KLm-gU-upL" kind="push" id="Yfl-h7-TWI"/>
</connections>
</barButtonItem>
</items>
</toolbar>
<mapView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" mapType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="eED-yn-0ps">
<rect key="frame" x="0.0" y="0.0" width="320" height="460"/>
</mapView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KyD-D5-srP" customClass="mqttitudeIndicatorButton">
<rect key="frame" x="265" y="20" width="35" height="36"/>
<constraints>
<constraint firstAttribute="width" constant="35" id="BcU-UY-YBl"/>
<constraint firstAttribute="height" constant="35" id="cnF-rf-DYv"/>
</constraints>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal">
<color key="titleColor" red="0.19607843137254902" green="0.30980392156862746" blue="0.52156862745098043" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<segue destination="KLm-gU-upL" kind="push" id="mHs-aG-aSY"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="ADW-aD-LPR" firstAttribute="trailing" secondItem="ffw-DX-wWE" secondAttribute="trailing" type="user" id="6aj-bs-ue3"/>
<constraint firstItem="ADW-aD-LPR" firstAttribute="bottom" secondItem="ffw-DX-wWE" secondAttribute="bottom" type="user" id="F5f-0s-7Sd"/>
<constraint firstItem="eED-yn-0ps" firstAttribute="top" secondItem="ffw-DX-wWE" secondAttribute="top" type="user" id="IxT-f9-kro"/>
<constraint firstItem="eED-yn-0ps" firstAttribute="leading" secondItem="ffw-DX-wWE" secondAttribute="leading" type="default" id="PdQ-vV-ZhX"/>
<constraint firstAttribute="trailing" secondItem="KyD-D5-srP" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="Tal-mx-h4e"/>
<constraint firstAttribute="bottom" secondItem="eED-yn-0ps" secondAttribute="bottom" constant="44" type="user" id="bvz-dQ-ulQ"/>
<constraint firstItem="KyD-D5-srP" firstAttribute="top" secondItem="ffw-DX-wWE" secondAttribute="top" constant="20" symbolic="YES" type="default" id="lJZ-fx-XV0"/>
<constraint firstItem="ADW-aD-LPR" firstAttribute="leading" secondItem="eED-yn-0ps" secondAttribute="leading" type="default" id="ldS-90-vqe"/>
<constraint firstItem="eED-yn-0ps" firstAttribute="trailing" secondItem="ADW-aD-LPR" secondAttribute="trailing" type="default" id="zkC-ky-bM7"/>
</constraints>
Expand All @@ -91,7 +78,6 @@
<outlet property="allButton" destination="cHH-1Y-Pca" id="3M4-jd-vMT"/>
<outlet property="centerButton" destination="8yY-FE-dno" id="Zxm-16-5r2"/>
<outlet property="connectionButton" destination="cxz-ek-1bc" id="7p6-QP-77L"/>
<outlet property="indicatorButton" destination="KyD-D5-srP" id="fbG-a3-JPb"/>
<outlet property="locationButton" destination="BCW-Nj-aGy" id="EWV-nb-awK"/>
<outlet property="mapView" destination="eED-yn-0ps" id="ySD-3E-pwJ"/>
<outlet property="moveButton" destination="ZGI-5D-f3y" id="cZv-sB-oLo"/>
Expand Down Expand Up @@ -272,16 +258,24 @@
<outlet property="delegate" destination="KLm-gU-upL" id="Quv-Bw-eyh"/>
</connections>
</tableView>
<navigationItem key="navigationItem" title="MQTT Connection Status" id="WFe-YW-aca"/>
<navigationItem key="navigationItem" title="MQTT Connection Status" id="WFe-YW-aca">
<barButtonItem key="rightBarButtonItem" image="connection.png" id="kl8-fH-Mjn">
<connections>
<segue destination="GeY-Q1-1Hf" kind="unwind" unwindAction="connectionAction:" id="X0B-JY-5id"/>
</connections>
</barButtonItem>
</navigationItem>
<connections>
<outlet property="UIclosed" destination="OMs-Lt-Xta" id="y94-Ee-x5U"/>
<outlet property="UIconnected" destination="wu8-hM-azq" id="uS6-pB-5fS"/>
<outlet property="UIerror" destination="4us-cD-yNb" id="Crt-xP-IPu"/>
<outlet property="UIerrorCode" destination="xLk-V9-E1v" id="YIx-vm-TdX"/>
<outlet property="UIurl" destination="z07-nI-24D" id="Tqa-T2-lW0"/>
<outlet property="connectionButton" destination="kl8-fH-Mjn" id="a7T-Bu-rJb"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="etq-xj-Qx0" userLabel="First Responder" sceneMemberID="firstResponder"/>
<exit id="GeY-Q1-1Hf" userLabel="Exit" sceneMemberID="exit"/>
</objects>
<point key="canvasLocation" x="1578" y="-1070"/>
</scene>
Expand Down
2 changes: 1 addition & 1 deletion apps/ios/mqttitude/mqttitude/Connection.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ @interface Connection()
#define RECONNECT_TIMER_MAX 512.0

/*
* Connection represents the MQTT connection in the MQTTitude context - state Matrix wip
* Connection represents the MQTT connection in the MQTTitude context - state Matrix w.i.p
*
* Current State Event Action Next State
* ---------------------------------------------------------------------------
Expand Down
20 changes: 20 additions & 0 deletions apps/ios/mqttitude/mqttitude/mqttitudeStatusTVC.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ @interface mqttitudeStatusTVC ()
@property (weak, nonatomic) IBOutlet UITextField *UIconnected;
@property (weak, nonatomic) IBOutlet UITextField *UIerror;
@property (weak, nonatomic) IBOutlet UITextView *UIerrorCode;
@property (weak, nonatomic) IBOutlet UIBarButtonItem *connectionButton;

@end

Expand All @@ -28,7 +29,26 @@ @implementation mqttitudeStatusTVC
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];

switch (self.connection.state) {
case state_connected:
self.connectionButton.tintColor = [UIColor greenColor];
break;
case state_error:
self.connectionButton.tintColor = [UIColor redColor];
break;
case state_connecting:
case state_closing:
self.connectionButton.tintColor = [UIColor yellowColor];
break;
case state_starting:
default:
self.connectionButton.tintColor = [UIColor blueColor];
break;
}

self.UIurl.text = self.connection.url;

self.UIconnected.text = ([self.connection.lastConnected compare:self.connection.lastClosed] == NSOrderedDescending) ? [NSDateFormatter localizedStringFromDate:self.connection.lastConnected
dateStyle:NSDateFormatterShortStyle
timeStyle:NSDateFormatterMediumStyle] : @"";
Expand Down
Loading

0 comments on commit 82a867b

Please sign in to comment.