Skip to content

Commit

Permalink
Merge pull request #29 from MyChore/fix/28-fileFix-ui
Browse files Browse the repository at this point in the history 
#28 fix: ChoreAdd ui 변경
  • Loading branch information
@yoogangee
yoogangee authored Aug 21, 2023
2 parents e82d539 + b057d8a commit 1889517
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 133 deletions.
47 changes: 22 additions & 25 deletions MyChore/MyChore/Presentation/View/ChoreAdd/ChoreAddMainViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,21 @@ import UIKit

import SnapKit

class ChoreAddMainViewController: UIViewController {
protocol SendDelegate: AnyObject {
func sendManager(manager: String)
func sendFurniture(furniture: String)
}

class ChoreAddMainViewController: UIViewController, SendDelegate {

func sendFurniture(furniture: String) {
self.furnitureSelectedLabel.text = furniture
}

func sendManager(manager: String) {
self.managerSelectedLabel.text = manager
}


override func viewDidLoad() {
super.viewDidLoad()
Expand All @@ -23,24 +37,21 @@ class ChoreAddMainViewController: UIViewController {

// 네비게이션바
func initNavigation() {
let backButton = UIBarButtonItem(image: UIImage(named: "icon_back"), style: .plain, target: self, action: #selector(backMainPage))
backButton.tintColor = UIColor.mcGrey800

let titleLabel = UILabel()
titleLabel.text = "집안일 추가"
titleLabel.font = UIFont.systemFont(ofSize: 20, weight: .semibold)

let doneButton = UIBarButtonItem(title: "완료", style: .done, target: self, action: #selector(sendData))


self.navigationItem.leftBarButtonItem = backButton
self.navigationItem.titleView = titleLabel
self.navigationItem.rightBarButtonItem = doneButton
self.navigationItem.rightBarButtonItem?.tintColor = UIColor.mcMainGreen
}

@objc func backMainPage() {
print("페이지 pop") // pop 표시
self.navigationController?.popViewController(animated: true)
}

@objc func sendData() {
Expand Down Expand Up @@ -138,7 +149,7 @@ class ChoreAddMainViewController: UIViewController {

@objc private func furnitureSelect() {
let furnitureSelectVC = FurnitureSelectViewController()

furnitureSelectVC.delegate = self
self.navigationController?.pushViewController(furnitureSelectVC, animated: true)
}

Expand Down Expand Up @@ -291,7 +302,7 @@ class ChoreAddMainViewController: UIViewController {

@objc private func managerSelect() {
let managerSelectVC = ManagerSelectViewController()

managerSelectVC.delegate = self
self.navigationController?.pushViewController(managerSelectVC, animated: true)
}

Expand Down Expand Up @@ -493,25 +504,11 @@ class ChoreAddMainViewController: UIViewController {
make.right.equalTo(self.view.safeAreaLayoutGuide).offset(-24)
}
}
}
/*
import SwiftUI

struct ViewControllerRepresentable: UIViewControllerRepresentable {
typealias UIViewControllerType = ChoreAddMainViewController //뷰 컨트롤러 이름

func makeUIViewController(context: Context) -> ChoreAddMainViewController {
return ChoreAddMainViewController() // 뷰컨트롤러 이름
@objc func handleTap(sender: UITapGestureRecognizer) {
if sender.state == .ended {
view.endEditing(true)
}

func updateUIViewController(_ uiViewController: ChoreAddMainViewController, context: Context) {
}
}

@available(iOS 16.0.0, *)
struct ViewPreview: PreviewProvider {
static var previews: some View {
ViewControllerRepresentable()
sender.cancelsTouchesInView = false
}
}
*/
54 changes: 31 additions & 23 deletions MyChore/MyChore/Presentation/View/ChoreAdd/FurnitureSelectViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ class FurnitureSelectViewController: UIViewController, UICollectionViewDelegate

let testdata = F_Test.data

var selectedFurniture = ""
var furniture: String?
weak var delegate: SendDelegate?


override func viewDidLoad() {
super.viewDidLoad()

Expand All @@ -43,6 +48,11 @@ class FurnitureSelectViewController: UIViewController, UICollectionViewDelegate
}
}

// override func viewDidAppear(_ animated: Bool) {
//
// ChoreAddViewModel.shared.getGroup()
// }

private let furnitureCollectionView = UICollectionView(frame: .zero, collectionViewLayout: UICollectionViewFlowLayout())

func initNavigation() {
Expand All @@ -68,7 +78,9 @@ class FurnitureSelectViewController: UIViewController, UICollectionViewDelegate
}

@objc func sendData() {
self.delegate?.sendFurniture(furniture: selectedFurniture)
print("페이지 pop")
self.navigationController?.popViewController(animated: true)
}
}

Expand All @@ -88,6 +100,12 @@ extension FurnitureSelectViewController: UICollectionViewDataSource {
cell.backgroundColor = .mcGrey200
return cell
}

func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
selectedFurniture = testdata[indexPath.row].furniture
}


}

extension FurnitureSelectViewController: UICollectionViewDelegateFlowLayout {
Expand All @@ -113,6 +131,19 @@ class FurnitureCollectionViewCell: UICollectionViewCell {
setConstraints()
}

override var isSelected: Bool {
didSet {
if isSelected == true {
furnitureLabel.textColor = UIColor.mcMainGreen
backgroundColor = UIColor.mcSubGreen100
}
else {
furnitureLabel.textColor = UIColor.black
backgroundColor = UIColor.mcGrey200
}
}
}

required init?(coder: NSCoder) {
super.init(coder: coder)
setUpCell()
Expand All @@ -131,26 +162,3 @@ class FurnitureCollectionViewCell: UICollectionViewCell {
}
}
}


/*
import SwiftUI

struct ViewControllerRepresentable: UIViewControllerRepresentable {
typealias UIViewControllerType = FurnitureSelectViewController //뷰 컨트롤러 이름

func makeUIViewController(context: Context) -> FurnitureSelectViewController {
return FurnitureSelectViewController() // 뷰컨트롤러 이름
}

func updateUIViewController(_ uiViewController: FurnitureSelectViewController, context: Context) {
}
}

@available(iOS 16.0.0, *)
struct ViewPreview: PreviewProvider {
static var previews: some View {
ViewControllerRepresentable()
}
}
*/
46 changes: 25 additions & 21 deletions MyChore/MyChore/Presentation/View/ChoreAdd/ManagerSelectViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ class ManagerSelectViewController: UIViewController {

let testdata = M_Test.data

var selectedManager = ""
var manager: String?
weak var delegate: SendDelegate?

override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = UIColor.white
Expand Down Expand Up @@ -70,8 +74,11 @@ class ManagerSelectViewController: UIViewController {
}

@objc func sendData() {
self.delegate?.sendManager(manager: selectedManager)
print("페이지 pop")
self.navigationController?.popViewController(animated: true)
}

}

extension ManagerSelectViewController: UICollectionViewDataSource {
Expand All @@ -90,6 +97,10 @@ extension ManagerSelectViewController: UICollectionViewDataSource {
cell.backgroundColor = .mcGrey200
return cell
}

func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
selectedManager = testdata[indexPath.row].peopleName
}
}

extension ManagerSelectViewController: UICollectionViewDelegateFlowLayout {
Expand Down Expand Up @@ -117,6 +128,20 @@ class ManagerCollectionViewCell: UICollectionViewCell {
return peopleLabel
}()

override var isSelected: Bool {
didSet {
if isSelected == true {
peopleLabel.textColor = UIColor.mcMainGreen
backgroundColor = UIColor.mcSubGreen100

}
else {
peopleLabel.textColor = UIColor.black
backgroundColor = UIColor.mcGrey200
}
}
}

override init(frame: CGRect) {
super.init(frame: frame)
setUpCell()
Expand Down Expand Up @@ -147,24 +172,3 @@ class ManagerCollectionViewCell: UICollectionViewCell {
}
}
}


//import SwiftUI
//
//struct ViewControllerRepresentable: UIViewControllerRepresentable {
// typealias UIViewControllerType = ManagerSelectViewController //뷰 컨트롤러 이름
//
// func makeUIViewController(context: Context) -> ManagerSelectViewController {
// return ManagerSelectViewController() // 뷰컨트롤러 이름
// }
//
// func updateUIViewController(_ uiViewController: ManagerSelectViewController, context: Context) {
// }
//}
//
//@available(iOS 16.0.0, *)
//struct ViewPreview: PreviewProvider {
// static var previews: some View {
// ViewControllerRepresentable()
// }
//}
21 changes: 0 additions & 21 deletions MyChore/MyChore/Presentation/View/ChoreAdd/RepeatEndViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,24 +123,3 @@ class RepeatEndViewController: UIViewController {
}
}

/*
import SwiftUI

struct ViewControllerRepresentable: UIViewControllerRepresentable {
typealias UIViewControllerType = RepeatEndViewController //뷰 컨트롤러 이름

func makeUIViewController(context: Context) -> RepeatEndViewController {
return RepeatEndViewController() // 뷰컨트롤러 이름
}

func updateUIViewController(_ uiViewController: RepeatEndViewController, context: Context) {
}
}

@available(iOS 16.0.0, *)
struct ViewPreview: PreviewProvider {
static var previews: some View {
ViewControllerRepresentable()
}
}
*/
21 changes: 0 additions & 21 deletions MyChore/MyChore/Presentation/View/ChoreAdd/RepeatPeriodViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,24 +108,3 @@ class RepeatPeriodTableViewCell: UITableViewCell {
fatalError("init(coder:) has not been implemented")
}
}

