Skip to content

Commit

Permalink
Merge pull request #408 from rlarjsdn3/fix/#407-Grabber이-어색하게-보이는-문제-수정
Browse files Browse the repository at this point in the history
fix: 시트 Grabber이 어색하게 보이는 문제 수정
  • Loading branch information
rlarjsdn3 authored Feb 14, 2024
2 parents 349c420 + 10369d2 commit da07435
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ final class FamilyMemberProfileCell: BaseTableViewCell<FamilyMemberProfileCellRe
override func setupAttributes() {
super.setupAttributes()

self.selectionStyle = .none
self.backgroundColor = .clear

containerView.do {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ public final class FamilyManagementViewController: BaseViewController<FamilyMana
.filter { !$0.isEmpty }
.withUnretained(self)
.subscribe {
debugPrint("MyMemberId: \($0.1)")
let privacyVC = PrivacyDIContainer(memberId: $0.1).makeViewController()
$0.0.navigationController?.pushViewController(privacyVC, animated: true)
}
Expand Down Expand Up @@ -123,7 +122,7 @@ public final class FamilyManagementViewController: BaseViewController<FamilyMana

familyMember
.drive(with: self, onNext: { owner, _ in
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
owner.refreshControl.endRefreshing()
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ final class HomeViewController: BaseViewController<HomeViewReactor>, UICollectio
$0.showsVerticalScrollIndicator = false
$0.backgroundColor = .clear
$0.refreshControl = refreshControl
$0.refreshControl?.tintColor = UIColor.bibbiWhite
$0.register(FeedCollectionViewCell.self, forCellWithReuseIdentifier: FeedCollectionViewCell.id)
}

Expand Down Expand Up @@ -259,7 +260,11 @@ extension HomeViewController {
.withUnretained(self)
.observe(on: MainScheduler.instance)
.withUnretained(self)
.bind(onNext: { $0.0.refreshControl.endRefreshing() })
.bind(onNext: { owner, _ in
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
owner.refreshControl.endRefreshing()
}
})
.disposed(by: disposeBag)

reactor.pulse(\.$postSection)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import RxSwift
import RxDataSources

final class ReactionMembersViewController: BaseViewController<ReactionMemberViewReactor> {
private let grabber: UIView = UIView()

private let reactionImageView: UIImageView = UIImageView()
private let reactionBadgeView: UIImageView = UIImageView()
private let reactionLabel: UILabel = BibbiLabel(.body1Bold)
Expand Down Expand Up @@ -61,13 +63,20 @@ final class ReactionMembersViewController: BaseViewController<ReactionMemberView
override func setupUI() {
super.setupUI()

view.addSubviews(reactionImageView, reactionBadgeView, reactionLabel,
view.addSubviews(grabber, reactionImageView, reactionBadgeView, reactionLabel,
memberTableView, closeButton)
}

override func setupAutoLayout() {
super.setupAutoLayout()

grabber.snp.makeConstraints {
$0.width.equalTo(36)
$0.height.equalTo(5.08)
$0.centerX.equalToSuperview()
$0.top.equalToSuperview().offset(6)
}

reactionImageView.snp.makeConstraints {
$0.size.equalTo(66)
$0.centerX.equalToSuperview()
Expand Down Expand Up @@ -101,6 +110,12 @@ final class ReactionMembersViewController: BaseViewController<ReactionMemberView
override func setupAttributes() {
super.setupAttributes()

grabber.do {
$0.layer.masksToBounds = true
$0.layer.cornerRadius = 5.08 / 2.0
$0.backgroundColor = UIColor.gray500
}

reactionImageView.do {
$0.clipsToBounds = true
$0.layer.cornerRadius = 33
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ extension ReactionViewController {
} else {
sheet.detents = [ .medium(), .large()]
}
sheet.prefersGrabberVisible = true
sheet.prefersGrabberVisible = false
}

self.present(viewController, animated: true)
Expand Down

0 comments on commit da07435

Please sign in to comment.