diff --git a/Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift b/Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift index 95e00765..9c926c77 100644 --- a/Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift +++ b/Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift @@ -84,7 +84,6 @@ enum ImageLiterals { static var imgBanner1: UIImage { .load(named: "img_banner1") } static var imgBanner2: UIImage { .load(named: "img_banner2") } static var imgBanner3: UIImage { .load(named: "img_banner3") } - static var imgBanner4: UIImage { .load(named: "img_banner4") } static var imgAppleLogin: UIImage { .load(named: "img_apple_login")} static var imgKakaoLogin: UIImage { .load(named: "img_kakao_login")} } diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_plus_button.imageset/Component 125.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_plus_button.imageset/Component 125.png index 3977ac91..4cfa9102 100644 Binary files a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_plus_button.imageset/Component 125.png and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_plus_button.imageset/Component 125.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_plus_button.imageset/Component 125@2x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_plus_button.imageset/Component 125@2x.png index 9f726101..abfe4bf7 100644 Binary files a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_plus_button.imageset/Component 125@2x.png and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_plus_button.imageset/Component 125@2x.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_plus_button.imageset/Component 125@3x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_plus_button.imageset/Component 125@3x.png index ef3a8038..c1699ce9 100644 Binary files a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_plus_button.imageset/Component 125@3x.png and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_plus_button.imageset/Component 125@3x.png differ 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 new file mode 100644 index 00000000..68729475 --- /dev/null +++ b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner3.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "ios 앱 배너.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} 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_banner3.imageset/ios \354\225\261 \353\260\260\353\204\210.png" new file mode 100644 index 00000000..75be90eb Binary files /dev/null and "b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_banner3.imageset/ios \354\225\261 \353\260\260\353\204\210.png" differ diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift index 6f3948e9..967c730a 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift @@ -425,7 +425,7 @@ extension CourseDetailVC { scrapCountLabel.snp.makeConstraints { $0.top.equalTo(likeButton.snp.bottom).offset(2) - $0.leading.equalToSuperview().offset(26) + $0.leading.equalToSuperview().offset(28) $0.width.equalTo(20) $0.height.equalTo(13) } diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/AdImageCollectionViewCell.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/AdImageCollectionViewCell.swift index 8b9ff2c2..44cb6bd7 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.imgBanner1, ImageLiterals.imgBanner2] + var imgBanners: [UIImage] = [ImageLiterals.imgBanner3, ImageLiterals.imgBanner1, ImageLiterals.imgBanner2] var currentPage: Int = 0 private var timer: Timer? diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/TitleCollectionViewCell.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/TitleCollectionViewCell.swift index e5dd62e0..64efdf24 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/TitleCollectionViewCell.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/TitleCollectionViewCell.swift @@ -115,12 +115,12 @@ extension TitleCollectionViewCell { dateSortButton.snp.makeConstraints { $0.top.equalTo(divideView.snp.bottom).offset(54) - $0.leading.equalTo(titleStackView.snp.trailing).offset(57) + $0.trailing.equalTo(scrapSortButton.snp.leading).offset(-16) } scrapSortButton.snp.makeConstraints { $0.top.equalTo(divideView.snp.bottom).offset(54) - $0.leading.equalTo(dateSortButton.snp.trailing).offset(8) + $0.trailing.equalToSuperview().offset(-16) } } } 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 a117969a..f5e0c9f8 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseDiscoveryVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseDiscoveryVC.swift @@ -207,14 +207,14 @@ extension CourseDiscoveryVC { } uploadButton.snp.makeConstraints { make in - make.trailing.equalTo(self.view.safeAreaLayoutGuide).inset(16) + make.trailing.equalTo(self.view.safeAreaLayoutGuide).inset(22) make.bottom.equalTo(self.view.safeAreaLayoutGuide).inset(20) make.height.equalTo(40) make.width.equalTo(92) } miniUploadButton.snp.makeConstraints { make in - make.leading.equalTo(self.view.safeAreaLayoutGuide).inset(276) + make.trailing.equalTo(self.view.safeAreaLayoutGuide).inset(22) make.bottom.equalTo(self.view.safeAreaLayoutGuide).inset(20) make.width.height.equalTo(41) }