Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Runnect-iOS/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ target 'Runnect-iOS' do
pod 'SnapKit', '~> 5.6.0'
pod 'Moya', '~> 15.0'
pod 'Then'
pod 'KakaoSDKCommon'
pod 'KakaoSDKAuth'
pod 'KakaoSDKUser'


# Pods for Runnect-iOS
Expand Down
22 changes: 21 additions & 1 deletion Runnect-iOS/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
PODS:
- Alamofire (5.6.4)
- KakaoSDKAuth (2.14.0):
- KakaoSDKCommon (= 2.14.0)
- KakaoSDKCommon (2.14.0):
- KakaoSDKCommon/Common (= 2.14.0)
- KakaoSDKCommon/Network (= 2.14.0)
- KakaoSDKCommon/Common (2.14.0)
- KakaoSDKCommon/Network (2.14.0):
- Alamofire (~> 5.1)
- KakaoSDKCommon/Common (= 2.14.0)
- KakaoSDKUser (2.14.0):
- KakaoSDKAuth (= 2.14.0)
- Kingfisher (7.4.1)
- Moya (15.0.0):
- Moya/Core (= 15.0.0)
Expand All @@ -12,6 +23,9 @@ PODS:
- Then (3.0.0)

DEPENDENCIES:
- KakaoSDKAuth
- KakaoSDKCommon
- KakaoSDKUser
- Kingfisher (~> 7.0)
- Moya (~> 15.0)
- NMapsMap
Expand All @@ -21,6 +35,9 @@ DEPENDENCIES:
SPEC REPOS:
trunk:
- Alamofire
- KakaoSDKAuth
- KakaoSDKCommon
- KakaoSDKUser
- Kingfisher
- Moya
- NMapsGeometry
Expand All @@ -30,13 +47,16 @@ SPEC REPOS:

SPEC CHECKSUMS:
Alamofire: 4e95d97098eacb88856099c4fc79b526a299e48c
KakaoSDKAuth: 8fca87815de22062a23297983f327613b087b8bb
KakaoSDKCommon: 0ce638f7a2e49704943c0b74a087a9f8067bba1c
KakaoSDKUser: 2ca18314ce72e6690f76cb1f6f9fbc771d31a803
Kingfisher: cd762a593a61b2fbecf7645c00f9a801a3ebfc9c
Moya: 138f0573e53411fb3dc17016add0b748dfbd78ee
NMapsGeometry: 53c573ead66466681cf123f99f698dc8071a4b83
NMapsMap: 926c3a303d381a24bec8da3cd6e198f50af93ae9
SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25
Then: 844265ae87834bbe1147d91d5d41a404da2ec27d

PODFILE CHECKSUM: bec9bfadf42d34524a80ccc0e46829d1fe943ddb
PODFILE CHECKSUM: fd71a741af1234cbd39c9117a0768b376c78640a

