[Feat] TeamSparker#122 - 완료 리스트 서버 연결 완료

완료 리스트 서버 연결 완료
L-j-h-c · Jan 19, 2022 · 9639acb · 9639acb
1 parent ef7e6bd
commit 9639acb
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 6 deletions.
diff --git a/Spark-iOS/Spark-iOS/Source/Cells/Storage/DoingStorageCVC.swift b/Spark-iOS/Spark-iOS/Source/Cells/Storage/DoingStorageCVC.swift
@@ -25,7 +25,7 @@ class DoingStorageCVC: UICollectionViewCell {
 
     func setUI() {
         gradationUIView.setGradient(color1: UIColor.clear, color2: UIColor.black)
-        flakeImage.contentMode = .scaleAspectFit
+        flakeImage.contentMode = .center
     }
 
     func initCell(roomName: String,
@@ -37,9 +37,7 @@ class DoingStorageCVC: UICollectionViewCell {
         let sparkFlake: SparkFlake = SparkFlake(leftDay: leftDay)
 
         flakeImage.image = sparkFlake.sparkFlakeGoingStorage()
-
         sparkCountLabel.text = String(sparkCount)
-
         roomNameLabel.text = roomName
 
         let startDate = startDate.split(separator: "-")

diff --git a/Spark-iOS/Spark-iOS/Source/Cells/Storage/DoneStorageCVC.swift b/Spark-iOS/Spark-iOS/Source/Cells/Storage/DoneStorageCVC.swift
@@ -9,6 +9,10 @@ import UIKit
 
 class DoneStorageCVC: UICollectionViewCell {
     @IBOutlet weak var gradationUIView: UIView!
+    @IBOutlet weak var thumbnailImage: UIImageView!
+    @IBOutlet weak var roomNameLabel: UILabel!
+    @IBOutlet weak var dateLabel: UILabel!
+    @IBOutlet weak var sparkCountLabel: UILabel!
 
     override func awakeFromNib() {
         super.awakeFromNib()
@@ -18,4 +22,19 @@ class DoneStorageCVC: UICollectionViewCell {
     func setUI() {
         gradationUIView.setGradient(color1: UIColor.clear, color2: UIColor.black)
     }
+
+    func initCell(roomName: String,
+                  thumbnail: String,
+                  sparkCount: Int,
+                  startDate: String,
+                  endDate: String) {
+        sparkCountLabel.text = String(sparkCount)
+        roomNameLabel.text = roomName
+
+        let startDate = startDate.split(separator: "-")
+        let endDate = endDate.split(separator: "-")
+        dateLabel.text = "\(startDate[0]).\(startDate[1]).\(startDate[2]) - \(endDate[0]).\(endDate[1]).\(endDate[2])"
+
+        thumbnailImage.updateImage(thumbnail)
+    }
 }
diff --git a/Spark-iOS/Spark-iOS/Source/Cells/Storage/DoneStorageCVC.xib b/Spark-iOS/Spark-iOS/Source/Cells/Storage/DoneStorageCVC.xib
@@ -126,7 +126,11 @@
                 <constraint firstAttribute="top" secondItem="pDq-F4-Umy" secondAttribute="top" id="yql-gB-r7H"/>
             </constraints>
             <connections>
+                <outlet property="dateLabel" destination="Aj5-A6-BNH" id="4Cd-Gi-bcz"/>
                 <outlet property="gradationUIView" destination="zjs-TB-eup" id="Hg6-av-YQx"/>
+                <outlet property="roomNameLabel" destination="Yb6-ig-5g3" id="pV6-zw-pAx"/>
+                <outlet property="sparkCountLabel" destination="Lnz-ma-zbE" id="WcH-yx-21r"/>
+                <outlet property="thumbnailImage" destination="SMW-pe-rPY" id="umb-q7-gH1"/>
             </connections>
             <point key="canvasLocation" x="133" y="114"/>
         </collectionViewCell>

diff --git a/Spark-iOS/Spark-iOS/Source/Cells/Storage/FailStorageCVC.swift b/Spark-iOS/Spark-iOS/Source/Cells/Storage/FailStorageCVC.swift
@@ -9,7 +9,10 @@ import UIKit
 
 class FailStorageCVC: UICollectionViewCell {
     @IBOutlet weak var gradationUIView: UIView!
-
+    @IBOutlet weak var roomNameLabel: UILabel!
+    @IBOutlet weak var sparkCountLabel: UILabel!
+    @IBOutlet weak var dateLabel: UILabel!
+
     override func awakeFromNib() {
         super.awakeFromNib()
         setUI()

diff --git a/Spark-iOS/Spark-iOS/Source/Cells/Storage/FailStorageCVC.xib b/Spark-iOS/Spark-iOS/Source/Cells/Storage/FailStorageCVC.xib
@@ -134,7 +134,10 @@
                 <constraint firstItem="ZTg-uK-7eu" firstAttribute="bottom" secondItem="Ej9-nc-oqb" secondAttribute="bottom" id="qyF-AM-FsW"/>
             </constraints>
             <connections>
+                <outlet property="dateLabel" destination="0lu-UT-RR9" id="VbR-Fj-VoN"/>
                 <outlet property="gradationUIView" destination="ZpD-q5-A5v" id="ynX-7X-vt3"/>
+                <outlet property="roomNameLabel" destination="ayp-qh-YU2" id="8OA-GT-d8Q"/>
+                <outlet property="sparkCountLabel" destination="ZLz-pW-Nr1" id="uic-tG-Ua4"/>
             </connections>
             <point key="canvasLocation" x="133" y="114"/>
         </collectionViewCell>

diff --git a/Spark-iOS/Spark-iOS/Source/SceneDelegate.swift b/Spark-iOS/Spark-iOS/Source/SceneDelegate.swift
@@ -18,7 +18,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
         window = UIWindow(frame: windowScene.coordinateSpace.bounds)
         window?.windowScene = windowScene
-        let rootViewController = UIStoryboard(name: Const.Storyboard.Name.storage, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.storage)
+        let rootViewController = UIStoryboard(name: Const.Storyboard.Name.mainTabBar, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.mainTabBar)
         window?.rootViewController = rootViewController
         window?.makeKeyAndVisible()
     }

diff --git a/Spark-iOS/Spark-iOS/Source/ViewControllers/TabBar/StorageVC.swift b/Spark-iOS/Spark-iOS/Source/ViewControllers/TabBar/StorageVC.swift
@@ -48,6 +48,9 @@ class StorageVC: UIViewController {
         let name = UICollectionView(frame: CGRect(x: 0, y: 197, width: 375, height: 520), collectionViewLayout: layout)
         name.backgroundColor = .clear
 
+        name.indicatorStyle = .white
+        name.showsVerticalScrollIndicator = true
+
         return name
     }()
 
@@ -61,6 +64,9 @@ class StorageVC: UIViewController {
         let name = UICollectionView(frame: CGRect(x: 0, y: 197, width: 375, height: 520), collectionViewLayout: layout)
         name.backgroundColor = .clear
 
+        name.indicatorStyle = .white
+        name.showsVerticalScrollIndicator = true
+
         return name
     }()
 
@@ -74,6 +80,9 @@ class StorageVC: UIViewController {
         let name = UICollectionView(frame: CGRect(x: 0, y: 197, width: 375, height: 520), collectionViewLayout: layout)
         name.backgroundColor = .clear
 
+        name.indicatorStyle = .white
+        name.showsVerticalScrollIndicator = true
+
         return name
     }()
 
@@ -407,15 +416,30 @@ extension StorageVC: UICollectionViewDelegate, UICollectionViewDataSource {
 
             guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: Const.Xib.NibName.doingStorageCVC, for: indexPath) as? DoingStorageCVC else { return UICollectionViewCell() }
 
-            cell.initCell(roomName: onGoingRoomList[indexPath.row].roomName, leftDay: onGoingRoomList[indexPath.row].leftDay , thumbnail: onGoingRoomList[indexPath.row].thumbnail , sparkCount: onGoingRoomList[indexPath.row].totalReceivedSpark, startDate: onGoingRoomList[indexPath.row].startDate, endDate: onGoingRoomList[indexPath.row].endDate)
+            cell.initCell(roomName: onGoingRoomList[indexPath.row].roomName,
+                          leftDay: onGoingRoomList[indexPath.row].leftDay,
+                          thumbnail: onGoingRoomList[indexPath.row].thumbnail,
+                          sparkCount: onGoingRoomList[indexPath.row].totalReceivedSpark,
+                          startDate: onGoingRoomList[indexPath.row].startDate,
+                          endDate: onGoingRoomList[indexPath.row].endDate)
 
             return cell
 
         case DoneCV:
+            guard let completeRoomList = completeRoomList else { return UICollectionViewCell()}
+
             guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: Const.Xib.NibName.doneStorageCVC, for: indexPath) as? DoneStorageCVC else { return UICollectionViewCell()}
 
+            cell.initCell(roomName: completeRoomList[indexPath.row].roomName,
+                          thumbnail: completeRoomList[indexPath.row].thumbnail,
+                          sparkCount: completeRoomList[indexPath.row].totalReceivedSpark,
+                          startDate: completeRoomList[indexPath.row].startDate,
+                          endDate: completeRoomList[indexPath.row].endDate)
+
             return cell
         default:
+            guard let completeRoomList = completeRoomList else { return UICollectionViewCell()}
+
             guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: Const.Xib.NibName.failStorageCVC, for: indexPath) as? FailStorageCVC else { return UICollectionViewCell() }
 
             return cell