Skip to content

Commit eeb0754

Browse files
joeshangjoeshang
committed
[Feature]将已点菜品图标中显示个数的样式更换成红色圆形角标
1 parent 9d8c4d9 commit eeb0754

File tree

4 files changed

+19
-20
lines changed

4 files changed

+19
-20
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
*.xcodeproj/*
22
!*.xcodeproj/project.pbxproj
33
xcuserdata
4+
*.xcworkspace
45
.DS_Store
56
*.swp
67
Pods

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,7 @@ - (void)viewDidLoad
106106
item.badgeTextFont = [UIFont systemFontOfSize:kDXEOrderBadgeFontSize];
107107
item.badgeTextColor = [[RNThemeManager sharedManager] colorForKey:@"Main.TabBar.BadgeTextFontColor"];
108108
item.badgeBackgroundImage = nil;
109-
item.badgeBackgroundColor = nil;
110-
CGSize imageSize = [normalImage size];
111-
item.badgePositionAdjustment = UIOffsetMake(-imageSize.width / 2,
112-
imageSize.height / 2 + 3);
109+
item.badgePositionAdjustment = UIOffsetMake(6, 10);
113110
}
114111

115112
[items addObject:item];

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

Lines changed: 9 additions & 7 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" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES">
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="DXEMainViewController">
@@ -16,21 +17,18 @@
1617
<subviews>
1718
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zsY-Aj-gOl" customClass="RNThemedImageView">
1819
<rect key="frame" x="0.0" y="0.0" width="768" height="94"/>
19-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2020
<userDefinedRuntimeAttributes>
2121
<userDefinedRuntimeAttribute type="string" keyPath="imageKey" value="navigationbar_background.png"/>
2222
</userDefinedRuntimeAttributes>
2323
</imageView>
2424
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Tkj-tK-x73" customClass="RNThemedImageView">
25-
<rect key="frame" x="289" y="15" width="190" height="64"/>
26-
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
25+
<rect key="frame" x="289" y="21" width="190" height="64"/>
2726
<userDefinedRuntimeAttributes>
2827
<userDefinedRuntimeAttribute type="string" keyPath="imageKey" value="navigationbar_brand.png"/>
2928
</userDefinedRuntimeAttributes>
3029
</imageView>
3130
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PIV-Ip-CaI">
3231
<rect key="frame" x="660" y="25" width="56" height="56"/>
33-
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
3432
<state key="normal" image="qrcode_button.png">
3533
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
3634
</state>
@@ -40,10 +38,14 @@
4038
</button>
4139
</subviews>
4240
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
43-
<simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
4441
</view>
4542
</objects>
4643
<resources>
4744
<image name="qrcode_button.png" width="56" height="56"/>
4845
</resources>
46+
<simulatedMetricsContainer key="defaultSimulatedMetrics">
47+
<simulatedStatusBarMetrics key="statusBar"/>
48+
<simulatedOrientationMetrics key="orientation"/>
49+
<simulatedScreenMetrics key="destination"/>
50+
</simulatedMetricsContainer>
4951
</document>

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

Lines changed: 8 additions & 9 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" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES">
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="DXEOpenViewController">
@@ -17,11 +18,9 @@
1718
<subviews>
1819
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="splash.png" translatesAutoresizingMaskIntoConstraints="NO" id="qF6-f7-jU3">
1920
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
20-
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
2121
</imageView>
2222
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="roa-ws-nyt" customClass="RNThemeButton">
2323
<rect key="frame" x="303" y="597" width="162" height="54"/>
24-
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
2524
<fontDescription key="fontDescription" type="system" pointSize="21"/>
2625
<state key="normal" title="进入点餐界面">
2726
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -37,7 +36,6 @@
3736
</button>
3837
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KJm-63-q3q" customClass="RNThemeButton">
3938
<rect key="frame" x="303" y="533" width="162" height="54"/>
40-
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
4139
<fontDescription key="fontDescription" type="system" pointSize="21"/>
4240
<state key="normal">
4341
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -52,7 +50,6 @@
5250
</button>
5351
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="桌号" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bsH-BW-VB5" customClass="RNThemeLabel">
5452
<rect key="frame" x="321" y="551" width="42" height="21"/>
55-
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
5653
<fontDescription key="fontDescription" type="system" pointSize="21"/>
5754
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
5855
<nil key="highlightedColor"/>
@@ -62,7 +59,6 @@
6259
</label>
6360
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="B22" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="URA-hw-NCr" customClass="RNThemeLabel">
6461
<rect key="frame" x="377" y="544" width="82" height="35"/>
65-
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
6662
<fontDescription key="fontDescription" type="system" pointSize="24"/>
6763
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
6864
<nil key="highlightedColor"/>
@@ -72,17 +68,20 @@
7268
</label>
7369
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xl0-DO-yXa" customClass="RNThemedImageView">
7470
<rect key="frame" x="372" y="535" width="2" height="50"/>
75-
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
7671
<userDefinedRuntimeAttributes>
7772
<userDefinedRuntimeAttribute type="string" keyPath="imageKey" value="open_button_seperator.png"/>
7873
</userDefinedRuntimeAttributes>
7974
</imageView>
8075
</subviews>
8176
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
82-
<simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
8377
</view>
8478
</objects>
8579
<resources>
8680
<image name="splash.png" width="768" height="1024"/>
8781
</resources>
82+
<simulatedMetricsContainer key="defaultSimulatedMetrics">
83+
<simulatedStatusBarMetrics key="statusBar"/>
84+
<simulatedOrientationMetrics key="orientation"/>
85+
<simulatedScreenMetrics key="destination"/>
86+
</simulatedMetricsContainer>
8887
</document>

0 commit comments

Comments
 (0)