Merge pull request #150 from TeamHY2/Fix/#149-RankingNumber

TeamHY2 · Jan 16, 2025 · ce84d1e · ce84d1e
2 parents 190338a + 523e2bf
commit ce84d1e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/HongikYeolgong2/Presentation/Ranking/Component/RankingCell.swift b/HongikYeolgong2/Presentation/Ranking/Component/RankingCell.swift
@@ -9,12 +9,17 @@ import SwiftUI
 
 struct RankingCell: View {
     let departmentRankInfo: RankingDepartment
+    let offset: Int
+
+    var isStudyTimeLessThanZero: Bool {
+        departmentRankInfo.studyDurationOfWeek <= 0
+    }
 
     var body: some View {
         VStack(spacing: 0) {
             HStack(spacing: 0) {
                 HStack(spacing: 14.adjustToScreenWidth) {
-                    Text("\(departmentRankInfo.currentRank)")
+                    Text(isStudyTimeLessThanZero ? "-" : "\(departmentRankInfo.currentRank)")
                         .font(.pretendard(size: 16, weight: .regular))
                         .foregroundStyle(setFontColor)
 
@@ -55,7 +60,7 @@ extension RankingCell {
     }
 
     private var setBackground: some View {
-        switch departmentRankInfo.currentRank {
+        switch offset {
         case 1:
             return Image(.rankingBox1)
                 .resizable()
@@ -76,7 +81,7 @@ extension RankingCell {
     }
 
     private var setFontColor: Color {
-        switch departmentRankInfo.currentRank {
+        switch offset {
         case 1:
                 .gray600
         case 2:

diff --git a/HongikYeolgong2/Presentation/Ranking/Component/RankingListView.swift b/HongikYeolgong2/Presentation/Ranking/Component/RankingListView.swift
@@ -13,8 +13,8 @@ struct RankingListView: View {
     var body: some View {
         ScrollView(showsIndicators: false) {
             LazyVStack(spacing: 16) {
-                ForEach(departmentRankings, id: \.self) { rankingInfo in
-                    RankingCell(departmentRankInfo: rankingInfo)
+                ForEach(Array(departmentRankings.enumerated()), id: \.self.offset) { (offset, rankingInfo) in
+                    RankingCell(departmentRankInfo: rankingInfo, offset: offset + 1)
                 }
             }
             .padding(.horizontal, 32.adjustToScreenWidth)