Skip to content

Commit b9aed42

Browse files
authored
Merge pull request #193 from EAT-SSU/fix/#192
[#192] 크리스마스ver 스플래시 이미지 짤림 현상 수정
2 parents 2819a0b + 08215ec commit b9aed42

File tree

7 files changed

+33
-14
lines changed

7 files changed

+33
-14
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "splashChistmasBackground.png",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}

EATSSU_MVC/EATSSU_MVC/Resources/Assets/Images.xcassets/version2/SplashChristmas.imageset/Contents.json renamed to EATSSU_MVC/EATSSU_MVC/Resources/Assets/Images.xcassets/version2/splashChristmasLogo.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "SplashChristmas.png",
4+
"filename" : "Logo_iOS.png",
55
"idiom" : "universal"
66
}
77
],

EATSSU_MVC/EATSSU_MVC/Resources/LaunchScreen.storyboard

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,41 @@
44
<dependencies>
55
<deployment identifier="iOS"/>
66
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
7-
<capability name="Named colors" minToolsVersion="9.0"/>
87
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
98
</dependencies>
109
<scenes>
1110
<!--View Controller-->
1211
<scene sceneID="EHf-IW-A2E">
1312
<objects>
14-
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
13+
<viewController automaticallyAdjustsScrollViewInsets="NO" id="01J-lp-oVM" sceneMemberID="viewController">
1514
<layoutGuides>
16-
<viewControllerLayoutGuide type="top" id="byN-LC-Shr"/>
17-
<viewControllerLayoutGuide type="bottom" id="cw0-Ma-ggV"/>
15+
<viewControllerLayoutGuide type="top" id="XCl-CF-1Vg"/>
16+
<viewControllerLayoutGuide type="bottom" id="hSG-lU-t3W"/>
1817
</layoutGuides>
1918
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
2019
<rect key="frame" x="0.0" y="0.0" width="402" height="874"/>
2120
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2221
<subviews>
23-
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" image="splashChristmas.png" id="FuW-Z2-fPE">
24-
<rect key="frame" x="-6" y="0.0" width="414" height="874"/>
25-
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
26-
<color key="backgroundColor" name="Main/primary"/>
22+
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" image="version2/splashChistmasBackground" id="Ae0-0j-iNM">
23+
<rect key="frame" x="0.0" y="0.0" width="402" height="874"/>
24+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
25+
</imageView>
26+
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="version2/splashChristmasLogo" adjustsImageSizeForAccessibilityContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IGI-yk-E8u">
27+
<rect key="frame" x="75.666666666666686" y="407" width="251" height="60"/>
2728
</imageView>
2829
</subviews>
2930
<constraints>
30-
<constraint firstItem="FuW-Z2-fPE" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="24C-H8-Bc7"/>
31-
<constraint firstAttribute="trailing" secondItem="FuW-Z2-fPE" secondAttribute="trailing" id="3ed-rR-79D"/>
32-
<constraint firstItem="FuW-Z2-fPE" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="HBR-yI-VIc"/>
33-
<constraint firstAttribute="bottom" secondItem="FuW-Z2-fPE" secondAttribute="bottom" id="gMA-2t-LcD"/>
31+
<constraint firstItem="IGI-yk-E8u" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="391-Hr-dWu"/>
32+
<constraint firstItem="IGI-yk-E8u" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="CJH-3A-nVG"/>
33+
<constraint firstAttribute="trailing" secondItem="Ae0-0j-iNM" secondAttribute="trailing" id="RkL-ma-cIg"/>
34+
<constraint firstItem="Ae0-0j-iNM" firstAttribute="top" secondItem="XCl-CF-1Vg" secondAttribute="bottom" id="ST9-Uj-gUp"/>
35+
<constraint firstItem="Ae0-0j-iNM" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="ew2-ST-s0K"/>
36+
<constraint firstItem="hSG-lU-t3W" firstAttribute="top" secondItem="Ae0-0j-iNM" secondAttribute="bottom" id="pu8-He-w1I"/>
3437
</constraints>
38+
<directionalEdgeInsets key="directionalLayoutMargins" top="0.0" leading="0.0" bottom="0.0" trailing="0.0"/>
3539
</view>
40+
<nil key="simulatedTopBarMetrics"/>
41+
<nil key="simulatedBottomBarMetrics"/>
3642
</viewController>
3743
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
3844
</objects>
@@ -41,7 +47,8 @@
4147
</scenes>
4248
<color key="tintColor" name="Main/primary"/>
4349
<resources>
44-
<image name="splashChristmas.png" width="390" height="844"/>
50+
<image name="version2/splashChistmasBackground" width="390" height="844"/>
51+
<image name="version2/splashChristmasLogo" width="251" height="60"/>
4552
<namedColor name="Main/primary">
4653
<color red="0.40000000000000002" green="0.83137254901960789" blue="0.76078431372549016" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
4754
</namedColor>
Binary file not shown.

0 commit comments

Comments
 (0)