[Delete] sopt-makers#336 - 눈 모양 아이콘과 답장 메시지 타입 개념 제거

lsj8706 · Dec 24, 2023 · e541698 · e541698
1 parent 7ffdd7a
commit e541698
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 29 deletions.
diff --git a/SOPT-iOS/Projects/Features/PokeFeature/Sources/Components/PokeKokButton.swift b/SOPT-iOS/Projects/Features/PokeFeature/Sources/Components/PokeKokButton.swift
@@ -15,12 +15,6 @@ public final class PokeKokButton: UIButton {
 
     // MARK: - Properties
 
-    public var isFriend: Bool {
-        didSet {
-            setIcon()
-        }
-    }
-
     public lazy var tap: Driver<Void> = self.publisher(for: .touchUpInside)
         .mapVoid()
         .asDriver()
@@ -37,8 +31,7 @@ public final class PokeKokButton: UIButton {
 
     // MARK: - initialization
 
-    public init(isFriend: Bool = true) {
-        self.isFriend = isFriend
+    public init() {
         super.init(frame: .zero)
         self.setUI()
     }
@@ -60,12 +53,8 @@ public final class PokeKokButton: UIButton {
         self.backgroundColor = backgroundColor
     }
 
-    public func setIsFriend(with isFriend: Bool) {
-        self.isFriend = isFriend
-    }
-
     private func setIcon() {
-        let icon = self.isFriend ? DSKitAsset.Assets.iconKok.image : DSKitAsset.Assets.iconEyes.image
+        let icon = DSKitAsset.Assets.iconKok.image
         self.setImage(icon.withTintColor(DSKitAsset.Colors.black.color), for: .normal)
         self.setImage(icon.withTintColor(DSKitAsset.Colors.gray500.color), for: .disabled)
     }

diff --git a/...OS/Projects/Features/PokeFeature/Sources/Components/PokeNotificationListContentView.swift b/...OS/Projects/Features/PokeFeature/Sources/Components/PokeNotificationListContentView.swift
@@ -157,7 +157,6 @@ extension PokeNotificationListContentView {
         self.descriptionLabel.attributedText = model.description.applyMDSFont()
         self.pokeChipView.configure(with: model.chipInfo)
         self.pokeKokButton.isEnabled = !model.isPoked
-        self.pokeKokButton.setIsFriend(with: !model.isFirstMeet)
     }
 
     public func configure(with model: PokeUserModel) {
@@ -169,7 +168,6 @@ extension PokeNotificationListContentView {
         self.descriptionLabel.attributedText = model.message.applyMDSFont()
         self.pokeChipView.configure(with: model.makeChipInfo())
         self.pokeKokButton.isEnabled = !model.isAlreadyPoke
-        self.pokeKokButton.setIsFriend(with: !model.isFirstMeet)
     }
 
     func setData(with model: PokeUserModel) {

diff --git a/SOPT-iOS/Projects/Features/PokeFeature/Sources/Components/PokeProfileCardView.swift b/SOPT-iOS/Projects/Features/PokeFeature/Sources/Components/PokeProfileCardView.swift
@@ -110,7 +110,6 @@ public final class PokeProfileCardView: UIView, PokeCompatible {
         self.nameLabel.text = model.name
         self.partLabel.text = String(describing: model.generation) + "기" + " " + model.part
         self.kokButton.isEnabled = !model.isAlreadyPoke
-        self.kokButton.setIsFriend(with: !model.isFirstMeet)
     }
 
     @discardableResult

diff --git a/SOPT-iOS/Projects/Features/PokeFeature/Sources/Components/PokeProfileListView.swift b/SOPT-iOS/Projects/Features/PokeFeature/Sources/Components/PokeProfileListView.swift
@@ -208,12 +208,6 @@ public final class PokeProfileListView: UIView, PokeCompatible {
         self.dividerView.backgroundColor = color
         return self
     }
-
-    @discardableResult
-    func setIsFriend(to isFriend: Bool) -> Self {
-        self.kokButton.isFriend = isFriend
-        return self
-    }
 }
 
 extension PokeProfileListView {

diff --git a/SOPT-iOS/Projects/Features/PokeFeature/Sources/Coordinator/PokeCoordinator.swift b/SOPT-iOS/Projects/Features/PokeFeature/Sources/Coordinator/PokeCoordinator.swift
@@ -56,7 +56,7 @@ final class PokeCoordinator: DefaultCoordinator {
 
         pokeMain.vm.onPokeButtonTapped = { [weak self] userModel in
             guard let self else { return .empty() }
-            return self.showMessageBottomSheet(userModel: userModel, isReplyToNewPerson: false, on: pokeMain.vc.viewController)
+            return self.showMessageBottomSheet(userModel: userModel, on: pokeMain.vc.viewController)
         }
 
         rootController = pokeMain.vc.asNavigationController
@@ -92,12 +92,9 @@ final class PokeCoordinator: DefaultCoordinator {
         pokeMyFriendsCoordinator.start()
     }
 
-    private func showMessageBottomSheet(userModel: PokeUserModel, isReplyToNewPerson: Bool, on view: UIViewController?) -> AnyPublisher<(PokeUserModel, PokeMessageModel), Never> {
+    private func showMessageBottomSheet(userModel: PokeUserModel, on view: UIViewController?) -> AnyPublisher<(PokeUserModel, PokeMessageModel), Never> {
         var messageType: PokeMessageType = userModel.isFirstMeet ? .pokeSomeone : .pokeFriend
-        if isReplyToNewPerson {
-            messageType = .replyNew
-        }
-
+
         guard let bottomSheet = self.factory
             .makePokeMessageTemplateBottomSheet(messageType: messageType)
                 .vc

diff --git a/SOPT-iOS/Projects/Features/PokeFeature/Sources/Models/PokeUserModel+.swift b/SOPT-iOS/Projects/Features/PokeFeature/Sources/Models/PokeUserModel+.swift
@@ -24,5 +24,4 @@ extension PokeUserModel {
 
         return .withPokeCount(relation: model.relationName, pokeCount: String(model.pokeNum))
     }
-
 }