COCOAPODS: 1.11.3
16 changes: 16 additions & 0 deletions Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
A3BC2F3F2964706100198261 /* UploadedCourseInfoCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F3E2964706100198261 /* UploadedCourseInfoCVC.swift */; };
A3BC2F4129667A0D00198261 /* NicknameEditorVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F4029667A0D00198261 /* NicknameEditorVC.swift */; };
A3BC2F432966A93100198261 /* CourseDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F422966A93100198261 /* CourseDetailVC.swift */; };
A3E55BA029C815B10000D85D /* SignInSocialLoginVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3E55B9F29C815B10000D85D /* SignInSocialLoginVC.swift */; };
A3F67AE2296D33AC001598A2 /* MyPageDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3F67AE1296D33AC001598A2 /* MyPageDto.swift */; };
A3F67AEA296E4936001598A2 /* ActivityRecordInfoDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3F67AE9296E4936001598A2 /* ActivityRecordInfoDto.swift */; };
CE09037D296E9ED900BEA710 /* ScrapCourseResponseDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE09037C296E9ED900BEA710 /* ScrapCourseResponseDto.swift */; };
Expand Down Expand Up @@ -155,6 +156,8 @@
A3BC2F3E2964706100198261 /* UploadedCourseInfoCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UploadedCourseInfoCVC.swift; sourceTree = "<group>"; };
A3BC2F4029667A0D00198261 /* NicknameEditorVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NicknameEditorVC.swift; sourceTree = "<group>"; };
A3BC2F422966A93100198261 /* CourseDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseDetailVC.swift; sourceTree = "<group>"; };
A3E55B9F29C815B10000D85D /* SignInSocialLoginVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInSocialLoginVC.swift; sourceTree = "<group>"; };
A3E55BA529C8AB0A0000D85D /* Runnect-iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Runnect-iOS.entitlements"; sourceTree = "<group>"; };
A3F67AE1296D33AC001598A2 /* MyPageDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageDto.swift; sourceTree = "<group>"; };
A3F67AE9296E4936001598A2 /* ActivityRecordInfoDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityRecordInfoDto.swift; sourceTree = "<group>"; };
CE09037C296E9ED900BEA710 /* ScrapCourseResponseDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrapCourseResponseDto.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -731,6 +734,7 @@
CE4545C7295D7AF4003201E1 /* Runnect-iOS */ = {
isa = PBXGroup;
children = (
A3E55BA529C8AB0A0000D85D /* Runnect-iOS.entitlements */,
CE6655AA295D7FAE00C64E12 /* Global */,
CE6655A9295D7FAA00C64E12 /* Network */,
CE6655A8295D7F7D00C64E12 /* Presentation */,
Expand Down Expand Up @@ -993,6 +997,7 @@
isa = PBXGroup;
children = (
CEC2A68629629B9B00160BF7 /* SignInVC.swift */,
A3E55B9F29C815B10000D85D /* SignInSocialLoginVC.swift */,
);
path = VC;
sourceTree = "<group>";
Expand Down Expand Up @@ -1329,6 +1334,7 @@
CEC2A6852961F92C00160BF7 /* CustomButton.swift in Sources */,
CE6B63D3296725E6003F900F /* CourseListCVC.swift in Sources */,
CEF3CD9A296DB305002723A1 /* CourseDetailResponseDto.swift in Sources */,
A3E55BA029C815B10000D85D /* SignInSocialLoginVC.swift in Sources */,
CE29D584296416D800F47542 /* caculateStatusBarHeight.swift in Sources */,
CE66560C295D928300C64E12 /* setRootViewController.swift in Sources */,
CE6655D9295D871B00C64E12 /* URL+.swift in Sources */,
Expand Down Expand Up @@ -1505,17 +1511,22 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "Runnect-iOS/Runnect-iOS.entitlements";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 9K86FQHDLU;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "Runnect-iOS/Info.plist";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "위치 정보 권한이 필요합니다.";
INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "위치 정보 권한이 필요합니다.";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "위치 정보 권한이 필요합니다.";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UIUserInterfaceStyle = Light;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -1537,17 +1548,22 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "Runnect-iOS/Runnect-iOS.entitlements";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 9K86FQHDLU;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "Runnect-iOS/Info.plist";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "위치 정보 권한이 필요합니다.";
INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "위치 정보 권한이 필요합니다.";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "위치 정보 권한이 필요합니다.";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UIUserInterfaceStyle = Light;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
2 changes: 2 additions & 0 deletions Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import NMapsMap

enum ImageLiterals {
// icon
static var icApple: UIImage { .load(named: "ic_apple") }
static var icArrowBack: UIImage { .load(named: "ic_arrow_back") }
static var icArrowMaximize: UIImage { .load(named: "ic_arrow_maximize") }
static var icArrowPageback: UIImage { .load(named: "ic_arrow_pageback") }
Expand All @@ -23,6 +24,7 @@ enum ImageLiterals {
static var icEdit: UIImage { .load(named: "ic_edit") }
static var icHeartFill: UIImage { .load(named: "ic_heart_fill") }
static var icHeart: UIImage { .load(named: "ic_heart") }
static var icKakao: UIImage { .load(named: "ic_kakao") }
static var icMapDeparture: UIImage { .load(named: "ic_map_departure") }
static var icMapLocation: UIImage { .load(named: "ic_map_location") }
static var icMapPoint: UIImage { .load(named: "ic_map_point") }
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "Apple.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Apple@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Apple@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "Kakao.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Kakao@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Kakao@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions Runnect-iOS/Runnect-iOS/Global/Supports/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,19 @@
import UIKit

import NMapsMap
import KakaoSDKAuth
import KakaoSDKCommon

@main
class AppDelegate: UIResponder, UIApplicationDelegate {

func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
if let url = URLContexts.first?.url {
if (AuthApi.isKakaoTalkLoginUrl(url)) {
_ = AuthController.handleOpenUrl(url: url)
}
}
}

func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask {
// 세로방향 고정
Expand All @@ -20,6 +30,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {

NMFAuthManager.shared().clientId = Config.naverMapClientId
KakaoSDK.initSDK(appKey: Config.kakaoNativeAppKey)

return true
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
guard let windowScene = (scene as? UIWindowScene) else { return }

let window = UIWindow(windowScene: windowScene)
let nav = UINavigationController(rootViewController: SplashVC())
let nav = UINavigationController(rootViewController: SignInSocialLoginVC())
window.rootViewController = nav
self.window = window
window.makeKeyAndVisible()
Expand Down
24 changes: 16 additions & 8 deletions Runnect-iOS/Runnect-iOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,29 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLSchemes</key>
<array>
<string>kakao27d01e20b51e5925bf386a6c5465849f</string>
</array>
</dict>
</array>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>kakaokompassauth</string>
<string>kakaolink</string>
</array>
<key>UIAppFonts</key>
<array>
<string>Pretendard-Bold.otf</string>
<string>Pretendard-SemiBold.otf</string>
<string>Pretendard-Medium.otf</string>
<string>Pretendard-Regular.otf</string>
</array>
<key>UIUserInterfaceStyle</key>
<string>Light</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>위치 정보 권한이 필요합니다.</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>위치 정보 권한이 필요합니다.</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>위치 정보 권한이 필요합니다.</string>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
Expand Down
Loading