@@ -101,8 +101,12 @@ - (NSString*)getImageName:(UIInterfaceOrientation)currentOrientation delegate:(i
101
101
imageName = [imageName stringByAppendingString: @" -700" ];
102
102
} else if (device.iPhone6 ) {
103
103
imageName = [imageName stringByAppendingString: @" -800" ];
104
- } else if (device.iPhone6Plus ) {
105
- imageName = [imageName stringByAppendingString: @" -800" ];
104
+ } else if (device.iPhone6Plus || device.iPhoneX ) {
105
+ if (device.iPhone6Plus ) {
106
+ imageName = [imageName stringByAppendingString: @" -800" ];
107
+ } else {
108
+ imageName = [imageName stringByAppendingString: @" -1100" ];
109
+ }
106
110
if (currentOrientation == UIInterfaceOrientationPortrait || currentOrientation == UIInterfaceOrientationPortraitUpsideDown) {
107
111
imageName = [imageName stringByAppendingString: @" -Portrait" ];
108
112
}
@@ -116,7 +120,7 @@ - (NSString*)getImageName:(UIInterfaceOrientation)currentOrientation delegate:(i
116
120
imageName = isLandscape ? nil : [imageName stringByAppendingString: @" -568h" ];
117
121
} else if (device.iPhone6 ) { // does not support landscape
118
122
imageName = isLandscape ? nil : [imageName stringByAppendingString: @" -667h" ];
119
- } else if (device.iPhone6Plus ) { // supports landscape
123
+ } else if (device.iPhone6Plus || device. iPhoneX ) { // supports landscape
120
124
if (isOrientationLocked) {
121
125
imageName = [imageName stringByAppendingString: (supportsLandscape ? @" -Landscape" : @" " )];
122
126
} else {
@@ -129,7 +133,11 @@ - (NSString*)getImageName:(UIInterfaceOrientation)currentOrientation delegate:(i
129
133
break ;
130
134
}
131
135
}
132
- imageName = [imageName stringByAppendingString: @" -736h" ];
136
+ if (device.iPhoneX ) {
137
+ imageName = [imageName stringByAppendingString: @" -2436h" ];
138
+ } else {
139
+ imageName = [imageName stringByAppendingString: @" -736h" ];
140
+ }
133
141
134
142
} else if (device.iPad ) { // supports landscape
135
143
if (isOrientationLocked) {
@@ -148,20 +156,6 @@ - (NSString*)getImageName:(UIInterfaceOrientation)currentOrientation delegate:(i
148
156
break ;
149
157
}
150
158
}
151
- } else if (device.iPhoneX ) { // supports landscape
152
- if (isOrientationLocked) {
153
- imageName = [imageName stringByAppendingString: (supportsLandscape ? @" -Landscape" : @" " )];
154
- } else {
155
- switch (currentOrientation) {
156
- case UIInterfaceOrientationLandscapeLeft:
157
- case UIInterfaceOrientationLandscapeRight:
158
- imageName = [imageName stringByAppendingString: @" -Landscape" ];
159
- break ;
160
- default :
161
- break ;
162
- }
163
- }
164
- imageName = [imageName stringByAppendingString: @" -812h" ];
165
159
}
166
160
167
161
return imageName;
0 commit comments