Skip to content

[Fix] #146 - 1차릴리즈qa반영 #149

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
merged 6 commits into from
May 19, 2023
Merged

[Fix] #146 - 1차릴리즈qa반영 #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
86bf5de
[Fix] #134 - 배너 슬라이드 자동으로 변경
lee-yeonwoo2 May 19, 2023
81f53e4
git pull develop
lee-yeonwoo2 May 19, 2023
04f3126
[Fix] #134 - 린트 에러 반영
lee-yeonwoo2 May 19, 2023
5105159
[Fix] #146 - 린트 에러 반영
lee-yeonwoo2 May 19, 2023
b4b5d25
[Fix] #146 - handlevisitor 코드 추가
lee-yeonwoo2 May 19, 2023
ad30afe
Merge remote-tracking branch 'origin/#146-1차릴리즈QA반영' into #146-1차릴리즈QA반영
lee-yeonwoo2 May 19, 2023
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
1 change: 1 addition & 0 deletions Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ extension CourseDetailVC {
}

@objc func startButtonDidTap() {
guard handleVisitor() else { return }
guard let courseId = self.courseId else { return }
getCourseDetailWithPath(courseId: courseId)
}
Expand Down
50 changes: 16 additions & 34 deletions Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/AdImageCollectionViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class AdImageCollectionViewCell: UICollectionViewCell {
let collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
collectionView.backgroundColor = .clear
collectionView.translatesAutoresizingMaskIntoConstraints = false
collectionView.isScrollEnabled = false
collectionView.isScrollEnabled = true
collectionView.showsVerticalScrollIndicator = false
return collectionView
}()
Expand All @@ -31,6 +31,7 @@ class AdImageCollectionViewCell: UICollectionViewCell {
// MARK: - UI Components
var imgBanners: [UIImage] = [ImageLiterals.imgBanner1, ImageLiterals.imgBanner2, ImageLiterals.imgBanner3]
var currentPage: Int = 0
private var timer: Timer?

private var pageControl = UIPageControl()
// MARK: - Life cycle
Expand Down Expand Up @@ -58,46 +59,27 @@ extension AdImageCollectionViewCell {

// 초기 페이지 설정
currentPage = imgBanners.count
timer = Timer.scheduledTimer(timeInterval: 5.0, target: self, selector: #selector(animateBannerSlide), userInfo: nil, repeats: true)

// 제스처 인식기 추가
let swipeLeftGesture = UISwipeGestureRecognizer(target: self, action: #selector(handleSwipeGesture(_:)))
swipeLeftGesture.direction = .left
bannerCollectionView.addGestureRecognizer(swipeLeftGesture)

let swipeRightGesture = UISwipeGestureRecognizer(target: self, action: #selector(handleSwipeGesture(_:)))
swipeRightGesture.direction = .right
bannerCollectionView.addGestureRecognizer(swipeRightGesture)

// 페이지 컨트롤 설정
pageControl.currentPage = 0
pageControl.numberOfPages = imgBanners.count
pageControl.pageIndicatorTintColor = .lightGray // 페이지를 암시하는 동그란 점의 색상
pageControl.currentPageIndicatorTintColor = .white
}

@objc func handleSwipeGesture(_ gesture: UISwipeGestureRecognizer) {
// 배너를 스와이프하여 수동으로 슬라이드
if gesture.direction == .left {
currentPage += 1
} else if gesture.direction == .right {
currentPage -= 1
}
// 첫 번째 배너에서 이전으로 스와이프하면 마지막 배너로 이동
if currentPage < 0 {
currentPage = imgBanners.count * 2 - 1
}

// 마지막 배너에서 다음으로 스와이프하면 첫 번째 배너로 이동
if currentPage >= imgBanners.count * 2 {
currentPage = 0
}

let indexPath = IndexPath(item: currentPage, section: 0)
bannerCollectionView.scrollToItem(at: indexPath, at: .centeredHorizontally, animated: true)

updatePageControl()
}

@objc func animateBannerSlide() {
currentPage += 1

if currentPage >= imgBanners.count {
currentPage = 0
}

let indexPath = IndexPath(item: currentPage, section: 0)
bannerCollectionView.scrollToItem(at: indexPath, at: .centeredHorizontally, animated: true)

pageControl.currentPage = currentPage
}

// 페이지 컨트롤 업데이트
func updatePageControl() {
let currentIndex = currentPage % imgBanners.count
Expand Down
3 changes: 1 addition & 2 deletions Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/MapCollectionViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import SnapKit
import Then

class MapCollectionViewCell: UICollectionViewCell {



// MARK: - collectionview

private lazy var mapCollectionView: UICollectionView = {
Expand Down
1 change: 0 additions & 1 deletion Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseDiscoveryVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ final class CourseDiscoveryVC: UIViewController {
private var courseList = [PublicCourse]()



// MARK: - UIComponents

private lazy var naviBar = CustomNavigationBar(self, type: .title).setTitle("코스 발견")
Expand Down