Merge pull request #118 from boostcampwm-2022/refactor/StatusImage

Refactor/status image
boostcampwm-2022 · Dec 8, 2022 · 1faa928 · 1faa928
2 parents 0a03518 + 5128f66
commit 1faa928
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/DailyQuest/DailyQuest/Presentation/Home/View/StatusView.swift b/DailyQuest/DailyQuest/Presentation/Home/View/StatusView.swift
@@ -91,14 +91,6 @@ final class StatusView: UIView {
             make.top.equalToSuperview().inset(10)
         }
 
-        addSubview(progressBar)
-        progressBar.snp.makeConstraints { make in
-            make.leading.equalTo(iconContainer.snp.trailing)
-            make.bottom.equalToSuperview().inset(10)
-            make.width.equalToSuperview().multipliedBy(0.5)
-            make.height.equalTo(5)
-        }
-
         addSubview(profileButton)
         profileButton.snp.makeConstraints { make in
             make.trailing.equalToSuperview().inset(15)
@@ -107,6 +99,15 @@ final class StatusView: UIView {
             make.width.equalTo(profileButton.snp.height).multipliedBy(1.0 / 1.0)
         }
 
+        addSubview(progressBar)
+        progressBar.snp.makeConstraints { make in
+            make.leading.equalTo(iconContainer.snp.trailing)
+            make.bottom.equalToSuperview().inset(20)
+            make.width.lessThanOrEqualTo(400)
+            make.trailing.equalTo(profileButton.snp.leading).inset(-40).priority(100)
+            make.height.equalTo(5)
+        }
+
         profileButton.imageView?.snp.makeConstraints({ make in
             make.trailing.equalToSuperview()
             make.centerY.equalToSuperview()

diff --git a/DailyQuest/DailyQuest/Presentation/Home/ViewModel/HomeViewModel.swift b/DailyQuest/DailyQuest/Presentation/Home/ViewModel/HomeViewModel.swift
@@ -48,6 +48,7 @@ final class HomeViewModel {
             .flatMap(questUseCase.update(with:))
             .filter({ $0 })
             .compactMap { [weak self] _ in self?.currentDate }
+            .share()
             .asObservable()
 
         let updateNotification = NotificationCenter