Jelajahi Sumber

Apex Mobile

优化与调整。
Ray Zhang 8 tahun lalu
induk
melakukan
d9080bc720

TEMPAT SAMPAH
Apex Mobile/Apex Mobile.xcodeproj/project.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 0 - 418
Apex Mobile/Apex Mobile.xcodeproj/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,422 +2,4 @@
 <Bucket
 <Bucket
    type = "1"
    type = "1"
    version = "2.0">
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/ApexMobileNetwork.m"
-            timestampString = "539058550.993107"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "126"
-            endingLineNumber = "126"
-            landmarkName = "+parse_authinfo:user:password:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/DetailPageViewController.m"
-            timestampString = "539342533.3873709"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "588"
-            endingLineNumber = "588"
-            landmarkName = "-tableView:cellForRowAtIndexPath:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/ApexMobileFirstViewController.m"
-            timestampString = "539071518.478664"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "32"
-            endingLineNumber = "32"
-            landmarkName = "-LoginButtonClick:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/ApexMobileFirstViewController.m"
-            timestampString = "539071518.478762"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "56"
-            endingLineNumber = "56"
-            landmarkName = "-LoginButtonClick:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/LoginViewController.m"
-            timestampString = "539058709.183265"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "53"
-            endingLineNumber = "53"
-            landmarkName = "-LoginButtonClick:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/StaticModelistViewController.m"
-            timestampString = "539058709.18332"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "68"
-            endingLineNumber = "68"
-            landmarkName = "-didReceiveMemoryWarning"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/ToolslistViewController.m"
-            timestampString = "539058550.993516"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "76"
-            endingLineNumber = "76"
-            landmarkName = "ToolslistViewController"
-            landmarkType = "3">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/ToolslistViewController.m"
-            timestampString = "539058550.993569"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "113"
-            endingLineNumber = "113"
-            landmarkName = "-PerformAction:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/SearchlistViewController.m"
-            timestampString = "538992817.7388361"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "93"
-            endingLineNumber = "93"
-            landmarkName = "-PerformAction:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/RANetwork.m"
-            timestampString = "539076975.972474"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "29"
-            endingLineNumber = "29"
-            landmarkName = "+get_json:parameters:file:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/DetailContent.m"
-            timestampString = "539076975.972615"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "46"
-            endingLineNumber = "46"
-            landmarkName = "-get_item_seg:row:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/RANetwork.m"
-            timestampString = "539076975.972706"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "423"
-            endingLineNumber = "423"
-            landmarkName = "+get_detailcontent:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/RANetwork.m"
-            timestampString = "539076975.97281"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "459"
-            endingLineNumber = "459"
-            landmarkName = "+get_detailcontent:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/RANetwork.m"
-            timestampString = "539076975.97289"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "467"
-            endingLineNumber = "467"
-            landmarkName = "+get_detailcontent:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/DetailPageViewController.m"
-            timestampString = "539342533.389531"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "529"
-            endingLineNumber = "529"
-            landmarkName = "-tableView:cellForRowAtIndexPath:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/DetailPageViewController.m"
-            timestampString = "539342533.3898309"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "528"
-            endingLineNumber = "528"
-            landmarkName = "-tableView:cellForRowAtIndexPath:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/DetailContent.m"
-            timestampString = "539076975.97405"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "61"
-            endingLineNumber = "61"
-            landmarkName = "-get_segmenttype:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/DetailContent.m"
-            timestampString = "539076975.974143"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "63"
-            endingLineNumber = "63"
-            landmarkName = "-get_segmenttype:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/DetailPageViewController.m"
-            timestampString = "539342533.390257"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "282"
-            endingLineNumber = "282"
-            landmarkName = "-tableView:heightForRowAtIndexPath:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/DetailPageViewController.m"
-            timestampString = "539342533.391481"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "446"
-            endingLineNumber = "446"
-            landmarkName = "-tableView:numberOfRowsInSection:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/DetailContent.m"
-            timestampString = "539076975.97532"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "28"
-            endingLineNumber = "28"
-            landmarkName = "-get_itemcount:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/HistoryTabBarController.m"
-            timestampString = "539076975.975419"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "87"
-            endingLineNumber = "87"
-            landmarkName = "-init"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/DetailTabBarController.m"
-            timestampString = "539079484.902439"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "190"
-            endingLineNumber = "190"
-            landmarkName = "-saveDetail:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/DetailTabBarController.m"
-            timestampString = "539079484.9027801"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "177"
-            endingLineNumber = "177"
-            landmarkName = "-alertView:clickedButtonAtIndex:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/ApexMobileDB.m"
-            timestampString = "539495171.8795021"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "65"
-            endingLineNumber = "65"
-            landmarkName = "+execSql:db:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Apex Mobile/DetailPageViewController.m"
-            timestampString = "539342533.405035"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "660"
-            endingLineNumber = "660"
-            landmarkName = "-tableView:cellForRowAtIndexPath:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>
 </Bucket>

