diff --git a/Hous-iOS/Hous-iOS/Screens/Home/ViewController/HomeViewController.swift b/Hous-iOS/Hous-iOS/Screens/Home/ViewController/HomeViewController.swift index ddbe0f3..674da6c 100644 --- a/Hous-iOS/Hous-iOS/Screens/Home/ViewController/HomeViewController.swift +++ b/Hous-iOS/Hous-iOS/Screens/Home/ViewController/HomeViewController.swift @@ -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 { @@ -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) diff --git a/Hous-iOS/Hous-iOS/Screens/Home/ViewController/PopUpViewController.swift b/Hous-iOS/Hous-iOS/Screens/Home/ViewController/PopUpViewController.swift index e53ed0a..c8fc1ac 100644 --- a/Hous-iOS/Hous-iOS/Screens/Home/ViewController/PopUpViewController.swift +++ b/Hous-iOS/Hous-iOS/Screens/Home/ViewController/PopUpViewController.swift @@ -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) } } diff --git a/Hous-iOS/Hous-iOS/Screens/Tabbar/HousTabbar.swift b/Hous-iOS/Hous-iOS/Screens/Tabbar/HousTabbar.swift index bd122f4..00a3327 100644 --- a/Hous-iOS/Hous-iOS/Screens/Tabbar/HousTabbar.swift +++ b/Hous-iOS/Hous-iOS/Screens/Tabbar/HousTabbar.swift @@ -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 }() diff --git a/Hous-iOS/Hous-iOS/Screens/Tabbar/HousTabbarItem.swift b/Hous-iOS/Hous-iOS/Screens/Tabbar/HousTabbarItem.swift index 450a925..dd3b306 100644 --- a/Hous-iOS/Hous-iOS/Screens/Tabbar/HousTabbarItem.swift +++ b/Hous-iOS/Hous-iOS/Screens/Tabbar/HousTabbarItem.swift @@ -10,7 +10,7 @@ import UIKit enum HousTabbarItem: String, CaseIterable { case home - case rulse + case rules case profile } @@ -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)) @@ -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) @@ -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