Skip to content

Commit 8fee74b

Browse files
joeshangjoeshang
committed
[Feature]更新购物车图标，设置整个程序的AppIcon
1 parent eeb0754 commit 8fee74b

File tree

9 files changed

+38
-15
lines changed

9 files changed

+38
-15
lines changed

‎DianXiaoEr-Menu-iOS/CommonResource/dish_cell_add2cart_button@2x.png‎

-1.92 KB
Loading

‎DianXiaoEr-Menu-iOS/CommonResource/dish_cell_cart_icon@2x.png‎

-2.02 KB
Loading

‎DianXiaoEr-Menu-iOS/Images.xcassets/AppIcon.appiconset/AppIcon-1.png‎

8.71 KB
Loading

‎DianXiaoEr-Menu-iOS/Images.xcassets/AppIcon.appiconset/AppIcon.png‎

19.5 KB
Loading

‎DianXiaoEr-Menu-iOS/Images.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@
2121
"scale" : "2x"
2222
},
2323
{
24-
"idiom" : "ipad",
2524
"size" : "76x76",
25+
"idiom" : "ipad",
26+
"filename" : "AppIcon-1.png",
2627
"scale" : "1x"
2728
},
2829
{
29-
"idiom" : "ipad",
3030
"size" : "76x76",
31+
"idiom" : "ipad",
32+
"filename" : "AppIcon.png",
3133
"scale" : "2x"
3234
}
3335
],

‎DianXiaoEr-Menu-iOS/ViewControllers/DXEDishesViewController.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ - (IBAction)onTapOnDishImageInDishDetailView:(id)sender
308308
#define kDXEDishImageInCartOriginX 13
309309
#define kDXEDishImageInCartOriginY 6
310310
#define kDXEDishImageInCartHeight 8
311-
#define kDXECartIconOriginWidth 28
311+
#define kDXECartIconOriginWidth 29
312312
#define kDXECartIconOriginHeight 23
313313

314314

@@ -326,7 +326,7 @@ - (void)putDishImage:(UIImageView *)dishImage
326326

327327
[UIView animateWithDuration:0.3 animations:^{
328328
// Step 1. 放大Cart图标
329-
cartIcon.transform = CGAffineTransformMakeScale(1.5, 1.5);
329+
cartIcon.transform = CGAffineTransformMakeScale(1.3, 1.3);
330330
} completion:^(BOOL finished){
331331
// Step 2. 吸入DishImage
332332
[dishImage genieInTransitionWithDuration:0.5

‎DianXiaoEr-Menu-iOS/ViewControllers/DXEMyselfViewController.xib‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
4+
<deployment defaultVersion="1808" identifier="iOS"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
56
</dependencies>
67
<objects>
78
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DXEMyselfViewController">
@@ -44,7 +45,7 @@
4445
</userDefinedRuntimeAttributes>
4546
</label>
4647
<tableView clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" indicatorStyle="white" style="plain" separatorStyle="none" rowHeight="140" sectionHeaderHeight="45" sectionFooterHeight="1" id="dRB-3K-iKd">
47-
<rect key="frame" x="32" y="520" width="702" height="322"/>
48+
<rect key="frame" x="32" y="520" width="702" height="325"/>
4849
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
4950
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
5051
<connections>
@@ -168,6 +169,13 @@
168169
</imageView>
169170
</subviews>
170171
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
172+
<nil key="simulatedStatusBarMetrics"/>
173+
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
171174
</view>
172175
</objects>
176+
<simulatedMetricsContainer key="defaultSimulatedMetrics">
177+
<simulatedStatusBarMetrics key="statusBar"/>
178+
<simulatedOrientationMetrics key="orientation"/>
179+
<simulatedScreenMetrics key="destination"/>
180+
</simulatedMetricsContainer>
173181
</document>

‎DianXiaoEr-Menu-iOS/Views/DXEDishCollectionViewCell.xib‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
4+
<deployment defaultVersion="1808" identifier="iOS"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
56
</dependencies>
67
<objects>
78
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -94,7 +95,7 @@
9495
</connections>
9596
</button>
9697
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dish_cell_cart_icon.png" id="GUm-mw-jfo">
97-
<rect key="frame" x="268" y="559" width="21" height="16"/>
98+
<rect key="frame" x="269" y="559" width="20" height="16"/>
9899
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
99100
</imageView>
100101
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dish_cell_incart_flag.png" id="Wlk-pd-TLg">
@@ -125,10 +126,15 @@
125126
</objects>
126127
<resources>
127128
<image name="dish_cell_add2cart_button.png" width="122" height="45"/>
128-
<image name="dish_cell_cart_icon.png" width="28" height="23"/>
129+
<image name="dish_cell_cart_icon.png" width="29" height="23"/>
129130
<image name="dish_cell_favor_hollow_icon.png" width="19" height="16"/>
130131
<image name="dish_cell_incart_flag.png" width="48" height="66"/>
131132
<image name="dish_cell_price_icon.png" width="19" height="16"/>
132133
<image name="dish_cell_soldout_flag.png" width="128" height="128"/>
133134
</resources>
135+
<simulatedMetricsContainer key="defaultSimulatedMetrics">
136+
<simulatedStatusBarMetrics key="statusBar"/>
137+
<simulatedOrientationMetrics key="orientation"/>
138+
<simulatedScreenMetrics key="destination"/>
139+
</simulatedMetricsContainer>
134140
</document>

‎DianXiaoEr-Menu-iOS/Views/DXEDishDetailView.xib‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
4+
<deployment defaultVersion="1808" identifier="iOS"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
56
</dependencies>
67
<objects>
78
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DXEDishesViewController"/>
@@ -108,12 +109,13 @@
108109
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
109110
</imageView>
110111
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dish_cell_cart_icon.png" id="ldd-6E-QW2">
111-
<rect key="frame" x="436" y="833" width="28" height="23"/>
112+
<rect key="frame" x="436" y="833" width="29" height="23"/>
112113
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
113114
</imageView>
114115
</subviews>
115116
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
116117
<gestureRecognizers/>
118+
<nil key="simulatedStatusBarMetrics"/>
117119
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
118120
<connections>
119121
<outlet property="cartButton" destination="cCj-2b-EIE" id="FqP-0p-GLr"/>
@@ -139,9 +141,14 @@
139141
<resources>
140142
<image name="dish_cell_add2cart_button.png" width="122" height="45"/>
141143
<image name="dish_cell_add2cart_pressed_button.png" width="122" height="45"/>
142-
<image name="dish_cell_cart_icon.png" width="28" height="23"/>
144+
<image name="dish_cell_cart_icon.png" width="29" height="23"/>
143145
<image name="dish_cell_favor_hollow_icon.png" width="19" height="16"/>
144146
<image name="dish_cell_incart_flag.png" width="48" height="66"/>
145147
<image name="dish_cell_price_icon.png" width="19" height="16"/>
146148
</resources>
149+
<simulatedMetricsContainer key="defaultSimulatedMetrics">
150+
<simulatedStatusBarMetrics key="statusBar"/>
151+
<simulatedOrientationMetrics key="orientation"/>
152+
<simulatedScreenMetrics key="destination" type="retina4"/>
153+
</simulatedMetricsContainer>
147154
</document>

0 commit comments

Comments
 (0)