/*
import SwiftUI

struct ViewControllerRepresentable: UIViewControllerRepresentable {
typealias UIViewControllerType = RepeatPeriodViewController //뷰 컨트롤러 이름

func makeUIViewController(context: Context) -> RepeatPeriodViewController {
return RepeatPeriodViewController() // 뷰컨트롤러 이름
}

func updateUIViewController(_ uiViewController: RepeatPeriodViewController, context: Context) {
}
}

@available(iOS 16.0.0, *)
struct ViewPreview: PreviewProvider {
static var previews: some View {
ViewControllerRepresentable()
}
}*/
29 changes: 7 additions & 22 deletions MyChore/MyChore/Presentation/View/ChoreAdd/RepeatSelectViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import Tabman

class RepeatSelectViewController: UIViewController {

var completionHandler: ((String) -> (String))?

override func viewDidLoad() {
super.viewDidLoad()

Expand Down Expand Up @@ -45,10 +47,13 @@ class RepeatSelectViewController: UIViewController {
print("페이지 pop") // pop 표시
}


@objc func sendData() {
print("페이지 pop")
self.navigationController?.popViewController(animated: true)
}



lazy var containerView: UIView = {
let containerView = UIView()
return containerView
Expand Down Expand Up @@ -87,6 +92,7 @@ class TabViewController: TabmanViewController {
let firstVC = RepeatPeriodViewController()
let secondVC = RepeatEndViewController()


viewControllers.append(firstVC)
viewControllers.append(secondVC)

Expand Down Expand Up @@ -142,24 +148,3 @@ extension TabViewController: PageboyViewControllerDataSource, TMBarDataSource {
}
}
}


import SwiftUI

struct ViewControllerRepresentable: UIViewControllerRepresentable {
typealias UIViewControllerType = RepeatSelectViewController //뷰 컨트롤러 이름

func makeUIViewController(context: Context) -> RepeatSelectViewController {
return RepeatSelectViewController() // 뷰컨트롤러 이름
}

func updateUIViewController(_ uiViewController: RepeatSelectViewController, context: Context) {
}
}

@available(iOS 16.0.0, *)
struct ViewPreview: PreviewProvider {
static var previews: some View {
ViewControllerRepresentable()
}
}

0 comments on commit 1889517

Please sign in to comment.