Skip to content

Commit

Permalink
Merge pull request #112 from WhereAreYouPJ/feat/home
Browse files Browse the repository at this point in the history 
Rename(#57): 번들ID 수정
  • Loading branch information
@jungseok-corine
jungseok-corine authored Jan 28, 2025
2 parents 2c88aa2 + 516cf1c commit dbd5853
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 132 deletions.
2 changes: 1 addition & 1 deletion Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 6c3dfe6ae815ef4d0d8a8089c6581b759daf26fd

COCOAPODS: 1.15.2
COCOAPODS: 1.16.2
12 changes: 2 additions & 10 deletions Where_Are_You.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@
99A07CD42CF440E100A47796 /* FeedBookMarkViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99A07CD32CF440E100A47796 /* FeedBookMarkViewModel.swift */; };
99A7D7E42C999897002BCD21 /* LocationBookMarkCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99A7D7E32C999897002BCD21 /* LocationBookMarkCell.swift */; };
99A814122D129DC5000FC5A3 /* NoFeedImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99A814112D129DC5000FC5A3 /* NoFeedImageView.swift */; };
99A897D72CEB02E900E79BED /* ImageLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99A897D62CEB02E900E79BED /* ImageLoader.swift */; };
99AE53472D3F5F13003AD774 /* BottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99AE53462D3F5F13003AD774 /* BottomSheetViewController.swift */; };
99AE53492D3F61E0003AD774 /* DailyScheduleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99AE53482D3F61E0003AD774 /* DailyScheduleTableViewCell.swift */; };
99AE534B2D408719003AD774 /* BottomSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99AE534A2D408719003AD774 /* BottomSheetView.swift */; };
Expand Down Expand Up @@ -194,7 +193,6 @@
99E2EEF12D3633CD0010F1F9 /* MainNoFeedImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99E2EEF02D3633CD0010F1F9 /* MainNoFeedImageView.swift */; };
99E401252D0D6CD900A63304 /* FeedOptionsHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99E401242D0D6CD900A63304 /* FeedOptionsHandler.swift */; };
99E755512C22E66F0016A0A6 /* MemberService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99E755502C22E66F0016A0A6 /* MemberService.swift */; };
99E7BA592C69A5D500F79C96 /* ImageUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99E7BA582C69A5D500F79C96 /* ImageUtility.swift */; };
99E8BC3F2C2CEB1D00536B95 /* GenericResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99E8BC3E2C2CEB1D00536B95 /* GenericResponse.swift */; };
99E8BC452C2D26CF00536B95 /* EmailVerifyUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99E8BC442C2D26CF00536B95 /* EmailVerifyUseCase.swift */; };
99E9D39B2CF7F7FC00D2554A /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99E9D39A2CF7F7FC00D2554A /* User.swift */; };
Expand Down Expand Up @@ -458,7 +456,6 @@
99A07CD32CF440E100A47796 /* FeedBookMarkViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedBookMarkViewModel.swift; sourceTree = "<group>"; };
99A7D7E32C999897002BCD21 /* LocationBookMarkCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationBookMarkCell.swift; sourceTree = "<group>"; };
99A814112D129DC5000FC5A3 /* NoFeedImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoFeedImageView.swift; sourceTree = "<group>"; };
99A897D62CEB02E900E79BED /* ImageLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageLoader.swift; sourceTree = "<group>"; };
99AE53462D3F5F13003AD774 /* BottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetViewController.swift; sourceTree = "<group>"; };
99AE53482D3F61E0003AD774 /* DailyScheduleTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DailyScheduleTableViewCell.swift; sourceTree = "<group>"; };
99AE534A2D408719003AD774 /* BottomSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -542,7 +539,6 @@
99E2EEF02D3633CD0010F1F9 /* MainNoFeedImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainNoFeedImageView.swift; sourceTree = "<group>"; };
99E401242D0D6CD900A63304 /* FeedOptionsHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedOptionsHandler.swift; sourceTree = "<group>"; };
99E755502C22E66F0016A0A6 /* MemberService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemberService.swift; sourceTree = "<group>"; };
99E7BA582C69A5D500F79C96 /* ImageUtility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageUtility.swift; sourceTree = "<group>"; };
99E8BC3E2C2CEB1D00536B95 /* GenericResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenericResponse.swift; sourceTree = "<group>"; };
99E8BC442C2D26CF00536B95 /* EmailVerifyUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailVerifyUseCase.swift; sourceTree = "<group>"; };
99E9D39A2CF7F7FC00D2554A /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1177,10 +1173,8 @@
99149FEA2C4F97C300136097 /* ValidationHelper.swift */,
99149FEC2C4F97EA00136097 /* TimeHelper.swift */,
9974EA1F2C62196500826793 /* SnappingFlowLayout.swift */,
99E7BA582C69A5D500F79C96 /* ImageUtility.swift */,
99FDD0BC2C6DF72700B15026 /* MultipartFormDataHelper.swift */,
D55C6C412CF5B8D7005132DC /* NavigationBarModifier.swift */,
99A897D62CEB02E900E79BED /* ImageLoader.swift */,
99E401242D0D6CD900A63304 /* FeedOptionsHandler.swift */,
D59ACC9B2CFF2DF900B3F877 /* MyLocation.gpx */,
);
Expand Down Expand Up @@ -2200,7 +2194,6 @@
99C5B9E52D30AEB200CD570F /* CommentAccountDeletionView.swift in Sources */,
99933E942D2A56D3009D0C5A /* EditFeedView.swift in Sources */,
99949F4F2C58890C00AE0177 /* ProfileView.swift in Sources */,
99E7BA592C69A5D500F79C96 /* ImageUtility.swift in Sources */,
99C1403E2C6496BC00A706B6 /* NoDataView.swift in Sources */,
D55C6C422CF5B8D7005132DC /* NavigationBarModifier.swift in Sources */,
99EDF5962CE8AD980008B19A /* GetFeedDetailsUseCase.swift in Sources */,
Expand Down Expand Up @@ -2287,7 +2280,6 @@
99EDF5A02CE8BE4A0008B19A /* GetHideFeedUseCase.swift in Sources */,
99647EF32D33DB3B00D63B4B /* CompleteDeleteView.swift in Sources */,
9967C1522C56467D00927277 /* CustomAlert.swift in Sources */,
99A897D72CEB02E900E79BED /* ImageLoader.swift in Sources */,
99C68E482C64B43900DEC1F1 /* FeedService.swift in Sources */,
99949F572C58B1CE00AE0177 /* FriendsListViewController.swift in Sources */,
D5BA308E2CE744CA00958BF5 /* FriendService.swift in Sources */,
Expand Down Expand Up @@ -2540,7 +2532,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.ben.OMW;
PRODUCT_BUNDLE_IDENTIFIER = "com.omw.on-my-way";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand Down Expand Up @@ -2580,7 +2572,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.ben.OMW;
PRODUCT_BUNDLE_IDENTIFIER = "com.omw.on-my-way";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand Down
2 changes: 1 addition & 1 deletion Where_Are_You/Presentation/Main/FriendFeed/Feeds/ViewControllers/AddFeedViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class AddFeedViewController: UIViewController {
}

