Преглед на файлове

Optimize the display of my-->saved list, add type and icon -- 优化my-->saved 列表显示,要增加类型,图标 resolve: #9

Ray Zhang преди 5 години
родител
ревизия
8d96f2cd7e

BIN
RA TradeFiling/RA TradeFiling.xcodeproj/project.xcworkspace/xcuserdata/ruizhang.xcuserdatad/UserInterfaceState.xcuserstate


+ 35 - 3
RA TradeFiling/RA TradeFiling.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -916,7 +916,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "7CB4F21F-54CC-4A15-A2BF-15355EF55AB3"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "RA TradeFiling/Login/LoginViewController.m"
@@ -932,7 +932,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "81452FF2-7013-4633-999E-3AFD779A9AC0"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "RA TradeFiling/Tab Root/TFRootViewController.m"
@@ -948,7 +948,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "FFC155ED-81A8-4CA2-B292-95CE57DB60A6"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "RA TradeFiling/Tab Root/TFRootViewController.m"
@@ -1008,5 +1008,37 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "D7E886B6-F6A9-4DF1-9C49-D78379253A19"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/My/SavedSearchViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "149"
+            endingLineNumber = "149"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "4A615E85-78E6-4B75-ADB1-BF4C9A711AFA"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/My/SavedDetailViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "140"
+            endingLineNumber = "140"
+            landmarkName = "-tableView:numberOfRowsInSection:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 0 - 157
RA TradeFiling/RA TradeFiling/Base.lproj/Main.storyboard

@@ -4,7 +4,6 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -39,161 +38,5 @@
             </objects>
             <point key="canvasLocation" x="-210" y="139"/>
         </scene>