+ 25 - 22
Apex Mobile/Apex Mobile/Main.storyboard

@@ -101,7 +101,7 @@
                                 </connections>
                                 </connections>
                             </tableView>
                             </tableView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cGF-KW-91T">
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cGF-KW-91T">
-                                <rect key="frame" x="127" y="303" width="120" height="60"/>
+                                <rect key="frame" x="127.5" y="303.5" width="120" height="60"/>
                                 <constraints>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="120" id="hot-i8-EWa"/>
                                     <constraint firstAttribute="width" constant="120" id="hot-i8-EWa"/>
                                     <constraint firstAttribute="height" constant="60" id="xbF-Jt-INS"/>
                                     <constraint firstAttribute="height" constant="60" id="xbF-Jt-INS"/>
@@ -118,7 +118,7 @@
                                 </connections>
                                 </connections>
                             </button>
                             </button>
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="lwb-OB-0ec">
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="lwb-OB-0ec">
-                                <rect key="frame" x="163" y="308.5" width="50" height="50"/>
+                                <rect key="frame" x="162.5" y="308.5" width="50" height="50"/>
                                 <constraints>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="50" id="0Je-vB-BLA"/>
                                     <constraint firstAttribute="width" constant="50" id="0Je-vB-BLA"/>
                                     <constraint firstAttribute="height" constant="50" id="kQF-ER-vE6"/>
                                     <constraint firstAttribute="height" constant="50" id="kQF-ER-vE6"/>
@@ -181,7 +181,7 @@
                                         <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
                                         <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
                                     </textField>
                                     </textField>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vvk-xp-NJf">
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vvk-xp-NJf">
-                                        <rect key="frame" x="317" y="100" width="38" height="30"/>
+                                        <rect key="frame" x="317" y="104" width="38" height="30"/>
                                         <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
                                         <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
                                         <state key="normal" title="Login">
                                         <state key="normal" title="Login">
                                             <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -191,7 +191,7 @@
                                         </connections>
                                         </connections>
                                     </button>
                                     </button>
                                     <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LxN-nX-R7q">
                                     <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="106" width="127" height="18"/>
+                                        <rect key="frame" x="20" y="110" width="127" height="18"/>
                                         <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
                                         <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                         <state key="normal" title="  Save password" image="unchecked_32">
                                         <state key="normal" title="  Save password" image="unchecked_32">
@@ -200,7 +200,7 @@
                                         </state>
                                         </state>
                                     </button>
                                     </button>
                                     <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="wIj-4p-xEI">
                                     <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="wIj-4p-xEI">
-                                        <rect key="frame" x="287" y="105" width="20" height="20"/>
+                                        <rect key="frame" x="287" y="109" width="20" height="20"/>
                                         <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
                                         <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
                                     </activityIndicatorView>
                                     </activityIndicatorView>
                                 </subviews>
                                 </subviews>
