Skip to content

Commit f311382

Browse files
committed
Merge branch 'fix/#39' into cd-automation
2 parents 66566ed + 855dea2 commit f311382

File tree

6 files changed

+8
-25
lines changed

6 files changed

+8
-25
lines changed

EATSSU_MVC/EATSSU_MVC/Resources/Images.xcassets/version2/MainLogo.imageset/Contents.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "MainLogo.svg",
4+
"filename" : "MainLogo.png",
55
"idiom" : "universal"
66
}
77
],
Loading

EATSSU_MVC/EATSSU_MVC/Resources/Images.xcassets/version2/MainLogo.imageset/MainLogo.svg

-9
This file was deleted.

EATSSU_MVC/EATSSU_MVC/Resources/LaunchScreen.storyboard

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
33
<device id="retina6_12" orientation="portrait" appearance="light"/>
44
<dependencies>
5+
<deployment identifier="iOS"/>
56
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
67
<capability name="Named colors" minToolsVersion="9.0"/>
78
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
@@ -17,16 +18,14 @@
1718
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1819
<subviews>
1920
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="version2/SplashLogo" translatesAutoresizingMaskIntoConstraints="NO" id="ngd-xW-Nxj">
20-
<rect key="frame" x="80" y="380" width="233" height="58"/>
21+
<rect key="frame" x="81.666666666666686" y="388.66666666666669" width="230" height="75"/>
2122
</imageView>
2223
</subviews>
2324
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
2425
<color key="backgroundColor" name="Main/primary"/>
2526
<constraints>
26-
<constraint firstItem="ngd-xW-Nxj" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" constant="380" id="ALC-7X-xs4"/>
27-
<constraint firstAttribute="bottomMargin" secondItem="ngd-xW-Nxj" secondAttribute="bottom" constant="380" id="Qk9-c5-fHi"/>
28-
<constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="ngd-xW-Nxj" secondAttribute="trailing" constant="80" id="cDe-6D-RSp"/>
29-
<constraint firstItem="ngd-xW-Nxj" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="80" id="unu-Nk-8e4"/>
27+
<constraint firstItem="ngd-xW-Nxj" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="c2u-7K-6vH"/>
28+
<constraint firstItem="ngd-xW-Nxj" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="hl5-Iq-AEh"/>
3029
</constraints>
3130
</view>
3231
</viewController>

EATSSU_MVC/EATSSU_MVC/Sources/Utility/Application/AppDelegate.swift

+2-9
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
4444
// 로그인 페이지로 이동
4545
}
4646

47-
if let kakaoAPIKey = Bundle.main.object(forInfoDictionaryKey: "KAKAO API KEY") as? String {
48-
KakaoSDK.initSDK(appKey: kakaoAPIKey)
49-
} else {
50-
/*
51-
해야 할 일
52-
- Configuration File에서 카카오 API 키를 불러오지 못했을 때 처리해야 하는 로직
53-
*/
54-
}
55-
47+
let kakaoAPIKey = Bundle.main.object(forInfoDictionaryKey: "KAKAO API KEY") as! String
48+
KakaoSDK.initSDK(appKey: kakaoAPIKey)
5649

5750
#if DEBUG
5851
var newArguments = ProcessInfo.processInfo.arguments

EATSSU_MVC/Project.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ let eatSSUInfoPlist: InfoPlist = .extendingDefault(with: [
77
"CFBundleURLTypes": [
88
[
99
"CFBundleTypeRole": "Editor",
10-
"CFBundleURLSchemes": "$(KAKAO_API_KEY)"
10+
"CFBundleURLSchemes": ["kakao$(KAKAO_API_KEY)"]
1111
]
1212
],
1313
"LSApplicationQueriesSchemes": ["kakaokompassauth", "kakaolink"],

0 commit comments

Comments
 (0)