-        <!--Saved Detail View Controller-->
-        <scene sceneID="Bak-Q4-1aa">
-            <objects>
-                <viewController storyboardIdentifier="SavedDetailViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="e3y-Mo-5Bq" customClass="SavedDetailViewController" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="1mQ-OJ-x6C">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="65" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="gKT-uG-6eo">
-                                <rect key="frame" x="0.0" y="64" width="414" height="788"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <prototypes>
-                                    <tableViewCell contentMode="scaleToFill" restorationIdentifier="cell_item_history" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="cell_item_history" rowHeight="65" id="oI3-pP-exT" customClass="CellItemHistory">
-                                        <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="oI3-pP-exT" id="EbC-uA-Hdc">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="65"/>
-                                            <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="Pv6-VP-CyP">
-                                                    <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>
-                                                <imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rect_market_news" translatesAutoresizingMaskIntoConstraints="NO" id="5iJ-aL-gVh">
-                                                    <rect key="frame" x="10" y="7.5" width="50" height="50"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" constant="50" id="FL2-yY-7h1"/>
-                                                        <constraint firstAttribute="height" constant="50" id="pmK-kM-kb9"/>
-                                                    </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="jPt-fD-eXi">
-                                                    <rect key="frame" x="70" y="36" width="334" height="17"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                    <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="calibratedWhite"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="jPt-fD-eXi" firstAttribute="top" secondItem="Pv6-VP-CyP" secondAttribute="bottom" constant="10" id="3db-co-QXZ"/>
-                                                <constraint firstItem="5iJ-aL-gVh" firstAttribute="centerY" secondItem="EbC-uA-Hdc" secondAttribute="centerY" id="94C-xj-L5u"/>
-                                                <constraint firstAttribute="trailing" secondItem="Pv6-VP-CyP" secondAttribute="trailing" constant="10" id="BJq-0J-LDW"/>
-                                                <constraint firstItem="jPt-fD-eXi" firstAttribute="trailing" secondItem="Pv6-VP-CyP" secondAttribute="trailing" id="Yu4-sX-HGh"/>
-                                                <constraint firstItem="5iJ-aL-gVh" firstAttribute="leading" secondItem="EbC-uA-Hdc" secondAttribute="leading" constant="10" id="bQQ-vB-80x"/>
-                                                <constraint firstItem="Pv6-VP-CyP" firstAttribute="leading" secondItem="5iJ-aL-gVh" secondAttribute="trailing" constant="10" id="eeM-jZ-A9d"/>
-                                                <constraint firstItem="jPt-fD-eXi" firstAttribute="leading" secondItem="Pv6-VP-CyP" secondAttribute="leading" id="l5O-vp-ybF"/>
-                                                <constraint firstItem="Pv6-VP-CyP" firstAttribute="top" secondItem="EbC-uA-Hdc" secondAttribute="top" constant="5" id="lQ3-eB-kok"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                        <connections>
-                                            <outlet property="icon" destination="5iJ-aL-gVh" id="zcj-jH-gIa"/>
-                                            <outlet property="name" destination="Pv6-VP-CyP" id="oWo-j8-fPT"/>
-                                            <outlet property="time" destination="jPt-fD-eXi" id="ihL-CP-1mL"/>
-                                        </connections>
-                                    </tableViewCell>
-                                </prototypes>
-                                <connections>
-                                    <outlet property="dataSource" destination="e3y-Mo-5Bq" id="hvt-Sx-Hz7"/>
-                                    <outlet property="delegate" destination="e3y-Mo-5Bq" id="Uga-BY-zo6"/>
-                                </connections>
-                            </tableView>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="IL9-2K-LFg"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    </view>
-                    <toolbarItems/>
-                    <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
-                    <connections>
-                        <outlet property="tableview" destination="gKT-uG-6eo" id="Dgf-cr-f1W"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="gE4-pV-vqt" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="3185" y="-329"/>
-        </scene>
-        <!--History-->
-        <scene sceneID="8SB-Pv-ejB">
-            <objects>
-                <viewController storyboardIdentifier="SavedSearchViewController" title="History" useStoryboardIdentifierAsRestorationIdentifier="YES" id="6Nc-8O-Duf" customClass="SavedSearchViewController" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="gZJ-y3-i64">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="65" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="uMr-li-Zcc">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="876"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <prototypes>
-                                    <tableViewCell contentMode="scaleToFill" restorationIdentifier="cell_item_history" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="cell_item_history" rowHeight="65" id="ZRU-TC-lVZ" customClass="CellItemHistory">
-                                        <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="ZRU-TC-lVZ" id="2P1-0P-Osn">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="65"/>
-                                            <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="wBd-fr-gqF">
-                                                    <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="BRA-3m-2pQ">
-                                                    <rect key="frame" x="70" y="36" width="334" height="17"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                    <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="calibratedWhite"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rect_market_news" translatesAutoresizingMaskIntoConstraints="NO" id="epb-lj-QpL">
-                                                    <rect key="frame" x="10" y="7.5" width="50" height="50"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" constant="50" id="jZt-3x-zoT"/>
-                                                        <constraint firstAttribute="height" constant="50" id="nYt-in-MCM"/>
-                                                    </constraints>
-                                                </imageView>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="wBd-fr-gqF" firstAttribute="top" secondItem="2P1-0P-Osn" secondAttribute="top" constant="5" id="7Nq-Zc-hd1"/>
-                                                <constraint firstItem="epb-lj-QpL" firstAttribute="centerY" secondItem="2P1-0P-Osn" secondAttribute="centerY" id="B5X-Bi-tKj"/>
-                                                <constraint firstItem="epb-lj-QpL" firstAttribute="leading" secondItem="2P1-0P-Osn" secondAttribute="leading" constant="10" id="Izl-Tl-FL7"/>
-                                                <constraint firstItem="BRA-3m-2pQ" firstAttribute="leading" secondItem="wBd-fr-gqF" secondAttribute="leading" id="Pdf-v5-qdT"/>
-                                                <constraint firstItem="BRA-3m-2pQ" firstAttribute="trailing" secondItem="wBd-fr-gqF" secondAttribute="trailing" id="Qav-sS-4yT"/>
-                                                <constraint firstItem="BRA-3m-2pQ" firstAttribute="top" secondItem="wBd-fr-gqF" secondAttribute="bottom" constant="10" id="VWw-CI-kdg"/>
-                                                <constraint firstItem="wBd-fr-gqF" firstAttribute="leading" secondItem="epb-lj-QpL" secondAttribute="trailing" constant="10" id="ahK-2B-5fj"/>
-                                                <constraint firstAttribute="trailing" secondItem="wBd-fr-gqF" secondAttribute="trailing" constant="10" id="oSa-X8-xtn"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                        <connections>
-                                            <outlet property="icon" destination="epb-lj-QpL" id="KtP-pf-mHT"/>
-                                            <outlet property="name" destination="wBd-fr-gqF" id="esC-Uu-RV8"/>
-                                            <outlet property="time" destination="BRA-3m-2pQ" id="vqo-V9-qAj"/>
-                                        </connections>
-                                    </tableViewCell>
-                                </prototypes>
-                                <connections>
-                                    <outlet property="dataSource" destination="6Nc-8O-Duf" id="6pF-vF-n2j"/>
-                                    <outlet property="delegate" destination="6Nc-8O-Duf" id="5i2-zi-M6L"/>
-                                </connections>
-                            </tableView>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="1Oc-r6-zhF"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    </view>
-                    <navigationItem key="navigationItem" title="Title" id="747-37-qjG"/>
-                    <connections>
-                        <outlet property="tableview" destination="uMr-li-Zcc" id="HVT-Lq-qcf"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="Trc-Qv-fAb" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="3929" y="-329"/>
-        </scene>
     </scenes>
