Skip to content

[MERGE]: Dev 파일 누락 추가 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dongglehada merged 1 commit into from
Dec 18, 2024
Merged

[MERGE]: Dev 파일 누락 추가 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions Poppool/Poppool.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -1817,6 +1819,7 @@
08B191BB2CF609AE0057BC04 /* RxKakaoSDKAuth */,
08B191BD2CF609AE0057BC04 /* RxKakaoSDKUser */,
088DE2432D104EE70030FA9E /* SwiftSoup */,
088DE2462D12DB5C0030FA9E /* GoogleMaps */,
);
productName = Poppool;
productReference = BDCA41BD2CF35AC0005EECF6 /* Poppool.app */;
Expand Down Expand Up @@ -1904,6 +1907,7 @@
BDCA420E2CF35FF5005EECF6 /* XCRemoteSwiftPackageReference "lottie-spm" */,
083A25CE2CF364B70099B58E /* XCRemoteSwiftPackageReference "Alamofire" */,
088DE2422D104EE70030FA9E /* XCRemoteSwiftPackageReference "SwiftSoup" */,
088DE2452D12DB5C0030FA9E /* XCRemoteSwiftPackageReference "ios-maps-sdk" */,
);
productRefGroup = BDCA41BE2CF35AC0005EECF6 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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" */;
Expand Down
11 changes: 10 additions & 1 deletion Poppool/Poppool.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions Poppool/Poppool/Application/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions Poppool/Poppool/Application/SceneDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
3 changes: 2 additions & 1 deletion Poppool/Poppool/Presentation/Secne/TabbarController/TabbarController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down