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

1.修改iOS Apex Drivers 渐变色以及部分图标。

Pen Li 7 жил өмнө
parent
commit
522af42f61
16 өөрчлөгдсөн 24 нэмэгдсэн , 26 устгасан
  1. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_available.imageset/action_available.png
  2. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_available.imageset/action_available@2x.png
  3. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_available.imageset/action_available@3x.png
  4. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_message.imageset/action_message.png
  5. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_message.imageset/action_message@2x.png
  6. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_message.imageset/action_message@3x.png
  7. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_setting.imageset/action_setting.png
  8. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_setting.imageset/action_setting@2x.png
  9. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_setting.imageset/action_setting@3x.png
  10. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_signout.imageset/action_signout.png
  11. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_signout.imageset/action_signout@2x.png
  12. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_signout.imageset/action_signout@3x.png
  13. 21 21
      Redant Drivers/Apex And Drivers/Home/HomeHeader.xib
  14. 1 2
      Redant Drivers/Apex And Drivers/Home/RAHomeHeaderView.m
  15. 0 1
      Redant Drivers/Apex And Drivers/RANavigationController.m
  16. 2 2
      Redant Drivers/Apex And Drivers/config.h

BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_available.imageset/action_available.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_available.imageset/action_available@2x.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_available.imageset/action_available@3x.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_message.imageset/action_message.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_message.imageset/action_message@2x.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_message.imageset/action_message@3x.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_setting.imageset/action_setting.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_setting.imageset/action_setting@2x.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_setting.imageset/action_setting@3x.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_signout.imageset/action_signout.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_signout.imageset/action_signout@2x.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_signout.imageset/action_signout@3x.png


+ 21 - 21
Redant Drivers/Apex And Drivers/Home/HomeHeader.xib

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -21,7 +21,7 @@
                     <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </view>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zid-Ks-zO5">
-                    <rect key="frame" x="10" y="12" width="42" height="21"/>
+                    <rect key="frame" x="10" y="11.5" width="42" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
@@ -31,7 +31,7 @@
                     <state key="normal" title="More"/>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="68c-5k-TZT" customClass="RABadgeNumberView">
-                    <rect key="frame" x="57" y="12.5" width="20" height="20"/>
+                    <rect key="frame" x="57" y="12" width="20" height="20"/>
                     <color key="backgroundColor" red="1" green="0.1047433005" blue="0.075207091899999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="20" id="XrI-P3-tmm"/>
@@ -61,27 +61,27 @@
                 <outlet property="moreBtn" destination="J4X-Vt-JUe" id="GLd-pT-vvy"/>
                 <outlet property="titleLaebl" destination="zid-Ks-zO5" id="kFh-0I-zJe"/>
             </connections>
-            <point key="canvasLocation" x="988" y="291"/>
+            <point key="canvasLocation" x="205" y="421"/>
         </view>
         <view contentMode="scaleToFill" id="CmN-WL-UzN" customClass="RAHomeHeaderView">
-            <rect key="frame" x="0.0" y="0.0" width="658" height="145"/>
+            <rect key="frame" x="0.0" y="0.0" width="658" height="155"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="q6Y-ok-z0V">
-                    <rect key="frame" x="0.0" y="-895" width="658" height="1000"/>
+                    <rect key="frame" x="0.0" y="-885" width="658" height="1000"/>
                     <color key="backgroundColor" red="0.31186315860000002" green="0.73688559149999999" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="1000" id="fD7-Vn-lfh"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kUV-Ds-Cp0">
-                    <rect key="frame" x="5" y="70" width="648" height="70"/>
+                    <rect key="frame" x="5" y="70" width="648" height="80"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oNA-fq-R2b">
-                            <rect key="frame" x="5" y="-15" width="156" height="80"/>
+                            <rect key="frame" x="5" y="-5" width="156" height="80"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sign Out" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="moB-91-AOW">
-                                    <rect key="frame" x="50.5" y="61" width="56" height="17"/>
+                                    <rect key="frame" x="50" y="61" width="56" height="17"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
@@ -107,7 +107,7 @@
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="y3L-Ku-sNt">
-                            <rect key="frame" x="166" y="-15" width="155.5" height="80"/>
+                            <rect key="frame" x="166" y="-5" width="155.5" height="80"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Setting" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JIY-pR-ykw">
                                     <rect key="frame" x="54.5" y="61" width="46.5" height="17"/>
@@ -116,7 +116,7 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vJn-m4-oEg">
-                                    <rect key="frame" x="58" y="19" width="40" height="40"/>
+                                    <rect key="frame" x="57.5" y="19" width="40" height="40"/>
                                     <state key="normal" image="action_setting"/>
                                     <connections>
                                         <action selector="settingBtnClick:" destination="CmN-WL-UzN" eventType="touchUpInside" id="Z0b-02-8mY"/>
@@ -129,10 +129,10 @@
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2aS-CO-3jY">
-                            <rect key="frame" x="326.5" y="-15" width="155.5" height="80"/>
+                            <rect key="frame" x="326.5" y="-5" width="156" height="80"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Available" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hae-rx-iyX">
-                                    <rect key="frame" x="50" y="61" width="57" height="17"/>
+                                    <rect key="frame" x="49.5" y="61" width="57" height="17"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
@@ -152,16 +152,16 @@
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iQb-jc-IpW">
-                            <rect key="frame" x="487" y="-15" width="155.5" height="80"/>
+                            <rect key="frame" x="487.5" y="-5" width="155.5" height="80"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T2T-ct-zc2">
-                                    <rect key="frame" x="49" y="61" width="58" height="17"/>
+                                    <rect key="frame" x="48.5" y="61" width="58" height="17"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g4U-M8-oMo">
-                                    <rect key="frame" x="58.5" y="19" width="40" height="40"/>
+                                    <rect key="frame" x="57.5" y="19" width="40" height="40"/>
                                     <state key="normal" image="action_message"/>
                                     <state key="selected" image="action_message_new"/>
                                     <connections>
@@ -244,7 +244,7 @@
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PMs-34-A9a">
-                            <rect key="frame" x="217.5" y="0.5" width="213" height="60"/>
+                            <rect key="frame" x="217.5" y="0.0" width="213" height="60"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="132" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vBo-bi-6Qy">
                                     <rect key="frame" x="0.0" y="7.5" width="213" height="21"/>
@@ -269,7 +269,7 @@
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="thx-28-zRP">
-                            <rect key="frame" x="435.5" y="0.5" width="212.5" height="60"/>
+                            <rect key="frame" x="435.5" y="0.0" width="212.5" height="60"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5555" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="apL-NL-f18">
                                     <rect key="frame" x="0.0" y="7.5" width="212.5" height="21"/>
@@ -296,7 +296,7 @@
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ni3-TR-BVf">
-                            <rect key="frame" x="214" y="25.5" width="1" height="10"/>
+                            <rect key="frame" x="214" y="25" width="1" height="10"/>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="10" id="6bX-Wf-tBG"/>
@@ -304,7 +304,7 @@
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tqP-9g-fiy">
-                            <rect key="frame" x="433" y="25.5" width="1" height="10"/>
+                            <rect key="frame" x="433" y="25" width="1" height="10"/>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         </view>
                     </subviews>

+ 1 - 2
Redant Drivers/Apex And Drivers/Home/RAHomeHeaderView.m

@@ -47,12 +47,11 @@
     
     UIColor *orangeWhiteColor =  ApexDriverOrangeWhiteColor;
     UIColor *orangeColor = ApexDriverOrangeColor;
-//    _gradientLayer.colors = @[(__bridge id)orangeWhiteColor.CGColor, (__bridge id)orangeColor.CGColor];
     _gradientLayer.colors = @[(__bridge id)orangeColor.CGColor, (__bridge id)orangeWhiteColor.CGColor];
     
     _gradientLayer.startPoint = CGPointMake(0, 0);
     _gradientLayer.endPoint = CGPointMake(1, 0);
-//    _gradientLayer.locations = @[@0,@0.2];
+//    _gradientLayer.locations = @[@0,@0.7,@0.95];
     _gradientLayer.frame = self.backgroundView.bounds;
     [self.backgroundView.layer addSublayer:_gradientLayer];
 }

+ 0 - 1
Redant Drivers/Apex And Drivers/RANavigationController.m

@@ -49,7 +49,6 @@
     
     UIColor *orangeWhiteColor =  ApexDriverOrangeWhiteColor;
     UIColor *orangeColor = ApexDriverOrangeColor;
-    //    _gradientLayer.colors = @[(__bridge id)orangeWhiteColor.CGColor, (__bridge id)orangeColor.CGColor];
     _gradientLayer.colors = @[(__bridge id)orangeColor.CGColor, (__bridge id)orangeWhiteColor.CGColor];
     
     _gradientLayer.startPoint = CGPointMake(0, 0);

+ 2 - 2
Redant Drivers/Apex And Drivers/config.h

@@ -9,8 +9,8 @@
 #ifndef config_h
 #define config_h
 
-#define ApexDriverOrangeWhiteColor UIColorFromRGB(0xff5555)
-#define ApexDriverOrangeColor UIColorFromRGB(0xEC6C23)
+#define ApexDriverOrangeWhiteColor UIColorFromRGB(0xff8008)
+#define ApexDriverOrangeColor UIColorFromRGB(0xe65c00)
 #define ApexDriverGrayColor UIColorFromRGB(0x4f5356)
 #define ApexDriverWhiteColor UIColorFromRGB(0xffffff)