-    <resources>
-        <image name="rect_market_news" width="48" height="48"/>
-    </resources>
 </document>

+ 1 - 0
RA TradeFiling/RA TradeFiling/My/CellItemHistory.h

@@ -12,5 +12,6 @@
 @property (strong, nonatomic) IBOutlet UILabel *name;
 @property (strong, nonatomic) IBOutlet UILabel *time;
 @property (strong, nonatomic) IBOutlet UIImageView *icon;
+@property (weak, nonatomic) IBOutlet UILabel *type;
 
 @end

+ 178 - 0
RA TradeFiling/RA TradeFiling/My/My.storyboard

@@ -135,5 +135,183 @@
             </objects>
             <point key="canvasLocation" x="5482" y="-330"/>
         </scene>
+        <!--History-->
+        <scene sceneID="Bqt-kL-Aa3">
+            <objects>
+                <viewController storyboardIdentifier="SavedSearchViewController" title="History" useStoryboardIdentifierAsRestorationIdentifier="YES" id="ise-iU-u1p" customClass="SavedSearchViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="r5q-Z2-7XQ">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="65" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="Gxv-DN-BPz">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="876"/>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <prototypes>
+                                    <tableViewCell contentMode="scaleToFill" restorationIdentifier="cell_item_history" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="cell_item_history" rowHeight="65" id="f0W-R9-165" customClass="CellItemHistory">
+                                        <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="f0W-R9-165" id="kVm-Hi-bFu">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="65"/>
+                                            <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="Qdz-Qv-zue">
+                                                    <rect key="frame" x="70" y="7.5" width="334" height="23"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="19"/>
+                                                    <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="izK-sd-3Dg">
+                                                    <rect key="frame" x="374" y="39.5" width="30" height="18"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rect_market_news" translatesAutoresizingMaskIntoConstraints="NO" id="fVM-m7-JHO">
+                                                    <rect key="frame" x="10" y="7.5" width="50" height="50"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="50" id="YpW-be-kKY"/>
+                                                        <constraint firstAttribute="width" constant="50" id="eii-XO-Qza"/>
+                                                    </constraints>
+                                                </imageView>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="type" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="teU-Lm-VWP">
+                                                    <rect key="frame" x="70" y="39.5" width="30.5" height="18"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="Qdz-Qv-zue" firstAttribute="top" secondItem="fVM-m7-JHO" secondAttribute="top" id="0bp-Bn-YhC"/>
+                                                <constraint firstAttribute="trailing" secondItem="Qdz-Qv-zue" secondAttribute="trailing" constant="10" id="2FL-qF-djX"/>
+                                                <constraint firstItem="Qdz-Qv-zue" firstAttribute="leading" secondItem="fVM-m7-JHO" secondAttribute="trailing" constant="10" id="51b-kO-Fwa"/>
+                                                <constraint firstItem="fVM-m7-JHO" firstAttribute="bottom" secondItem="izK-sd-3Dg" secondAttribute="bottom" id="5pP-GO-g6O"/>
+                                                <constraint firstItem="izK-sd-3Dg" firstAttribute="trailing" secondItem="Qdz-Qv-zue" secondAttribute="trailing" id="IoO-1Y-MiZ"/>
+                                                <constraint firstItem="teU-Lm-VWP" firstAttribute="leading" secondItem="Qdz-Qv-zue" secondAttribute="leading" id="eFh-bf-SYB"/>
+                                                <constraint firstItem="fVM-m7-JHO" firstAttribute="leading" secondItem="kVm-Hi-bFu" secondAttribute="leading" constant="10" id="gzI-lU-0Ls"/>
+                                                <constraint firstItem="fVM-m7-JHO" firstAttribute="centerY" secondItem="kVm-Hi-bFu" secondAttribute="centerY" id="ohM-G7-E5t"/>
+                                                <constraint firstItem="fVM-m7-JHO" firstAttribute="bottom" secondItem="teU-Lm-VWP" secondAttribute="bottom" id="svu-gP-Fc8"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <outlet property="icon" destination="fVM-m7-JHO" id="mni-ur-zRt"/>
+                                            <outlet property="name" destination="Qdz-Qv-zue" id="yIi-id-e7Y"/>
+                                            <outlet property="time" destination="izK-sd-3Dg" id="D9l-UE-vc1"/>
+                                            <outlet property="type" destination="teU-Lm-VWP" id="WJd-0F-Jeo"/>
+                                        </connections>
+                                    </tableViewCell>
+                                </prototypes>
+                                <connections>
+                                    <outlet property="dataSource" destination="ise-iU-u1p" id="KUo-KP-Bpb"/>
+                                    <outlet property="delegate" destination="ise-iU-u1p" id="xVj-gt-1o0"/>
+                                </connections>
+                            </tableView>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="G1i-9S-WrI"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="Gxv-DN-BPz" firstAttribute="top" secondItem="r5q-Z2-7XQ" secondAttribute="top" id="6PR-sI-amX"/>
+                            <constraint firstAttribute="bottom" secondItem="Gxv-DN-BPz" secondAttribute="bottom" constant="20" symbolic="YES" id="gMG-eS-qmW"/>
+                            <constraint firstItem="Gxv-DN-BPz" firstAttribute="leading" secondItem="G1i-9S-WrI" secondAttribute="leading" id="mgI-ZM-Cpy"/>
+                            <constraint firstItem="Gxv-DN-BPz" firstAttribute="trailing" secondItem="G1i-9S-WrI" secondAttribute="trailing" id="pTs-aM-Osw"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" title="Title" id="uzV-dH-FpD"/>
+                    <connections>
+                        <outlet property="tableview" destination="Gxv-DN-BPz" id="nom-Zn-Bcc"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="UQX-Jn-dY9" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3929" y="-329"/>
+        </scene>
+        <!--Saved Detail View Controller-->
+        <scene sceneID="2gO-ix-LFp">
+            <objects>
+                <viewController storyboardIdentifier="SavedDetailViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="foq-o6-US4" customClass="SavedDetailViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="5SI-y9-Cj5">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="65" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="AWQ-Ja-r12">
+                                <rect key="frame" x="0.0" y="44" width="414" height="852"/>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <prototypes>
+                                    <tableViewCell contentMode="scaleToFill" restorationIdentifier="cell_item_history" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="cell_item_history" rowHeight="65" id="Pk4-0e-vYc" customClass="CellItemHistory">
+                                        <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="Pk4-0e-vYc" id="BFt-8z-vge">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="65"/>
+                                            <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="Ipz-sf-Wvh">
+                                                    <rect key="frame" x="70" y="7.5" width="334" height="23"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="19"/>
+                                                    <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="lhh-eq-MMr">
+                                                    <rect key="frame" x="374" y="39.5" width="30" height="18"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rect_market_news" translatesAutoresizingMaskIntoConstraints="NO" id="QU4-Bp-liV">
+                                                    <rect key="frame" x="10" y="7.5" width="50" height="50"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="50" id="opF-nj-yKw"/>
+                                                        <constraint firstAttribute="width" constant="50" id="u9Q-CL-yJv"/>
+                                                    </constraints>
+                                                </imageView>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="type" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="s3Q-Mk-4rg">
+                                                    <rect key="frame" x="70" y="39.5" width="30.5" height="18"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="lhh-eq-MMr" firstAttribute="trailing" secondItem="Ipz-sf-Wvh" secondAttribute="trailing" id="6qd-zt-ONw"/>
+                                                <constraint firstAttribute="trailing" secondItem="Ipz-sf-Wvh" secondAttribute="trailing" constant="10" id="AUA-yM-rsb"/>
+                                                <constraint firstItem="QU4-Bp-liV" firstAttribute="bottom" secondItem="lhh-eq-MMr" secondAttribute="bottom" id="CRl-0o-tTk"/>
+                                                <constraint firstItem="QU4-Bp-liV" firstAttribute="centerY" secondItem="BFt-8z-vge" secondAttribute="centerY" id="ICJ-rL-vG1"/>
+                                                <constraint firstItem="Ipz-sf-Wvh" firstAttribute="leading" secondItem="QU4-Bp-liV" secondAttribute="trailing" constant="10" id="cbS-NJ-FKY"/>
+                                                <constraint firstItem="QU4-Bp-liV" firstAttribute="bottom" secondItem="s3Q-Mk-4rg" secondAttribute="bottom" id="jfY-SK-VjD"/>
+                                                <constraint firstItem="QU4-Bp-liV" firstAttribute="leading" secondItem="BFt-8z-vge" secondAttribute="leading" constant="10" id="p4s-Ig-1B7"/>
+                                                <constraint firstItem="s3Q-Mk-4rg" firstAttribute="leading" secondItem="Ipz-sf-Wvh" secondAttribute="leading" id="pAu-vh-Sce"/>
+                                                <constraint firstItem="Ipz-sf-Wvh" firstAttribute="top" secondItem="QU4-Bp-liV" secondAttribute="top" id="smG-gu-rgN"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <outlet property="icon" destination="QU4-Bp-liV" id="qy9-n9-9kN"/>
+                                            <outlet property="name" destination="Ipz-sf-Wvh" id="RF1-na-lcy"/>
+                                            <outlet property="time" destination="lhh-eq-MMr" id="5CD-43-Uau"/>
+                                            <outlet property="type" destination="s3Q-Mk-4rg" id="zLg-n6-HVw"/>
+                                        </connections>
+                                    </tableViewCell>
+                                </prototypes>
+                                <connections>
+                                    <outlet property="dataSource" destination="foq-o6-US4" id="wzh-kp-wCi"/>
+                                    <outlet property="delegate" destination="foq-o6-US4" id="3wZ-cF-K94"/>
+                                </connections>
+                            </tableView>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="Mmr-ep-2z3"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="bottom" secondItem="AWQ-Ja-r12" secondAttribute="bottom" id="1Sa-Nc-4u8"/>
+                            <constraint firstItem="AWQ-Ja-r12" firstAttribute="leading" secondItem="Mmr-ep-2z3" secondAttribute="leading" id="IHK-Zb-ttL"/>
+                            <constraint firstItem="AWQ-Ja-r12" firstAttribute="top" secondItem="Mmr-ep-2z3" secondAttribute="top" id="klf-yr-56c"/>
+                            <constraint firstItem="AWQ-Ja-r12" firstAttribute="trailing" secondItem="Mmr-ep-2z3" secondAttribute="trailing" id="tHU-RJ-iVC"/>
+                        </constraints>
+                    </view>
+                    <toolbarItems/>
+                    <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
+                    <connections>
+                        <outlet property="tableview" destination="AWQ-Ja-r12" id="Ljq-Fg-B8A"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="pUc-a1-aq9" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3185" y="-329"/>
+        </scene>
     </scenes>
+    <resources>
+        <image name="rect_market_news" width="48" height="48"/>
+    </resources>
 </document>

+ 2 - 2
RA TradeFiling/RA TradeFiling/My/MylistViewController.m

@@ -88,13 +88,13 @@
     
     if([type isEqualToString:@"saved_detail"])
     {
-        SavedDetailViewController *viewcontroller = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"SavedDetailViewController"];
+        SavedDetailViewController *viewcontroller = [[UIStoryboard storyboardWithName:@"My" bundle:nil] instantiateViewControllerWithIdentifier:@"SavedDetailViewController"];
         viewcontroller.title = @"Saved Detail";
         [self.navigationController pushViewController:viewcontroller animated:YES];
     }
     else if([type isEqualToString:@"saved_search"])
     {
-        SavedSearchViewController *viewcontroller = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"SavedSearchViewController"];
+        SavedSearchViewController *viewcontroller = [[UIStoryboard storyboardWithName:@"My" bundle:nil] instantiateViewControllerWithIdentifier:@"SavedSearchViewController"];
         viewcontroller.title = @"Saved Search";
         [self.navigationController pushViewController:viewcontroller animated:YES];
     }

+ 14 - 9
RA TradeFiling/RA TradeFiling/My/SavedDetailViewController.m

@@ -149,26 +149,31 @@
     NSString *CellIdentifier = @"cell_item_history";
     CellItemHistory *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
     NSString* name = [self.data[indexPath.row] valueForKey:@"name"];