private func setupNavigationBar() {
Utilities.createNavigationBar(for: self, title: "새 피드 작성", backButtonAction: #selector(backButtonTapped), showBackButton: true)
configureNavigationBar(title: "새 피드 작성", backButtonAction: #selector(backButtonTapped))
}

private func setupUI() {
Expand Down
2 changes: 1 addition & 1 deletion ...e_Are_You/Presentation/Main/FriendFeed/Feeds/ViewControllers/EditFeedViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class EditFeedViewController: UIViewController {
}

private func setupNavigationBar() {
Utilities.createNavigationBar(for: self, title: "피드 수정", backButtonAction: #selector(backButtonTapped))
configureNavigationBar(title: "피드 수정", backButtonAction: #selector(backButtonTapped))
}

private func buttonActions() {
Expand Down
2 changes: 1 addition & 1 deletion Where_Are_You/Presentation/Main/Mypage/ViewControllers/FeedArchiveViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class FeedArchiveViewController: UIViewController {

// MARK: - Helpers
private func setupNavigationBar() {
Utilities.createNavigationBar(for: self, title: "피드 보관함", backButtonAction: #selector(backButtonTapped))
configureNavigationBar(title: "피드 보관함", backButtonAction: #selector(backButtonTapped))
}

private func setupViewModel() {
Expand Down
2 changes: 1 addition & 1 deletion Where_Are_You/Presentation/Main/Mypage/ViewControllers/FeedBookMarkViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class FeedBookMarkViewController: UIViewController {

// MARK: - Helpers
private func setupNavigationBar() {
Utilities.createNavigationBar(for: self, title: "피드 책갈피", backButtonAction: #selector(backButtonTapped))
configureNavigationBar(title: "피드 책갈피", backButtonAction: #selector(backButtonTapped))
}

private func setupViewModel() {
Expand Down
3 changes: 1 addition & 2 deletions Where_Are_You/Presentation/Main/Mypage/ViewControllers/LocationBookmarkViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ class LocationBookmarkViewController: UIViewController {
}

private func setupNavigationBar() {
Utilities.createNavigationBar(for: self, title: "위치 즐겨찾기", backButtonAction: #selector(backButtonTapped))
navigationItem.rightBarButtonItem = UIBarButtonItem(customView: addButton)
configureNavigationBar(title: "위치 즐겨찾기", backButtonAction: #selector(backButtonTapped), rightButton: UIBarButtonItem(customView: addButton))
}

private func setupBindings() {
Expand Down
3 changes: 1 addition & 2 deletions Where_Are_You/Presentation/Main/Mypage/ViewControllers/MyDetailManageViewcontroller.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ class MyDetailManageViewcontroller: UIViewController {
}

private func setupNavigationBar() {
Utilities.createNavigationBar(for: self, title: "내 정보 관리", backButtonAction: #selector(backButtonTapped))
navigationItem.rightBarButtonItem = UIBarButtonItem(customView: addButton)
configureNavigationBar(title: "내 정보 관리", backButtonAction: #selector(backButtonTapped), rightButton: UIBarButtonItem(customView: addButton))
}

private func buttonActions() {
Expand Down
42 changes: 3 additions & 39 deletions Where_Are_You/Utils/Extensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ enum FeedViewType {
}

extension UIViewController {
func configureNavigationBar(title: String, backButtonAction: Selector? = nil, showBackButton: Bool = true) {
Utilities.createNavigationBar(for: self, title: title, backButtonAction: backButtonAction, showBackButton: showBackButton)
func configureNavigationBar(title: String, backButtonAction: Selector? = nil, showBackButton: Bool = true, rightButton: UIBarButtonItem? = nil) {
Utilities.createNavigationBar(for: self, title: title, backButtonAction: backButtonAction, showBackButton: showBackButton, rightButton: rightButton)
}
}

Expand Down Expand Up @@ -299,42 +299,6 @@ extension UIImage {
draw(in: CGRect(origin: .zero, size: size))
}
}

func toURL() -> URL? {
// 로컬 임시 디렉토리에 저장할 파일 경로 생성
guard let data = self.jpegData(compressionQuality: 0.8) else { return nil }
let tempDirectory = FileManager.default.temporaryDirectory
let fileName = UUID().uuidString + ".jpg"
let fileURL = tempDirectory.appendingPathComponent(fileName)

do {
// UIImage 데이터를 파일로 저장
try data.write(to: fileURL)
return fileURL
} catch {
print("이미지를 로컬 파일로 저장하는 중 오류 발생: \(error.localizedDescription)")
return nil
}
}
}

// MARK: - UIImageView

extension UIImageView {
func setImage(from urlString: String?, placeholder: UIImage? = UIImage(named: "basic_profile_image")) {
// URL 검증 및 기본 이미지 설정
guard let urlString = urlString, !urlString.isEmpty else {
self.image = placeholder
return
}

// ImageLoader를 통해 이미지 로드
ImageLoader.shared.loadImage(from: urlString) { [weak self] loadedImage in
DispatchQueue.main.async {
self?.image = loadedImage ?? placeholder
}
}
}
}

// MARK: - DateFormatter
Expand Down Expand Up @@ -426,7 +390,7 @@ extension View {
// MARK: - UILabel

extension UILabel {

// "... 더보기" 관련 로직
func addTrailing(with trailingText: String, moreText: String, moreTextFont: UIFont, moreTextColor: UIColor) {
guard let text = self.text, !text.isEmpty else { return }

Expand Down
52 changes: 0 additions & 52 deletions Where_Are_You/Utils/ImageLoader.swift
View file

This file was deleted.

22 changes: 0 additions & 22 deletions Where_Are_You/Utils/ImageUtility.swift
View file

This file was deleted.

0 comments on commit dbd5853

Please sign in to comment.