#85 Main Tab Bar 수정

- closed 85

dandi/dandi/Data/Network/Service/AuthService.swift

@@ -9,7 +9,7 @@ import Moya
 
 enum AuthService {
  case refresh(refreshToken: String, accessToken: String)
- case login(idToken: String)
+ case login(idToken: String, fcmToken: String)
  case logout
  case witdraw
 }
@@ -48,9 +48,12 @@ extension AuthService: BaseTargetType {
 
  var task: Task {
  switch self {
- case let .login(idToken):
+ case let .login(idToken, fcmToken):
  return .requestParameters(
- parameters: ["idToken": idToken],
+ parameters: [
+ "idToken": idToken,
+ "pushNotificationToken": fcmToken
+ ],
  encoding: JSONEncoding.default
  )
  default:

dandi/dandi/Data/Repositories/DefaultAuthRepository.swift

@@ -36,10 +36,10 @@ final class DefaultAuthRepository: AuthRepository {
  }
 
  func fetchUserInfo(
- fcmToken _: String,
+ fcmToken: String,
  idToken: String
  ) -> Single<NetworkResult<Token>> {
- return router.rx.request(.login(idToken: idToken))
+ return router.rx.request(.login(idToken: idToken, fcmToken: fcmToken))
  .map { response in
  let decodedResponse: NetworkResult<TokenDTO> = NetworkHandler.requestDecoded(by: response)
  switch decodedResponse {

dandi/dandi/Global/Resource/Assets.xcassets/ic.closet.filled.imageset/Contents.json

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

dandi/dandi/Global/Resource/Image.swift

@@ -17,6 +17,7 @@ struct Image {
  static let btnRotation = UIImage(named: "btnRotation")!
  static let settingLine = UIImage(named: "ic_setting_line")!
  static let closetLine = UIImage(named: "ic_closet_line")!
+ static let closetFilled = UIImage(named: "ic.closet.filled")!
 
  static let background1 = UIImage(named: "img.background1")!
  static let background2 = UIImage(named: "img.background2")!

dandi/dandi/Presentation/Closet/Main/ClosetMainViewController.swift

@@ -15,11 +15,6 @@ import YDS
 final class ClosetMainViewController: BaseViewController, View {
  typealias Reactor = ClosetTabReactor
 
- override var hidesBottomBarWhenPushed: Bool {
- get { navigationController?.topViewController == self }
- set { super.hidesBottomBarWhenPushed = newValue }
- }
-
  private var categoryList: [CategoryInfo] = [] {
  didSet {
  category = categoryList.map { $0.category }
@@ -73,21 +68,10 @@ final class ClosetMainViewController: BaseViewController, View {
 
  override init() {
  super.init()
- setProperties()
  setCollectionView()
  setLayouts()
  }
 
- override func viewWillAppear(_ animated: Bool) {
- super.viewWillAppear(animated)
- navigationController?.navigationBar.isHidden = false
- }
-
- override func viewWillDisappear(_ animated: Bool) {
- super.viewWillDisappear(animated)
- navigationController?.navigationBar.isHidden = true
- }
-
  func bind(reactor: Reactor) {
  bindAction(reactor)
  bindState(reactor)
@@ -168,10 +152,6 @@ final class ClosetMainViewController: BaseViewController, View {
  }
  }
 
- private func setProperties() {
- title = "옷장"
- }
-
  private func setLayouts() {
  view.addSubview(emptyLabel)
  emptyLabel.snp.makeConstraints { make in

dandi/dandi/Presentation/Login/LoginViewController.swift

@@ -43,7 +43,12 @@ final class LoginViewController: BaseViewController, View {
  .disposed(by: disposeBag)
 
  tokenPublisher
- .map { idToken in Reactor.Action.loginButtonDidTap(fcmToken: "", idToken: idToken) }
+ .map { idToken in
+ Reactor.Action.loginButtonDidTap(
+ fcmToken: UserDefaultHandler.shared.fcmToken,
+ idToken: idToken
+ )
+ }
  .bind(to: reactor.action)
  .disposed(by: disposeBag)
 

dandi/dandi/Presentation/Tab/MainTabBarController.swift

@@ -50,26 +50,36 @@ extension MainTabBarController {
  selectedImage: Tab.feed.selectedImage
  )
 
- let myPageVC = factory.makeMyPageViewController()
- let myPageNavigationController = YDSNavigationController(rootViewController: myPageVC)
- myPageNavigationController.title = "마이페이지"
- myPageNavigationController.tabBarItem = UITabBarItem(
- title: nil,
- image: Tab.my.image,
- selectedImage: Tab.my.selectedImage
- )
-
  let chatVC = factory.makeChatViewController()
  let chatNavigationController = YDSNavigationController(rootViewController: chatVC)
  chatNavigationController.title = "단디챗"
  chatNavigationController.tabBarItem = UITabBarItem(
+ title: nil,
+ image: Tab.chat.image,
+ selectedImage: Tab.chat.selectedImage
+ )
+
+ let closetVC = factory.makeClosetMainViewController()
+ let closetNavigationController = YDSNavigationController(rootViewController: closetVC)
+ closetNavigationController.title = "내 옷장"
+ closetNavigationController.tabBarItem = UITabBarItem(
+ title: nil,
+ image: Tab.closet.image,
+ selectedImage: Tab.closet.selectedImage
+ )
+
+ let myPageVC = factory.makeMyPageViewController()
+ let myPageNavigationController = YDSNavigationController(rootViewController: myPageVC)
+ myPageNavigationController.title = "마이페이지"
+ myPageNavigationController.tabBarItem = UITabBarItem(
  title: nil,
  image: Tab.my.image,
  selectedImage: Tab.my.selectedImage
  )
 
  super.setViewControllers([
  homeNavigationController,
+ closetNavigationController,
  feedNavigationController,
  chatNavigationController,
  myPageNavigationController

dandi/dandi/Presentation/Tab/Tab.swift

@@ -11,8 +11,10 @@ import YDS
 
 enum Tab: Int, CaseIterable {
  case home = 0
- case feed = 1
- case my = 2
+ case closet = 1
+ case feed = 2
+ case chat = 3
+ case my = 4
 
  var image: UIImage {
  switch self {
@@ -22,6 +24,10 @@ enum Tab: Int, CaseIterable {
  return YDSIcon.feedLine
  case .my:
  return YDSIcon.personLine
+ case .closet:
+ return Image.closetLine.resize(newWidth: 21)
+ case .chat:
+ return YDSIcon.commentLine.resize(newWidth: 21)
  }
  }
 
@@ -33,6 +39,10 @@ enum Tab: Int, CaseIterable {
  return YDSIcon.feedFilled
  case .my:
  return YDSIcon.personFilled
+ case .closet:
+ return Image.closetFilled.resize(newWidth: 21)
+ case .chat:
+ return YDSIcon.commentFilled.resize(newWidth: 21)
  }
  }