Skip to content

Commit

Permalink
[FIX] 레이아웃 수정 및 오타 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
ffalswo2 committed Jul 21, 2022
1 parent c6848f0 commit 0f99421
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,6 @@ extension HomeViewController: UICollectionViewDelegate {

func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {

if homeData.homieProfileList[indexPath.row].typeColor == "GRAY" { return }

if indexPath.row == homeData.homieProfileList.count {
UIPasteboard.general.string = homeData.roomCode
if let str = UIPasteboard.general.string {
Expand All @@ -136,6 +134,8 @@ extension HomeViewController: UICollectionViewDelegate {
return
}

if homeData.homieProfileList[indexPath.row].typeColor == "GRAY" { return }

if indexPath.section == HomeSection.profiles.rawValue {

let profileHomeVC = ProfileViewController(item: .profile)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,11 @@ final class PopUpViewController: UIViewController {
participantLabel.snp.makeConstraints { make in
make.top.equalTo(eventDateView.snp.bottom).offset(16)
make.leading.equalTo(popUpView).offset(24)
make.height.equalTo(24)
}

participantsCollectionView.snp.makeConstraints { make in
make.top.equalTo(participantLabel.snp.bottom)
make.top.equalTo(participantLabel.snp.bottom).offset(8)
make.leading.trailing.equalTo(popUpView)
}
}
Expand Down
2 changes: 1 addition & 1 deletion Hous-iOS/Hous-iOS/Screens/Tabbar/HousTabbar.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ final class HousTabbar: UIStackView {
}()

private let rulesItemView: HousTabbarItemView = {
let view = HousTabbarItemView(item: .rulse, index: 1)
let view = HousTabbarItemView(item: .rules, index: 1)
view.clipsToBounds = true
return view
}()
Expand Down
8 changes: 4 additions & 4 deletions Hous-iOS/Hous-iOS/Screens/Tabbar/HousTabbarItem.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import UIKit

enum HousTabbarItem: String, CaseIterable {
case home
case rulse
case rules
case profile
}

Expand All @@ -19,7 +19,7 @@ extension HousTabbarItem {
switch self {
case .home:
return UINavigationController(rootViewController: HomeViewController())
case .rulse:
case .rules:
return UINavigationController(rootViewController: RulesViewController())
case .profile:
return UINavigationController(rootViewController: ProfileViewController(item: .profile))
Expand All @@ -30,7 +30,7 @@ extension HousTabbarItem {
switch self {
case .home:
return R.Image.homeTabUnselected.withTintColor(.white.withAlphaComponent(0.4), renderingMode: .alwaysOriginal)
case .rulse:
case .rules:
return R.Image.rulesTabUnselected.withTintColor(.white.withAlphaComponent(0.4), renderingMode: .alwaysOriginal)
case .profile:
return R.Image.profileTabUnselected.withTintColor(.white.withAlphaComponent(0.4), renderingMode: .alwaysOriginal)
Expand All @@ -41,7 +41,7 @@ extension HousTabbarItem {
switch self {
case .home:
return R.Image.homeTabSelected
case .rulse:
case .rules:
return R.Image.rulesTabSelected
case .profile:
return R.Image.profileTabSelected
Expand Down

0 comments on commit 0f99421

Please sign in to comment.