Skip to content

[FIX] 사진이 한장일 때 무한 스크롤을 방지하도록 수정 #100

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
0Hooni merged 7 commits into from
Apr 5, 2025
Merged

[FIX] 사진이 한장일 때 무한 스크롤을 방지하도록 수정 #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d613755
fix/#82: 패키지 오류 해결
0Hooni Apr 4, 2025
17ac190
style/#82: 코드 스타일에 맞게 상단 주석 제거
0Hooni Apr 4, 2025
612fbde
fix/#82: 상단 배너에 사진이 한장일 때 무한 스크롤 및 스크롤 방지
0Hooni Apr 4, 2025
68e8644
fix/#82: 배너 사진이 1장일 때 델리게이트 메서드 로직 문제 해결
0Hooni Apr 4, 2025
7ce8f30
docs/#82: 이슈 해결 중 추가 발견한 문제 주석 추가
0Hooni Apr 4, 2025
aa8e7c1
Merge branch 'dev' into fix/#82-block-swipe-when-carousel-have-one-image
0Hooni Apr 5, 2025
4b8a89b
style/#82: Apply SwiftLint autocorrect
github-actions[bot] Apr 5, 2025
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
8 changes: 4 additions & 4 deletions 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.

7 changes: 0 additions & 7 deletions Poppool/Poppool/Presentation/Scene/Detail/DetailController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
//
// DetailController.swift
// Poppool
//
// Created by SeoJunYoung on 12/9/24.
//

import UIKit

import ReactorKit
Expand Down
7 changes: 0 additions & 7 deletions Poppool/Poppool/Presentation/Scene/Home/Main/HomeController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
//
// HomeController.swift
// Poppool
//
// Created by SeoJunYoung on 11/28/24.
//

import UIKit

import ReactorKit
Expand Down
7 changes: 0 additions & 7 deletions Poppool/Poppool/Presentation/Scene/Home/Main/HomeReactor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
//
// HomeReactor.swift
// Poppool
//
// Created by SeoJunYoung on 11/28/24.
//

import UIKit

import ReactorKit
Expand Down
35 changes: 18 additions & 17 deletions ...n/Scene/Home/Main/View/ImageBannerSection/ImageBannerSection/ImageBannerSectionCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
//
// ImageBannerSectionCell.swift
// Poppool
//
// Created by SeoJunYoung on 11/28/24.
//

import UIKit

import RxSwift
Expand Down Expand Up @@ -91,6 +84,8 @@ final class ImageBannerSectionCell: UICollectionViewCell {
autoScrollTimer = nil
}

// FIXME: (홈 -> 상세) 이동 시 홈의 자동 스크롤이 계속 돌아감.
// FIXME: 또한 오토 스크롤을 한번만 실행하면 되는데, 사진이 넘어갈 때 마다 실행되는것으로 보임
func startAutoScroll(interval: TimeInterval = 3.0) {
stopAutoScroll() // 기존 타이머를 중지
stopButton.isHidden = false
Expand Down Expand Up @@ -206,16 +201,20 @@ extension ImageBannerSectionCell: Inputable {
if imageSection.isEmpty {
pageControl.setNumberOfPages(input.imagePaths.count)
let datas = zip(input.imagePaths, input.idList)
let backContents = datas.suffix(1)
let frontContents = datas.prefix(1)
imageSection.inputDataList = datas.map { .init(imagePath: $0.0, id: $0.1) }
imageSection.inputDataList.append(contentsOf: frontContents.map { .init(imagePath: $0.0, id: $0.1) })
imageSection.inputDataList = backContents.map {.init(imagePath: $0.0, id: $0.1) } + imageSection.inputDataList
DispatchQueue.main.async { [weak self] in
self?.contentCollectionView.scrollToItem(
at: .init(row: 1, section: 0),
at: .centeredHorizontally, animated: false
)
if input.imagePaths.count > 1 {
let backContents = datas.suffix(1)
let frontContents = datas.prefix(1)
imageSection.inputDataList = datas.map { .init(imagePath: $0.0, id: $0.1) }
imageSection.inputDataList.append(contentsOf: frontContents.map { .init(imagePath: $0.0, id: $0.1) })
imageSection.inputDataList = backContents.map { .init(imagePath: $0.0, id: $0.1) } + imageSection.inputDataList
DispatchQueue.main.async { [weak self] in
self?.contentCollectionView.scrollToItem(
at: .init(row: 1, section: 0),
at: .centeredHorizontally, animated: false
)
}
} else {
imageSection.inputDataList = datas.map { .init(imagePath: $0.0, id: $0.1) }
}
}

Expand Down Expand Up @@ -264,6 +263,8 @@ extension ImageBannerSectionCell: UICollectionViewDelegate, UICollectionViewData
}

func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
guard imageSection.dataCount > 1 else { return }

if currentIndex == 0 {
contentCollectionView.scrollToItem(
at: .init(row: imageSection.dataCount - 2, section: 0),
Expand Down