Skip to content
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.

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

[Fix] #159 - 피드뷰 레이아웃 수정 #163

Merged
merged 5 commits into from
Jan 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
Expand Down
3 changes: 2 additions & 1 deletion Spark-iOS/Spark-iOS/Source/Cells/Feed/FeedCVC.swift
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ extension FeedCVC {
profileImageView.layer.masksToBounds = true
profileImageView.contentMode = .scaleAspectFill
feedImageView.contentMode = .scaleAspectFill
feedImageView.layer.masksToBounds = true

sparkLabel.text = "받은 스파크"

Expand Down Expand Up @@ -193,7 +194,7 @@ extension FeedCVC {

feedImageView.snp.makeConstraints { make in
make.top.leading.trailing.equalToSuperview()
make.height.equalTo(feedImageView.snp.width).multipliedBy(1.0 / 1.0)
make.height.equalTo(self.snp.width).multipliedBy(1.0 / 1.0)
}

fadeImageView.snp.makeConstraints { make in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class AuthTimerVC: UIViewController {
super.viewWillAppear(animated)

navigationController?.isNavigationBarHidden = true
navigationController?.interactivePopGestureRecognizer?.delegate = nil
}

// MARK: - Methods
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,22 @@ class CreateRoomVC: UIViewController {

// MARK: - View Life Cycles

override func viewWillAppear(_ animated: Bool) {
navigationController?.isNavigationBarHidden = true
}

override func viewDidLoad() {
super.viewDidLoad()

setUI()
setLayout()
setNotification()
setAddTarget()
}

override func viewWillAppear(_ animated: Bool) {
navigationController?.isNavigationBarHidden = true
navigationController?.interactivePopGestureRecognizer?.delegate = nil
}

// MARK: - Methods

private func setUI() {
// navigationController?.initWithLeftButtonTitle(title: "aa",
// tintColor: .sparkBlack,
// backgroundColor: .white,
// image: UIImage(named: "icQuit"),
// selector: #selector(touchCloseButton))

closeButton.setImage(UIImage(named: "icQuit"), for: .normal)

titleLabel.text = "어떤 습관방을 만들건가요?"
Expand Down Expand Up @@ -213,5 +207,4 @@ extension CreateRoomVC: UITextFieldDelegate {
disableButton()
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ class CompleteAuthVC: UIViewController {
// MARK: IBActions
@IBAction func goToFeedVC(_ sender: Any) {
guard let presentingVC = self.presentingViewController?.presentingViewController as? UITabBarController else { return }
guard let naviVC = presentingVC.viewControllers?[1] as? UINavigationController else { return }

self.presentingViewController?.presentingViewController?.dismiss(animated: false) {
presentingVC.dismiss(animated: false) {
naviVC.popViewController(animated: false)
presentingVC.selectedIndex = 0
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ class HabitRoomVC: UIViewController {
extension HabitRoomVC {
private func setUI() {
navigationController?.isNavigationBarHidden = true
navigationController?.interactivePopGestureRecognizer?.delegate = nil

tabBarController?.tabBar.isHidden = true
NotificationCenter.default.post(name: .disappearFloatingButton, object: nil)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@ class FeedVC: UIViewController {
NotificationCenter.default.post(name: .disappearFloatingButton, object: nil)
tabBarController?.tabBar.isHidden = false
// FIXME: - getFeedListFetchWithAPI를 여기서 호출하는거로 변경
// collectionView.scrollToItem(at: IndexPath(item: 0, section: 0), at: .bottom, animated: false)
// DispatchQueue.main.async {
// self.getFeedListFetchWithAPI(lastID: self.feedLastID) {
// self.collectionView.scrollToItem(at: IndexPath(item: 0, section: 0), at: .bottom, animated: false)
// }
// }
}

// MARK: - Methods
Expand Down