Merge pull request #141 from boostcampwm-2022/refactor/browseView

Refactor/browse view

Author: jinwoong16

DailyQuest/DailyQuest/Domain/Entities/User.swift

@@ -44,6 +44,15 @@ struct User {
 }
 
 extension User {
+    func setAllow(allow: Bool) -> User {
+        return User(uuid: self.uuid,
+                    nickName: self.nickName,
+                    profileURL: self.profileURL,
+                    backgroundImageURL: self.backgroundImageURL,
+                    introduce: self.introduce,
+                    allow: allow)
+    }
+    
     func setProfileImageURL(profileURL: String) -> User {
         return User(uuid: self.uuid,
                     nickName: self.nickName,

DailyQuest/DailyQuest/Domain/UseCases/Settings/DefaultSettingsUseCase.swift

@@ -37,4 +37,18 @@ extension DefaultSettingsUseCase: SettingsUseCase {
             .catchAndReturn(false)
             .asObservable()
     }
+    
+    func updateAllow(allow: Bool) -> Single<Bool> {
+        userRepository.readUser()
+            .map { $0.setAllow(allow: allow) }
+            .flatMap(userRepository.updateUser(by:))
+            .map { _ in true }
+            .catchAndReturn(false)
+    }
+    
+    func fetchAllow() -> Single<Bool?> {
+        userRepository.readUser()
+            .map { $0.allow }
+            .catchAndReturn(nil)
+    }
 }

DailyQuest/DailyQuest/Domain/UseCases/Settings/Protocols/SettingsUseCase.swift

@@ -12,4 +12,7 @@ import RxSwift
 protocol SettingsUseCase {
     func isLoggedIn() -> Observable<Bool>
     func signOut() -> Observable<Bool>
+    
+    func updateAllow(allow: Bool) -> Single<Bool>
+    func fetchAllow() -> Single<Bool?>
 }

DailyQuest/DailyQuest/Presentation/Browse/Flow/BrowseCoordinator.swift

@@ -30,6 +30,7 @@ final class DefaultBrowseCoordinator: BrowseCoordinator {
     func start() {
         let browseViewController = browseSceneDIContainer.makeBrowseViewController()
         navigationController.pushViewController(browseViewController, animated: false)
+        navigationController.isNavigationBarHidden = true
 
         browseViewController
             .coordinatorPublisher

DailyQuest/DailyQuest/Presentation/Browse/View/UserInfoView.swift

@@ -6,7 +6,7 @@
 //
 
 import UIKit
-
+import Kingfisher
 import SnapKit
 
 final class UserInfoView: UIStackView {
@@ -59,5 +59,6 @@ final class UserInfoView: UIStackView {
 
     func setup(with user: User) {
         welcomeLabel.text = user.nickName + "님의 퀘스트"
+        userImage.setImage(with: user.profileURL)
     }
 }

DailyQuest/DailyQuest/Presentation/Browse/ViewController/BrowseViewController.swift

@@ -17,6 +17,18 @@ final class BrowseViewController: UITableViewController {
     private var viewModel: BrowseViewModel!
     private var disposableBag = DisposeBag()
 
+    lazy var activityIndicator: UIActivityIndicatorView = {
+        // Create an indicator.
+        let activityIndicator = UIActivityIndicatorView()
+        activityIndicator.color = .maxDarkYellow
+        
+        let transfrom = CGAffineTransform.init(scaleX: 2, y: 2)
+        activityIndicator.transform = transfrom
+        
+        activityIndicator.startAnimating()
+        return activityIndicator
+    }()
+    
     // MARK: - Life Cycle
     static func create(with viewModel: BrowseViewModel) -> BrowseViewController {
         let view = BrowseViewController()
@@ -28,10 +40,18 @@ final class BrowseViewController: UITableViewController {
         super.viewDidLoad()
 
         configure()
-        
+        configureIndicatorBar()
         bind()
     }
 
+    private func configureIndicatorBar() {
+        self.view.addSubview(activityIndicator)
+        activityIndicator.snp.makeConstraints { make in
+            make.width.height.equalTo(50)
+            make.centerX.centerY.equalToSuperview()
+        }
+    }
+    
     /**
      table view의 기본 정보를 설정합니다.
      */
@@ -50,6 +70,9 @@ final class BrowseViewController: UITableViewController {
 
         output
             .data
+            .do{ [weak self] _ in
+                self?.activityIndicator.stopAnimating()
+            }
             .drive(tableView.rx.items(cellIdentifier: BrowseCell.reuseIdentifier, cellType: BrowseCell.self)) { row, item, cell in
                 cell.setup(with: item)
             }

DailyQuest/DailyQuest/Presentation/Common/View/QuestViewHeader.swift

@@ -18,7 +18,7 @@ final class QuestViewHeader: UIStackView {
     // MARK: - Components
     private(set) lazy var titleLabel: UILabel = {
         let titleLabel = UILabel()
-        titleLabel.text = "Today Quests"
+        titleLabel.text = "오늘의 퀘스트"
         titleLabel.textColor = .maxViolet
         titleLabel.font = UIFont.boldSystemFont(ofSize: 32)
 

DailyQuest/DailyQuest/Presentation/Home/ViewModel/HomeViewModel.swift

@@ -94,14 +94,14 @@ final class HomeViewModel {
             .do(onNext: { [weak self] date in
                 self?.currentDate = date
             })
-            .flatMap(questUseCase.fetch(by:))
-            .asDriver(onErrorJustReturn: [])
+                .flatMap(questUseCase.fetch(by:))
+                .asDriver(onErrorJustReturn: [])
 
-        let userNotification = NotificationCenter
-            .default
-            .rx
-            .notification(.userUpdated)
-            .map { _ in Date() }
+                let userNotification = NotificationCenter
+                .default
+                .rx
+                .notification(.userUpdated)
+                .map { _ in Date() }
 
         let userData = Observable
             .merge(
@@ -194,13 +194,10 @@ final class HomeViewModel {
 private extension HomeViewModel {
     func calculateRelative(_ date: Date) -> String {
         let today = Date()
-        
-        if today.startOfDay > date.startOfDay {
-            return "Previous Quests"
-        } else if today.startOfDay < date.startOfDay {
-            return "Upcomming Quests"
+        if today.startOfDay == date.startOfDay {
+            return "오늘의 퀘스트"
         } else {
-            return "Today Quests"
+            return "\(date.toFormatMonthDay)의 퀘스트 "
         }
     }
 }

DailyQuest/DailyQuest/Presentation/Settings/View/ToggleField/ToggleCell.swift

@@ -6,9 +6,15 @@
 //
 
 import UIKit
+import RxSwift
+import RxCocoa
 
 final class ToggleCell: UITableViewCell {
     static let reuseIdentifier = "ToggleCell"
+    private var viewModel: ToggleItemViewModel!
+    
+    var toggleItemDidClicked = PublishSubject<Bool>()
+    private var disposableBag = DisposeBag()
 
     private let padding = 20
 
@@ -45,9 +51,9 @@ final class ToggleCell: UITableViewCell {
     }
 
     private func configureUI() {
-        addSubview(icon)
-        addSubview(title)
-        addSubview(toggle)
+        contentView.addSubview(icon)
+        contentView.addSubview(title)
+        contentView.addSubview(toggle)
 
         icon.snp.makeConstraints { make in
             make.leading.top.bottom.equalToSuperview().inset(padding)
@@ -67,5 +73,40 @@ final class ToggleCell: UITableViewCell {
     func setup(with viewModel: ToggleItemViewModel) {
         icon.image = UIImage(systemName: viewModel.imageName)
         title.text = viewModel.title
+        self.viewModel = viewModel
+        bind()
+    }
+    
+    func bind() {
+        toggle.rx.tapGesture()
+            .when(.ended)
+            .do(onNext: { _ in
+                print(self.toggle.isOn)
+            })
+            .bind(onNext: {_ in
+                self.toggleItemDidClicked.onNext(!self.toggle.isOn)
+            })
+            .disposed(by: disposableBag)
+        
+        let output = viewModel.transform(input: ToggleItemViewModel.Input(
+            toggleItemDidClicked: toggleItemDidClicked
+        ))
+        
+        output.toggleItemResult
+            .subscribe(onNext: { isOn in
+                guard let isOn = isOn else {
+                    self.toggle.isOn = false
+                    self.toggle.isEnabled = false
+                    return
+                }
+                
+                if !self.toggle.isEnabled {
+                    self.toggle.isEnabled = true
+                }
+                DispatchQueue.main.async {
+                    self.toggle.isOn = isOn
+                }
+            })
+            .disposed(by: disposableBag)
     }
 }

DailyQuest/DailyQuest/Presentation/Settings/View/ToggleField/ToggleItemViewModel.swift

@@ -6,8 +6,34 @@
 //
 
 import Foundation
+import RxSwift
 
 struct ToggleItemViewModel {
     let title: String
     let imageName: String
+    let settingsUseCase: SettingsUseCase!
+    
+    struct Input {
+        let toggleItemDidClicked: Observable<Bool>
+    }
+    
+    struct Output {
+        let toggleItemResult: Observable<Bool?>
+    }
+    
+    func transform(input: Input) -> Output {
+        let fetchAllow = settingsUseCase.isLoggedIn()
+            .flatMap { _ in settingsUseCase.fetchAllow() }
+            .asObservable()
+        
+        let changeAllow = input.toggleItemDidClicked
+            .flatMap { isOn in
+                settingsUseCase.updateAllow(allow: isOn).asObservable()
+                    .map { result in result ? isOn : nil  }
+            }
+        
+        let toggleItemResult = Observable.merge(fetchAllow, changeAllow)
+        
+        return Output(toggleItemResult: toggleItemResult)
+    }
 }