Эх сурвалжийг харах

1.修改iOS Apex Drivers Order Filter。

Pen Li 7 жил өмнө
parent
commit
0c10fbc768

+ 6 - 0
Redant Drivers/Apex And Drivers/Base.lproj/Localizable.strings

@@ -124,3 +124,9 @@
 "about_surpport" = "redantsupport@united-us.net";
 "Clean Success" = "Clean Success";
 "are you sure to clean cached file" = "are you sure to clean cached file";
+
+/**
+ * Filter
+ */
+"Search" = "Search";
+"Order Filter" = "Order Filter";

+ 12 - 9
Redant Drivers/Apex And Drivers/Filter/Base.lproj/orderFilter.storyboard

@@ -22,11 +22,11 @@
                                 <rect key="frame" x="0.0" y="20" width="375" height="647"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <view key="tableFooterView" contentMode="scaleToFill" id="goQ-QF-OSZ">
-                                    <rect key="frame" x="0.0" y="178" width="375" height="44"/>
+                                    <rect key="frame" x="0.0" y="178" width="375" height="54"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <subviews>
                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7Rj-Wx-DTQ">
-                                            <rect key="frame" x="5" y="1" width="590" height="43"/>
+                                            <rect key="frame" x="5" y="10" width="365" height="44"/>
                                             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <state key="normal" title="Search">
                                                 <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -45,11 +45,11 @@
                                             </connections>
                                         </button>
                                     </subviews>
-                                    <color key="backgroundColor" red="0.94288374352331605" green="0.94288374352331605" blue="0.94288374352331605" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <constraints>
                                         <constraint firstAttribute="bottom" secondItem="7Rj-Wx-DTQ" secondAttribute="bottom" id="HZb-9D-AsL"/>
                                         <constraint firstAttribute="trailing" secondItem="7Rj-Wx-DTQ" secondAttribute="trailing" constant="5" id="Ro7-4r-RPE"/>
-                                        <constraint firstItem="7Rj-Wx-DTQ" firstAttribute="top" secondItem="goQ-QF-OSZ" secondAttribute="top" constant="1" id="dHa-sj-0rb"/>
+                                        <constraint firstItem="7Rj-Wx-DTQ" firstAttribute="top" secondItem="goQ-QF-OSZ" secondAttribute="top" constant="10" id="dHa-sj-0rb"/>
                                         <constraint firstItem="7Rj-Wx-DTQ" firstAttribute="leading" secondItem="goQ-QF-OSZ" secondAttribute="leading" constant="5" id="yPE-iV-Dai"/>
                                     </constraints>
                                 </view>
@@ -62,13 +62,13 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y6T-Kp-z23">
-                                                    <rect key="frame" x="5" y="14.5" width="560" height="21"/>
+                                                    <rect key="frame" x="5" y="14.5" width="335" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <imageView contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check_mark" translatesAutoresizingMaskIntoConstraints="NO" id="Ojw-Rz-bEx">
-                                                    <rect key="frame" x="570" y="15" width="20" height="20"/>
+                                                    <rect key="frame" x="345" y="15" width="20" height="20"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="20" id="qmh-Es-QCm"/>
                                                         <constraint firstAttribute="height" constant="20" id="yKk-ej-gvI"/>
@@ -96,7 +96,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Qyi-QK-7XW">
-                                                    <rect key="frame" x="5" y="10" width="292.5" height="30"/>
+                                                    <rect key="frame" x="5" y="5" width="180" height="39.5"/>
                                                     <state key="normal" title="From">
                                                         <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     </state>
@@ -105,7 +105,7 @@
                                                     </connections>
                                                 </button>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="89y-vM-rg0">
-                                                    <rect key="frame" x="302.5" y="10" width="292.5" height="30"/>
+                                                    <rect key="frame" x="190" y="5" width="180" height="39.5"/>
                                                     <state key="normal" title="To">
                                                         <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     </state>
@@ -116,8 +116,11 @@
                                             </subviews>
                                             <constraints>
                                                 <constraint firstItem="Qyi-QK-7XW" firstAttribute="centerY" secondItem="ZC9-gt-wnt" secondAttribute="centerY" id="1e4-Ad-MVb"/>
+                                                <constraint firstAttribute="bottom" secondItem="Qyi-QK-7XW" secondAttribute="bottom" constant="5" id="3Q7-Gc-sHH"/>
                                                 <constraint firstAttribute="trailing" secondItem="89y-vM-rg0" secondAttribute="trailing" constant="5" id="Oa8-gx-nJQ"/>
+                                                <constraint firstItem="Qyi-QK-7XW" firstAttribute="height" secondItem="89y-vM-rg0" secondAttribute="height" id="Qwu-8Z-PdD"/>
                                                 <constraint firstItem="Qyi-QK-7XW" firstAttribute="leading" secondItem="ZC9-gt-wnt" secondAttribute="leading" constant="5" id="WIh-67-K01"/>
+                                                <constraint firstItem="Qyi-QK-7XW" firstAttribute="top" secondItem="ZC9-gt-wnt" secondAttribute="top" constant="5" id="ZOY-qx-Dz7"/>
                                                 <constraint firstItem="89y-vM-rg0" firstAttribute="leading" secondItem="Qyi-QK-7XW" secondAttribute="trailing" constant="5" id="dKV-uu-PwL"/>
                                                 <constraint firstItem="89y-vM-rg0" firstAttribute="centerY" secondItem="ZC9-gt-wnt" secondAttribute="centerY" id="frD-am-hKe"/>
                                                 <constraint firstItem="89y-vM-rg0" firstAttribute="width" secondItem="Qyi-QK-7XW" secondAttribute="width" id="huw-lx-WrV"/>
@@ -136,7 +139,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Z7R-ah-wFK">
-                                                    <rect key="frame" x="5" y="10" width="590" height="30"/>
+                                                    <rect key="frame" x="5" y="10" width="365" height="30"/>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <textInputTraits key="textInputTraits"/>

+ 7 - 1
Redant Drivers/Apex And Drivers/Filter/RAOrderFilterViewController.m

@@ -36,7 +36,13 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     
-    self.title = @"Order Filter";
+    self.title = NSLocalizedString(@"Order Filter", nil);
+    
+    UIBarButtonItem *searchBtn = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Search", nil)
+                                                                  style:UIBarButtonItemStylePlain
+                                                                 target:self
+                                                                 action:@selector(searchButtonClick:)];
+    self.navigationItem.rightBarButtonItem = searchBtn;
     
     [self configureTableView];
 }

+ 6 - 0
Redant Drivers/Apex And Drivers/en.lproj/Localizable.strings

@@ -124,3 +124,9 @@
 "about_surpport" = "redantsupport@united-us.net";
 "Clean Success" = "Clean Success";
 "are you sure to clean cached file" = "are you sure to clean cached file";
+
+/**
+ * Filter
+ */
+"Search" = "Search";
+"Order Filter" = "Order Filter";

+ 5 - 0
Redant Drivers/Apex And Drivers/zh-Hans.lproj/Localizable.strings

@@ -126,3 +126,8 @@
 "Clean Success" = "清除成功";
 "are you sure to clean cached file" = "你确定要清除缓存文件吗?";
 
+/**
+ * Filter
+ */
+"Search" = "搜索";
+"Order Filter" = "订单查询";