Qa 1 (#36)

* 🐛 Discover 나라 필터 나라 글자 수 무제한 노출 버그 * 🐛 Discover 나라 필터 글자 왼쪽 정렬 * 🐛 Discover 하트 초기화 (sort 같은 현상) * no message * 🔨🐛 discover 새로고침 기능 추가 & weekly hot 호출 버그 수정
OFU-Crew · Jan 11, 2021 · 7bf2c46 · 7bf2c46
1 parent 4fa9ac4
commit 7bf2c46
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 22 deletions.
diff --git a/Dear-World/Dear-World/Source/Domain/Message/API/Message.API.Messages.swift b/Dear-World/Dear-World/Source/Domain/Message/API/Message.API.Messages.swift
@@ -22,7 +22,7 @@ extension Message.API {
     var parameters: [String: Any?]? {
       [
         "countryCode": countryCode,
-        "type": type,
+        "type": type.rawValue,
         "lastId": lastMsgId
       ]
     }

diff --git a/Dear-World/Dear-World/Source/Presentation/Scene/Discover/Cell/MessageTableViewCell.swift b/Dear-World/Dear-World/Source/Presentation/Scene/Discover/Cell/MessageTableViewCell.swift
@@ -26,9 +26,9 @@ final class MessageTableViewCell: UITableViewCell {
     }
   }
   var isLike: Bool = false {
-    //FIXME : 내려올 때 isLiked가 항상 false로 내려옴
     didSet {
       self.likeView.image = isLike ? UIImage(named: "heart_liked") : UIImage(named: "heart")
+      self.likeCountLabel.textColor = isLike ? .loveRed : .grayWhite
     }
   }
   var messageId: Int?
@@ -94,7 +94,7 @@ final class MessageTableViewCell: UITableViewCell {
     self.nameLabel.snp.makeConstraints {
       $0.top.equalTo(emojiView.snp.top)
       $0.leading.equalTo(emojiView.snp.trailing).offset(10)
-      $0.trailing.greaterThanOrEqualToSuperview().inset(30)
+      $0.trailing.lessThanOrEqualToSuperview()
     }
 
     mainView.addSubview(countryFlagImageView)
@@ -106,19 +106,19 @@ final class MessageTableViewCell: UITableViewCell {
     self.countryLabel.do {
       $0.text = "South Korea"
       $0.font = .boldSystemFont(ofSize: 12)
-      $0.textColor = .grayWhite
+      $0.textColor = .nightBlue
     }
     mainView.addSubview(self.countryLabel)
     self.countryLabel.snp.makeConstraints {
-      $0.centerY.equalTo(countryFlagImageView)
-      $0.leading.equalTo(countryFlagImageView.snp.trailing).offset(10)
-      $0.trailing.greaterThanOrEqualToSuperview().inset(30)
+      $0.bottom.equalTo(emojiView.snp.bottom)
+      $0.leading.equalTo(emojiView.snp.trailing).offset(10)
+      $0.trailing.lessThanOrEqualToSuperview()
     }
 
     self.detailTextView.do {
       $0.text = "Hello world, dont worry because you’re strong enough to overcome this corona blue. At the end of the day, trust yourself. more"
       $0.font = .systemFont(ofSize: 12)
-      $0.textColor = .black
+      $0.textColor = .warmBlue
       $0.textContainerInset = .zero
       $0.isScrollEnabled = false
       $0.isEditable = false

diff --git a/Dear-World/Dear-World/Source/Presentation/Scene/Discover/DiscoverReactor.swift b/Dear-World/Dear-World/Source/Presentation/Scene/Discover/DiscoverReactor.swift
@@ -43,7 +43,8 @@ final class DiscoverReactor: Reactor {
       messageCount: 0,
       messages: []
     )
-    var isRefreshing: Bool = false
+    @Revision var isRefreshing: Bool = false
+
     var isLoading: Bool = false
     var isAnimating: Bool = false
     @Revision var isPresentAboutPage: Bool = false
@@ -120,19 +121,26 @@ final class DiscoverReactor: Reactor {
               countryCode: currentState.selectedCountry?.code,
               lastMsgId: nil,
               type: sortType ?? .recent
-            )
-          )
-          .filterNil()
-          .map{ Mutation.setMessages(result: $0) },
-          .just(.setLoading(false))
+            ))
+            .filterNil()
+            .map{ .setMessages(result: $0)},
+            .just(.setLoading(false))
         )
       )
     case .refresh:
-      return .concat([
-        .just(Mutation.setRefreshing(true)),
-        .just(Mutation.setRefreshing(false))
-      ])
-
+      guard currentState.isRefreshing == false else { return .empty() }
+      return .merge(
+        Network.request(Message.API.MessageCount(countryCode: currentState.selectedCountry?.code))
+          .filterNil()
+          .map(\.messageCount)
+          .map{.setMessageCount($0)}
+        ,.concat([
+          .just(.setRefreshing(true)),
+          Network.request(Message.API.Messages(countryCode: currentState.selectedCountry?.code, lastMsgId: nil, type: currentState.selectedSortType))
+            .filterNil()
+            .map{.setMessages(result: $0)},
+          .just(.setRefreshing(false))
+      ]))
     case .loadMore:
       guard !currentState.isLoading else { return .empty() }
       return Observable<Mutation>.concat([

diff --git a/Dear-World/Dear-World/Source/Presentation/Scene/Discover/DiscoverViewController.swift b/Dear-World/Dear-World/Source/Presentation/Scene/Discover/DiscoverViewController.swift
@@ -24,7 +24,8 @@ final class DiscoverViewController: UIViewController, View {
   private let sortView: UIView = UIView()
   private var sortLabel: UILabel = UILabel()
   private var messages: [Message.Model.Message] = []
-  let filterContainerView: UIView = UIView()
+  private let filterContainerView: UIView = UIView()
+  private let refreshControl: UIRefreshControl = UIRefreshControl()
 
   var disposeBag: DisposeBag = DisposeBag()
 
@@ -93,6 +94,7 @@ final class DiscoverViewController: UIViewController, View {
     countryLabel.snp.makeConstraints {
       $0.centerY.equalToSuperview()
       $0.leading.equalTo(CountryFilterView.snp.leading)
+      $0.width.lessThanOrEqualTo(200)
     }
     let select: UIImageView = UIImageView().then {
       $0.image = UIImage(named: "select")
@@ -144,6 +146,15 @@ final class DiscoverViewController: UIViewController, View {
       $0.sectionHeaderHeight = 150
       $0.tableHeaderView = nil
       $0.allowsSelection = false
+      $0.refreshControl = refreshControl
+    }
+
+    refreshControl.addTarget(self, action: #selector(tableViewWillRefresh), for: .valueChanged)
+  }
+
+  @objc private func tableViewWillRefresh() {
+    if self.refreshControl.isRefreshing {
+      reactor?.action.on(.next(.refresh))
     }
   }
 
@@ -284,6 +295,13 @@ final class DiscoverViewController: UIViewController, View {
       .map(\.title)
       .bind(to: self.sortLabel.rx.text)
       .disposed(by: self.disposeBag)
+
+    reactor.state
+      .distinctUntilChanged(\.$isRefreshing)
+      .map(\.isRefreshing)
+      .filter{!$0}
+      .bind(to: self.refreshControl.rx.isRefreshing)
+      .disposed(by: self.disposeBag)
   }
 }
 extension DiscoverViewController: UITableViewDelegate, UITableViewDataSource {

diff --git a/Dear-World/Dear-World/Source/Presentation/View/CountrySelectController.swift b/Dear-World/Dear-World/Source/Presentation/View/CountrySelectController.swift
@@ -135,7 +135,10 @@ public final class CountrySelectController: UIViewController {
         let cellBackgroudView = UIView()
         cellBackgroudView.backgroundColor = .breathingWhite
         cell.selectedBackgroundView = cellBackgroudView
-        //TODO: CheckMark 달기
+        cell.textLabel?.snp.makeConstraints {
+          $0.left.equalToSuperview().inset(20)
+          $0.centerY.equalToSuperview()
+        }
         return cell
       }
       .disposed(by: self.disposeBag)
@@ -242,4 +245,3 @@ public class AllCountries {
       })
   }
 }
-