[Merge] #448 - pull develop

sopt-makers · Nov 29, 2024 · c22f805 · c22f805
2 parents 7cf859a + ff31116
commit c22f805
Show file tree

Hide file tree

Showing 26 changed files with 1,077 additions and 113 deletions.
diff --git a/SOPT-iOS/Projects/Core/Sources/Literals/StringLiterals.swift b/SOPT-iOS/Projects/Core/Sources/Literals/StringLiterals.swift
@@ -277,6 +277,11 @@ public struct I18N {
         }
     }
 
+    public struct Soptlog {
+        public static let editProfile = "프로필 수정"
+        public static let enrollIntroduce = "프로필 수정에서 한 줄 소개 등록해보세요!"
+    }
+
     public struct Attendance {
         public static func nthAttendance(_ idx: Int) -> String {
             return "\(idx)차 출석"

diff --git a/SOPT-iOS/Projects/Features/AuthFeature/Sources/SignInScene/VC/UserNotFoundVC.swift b/SOPT-iOS/Projects/Features/AuthFeature/Sources/SignInScene/VC/UserNotFoundVC.swift
@@ -45,7 +45,7 @@ public final class UserNotFoundVC: UIViewController, UserNotFoundViewControllabl
 
 
     private let loginRetryButton = AppCustomButton(title: I18N.SignIn.retryLogin)
-        .setFontColor(customFont: DSKitFontFamily.Suit.semiBold.font(size: 18))
+        .setConfigForState(enabledFont: DSKitFontFamily.Suit.semiBold.font(size: 18))
 
     private let loginHelpButton = UIButton(type: .system).then {
         var config = UIButton.Configuration.plain()

diff --git a/...ojects/Features/DailySoptuneFeature/Sources/DailySoptuneScene/VC/DailySoptuneMainVC.swift b/...ojects/Features/DailySoptuneFeature/Sources/DailySoptuneScene/VC/DailySoptuneMainVC.swift
@@ -59,7 +59,7 @@ public final class DailySoptuneMainVC: UIViewController, DailySoptuneMainViewCon
 	}
 
 	private let checkTodayFortuneButton = AppCustomButton(title: I18N.DailySoptune.checkTodayFortune)
-		.setFontColor(customFont: DSKitFontFamily.Suit.semiBold.font(size: 18))
+        .setConfigForState(enabledFont: DSKitFontFamily.Suit.semiBold.font(size: 18))
 
 	// MARK: - Initialization
 

diff --git a/...ects/Features/DailySoptuneFeature/Sources/DailySoptuneScene/VC/DailySoptuneResultVC.swift b/...ects/Features/DailySoptuneFeature/Sources/DailySoptuneScene/VC/DailySoptuneResultVC.swift
@@ -53,7 +53,7 @@ public final class DailySoptuneResultVC: UIViewController, DailySoptuneResultVie
     // 오늘의 부적 받기 버튼
 
     private lazy var receiveTodaysFortuneCardButton = AppCustomButton(title: I18N.DailySoptune.receiveTodaysFortuneCard)
-        .setFontColor(customFont: DSKitFontFamily.Suit.semiBold.font(size: 18))
+        .setConfigForState(enabledFont: DSKitFontFamily.Suit.semiBold.font(size: 18))
         .setEnabled(true)
 
     // MARK: - Initialization

diff --git a/SOPT-iOS/Projects/Features/HomeFeature/Sources/Cells/Announcements/Empty.swift b/SOPT-iOS/Projects/Features/HomeFeature/Sources/Cells/Announcements/Empty.swift
diff --git a/SOPT-iOS/Projects/Features/HomeFeature/Sources/Cells/CoffeeChat/Empty.swift b/SOPT-iOS/Projects/Features/HomeFeature/Sources/Cells/CoffeeChat/Empty.swift
diff --git a/SOPT-iOS/Projects/Features/HomeFeature/Sources/Cells/SocialLinks/Empty.swift b/SOPT-iOS/Projects/Features/HomeFeature/Sources/Cells/SocialLinks/Empty.swift
diff --git a/SOPT-iOS/Projects/Features/RootFeature/Sources/ApplicationCoordinator.swift b/SOPT-iOS/Projects/Features/RootFeature/Sources/ApplicationCoordinator.swift
@@ -20,6 +20,7 @@ import PokeFeature
 import AttendanceFeature
 import DailySoptuneFeature
 import WebFeature
+import SoptlogFeature
 
 public
 final class ApplicationCoordinator: BaseCoordinator {
@@ -376,4 +377,21 @@ extension ApplicationCoordinator {
 
         return coordinator
     }
+
+    @discardableResult
+    internal func runSoptlogFlow() -> SoptlogCoordinator {
+        let coordinator = SoptlogCoordinator(
+            router: Router(rootController: UIWindow.getRootNavigationController),
+            factory: SoptlogBuilder()
+        )
+
+        coordinator.finishFlow = { [weak self] in
+            self?.removeDependency(coordinator)
+        }
+
+        addDependency(coordinator)
+        coordinator.start()
+
+        return coordinator
+    }
 }
diff --git a/SOPT-iOS/Projects/Features/SoptlogFeature/Interface/Sources/Empty.swift b/SOPT-iOS/Projects/Features/SoptlogFeature/Interface/Sources/Empty.swift
diff --git a/SOPT-iOS/Projects/Features/SoptlogFeature/Interface/Sources/SoptlogFeatureBuildable.swift b/SOPT-iOS/Projects/Features/SoptlogFeature/Interface/Sources/SoptlogFeatureBuildable.swift
@@ -0,0 +1,13 @@
+//
+//  SoptlogFeatureBuildable.swift
+//  SoptlogFeature
+//
+//  Created by 강윤서 on 11/25/24.
+//  Copyright © 2024 SOPT-iOS. All rights reserved.
+//
+
+import Foundation
+
+public protocol SoptlogFeatureBuildable {
+    func makeSoptlog() -> SoptlogPresentable
+}
diff --git a/SOPT-iOS/Projects/Features/SoptlogFeature/Interface/Sources/SoptlogPresentable.swift b/SOPT-iOS/Projects/Features/SoptlogFeature/Interface/Sources/SoptlogPresentable.swift
@@ -0,0 +1,19 @@
+//
+//  SoptlogPresentable.swift
+//  SoptlogFeature
+//
+//  Created by 강윤서 on 11/25/24.
+//  Copyright © 2024 SOPT-iOS. All rights reserved.
+//
+
+import Foundation
+
+import BaseFeatureDependency
+import Core
+
+public protocol SoptlogViewControllable: ViewControllable { }
+public protocol SoptlogCoordinatable {
+
+}
+public typealias SoptlogViewModelType = ViewModelType & SoptlogCoordinatable
+public typealias SoptlogPresentable = (vc: SoptlogViewControllable, vm: any SoptlogViewModelType)
diff --git a/SOPT-iOS/Projects/Features/SoptlogFeature/Sources/Empty.swift b/SOPT-iOS/Projects/Features/SoptlogFeature/Sources/Empty.swift
diff --git a/...s/Features/SoptlogFeature/Sources/SoptlogScene/Cell/AppServiceSectionBackgroundView.swift b/...s/Features/SoptlogFeature/Sources/SoptlogScene/Cell/AppServiceSectionBackgroundView.swift
@@ -0,0 +1,34 @@
+//
+//  AppServiceSectionBackgroundView.swift
+//  SoptlogFeature
+//
+//  Created by 강윤서 on 11/26/24.
+//  Copyright © 2024 SOPT-iOS. All rights reserved.
+//
+
+import UIKit
+
+import DSKit
+
+final class AppServiceSectionBackgroundView: UICollectionReusableView {
+
+    // MARK: - init
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setUI()
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+// MARK: - UI & Layout
+
+extension AppServiceSectionBackgroundView {
+    private func setUI() {
+        self.backgroundColor = DSKitAsset.Colors.gray800.color
+        self.layer.cornerRadius = 12
+    }
+}
diff --git a/SOPT-iOS/Projects/Features/SoptlogFeature/Sources/SoptlogScene/Cell/EditProfileCVC.swift b/SOPT-iOS/Projects/Features/SoptlogFeature/Sources/SoptlogScene/Cell/EditProfileCVC.swift
@@ -0,0 +1,49 @@
+//
+//  EditProfileCVC.swift
+//  SoptlogFeature
+//
+//  Created by 강윤서 on 11/26/24.
+//  Copyright © 2024 SOPT-iOS. All rights reserved.
+//
+
+import UIKit
+
+import Core
+import DSKit
+
+final class EditProfileCVC: UICollectionViewCell {
+
+    // MARK: - UI Components
+
+    private let editProfileButton = AppOutlinedButton(title: I18N.Soptlog.editProfile)
+        .chageTextColor(textColor: DSKitAsset.Colors.gray100.color)
+        .chageOutlinedColor(outlinedColor: DSKitAsset.Colors.gray100.color)
+
+    // MARK: - init
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setUI()
+        setLayout()
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+// MARK: - UI & Layout
+
+extension EditProfileCVC {
+    private func setUI() {
+        contentView.backgroundColor = .clear
+    }
+
+    private func setLayout() {
+        contentView.addSubviews(editProfileButton)
+
+        editProfileButton.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+    }
+}
diff --git a/SOPT-iOS/Projects/Features/SoptlogFeature/Sources/SoptlogScene/Cell/IntroduceCVC.swift b/SOPT-iOS/Projects/Features/SoptlogFeature/Sources/SoptlogScene/Cell/IntroduceCVC.swift
@@ -0,0 +1,60 @@
+//
+//  IntroduceCVC.swift
+//  SoptlogFeature
+//
+//  Created by 강윤서 on 11/26/24.
+//  Copyright © 2024 SOPT-iOS. All rights reserved.
+//
+
+import UIKit
+
+import Core
+import DSKit
+
+final class IntroduceCVC: UICollectionViewCell {
+
+    // MARK: - UI Components
+
+    private let introduceLabel = UILabel().then {
+        $0.text = I18N.Soptlog.enrollIntroduce
+        $0.font = DSKitFontFamily.Suit.medium.font(size: 14)
+        $0.textColor = DSKitAsset.Colors.gray100.color
+    }
+
+    // MARK: - init
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setUI()
+        setLayout()
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+// MARK: - UI & Layout
+
+extension IntroduceCVC {
+    private func setUI() {
+        contentView.backgroundColor = DSKitAsset.Colors.gray800.color
+        contentView.layer.cornerRadius = 8
+    }
+
+    private func setLayout() {
+        contentView.addSubviews(introduceLabel)
+
+        introduceLabel.snp.makeConstraints { make in
+            make.center.equalToSuperview()
+        }
+    }
+}
+
+// MARK: - Methods
+
+extension IntroduceCVC {
+    func configureCell(_ text: String) {
+        introduceLabel.text = text
+    }
+}
diff --git a/SOPT-iOS/Projects/Features/SoptlogFeature/Sources/SoptlogScene/Cell/SoptlogAlarmCVC.swift b/SOPT-iOS/Projects/Features/SoptlogFeature/Sources/SoptlogScene/Cell/SoptlogAlarmCVC.swift
@@ -0,0 +1,95 @@
+//
+//  SoptlogAlarmCVC.swift
+//  SoptlogFeature
+//
+//  Created by 강윤서 on 11/26/24.
+//  Copyright © 2024 SOPT-iOS. All rights reserved.
+//
+
+import UIKit
+
+import Core
+import DSKit
+
+final class SoptlogAlarmCVC: UICollectionViewCell {
+
+    // MARK: - UI Components
+
+    private let serviceImageView = UIImageView()
+
+    private let titleLabel = UILabel().then {
+        $0.text = "차은우님, 잊지 말아야 할 말을 듣게 될 거예요"
+        $0.numberOfLines = 1
+        $0.textColor = DSKitAsset.Colors.white.color
+        $0.font = DSKitFontFamily.Suit.bold.font(size: 18)
+    }
+
+    private let subTitleLabel = UILabel().then {
+        $0.text = "오늘의 솝마디"
+        $0.textColor = DSKitAsset.Colors.gray200.color
+        $0.font = DSKitFontFamily.Suit.semiBold.font(size: 12)
+    }
+
+    private let arrowImageview = UIImageView().then {
+        $0.image = DSKitAsset.Assets.chevronRight.image
+            .withTintColor(DSKitAsset.Colors.gray200.color)
+    }
+
+    // MARK: - init
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setUI()
+        setLayout()
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+// MARK: - UI & Layout
+
+extension SoptlogAlarmCVC {
+    private func setUI() {
+        contentView.backgroundColor = DSKitAsset.Colors.gray800.color
+        serviceImageView.image = DSKitAsset.Assets.soptampLogo.image
+    }
+
+    private func setLayout() {
+        contentView.addSubviews(serviceImageView, titleLabel, subTitleLabel, arrowImageview)
+
+        serviceImageView.snp.makeConstraints { make in
+            make.leading.equalToSuperview().inset(20)
+            make.centerY.equalToSuperview()
+            make.size.equalTo(60)
+        }
+
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalToSuperview().inset(19)
+            make.trailing.equalToSuperview().inset(20)
+            make.leading.equalTo(serviceImageView.snp.trailing).offset(14)
+        }
+
+        subTitleLabel.snp.makeConstraints { make in
+            make.top.equalTo(titleLabel.snp.bottom).offset(2)
+            make.leading.equalTo(titleLabel.snp.leading)
+        }
+
+        arrowImageview.snp.makeConstraints { make in
+            make.size.equalTo(16)
+            make.top.equalTo(subTitleLabel.snp.top)
+            make.leading.equalTo(subTitleLabel.snp.trailing)
+        }
+    }
+}
+
+// MARK: - Methods
+
+extension SoptlogAlarmCVC {
+    func configureCell(model: SoptlogAlarmInfo) {
+        self.titleLabel.text = model.title
+        self.serviceImageView.setImage(with: model.imageURL)
+        self.subTitleLabel.text = model.subTitle
+    }
+}