diff --git a/SOPTving/SOPTving/Presentation/MainScene/VC/MainVC.swift b/SOPTving/SOPTving/Presentation/MainScene/VC/MainVC.swift deleted file mode 100644 index 34eeb77..0000000 --- a/SOPTving/SOPTving/Presentation/MainScene/VC/MainVC.swift +++ /dev/null @@ -1,153 +0,0 @@ -// -// MainVC.swift -// SOPTving -// -// Created by 장석우 on 2023/04/13. -// - -import UIKit - -import SnapKit -import Then - -final class MainVC: UIViewController { - - //MARK: - Properties - - var mainTitle: String? { - didSet { - updateUI() - } - } - - private var data: [String] = ["처음", "중간", "마지막"] - - private var currentNode : Node? { - didSet{ mainTitle = currentNode?.data } - } - private var dataLinkedList = LinkedList() - - //MARK: - UI Components - - private let profileLabel: UILabel = { - let label = UILabel() - label.font = .tvingSemiBold(ofSize: 20) - label.text = "asdf" - label.textColor = .white - return label - }() - - private lazy var prevButton = ButtonBuilder() - .setTitle("이전으로", - color: .white, - font: .tvingSemiBold(ofSize: 16)) - .setBackgroundColor(.systemBlue) - .setCornerRadius(12) - .setAction { [weak self] _ in - self?.prevButtonDidTap() - } - .build() - - private lazy var nextButton = ButtonBuilder() - .setTitle("다음으로", - color: .white, - font: .tvingSemiBold(ofSize: 16)) - .setBackgroundColor(.systemBlue) - .setCornerRadius(12) - .setAction { [weak self] _ in - self?.nextButtonDidTap() - } - .build() - - - //MARK: - Life Cycle - - override func viewDidLoad() { - super.viewDidLoad() - - style() - hierarchy() - layout() - - } - - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - - } - - override func viewDidAppear(_ animated: Bool) { - super.viewDidAppear(animated) - setData() - } - -} - -//MARK: - Methods - -extension MainVC { - - private func updateUI() { - profileLabel.text = mainTitle - } - - - //MARK: Public - - private func setData() { - dataLinkedList.append(data: data) - currentNode = dataLinkedList.getHead() - } - -} - -//MARK: - Action Method - -extension MainVC { - func nextButtonDidTap() { - currentNode = currentNode?.next - } - - func prevButtonDidTap() { - currentNode = currentNode?.prev - } -} - - - - - -//MARK: - UI & Layout - -extension MainVC { - - private func style() { - view.backgroundColor = .black - } - - private func hierarchy() { - view.addSubviews(profileLabel, prevButton, nextButton) - } - - private func layout() { - profileLabel.snp.makeConstraints { - $0.center.equalToSuperview() - } - - nextButton.snp.makeConstraints { - $0.centerX.equalToSuperview().offset(50) - $0.top.equalTo(profileLabel.snp.bottom).offset(100) - $0.height.equalTo(40) - $0.width.equalTo(80) - } - - prevButton.snp.makeConstraints { - $0.centerX.equalToSuperview().offset(-50) - $0.top.equalTo(profileLabel.snp.bottom).offset(100) - $0.height.equalTo(40) - $0.width.equalTo(80) - } - - } -} - diff --git a/SOPTving/SOPTving/Presentation/MainScene/View/MyPageProfileView.swift b/SOPTving/SOPTving/Presentation/MainScene/View/MyPageProfileView.swift index 7d6c935..ed7fd6c 100644 --- a/SOPTving/SOPTving/Presentation/MainScene/View/MyPageProfileView.swift +++ b/SOPTving/SOPTving/Presentation/MainScene/View/MyPageProfileView.swift @@ -94,31 +94,26 @@ final class MyPageProfileView: UIView { font: .tvingBold(ofSize: 16)) .build() - private lazy var memberShipStackView: UIStackView = { - let stackView = UIStackView(arrangedSubviews: [memberShipImageView, - memberShipLabel, - myMemberShipButton]) + private let memberShipStackView: UIStackView = { + let stackView = UIStackView() stackView.axis = .horizontal stackView.distribution = .fill - stackView.alignment = .center + stackView.alignment = .fill stackView.spacing = 8 - memberShipLabel.setContentHuggingPriority(.defaultLow, for: .horizontal) return stackView }() - private lazy var cashStackView: UIStackView = { - let stackView = UIStackView(arrangedSubviews: [cashImageView, - cashLabel, - myCashButton]) + private let cashStackView: UIStackView = { + let stackView = UIStackView() stackView.axis = .horizontal stackView.distribution = .fill - stackView.alignment = .center + stackView.alignment = .fill stackView.spacing = 8 return stackView }() - private lazy var darkStackView: UIStackView = { - let stackView = UIStackView(arrangedSubviews: [memberShipStackView, cashStackView]) + private let darkStackView: UIStackView = { + let stackView = UIStackView() stackView.axis = .vertical stackView.distribution = .equalCentering stackView.alignment = .fill @@ -169,6 +164,16 @@ extension MyPageProfileView { profileChangeButton, darkView) + memberShipStackView.addArrangedSubViews(memberShipImageView, + memberShipLabel, + myMemberShipButton) + + cashStackView.addArrangedSubViews(cashImageView, + cashLabel, + myCashButton) + + darkStackView.addArrangedSubViews(memberShipStackView, cashStackView) + darkView.addSubviews(darkStackView) } @@ -204,17 +209,17 @@ extension MyPageProfileView { memberShipImageView.snp.makeConstraints { $0.size.equalTo(23) } - + cashImageView.snp.makeConstraints { $0.size.equalTo(23) } memberShipLabel.snp.makeConstraints { - $0.width.lessThanOrEqualToSuperview().priority(200) + $0.width.greaterThanOrEqualTo(memberShipImageView) } cashLabel.snp.makeConstraints { - $0.width.lessThanOrEqualToSuperview().priority(200) + $0.width.greaterThanOrEqualTo(cashImageView) } } } diff --git a/SOPTving/SOPTving/Presentation/MainScene/ViewController/MyPageVC.swift b/SOPTving/SOPTving/Presentation/MainScene/ViewController/MyPageVC.swift index c3364e8..beab01a 100644 --- a/SOPTving/SOPTving/Presentation/MainScene/ViewController/MyPageVC.swift +++ b/SOPTving/SOPTving/Presentation/MainScene/ViewController/MyPageVC.swift @@ -111,10 +111,8 @@ extension MyPageVC { @objc private func backButtonDidTap() { - dismiss(animated: true) + navigationController?.popViewController(animated: true) } - - } //MARK: - UI & Layout