[Refactor] #537 - 솝탬프 UI 변경

SOPT-iOS/Projects/Features/BaseFeatureDependency/Sources/Alert/AlertVCTheme.swift

@@ -23,7 +23,7 @@ extension AlertVC.AlertTheme {
         case .main:
             return DSKitAsset.Colors.gray700.color
         case .soptamp:
-            return DSKitAsset.Colors.white.color
+            return DSKitAsset.Colors.gray800.color
         }
     }
 
@@ -32,7 +32,7 @@ extension AlertVC.AlertTheme {
         case .main:
             return DSKitAsset.Colors.white100.color
         case .soptamp:
-            return DSKitAsset.Colors.soptampGray900.color
+            return DSKitAsset.Colors.white.color
         }
     }
 
@@ -50,7 +50,7 @@ extension AlertVC.AlertTheme {
         case .main:
             return DSKitAsset.Colors.white100.color
         case .soptamp:
-            return DSKitAsset.Colors.soptampError200.color
+            return DSKitAsset.Colors.white.color
         }
     }
 
@@ -59,7 +59,7 @@ extension AlertVC.AlertTheme {
         case .main:
             return DSKitAsset.Colors.black100.color
         case .soptamp:
-            return DSKitAsset.Colors.gray10.color
+            return DSKitAsset.Colors.black.color
         }
     }
 
@@ -68,7 +68,7 @@ extension AlertVC.AlertTheme {
         case .main:
             return isNetworkErr ? DSKitAsset.Colors.white100.color : DSKitAsset.Colors.gray600.color
         case .soptamp:
-            return isNetworkErr ? DSKitAsset.Colors.black60.color : DSKitAsset.Colors.soptampGray300.color
+            return isNetworkErr ? DSKitAsset.Colors.white.color : DSKitAsset.Colors.gray600.color
         }
     }
 
@@ -77,7 +77,7 @@ extension AlertVC.AlertTheme {
         case .main:
             return isNetworkErr ? DSKitAsset.Colors.black100.color : DSKitAsset.Colors.white100.color
         case .soptamp:
-            return isNetworkErr ? DSKitAsset.Colors.white.color : DSKitAsset.Colors.black100.color
+            return isNetworkErr ? DSKitAsset.Colors.black.color : DSKitAsset.Colors.white.color
         }
     }
 }

SOPT-iOS/Projects/Features/SoptlogFeature/Sources/SoptlogScene/Cell/SoptlogAppServiceCVC.swift

@@ -35,9 +35,7 @@ final class SoptlogAppServiceCVC: UICollectionViewCell {
         $0.font = DSKitFontFamily.Suit.medium.font(size: 14)
     }
 
-    private let serviceImageView = UIImageView().then {
-        $0.image = DSKitAsset.Assets.icHot.image
-    }
+    private let serviceImageView = UIImageView()
 
     private let serviceValue = UILabel().then {
         $0.textColor = DSKitAsset.Colors.white.color

SOPT-iOS/Projects/Features/StampFeature/Sources/Components/STChartRectangleView.swift

@@ -43,8 +43,8 @@ public class STChartRectangleView: UIView {
   private let starRankView: UIImageView = {
     let iv = UIImageView()
     iv.contentMode = .scaleAspectFit
-    iv.image = DSKitAsset.Assets.icStar.image.withRenderingMode(.alwaysTemplate)
-    iv.tintColor = DSKitAsset.Colors.soptampPurple100.color
+    iv.image = DSKitAsset.Assets.icBigStar.image.withRenderingMode(.alwaysTemplate)
+    iv.tintColor = DSKitAsset.Colors.soptampPink300.color
     return iv
   }()
 
@@ -62,7 +62,6 @@ public class STChartRectangleView: UIView {
 
   private let scoreLabel: UILabel = {
     let label = UILabel()
-    label.text = "100점"
     label.setTypoStyle(.SoptampFont.number2)
     label.partFontChange(targetString: "점", font: DSKitFontFamily.Pretendard.medium.font(size: 12))
     return label
@@ -75,7 +74,7 @@ public class STChartRectangleView: UIView {
 
   private lazy var usernameContainerView = UIView().then {
     $0.layer.cornerRadius = 16.f
-    $0.backgroundColor = self.pointColor
+    $0.backgroundColor = DSKitAsset.Colors.gray800.color
   }
 
   private lazy var usernameStackView = UIStackView().then {
@@ -85,9 +84,7 @@ public class STChartRectangleView: UIView {
 
   private let usernameLabel: UILabel = {
     let label = UILabel()
-    label.text = "뉴비"
     label.setTypoStyle(.SoptampFont.subtitle3)
-    label.textColor = DSKitAsset.Colors.gray800.color
     label.lineBreakMode = .byCharWrapping
     label.setCharacterSpacing(0)
     return label
@@ -113,9 +110,9 @@ public class STChartRectangleView: UIView {
 
   private var pointColor: UIColor {
     switch self.viewLevel {
-    case .rankOne: return DSKitAsset.Colors.soptampPurple200.color
-    case .rankTwo: return DSKitAsset.Colors.soptampPink200.color
-    case .rankThree: return DSKitAsset.Colors.soptampMint200.color
+    case .rankOne: return DSKitAsset.Colors.soptampPink300.color
+    case .rankTwo: return DSKitAsset.Colors.green300.color
+    case .rankThree: return DSKitAsset.Colors.soptampPurple300.color
     }
   }
 }
@@ -127,27 +124,23 @@ public class STChartRectangleView: UIView {
 extension STChartRectangleView {
   private func setUI() {
     self.rectangleView.backgroundColor = self.pointColor
-
+    self.scoreLabel.textColor = DSKitAsset.Colors.white.color
+    self.usernameLabel.textColor = pointColor
+    self.rightChevronImageView.tintColor = pointColor
+
     switch viewLevel {
     case .rankOne:
       rankLabel.text = "1"
-      rankLabel.textColor = DSKitAsset.Colors.soptampPurple300.color
-      setScoreLabel(by: DSKitAsset.Colors.soptampPurple300.color)
+      rankLabel.textColor = DSKitAsset.Colors.white.color
     case .rankTwo:
       rankLabel.text = "2"
-      rankLabel.textColor = DSKitAsset.Colors.soptampPink300.color
-      setScoreLabel(by: DSKitAsset.Colors.soptampPink300.color)
+      rankLabel.textColor = pointColor
     case .rankThree:
       rankLabel.text = "3"
-      rankLabel.textColor = DSKitAsset.Colors.soptampMint300.color
-      setScoreLabel(by: DSKitAsset.Colors.soptampMint300.color)
+      rankLabel.textColor = pointColor
     }
   }
 
-  private func setScoreLabel(by color: UIColor) {
-    scoreLabel.textColor = color
-  }
-
   private func setLayout() {
     self.usernameContainerView.addSubview(self.usernameStackView)
 
@@ -192,7 +185,8 @@ extension STChartRectangleView {
     rectangleView.addSubview(scoreLabel)
 
     scoreLabel.snp.makeConstraints { make in
-      make.center.equalToSuperview()
+        make.top.equalToSuperview().offset(8)
+        make.centerX.equalToSuperview()
     }
 
     rectangleView.snp.makeConstraints { make in

SOPT-iOS/Projects/Features/StampFeature/Sources/Components/STPartChartRectangleView.swift

@@ -25,8 +25,8 @@ public class STPartChartRectangleView: UIView {
   private let starRankView: UIImageView = {
     let iv = UIImageView()
     iv.contentMode = .scaleAspectFit
-    iv.image = DSKitAsset.Assets.icStar.image.withRenderingMode(.alwaysTemplate)
-    iv.tintColor = DSKitAsset.Colors.soptampPurple100.color
+    iv.image = DSKitAsset.Assets.icBigStar.image.withRenderingMode(.alwaysTemplate)
+    iv.tintColor = DSKitAsset.Colors.soptampPink300.color
     return iv
   }()
 
@@ -45,7 +45,7 @@ public class STPartChartRectangleView: UIView {
   private let partNameLabel: UILabel = {
     let label = UILabel()
     label.setTypoStyle(.MDS.body3.font)
-    label.textColor = .black
+    label.textColor = DSKitAsset.Colors.white.color
     label.lineBreakMode = .byTruncatingTail
     label.setCharacterSpacing(0)
     return label
@@ -79,20 +79,20 @@ extension STPartChartRectangleView {
     starRankView.isHidden = (rank > 3)
 
     if rank == 1 {
-      rankLabel.textColor = DSKitAsset.Colors.soptampPurple300.color
-      rectangleView.backgroundColor = DSKitAsset.Colors.soptampPurple200.color
-      starRankView.image = DSKitAsset.Assets.icStar.image.withRenderingMode(.alwaysTemplate)
+      rankLabel.textColor = DSKitAsset.Colors.white.color
+      rectangleView.backgroundColor = DSKitAsset.Colors.soptampPink300.color
+      starRankView.image = DSKitAsset.Assets.icBigStar.image.withRenderingMode(.alwaysTemplate)
     } else if rank == 2 {
-      rankLabel.textColor = DSKitAsset.Colors.soptampPink300.color
-      rectangleView.backgroundColor = DSKitAsset.Colors.soptampPink200.color
+      rankLabel.textColor = DSKitAsset.Colors.green300.color
+      rectangleView.backgroundColor = DSKitAsset.Colors.green300.color
       starRankView.image = nil
     } else if rank == 3 {
-      rankLabel.textColor = DSKitAsset.Colors.soptampMint300.color
-      rectangleView.backgroundColor = DSKitAsset.Colors.soptampMint200.color
+      rankLabel.textColor = DSKitAsset.Colors.soptampPurple300.color
+      rectangleView.backgroundColor = DSKitAsset.Colors.soptampPurple300.color
       starRankView.image = nil
     } else {
       rankLabel.text = ""
-      rectangleView.backgroundColor = DSKitAsset.Colors.soptampGray300.color
+      rectangleView.backgroundColor = DSKitAsset.Colors.gray700.color
     }
   }
 
@@ -101,7 +101,7 @@ extension STPartChartRectangleView {
     starRankView.addSubview(rankLabel)
 
     starRankView.snp.makeConstraints { make in
-      make.bottom.equalTo(rectangleView.snp.top).offset(-13.adjusted)
+      make.bottom.equalTo(rectangleView.snp.top).offset(-4)
       make.centerX.equalToSuperview()
       make.size.equalTo(50.adjusted)
     }
@@ -119,7 +119,7 @@ extension STPartChartRectangleView {
 
     partNameLabel.snp.makeConstraints { make in
       make.centerX.equalToSuperview()
-      make.bottom.equalToSuperview()
+      make.bottom.equalToSuperview().offset(4)
       make.width.lessThanOrEqualToSuperview()
     }
   }

SOPT-iOS/Projects/Features/StampFeature/Sources/Components/STSpeechBalloonView.swift

@@ -48,7 +48,8 @@ public class STSpeechBalloonView: UIView {
     private let sentenceLabel: UILabel = {
         let label = UILabel()
         label.setTypoStyle(.SoptampFont.subtitle3)
-        label.textColor = DSKitAsset.Colors.soptampBlack.color
+        label.text = I18N.RankingList.noSentenceText
+        label.textColor = DSKitAsset.Colors.gray300.color
         label.textAlignment = .center
         label.clipsToBounds = true
         label.sizeToFit()
@@ -62,7 +63,7 @@ public class STSpeechBalloonView: UIView {
         self.init()
 
         self.viewLevel = level
-        sentenceLabel.text = sentence
+        if !sentence.isEmpty { sentenceLabel.text = sentence }
         setUI()
         setLayout(sentence: sentence)
     }
@@ -81,25 +82,10 @@ public class STSpeechBalloonView: UIView {
 extension STSpeechBalloonView {
 
     private func setUI() {
-        switch viewLevel {
-        case .rankOne:
-            backgroundView.backgroundColor = DSKitAsset.Colors.soptampPurple300.color
-            sentenceLabel.textColor = DSKitAsset.Colors.soptampWhite.color
-            balloonTailImageView.tintColor = DSKitAsset.Colors.soptampPurple300.color
-        case .rankTwo:
-            backgroundView.backgroundColor = DSKitAsset.Colors.soptampPink300.color
-            sentenceLabel.textColor = DSKitAsset.Colors.soptampWhite.color
-            balloonTailImageView.tintColor = DSKitAsset.Colors.soptampPink300.color
-        case .rankThree:
-            backgroundView.backgroundColor = DSKitAsset.Colors.soptampMint300.color
-            sentenceLabel.textColor = DSKitAsset.Colors.soptampBlack.color
-            balloonTailImageView.tintColor = DSKitAsset.Colors.soptampMint300.color
-        }
-
-        guard self.sentenceLabel.text == I18N.RankingList.noSentenceText else { return }
-        self.sentenceLabel.textColor = DSKitAsset.Colors.soptampGray500.color
-        self.backgroundView.backgroundColor = DSKitAsset.Colors.soptampGray100.color
-        self.balloonTailImageView.tintColor = DSKitAsset.Colors.soptampGray100.color
+        self.backgroundView.backgroundColor = DSKitAsset.Colors.gray800.color
+        self.balloonTailImageView.tintColor = DSKitAsset.Colors.gray800.color
+        guard self.sentenceLabel.text != I18N.RankingList.noSentenceText else { return }
+        self.sentenceLabel.textColor = DSKitAsset.Colors.white.color
     }
 
     private func setLayout(sentence: String) {
@@ -114,12 +100,13 @@ extension STSpeechBalloonView {
 
         sentenceLabelStackView.snp.makeConstraints { make in
             make.centerY.equalToSuperview()
-            make.centerX.equalToSuperview().offset(10)
+            make.centerX.equalToSuperview()
             make.width.lessThanOrEqualTo(273.adjusted)
         }
 
         sentenceLabel.snp.makeConstraints { make in
             make.width.lessThanOrEqualTo(241.adjusted)
+            make.centerX.equalToSuperview()
         }
 
         balloonTailImageView.snp.makeConstraints { make in

SOPT-iOS/Projects/Features/StampFeature/Sources/Components/STStarView.swift

@@ -20,7 +20,7 @@ public class STStarView: UIView {
     private var spacing: CGFloat = 0
     private var starScale: CGFloat = 15
     private var starImageArray: [UIImageView] = []
-    private var starDefaultColor = DSKitAsset.Colors.soptampGray300.color
+    private var starDefaultColor = DSKitAsset.Colors.soptampGray500.color
 
     // MARK: - UI Components
 

SOPT-iOS/Projects/Features/StampFeature/Sources/ListDetailScene/VC/ListDetailVC.swift

@@ -120,9 +120,11 @@ public class ListDetailVC: UIViewController, ListDetailViewControllable {
     private lazy var missionDateTextField = MissionDateView(frame: self.view.frame)
     private lazy var bottomButton = STCustomButton(title: sceneType == .none ? I18N.ListDetail.missionComplete : I18N.ListDetail.editComplete)
         .setEnabled(false)
-        .setColor(bgColor: starLevel.pointColor,
-                  disableColor: starLevel.disableColor,
-                  textColor: starLevel.buttonTitleColor)
+        .setColor(bgColor: DSKitAsset.Colors.white.color,
+                  disableColor: DSKitAsset.Colors.gray300.color,
+                  textColor: DSKitAsset.Colors.black.color,
+                  disableTextcolor: DSKitAsset.Colors.black.color
+        )
     private lazy var backgroundDimmerView = CustomDimmerView(self)
 
 
@@ -314,7 +316,7 @@ extension ListDetailVC {
       .removeDuplicates()
       .withUnretained(self)
       .sink(receiveValue: { owner, date in
-          owner.bottomButton.setEnabled(!date.isEmpty && owner.textView.hasText)
+          owner.bottomButton.setEnabled(!date.isEmpty && !(owner.textView.text == I18N.ListDetail.memoPlaceHolder))
       }).store(in: self.cancelBag)
   }
 
@@ -519,7 +521,7 @@ extension ListDetailVC {
     switch type {
     case .none, .edit:
       self.scrollView.isScrollEnabled = true
-      self.missionView.backgroundColor = DSKitAsset.Colors.soptampGray50.color
+      self.missionView.backgroundColor = DSKitAsset.Colors.gray800.color
       self.setTextView(.inactive)
       self.imagePlaceholderLabel.isHidden = missionImageView.image == nil ? false : true
       self.missionImageView.isUserInteractionEnabled = true
@@ -528,7 +530,7 @@ extension ListDetailVC {
       self.scrollView.isScrollEnabled = false
       self.scrollView.setContentOffset(.zero, animated: true)
       self.naviBar.setRightButton(.addRecord)
-      self.missionView.backgroundColor = starLevel.bgColor
+      self.missionView.backgroundColor = DSKitAsset.Colors.gray800.color
       self.setTextView(.completed)
       self.imagePlaceholderLabel.isHidden = true
       self.bottomButton.isHidden = true
@@ -545,23 +547,22 @@ extension ListDetailVC {
     self.navigationController?.navigationBar.isHidden = true
     self.navigationController?.interactivePopGestureRecognizer?.delegate = nil
 
-    self.view.backgroundColor = .white
+    self.view.backgroundColor = DSKitAsset.Colors.gray950.color
 
     self.scrollView.keyboardDismissMode = .onDrag
     self.scrollView.showsVerticalScrollIndicator = false
     self.scrollView.contentInset = UIEdgeInsets(top: 7, left: 0, bottom: 32, right: 0)
 
-    self.missionImageView.backgroundColor = DSKitAsset.Colors.soptampGray50.color
+    self.missionImageView.backgroundColor = DSKitAsset.Colors.gray900.color
     self.missionImageView.layer.masksToBounds = true
     self.missionImageView.contentMode = .scaleAspectFill
     self.missionImageView.layer.cornerRadius = 9
 
     self.textView.layer.cornerRadius = 12
-    self.textView.layer.borderColor = starLevel.pointColor.cgColor
-    self.missionDateTextField.setBorderLayerColor(to: starLevel.pointColor.cgColor)
+    self.textView.layer.borderColor = DSKitAsset.Colors.gray500.color.cgColor
     self.textView.textContainerInset = UIEdgeInsets(top: 14, left: 14, bottom: 14, right: 14)
 
-    self.imagePlaceholderLabel.textColor = DSKitAsset.Colors.soptampGray500.color
+    self.imagePlaceholderLabel.textColor = DSKitAsset.Colors.gray300.color
     self.imagePlaceholderLabel.setTypoStyle(.SoptampFont.subtitle2)
     self.textView.setTypoStyle(.SoptampFont.caption1)
 
@@ -572,20 +573,19 @@ extension ListDetailVC {
   }
 
   private func setTextView(_ state: TextViewState) {
+    self.textView.backgroundColor = DSKitAsset.Colors.gray900.color
+
     switch state {
     case .inactive:
-      self.textView.backgroundColor = DSKitAsset.Colors.soptampGray50.color
-      self.textView.textColor = DSKitAsset.Colors.soptampGray600.color
+      self.textView.textColor = DSKitAsset.Colors.gray300.color
       self.textView.layer.borderWidth = .zero
       self.textView.isEditable = true
     case .active:
-      self.textView.backgroundColor = DSKitAsset.Colors.soptampWhite.color
-      self.textView.textColor = DSKitAsset.Colors.soptampGray900.color
+      self.textView.textColor = DSKitAsset.Colors.white.color
       self.textView.layer.borderWidth = 1
       self.textView.isEditable = true
     case .completed:
-      self.textView.backgroundColor = DSKitAsset.Colors.soptampGray50.color
-      self.textView.textColor = DSKitAsset.Colors.soptampGray900.color
+      self.textView.textColor = DSKitAsset.Colors.white.color
       self.textView.layer.borderWidth = .zero
       self.textView.isEditable = false
     }