@@ -212,7 +212,7 @@
                                     <constraint firstItem="dHA-PV-ECL" firstAttribute="top" secondItem="OnO-n9-f7N" secondAttribute="top" id="5cO-ce-YEk"/>
                                     <constraint firstItem="dHA-PV-ECL" firstAttribute="top" secondItem="OnO-n9-f7N" secondAttribute="top" id="5cO-ce-YEk"/>
                                     <constraint firstItem="O5q-tH-vch" firstAttribute="centerX" secondItem="OnO-n9-f7N" secondAttribute="centerX" id="9eJ-iH-oTl"/>
                                     <constraint firstItem="O5q-tH-vch" firstAttribute="centerX" secondItem="OnO-n9-f7N" secondAttribute="centerX" id="9eJ-iH-oTl"/>
                                     <constraint firstItem="LxN-nX-R7q" firstAttribute="leading" secondItem="O5q-tH-vch" secondAttribute="leading" id="AeB-jY-RRd"/>
                                     <constraint firstItem="LxN-nX-R7q" firstAttribute="leading" secondItem="O5q-tH-vch" secondAttribute="leading" id="AeB-jY-RRd"/>
-                                    <constraint firstItem="vvk-xp-NJf" firstAttribute="top" secondItem="O5q-tH-vch" secondAttribute="bottom" constant="20" id="Gra-Tq-Fi8"/>
+                                    <constraint firstItem="vvk-xp-NJf" firstAttribute="top" secondItem="O5q-tH-vch" secondAttribute="bottom" constant="24" id="Gra-Tq-Fi8"/>
                                     <constraint firstItem="dHA-PV-ECL" firstAttribute="leading" secondItem="OnO-n9-f7N" secondAttribute="leading" constant="20" id="HL3-xu-Qlv"/>
                                     <constraint firstItem="dHA-PV-ECL" firstAttribute="leading" secondItem="OnO-n9-f7N" secondAttribute="leading" constant="20" id="HL3-xu-Qlv"/>
                                     <constraint firstItem="dHA-PV-ECL" firstAttribute="centerX" secondItem="OnO-n9-f7N" secondAttribute="centerX" id="QII-AH-rLY"/>
                                     <constraint firstItem="dHA-PV-ECL" firstAttribute="centerX" secondItem="OnO-n9-f7N" secondAttribute="centerX" id="QII-AH-rLY"/>
                                     <constraint firstItem="O5q-tH-vch" firstAttribute="width" secondItem="dHA-PV-ECL" secondAttribute="width" id="cmr-UO-Edb"/>
                                     <constraint firstItem="O5q-tH-vch" firstAttribute="width" secondItem="dHA-PV-ECL" secondAttribute="width" id="cmr-UO-Edb"/>
@@ -221,13 +221,6 @@
                                     <constraint firstItem="vvk-xp-NJf" firstAttribute="trailing" secondItem="O5q-tH-vch" secondAttribute="trailing" id="pAX-io-GU3"/>
                                     <constraint firstItem="vvk-xp-NJf" firstAttribute="trailing" secondItem="O5q-tH-vch" secondAttribute="trailing" id="pAX-io-GU3"/>
                                 </constraints>
                                 </constraints>
                             </view>
                             </view>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hzc-kg-csR">
-                                <rect key="frame" x="124.5" y="564" width="126" height="30"/>
-                                <state key="normal" title="Retrieve password"/>
-                                <connections>
-                                    <action selector="RetrieveButtonClick:" destination="RGM-u2-C1G" eventType="touchUpInside" id="kKP-WL-fGb"/>
-                                </connections>
-                            </button>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="apexlogo-2" translatesAutoresizingMaskIntoConstraints="NO" id="zKh-Ur-Gus">
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="apexlogo-2" translatesAutoresizingMaskIntoConstraints="NO" id="zKh-Ur-Gus">
                                 <rect key="frame" x="49.5" y="49" width="276" height="120"/>
                                 <rect key="frame" x="49.5" y="49" width="276" height="120"/>
                                 <constraints>
                                 <constraints>
