[Team10 / iOS / 쑤 & Zeke] Rx를 활용한 ViewModel 구현

iOS/issue-tracker/.swiftlint.yml

@@ -0,0 +1,8 @@
+disabled_rules:
+- line_length
+- identifier_name
+included:
+excluded:
+- issue-trackerTests
+- issue-trackerUITests
+

iOS/issue-tracker/LabelsCollectionViewCell.swift

@@ -8,38 +8,39 @@
 import UIKit
 import SnapKit
 
-class LabelsCollectionViewCell: UICollectionViewCell {
+final class LabelsCollectionViewCell: UICollectionViewCell {
     static var identifiers = "LabelsCollectionViewCell"
-    
-    let label: PaddingLabel = {
+
+    private let label: PaddingLabel = {
         var label = PaddingLabel(withInsets: 0, 0, 10, 10)
         label.textAlignment = .center
         label.textColor = .white
         label.layer.masksToBounds = true
-        label.layer.cornerRadius = 15
+        label.layer.cornerRadius = 10
         return label
     }()
-    
+
     override init(frame: CGRect) {
         super.init(frame: frame)
         addSubview(label)
         setupAutolayout()
     }
-    
+
     required init?(coder: NSCoder) {
         super.init(coder: coder)
         addSubview(label)
         setupAutolayout()
     }
-    
-    func setupAutolayout() {
+
+    private func setupAutolayout() {
         label.snp.makeConstraints { label in
             label.edges.equalToSuperview()
         }
     }
-    
+
     func configure(title: String, color: String) {
         label.text = title
         label.backgroundColor = UIColor.hexStringToUIColor(hex: color)
+        label.sizeToFit()
     }
 }

iOS/issue-tracker/issue-tracker.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -12,7 +12,7 @@
       },
       {
         "package": "MarkdownKit",
-        "repositoryURL": "https://github.com/bmoliveira/MarkdownKit.git",
+        "repositoryURL": "https://github.com/bmoliveira/MarkdownKit",
         "state": {
           "branch": null,
           "revision": "5056f3305d3499f44d8815530d560b87082e0cf5",

iOS/issue-tracker/issue-tracker/Base.lproj/Main.storyboard

@@ -17,7 +17,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="300" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="oU9-yx-qTd">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="130" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="oU9-yx-qTd">
                                 <rect key="frame" x="0.0" y="88" width="414" height="725"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             </tableView>
@@ -71,7 +71,7 @@
             </objects>
             <point key="canvasLocation" x="1109" y="1517"/>
         </scene>
-        <!--내게정-->
+        <!--내계정-->
         <scene sceneID="CPO-fU-AJO">
             <objects>
                 <viewController id="cxD-Kl-bEy" sceneMemberID="viewController">
@@ -81,7 +81,7 @@
                         <viewLayoutGuide key="safeArea" id="QuP-fM-FfB"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     </view>
-                    <tabBarItem key="tabBarItem" title="내게정" image="person" catalog="system" id="JZ5-aR-2TP"/>
+                    <tabBarItem key="tabBarItem" title="내계정" image="person" catalog="system" id="JZ5-aR-2TP"/>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="vTy-kJ-ZF8" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
@@ -106,7 +106,7 @@
         <!--Tab Bar Controller-->
         <scene sceneID="pYl-ZN-vsk">
             <objects>
-                <tabBarController automaticallyAdjustsScrollViewInsets="NO" id="ztH-lY-X3Y" sceneMemberID="viewController">
+                <tabBarController storyboardIdentifier="main" automaticallyAdjustsScrollViewInsets="NO" id="ztH-lY-X3Y" sceneMemberID="viewController">
                     <toolbarItems/>
                     <tabBar key="tabBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="9hE-5W-2K0">
                         <rect key="frame" x="0.0" y="0.0" width="1000" height="1000"/>

iOS/issue-tracker/issue-tracker/Controller/AddLabelViewController.swift

@@ -0,0 +1,138 @@
+//
+//  AddViewController.swift
+//  issue-tracker
+//
+//  Created by Ador on 2021/06/10.
+//
+
+import UIKit
+import RxSwift
+import RxCocoa
+import SnapKit
+
+protocol AddLabelViewControllerDelegate: AnyObject {
+    func fetchData()
+}
+
+final class AddLabelViewController: UIViewController {
+    private var addLabelViewModel: AddLabelViewModel!
+    private lazy var tableView: UITableView = {
+        let tableView = UITableView(frame: .zero, style: .grouped)
+        tableView.allowsSelection = false
+        tableView.register(AddLabelTableViewCell.self, forCellReuseIdentifier: AddLabelTableViewCell.identifier)
+        return tableView
+    }()
+    private var estimatedLabelView = EstimatedLabelView()
+    private var bag = DisposeBag()
+    private var saveButton = UIBarButtonItem(title: "저장", style: .plain, target: nil, action: nil)
+    private var cancelButton = UIBarButtonItem(title: "뒤로", style: .plain, target: nil, action: nil)
+    var reloadDataHandler: (() -> Void)?
+    weak var delegate: AddLabelViewControllerDelegate?
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.view.backgroundColor = #colorLiteral(red: 0.9494308829, green: 0.9485411048, blue: 0.9703034759, alpha: 1)
+        self.addLabelViewModel = AddLabelViewModel(networkManager: NetworkManager())
+
+        navigationItem.title = "새로운 레이블"
+        self.navigationItem.leftBarButtonItem = cancelButton
+        self.navigationItem.rightBarButtonItem = saveButton
+
+        tableView.dataSource = self
+        view.addSubview(tableView)
+        view.addSubview(estimatedLabelView)
+        configureAutolayout()
+        binding()
+        bindButton()
+    }
+
+    private func binding() {
+        addLabelViewModel.color
+            .map { UIColor.hexStringToUIColor(hex: $0)}
+            .bind(to: estimatedLabelView.getLabel().rx.backgroundColor)
+            .disposed(by: bag)
+    }
+
+    func bindButton() {
+        saveButton.rx.tap
+            .subscribe { [weak self] _ in
+                guard let viewModel = self?.addLabelViewModel else { return }
+                if viewModel.title.value == "" || viewModel.description.value == "" {
+                    CustomAlertView.shared.setUpAlertView(title: "실패", message: "필수 입력란이 비었습니다. 다시 한번 확인해주세요.", buttonTitle: "확인", alertType: .failure, buttonHandler: nil)
+                } else {
+                    viewModel.postAddedLabel {
+                        self?.dismiss(animated: true, completion: nil)
+                        self?.delegate?.fetchData()
+                    }
+                }
+            }
+            .disposed(by: bag)
+
+        cancelButton.rx.tap
+            .subscribe { [weak self] _ in
+                self?.dismiss(animated: true, completion: nil)
+            }
+            .disposed(by: bag)
+    }
+
+    private func configureAutolayout() {
+        tableView.snp.makeConstraints { view in
+            view.top.equalToSuperview().inset(40)
+            view.leading.trailing.bottom.equalToSuperview()
+        }
+
+        estimatedLabelView.snp.makeConstraints { view in
+            view.leading.trailing.equalToSuperview().inset(16)
+            view.centerX.centerY.equalToSuperview()
+            view.height.equalTo(160)
+        }
+    }
+}
+
+extension AddLabelViewController: UITableViewDataSource {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 3
+    }
+
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: AddLabelTableViewCell.identifier, for: indexPath) as? AddLabelTableViewCell else { return UITableViewCell() }
+        switch indexPath.row {
+        case 0:
+            cell.textLabel?.text = "제목"
+            cell.configureTextFieldPlaceHolder(text: "(필수입력)")
+            cell.textField.rx.text
+                .orEmpty
+                .distinctUntilChanged()
+                .observe(on: MainScheduler.instance)
+                .bind(to: addLabelViewModel.title)
+                .disposed(by: bag)
+            return cell
+        case 1:
+            cell.textLabel?.text = "설명"
+            cell.configureTextFieldPlaceHolder(text: "(선택사항)")
+            cell.textField.rx.text
+                .orEmpty
+                .distinctUntilChanged()
+                .observe(on: MainScheduler.instance)
+                .bind(to: addLabelViewModel.description)
+                .disposed(by: bag)
+            return cell
+        case 2:
+            cell.textLabel?.text = "배경색"
+
+            addLabelViewModel.color
+                .bind(to: cell.textField.rx.text)
+                .disposed(by: bag)
+
+            cell.reloadButton.rx.tap
+                .map { UIColor.getRandomColor().convertHexToString() }
+                .bind(to: addLabelViewModel.color)
+                .disposed(by: bag)
+
+            cell.configureBackgroundCellMode()
+            return cell
+        default:
+            fatalError()
+        }
+    }
+}

iOS/issue-tracker/issue-tracker/Controller/AddMilestoneViewController.swift

@@ -0,0 +1,83 @@
+//
+//  AddMilestoneViewController.swift
+//  issue-tracker
+//
+//  Created by Ador on 2021/06/17.
+//
+
+import UIKit
+import RxSwift
+
+class AddMilestoneViewController: UIViewController {
+
+    private let disposeBag = DisposeBag()
+    private let viewModel: MilestoneViewModel! = MilestoneViewModel.shared
+    private lazy var tableView: UITableView = {
+        let tableView = UITableView(frame: .zero, style: .grouped)
+        tableView.register(AddMilestoneTableViewCell.self, forCellReuseIdentifier: AddMilestoneTableViewCell.reuseIdentifier)
+        return tableView
+    }()
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        navigationItem.title = "새로운 마일스톤"
+        self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: "뒤로",
+                                                                style: .plain,
+                                                                target: self,
+                                                                action: #selector(didTapCancel))
+        self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "저장",
+                                                                 style: .plain,
+                                                                 target: self,
+                                                                 action: #selector(didTapSave))
+
+        tableView.dataSource = self
+        tableView.frame = view.bounds
+
+        view.addSubview(tableView)
+        viewModel.dismissCompletion = {
+            self.dismiss(animated: true)
+        }
+    }
+
+    @objc
+    private func didTapSave() {
+        viewModel.post()
+    }
+
+    @objc
+    private func didTapCancel() {
+        dismiss(animated: true)
+    }
+}
+
+extension AddMilestoneViewController: UITableViewDataSource {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 3
+    }
+
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: AddMilestoneTableViewCell.reuseIdentifier, for: indexPath) as? AddMilestoneTableViewCell else {
+            fatalError()
+        }
+        if indexPath.row == 0 {
+            cell.becomeFirstResponder()
+        }
+        let textLabel = ["제목", "설명", "완료일"]
+        let keys = ["title", "description", "dueDate"]
+        cell.textLabel?.text = textLabel[indexPath.row]
+        cell.bind { textField in
+            textField.rx.text
+                .orEmpty
+                .observe(on: MainScheduler.instance)
+                .distinctUntilChanged()
+                .debounce(.milliseconds(500), scheduler: MainScheduler.instance)
+                .subscribe(onNext: { text in
+                    let key = keys[indexPath.row]
+                    self.viewModel.milestone[key] = text
+                })
+                .disposed(by: disposeBag)
+        }
+        return cell
+    }
+}