-    NSString* create_time = [self.data[indexPath.row] valueForKey:@"create_time"];
+    NSString* create_time = [self.data[indexPath.row] valueForKey:@"current_date"];
     
     NSString *module_name = [self.data[indexPath.row] valueForKey:@"module"];
     // Cargo Tracking
-    
+    NSString* type =@"";
     if ([module_name isEqualToString:@"isf"]) {
-        
-        cell.icon.image = [[UIImage imageNamed:@"mode_booking"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+        type=@"ISF";
+        cell.icon.image = [[UIImage imageNamed:@"flag_us"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
     } else if ([module_name isEqualToString:@"acem1"]) {
-        
-        cell.icon.image = [[UIImage imageNamed:@"mode_container"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+        type=@"ACE M1";
+        cell.icon.image = [[UIImage imageNamed:@"flag_us"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
     } else if ([module_name isEqualToString:@"aci"]) {
-        
-        cell.icon.image = [[UIImage imageNamed:@"mode_bl"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+        type=@"ACI";
+        cell.icon.image = [[UIImage imageNamed:@"flag_ca"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
     } else if ([module_name isEqualToString:@"emanifest"]) {
+        type=@"eManifest";
+        cell.icon.image = [[UIImage imageNamed:@"flag_ca"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
-        cell.icon.image = [[UIImage imageNamed:@"mode_cargo_tracking"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+    }
+    else if ([module_name isEqualToString:@"customer"]) {
+        type=@"Customer";
+        cell.icon.image = [[UIImage imageNamed:@"ic_customer"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
     }
     

+ 18 - 9
RA TradeFiling/RA TradeFiling/My/SavedSearchViewController.m

@@ -149,33 +149,42 @@
     NSString *CellIdentifier = @"cell_item_history";
     CellItemHistory *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
     NSString* name = [self.data[indexPath.row] valueForKey:@"name"];
-    NSString* create_time = [self.data[indexPath.row] valueForKey:@"create_time"];
-
+    NSString* create_time = [self.data[indexPath.row] valueForKey:@"current_date"];
+    NSString* type =@"";
     NSString *module_name = [self.data[indexPath.row] valueForKey:@"module"];
     
     if ([module_name isEqualToString:@"isf"]) {
         
-        cell.icon.image = [[UIImage imageNamed:@"mode_booking"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+        type=@"ISF";
+        cell.icon.image = [[UIImage imageNamed:@"flag_us"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
     } else if ([module_name isEqualToString:@"acem1"]) {
         
-        cell.icon.image = [[UIImage imageNamed:@"mode_container"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+        type=@"ACE M1";
+        cell.icon.image = [[UIImage imageNamed:@"flag_us"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
     } else if ([module_name isEqualToString:@"aci"]) {
-        
-        cell.icon.image = [[UIImage imageNamed:@"mode_bl"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+        type=@"ACI";
+        cell.icon.image = [[UIImage imageNamed:@"flag_ca"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
     } else if ([module_name isEqualToString:@"emanifest"]) {
+        type=@"eManifest";
+        cell.icon.image = [[UIImage imageNamed:@"flag_ca"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
-        cell.icon.image = [[UIImage imageNamed:@"mode_cargo_tracking"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+    } else if ([module_name isEqualToString:@"customer"]) {
+        type=@"Customer";
+        cell.icon.image = [[UIImage imageNamed:@"ic_customer"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
     }
     
     cell.name.text = name;
-    [cell.name sizeToFit];
+//    [cell.name sizeToFit];
     
     cell.time.text =create_time;
-    [cell.time sizeToFit];
+//    [cell.time sizeToFit];
+    
+    cell.type.text =type;
+//    [cell.time sizeToFit];
     
     //    cell.imageView.image = [UIImage imageNamed:[self.toolsinfo[indexPath.row] valueForKey:@"img"]];