@@ -236,13 +229,23 @@
                                 </constraints>
                                 </constraints>
                                 <inset key="insetFor6xAndEarlier" minX="0.0" minY="40" maxX="0.0" maxY="-40"/>
                                 <inset key="insetFor6xAndEarlier" minX="0.0" minY="40" maxX="0.0" maxY="-40"/>
                             </imageView>
                             </imageView>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hzc-kg-csR">
+                                <rect key="frame" x="187" y="426.5" width="172" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="172" id="1Td-rT-95c"/>
+                                </constraints>
+                                <state key="normal" title="Retrieve password"/>
+                                <connections>
+                                    <action selector="RetrieveButtonClick:" destination="RGM-u2-C1G" eventType="touchUpInside" id="kKP-WL-fGb"/>
+                                </connections>
+                            </button>
                         </subviews>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                         <constraints>
-                            <constraint firstItem="Hzc-kg-csR" firstAttribute="centerX" secondItem="lHV-oi-ARt" secondAttribute="centerX" id="Mnl-xk-TBH"/>
+                            <constraint firstAttribute="trailing" secondItem="Hzc-kg-csR" secondAttribute="trailing" constant="16" id="1Ug-M1-2wb"/>
+                            <constraint firstItem="Hzc-kg-csR" firstAttribute="top" secondItem="vvk-xp-NJf" secondAttribute="bottom" constant="24" id="Fha-yZ-KoM"/>
                             <constraint firstItem="zKh-Ur-Gus" firstAttribute="top" secondItem="Fgn-Jb-we3" secondAttribute="bottom" constant="29" id="NCe-W2-EeK"/>
                             <constraint firstItem="zKh-Ur-Gus" firstAttribute="top" secondItem="Fgn-Jb-we3" secondAttribute="bottom" constant="29" id="NCe-W2-EeK"/>
                             <constraint firstItem="zKh-Ur-Gus" firstAttribute="centerX" secondItem="lHV-oi-ARt" secondAttribute="centerX" id="de4-gF-h5y"/>
                             <constraint firstItem="zKh-Ur-Gus" firstAttribute="centerX" secondItem="lHV-oi-ARt" secondAttribute="centerX" id="de4-gF-h5y"/>
-                            <constraint firstItem="deU-wF-9js" firstAttribute="top" secondItem="Hzc-kg-csR" secondAttribute="bottom" constant="24" id="fbS-Mb-Anu"/>
                             <constraint firstItem="OnO-n9-f7N" firstAttribute="width" secondItem="lHV-oi-ARt" secondAttribute="width" id="jGj-UK-dEj"/>
                             <constraint firstItem="OnO-n9-f7N" firstAttribute="width" secondItem="lHV-oi-ARt" secondAttribute="width" id="jGj-UK-dEj"/>
                             <constraint firstItem="OnO-n9-f7N" firstAttribute="centerY" secondItem="lHV-oi-ARt" secondAttribute="centerY" id="raF-GG-xW9"/>
                             <constraint firstItem="OnO-n9-f7N" firstAttribute="centerY" secondItem="lHV-oi-ARt" secondAttribute="centerY" id="raF-GG-xW9"/>
                             <constraint firstItem="OnO-n9-f7N" firstAttribute="centerX" secondItem="lHV-oi-ARt" secondAttribute="centerX" id="vXY-JI-MLZ"/>
                             <constraint firstItem="OnO-n9-f7N" firstAttribute="centerX" secondItem="lHV-oi-ARt" secondAttribute="centerX" id="vXY-JI-MLZ"/>
@@ -321,7 +324,7 @@
                                 </constraints>
                                 </constraints>
                             </view>
                             </view>
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="WyF-Pl-7ix">
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="WyF-Pl-7ix">
-                                <rect key="frame" x="162" y="309" width="50" height="50"/>
+                                <rect key="frame" x="162.5" y="308.5" width="50" height="50"/>
                                 <color key="tintColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                 <color key="tintColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="0Us-Fh-cOj"/>
                                     <constraint firstAttribute="height" constant="50" id="0Us-Fh-cOj"/>
