Browse Source

iOS Apex Mobile 2.92 更换图标,修复announcement & market news的bug

Ray Zhang 5 years ago
parent
commit
e4f478fb62
32 changed files with 105 additions and 91 deletions
  1. 2 2
      Apex Mobile/Apex Mobile.xcodeproj/project.pbxproj
  2. 66 54
      Apex Mobile/Apex Mobile/Main.storyboard
  3. 7 5
      Apex Mobile/Apex Mobile/NewImages.xcassets/apex512.imageset/Contents.json
  4. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apex512.imageset/apex512.png
  5. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apex512.imageset/appicon-1.png
  6. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apex512.imageset/appicon-2.png
  7. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apex512.imageset/appicon.png
  8. 6 6
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-1.imageset/Contents.json
  9. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-1.imageset/apexlogopng.png
  10. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-1.imageset/apexlogopng@2x.png
  11. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-1.imageset/apexlogopng@3x.png
  12. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-1.imageset/appicon-1.png
  13. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-1.imageset/appicon-2.png
  14. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-1.imageset/appicon.png
  15. 6 6
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2.imageset/Contents.json
  16. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2.imageset/apexlogopng.png
  17. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2.imageset/apexlogopng@2x.png
  18. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2.imageset/apexlogopng@3x.png
  19. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2.imageset/appicon-1.png
  20. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2.imageset/appicon-2.png
  21. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2.imageset/appicon.png
  22. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2p.imageset/Apexbody_03.png
  23. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2p.imageset/Apexbody_03@2x.png
  24. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2p.imageset/Apexbody_03@3x.png
  25. 6 6
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2p.imageset/Contents.json
  26. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2p.imageset/appicon-1.png
  27. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2p.imageset/appicon-2.png
  28. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2p.imageset/appicon.png
  29. 6 6
      Apex Mobile/Apex Mobile/NewImages.xcassets/mode_booking.imageset/Contents.json
  30. BIN
      Apex Mobile/Apex Mobile/NewImages.xcassets/mode_booking.imageset/appicon.png
  31. 2 2
      Apex Mobile/Apex Mobile/NewsViewController.m
  32. 4 4
      Apex Mobile/Launch Screen.storyboard

+ 2 - 2
Apex Mobile/Apex Mobile.xcodeproj/project.pbxproj

