Merge pull request #133 from IIION/feature/sticker-logic

✨ 스티커 획득 로직과 프로필에서 뷰 할 수 있는 기능을 추가하였습니다.

Author: hs-ryu

Workade/Managers/FirestoreManager.swift

@@ -92,14 +92,13 @@ class FirestoreDAO {
         try await dto.getDocuments(collectionName: region.rawValue).count
     }
 
-    func getActiveUser(region: Region, uid: String) async throws -> ActiveUser {
+    func getActiveUser(region: Region, uid: String) async throws {
         let document = try await dto.getDocument(collectionName: region.rawValue, documentName: uid)
         let data = document.data()
         let decoder = JSONDecoder()
         let jsonData = try JSONSerialization.data(withJSONObject: data)
         let activeUser = try decoder.decode(ActiveUser.self, from: jsonData)
-        
-        return activeUser
+        UserManager.shared.activeMyInfo = activeUser
     }
 
     func getActiveUsers(region: Region) async throws -> [Job: [ActiveUser]]? {

Workade/SceneDelegate.swift

@@ -23,13 +23,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         window?.rootViewController = UINavigationController(rootViewController: ExploreViewController())
         window?.makeKeyAndVisible()
         Task {
-//            try Auth.auth().signOut()
+            //            try Auth.auth().signOut()
             guard let uid = Auth.auth().currentUser?.uid,
                   let user = try await FirestoreDAO.shared.getUser(userID: uid),
                   let region = user.activeRegion
             else { return }
-                    async let count = try? await FirestoreDAO.shared.getActiveUsersNumber(region: region)
-                    await window?.rootViewController?.navigationController?.pushViewController(WorkationViewController(region: region, peopleCount: count ?? 0), animated: false)
+            try await FirestoreDAO.shared.getActiveUser(region: region, uid: uid)
         }
 
         if let url = connectionOptions.urlContexts.first?.url {

Workade/Views&ViewModels/MyPage/StickerCollectionViewCell.swift

@@ -22,6 +22,7 @@ class StickerCollectionViewCell: UICollectionViewCell {
 
     let stickerImage: UIImageView = {
         let image = UIImageView()
+        image.contentMode = .scaleAspectFit
         image.translatesAutoresizingMaskIntoConstraints = false
 
         return image
@@ -106,6 +107,6 @@ class StickerCollectionViewCell: UICollectionViewCell {
 
         let labelsHeight = nameLabelHeight + dataLabelHeight + locationLabelHeight
 
-        return labelsHeight + 6 + stickerImageWidth
+        return labelsHeight + 32 + stickerImageWidth
     }
 }

Workade/Views&ViewModels/Workation/StickerProgress/StickerProgressView.swift

@@ -9,6 +9,9 @@ import Combine
 import UIKit
 
 final class StickerProgressView: UIView {
+    
+    var stickers: [StickerTitle]
+    
     var cancellable = Set<AnyCancellable>()
 
     private let workationProgressView: UIProgressView = {
@@ -68,13 +71,13 @@ final class StickerProgressView: UIView {
     private lazy var lockStack: UIStackView = {
         let stackView = UIStackView(arrangedSubviews: [
             UIView(),
-            weekStack(image: UIImage(named: "sampleSticker"), isUnlocked: true, week: 1),
+            weekStack(image: UIImage(named: stickers[0].rawValue), isUnlocked: UserManager.shared.activeMyInfo?.progressDay ?? 0 >= 7, week: 1),
             UIView(),
-            weekStack(image: UIImage(named: "sampleSticker"), isUnlocked: true, week: 2),
+            weekStack(image: UIImage(named: stickers[1].rawValue), isUnlocked: UserManager.shared.activeMyInfo?.progressDay ?? 0 >= 14, week: 2),
             UIView(),
-            weekStack(image: UIImage(named: "sampleSticker"), isUnlocked: false, week: 3),
+            weekStack(image: UIImage(named: stickers[2].rawValue), isUnlocked: UserManager.shared.activeMyInfo?.progressDay ?? 0 >= 21, week: 3),
             UIView(),
-            weekStack(image: UIImage(named: "sampleSticker"), isUnlocked: false, week: 4),
+            weekStack(image: UIImage(named: stickers[3].rawValue), isUnlocked: UserManager.shared.activeMyInfo?.progressDay ?? 0 >= 28, week: 4),
             UIView()
         ])
         stackView.axis = .horizontal
@@ -84,8 +87,9 @@ final class StickerProgressView: UIView {
         return stackView
     }()
 
-    override init(frame: CGRect) {
-        super.init(frame: frame)
+    init(stickers: [StickerTitle]) {
+        self.stickers = stickers
+        super.init(frame: .zero)
 
         setupLayout()
         bind()
@@ -131,47 +135,10 @@ final class StickerProgressView: UIView {
                 guard let self = self, var user = user else { return }
                 DispatchQueue.main.async {
                     let offsetDate = Date().timeIntervalSince(user.startDate)
-                    let day = Int(offsetDate/86400)
-                    self.workationProgressView.progress = Float(day > 0 ? day/35 : 0)
+                    let day = Float(offsetDate/86400)
+                    self.workationProgressView.setProgress(day > 0 ? day/35 : 0, animated: true)
                 }
             }
             .store(in: &cancellable)
     }
 }
-
-#if canImport(SwiftUI) && DEBUG
-import SwiftUI
-
-struct StickerProgressViewPreview: PreviewProvider {
-    static var previews: some View {
-        UIViewPreview {
-            let view = StickerProgressView(frame: .zero)
-            return view
-        }
-        .frame(width: 310, height: 90)
-        .previewLayout(.sizeThatFits)
-    }
-}
-#endif
-
-#if canImport(SwiftUI) && DEBUG
-import SwiftUI
-struct UIViewPreview<View: UIView>: UIViewRepresentable {
-    let view: View
-
-    init(_ builder: @escaping () -> View) {
-        view = builder()
-    }
-
-    // MARK: - UIViewRepresentable
-
-    func makeUIView(context: Context) -> UIView {
-        return view
-    }
-
-    func updateUIView(_ view: UIView, context: Context) {
-        view.setContentHuggingPriority(.defaultHigh, for: .horizontal)
-        view.setContentHuggingPriority(.defaultHigh, for: .vertical)
-    }
-}
-#endif

Workade/Views&ViewModels/Workation/StickerSheet/StickerSheetViewController.swift

@@ -66,9 +66,18 @@ class StickerSheetViewController: UIViewController {
     }()
 
     @objc private func backgroundViewTapped(_ tapRecognizer: UITapGestureRecognizer) {
-        if step < stickers.count {
+        if step < stickers.count-1 {
             step += 1
         } else {
+            Task {
+                guard var user = UserManager.shared.user.value else { return }
+                if user.stickers == nil {
+                    user.stickers = stickers
+                } else {
+                    user.stickers?.append(contentsOf: stickers)
+                }
+                try await FirestoreDAO.shared.createUser(user: user)
+            }
             presentingViewController?.dismiss(animated: true)
             self.viewDidDismiss?()
         }

Workade/Views&ViewModels/Workation/WorkationViewController.swift

@@ -15,6 +15,7 @@ final class WorkationViewController: UIViewController {
     var dismissAction: (() -> Void)?
 
     var cancellable = Set<AnyCancellable>()
+    var activeUserCancellable: AnyCancellable? = nil
 
     let canGetStickers: [StickerTitle] = [
         .halLaBong, .dolHaReuBang, .horse, .halLaSan
@@ -200,8 +201,9 @@ final class WorkationViewController: UIViewController {
             alert.addAction(UIAlertAction(title: "종료", style: .destructive, handler: { [weak self] _ in
                 Task { [weak self] in
                     guard let self = self, var user = UserManager.shared.user.value else { return }
-                    try await FirestoreDAO.shared.deleteActiveUser(userID: user.id, region: self.region)
-                    try await FirestoreDAO.shared.createUser(user: User(id: user.id, name: user.name, email: user.email, job: user.job, stickers: user.stickers, activeRegion: nil))
+                    self.activeUserCancellable?.cancel()
+                    try? await FirestoreDAO.shared.deleteActiveUser(userID: user.id, region: self.region)
+                    try? await FirestoreDAO.shared.createUser(user: User(id: user.id, name: user.name, email: user.email, job: user.job, stickers: user.stickers, activeRegion: nil))
                 }
 
                 UIView.animate(withDuration: 0.3, delay: 0) { [weak self] in
@@ -295,7 +297,7 @@ final class WorkationViewController: UIViewController {
         label.textColor = .theme.primary
         label.text = "스티커"
 
-        let progressView = StickerProgressView()
+        let progressView = StickerProgressView(stickers: canGetStickers)
 
         let stackView = UIStackView(arrangedSubviews: [label, progressView])
         stackView.axis = .vertical
@@ -453,14 +455,17 @@ extension WorkationViewController {
                 DispatchQueue.main.async {
                     let offsetDate = Date().timeIntervalSince(user.startDate)
                     let day = Int(ceil(offsetDate/86400))
+                    if let storedDay = user.progressDay {
+                        self.compareProgressDay(presentDay: day, storedDay: storedDay)
+                    }
                     user.progressDay = day
                     self.updateActiveUser(user: user)
                     self.dayLabel.text = "\(day)일째"
                 }
             }
             .store(in: &cancellable)
 
-        UserManager.shared.$activeMyInfo
+        activeUserCancellable = UserManager.shared.$activeMyInfo
             .sink { [weak self] user in
                 guard let self = self, var user = user else { return }
                 DispatchQueue.main.async {
@@ -477,12 +482,11 @@ extension WorkationViewController {
                     self.loginPaneView.isHidden = true
                 }
             }
-            .store(in: &cancellable)
     }
 
     private func updateActiveUser(user: ActiveUser) {
         Task {
-            try await FirestoreDAO.shared.updateActiveUser(user: user)
+            try await FirestoreDAO.shared.createActiveUser(user: user)
         }
     }
 
@@ -492,7 +496,15 @@ extension WorkationViewController {
         if storedStep < step {
             let getStickers = [StickerTitle](canGetStickers[storedStep..<step])
             let stickers = getStickers.map { StickerModel(date: Date(), title: $0, region: self.region) }
-            self.present(StickerSheetViewController(stickers: stickers), animated: true)
+            let stickerShetViewController = StickerSheetViewController(stickers: stickers)
+            self.present(stickerShetViewController, animated: true)
+            let dimView = UIView(frame: UIScreen.main.bounds)
+            dimView.backgroundColor = .theme.primary.withAlphaComponent(0.8)
+            view.addSubview(dimView)
+            view.bringSubviewToFront(dimView)
+            stickerShetViewController.viewDidDismiss = {
+                dimView.removeFromSuperview()
+            }
         }
     }
 }