@@ -501,7 +504,7 @@
                                 </constraints>
                                 </constraints>
                             </view>
                             </view>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="apexlogo-2" translatesAutoresizingMaskIntoConstraints="NO" id="L4w-P6-CzE">
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="apexlogo-2" translatesAutoresizingMaskIntoConstraints="NO" id="L4w-P6-CzE">
-                                <rect key="frame" x="10" y="40" width="354" height="128"/>
+                                <rect key="frame" x="10" y="40" width="355" height="128"/>
                                 <constraints>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="128" id="dJh-vJ-tuc"/>
                                     <constraint firstAttribute="height" constant="128" id="dJh-vJ-tuc"/>
                                 </constraints>
                                 </constraints>
@@ -624,22 +627,22 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                             <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">
                                                 <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="70" y="4.5" width="267" height="21"/>
+                                                    <rect key="frame" x="63" y="8" width="274" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <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"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 </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">
                                                 <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="70" y="28.5" width="267" height="31"/>
+                                                    <rect key="frame" x="63" y="32" width="274" height="24"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <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"/>
                                                     <color key="textColor" red="0.33333334329999997" green="0.33333334329999997" blue="0.33333334329999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 </label>
                                                 <imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rect_market_news" translatesAutoresizingMaskIntoConstraints="NO" id="c0R-J8-9uA">
                                                 <imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rect_market_news" translatesAutoresizingMaskIntoConstraints="NO" id="c0R-J8-9uA">
-                                                    <rect key="frame" x="10" y="4.5" width="55" height="55"/>
+                                                    <rect key="frame" x="10" y="8" width="48" height="48"/>
                                                     <constraints>
                                                     <constraints>
-                                                        <constraint firstAttribute="width" constant="55" id="6FD-Gf-avq"/>
-                                                        <constraint firstAttribute="height" constant="55" id="miM-A5-vlN"/>
+                                                        <constraint firstAttribute="width" constant="48" id="6FD-Gf-avq"/>
+                                                        <constraint firstAttribute="height" constant="48" id="miM-A5-vlN"/>
                                                     </constraints>
                                                     </constraints>
                                                 </imageView>
                                                 </imageView>
                                             </subviews>
                                             </subviews>

+ 13 - 1
Apex Mobile/Apex Mobile/NewsViewController.m

@@ -256,11 +256,23 @@
     {
     {
         NSData *_decodedImageData   = [[NSData alloc] initWithBase64EncodedString:base64img options:NSDataBase64DecodingIgnoreUnknownCharacters];
         NSData *_decodedImageData   = [[NSData alloc] initWithBase64EncodedString:base64img options:NSDataBase64DecodingIgnoreUnknownCharacters];
         cell.image.image = [UIImage imageWithData:_decodedImageData];
         cell.image.image = [UIImage imageWithData:_decodedImageData];
+        cell.image.contentMode=UIViewContentModeScaleAspectFill;
     }
     }
     else
     else
     {
     {
-        UIImage * img =[UIImage imageNamed:@"rect_market_news"];
+        NSString* default_icon =nil;
+        if([self.module_name isEqualToString:@"Announcements"])
+        {
+            default_icon = @"mode_announcement";
+        }
+        else
+        {
+        default_icon = @"rect_market_news";
+        }
+        
+        UIImage * img =[UIImage imageNamed:default_icon];
         cell.image.image = img;
         cell.image.image = img;
+        cell.image.contentMode=UIViewContentModeScaleAspectFit;
         
         
     }
     }
     cell.title.text = title;
     cell.title.text = title;

+ 1 - 1
Apex Mobile/Apex Mobile/config.h

@@ -12,7 +12,7 @@
 
 
 # ifdef DEBUG
 # ifdef DEBUG
 
 
-#define test_server
+//#define test_server
 
 
 # endif
 # endif