From f81ad83582e17dadae6645d86e8462ff309deaab Mon Sep 17 00:00:00 2001
From: hyungyu Kim <ypsophila97@icloud.com>
Date: Fri, 21 Jan 2022 16:00:01 +0900
Subject: [PATCH 1/3] =?UTF-8?q?[Fix]=20#165=20-=20=EB=A9=98=ED=8A=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=83=81=ED=83=9C=EB=B0=94=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 인증가능할때 멘트 추가
- 상태바 하얀색으로 변경
- 66일때는 스파크 보내기 버튼도 비활성화
---
 .../Cells/HabitRoom/habitRoomMemberCVC.swift  | 29 +++++++++++++++----
 .../HabitRoom/HabitRoomVC.swift               | 11 +++++--
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/Spark-iOS/Spark-iOS/Source/Cells/HabitRoom/habitRoomMemberCVC.swift b/Spark-iOS/Spark-iOS/Source/Cells/HabitRoom/habitRoomMemberCVC.swift
index 453e695a..af29808b 100644
--- a/Spark-iOS/Spark-iOS/Source/Cells/HabitRoom/habitRoomMemberCVC.swift
+++ b/Spark-iOS/Spark-iOS/Source/Cells/HabitRoom/habitRoomMemberCVC.swift
@@ -63,7 +63,8 @@ extension HabitRoomMemberCVC {
                     profileImg: String,
                     nickname: String,
                     status: String,
-                    receivedSpark: Int) {
+                    receivedSpark: Int,
+                    leftDay: Int) {
         profileImage.updateImage(profileImg)
         
         nicknameLabel.text = nickname
@@ -81,8 +82,13 @@ extension HabitRoomMemberCVC {
             stickerImage.image = UIImage(named: "stickerRestSmallHavitroom")
             stickerImage.isHidden = false
         } else {
-            statusLabel.text = "인증은 내일부터 가능해요."
-            stickerImage.isHidden = true
+            if leftDay == 66 {
+                statusLabel.text = "인증은 내일부터 가능해요."
+                stickerImage.isHidden = true
+            } else {
+                statusLabel.text = "아직 인증하지 않았어요!"
+                stickerImage.isHidden = true
+            }
         }
         
         tagMeImage.isHidden = false
@@ -97,7 +103,8 @@ extension HabitRoomMemberCVC {
                         profileImg: String,
                         nickname: String,
                         status: String,
-                        sparkDone: Bool) {
+                        sparkDone: Bool,
+                        leftDay: Int) {
         profileImage.updateImage(profileImg)
         
         nicknameLabel.text = nickname
@@ -109,14 +116,24 @@ extension HabitRoomMemberCVC {
         } else if status == "REST" {
             statusLabel.text = "오늘은 쉬어요."
         } else {
-            statusLabel.text = "인증은 내일부터 가능해요."
+            if leftDay == 66 {
+                statusLabel.text = "인증은 내일부터 가능해요."
+                stickerImage.isHidden = true
+            } else {
+                statusLabel.text = "아직 인증하지 않았어요!"
+                stickerImage.isHidden = true
+            }
         }
         
         tagMeImage.isHidden = true
         if sparkDone {
             sparkImage.image = UIImage(named: "icFireInactive")
         } else {
-            sparkImage.image = UIImage(named: "icFireDefault")
+            if leftDay == 66 {
+                sparkImage.image = UIImage(named: "icFireInactive")
+            } else {
+                sparkImage.image = UIImage(named: "icFireDefault")
+            }
         }
         sparkCountLabel.isHidden = true
     }
diff --git a/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/HabitRoomVC.swift b/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/HabitRoomVC.swift
index fbe07bb1..f1e6719a 100644
--- a/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/HabitRoomVC.swift
+++ b/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/HabitRoomVC.swift
@@ -54,6 +54,11 @@ class HabitRoomVC: UIViewController {
         }
     }
     
+    // set status bar style
+    override var preferredStatusBarStyle: UIStatusBarStyle {
+        return .lightContent
+    }
+    
     // FIXME: - update??
 //    override func viewDidLayoutSubviews() {
 //        super.viewDidLayoutSubviews()
@@ -284,7 +289,8 @@ extension HabitRoomVC: UICollectionViewDataSource {
                             profileImg: habitRoomDetail?.myRecord.profileImg ?? "",
                             nickname: habitRoomDetail?.myRecord.nickname ?? "",
                             status: habitRoomDetail?.myRecord.status ?? "",
-                            receivedSpark: habitRoomDetail?.myRecord.receivedSpark ?? 0)
+                            receivedSpark: habitRoomDetail?.myRecord.receivedSpark ?? 0,
+                            leftDay: habitRoomDetail?.leftDay ?? 0)
             
             return cell
         } else {
@@ -293,7 +299,8 @@ extension HabitRoomVC: UICollectionViewDataSource {
                                 profileImg: habitRoomDetail?.otherRecords[indexPath.item - 1]?.profileImg ?? "",
                                 nickname: habitRoomDetail?.otherRecords[indexPath.item - 1]?.nickname ?? "",
                                 status: habitRoomDetail?.otherRecords[indexPath.item - 1]?.status ?? "",
-                                sparkDone: false)
+                                sparkDone: false,
+                                leftDay: habitRoomDetail?.leftDay ?? 0)
             
             return cell
         }

From 2587114f73c1fec69c2c116bd54631d65fb8f438 Mon Sep 17 00:00:00 2001
From: hyungyu Kim <ypsophila97@icloud.com>
Date: Fri, 21 Jan 2022 16:21:03 +0900
Subject: [PATCH 2/3] =?UTF-8?q?[Fix]=20#165=20-=20=EC=8A=A4=ED=8C=8C?=
 =?UTF-8?q?=ED=81=AC=20=EB=B3=B4=EB=82=B4=EA=B8=B0=20=EB=B7=B0=20=ED=99=94?=
 =?UTF-8?q?=EB=A9=B4=EC=A0=84=ED=99=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Cells/HabitRoom/habitRoomMemberCVC.swift  | 20 ++++++++++++++++++-
 .../HabitRoom/HabitRoomVC.swift               | 12 ++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/Spark-iOS/Spark-iOS/Source/Cells/HabitRoom/habitRoomMemberCVC.swift b/Spark-iOS/Spark-iOS/Source/Cells/HabitRoom/habitRoomMemberCVC.swift
index af29808b..81fb0985 100644
--- a/Spark-iOS/Spark-iOS/Source/Cells/HabitRoom/habitRoomMemberCVC.swift
+++ b/Spark-iOS/Spark-iOS/Source/Cells/HabitRoom/habitRoomMemberCVC.swift
@@ -9,6 +9,10 @@ import UIKit
 
 class HabitRoomMemberCVC: UICollectionViewCell {
 
+    // MARK: - Properties
+    
+    var presentToSendSparkVCClosure: (()-> Void)?
+    
     // MARK: - @IBOutlet Properties
     
     @IBOutlet weak var profileImage: UIImageView!
@@ -35,6 +39,7 @@ class HabitRoomMemberCVC: UICollectionViewCell {
         sparkCountLabel.text = ""
         sparkCountLabel.isHidden = true
         sparkImage.image = UIImage()
+        sparkImage.isUserInteractionEnabled = false
         stickerImage.isHidden = true
         stickerImage.image = UIImage()
     }
@@ -104,7 +109,8 @@ extension HabitRoomMemberCVC {
                         nickname: String,
                         status: String,
                         sparkDone: Bool,
-                        leftDay: Int) {
+                        leftDay: Int,
+                        closure: (()->Void)?) {
         profileImage.updateImage(profileImg)
         
         nicknameLabel.text = nickname
@@ -128,13 +134,25 @@ extension HabitRoomMemberCVC {
         tagMeImage.isHidden = true
         if sparkDone {
             sparkImage.image = UIImage(named: "icFireInactive")
+            sparkImage.isUserInteractionEnabled = false
         } else {
             if leftDay == 66 {
                 sparkImage.image = UIImage(named: "icFireInactive")
+                sparkImage.isUserInteractionEnabled = false
             } else {
                 sparkImage.image = UIImage(named: "icFireDefault")
+                sparkImage.isUserInteractionEnabled = true
+                
+                presentToSendSparkVCClosure = closure
+                let tap = UITapGestureRecognizer(target: self, action: #selector(presentToSendSparkVC))
+                sparkImage.addGestureRecognizer(tap)
             }
         }
         sparkCountLabel.isHidden = true
     }
+    
+    @objc
+    private func presentToSendSparkVC() {
+        presentToSendSparkVCClosure?()
+    }
 }
diff --git a/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/HabitRoomVC.swift b/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/HabitRoomVC.swift
index 595f9257..87c57093 100644
--- a/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/HabitRoomVC.swift
+++ b/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/HabitRoomVC.swift
@@ -231,6 +231,16 @@ extension HabitRoomVC {
             print("카메라 안됩니다.")
         }
     }
+    
+    private func presentToSendSparkVC(recordID: Int) {
+        guard let nextVC = UIStoryboard(name: Const.Storyboard.Name.sendSpark, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.sendSpark) as? SendSparkVC else { return }
+        nextVC.modalPresentationStyle = .overFullScreen
+        nextVC.modalTransitionStyle = .crossDissolve
+        nextVC.roomID = habitRoomDetail?.roomID
+        nextVC.recordID = recordID
+
+        self.present(nextVC, animated: true, completion: nil)
+    }
 }
 
 // MARK: - UIImagePickerDelegate
@@ -301,7 +311,7 @@ extension HabitRoomVC: UICollectionViewDataSource {
                                 nickname: habitRoomDetail?.otherRecords[indexPath.item - 1]?.nickname ?? "",
                                 status: habitRoomDetail?.otherRecords[indexPath.item - 1]?.status ?? "",
                                 sparkDone: false,
-                                leftDay: habitRoomDetail?.leftDay ?? 0)
+                                leftDay: habitRoomDetail?.leftDay ?? 0) { self.presentToSendSparkVC(recordID: self.habitRoomDetail?.otherRecords[indexPath.item - 1]?.recordID ?? 0) }
             
             return cell
         }

From 2fa1022416f9aeba50e7f16d5dfd5cd9e520e875 Mon Sep 17 00:00:00 2001
From: hyungyu Kim <ypsophila97@icloud.com>
Date: Fri, 21 Jan 2022 18:18:47 +0900
Subject: [PATCH 3/3] =?UTF-8?q?[Feat]=20#165=20-=20=EC=83=81=ED=83=9C?=
 =?UTF-8?q?=EB=A5=BC=20=EA=B0=80=EC=A7=80=EA=B3=A0=20=EC=8A=A4=ED=8C=8C?=
 =?UTF-8?q?=ED=81=AC=20=EB=B2=84=ED=8A=BC=20=ED=99=9C=EC=84=B1=ED=99=94?=
 =?UTF-8?q?=EC=9C=A0=EB=AC=B4=EC=99=80=20=EC=98=A4=EB=8A=98=EC=9D=98=20?=
 =?UTF-8?q?=EC=9D=B8=EC=A6=9D=20=EB=B6=84=EA=B8=B0=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resource/Constants/Notification.swift     |  1 +
 .../HabitRoom/HabitAuth.storyboard            |  4 +-
 .../HabitRoom/HabitRoom.storyboard            | 36 ++++++------
 .../Cells/HabitRoom/habitRoomMemberCVC.swift  |  7 ++-
 .../HabitRoom/HabitAuthVC.swift               |  5 +-
 .../HabitRoom/HabitRoomVC.swift               | 55 +++++++++++++++----
 6 files changed, 73 insertions(+), 35 deletions(-)

diff --git a/Spark-iOS/Spark-iOS/Resource/Constants/Notification.swift b/Spark-iOS/Spark-iOS/Resource/Constants/Notification.swift
index 83fa90ac..743f4834 100644
--- a/Spark-iOS/Spark-iOS/Resource/Constants/Notification.swift
+++ b/Spark-iOS/Spark-iOS/Resource/Constants/Notification.swift
@@ -13,4 +13,5 @@ extension Notification.Name {
     static let appearFloatingButton = Notification.Name("appearFloatingButton")
     static let disappearFloatingButton = Notification.Name("disappearFloatingButton")
     static let resetStopWatch = Notification.Name("resetStopWatch")
+    static let updateHabitRoom = Notification.Name("updateHabitRoom")
 }
diff --git a/Spark-iOS/Spark-iOS/Resource/Storyboards/HabitRoom/HabitAuth.storyboard b/Spark-iOS/Spark-iOS/Resource/Storyboards/HabitRoom/HabitAuth.storyboard
index 8f60f422..c618d532 100644
--- a/Spark-iOS/Spark-iOS/Resource/Storyboards/HabitRoom/HabitAuth.storyboard
+++ b/Spark-iOS/Spark-iOS/Resource/Storyboards/HabitRoom/HabitAuth.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
diff --git a/Spark-iOS/Spark-iOS/Resource/Storyboards/HabitRoom/HabitRoom.storyboard b/Spark-iOS/Spark-iOS/Resource/Storyboards/HabitRoom/HabitRoom.storyboard
index eec07427..b8100046 100644
--- a/Spark-iOS/Spark-iOS/Resource/Storyboards/HabitRoom/HabitRoom.storyboard
+++ b/Spark-iOS/Spark-iOS/Resource/Storyboards/HabitRoom/HabitRoom.storyboard
@@ -21,11 +21,11 @@
             <objects>
                 <viewController storyboardIdentifier="HabitRoomVC" id="Y6W-OH-hqX" customClass="HabitRoomVC" customModule="Spark_iOS" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="suy-dQ-y1I">
-                                <rect key="frame" x="0.0" y="343" width="414" height="553"/>
+                                <rect key="frame" x="0.0" y="499" width="600" height="101"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="nGt-Lp-835">
                                     <size key="itemSize" width="128" height="128"/>
@@ -45,13 +45,13 @@
                                 </cells>
                             </collectionView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="INP-rS-JPk">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="348"/>
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="504"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="INP-rS-JPk" secondAttribute="height" multiplier="375:315" id="m59-v9-3SR"/>
                                 </constraints>
                             </imageView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mzm-65-lz0">
-                                <rect key="frame" x="20" y="64" width="24" height="24"/>
+                                <rect key="frame" x="20" y="20" width="24" height="24"/>
                                 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                 <state key="normal" image="icBackWhite"/>
                                 <connections>
@@ -59,24 +59,24 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ABA-OJ-sFD">
-                                <rect key="frame" x="186.5" y="64" width="41.5" height="20.5"/>
+                                <rect key="frame" x="279.5" y="20" width="41.5" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eB0-bS-UA9">
-                                <rect key="frame" x="370" y="64" width="24" height="24"/>
+                                <rect key="frame" x="556" y="20" width="24" height="24"/>
                                 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                 <state key="normal" image="icMoreVerticalWhite"/>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cFf-Os-dsz">
-                                <rect key="frame" x="20" y="117.5" width="41.5" height="20.5"/>
+                                <rect key="frame" x="20" y="73.5" width="41.5" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="9" translatesAutoresizingMaskIntoConstraints="NO" id="Wbn-p4-clp">
-                                <rect key="frame" x="322" y="119" width="72" height="18"/>
+                                <rect key="frame" x="508" y="75" width="72" height="18"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="IXG-na-OT7">
                                         <rect key="frame" x="0.0" y="0.0" width="18" height="18"/>
@@ -94,43 +94,43 @@
                                 </constraints>
                             </stackView>
                             <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="pjm-qP-ARe">
-                                <rect key="frame" x="20" y="152" width="374" height="4"/>
+                                <rect key="frame" x="20" y="108" width="560" height="4"/>
                             </progressView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wy4-Vp-81Z">
-                                <rect key="frame" x="20" y="164" width="41.5" height="20.5"/>
+                                <rect key="frame" x="20" y="120" width="41.5" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="omc-x7-fqu">
-                                <rect key="frame" x="352.5" y="164" width="41.5" height="20.5"/>
+                                <rect key="frame" x="538.5" y="120" width="41.5" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RnB-mU-OUf">
-                                <rect key="frame" x="20" y="212.5" width="374" height="71.5"/>
+                                <rect key="frame" x="20" y="168.5" width="560" height="107"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="시간" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1cf-84-80o">
-                                        <rect key="frame" x="8" y="10" width="26" height="20.5"/>
+                                        <rect key="frame" x="8" y="10" width="24.5" height="16.5"/>
                                         <fontDescription key="fontDescription" name="NotoSansKR-Bold" family="Noto Sans KR" pointSize="14"/>
                                         <color key="textColor" name="sparkWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="목표" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qSy-7n-MfT">
-                                        <rect key="frame" x="8" y="41" width="26" height="20.5"/>
+                                        <rect key="frame" x="8" y="80.5" width="24.5" height="16.5"/>
                                         <fontDescription key="fontDescription" name="NotoSansKR-Bold" family="Noto Sans KR" pointSize="14"/>
                                         <color key="textColor" name="sparkWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ngC-dS-4WJ">
-                                        <rect key="frame" x="41" y="10" width="41.5" height="20.5"/>
+                                        <rect key="frame" x="39.5" y="10" width="41.5" height="20.5"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <color key="textColor" name="sparkWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b13-Cp-oOC">
-                                        <rect key="frame" x="41" y="41" width="41.5" height="20.5"/>
+                                        <rect key="frame" x="39.5" y="80.5" width="41.5" height="20.5"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <color key="textColor" name="sparkWhite"/>
                                         <nil key="highlightedColor"/>
@@ -150,7 +150,7 @@
                                 </constraints>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BjG-wg-ehW">
-                                <rect key="frame" x="112" y="781.5" width="190" height="60.5"/>
+                                <rect key="frame" x="112" y="460.5" width="376" height="119.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="BjG-wg-ehW" secondAttribute="height" multiplier="151:48" id="V4F-gB-9Dm"/>
                                 </constraints>
@@ -207,7 +207,7 @@
                         <outlet property="habitTitleLabel" destination="ABA-OJ-sFD" id="tNY-Gf-EIT"/>
                         <outlet property="mainCollectionView" destination="suy-dQ-y1I" id="24D-in-Qwv"/>
                         <outlet property="moreButton" destination="eB0-bS-UA9" id="IJL-qg-RtK"/>
-                        <outlet property="progessView" destination="pjm-qP-ARe" id="9PS-3m-BQY"/>
+                        <outlet property="progressView" destination="pjm-qP-ARe" id="9PS-3m-BQY"/>
                         <outlet property="secondLifeImage" destination="bQZ-4W-DDf" id="tsu-7V-ufP"/>
                         <outlet property="startDateLabel" destination="wy4-Vp-81Z" id="0LK-yl-snN"/>
                         <outlet property="thirdLifeImage" destination="1Om-9f-SMR" id="LVB-pd-8fr"/>
diff --git a/Spark-iOS/Spark-iOS/Source/Cells/HabitRoom/habitRoomMemberCVC.swift b/Spark-iOS/Spark-iOS/Source/Cells/HabitRoom/habitRoomMemberCVC.swift
index 81fb0985..30952967 100644
--- a/Spark-iOS/Spark-iOS/Source/Cells/HabitRoom/habitRoomMemberCVC.swift
+++ b/Spark-iOS/Spark-iOS/Source/Cells/HabitRoom/habitRoomMemberCVC.swift
@@ -108,7 +108,6 @@ extension HabitRoomMemberCVC {
                         profileImg: String,
                         nickname: String,
                         status: String,
-                        sparkDone: Bool,
                         leftDay: Int,
                         closure: (()->Void)?) {
         profileImage.updateImage(profileImg)
@@ -132,11 +131,12 @@ extension HabitRoomMemberCVC {
         }
         
         tagMeImage.isHidden = true
-        if sparkDone {
+        
+        if leftDay == 66 {
             sparkImage.image = UIImage(named: "icFireInactive")
             sparkImage.isUserInteractionEnabled = false
         } else {
-            if leftDay == 66 {
+            if status == "DONE" || status == "REST" {
                 sparkImage.image = UIImage(named: "icFireInactive")
                 sparkImage.isUserInteractionEnabled = false
             } else {
@@ -148,6 +148,7 @@ extension HabitRoomMemberCVC {
                 sparkImage.addGestureRecognizer(tap)
             }
         }
+
         sparkCountLabel.isHidden = true
     }
     
diff --git a/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/HabitAuthVC.swift b/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/HabitAuthVC.swift
index 745e7136..7d9bb574 100644
--- a/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/HabitAuthVC.swift
+++ b/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/HabitAuthVC.swift
@@ -43,6 +43,7 @@ class HabitAuthVC: UIViewController {
     
     @IBAction func touchOutsideDismiss(_ sender: Any) {
         self.dismiss(animated: true, completion: nil)
+        NotificationCenter.default.post(name: .updateHabitRoom, object: nil)
     }
 }
 
@@ -165,8 +166,10 @@ extension HabitAuthVC {
     func setConsiderRestWithAPI(statusType: String) {
         RoomAPI.shared.setConsiderRest(roomID: roomID ?? 0, statusType: statusType) {  response in
             switch response {
-            case .success(_):
+            case .success(let message):
                 self.dismiss(animated: true, completion: nil)
+                NotificationCenter.default.post(name: .updateHabitRoom, object: nil)
+                print("setConsiderRestWithAPI - success: \(message)")
             case .requestErr(let message):
                 print("setConsiderRestWithAPI - requestErr: \(message)")
             case .pathErr:
diff --git a/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/HabitRoomVC.swift b/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/HabitRoomVC.swift
index ab8c7b4d..213623de 100644
--- a/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/HabitRoomVC.swift
+++ b/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/HabitRoomVC.swift
@@ -23,7 +23,7 @@ class HabitRoomVC: UIViewController {
     @IBOutlet weak var flakeImageView: UIImageView!
     @IBOutlet weak var habitTitleLabel: UILabel!
     @IBOutlet weak var ddayTitleLabel: UILabel!
-    @IBOutlet weak var progessView: UIProgressView!
+    @IBOutlet weak var progressView: UIProgressView!
     @IBOutlet weak var startDateLabel: UILabel!
     @IBOutlet weak var endDateLabel: UILabel!
     @IBOutlet weak var bgView: UIView!
@@ -44,6 +44,7 @@ class HabitRoomVC: UIViewController {
         setUI()
         setDelegate()
         registerXib()
+        setNotification()
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -115,7 +116,7 @@ extension HabitRoomVC {
         ddayTitleLabel.font = .h1BigtitleEng
         ddayTitleLabel.textColor = .sparkWhite
         
-        progessView.trackTintColor = .sparkDeepGray
+        progressView.trackTintColor = .sparkDeepGray
         
         startDateLabel.font = .captionEng
         startDateLabel.textColor = .sparkWhite
@@ -135,12 +136,8 @@ extension HabitRoomVC {
         authButton.setTitle("오늘의 인증", for: .normal)
         authButton.setTitleColor(.sparkWhite, for: .normal)
         authButton.titleLabel?.font = .btn1Default
-        authButton.backgroundColor = .sparkDarkPinkred
-        authButton.layer.cornerRadius = 2
-        authButton.layer.shadowColor = UIColor.sparkDarkPinkred.cgColor
-        authButton.layer.shadowOffset = CGSize(width: 0, height: 2)
-        authButton.layer.shadowOpacity = Float(0.3)
-        authButton.layer.shadowRadius = 10
+        authButton.backgroundColor = .sparkGray
+        authButton.isEnabled = false
     }
     
     private func setUIByData(_ habitRoomDetail: HabitRoomDetail) {
@@ -157,9 +154,11 @@ extension HabitRoomVC {
         
         let sparkFlake = SparkFlake(leftDay: leftDay)
         flakeImageView.image = sparkFlake.sparkFlakeHabitBackground()
-        progessView.progressTintColor = sparkFlake.sparkFlakeColor()
+        progressView.progressTintColor = sparkFlake.sparkFlakeColor()
         // 맞나..?
-        progessView.setProgress(Float((66 - leftDay )/66), animated: true)
+        
+//        progessView.setProgress(Float((66 - leftDay )/66), animated: true)
+        progressView.setProgress(Float((66 - leftDay )/66), animated: false)
         
         startDateLabel.text = habitRoomDetail.startDate
         endDateLabel.text = habitRoomDetail.endDate
@@ -183,6 +182,32 @@ extension HabitRoomVC {
                 lifeImgaeList[index]?.image = UIImage(named: "icRoomlifeEmpty")
             }
         }
+        
+        // 오늘의 인증 버튼 세팅
+        if leftDay == 66 {
+            authButton.isEnabled = false
+            authButton.backgroundColor = .sparkGray
+            authButton.layer.borderWidth = 0
+        } else {
+            if habitRoomDetail.myRecord.status == "DONE" ||
+               habitRoomDetail.myRecord.status == "REST" {
+                authButton.isEnabled = false
+                authButton.backgroundColor = .sparkGray
+                authButton.layer.borderWidth = 0
+            } else {
+                authButton.isEnabled = true
+                authButton.backgroundColor = .sparkDarkPinkred
+                authButton.layer.cornerRadius = 2
+                authButton.layer.shadowColor = UIColor.sparkDarkPinkred.cgColor
+                authButton.layer.shadowOffset = CGSize(width: 0, height: 2)
+                authButton.layer.shadowOpacity = Float(0.3)
+                authButton.layer.shadowRadius = 10
+            }
+        }
+    }
+    
+    private func setNotification() {
+        NotificationCenter.default.addObserver(self, selector: #selector(updateHabitRoom), name: .updateHabitRoom, object: nil)
     }
     
     private func setDelegate() {
@@ -242,6 +267,15 @@ extension HabitRoomVC {
 
         self.present(nextVC, animated: true, completion: nil)
     }
+    
+    // MARK: - @objc Methods
+    
+    @objc
+    private func updateHabitRoom() {
+        fetchHabitRoomDetailWithAPI(roomID: roomID ?? 0) {
+            self.mainCollectionView.scrollToItem(at: IndexPath(item: 0, section: 0), at: .top, animated: false)
+        }
+    }
 }
 
 // MARK: - UIImagePickerDelegate
@@ -311,7 +345,6 @@ extension HabitRoomVC: UICollectionViewDataSource {
                                 profileImg: habitRoomDetail?.otherRecords[indexPath.item - 1]?.profileImg ?? "",
                                 nickname: habitRoomDetail?.otherRecords[indexPath.item - 1]?.nickname ?? "",
                                 status: habitRoomDetail?.otherRecords[indexPath.item - 1]?.status ?? "",
-                                sparkDone: false,
                                 leftDay: habitRoomDetail?.leftDay ?? 0) { self.presentToSendSparkVC(recordID: self.habitRoomDetail?.otherRecords[indexPath.item - 1]?.recordID ?? 0) }
             
             return cell