Commit cb05bf88 authored by Alex Moore's avatar Alex Moore

Fixed crash from settings page (maybe?)

parent b4870d5f
{
"images" : [
{
"idiom" : "iphone",
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-Small@2x.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-Small@3x.png",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Icon-40@2x.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Icon-40@3x.png",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"idiom" : "iphone",
"filename" : "Icon-60@2x.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"idiom" : "iphone",
"filename" : "Icon-60@3x.png",
"scale" : "3x"
},
{
......
......@@ -19,7 +19,10 @@
// Do any additional setup after loading the view.
[self.view addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self.view action:@selector(endEditing:)]];
self.navigationItem.hidesBackButton = YES;
}
- (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
[self resetRTI];
}
......@@ -83,14 +86,15 @@
return (UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskPortraitUpsideDown);
}
-(IBAction)unwindFromSection:(UIStoryboardSegue *)sender {
}
-(IBAction)unwind:(UIStoryboardSegue *)sender {
//reset UIWebView here
[self resetRTI];
-(IBAction)unwindFromScan:(UIStoryboardSegue *)sender {
}
-(void) resetRTI {
//Reset global uiwebview
GlobalWebController *globalWeb = [GlobalWebController resetInstance];
......
......@@ -49,7 +49,7 @@
</connections>
</button>
<navigationBar contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TTD-gb-lM9">
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
<rect key="frame" x="0.0" y="28" width="600" height="44"/>
<items>
<navigationItem title="Inventory Log-In" id="4Dp-YT-MRf"/>
</items>
......@@ -57,21 +57,21 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="rr9-HZ-Pee" secondAttribute="bottom" constant="320" id="1Ho-4B-aKf"/>
<constraint firstItem="u4E-6x-G9M" firstAttribute="leading" secondItem="rFc-Xp-Oik" secondAttribute="leading" id="5qg-ed-otW"/>
<constraint firstItem="u4E-6x-G9M" firstAttribute="trailing" secondItem="rr9-HZ-Pee" secondAttribute="trailing" id="Bwh-sW-YJd"/>
<constraint firstItem="1dA-Bp-AXg" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" id="G6O-yh-OYj"/>
<constraint firstItem="u4E-6x-G9M" firstAttribute="top" secondItem="rFc-Xp-Oik" secondAttribute="bottom" constant="26" id="Ko6-kv-uEw"/>
<constraint firstItem="rFc-Xp-Oik" firstAttribute="trailing" secondItem="8bC-Xf-vdC" secondAttribute="trailingMargin" id="O9f-lM-LGm"/>
<constraint firstItem="rr9-HZ-Pee" firstAttribute="top" secondItem="u4E-6x-G9M" secondAttribute="bottom" constant="8" symbolic="YES" id="QCG-y3-3H4"/>
<constraint firstItem="tJE-yf-FhY" firstAttribute="leading" secondItem="1dA-Bp-AXg" secondAttribute="leading" id="cfL-oo-zTN"/>
<constraint firstItem="rFc-Xp-Oik" firstAttribute="leading" secondItem="1dA-Bp-AXg" secondAttribute="trailing" constant="15" id="dpe-GB-Bxz"/>
<constraint firstItem="u4E-6x-G9M" firstAttribute="bottom" secondItem="tJE-yf-FhY" secondAttribute="bottom" id="gOO-Mh-fnx"/>
<constraint firstItem="tJE-yf-FhY" firstAttribute="top" secondItem="1dA-Bp-AXg" secondAttribute="bottom" constant="40" id="jJ8-Ew-bj7"/>
<constraint firstItem="TTD-gb-lM9" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="l2o-3x-Klu"/>
<constraint firstItem="rFc-Xp-Oik" firstAttribute="trailing" secondItem="u4E-6x-G9M" secondAttribute="trailing" id="nnz-3t-CNr"/>
<constraint firstItem="TTD-gb-lM9" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" id="oUL-xr-XRe"/>
<constraint firstAttribute="trailing" secondItem="TTD-gb-lM9" secondAttribute="trailing" id="s1d-FC-45D"/>
<constraint firstItem="1dA-Bp-AXg" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" id="1Iv-ts-bxe"/>
<constraint firstItem="rFc-Xp-Oik" firstAttribute="top" secondItem="TTD-gb-lM9" secondAttribute="bottom" constant="84" id="BZN-PO-w4E"/>
<constraint firstItem="TTD-gb-lM9" firstAttribute="top" secondItem="y3c-jy-aDJ" secondAttribute="bottom" constant="8" id="I9t-6P-DtG"/>
<constraint firstItem="tJE-yf-FhY" firstAttribute="top" secondItem="1dA-Bp-AXg" secondAttribute="bottom" constant="40" id="INL-Jl-D2V"/>
<constraint firstItem="rFc-Xp-Oik" firstAttribute="trailing" secondItem="u4E-6x-G9M" secondAttribute="trailing" id="Odo-8G-1rD"/>
<constraint firstAttribute="trailing" secondItem="TTD-gb-lM9" secondAttribute="trailing" id="SMU-ZS-LjP"/>
<constraint firstItem="u4E-6x-G9M" firstAttribute="trailing" secondItem="rr9-HZ-Pee" secondAttribute="trailing" id="UTT-kZ-vUg"/>
<constraint firstItem="rFc-Xp-Oik" firstAttribute="leading" secondItem="u4E-6x-G9M" secondAttribute="leading" id="ZPV-Ud-12J"/>
<constraint firstItem="tJE-yf-FhY" firstAttribute="leading" secondItem="1dA-Bp-AXg" secondAttribute="leading" id="Zfu-Ad-NS1"/>
<constraint firstItem="rFc-Xp-Oik" firstAttribute="trailing" secondItem="8bC-Xf-vdC" secondAttribute="trailingMargin" id="Zgw-YO-s0e"/>
<constraint firstItem="rr9-HZ-Pee" firstAttribute="top" secondItem="u4E-6x-G9M" secondAttribute="bottom" constant="8" symbolic="YES" id="ccd-bI-2Mm"/>
<constraint firstItem="u4E-6x-G9M" firstAttribute="bottom" secondItem="tJE-yf-FhY" secondAttribute="bottom" id="iXp-oe-fIk"/>
<constraint firstItem="u4E-6x-G9M" firstAttribute="top" secondItem="rFc-Xp-Oik" secondAttribute="bottom" constant="26" id="lZ2-B3-rTj"/>
<constraint firstItem="rFc-Xp-Oik" firstAttribute="leading" secondItem="1dA-Bp-AXg" secondAttribute="trailing" constant="15" id="rxR-ng-ItO"/>
<constraint firstItem="TTD-gb-lM9" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="v6X-UK-apY"/>
</constraints>
</view>
<navigationItem key="navigationItem" title="PLUC Inventory Log-In" id="MTF-s9-qJz"/>
......@@ -111,12 +111,12 @@
</prototypes>
</tableView>
<navigationBar contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="56R-bO-Qgb">
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
<rect key="frame" x="0.0" y="17" width="600" height="44"/>
<items>
<navigationItem title="Inventory Section" id="4Uv-nC-4He">
<barButtonItem key="leftBarButtonItem" title="Exit" id="bBZ-SA-qdk">
<connections>
<segue destination="yp2-94-MGi" kind="unwind" unwindAction="unwind:" id="E21-9q-nfq"/>
<segue destination="yp2-94-MGi" kind="unwind" unwindAction="unwindFromSection:" id="2lE-Yv-uou"/>
</connections>
</barButtonItem>
<barButtonItem key="rightBarButtonItem" title="Select" id="2p3-0Z-NXG">
......@@ -130,13 +130,13 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="bottomMargin" secondItem="KQi-KS-V1c" secondAttribute="bottom" constant="-61" id="73Z-Gd-xXt"/>
<constraint firstItem="56R-bO-Qgb" firstAttribute="leading" secondItem="Via-s0-aIE" secondAttribute="leading" id="PGs-4x-xUc"/>
<constraint firstItem="56R-bO-Qgb" firstAttribute="top" secondItem="Via-s0-aIE" secondAttribute="top" id="dji-Xe-e2O"/>
<constraint firstItem="KQi-KS-V1c" firstAttribute="top" secondItem="56R-bO-Qgb" secondAttribute="bottom" constant="17" id="fDS-Am-FqQ"/>
<constraint firstAttribute="trailing" secondItem="56R-bO-Qgb" secondAttribute="trailing" id="mBb-Xz-hKl"/>
<constraint firstItem="56R-bO-Qgb" firstAttribute="leading" secondItem="KQi-KS-V1c" secondAttribute="leading" id="u7v-aH-tyG"/>
<constraint firstItem="KQi-KS-V1c" firstAttribute="trailing" secondItem="56R-bO-Qgb" secondAttribute="trailing" id="uAF-ub-UhR"/>
<constraint firstItem="56R-bO-Qgb" firstAttribute="top" secondItem="Via-s0-aIE" secondAttribute="topMargin" constant="17" id="42H-Rg-Cte"/>
<constraint firstAttribute="trailing" secondItem="56R-bO-Qgb" secondAttribute="trailing" id="4sB-u4-CQp"/>
<constraint firstItem="KQi-KS-V1c" firstAttribute="top" secondItem="56R-bO-Qgb" secondAttribute="bottom" id="7si-F4-06c"/>
<constraint firstItem="56R-bO-Qgb" firstAttribute="trailing" secondItem="KQi-KS-V1c" secondAttribute="trailing" id="Q0d-Q5-TWI"/>
<constraint firstItem="KQi-KS-V1c" firstAttribute="leading" secondItem="56R-bO-Qgb" secondAttribute="leading" id="Vfi-Iz-3o4"/>
<constraint firstItem="56R-bO-Qgb" firstAttribute="leading" secondItem="Via-s0-aIE" secondAttribute="leading" id="ZJW-k2-zEh"/>
<constraint firstAttribute="bottomMargin" secondItem="KQi-KS-V1c" secondAttribute="bottom" constant="-61" id="hgc-eS-19m"/>
</constraints>
</view>
<navigationItem key="navigationItem" title="Inventory Section" id="GVO-9b-BCZ">
......@@ -166,31 +166,31 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Continuous scanning:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NbJ-uH-v6R">
<rect key="frame" x="217" y="122" width="167" height="21"/>
<rect key="frame" x="217" y="102" width="167" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="2" maximumValue="4" translatesAutoresizingMaskIntoConstraints="NO" id="Unv-hz-Ovj">
<rect key="frame" x="253" y="310" width="94" height="29"/>
<rect key="frame" x="253" y="290" width="94" height="29"/>
<connections>
<action selector="changeSledVolume:" destination="SAZ-ry-SGT" eventType="valueChanged" id="rBB-T2-ktI"/>
</connections>
</stepper>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sled Volume:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K8q-Hx-Op6">
<rect key="frame" x="248" y="229" width="104" height="29"/>
<rect key="frame" x="248" y="209" width="104" height="29"/>
<constraints>
<constraint firstAttribute="width" constant="104" id="KuV-lL-KF7"/>
<constraint firstAttribute="height" constant="29" id="iBR-p2-Y9l"/>
<constraint firstAttribute="height" constant="29" id="rjJ-OV-jiX"/>
<constraint firstAttribute="width" constant="104" id="wTy-Nh-VBK"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Volume Level" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QRZ-Sy-r8t">
<rect key="frame" x="248" y="266" width="105" height="36"/>
<rect key="frame" x="248" y="246" width="105" height="36"/>
<constraints>
<constraint firstAttribute="height" constant="36" id="gpY-96-0zH"/>
<constraint firstAttribute="height" constant="36" id="Eep-c4-8ik"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
......@@ -209,21 +209,21 @@
</items>
</navigationBar>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="6gf-v9-uSr">
<rect key="frame" x="276" y="151" width="51" height="31"/>
<rect key="frame" x="276" y="131" width="51" height="31"/>
<connections>
<action selector="switchContScanChange:" destination="SAZ-ry-SGT" eventType="valueChanged" id="Rxq-0C-BI1"/>
</connections>
</switch>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="6U7-zs-UVI">
<rect key="frame" x="250" y="431" width="100" height="100"/>
<rect key="frame" x="250" y="411" width="100" height="100"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="1Rg-q4-2BG"/>
<constraint firstAttribute="width" constant="100" id="Mha-X8-Pc5"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sled Battery Level:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oGF-ud-951">
<rect key="frame" x="228" y="394" width="145" height="29"/>
<rect key="frame" x="228" y="374" width="145" height="29"/>
<constraints>
<constraint firstAttribute="height" constant="29" id="Oyx-q2-qIa"/>
<constraint firstAttribute="height" constant="29" id="wyn-jV-htj"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
......@@ -232,25 +232,25 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="UYK-DH-1XM" firstAttribute="top" secondItem="eDN-A7-E2u" secondAttribute="top" id="1ev-Xe-qN3"/>
<constraint firstItem="UYK-DH-1XM" firstAttribute="centerX" secondItem="NbJ-uH-v6R" secondAttribute="centerX" id="6XJ-x4-Le0"/>
<constraint firstItem="Obq-NZ-uqV" firstAttribute="top" secondItem="6U7-zs-UVI" secondAttribute="bottom" constant="69" id="C8C-qk-vf7"/>
<constraint firstItem="oGF-ud-951" firstAttribute="centerX" secondItem="6U7-zs-UVI" secondAttribute="centerX" id="IhR-uf-YNN"/>
<constraint firstItem="Unv-hz-Ovj" firstAttribute="centerX" secondItem="QRZ-Sy-r8t" secondAttribute="centerX" id="NjR-EI-ZY1"/>
<constraint firstItem="K8q-Hx-Op6" firstAttribute="centerX" secondItem="QRZ-Sy-r8t" secondAttribute="centerX" id="b0S-Lx-0uv"/>
<constraint firstItem="Unv-hz-Ovj" firstAttribute="centerX" secondItem="oGF-ud-951" secondAttribute="centerX" id="b7L-ND-u9w"/>
<constraint firstItem="6gf-v9-uSr" firstAttribute="top" secondItem="NbJ-uH-v6R" secondAttribute="bottom" constant="8" symbolic="YES" id="d4I-lY-v71"/>
<constraint firstItem="6gf-v9-uSr" firstAttribute="centerX" secondItem="K8q-Hx-Op6" secondAttribute="centerX" id="d90-u9-WcF"/>
<constraint firstItem="QRZ-Sy-r8t" firstAttribute="top" secondItem="K8q-Hx-Op6" secondAttribute="bottom" constant="8" symbolic="YES" id="edA-dZ-uS0"/>
<constraint firstItem="NbJ-uH-v6R" firstAttribute="centerX" secondItem="6gf-v9-uSr" secondAttribute="centerX" id="gx9-bp-xA8"/>
<constraint firstItem="K8q-Hx-Op6" firstAttribute="top" secondItem="6gf-v9-uSr" secondAttribute="bottom" constant="47" id="k6e-ZR-ere"/>
<constraint firstItem="UYK-DH-1XM" firstAttribute="leading" secondItem="eDN-A7-E2u" secondAttribute="leading" id="knO-o7-ZXq"/>
<constraint firstItem="QRZ-Sy-r8t" firstAttribute="leading" secondItem="K8q-Hx-Op6" secondAttribute="leading" id="lqy-4c-3cL"/>
<constraint firstItem="oGF-ud-951" firstAttribute="top" secondItem="Unv-hz-Ovj" secondAttribute="bottom" constant="55" id="oag-Jv-qvY"/>
<constraint firstItem="Unv-hz-Ovj" firstAttribute="top" secondItem="QRZ-Sy-r8t" secondAttribute="bottom" constant="8" symbolic="YES" id="utx-We-i4x"/>
<constraint firstAttribute="trailing" secondItem="UYK-DH-1XM" secondAttribute="trailing" id="vmR-sK-NnG"/>
<constraint firstItem="NbJ-uH-v6R" firstAttribute="top" secondItem="UYK-DH-1XM" secondAttribute="bottom" constant="78" id="wFP-bI-rWQ"/>
<constraint firstItem="6U7-zs-UVI" firstAttribute="top" secondItem="oGF-ud-951" secondAttribute="bottom" constant="8" symbolic="YES" id="yzF-6c-MKY"/>
<constraint firstItem="QRZ-Sy-r8t" firstAttribute="top" secondItem="K8q-Hx-Op6" secondAttribute="bottom" constant="8" symbolic="YES" id="0iT-8G-Pvk"/>
<constraint firstItem="UYK-DH-1XM" firstAttribute="leading" secondItem="eDN-A7-E2u" secondAttribute="leading" id="4eA-gG-NcV"/>
<constraint firstItem="Obq-NZ-uqV" firstAttribute="top" secondItem="6U7-zs-UVI" secondAttribute="bottom" constant="89" id="5NA-CP-7AP"/>
<constraint firstItem="NbJ-uH-v6R" firstAttribute="top" secondItem="UYK-DH-1XM" secondAttribute="bottom" constant="58" id="9Pz-gD-4U7"/>
<constraint firstItem="NbJ-uH-v6R" firstAttribute="centerX" secondItem="UYK-DH-1XM" secondAttribute="centerX" id="BeC-nl-CII"/>
<constraint firstItem="6U7-zs-UVI" firstAttribute="top" secondItem="oGF-ud-951" secondAttribute="bottom" constant="8" symbolic="YES" id="GYE-Sl-6on"/>
<constraint firstItem="6gf-v9-uSr" firstAttribute="top" secondItem="NbJ-uH-v6R" secondAttribute="bottom" constant="8" symbolic="YES" id="MtT-ka-X4d"/>
<constraint firstItem="oGF-ud-951" firstAttribute="centerX" secondItem="Unv-hz-Ovj" secondAttribute="centerX" id="Psl-iT-F2o"/>
<constraint firstItem="Unv-hz-Ovj" firstAttribute="top" secondItem="QRZ-Sy-r8t" secondAttribute="bottom" constant="8" symbolic="YES" id="S8d-aE-Uuf"/>
<constraint firstItem="QRZ-Sy-r8t" firstAttribute="centerX" secondItem="Unv-hz-Ovj" secondAttribute="centerX" id="TNw-hJ-HLP"/>
<constraint firstItem="NbJ-uH-v6R" firstAttribute="centerX" secondItem="6gf-v9-uSr" secondAttribute="centerX" id="UkM-d3-ncf"/>
<constraint firstItem="oGF-ud-951" firstAttribute="top" secondItem="Unv-hz-Ovj" secondAttribute="bottom" constant="55" id="Xam-03-hUX"/>
<constraint firstItem="oGF-ud-951" firstAttribute="centerX" secondItem="6U7-zs-UVI" secondAttribute="centerX" id="dGK-dv-hdM"/>
<constraint firstItem="QRZ-Sy-r8t" firstAttribute="leading" secondItem="K8q-Hx-Op6" secondAttribute="leading" id="edM-nR-Dl5"/>
<constraint firstItem="QRZ-Sy-r8t" firstAttribute="centerX" secondItem="K8q-Hx-Op6" secondAttribute="centerX" id="hId-dX-2lZ"/>
<constraint firstItem="K8q-Hx-Op6" firstAttribute="top" secondItem="6gf-v9-uSr" secondAttribute="bottom" constant="47" id="kWo-pw-X5f"/>
<constraint firstItem="UYK-DH-1XM" firstAttribute="top" secondItem="eDN-A7-E2u" secondAttribute="top" id="lde-hm-0kL"/>
<constraint firstItem="K8q-Hx-Op6" firstAttribute="centerX" secondItem="6gf-v9-uSr" secondAttribute="centerX" id="nd0-f5-Und"/>
<constraint firstAttribute="trailing" secondItem="UYK-DH-1XM" secondAttribute="trailing" id="pJ5-DA-ikz"/>
</constraints>
</view>
<navigationItem key="navigationItem" title="Settings" id="fve-mW-VnO"/>
......@@ -307,12 +307,12 @@
<nil key="highlightedColor"/>
</label>
<navigationBar contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vuW-X8-mZm">
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
<rect key="frame" x="0.0" y="20" width="600" height="44"/>
<items>
<navigationItem title="Inventory Scan" id="oWP-cH-pTs">
<barButtonItem key="leftBarButtonItem" title="Exit" id="sjS-Af-uhs">
<connections>
<segue destination="McA-YG-yqh" kind="unwind" unwindAction="unwind:" id="MTA-QE-Kbb"/>
<segue destination="McA-YG-yqh" kind="unwind" unwindAction="unwindFromScan:" id="Dgn-dm-Krk"/>
</connections>
</barButtonItem>
<barButtonItem key="rightBarButtonItem" title="Settings" id="iPD-IX-G2q">
......@@ -326,18 +326,18 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="vuW-X8-mZm" secondAttribute="trailing" id="27g-8A-STk"/>
<constraint firstAttribute="bottom" secondItem="HXe-Ct-PRX" secondAttribute="bottom" constant="20" symbolic="YES" id="2yl-m0-aWM"/>
<constraint firstItem="H7S-u0-5kF" firstAttribute="top" secondItem="28C-Wr-Ey7" secondAttribute="bottom" constant="31" id="5u4-LY-aD5"/>
<constraint firstItem="28C-Wr-Ey7" firstAttribute="centerX" secondItem="H7S-u0-5kF" secondAttribute="centerX" id="C48-oM-VNP"/>
<constraint firstItem="HXe-Ct-PRX" firstAttribute="trailing" secondItem="H7S-u0-5kF" secondAttribute="trailing" id="OD8-P6-2HP"/>
<constraint firstItem="vuW-X8-mZm" firstAttribute="leading" secondItem="STn-V1-lxQ" secondAttribute="leading" id="OS1-5d-Fmm"/>
<constraint firstItem="vuW-X8-mZm" firstAttribute="centerX" secondItem="28C-Wr-Ey7" secondAttribute="centerX" id="TTd-1N-eJn"/>
<constraint firstItem="HXe-Ct-PRX" firstAttribute="leading" secondItem="STn-V1-lxQ" secondAttribute="leadingMargin" id="Xjq-He-FKp"/>
<constraint firstItem="28C-Wr-Ey7" firstAttribute="top" secondItem="vuW-X8-mZm" secondAttribute="bottom" constant="48" id="dtc-bu-iwt"/>
<constraint firstItem="HXe-Ct-PRX" firstAttribute="top" secondItem="H7S-u0-5kF" secondAttribute="bottom" constant="8" symbolic="YES" id="r5K-aD-lB7"/>
<constraint firstItem="H7S-u0-5kF" firstAttribute="leading" secondItem="HXe-Ct-PRX" secondAttribute="leading" id="rgY-TA-Nlx"/>
<constraint firstItem="vuW-X8-mZm" firstAttribute="top" secondItem="STn-V1-lxQ" secondAttribute="top" id="wgU-kl-iKd"/>
<constraint firstItem="vuW-X8-mZm" firstAttribute="centerX" secondItem="28C-Wr-Ey7" secondAttribute="centerX" id="0TK-JD-pwB"/>
<constraint firstItem="vuW-X8-mZm" firstAttribute="top" secondItem="RKt-M1-hEG" secondAttribute="bottom" id="4nC-if-oo0"/>
<constraint firstAttribute="trailing" secondItem="vuW-X8-mZm" secondAttribute="trailing" id="Bht-Yj-Sns"/>
<constraint firstItem="H7S-u0-5kF" firstAttribute="top" secondItem="28C-Wr-Ey7" secondAttribute="bottom" constant="31" id="CgE-wO-MmE"/>
<constraint firstItem="H7S-u0-5kF" firstAttribute="centerX" secondItem="28C-Wr-Ey7" secondAttribute="centerX" id="FKb-mX-yde"/>
<constraint firstItem="HXe-Ct-PRX" firstAttribute="leading" secondItem="STn-V1-lxQ" secondAttribute="leadingMargin" id="FiZ-KP-6Xf"/>
<constraint firstItem="HXe-Ct-PRX" firstAttribute="top" secondItem="H7S-u0-5kF" secondAttribute="bottom" constant="8" symbolic="YES" id="XNr-rF-XOi"/>
<constraint firstItem="28C-Wr-Ey7" firstAttribute="top" secondItem="vuW-X8-mZm" secondAttribute="bottom" constant="28" id="fHm-sE-1Qj"/>
<constraint firstAttribute="bottom" secondItem="HXe-Ct-PRX" secondAttribute="bottom" constant="20" symbolic="YES" id="vGb-RY-vE3"/>
<constraint firstItem="H7S-u0-5kF" firstAttribute="trailing" secondItem="HXe-Ct-PRX" secondAttribute="trailing" id="wm3-hU-Oe9"/>
<constraint firstItem="vuW-X8-mZm" firstAttribute="leading" secondItem="STn-V1-lxQ" secondAttribute="leading" id="yWr-Ku-GDy"/>
<constraint firstItem="H7S-u0-5kF" firstAttribute="leading" secondItem="HXe-Ct-PRX" secondAttribute="leading" id="ywU-Iv-Pk6"/>
</constraints>
</view>
<navigationItem key="navigationItem" title="Scan Book ID" id="3KX-LL-wsG">
......@@ -352,7 +352,7 @@
<placeholder placeholderIdentifier="IBFirstResponder" id="cQa-49-Hhu" userLabel="First Responder" sceneMemberID="firstResponder"/>
<exit id="McA-YG-yqh" userLabel="Exit" sceneMemberID="exit"/>
</objects>
<point key="canvasLocation" x="2355" y="136"/>
<point key="canvasLocation" x="2356" y="136"/>
</scene>
</scenes>
</document>
......@@ -9,6 +9,7 @@
#import <UIKit/UIKit.h>
#import "Session.h"
#import "CaptuvoScannerController.h"
#import "LogInViewController.h"
@interface ScanBookViewController : CaptuvoScannerController<UITableViewDataSource, UITableViewDelegate>
......
......@@ -295,9 +295,6 @@ static int BOOK_ID_LENGTH = 14;
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
......
......@@ -265,11 +265,13 @@
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
NSIndexPath *path = [self.tableView indexPathForSelectedRow];
Session *session = [[Session alloc] init];
session.section = [self.sections objectAtIndex:path.row];
ScanBookViewController *destViewController = [segue destinationViewController];
destViewController.session = session;
if ([segue.identifier isEqualToString:@"segueToScanning"]) {
NSIndexPath *path = [self.tableView indexPathForSelectedRow];
Session *session = [[Session alloc] init];
session.section = [self.sections objectAtIndex:path.row];
ScanBookViewController *destViewController = [segue destinationViewController];
destViewController.session = session;
}
}
......
......@@ -82,7 +82,9 @@
break;
}
case BatteryStatusPowerSourceConnected: {
self.batteryView.image = [UIImage imageNamed:@"battery_charging_100.png"];
ChargeStatus charge_status = [[Captuvo sharedCaptuvoDevice] getChargeStatus];
[self displayChargeStatusIcon:charge_status];
//self.batteryView.image = [UIImage imageNamed:@"battery_charging_100.png"];
break;
}
case BatteryStatusUndefined: {
......@@ -92,6 +94,25 @@
}
}
-(void) displayChargeStatusIcon:(ChargeStatus)charge_status {
switch (charge_status) {
case ChargeStatusNotCharging:
self.batteryView.image = [UIImage imageNamed:@"battery_charging_000.png"];
break;
case ChargeStatusCharging:
self.batteryView.image = [UIImage imageNamed:@"battery_charging_060.png"];
break;
case ChargeStatusChargeComplete:
self.batteryView.image = [UIImage imageNamed:@"battery_charging_100.png"];
break;
case ChargeStatusUndefined:
self.batteryView.image = [UIImage imageNamed:@"laptop_nobattery_klaptopdaemon.png"];
break;
default:
break;
}
}
#pragma mark - Navigation
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment