瀏覽代碼

1.删除More Color原图,添加半透明图。

Pen Li 9 年之前
父節點
當前提交
9d8dcedf13
共有 29 個文件被更改,包括 15 次插入130 次删除
  1. 二進制
      RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate
  2. 12 12
      RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard
  3. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_16.imageset/Color_Indicator1_16.png
  4. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_16.imageset/Color_Indicator1_16@2x.png
  5. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_16.imageset/Color_Indicator1_16@3x.png
  6. 0 23
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_16.imageset/Contents.json
  7. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_24.imageset/Color_Indicator1_24.png
  8. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_24.imageset/Color_Indicator1_24@2x.png
  9. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_24.imageset/Color_Indicator1_24@3x.png
  10. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_32.imageset/Color_Indicator1_32.png
  11. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_32.imageset/Color_Indicator1_32@2x.png
  12. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_32.imageset/Color_Indicator1_32@3x.png
  13. 0 23
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_32.imageset/Contents.json
  14. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_16.imageset/Color_Indicator2_16.png
  15. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_16.imageset/Color_Indicator2_16@2x.png
  16. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_16.imageset/Color_Indicator2_16@3x.png
  17. 0 23
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_16.imageset/Contents.json
  18. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_24.imageset/Color_Indicator2_24.png
  19. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_24.imageset/Color_Indicator2_24@2x.png
  20. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_24.imageset/Color_Indicator2_24@3x.png
  21. 0 23
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_24.imageset/Contents.json
  22. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_32.imageset/Color_Indicator2_32.png
  23. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_32.imageset/Color_Indicator2_32@2x.png
  24. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_32.imageset/Color_Indicator2_32@3x.png
  25. 0 23
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_32.imageset/Contents.json
  26. 3 3
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/more_color.imageset/Contents.json
  27. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/more_color.imageset/more_color.png
  28. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/more_color.imageset/more_color@2x.png
  29. 二進制
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/more_color.imageset/more_color@3x.png

二進制
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 12 - 12
RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard

@@ -1379,7 +1379,7 @@
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="7fM-wP-luR">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="more_color" id="7fM-wP-luR">
                                                     <rect key="frame" x="8" y="153" width="16" height="16"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                 </imageView>
@@ -1454,7 +1454,7 @@
                                                     <rect key="frame" x="8" y="8" width="32" height="32"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="Luv-07-ZAU">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="more_color" id="Luv-07-ZAU">
                                                     <rect key="frame" x="8" y="320" width="32" height="32"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                 </imageView>
@@ -1513,7 +1513,7 @@
                                                     <rect key="frame" x="673" y="88" width="24" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="Z2a-02-p0m">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="more_color" id="Z2a-02-p0m">
                                                     <rect key="frame" x="636" y="88" width="24" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
@@ -6036,7 +6036,7 @@ Email: redantsupport@united-us.net</string>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="Km8-l7-rIl">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="more_color" id="Km8-l7-rIl">
                                                     <rect key="frame" x="8" y="320" width="32" height="32"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                 </imageView>
@@ -6086,7 +6086,7 @@ Email: redantsupport@united-us.net</string>
                                         </connections>
                                     </collectionViewCell>
                                     <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="CategoryCellNPD" id="Cox-ku-WUC" customClass="CategoryCellNPD">
-                                        <rect key="frame" x="588" y="95" width="180" height="251"/>
+                                        <rect key="frame" x="588" y="94.5" width="180" height="251"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                             <rect key="frame" x="0.0" y="0.0" width="180" height="251"/>
@@ -6111,7 +6111,7 @@ Email: redantsupport@united-us.net</string>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="8rb-ze-4cD">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="more_color" id="8rb-ze-4cD">
                                                     <rect key="frame" x="8" y="153" width="16" height="16"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                 </imageView>
@@ -6186,7 +6186,7 @@ Email: redantsupport@united-us.net</string>
                                                     <rect key="frame" x="673" y="88" width="24" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="yop-ju-4DF">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="more_color" id="yop-ju-4DF">
                                                     <rect key="frame" x="638" y="88" width="24" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
