瀏覽代碼

1.修改iOS Apex Drivers Login Logo。
2.修改iOS Apex Drivers导航条设置Apex Logo。

Pen Li 7 年之前
父節點
當前提交
2dbb00957c

+ 23 - 0
Redant Drivers/Apex And Drivers/Assets.xcassets/apexlogo-2.imageset/Contents.json

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

二進制
Redant Drivers/Apex And Drivers/Assets.xcassets/apexlogo-2.imageset/apexlogopng.png


二進制
Redant Drivers/Apex And Drivers/Assets.xcassets/apexlogo-2.imageset/apexlogopng@2x.png


二進制
Redant Drivers/Apex And Drivers/Assets.xcassets/apexlogo-2.imageset/apexlogopng@3x.png


+ 3 - 3
Redant Drivers/Apex And Drivers/Assets.xcassets/driver_logo.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "driver_logo.png",
+      "filename" : "driver_logo_0.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "driver_logo@2x.png",
+      "filename" : "driver_logo_0@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "driver_logo@3x.png",
+      "filename" : "driver_logo_0@3x.png",
       "scale" : "3x"
     }
   ],

二進制
Redant Drivers/Apex And Drivers/Assets.xcassets/driver_logo.imageset/driver_logo.png


二進制
Redant Drivers/Apex And Drivers/Assets.xcassets/driver_logo.imageset/driver_logo@2x.png


二進制
Redant Drivers/Apex And Drivers/Assets.xcassets/driver_logo.imageset/driver_logo@3x.png


二進制
Redant Drivers/Apex And Drivers/Assets.xcassets/driver_logo.imageset/driver_logo_0.png


二進制
Redant Drivers/Apex And Drivers/Assets.xcassets/driver_logo.imageset/driver_logo_0@2x.png


二進制
Redant Drivers/Apex And Drivers/Assets.xcassets/driver_logo.imageset/driver_logo_0@3x.png


+ 6 - 0
Redant Drivers/Apex And Drivers/Home/RAHomeViewController.m

@@ -153,6 +153,12 @@
 }
 
 - (void)configureNavigationBar {
+    
+    UIImage *logo = [[UIImage imageNamed:@"apexlogo-2"] imageWithRenderingMode:UIImageRenderingModeAutomatic];
+    UIBarButtonItem *logoItem = [[UIBarButtonItem alloc] initWithImage:logo landscapeImagePhone:logo style:UIBarButtonItemStylePlain target:nil action:nil];
+//    logoItem.enabled = NO;
+    self.navigationItem.leftBarButtonItem = logoItem;
+    
     UIBarButtonItem *uploadListItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"upload_list"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
                                                                        style:UIBarButtonItemStylePlain
                                                                        target:self

+ 16 - 16
Redant Drivers/Apex And Drivers/Login/Login.storyboard

@@ -23,10 +23,10 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qCw-s3-fQH">
-                                <rect key="frame" x="0.0" y="268.5" width="375" height="130"/>
+                                <rect key="frame" x="0.0" y="178" width="375" height="140"/>
                                 <subviews>
                                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="User" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="VlU-9K-g4X">
-                                        <rect key="frame" x="20" y="0.0" width="335" height="30"/>
+                                        <rect key="frame" x="20" y="10" width="335" height="30"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="30" id="fEJ-5y-wXK"/>
                                         </constraints>
@@ -35,13 +35,13 @@
                                         <textInputTraits key="textInputTraits" returnKeyType="done"/>
                                     </textField>
                                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Password" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="9gC-X8-VVb">
-                                        <rect key="frame" x="20" y="50" width="335" height="30"/>
+                                        <rect key="frame" x="20" y="60" width="335" height="30"/>
                                         <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
                                     </textField>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Qz0-oF-i3d">
-                                        <rect key="frame" x="317" y="104" width="38" height="30"/>
+                                        <rect key="frame" x="317" y="114" width="38" height="30"/>
                                         <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
                                         <state key="normal" title="Login">
                                             <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -51,7 +51,7 @@
                                         </connections>
                                     </button>
                                     <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vy2-V9-9ML">
-                                        <rect key="frame" x="20" y="110" width="127" height="18"/>
+                                        <rect key="frame" x="20" y="120" width="127" height="18"/>
                                         <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                         <state key="normal" title="  Save password" image="unchecked_32">
@@ -60,7 +60,7 @@
                                         </state>
                                     </button>
                                     <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="n26-yz-BRQ">
-                                        <rect key="frame" x="287" y="109" width="20" height="20"/>
+                                        <rect key="frame" x="287" y="119" width="20" height="20"/>
                                         <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
                                     </activityIndicatorView>
                                 </subviews>
@@ -74,19 +74,19 @@
                                     <constraint firstItem="Qz0-oF-i3d" firstAttribute="top" secondItem="9gC-X8-VVb" secondAttribute="bottom" constant="24" id="FxS-Oc-vVk"/>
                                     <constraint firstItem="9gC-X8-VVb" firstAttribute="top" secondItem="VlU-9K-g4X" secondAttribute="bottom" constant="20" id="QwQ-XT-xkf"/>
                                     <constraint firstItem="vy2-V9-9ML" firstAttribute="leading" secondItem="9gC-X8-VVb" secondAttribute="leading" id="aws-uB-39W"/>
-                                    <constraint firstItem="VlU-9K-g4X" firstAttribute="top" secondItem="qCw-s3-fQH" secondAttribute="top" id="nOV-Rf-3kV"/>
-                                    <constraint firstAttribute="height" constant="130" id="nQC-EH-PLF"/>
+                                    <constraint firstItem="VlU-9K-g4X" firstAttribute="top" secondItem="qCw-s3-fQH" secondAttribute="top" constant="10" id="nOV-Rf-3kV"/>
+                                    <constraint firstAttribute="height" constant="140" id="nQC-EH-PLF"/>
                                     <constraint firstItem="Qz0-oF-i3d" firstAttribute="leading" secondItem="n26-yz-BRQ" secondAttribute="trailing" constant="10" id="pyO-o5-w4j"/>
                                     <constraint firstItem="9gC-X8-VVb" firstAttribute="centerX" secondItem="qCw-s3-fQH" secondAttribute="centerX" id="qfR-jT-s4Z"/>
                                     <constraint firstItem="vy2-V9-9ML" firstAttribute="centerY" secondItem="Qz0-oF-i3d" secondAttribute="centerY" id="qjq-Ld-Wsm"/>
                                 </constraints>
                             </view>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="driver_logo" translatesAutoresizingMaskIntoConstraints="NO" id="uPR-4Z-qVR">
-                                <rect key="frame" x="20" y="49" width="335" height="199.5"/>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="driver_logo" translatesAutoresizingMaskIntoConstraints="NO" id="uPR-4Z-qVR">
+                                <rect key="frame" x="20" y="49" width="335" height="109"/>
                                 <inset key="insetFor6xAndEarlier" minX="0.0" minY="40" maxX="0.0" maxY="-40"/>
                             </imageView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4nB-rd-0CZ">
-                                <rect key="frame" x="183" y="426.5" width="172" height="30"/>
+                                <rect key="frame" x="183" y="343" width="172" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="172" id="ROU-8P-HXY"/>
                                 </constraints>
@@ -96,7 +96,7 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ver:A160422" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hEP-az-ldq">
-                                <rect key="frame" x="20" y="30" width="82.5" height="17"/>
+                                <rect key="frame" x="20" y="30" width="83" height="17"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="calibratedWhite"/>
                                 <nil key="highlightedColor"/>
@@ -105,16 +105,16 @@
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="uPR-4Z-qVR" firstAttribute="centerX" secondItem="jSh-rY-8BJ" secondAttribute="centerX" id="5pf-lB-Mm4"/>
+                            <constraint firstItem="4nB-rd-0CZ" firstAttribute="top" secondItem="qCw-s3-fQH" secondAttribute="bottom" constant="25" id="6o9-jZ-S21"/>
                             <constraint firstItem="hEP-az-ldq" firstAttribute="top" secondItem="6Mm-eS-rAo" secondAttribute="bottom" constant="10" id="8mY-tL-gaO"/>
+                            <constraint firstItem="qCw-s3-fQH" firstAttribute="top" secondItem="uPR-4Z-qVR" secondAttribute="bottom" constant="20" id="D17-Cv-ElT"/>
                             <constraint firstItem="uPR-4Z-qVR" firstAttribute="trailing" secondItem="VlU-9K-g4X" secondAttribute="trailing" id="H1m-mE-RTg"/>
                             <constraint firstItem="qCw-s3-fQH" firstAttribute="width" secondItem="jSh-rY-8BJ" secondAttribute="width" id="MS5-9p-o7T"/>
-                            <constraint firstItem="4nB-rd-0CZ" firstAttribute="top" secondItem="Qz0-oF-i3d" secondAttribute="bottom" constant="24" id="MwQ-kO-4g7"/>
                             <constraint firstItem="uPR-4Z-qVR" firstAttribute="top" secondItem="6Mm-eS-rAo" secondAttribute="bottom" constant="29" id="O4A-nP-rYp"/>
                             <constraint firstItem="qCw-s3-fQH" firstAttribute="centerX" secondItem="jSh-rY-8BJ" secondAttribute="centerX" id="ODC-DF-6A9"/>
                             <constraint firstItem="hEP-az-ldq" firstAttribute="leading" secondItem="jSh-rY-8BJ" secondAttribute="leading" constant="20" id="OwY-VO-t5P"/>
-                            <constraint firstItem="VlU-9K-g4X" firstAttribute="top" secondItem="uPR-4Z-qVR" secondAttribute="bottom" constant="20" id="SjL-zw-v32"/>
+                            <constraint firstItem="KzV-Ny-317" firstAttribute="top" relation="greaterThanOrEqual" secondItem="4nB-rd-0CZ" secondAttribute="bottom" constant="210" id="Sr3-MZ-z0k"/>
                             <constraint firstItem="uPR-4Z-qVR" firstAttribute="leading" secondItem="VlU-9K-g4X" secondAttribute="leading" id="VBn-UB-gKO"/>
-                            <constraint firstItem="qCw-s3-fQH" firstAttribute="centerY" secondItem="jSh-rY-8BJ" secondAttribute="centerY" priority="999" id="WuP-h2-Qx9"/>
                             <constraint firstItem="4nB-rd-0CZ" firstAttribute="trailing" secondItem="9gC-X8-VVb" secondAttribute="trailing" id="iXl-Es-zfd"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="eN5-fH-f6F"/>
@@ -232,7 +232,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="driver_logo" width="276" height="120"/>
+        <image name="driver_logo" width="253" height="109"/>
         <image name="unchecked_32" width="16" height="16"/>
     </resources>
 </document>

+ 1 - 1
Redant Drivers/Apex And Drivers/Login/LoginViewController.m

@@ -122,7 +122,7 @@
         UIImage *logo = [[UIImage imageNamed:@"apexlogo-2"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         UIBarButtonItem *logoItem = [[UIBarButtonItem alloc] initWithImage:logo landscapeImagePhone:logo style:UIBarButtonItemStylePlain target:nil action:nil];
         logoItem.enabled = NO;
-        self.tabBarController.navigationItem.leftBarButtonItem = logoItem;
+        self.navigationItem.leftBarButtonItem = logoItem;
     }
 }