@@ -1819,7 +1819,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 200924;
+				CURRENT_PROJECT_VERSION = 200925;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1857,7 +1857,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 200924;
+				CURRENT_PROJECT_VERSION = 200925;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (

+ 66 - 54
Apex Mobile/Apex Mobile/Main.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="YOs-rL-bRV">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="YOs-rL-bRV">
     <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment version="4368" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -56,6 +56,7 @@
                                 </connections>
                             </tableView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="ojC-VY-hzp"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="VSo-fp-Aqt" firstAttribute="leading" secondItem="ojC-VY-hzp" secondAttribute="leading" id="01G-ol-y6O"/>
@@ -63,7 +64,6 @@
                             <constraint firstItem="VSo-fp-Aqt" firstAttribute="top" secondItem="ojC-VY-hzp" secondAttribute="top" id="YRi-y3-vgM"/>
                             <constraint firstItem="ojC-VY-hzp" firstAttribute="trailing" secondItem="VSo-fp-Aqt" secondAttribute="trailing" id="vNp-R1-P9B"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="ojC-VY-hzp"/>
                     </view>
                     <tabBarItem key="tabBarItem" title="Search" id="EFy-bO-l3i"/>
                     <simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
@@ -85,7 +85,7 @@
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" rowHeight="110" estimatedRowHeight="110" sectionHeaderHeight="-1" sectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="Vjd-jz-qR0">
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="687"/>
-                                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                                <color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
                                 <connections>
                                     <outlet property="dataSource" destination="XAM-wb-CvU" id="UGh-l6-38n"/>
                                     <outlet property="delegate" destination="XAM-wb-CvU" id="PnA-NI-Z60"/>
@@ -113,6 +113,7 @@
                                 <color key="color" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </activityIndicatorView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="NE0-3H-Pi7"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="NE0-3H-Pi7" firstAttribute="trailing" secondItem="Vjd-jz-qR0" secondAttribute="trailing" id="Hxm-ei-DV8"/>
@@ -124,7 +125,6 @@
                             <constraint firstItem="NE0-3H-Pi7" firstAttribute="bottom" secondItem="Vjd-jz-qR0" secondAttribute="bottom" id="iTX-qv-NhV"/>
                             <constraint firstItem="lwb-OB-0ec" firstAttribute="centerY" secondItem="QxY-X5-VD0" secondAttribute="centerY" id="zDT-XE-JLs"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="NE0-3H-Pi7"/>
                     </view>
                     <tabBarItem key="tabBarItem" title="History" image="tab_history" id="TGe-qX-0UY"/>
                     <simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
@@ -164,7 +164,7 @@
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
                                     </textField>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vvk-xp-NJf">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vvk-xp-NJf">
                                         <rect key="frame" x="356" y="108" width="38" height="30"/>
                                         <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
                                         <state key="normal" title="Login">
@@ -175,7 +175,7 @@
                                         </connections>
                                     </button>
                                     <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LxN-nX-R7q">
-                                        <rect key="frame" x="20" y="107" width="143" height="32"/>
+                                        <rect key="frame" x="20" y="114" width="127" height="18"/>
                                         <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                         <state key="normal" title="  Save password" image="unchecked_32">
@@ -213,7 +213,7 @@
                                 </constraints>
                                 <inset key="insetFor6xAndEarlier" minX="0.0" minY="40" maxX="0.0" maxY="-40"/>
                             </imageView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hzc-kg-csR">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hzc-kg-csR">
                                 <rect key="frame" x="222" y="465" width="172" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="172" id="1Td-rT-95c"/>
@@ -229,7 +229,7 @@
                                 <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qAN-Fe-Tk8">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qAN-Fe-Tk8">
                                 <rect key="frame" x="299" y="637" width="95" height="30"/>
                                 <state key="normal" title="Privacy Policy"/>
                                 <connections>
@@ -237,6 +237,7 @@
                                 </connections>
                             </button>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="FAI-Jn-FAt"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="FAI-Jn-FAt" firstAttribute="trailing" secondItem="qAN-Fe-Tk8" secondAttribute="trailing" constant="20" id="9qD-lA-9Xp"/>
@@ -252,7 +253,6 @@
                             <constraint firstItem="OnO-n9-f7N" firstAttribute="centerX" secondItem="FAI-Jn-FAt" secondAttribute="centerX" id="vXY-JI-MLZ"/>
                             <constraint firstItem="FAI-Jn-FAt" firstAttribute="bottom" secondItem="qAN-Fe-Tk8" secondAttribute="bottom" constant="20" id="zrB-d7-MfV"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="FAI-Jn-FAt"/>
                     </view>
                     <tabBarItem key="tabBarItem" title="Login" image="tab_login" id="Tch-x6-pfY"/>
                     <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
@@ -418,6 +418,7 @@
                                 </constraints>
                             </view>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="pP9-eI-NI0"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="TYb-wc-Nwg" firstAttribute="top" secondItem="3xo-DP-qWN" secondAttribute="bottom" id="7Q1-xA-m6A"/>
@@ -432,7 +433,6 @@
                             <constraint firstItem="CoA-Tq-6Qs" firstAttribute="top" secondItem="3xo-DP-qWN" secondAttribute="bottom" id="gVC-BJ-pMJ"/>
                             <constraint firstItem="3xo-DP-qWN" firstAttribute="leading" secondItem="pP9-eI-NI0" secondAttribute="leading" id="mui-fH-ZHN"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="pP9-eI-NI0"/>
                     </view>
                     <tabBarItem key="tabBarItem" title="Home" image="tab_home" id="OC9-MV-8nf"/>
                     <navigationItem key="navigationItem" id="giR-co-TyJ"/>
@@ -486,11 +486,11 @@
                                         <rect key="frame" x="0.0" y="55.333332061767578" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tq0-wS-k0Y" id="cWg-0l-aaE">
-                                            <rect key="frame" x="0.0" y="0.0" width="383" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="382.66666666666669" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="tg4-Ox-UsK">
-                                                    <rect key="frame" x="20" y="0.0" width="355" height="44"/>
+                                                    <rect key="frame" x="20" y="0.0" width="354.66666666666669" height="44"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -507,6 +507,7 @@
                                 </connections>
                             </tableView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="hpB-AM-y22"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="hpB-AM-y22" firstAttribute="bottom" secondItem="t4w-1J-ZSQ" secondAttribute="bottom" id="1Lq-O9-mK3"/>
@@ -514,7 +515,6 @@
                             <constraint firstItem="t4w-1J-ZSQ" firstAttribute="leading" secondItem="hpB-AM-y22" secondAttribute="leading" id="82y-jF-M3t"/>
                             <constraint firstItem="t4w-1J-ZSQ" firstAttribute="top" secondItem="hpB-AM-y22" secondAttribute="top" id="DNZ-Xt-6Yr"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="hpB-AM-y22"/>
                     </view>
                     <tabBarItem key="tabBarItem" title="Tools" image="tools" id="fJu-Gg-e2f"/>
                     <navigationItem key="navigationItem" title="Tools" id="Cr5-do-P06"/>
@@ -531,8 +531,8 @@
                     <view key="view" contentMode="scaleToFill" id="ggR-kU-S5e">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="QEK-bi-Moz"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </view>
                     <tabBarItem key="tabBarItem" title="My" id="3ya-sj-Vib"/>
                     <simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
@@ -614,6 +614,7 @@
                                 </constraints>
                             </imageView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="qqy-e5-VYs"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="QzH-GH-INM" firstAttribute="centerX" secondItem="qqy-e5-VYs" secondAttribute="centerX" id="E1i-9b-Sgg"/>
@@ -624,7 +625,6 @@
                             <constraint firstItem="L4w-P6-CzE" firstAttribute="leading" secondItem="qqy-e5-VYs" secondAttribute="leading" constant="10" id="Ykt-Nx-iFC"/>
                             <constraint firstItem="QzH-GH-INM" firstAttribute="centerY" secondItem="qqy-e5-VYs" secondAttribute="centerY" priority="999" id="mDe-mV-dtM"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="qqy-e5-VYs"/>
                     </view>
                     <navigationItem key="navigationItem" title="About" id="Fv2-lk-EA8"/>
                     <nil key="simulatedBottomBarMetrics"/>
@@ -647,8 +647,8 @@
                     <view key="view" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="xU3-mF-FWx">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <viewLayoutGuide key="safeArea" id="fcz-8K-xdd"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                     <tabBarItem key="tabBarItem" title="Service location" image="map (1)" id="4zB-7i-xln"/>
                     <toolbarItems/>
@@ -666,8 +666,8 @@
                     <view key="view" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="8e0-87-IL3">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <viewLayoutGuide key="safeArea" id="uNI-nn-LiD"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                     <tabBarItem key="tabBarItem" title="Service location" image="map (1)" id="qge-0o-e5V"/>
                     <toolbarItems/>
@@ -702,6 +702,7 @@
                                 </wkWebViewConfiguration>
                             </wkWebView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="CcC-cg-ElX"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="kly-ZP-lFy" firstAttribute="top" secondItem="CcC-cg-ElX" secondAttribute="top" constant="5" id="2jQ-3a-dZP"/>
@@ -711,7 +712,6 @@
                             <constraint firstItem="dff-mJ-R1Y" firstAttribute="leading" secondItem="CcC-cg-ElX" secondAttribute="leading" constant="5" id="r8d-al-FvY"/>
                             <constraint firstItem="CcC-cg-ElX" firstAttribute="bottom" secondItem="dff-mJ-R1Y" secondAttribute="bottom" id="wc9-vs-4Ef"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="CcC-cg-ElX"/>
                     </view>
                     <connections>
                         <outlet property="webview" destination="dff-mJ-R1Y" id="zqN-sx-i9B"/>
@@ -737,17 +737,17 @@
                                         <rect key="frame" x="0.0" y="28" width="414" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="65E-n4-LH6" id="SYB-mj-lbk">
-                                            <rect key="frame" x="0.0" y="0.0" width="383" height="65"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="382.66666666666669" height="65"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bkc-WL-mze">
-                                                    <rect key="frame" x="63" y="8.6666666666666643" width="315" height="21"/>
+                                                    <rect key="frame" x="63" y="8.6666666666666643" width="314.66666666666669" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Label" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jq7-eQ-ZiX">
-                                                    <rect key="frame" x="63" y="32.666666666666664" width="315" height="24"/>
+                                                    <rect key="frame" x="63" y="32.666666666666664" width="314.66666666666669" height="24"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <color key="textColor" red="0.33333334329999997" green="0.33333334329999997" blue="0.33333334329999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -794,6 +794,7 @@
                                 <color key="color" red="0.40000000600000002" green="0.80000001190000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </activityIndicatorView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="7qV-oV-8s1"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="7qV-oV-8s1" firstAttribute="trailing" secondItem="RHV-m7-JCn" secondAttribute="trailing" id="3FN-UB-gQf"/>
@@ -803,7 +804,6 @@
                             <constraint firstItem="Kgw-c0-JVW" firstAttribute="centerY" secondItem="RHV-m7-JCn" secondAttribute="centerY" id="p67-L8-zdC"/>
                             <constraint firstItem="7qV-oV-8s1" firstAttribute="bottom" secondItem="RHV-m7-JCn" secondAttribute="bottom" id="wd8-1o-5zj"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="7qV-oV-8s1"/>
                     </view>
                     <connections>
                         <outlet property="mum" destination="Kgw-c0-JVW" id="i34-3X-vc9"/>
@@ -882,17 +882,17 @@
                                         <rect key="frame" x="0.0" y="110" width="414" height="82"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="cff-AI-2yS" id="78g-DF-IJU">
-                                            <rect key="frame" x="0.0" y="0.0" width="383" height="82"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="382.66666666666669" height="82"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="item_bool" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="94I-uG-uW7">
-                                                    <rect key="frame" x="10" y="10" width="363" height="21"/>
+                                                    <rect key="frame" x="10" y="10" width="362.66666666666669" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XF6-7j-X0s">
-                                                    <rect key="frame" x="10" y="0.0" width="363" height="82"/>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XF6-7j-X0s">
+                                                    <rect key="frame" x="10" y="0.0" width="362.66666666666669" height="82"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <state key="normal" title="Not set">
                                                         <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1008,10 +1008,10 @@
                                             <rect key="frame" x="297" y="5" width="97" height="34"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <state key="normal" title="Show Fields">
-                                                <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                <color key="titleColor" systemColor="darkTextColor"/>
                                             </state>
                                             <state key="selected" title="Hide Fields">
-                                                <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                <color key="titleColor" systemColor="darkTextColor"/>
                                             </state>
                                             <connections>
                                                 <action selector="searchTableExpandableBtnClick:" destination="C3t-ED-9dx" eventType="touchUpInside" id="xY2-Xs-mHl"/>
@@ -1021,6 +1021,7 @@
                                 </items>
                             </toolbar>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="Ug8-lN-BLG"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="Ug8-lN-BLG" firstAttribute="trailing" secondItem="FYC-YO-04g" secondAttribute="trailing" id="0eR-do-34B"/>
@@ -1034,7 +1035,6 @@
                             <constraint firstItem="s08-SO-Hkg" firstAttribute="top" secondItem="Ug8-lN-BLG" secondAttribute="top" id="oN6-7x-d04"/>
                             <constraint firstItem="FYC-YO-04g" firstAttribute="leading" secondItem="Ug8-lN-BLG" secondAttribute="leading" id="xuP-pN-h3X"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="Ug8-lN-BLG"/>
                     </view>
                     <navigationItem key="navigationItem" title="Search" id="OwC-ot-lOg">
                         <barButtonItem key="rightBarButtonItem" image="ic_setting" id="cmN-H2-3ne">
@@ -1106,6 +1106,7 @@
                                 </connections>
                             </tableView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="KsQ-fe-Efg"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="TxA-8D-Obq" firstAttribute="leading" secondItem="KsQ-fe-Efg" secondAttribute="leading" id="Jny-Dl-8l4"/>
@@ -1115,7 +1116,6 @@
                             <constraint firstItem="KsQ-fe-Efg" firstAttribute="bottom" secondItem="TxA-8D-Obq" secondAttribute="bottom" id="ndW-e0-jqh"/>
                             <constraint firstItem="TxA-8D-Obq" firstAttribute="width" secondItem="utH-2m-x08" secondAttribute="width" id="s4b-B4-XGr"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="KsQ-fe-Efg"/>
                     </view>
                     <navigationItem key="navigationItem" id="hLT-6n-O4w">
                         <barButtonItem key="rightBarButtonItem" title="Item" image="ic_mark_read" springLoaded="YES" style="plain" id="hcg-nl-Lld">
@@ -1154,7 +1154,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uow-re-de3">
-                                                    <rect key="frame" x="-10" y="5" width="0.0" height="21"/>
+                                                    <rect key="frame" x="70" y="5" width="334" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -1167,7 +1167,7 @@
                                                     </constraints>
                                                 </imageView>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="time" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RJz-KQ-Fv2">
-                                                    <rect key="frame" x="-10" y="36" width="0.0" height="17"/>
+                                                    <rect key="frame" x="70" y="36" width="334" height="17"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
@@ -1197,8 +1197,8 @@
                                 </connections>
                             </tableView>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <viewLayoutGuide key="safeArea" id="caU-PV-mSZ"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                     <connections>
                         <outlet property="tableview" destination="Dw1-MH-d07" id="u9q-Ri-KbE"/>
@@ -1229,13 +1229,13 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tp8-Ek-fGC">
-                                                    <rect key="frame" x="-10" y="5" width="0.0" height="21"/>
+                                                    <rect key="frame" x="70" y="5" width="334" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="time" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nzO-0Q-mKW">
-                                                    <rect key="frame" x="-10" y="36" width="0.0" height="17"/>
+                                                    <rect key="frame" x="70" y="36" width="334" height="17"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
@@ -1272,8 +1272,8 @@
                                 </connections>
                             </tableView>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <viewLayoutGuide key="safeArea" id="aax-eY-hEh"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                     <navigationItem key="navigationItem" title="Title" id="lRn-1c-TxB"/>
                     <connections>
@@ -1301,18 +1301,18 @@
                                         <rect key="frame" x="0.0" y="28" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fFD-VO-CKz" id="IND-eh-Wg5">
-                                            <rect key="frame" x="0.0" y="0.0" width="383" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="382.66666666666669" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2vf-O6-CXq">
-                                                    <rect key="frame" x="79.333333333333314" y="0.0" width="295.66666666666669" height="44"/>
+                                                    <rect key="frame" x="79" y="0.0" width="295.66666666666669" height="44"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="ic_pdf128" id="vJN-YF-dbw">
-                                                    <rect key="frame" x="20" y="0.0" width="44.333333333333314" height="44"/>
+                                                    <rect key="frame" x="20" y="0.0" width="44" height="44"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                 </imageView>
                                             </subviews>
@@ -1325,8 +1325,8 @@
                                 </connections>
                             </tableView>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <viewLayoutGuide key="safeArea" id="yxq-yv-F6l"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                     <connections>
                         <outlet property="tableview" destination="QAF-Zi-uoj" id="gnA-Vf-k79"/>
@@ -1368,7 +1368,7 @@
                                     <outlet property="delegate" destination="adW-Ar-52t" id="Fhr-0F-cwc"/>
                                 </connections>
                             </textField>
-                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gUy-8S-kFU">
+                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gUy-8S-kFU">
                                 <rect key="frame" x="10" y="130" width="48" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="d1t-tg-Ktk"/>
@@ -1380,7 +1380,7 @@
                                     <action selector="onCancel:" destination="adW-Ar-52t" eventType="touchUpInside" id="bo5-sE-1dQ"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EZm-dC-lQ4">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EZm-dC-lQ4">
                                 <rect key="frame" x="351" y="130" width="53" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="xac-v9-MaN"/>
@@ -1411,6 +1411,7 @@
                                 <color key="color" red="0.40000000600000002" green="0.80000001190000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </activityIndicatorView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="2pt-7n-NmB"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="hjm-ij-Anz" firstAttribute="centerX" secondItem="2pt-7n-NmB" secondAttribute="centerX" id="0uO-1D-HzA"/>
@@ -1430,7 +1431,6 @@
                             <constraint firstItem="oiA-1a-FH6" firstAttribute="leading" secondItem="2pt-7n-NmB" secondAttribute="leading" constant="10" id="s6Y-kA-8ty"/>
                             <constraint firstItem="2pt-7n-NmB" firstAttribute="trailing" secondItem="x3N-fn-QfS" secondAttribute="trailing" constant="10" id="yHp-2A-Ob7"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="2pt-7n-NmB"/>
                     </view>
                     <navigationItem key="navigationItem" title="Change password" id="1o1-l5-SjW"/>
                     <connections>
@@ -1483,6 +1483,7 @@
                                 </connections>
                             </tableView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="KXj-9H-wRg"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="iXC-3g-FEF" firstAttribute="top" secondItem="KXj-9H-wRg" secondAttribute="top" id="47D-Qo-2Uk"/>
@@ -1490,7 +1491,6 @@
                             <constraint firstItem="iXC-3g-FEF" firstAttribute="leading" secondItem="KXj-9H-wRg" secondAttribute="leading" id="hiN-n6-krx"/>
                             <constraint firstItem="KXj-9H-wRg" firstAttribute="trailing" secondItem="iXC-3g-FEF" secondAttribute="trailing" id="yhE-Cb-mRR"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="KXj-9H-wRg"/>
                     </view>
                     <navigationItem key="navigationItem" id="FRT-OA-rqr">
                         <barButtonItem key="rightBarButtonItem" title="Save" id="wQJ-IE-abv">
@@ -1539,7 +1539,7 @@
                                     <outlet property="delegate" destination="6Nv-Co-XiD" id="VXG-xf-Amb"/>
                                 </connections>
                             </textField>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gha-2I-ENG">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gha-2I-ENG">
                                 <rect key="frame" x="67" y="108" width="48" height="30"/>
                                 <state key="normal" title="Cancel">
                                     <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1548,7 +1548,7 @@
                                     <action selector="OnCancel:" destination="6Nv-Co-XiD" eventType="touchUpInside" id="1qN-la-b9K"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oJM-ge-k0D">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oJM-ge-k0D">
                                 <rect key="frame" x="317" y="108" width="30" height="30"/>
                                 <state key="normal" title="Ok">
                                     <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1558,7 +1558,7 @@
                                 </connections>
                             </button>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Retrieve Password" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MGf-17-Sft">
-                                <rect key="frame" x="128.66666666666669" y="5" width="156.66666666666669" height="23"/>
+                                <rect key="frame" x="129.33333333333331" y="5" width="155.33333333333331" height="23"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="19"/>
                                 <nil key="highlightedColor"/>
                             </label>
@@ -1567,6 +1567,7 @@
                                 <color key="color" red="0.40000000600000002" green="0.80000001190000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </activityIndicatorView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="An6-CA-N9y"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="Fkr-8L-6gA" firstAttribute="centerX" secondItem="An6-CA-N9y" secondAttribute="centerX" id="0h5-Yw-yY7"/>
@@ -1582,7 +1583,6 @@
                             <constraint firstItem="Fkr-8L-6gA" firstAttribute="centerY" secondItem="qVj-DC-yAZ" secondAttribute="centerY" id="gpQ-h6-eoY"/>
                             <constraint firstItem="gha-2I-ENG" firstAttribute="top" secondItem="zBl-3h-h8W" secondAttribute="bottom" constant="10" id="uac-jg-ZvV"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="An6-CA-N9y"/>
                     </view>
                     <navigationItem key="navigationItem" id="Tsm-IG-Abp"/>
                     <connections>
@@ -1614,6 +1614,7 @@
                                 </wkWebViewConfiguration>
                             </wkWebView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="jr2-Dq-Yyq"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="QGo-eo-ywb" firstAttribute="top" secondItem="jr2-Dq-Yyq" secondAttribute="top" id="ClT-Ya-cox"/>
@@ -1621,7 +1622,6 @@
                             <constraint firstItem="jr2-Dq-Yyq" firstAttribute="trailing" secondItem="QGo-eo-ywb" secondAttribute="trailing" constant="5" id="hqU-WJ-N5J"/>
                             <constraint firstItem="jr2-Dq-Yyq" firstAttribute="bottom" secondItem="QGo-eo-ywb" secondAttribute="bottom" id="rJz-h3-ZW6"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="jr2-Dq-Yyq"/>
                     </view>
                     <connections>
                         <outlet property="webview" destination="QGo-eo-ywb" id="enX-X2-smK"/>
@@ -1649,7 +1649,7 @@
                                 <color key="color" red="0.40000000600000002" green="0.80000001190000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </activityIndicatorView>
                             <label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No record in this page" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AKO-ni-aUG">
-                                <rect key="frame" x="122.66666666666669" y="246.66666666666663" width="169" height="21"/>
+                                <rect key="frame" x="123" y="246.66666666666663" width="168" height="21"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <inset key="insetFor6xAndEarlier" minX="0.0" minY="64" maxX="0.0" maxY="-64"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -1717,7 +1717,7 @@
                                                 <constraint firstItem="Fv6-ui-cri" firstAttribute="top" secondItem="q9z-Ac-77Z" secondAttribute="top" constant="8" id="dnH-6e-gCz"/>
                                             </constraints>
                                         </tableViewCellContentView>
-                                        <color key="backgroundColor" cocoaTouchSystemColor="tableCellGroupedBackgroundColor"/>
+                                        <color key="backgroundColor" systemColor="tableCellGroupedBackgroundColor"/>
                                         <connections>
                                             <outlet property="listLabel" destination="Fv6-ui-cri" id="ee6-GK-EOJ"/>
                                         </connections>
@@ -1818,6 +1818,7 @@
                                 </connections>
                             </tableView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="txn-R2-ekf"/>
                         <color key="backgroundColor" red="0.90612856220000004" green="0.90612856220000004" blue="0.90612856220000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="txn-R2-ekf" firstAttribute="trailing" secondItem="mia-XC-A8d" secondAttribute="trailing" id="2TB-C6-6NT"/>
@@ -1833,7 +1834,6 @@
                             <constraint firstItem="9wT-8n-8NB" firstAttribute="leading" secondItem="txn-R2-ekf" secondAttribute="leading" id="rTT-vG-wDX"/>
                             <constraint firstItem="mia-XC-A8d" firstAttribute="height" secondItem="9wT-8n-8NB" secondAttribute="height" multiplier="2:1" identifier="ratio_constraint" id="uWa-dk-e6q"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="txn-R2-ekf"/>
                     </view>
                     <connections>
                         <outlet property="mum" destination="Cs2-5V-Ius" id="vFR-HN-dsS"/>
@@ -1848,7 +1848,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="apexlogo-1" width="387" height="96"/>
+        <image name="apexlogo-1" width="412" height="96"/>
         <image name="bar_search" width="30" height="30"/>
         <image name="ic_clear" width="30" height="30"/>
         <image name="ic_mark_read" width="30" height="30"/>
@@ -1861,5 +1861,17 @@
         <image name="tab_login" width="30" height="30"/>
         <image name="tools" width="32" height="32"/>
         <image name="unchecked_32" width="16" height="16"/>
+        <systemColor name="darkTextColor">
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="darkTextColor">
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="groupTableViewBackgroundColor">
+            <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="tableCellGroupedBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>

+ 7 - 5
Apex Mobile/Apex Mobile/NewImages.xcassets/apex512.imageset/Contents.json

@@ -1,21 +1,23 @@
 {
   "images" : [
     {
+      "filename" : "appicon-1.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "appicon.png",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "apex512.png"
+      "scale" : "2x"
     },
     {
+      "filename" : "appicon-2.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apex512.imageset/apex512.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apex512.imageset/appicon-1.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apex512.imageset/appicon-2.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apex512.imageset/appicon.png


+ 6 - 6
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-1.imageset/Contents.json

@@ -1,23 +1,23 @@
 {
   "images" : [
     {
+      "filename" : "appicon.png",
       "idiom" : "universal",
-      "filename" : "apexlogopng.png",
       "scale" : "1x"
     },
     {
+      "filename" : "appicon-1.png",
       "idiom" : "universal",
-      "filename" : "apexlogopng@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "appicon-2.png",
       "idiom" : "universal",
-      "filename" : "apexlogopng@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-1.imageset/apexlogopng.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-1.imageset/apexlogopng@2x.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-1.imageset/apexlogopng@3x.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-1.imageset/appicon-1.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-1.imageset/appicon-2.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-1.imageset/appicon.png


+ 6 - 6
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2.imageset/Contents.json

@@ -1,23 +1,23 @@
 {
   "images" : [
     {
+      "filename" : "appicon.png",
       "idiom" : "universal",
-      "filename" : "apexlogopng.png",
       "scale" : "1x"
     },
     {
+      "filename" : "appicon-1.png",
       "idiom" : "universal",
-      "filename" : "apexlogopng@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "appicon-2.png",
       "idiom" : "universal",
-      "filename" : "apexlogopng@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2.imageset/apexlogopng.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2.imageset/apexlogopng@2x.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2.imageset/apexlogopng@3x.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2.imageset/appicon-1.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2.imageset/appicon-2.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2.imageset/appicon.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2p.imageset/Apexbody_03.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2p.imageset/Apexbody_03@2x.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2p.imageset/Apexbody_03@3x.png


+ 6 - 6
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2p.imageset/Contents.json

@@ -1,23 +1,23 @@
 {
   "images" : [
     {
+      "filename" : "appicon.png",
       "idiom" : "universal",
-      "filename" : "Apexbody_03.png",
       "scale" : "1x"
     },
     {
+      "filename" : "appicon-1.png",
       "idiom" : "universal",
-      "filename" : "Apexbody_03@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "appicon-2.png",
       "idiom" : "universal",
-      "filename" : "Apexbody_03@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2p.imageset/appicon-1.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2p.imageset/appicon-2.png


BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/apexlogo-2p.imageset/appicon.png


+ 6 - 6
Apex Mobile/Apex Mobile/NewImages.xcassets/mode_booking.imageset/Contents.json

@@ -1,23 +1,23 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "mode_booking.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "mode_booking@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "mode_booking@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
Apex Mobile/Apex Mobile/NewImages.xcassets/mode_booking.imageset/appicon.png


+ 2 - 2
Apex Mobile/Apex Mobile/NewsViewController.m

@@ -65,7 +65,7 @@
                     [self.data append_jsondata: result];
                     self.lastid = self.data._id;
 
-                    if([result[@"result"] intValue]!=RESULT_TRUE)
+                    if([result[@"result"] intValue]!=1)
                     {
                         UIAlertController *alertVC = [UIAlertController alertControllerWithTitle: @"Warning"
                                                                                                       message: result[@"err_msg"]
@@ -122,7 +122,7 @@
                             [self.data append_jsondata: result];
                             self.lastid = self.data._id;
                             self.btnrefresh.hidden = false;
-                            if([result[@"result"] intValue]!=RESULT_TRUE)
+                            if([result[@"result"] intValue]!=1)
                             {
                                 UIAlertController *alertVC = [UIAlertController alertControllerWithTitle: @"Warning"
                                                                                                               message: result[@"err_msg"]

+ 4 - 4
Apex Mobile/Launch Screen.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -37,6 +37,7 @@
                                 <inset key="insetFor6xAndEarlier" minX="0.0" minY="40" maxX="0.0" maxY="-40"/>
                             </imageView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="2Wi-EK-hzc" firstAttribute="top" secondItem="Bcu-3y-fUS" secondAttribute="top" constant="106" id="06u-to-a33"/>
@@ -48,7 +49,6 @@
                             <constraint firstItem="2Wi-EK-hzc" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="wyn-fK-T2t"/>
                             <constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="x7j-FC-K8j"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -57,6 +57,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="apexlogo-1" width="387" height="96"/>
+        <image name="apexlogo-1" width="412" height="96"/>
     </resources>
 </document>