@@ -7149,7 +7149,7 @@ Email: redantsupport@united-us.net</string>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="Byl-UD-AE8">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="more_color" id="Byl-UD-AE8">
                                                     <rect key="frame" x="8" y="320" width="32" height="32"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                 </imageView>
@@ -7199,7 +7199,7 @@ Email: redantsupport@united-us.net</string>
                                         </connections>
                                     </collectionViewCell>
                                     <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="CategoryCellNPD" id="B2X-jg-ycW" customClass="CategoryCellNPD">
-                                        <rect key="frame" x="588" y="95" width="180" height="251"/>
+                                        <rect key="frame" x="588" y="94.5" width="180" height="251"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                             <rect key="frame" x="0.0" y="0.0" width="180" height="251"/>
@@ -7224,7 +7224,7 @@ Email: redantsupport@united-us.net</string>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="scg-Vi-nab">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="more_color" id="scg-Vi-nab">
                                                     <rect key="frame" x="8" y="153" width="16" height="16"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                 </imageView>
@@ -7299,7 +7299,7 @@ Email: redantsupport@united-us.net</string>
                                                     <rect key="frame" x="673" y="88" width="24" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="DSb-h2-y4N">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="more_color" id="DSb-h2-y4N">
                                                     <rect key="frame" x="631" y="88" width="24" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
@@ -8658,7 +8658,6 @@ Email: redantsupport@united-us.net</string>
         </scene>
     </scenes>
     <resources>
-        <image name="Color_Indicator2_32" width="32" height="32"/>
         <image name="Combinegray" width="40" height="40"/>
         <image name="about" width="96" height="96"/>
         <image name="add_180" width="180" height="180"/>
@@ -8693,6 +8692,7 @@ Email: redantsupport@united-us.net</string>
         <image name="mark_closeout_32" width="32" height="32"/>
         <image name="mark_wish_32" width="32" height="32"/>
         <image name="menu_open" width="36" height="36"/>
+        <image name="more_color" width="32" height="32"/>
         <image name="newcustomer" width="32" height="32"/>
         <image name="neworder" width="40" height="40"/>
         <image name="notifyMe" width="124" height="39"/>

二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_16.imageset/Color_Indicator1_16.png


二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_16.imageset/Color_Indicator1_16@2x.png


二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_16.imageset/Color_Indicator1_16@3x.png


+ 0 - 23
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_16.imageset/Contents.json

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

二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_24.imageset/Color_Indicator1_24.png


二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_24.imageset/Color_Indicator1_24@2x.png


二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_24.imageset/Color_Indicator1_24@3x.png


二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_32.imageset/Color_Indicator1_32.png


二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_32.imageset/Color_Indicator1_32@2x.png


二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_32.imageset/Color_Indicator1_32@3x.png


+ 0 - 23
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_32.imageset/Contents.json

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

二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_16.imageset/Color_Indicator2_16.png


二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_16.imageset/Color_Indicator2_16@2x.png


二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_16.imageset/Color_Indicator2_16@3x.png


+ 0 - 23
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_16.imageset/Contents.json

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

二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_24.imageset/Color_Indicator2_24.png


二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_24.imageset/Color_Indicator2_24@2x.png


二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_24.imageset/Color_Indicator2_24@3x.png


+ 0 - 23
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_24.imageset/Contents.json

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

二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_32.imageset/Color_Indicator2_32.png


二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_32.imageset/Color_Indicator2_32@2x.png


二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_32.imageset/Color_Indicator2_32@3x.png


+ 0 - 23
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_32.imageset/Contents.json

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

+ 3 - 3
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_24.imageset/Contents.json → RedAnt ERP Mobile/iSales-NPD/Images.xcassets/more_color.imageset/Contents.json

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

二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/more_color.imageset/more_color.png


二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/more_color.imageset/more_color@2x.png


二進制
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/more_color.imageset/more_color@3x.png