From 9c4f595eb21dba0a759d89e02c8d967026eaaf4a Mon Sep 17 00:00:00 2001 From: LeeMyeongJin Date: Fri, 13 Oct 2023 21:21:45 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[Feat]=20#193=20-=20=EC=B9=B4=EC=B9=B4?= =?UTF-8?q?=EC=98=A4=ED=86=A1=20SDK=20=EC=84=A4=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Runnect-iOS/Podfile | 2 ++ Runnect-iOS/Podfile.lock | 21 ++++++++++++++++++- .../Presentation/MyPage/VC/MyPageVC.swift | 2 ++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/Runnect-iOS/Podfile b/Runnect-iOS/Podfile index c9ac53f9..9c98c78e 100644 --- a/Runnect-iOS/Podfile +++ b/Runnect-iOS/Podfile @@ -16,6 +16,8 @@ target 'Runnect-iOS' do pod 'KakaoSDKShare' pod 'KakaoSDKTemplate' pod 'FirebaseDynamicLinks' + pod 'KakaoSDKTalk' + pod 'DropDown', :git => 'https://github.com/thingineeer/DropDown.git', :commit => '95ee36f7bd925d466033c2c169979f1c574bf3b9' # Pods for Runnect-iOS diff --git a/Runnect-iOS/Podfile.lock b/Runnect-iOS/Podfile.lock index 5b4d89c1..31f52b6c 100644 --- a/Runnect-iOS/Podfile.lock +++ b/Runnect-iOS/Podfile.lock @@ -1,5 +1,6 @@ PODS: - Alamofire (5.7.1) + - DropDown (2.3.13) - FirebaseCore (10.14.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.8) @@ -25,6 +26,9 @@ PODS: - KakaoSDKShare (2.16.0): - KakaoSDKCommon (= 2.16.0) - KakaoSDKTemplate (= 2.16.0) + - KakaoSDKTalk (2.16.0): + - KakaoSDKTemplate (= 2.16.0) + - KakaoSDKUser (= 2.16.0) - KakaoSDKTemplate (2.16.0): - KakaoSDKCommon/Common (= 2.16.0) - KakaoSDKUser (2.16.0): @@ -42,10 +46,12 @@ PODS: - Then (3.0.0) DEPENDENCIES: + - DropDown (from `https://github.com/thingineeer/DropDown.git`, commit `95ee36f7bd925d466033c2c169979f1c574bf3b9`) - FirebaseDynamicLinks - KakaoSDKAuth - KakaoSDKCommon - KakaoSDKShare + - KakaoSDKTalk - KakaoSDKTemplate - KakaoSDKUser - Kingfisher (~> 7.0) @@ -64,6 +70,7 @@ SPEC REPOS: - KakaoSDKAuth - KakaoSDKCommon - KakaoSDKShare + - KakaoSDKTalk - KakaoSDKTemplate - KakaoSDKUser - Kingfisher @@ -74,8 +81,19 @@ SPEC REPOS: - SnapKit - Then +EXTERNAL SOURCES: + DropDown: + :commit: 95ee36f7bd925d466033c2c169979f1c574bf3b9 + :git: https://github.com/thingineeer/DropDown.git + +CHECKOUT OPTIONS: + DropDown: + :commit: 95ee36f7bd925d466033c2c169979f1c574bf3b9 + :git: https://github.com/thingineeer/DropDown.git + SPEC CHECKSUMS: Alamofire: 0123a34370cb170936ae79a8df46cc62b2edeb88 + DropDown: bf260fd688978138019ad7d94f63a2362dad85ba FirebaseCore: 6fc17ac9f03509d51c131298aacb3ee5698b4f02 FirebaseCoreInternal: d558159ee6cc4b823c2296ecc193de9f6d9a5bb3 FirebaseDynamicLinks: 0eaabff2d0e5d0e576c0227227b00771aa2f3aaf @@ -83,6 +101,7 @@ SPEC CHECKSUMS: KakaoSDKAuth: 1b85ed7c41b0517bfd1fc9dc46c292c75b8cb610 KakaoSDKCommon: d6579aa2e9d963d74e13d741cbf1cce48b8b0c17 KakaoSDKShare: efc0415c4f33274232604eeaf96fb03641facdca + KakaoSDKTalk: 44545bd9a1ebc144795eb6e927960b10cf8252f5 KakaoSDKTemplate: 7e478a3cda6f5879b475546bfcd667b464fbb6d0 KakaoSDKUser: 427e5b3884abd19ee6d9a7bd6e3f3029eb2968b8 Kingfisher: 59f908b6d2f403b0a3e539debb0eec05cb27002c @@ -93,6 +112,6 @@ SPEC CHECKSUMS: SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25 Then: 844265ae87834bbe1147d91d5d41a404da2ec27d -PODFILE CHECKSUM: 43e89e9e217761b44c0c7e93fb4abfab29a82ece +PODFILE CHECKSUM: 5bd73b39108f7bc1302e8303d79fefc7783805a5 COCOAPODS: 1.12.1 diff --git a/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/MyPageVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/MyPageVC.swift index d4e7d80e..a8777b87 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/MyPageVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/MyPageVC.swift @@ -10,6 +10,8 @@ import UIKit import SnapKit import Then import Moya +import KakaoSDKUser +import KakaoSDKTalk final class MyPageVC: UIViewController { From 96f7630fc65dbe1086140bd5e9e0507a6a20173d Mon Sep 17 00:00:00 2001 From: LeeMyeongJin Date: Fri, 13 Oct 2023 22:12:02 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[Fix]=20#193=20-=20=EC=8B=A0=EA=B3=A0?= =?UTF-8?q?=ED=95=98=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit safari를 통하지않고 바로 카카오톡으로 연결되게 변경 하였습니다. --- .../Runnect-iOS/Presentation/MyPage/VC/MyPageVC.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/MyPageVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/MyPageVC.swift index a8777b87..a2ffebfa 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/MyPageVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/MyPageVC.swift @@ -10,8 +10,8 @@ import UIKit import SnapKit import Then import Moya -import KakaoSDKUser import KakaoSDKTalk +import KakaoSDKUser final class MyPageVC: UIViewController { @@ -256,7 +256,8 @@ extension MyPageVC { @objc private func touchUpkakaoChannelAsk() { - if let url = URL(string: "https://pf.kakao.com/_hXduG") { + + if let url = TalkApi.shared.makeUrlForChannelChat(channelPublicId: "_hXduG") { UIApplication.shared.open(url) } } From c0bdccf249c8c4227931dd59f23ccb90f913038f Mon Sep 17 00:00:00 2001 From: LeeMyeongJin Date: Fri, 13 Oct 2023 22:13:35 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[Fix]=20#193=20-=20info.plist=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 카카오톡 플러스 채널 추가 --- Runnect-iOS/Runnect-iOS/Info.plist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Runnect-iOS/Runnect-iOS/Info.plist b/Runnect-iOS/Runnect-iOS/Info.plist index dce22c41..7e037407 100644 --- a/Runnect-iOS/Runnect-iOS/Info.plist +++ b/Runnect-iOS/Runnect-iOS/Info.plist @@ -52,6 +52,8 @@ kakaokompassauth kakaolink + + kakaoplus LSRequiresIPhoneOS From 0b9379b2ab4bc9f22ee98ecf1bbd73b4d570b4ed Mon Sep 17 00:00:00 2001 From: LeeMyeongJin Date: Sat, 14 Oct 2023 14:44:34 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[Chore]=20#193=20-=20=EB=B6=88=ED=95=84?= =?UTF-8?q?=EC=9A=94=ED=95=9C=20=EC=A3=BC=EC=84=9D=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Runnect-iOS/Runnect-iOS/Info.plist | 1 - 1 file changed, 1 deletion(-) diff --git a/Runnect-iOS/Runnect-iOS/Info.plist b/Runnect-iOS/Runnect-iOS/Info.plist index 7e037407..2e92d261 100644 --- a/Runnect-iOS/Runnect-iOS/Info.plist +++ b/Runnect-iOS/Runnect-iOS/Info.plist @@ -52,7 +52,6 @@ kakaokompassauth kakaolink - kakaoplus LSRequiresIPhoneOS