다른 유저의 직업/관심사가 보이도록 수정, 메인화면 UI 수정

Weekand/Weekand/Domain/Enum/Status.swift

@@ -10,7 +10,7 @@ import UIKit
 
 /// 일정 상태 정보
 enum Status: String {
-    case upcoming = "UNCOMPLETED"
+    case upcoming = "NOT_YET"
     case completed = "COMPLETED"
     case incompleted = "INCOMPLETED"
     case undetermined = "UNDETERMINED"

Weekand/Weekand/Presentation/MainScene/Common/View/WCategoryTitleLabel.swift

@@ -24,10 +24,10 @@ class WCategoryTitleLabel: WIconLabel {
         self.label.font = WFont.body1()
         self.label.textColor = .gray900
 
-        self.stack.spacing = 7
+        self.stack.spacing = 0
 
         icon.snp.makeConstraints { make in
-            make.height.equalTo(10)
+            make.height.equalTo(24)
             make.width.equalTo(icon.snp.height)
         }
 
@@ -47,7 +47,13 @@ class WCategoryTitleLabel: WIconLabel {
 extension WCategoryTitleLabel {
 
     public func editValue(color: UIColor, title: String) {
-        self.icon.backgroundColor = color
+
+        if let categoryBox = UIImage(named: "box.filled")?.withTintColor(color) {
+            self.icon.image = categoryBox
+        } else {
+            self.icon.backgroundColor = color
+        }
+
         self.label.text = title
     }
 }

Weekand/Weekand/Presentation/MainScene/Common/View/WIconLabel.swift

@@ -14,7 +14,7 @@ class WIconLabel: UIView {
 
     lazy var icon = UIImageView().then {
         $0.setContentHuggingPriority(.required, for: .vertical)
-        $0.contentMode = .scaleAspectFit
+        $0.contentMode = .scaleAspectFill
     }
     lazy var label = UILabel().then {
         $0.textAlignment = .left
@@ -26,14 +26,14 @@ class WIconLabel: UIView {
         $0.addArrangedSubview(label)
 
         icon.snp.makeConstraints { make in
-            make.height.lessThanOrEqualTo(label.snp.height)
             make.width.equalTo(icon.snp.height)
+            make.centerY.equalToSuperview()
         }
 
         $0.axis = .horizontal
         $0.distribution = .fill
         $0.alignment = .center
-        $0.spacing = 5
+        $0.spacing = 10
     }
 
     override init(frame: CGRect) {

Weekand/Weekand/Presentation/MainScene/Common/View/WStatusTimeLabel.swift

@@ -23,6 +23,11 @@ class WStatusTimeLabel: WIconLabel {
 
         self.label.font = WFont.body2()
         self.label.textColor = .gray400
+        self.stack.spacing = 0
+
+        self.icon.snp.makeConstraints { make in
+            make.height.equalTo(24)
+        }
     }
 
     init(status: StatusIcon, title: String) {

Weekand/Weekand/Presentation/MainScene/Main/View/MainViewController.swift

@@ -30,9 +30,16 @@ class MainViewController: UIViewController {
     var headerView = MainViewHeader()
     var tableView: UITableView!
 
-    lazy var foldButton = UIBarButtonItem(image: UIImage(named: "emptyImage")!, style: .plain, target: self, action: nil)
+    lazy var foldButton = UIBarButtonItem(image: UIImage(named: "emptyImage")!, style: .plain, target: self, action: nil).then {
+        let foldButtonImage = UIImage(named: "chevron.up") ?? UIImage(systemName: "chevron.up")
+        $0.setBackgroundImage(foldButtonImage?.withTintColor(.gray900), for: .normal, barMetrics: .default)
+    }
     lazy var searchButton = UIBarButtonItem(image: UIImage(named: "search") ?? UIImage(systemName: "magnifyingglass"), style: .plain, target: self, action: nil)
     lazy var alarmButton = UIBarButtonItem(image: UIImage(named: "alarm") ?? UIImage(systemName: "bell"), style: .plain, target: self, action: nil)
+    let spacer = UIBarButtonItem(barButtonSystemItem: .fixedSpace, target: nil, action: nil).then {
+        $0.width = 4
+    }
+
 
     lazy var floatingButton = UIButton().then {
         $0.backgroundColor = .mainColor
@@ -67,10 +74,9 @@ class MainViewController: UIViewController {
     private func configureUI() {
 
         // Navigation Bar
-        let foldButtonImage = UIImage(named: "chevron.up") ?? UIImage(systemName: "chevron.up")
-        foldButton.setBackgroundImage(foldButtonImage?.withTintColor(.gray900), for: .normal, barMetrics: .default)
-        navigationItem.leftBarButtonItem = foldButton
-        navigationItem.rightBarButtonItems = [alarmButton, searchButton]
+
+        navigationItem.setLeftBarButtonItems([spacer, foldButton], animated: false)
+        navigationItem.rightBarButtonItems = [spacer, alarmButton, searchButton]
 
         // Content View
         [ collectionView, headerView, tableView ].forEach { self.view.addSubview($0) }
@@ -409,7 +415,7 @@ extension MainViewController {
         }
 
         if let safeImage = buttonImage {
-            navigationItem.leftBarButtonItem?.setBackgroundImage(safeImage.withTintColor(.gray900), for: .normal, barMetrics: .default)
+            foldButton.setBackgroundImage(safeImage.withTintColor(.gray900), for: .normal, barMetrics: .default)
         }
 
         UIView.animate(withDuration: 0.25) {

Weekand/Weekand/Presentation/ProfileScene/Profile/ViewModel/ProfileViewModel.swift

@@ -21,7 +21,7 @@ class ProfileViewModel: ViewModelType {
     private let profileUseCase: ProfileUseCase
     private let disposeBag = DisposeBag()
 
-    var userDeatil = BehaviorRelay<UserDetail>(value: UserDetail.defaultData)
+    var userDeatil = PublishRelay<UserDetail>()
     var buttonState = BehaviorRelay<ProfileButtonType>(value: ProfileButtonType.edit)
     var errorMessage = BehaviorRelay<String?>(value: nil)
 
@@ -169,6 +169,7 @@ extension ProfileViewModel {
         }, onFailure: { error in
             print("\(#function) Error: \(error)")
             self.errorMessage.accept("\(error)")
+            self.userDeatil.accept(UserDetail.defaultData)
         }, onDisposed: nil)
         .disposed(by: disposeBag)
     }
@@ -177,7 +178,7 @@ extension ProfileViewModel {
     private func followUser(id: String) {
 
         self.profileUseCase.createFollowee(id: id).subscribe(onSuccess: { _ in
-            BehaviorRelay<ProfileButtonType>.just(.following).bind(to: self.buttonState).disposed(by: self.disposeBag)
+            self.buttonState.accept(.following)
         }, onFailure: { error in
             print("\(#function) Error: \(error)")
             self.errorMessage.accept("\(error)")
@@ -190,7 +191,7 @@ extension ProfileViewModel {
     private func unfollowUser(id: String) {
 
         self.profileUseCase.deleteFollowee(id: id).subscribe(onSuccess: { _ in
-            BehaviorRelay<ProfileButtonType>.just(.follow).bind(to: self.buttonState).disposed(by: self.disposeBag)
+            self.buttonState.accept(.follow)
 
         }, onFailure: { error in
             print("\(#function) Error: \(error)")

Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "rectangle.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "state.completed.png",
+      "filename" : "work_completed.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "state.completed2x.png",
+      "filename" : "work_completed@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "state.completed3x.png",
+      "filename" : "work_completed@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "state.hold.png",
+      "filename" : "work_beforecheck.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "state.hold2x.png",
+      "filename" : "work_beforecheck@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "state.hold3x.png",
+      "filename" : "work_beforecheck@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "state.incomplete.png",
+      "filename" : "work_uncompleted.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "state.incomplete2x.png",
+      "filename" : "work_uncompleted@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "state.incomplete3x.png",
+      "filename" : "work_uncompleted@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "state.proceeding.png",
+      "filename" : "work_ongoing.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "state.proceeding2x.png",
+      "filename" : "work_ongoing@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "state.proceeding3x.png",
+      "filename" : "work_ongoing@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "state.upcomming.png",
+      "filename" : "work_prearranged.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "state.upcomming2x.png",
+      "filename" : "work_prearranged@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "state.upcomming3x.png",
+      "filename" : "work_prearranged@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/Contents.json

@@ -6,12 +6,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "radio_disabled2x.png",
+      "filename" : "radio_disabled@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "radio_disabled3x.png",
+      "filename" : "radio_disabled@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }