diff --git a/Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj b/Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj index 32d003c4..499336f1 100644 --- a/Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj +++ b/Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj @@ -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 */; }; @@ -155,6 +156,7 @@ A3BC2F3E2964706100198261 /* UploadedCourseInfoCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UploadedCourseInfoCVC.swift; sourceTree = ""; }; A3BC2F4029667A0D00198261 /* NicknameEditorVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NicknameEditorVC.swift; sourceTree = ""; }; A3BC2F422966A93100198261 /* CourseDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseDetailVC.swift; sourceTree = ""; }; + A3E55B9F29C815B10000D85D /* SignInSocialLoginVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInSocialLoginVC.swift; sourceTree = ""; }; A3F67AE1296D33AC001598A2 /* MyPageDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageDto.swift; sourceTree = ""; }; A3F67AE9296E4936001598A2 /* ActivityRecordInfoDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityRecordInfoDto.swift; sourceTree = ""; }; CE09037C296E9ED900BEA710 /* ScrapCourseResponseDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrapCourseResponseDto.swift; sourceTree = ""; }; @@ -993,6 +995,7 @@ isa = PBXGroup; children = ( CEC2A68629629B9B00160BF7 /* SignInVC.swift */, + A3E55B9F29C815B10000D85D /* SignInSocialLoginVC.swift */, ); path = VC; sourceTree = ""; @@ -1329,6 +1332,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 */, diff --git a/Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift b/Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift index 8e418060..cbfe8d49 100644 --- a/Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift +++ b/Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift @@ -10,6 +10,7 @@ import NMapsMap enum ImageLiterals { // icon + static var icArrowBack: 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") } @@ -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 icHeart: 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") } diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_apple.imageset/Apple.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_apple.imageset/Apple.png new file mode 100644 index 00000000..cfa0cccb Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_apple.imageset/Apple.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_apple.imageset/Apple@2x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_apple.imageset/Apple@2x.png new file mode 100644 index 00000000..851c5d1a Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_apple.imageset/Apple@2x.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_apple.imageset/Apple@3x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_apple.imageset/Apple@3x.png new file mode 100644 index 00000000..134ef371 Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_apple.imageset/Apple@3x.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_apple.imageset/Contents.json b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_apple.imageset/Contents.json new file mode 100644 index 00000000..4d141d0c --- /dev/null +++ b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_apple.imageset/Contents.json @@ -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 + } +} diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_kakao.imageset/Contents.json b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_kakao.imageset/Contents.json new file mode 100644 index 00000000..dd12fd34 --- /dev/null +++ b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_kakao.imageset/Contents.json @@ -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 + } +} diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_kakao.imageset/Kakao.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_kakao.imageset/Kakao.png new file mode 100644 index 00000000..3d89ffde Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_kakao.imageset/Kakao.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_kakao.imageset/Kakao@2x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_kakao.imageset/Kakao@2x.png new file mode 100644 index 00000000..8540a6e3 Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_kakao.imageset/Kakao@2x.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_kakao.imageset/Kakao@3x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_kakao.imageset/Kakao@3x.png new file mode 100644 index 00000000..bf3a9b2a Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_kakao.imageset/Kakao@3x.png differ diff --git a/Runnect-iOS/Runnect-iOS/Presentation/SignIn/VC/SignInSocialLoginVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/SignIn/VC/SignInSocialLoginVC.swift new file mode 100644 index 00000000..452a7a6b --- /dev/null +++ b/Runnect-iOS/Runnect-iOS/Presentation/SignIn/VC/SignInSocialLoginVC.swift @@ -0,0 +1,29 @@ +// +// SignInSocialLoginVC.swift +// Runnect-iOS +// +// Created by 몽이 누나 on 2023/03/20. +// + +import UIKit + +class SignInSocialLoginVC: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +}