diff --git a/Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj b/Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj index b0a0acf0..93fb542e 100644 --- a/Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj +++ b/Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj @@ -1710,7 +1710,7 @@ CODE_SIGN_ENTITLEMENTS = "Runnect-iOS/Runnect-iOSDebug.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.0.7; + CURRENT_PROJECT_VERSION = 1.0.8; DEVELOPMENT_TEAM = 8Q4H7X3Q58; GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = "Runnect-iOS/Info.plist"; @@ -1751,7 +1751,7 @@ CODE_SIGN_ENTITLEMENTS = "Runnect-iOS/Runnect-iOS.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.0.7; + CURRENT_PROJECT_VERSION = 1.0.8; DEVELOPMENT_TEAM = 8Q4H7X3Q58; GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = "Runnect-iOS/Info.plist"; diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner1.imageset/Contents.json b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner1.imageset/Contents.json index d0f1d61e..d2c7602e 100644 --- a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner1.imageset/Contents.json +++ b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner1.imageset/Contents.json @@ -1,15 +1,17 @@ { "images" : [ { - "filename" : "ios 1.png", + "filename" : "ios 앱 배너-1.png", "idiom" : "universal", "scale" : "1x" }, { + "filename" : "ios 앱 배너@2x.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "ios 앱 배너@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git "a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner1.imageset/ios \354\225\261 \353\260\260\353\204\210-1.png" "b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner1.imageset/ios \354\225\261 \353\260\260\353\204\210-1.png" new file mode 100644 index 00000000..7af08b70 Binary files /dev/null and "b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner1.imageset/ios \354\225\261 \353\260\260\353\204\210-1.png" differ diff --git "a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner3.imageset/ios \354\225\261 \353\260\260\353\204\210.png" "b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner1.imageset/ios \354\225\261 \353\260\260\353\204\210@2x.png" similarity index 100% rename from "Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner3.imageset/ios \354\225\261 \353\260\260\353\204\210.png" rename to "Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner1.imageset/ios \354\225\261 \353\260\260\353\204\210@2x.png" diff --git "a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner1.imageset/ios \354\225\261 \353\260\260\353\204\210@3x.png" "b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner1.imageset/ios \354\225\261 \353\260\260\353\204\210@3x.png" new file mode 100644 index 00000000..39f41b06 Binary files /dev/null and "b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner1.imageset/ios \354\225\261 \353\260\260\353\204\210@3x.png" differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner2.imageset/Contents.json b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner2.imageset/Contents.json index 2ff49d2e..d0f1d61e 100644 --- a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner2.imageset/Contents.json +++ b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner2.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "ios 2.png", + "filename" : "ios 1.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner1.imageset/ios 1.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner2.imageset/ios 1.png similarity index 100% rename from Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner1.imageset/ios 1.png rename to Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner2.imageset/ios 1.png diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner3.imageset/Contents.json b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner3.imageset/Contents.json index 68729475..2ff49d2e 100644 --- a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner3.imageset/Contents.json +++ b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner3.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "ios 앱 배너.png", + "filename" : "ios 2.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner2.imageset/ios 2.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner3.imageset/ios 2.png similarity index 100% rename from Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner2.imageset/ios 2.png rename to Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner3.imageset/ios 2.png diff --git a/Runnect-iOS/Runnect-iOS/Info.plist b/Runnect-iOS/Runnect-iOS/Info.plist index 6da05c70..5b9801d3 100644 --- a/Runnect-iOS/Runnect-iOS/Info.plist +++ b/Runnect-iOS/Runnect-iOS/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.0.7 + 1.0.8 CFBundleURLTypes diff --git a/Runnect-iOS/Runnect-iOS/Network/Dto/CourseDetailDto/ResponseDto/CourseDetailScrapCountDto.swift b/Runnect-iOS/Runnect-iOS/Network/Dto/CourseDetailDto/ResponseDto/CourseDetailScrapCountDto.swift index 25950623..92fa3e72 100644 --- a/Runnect-iOS/Runnect-iOS/Network/Dto/CourseDetailDto/ResponseDto/CourseDetailScrapCountDto.swift +++ b/Runnect-iOS/Runnect-iOS/Network/Dto/CourseDetailDto/ResponseDto/CourseDetailScrapCountDto.swift @@ -10,4 +10,10 @@ import Foundation struct CourseDetailScrapCountDto: Codable { let scrapCount: Int + + let publicCourse: Int? + let scarpTF: Bool? + /* + 코스 아이디와, 스크랩 TF는 사용 안함, 필요시 사용 + */ } diff --git a/Runnect-iOS/Runnect-iOS/Network/Dto/CourseDiscoveryDto/ResponseDto/PickedMapListResponseDto.swift b/Runnect-iOS/Runnect-iOS/Network/Dto/CourseDiscoveryDto/ResponseDto/PickedMapListResponseDto.swift index c242cb62..81316ea9 100644 --- a/Runnect-iOS/Runnect-iOS/Network/Dto/CourseDiscoveryDto/ResponseDto/PickedMapListResponseDto.swift +++ b/Runnect-iOS/Runnect-iOS/Network/Dto/CourseDiscoveryDto/ResponseDto/PickedMapListResponseDto.swift @@ -10,8 +10,8 @@ import Foundation // MARK: - PickedMapListResponseDto struct PickedMapListResponseDto: Codable { - let totalPageSize: Int - let isEnd: Bool + let totalPageSize: Int? + let isEnd: Bool? let publicCourses: [PublicCourse] } diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/AdImageCollectionViewCell.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/AdImageCollectionViewCell.swift index 44cb6bd7..9993e4bc 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/AdImageCollectionViewCell.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/AdImageCollectionViewCell.swift @@ -31,7 +31,7 @@ final class AdImageCollectionViewCell: UICollectionViewCell, UIScrollViewDelegat final let collectionViewInset = UIEdgeInsets(top: 28, left: 16, bottom: 28, right: 16) // MARK: - UI Components - var imgBanners: [UIImage] = [ImageLiterals.imgBanner3, ImageLiterals.imgBanner1, ImageLiterals.imgBanner2] + var imgBanners: [UIImage] = [ImageLiterals.imgBanner1, ImageLiterals.imgBanner2, ImageLiterals.imgBanner3] var currentPage: Int = 0 private var timer: Timer? @@ -128,19 +128,20 @@ extension AdImageCollectionViewCell: UICollectionViewDelegate, UICollectionViewD imageView.isUserInteractionEnabled = true cell.contentView.addSubviews(imageView) - if indexPath.item == 0 { - let tapGesture = UITapGestureRecognizer(target: self, action: #selector(firstCellTapped(_:))) - imageView.addGestureRecognizer(tapGesture) - } + // 터치 이벤트 임시 제거 + // if indexPath.item == 0 { + // let tapGesture = UITapGestureRecognizer(target: self, action: #selector(firstCellTapped(_:))) + // imageView.addGestureRecognizer(tapGesture) + // } return cell } // 첫 번째 셀 클릭 이벤트 핸들러 - @objc func firstCellTapped(_ gesture: UITapGestureRecognizer) { - // Safari 링크로 연결 - if let url = URL(string: "https://docs.google.com/forms/d/1cpgZHNNi1kIvi2ZCwCIcMJcI1PkHBz9a5vWJb7FfIbg/edit") { - UIApplication.shared.open(url) - } - } + // @objc func firstCellTapped(_ gesture: UITapGestureRecognizer) { + // // Safari 링크로 연결 + // if let url = URL(string: "https://docs.google.com/forms/d/1cpgZHNNi1kIvi2ZCwCIcMJcI1PkHBz9a5vWJb7FfIbg/edit") { + // UIApplication.shared.open(url) + // } + // } } diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseDiscoveryVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseDiscoveryVC.swift index f5e0c9f8..fd952add 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseDiscoveryVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseDiscoveryVC.swift @@ -207,7 +207,7 @@ extension CourseDiscoveryVC { } uploadButton.snp.makeConstraints { make in - make.trailing.equalTo(self.view.safeAreaLayoutGuide).inset(22) + make.trailing.equalTo(self.view.safeAreaLayoutGuide).inset(21) make.bottom.equalTo(self.view.safeAreaLayoutGuide).inset(20) make.height.equalTo(40) make.width.equalTo(92) @@ -216,7 +216,6 @@ extension CourseDiscoveryVC { miniUploadButton.snp.makeConstraints { make in make.trailing.equalTo(self.view.safeAreaLayoutGuide).inset(22) make.bottom.equalTo(self.view.safeAreaLayoutGuide).inset(20) - make.width.height.equalTo(41) } emptyView.snp.makeConstraints { make in @@ -490,8 +489,11 @@ extension CourseDiscoveryVC { do { let responseDto = try result.map(BaseResponse.self) guard let data = responseDto.data else { return } - self.totalPageNum = data.totalPageSize - self.isEnd = data.isEnd + + guard let totalPageNum = data.totalPageSize, let isEnd = data.isEnd else { return } + self.totalPageNum = totalPageNum + self.isEnd = isEnd + self.courseList.append(contentsOf: data.publicCourses) self.mapCollectionView.reloadData() print("pageNo= \(pageNo), isEnd= \(self.isEnd), totalPageNum= \(self.totalPageNum)") diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseStorage/Views/CVC/CourseListCVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseStorage/Views/CVC/CourseListCVC.swift index 4dbca07b..dace27f1 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseStorage/Views/CVC/CourseListCVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseStorage/Views/CVC/CourseListCVC.swift @@ -150,6 +150,8 @@ extension CourseListCVC { extension CourseListCVC { private func setUI() { self.contentView.backgroundColor = .w1 + self.courseImageView.layer.borderColor = UIColor(hex: "EAEAEA").cgColor /// 모든 코스 테두리 1px 요구사항 + self.courseImageView.layer.borderWidth = 1.0 } private func setLayout() {