diff --git a/Poppool/Poppool.xcodeproj/project.pbxproj b/Poppool/Poppool.xcodeproj/project.pbxproj index a6c23d69..325119f1 100644 --- a/Poppool/Poppool.xcodeproj/project.pbxproj +++ b/Poppool/Poppool.xcodeproj/project.pbxproj @@ -117,6 +117,7 @@ 086DD9402D01EEEB00B97D3B /* SearchCountTitleSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 086DD93F2D01EEEB00B97D3B /* SearchCountTitleSection.swift */; }; 086DD9422D01EEF700B97D3B /* SearchCountTitleSectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 086DD9412D01EEF700B97D3B /* SearchCountTitleSectionCell.swift */; }; 088DE2442D104EE70030FA9E /* SwiftSoup in Frameworks */ = {isa = PBXBuildFile; productRef = 088DE2432D104EE70030FA9E /* SwiftSoup */; }; + 088DE2472D12DB5C0030FA9E /* GoogleMaps in Frameworks */ = {isa = PBXBuildFile; productRef = 088DE2462D12DB5C0030FA9E /* GoogleMaps */; }; 089952422D031E650022AEF9 /* SearchSortedController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 089952412D031E650022AEF9 /* SearchSortedController.swift */; }; 089952442D031E6D0022AEF9 /* SearchSortedReactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 089952432D031E6D0022AEF9 /* SearchSortedReactor.swift */; }; 089952462D031E740022AEF9 /* SearchSortedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 089952452D031E740022AEF9 /* SearchSortedView.swift */; }; @@ -588,6 +589,7 @@ 08B191BA2CF609AE0057BC04 /* RxKakaoSDK in Frameworks */, 08B191BC2CF609AE0057BC04 /* RxKakaoSDKAuth in Frameworks */, 083A25D02CF364B70099B58E /* Alamofire in Frameworks */, + 088DE2472D12DB5C0030FA9E /* GoogleMaps in Frameworks */, BDCA42102CF35FF5005EECF6 /* Lottie in Frameworks */, BDCA41FE2CF35EE7005EECF6 /* ReactorKit in Frameworks */, BDCA41F22CF35D0D005EECF6 /* SnapKit in Frameworks */, @@ -1817,6 +1819,7 @@ 08B191BB2CF609AE0057BC04 /* RxKakaoSDKAuth */, 08B191BD2CF609AE0057BC04 /* RxKakaoSDKUser */, 088DE2432D104EE70030FA9E /* SwiftSoup */, + 088DE2462D12DB5C0030FA9E /* GoogleMaps */, ); productName = Poppool; productReference = BDCA41BD2CF35AC0005EECF6 /* Poppool.app */; @@ -1904,6 +1907,7 @@ BDCA420E2CF35FF5005EECF6 /* XCRemoteSwiftPackageReference "lottie-spm" */, 083A25CE2CF364B70099B58E /* XCRemoteSwiftPackageReference "Alamofire" */, 088DE2422D104EE70030FA9E /* XCRemoteSwiftPackageReference "SwiftSoup" */, + 088DE2452D12DB5C0030FA9E /* XCRemoteSwiftPackageReference "ios-maps-sdk" */, ); productRefGroup = BDCA41BE2CF35AC0005EECF6 /* Products */; projectDirPath = ""; @@ -2571,6 +2575,14 @@ minimumVersion = 2.7.6; }; }; + 088DE2452D12DB5C0030FA9E /* XCRemoteSwiftPackageReference "ios-maps-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/googlemaps/ios-maps-sdk"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 9.2.0; + }; + }; BDCA41F02CF35D0D005EECF6 /* XCRemoteSwiftPackageReference "SnapKit" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/SnapKit/SnapKit.git"; @@ -2672,6 +2684,11 @@ package = 088DE2422D104EE70030FA9E /* XCRemoteSwiftPackageReference "SwiftSoup" */; productName = SwiftSoup; }; + 088DE2462D12DB5C0030FA9E /* GoogleMaps */ = { + isa = XCSwiftPackageProductDependency; + package = 088DE2452D12DB5C0030FA9E /* XCRemoteSwiftPackageReference "ios-maps-sdk" */; + productName = GoogleMaps; + }; 08B191B92CF609AE0057BC04 /* RxKakaoSDK */ = { isa = XCSwiftPackageProductDependency; package = BDCA41F92CF35EC0005EECF6 /* XCRemoteSwiftPackageReference "kakao-ios-sdk-rx" */; diff --git a/Poppool/Poppool.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Poppool/Poppool.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index a1847042..bc9ade91 100644 --- a/Poppool/Poppool.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Poppool/Poppool.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "3ea59c092e0a2ecea5197df4f8773d70f2ce7ad6e2ca92f5e7fd8dd2a5d10415", + "originHash" : "c64517fc0b863f1430f9f4c7e49f93b8a5dc6a2216945c3f8f0da1e675fed287", "pins" : [ { "identity" : "alamofire", @@ -10,6 +10,15 @@ "version" : "5.10.2" } }, + { + "identity" : "ios-maps-sdk", + "kind" : "remoteSourceControl", + "location" : "https://github.com/googlemaps/ios-maps-sdk", + "state" : { + "revision" : "df7ecd2f894fd83f0287f2cfb6842a0dfe6f290b", + "version" : "9.2.0" + } + }, { "identity" : "kakao-ios-sdk", "kind" : "remoteSourceControl", diff --git a/Poppool/Poppool/Application/AppDelegate.swift b/Poppool/Poppool/Application/AppDelegate.swift index f43a2ea6..359c1f29 100644 --- a/Poppool/Poppool/Application/AppDelegate.swift +++ b/Poppool/Poppool/Application/AppDelegate.swift @@ -10,14 +10,16 @@ import UIKit import RxKakaoSDKAuth import KakaoSDKAuth import RxKakaoSDKCommon +import GoogleMaps @main class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - RxKakaoSDK.initSDK(appKey: Secrets.kakaoAuthAppkey.rawValue, loggingEnable: false) - return true - } + RxKakaoSDK.initSDK(appKey: Secrets.kakaoAuthAppkey.rawValue, loggingEnable: false) + GMSServices.provideAPIKey(Secrets.popPoolApiKey.rawValue) + return true + } // MARK: UISceneSession Lifecycle diff --git a/Poppool/Poppool/Application/SceneDelegate.swift b/Poppool/Poppool/Application/SceneDelegate.swift index 609354c7..1e18c9a1 100644 --- a/Poppool/Poppool/Application/SceneDelegate.swift +++ b/Poppool/Poppool/Application/SceneDelegate.swift @@ -26,11 +26,11 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { // rootViewController.reactor = LoginReactor() -// let rootViewController = DetailController() -// rootViewController.reactor = DetailReactor(popUpID: 8) + let rootViewController = DetailController() + rootViewController.reactor = DetailReactor(popUpID: 8) - let rootViewController = SearchMainController() - rootViewController.reactor = SearchMainReactor() +// let rootViewController = SearchMainController() +// rootViewController.reactor = SearchMainReactor() let navigationController = UINavigationController(rootViewController: rootViewController) // let navigationController = WaveTabBarController() diff --git a/Poppool/Poppool/Presentation/Secne/TabbarController/TabbarController.swift b/Poppool/Poppool/Presentation/Secne/TabbarController/TabbarController.swift index f9277280..eda20b3e 100644 --- a/Poppool/Poppool/Presentation/Secne/TabbarController/TabbarController.swift +++ b/Poppool/Poppool/Presentation/Secne/TabbarController/TabbarController.swift @@ -193,7 +193,8 @@ class WaveTabBarController: UITabBarController, UITabBarControllerDelegate { } func addSomeTabItems() { - let mapController = BaseViewController() + let mapController = MapViewController() + mapController.reactor = MapReactor(useCase: DefaultMapUseCase(repository: DefaultMapRepository(provider: ProviderImpl()))) let homeController = HomeController() homeController.reactor = HomeReactor()