diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/Contents.json b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/anxiety_emotion_graphic.imageset/Contents.json b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/anxiety_emotion_graphic.imageset/Contents.json new file mode 100644 index 0000000..6bfe184 --- /dev/null +++ b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/anxiety_emotion_graphic.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "anxiety_emotion_graphic.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "anxiety_emotion_graphic@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "anxiety_emotion_graphic@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/anxiety_emotion_graphic.imageset/anxiety_emotion_graphic.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/anxiety_emotion_graphic.imageset/anxiety_emotion_graphic.png new file mode 100644 index 0000000..1e1a4e9 Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/anxiety_emotion_graphic.imageset/anxiety_emotion_graphic.png differ diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/anxiety_emotion_graphic.imageset/anxiety_emotion_graphic@2x.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/anxiety_emotion_graphic.imageset/anxiety_emotion_graphic@2x.png new file mode 100644 index 0000000..2a3aacd Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/anxiety_emotion_graphic.imageset/anxiety_emotion_graphic@2x.png differ diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/anxiety_emotion_graphic.imageset/anxiety_emotion_graphic@3x.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/anxiety_emotion_graphic.imageset/anxiety_emotion_graphic@3x.png new file mode 100644 index 0000000..0295209 Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/anxiety_emotion_graphic.imageset/anxiety_emotion_graphic@3x.png differ diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/calm_emotion_graphic.imageset/Contents.json b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/calm_emotion_graphic.imageset/Contents.json new file mode 100644 index 0000000..040a60a --- /dev/null +++ b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/calm_emotion_graphic.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "calm_emotion_graphic.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "calm_emotion_graphic@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "calm_emotion_graphic@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/calm_emotion_graphic.imageset/calm_emotion_graphic.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/calm_emotion_graphic.imageset/calm_emotion_graphic.png new file mode 100644 index 0000000..b739567 Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/calm_emotion_graphic.imageset/calm_emotion_graphic.png differ diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/calm_emotion_graphic.imageset/calm_emotion_graphic@2x.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/calm_emotion_graphic.imageset/calm_emotion_graphic@2x.png new file mode 100644 index 0000000..25239e9 Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/calm_emotion_graphic.imageset/calm_emotion_graphic@2x.png differ diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/calm_emotion_graphic.imageset/calm_emotion_graphic@3x.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/calm_emotion_graphic.imageset/calm_emotion_graphic@3x.png new file mode 100644 index 0000000..30eeb4e Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/calm_emotion_graphic.imageset/calm_emotion_graphic@3x.png differ diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/fatigue_emotion_graphic.imageset/Contents.json b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/fatigue_emotion_graphic.imageset/Contents.json new file mode 100644 index 0000000..578692a --- /dev/null +++ b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/fatigue_emotion_graphic.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "fatigue_emotion_graphic.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "fatigue_emotion_graphic@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "fatigue_emotion_graphic@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/fatigue_emotion_graphic.imageset/fatigue_emotion_graphic.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/fatigue_emotion_graphic.imageset/fatigue_emotion_graphic.png new file mode 100644 index 0000000..874e554 Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/fatigue_emotion_graphic.imageset/fatigue_emotion_graphic.png differ diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/fatigue_emotion_graphic.imageset/fatigue_emotion_graphic@2x.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/fatigue_emotion_graphic.imageset/fatigue_emotion_graphic@2x.png new file mode 100644 index 0000000..6dfcee8 Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/fatigue_emotion_graphic.imageset/fatigue_emotion_graphic@2x.png differ diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/fatigue_emotion_graphic.imageset/fatigue_emotion_graphic@3x.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/fatigue_emotion_graphic.imageset/fatigue_emotion_graphic@3x.png new file mode 100644 index 0000000..6d9e7e9 Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/fatigue_emotion_graphic.imageset/fatigue_emotion_graphic@3x.png differ diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/lethargy_emotion_graphic.imageset/Contents.json b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/lethargy_emotion_graphic.imageset/Contents.json new file mode 100644 index 0000000..2b583fd --- /dev/null +++ b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/lethargy_emotion_graphic.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "lethargy_emotion_graphic.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "lethargy_emotion_graphic@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "lethargy_emotion_graphic@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/lethargy_emotion_graphic.imageset/lethargy_emotion_graphic.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/lethargy_emotion_graphic.imageset/lethargy_emotion_graphic.png new file mode 100644 index 0000000..f72d513 Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/lethargy_emotion_graphic.imageset/lethargy_emotion_graphic.png differ diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/lethargy_emotion_graphic.imageset/lethargy_emotion_graphic@2x.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/lethargy_emotion_graphic.imageset/lethargy_emotion_graphic@2x.png new file mode 100644 index 0000000..2a7acbb Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/lethargy_emotion_graphic.imageset/lethargy_emotion_graphic@2x.png differ diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/lethargy_emotion_graphic.imageset/lethargy_emotion_graphic@3x.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/lethargy_emotion_graphic.imageset/lethargy_emotion_graphic@3x.png new file mode 100644 index 0000000..e75d27f Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/lethargy_emotion_graphic.imageset/lethargy_emotion_graphic@3x.png differ diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/satisfaction_emotion_graphic.imageset/Contents.json b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/satisfaction_emotion_graphic.imageset/Contents.json new file mode 100644 index 0000000..6f51a77 --- /dev/null +++ b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/satisfaction_emotion_graphic.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "satisfaction_emotion_graphic.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "satisfaction_emotion_graphic@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "satisfaction_emotion_graphic@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/satisfaction_emotion_graphic.imageset/satisfaction_emotion_graphic.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/satisfaction_emotion_graphic.imageset/satisfaction_emotion_graphic.png new file mode 100644 index 0000000..af9125d Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/satisfaction_emotion_graphic.imageset/satisfaction_emotion_graphic.png differ diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/satisfaction_emotion_graphic.imageset/satisfaction_emotion_graphic@2x.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/satisfaction_emotion_graphic.imageset/satisfaction_emotion_graphic@2x.png new file mode 100644 index 0000000..fdd2ae8 Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/satisfaction_emotion_graphic.imageset/satisfaction_emotion_graphic@2x.png differ diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/satisfaction_emotion_graphic.imageset/satisfaction_emotion_graphic@3x.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/satisfaction_emotion_graphic.imageset/satisfaction_emotion_graphic@3x.png new file mode 100644 index 0000000..c278f98 Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/satisfaction_emotion_graphic.imageset/satisfaction_emotion_graphic@3x.png differ diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/vitality_emotion_graphic.imageset/Contents.json b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/vitality_emotion_graphic.imageset/Contents.json new file mode 100644 index 0000000..5491d42 --- /dev/null +++ b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/vitality_emotion_graphic.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "vitality_emotion_graphic.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "vitality_emotion_graphic@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "vitality_emotion_graphic@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/vitality_emotion_graphic.imageset/vitality_emotion_graphic.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/vitality_emotion_graphic.imageset/vitality_emotion_graphic.png new file mode 100644 index 0000000..863d3a1 Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/vitality_emotion_graphic.imageset/vitality_emotion_graphic.png differ diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/vitality_emotion_graphic.imageset/vitality_emotion_graphic@2x.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/vitality_emotion_graphic.imageset/vitality_emotion_graphic@2x.png new file mode 100644 index 0000000..cbedf27 Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/vitality_emotion_graphic.imageset/vitality_emotion_graphic@2x.png differ diff --git a/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/vitality_emotion_graphic.imageset/vitality_emotion_graphic@3x.png b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/vitality_emotion_graphic.imageset/vitality_emotion_graphic@3x.png new file mode 100644 index 0000000..e2d589b Binary files /dev/null and b/Projects/Presentation/Resources/Images.xcassets/EmotionActivity/vitality_emotion_graphic.imageset/vitality_emotion_graphic@3x.png differ diff --git a/Projects/Presentation/Sources/ActivityHistory/View/ActivityHistoryViewController.swift b/Projects/Presentation/Sources/ActivityHistory/View/ActivityHistoryViewController.swift index 791ce7b..9417ad3 100644 --- a/Projects/Presentation/Sources/ActivityHistory/View/ActivityHistoryViewController.swift +++ b/Projects/Presentation/Sources/ActivityHistory/View/ActivityHistoryViewController.swift @@ -28,6 +28,7 @@ final class ActivityHistoryViewController: BaseViewController Bool { + let key = date.convertToString(dateType: .yearMonthDate) + return emotionRecords[key] != nil + } + func calendar(_ calendar: FSCalendar, didSelect date: Date, at monthPosition: FSCalendarMonthPosition) { let key = date.convertToString(dateType: .yearMonthDate) let emotion = emotionRecords[key] diff --git a/Projects/Presentation/Sources/ActivityHistory/View/EmotionDetailViewController.swift b/Projects/Presentation/Sources/ActivityHistory/View/EmotionDetailViewController.swift index 90c5378..937a7b0 100644 --- a/Projects/Presentation/Sources/ActivityHistory/View/EmotionDetailViewController.swift +++ b/Projects/Presentation/Sources/ActivityHistory/View/EmotionDetailViewController.swift @@ -9,9 +9,27 @@ import SnapKit import UIKit final class EmotionDetailViewController: UIViewController { + private enum Layout { + static let horizontalMargin: CGFloat = 24 + static let headerStackViewSpacing: CGFloat = 10 + static let headerStackViewTopSpacing: CGFloat = 18 + static let headerStackViewTrailingSpacing: CGFloat = 4 + static let headerStackViewHeight: CGFloat = 44 + static let closeButtonSize: CGFloat = 44 + static let closeButtonImageSize: CGFloat = 24 + static let emotionImageViewTopSpacing: CGFloat = 30 + } + private let date: Date private let emotion: Marble - private let label = UILabel() + + private let headerStackView = UIStackView() + private let dateLabel = UILabel() + private let closeButtonImage = UIImageView() + private let closeButton = UIButton() + private let descriptionLabel = UILabel() + private let emotionImageView = UIImageView() + var onDismiss: (() -> Void)? init(date: Date, emotion: Marble) { self.date = date @@ -25,9 +43,82 @@ final class EmotionDetailViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - print("\(emotion.koreanDescription)") - view.backgroundColor = .white + configureAttribute() + configureLayout() + } + + override func viewDidDisappear(_ animated: Bool) { + super.viewDidDisappear(animated) + onDismiss?() + } + + private func configureAttribute() { + view.backgroundColor = BitnagilColor.gray99 + + headerStackView.axis = .horizontal + headerStackView.alignment = .center + headerStackView.spacing = Layout.headerStackViewSpacing + + dateLabel.text = "\(date.convertToString(dateType: .yearMonthDateLong))의 감정" + dateLabel.font = BitnagilFont(style: .title3, weight: .semiBold).font + dateLabel.textColor = BitnagilColor.gray10 + + descriptionLabel.attributedText = BitnagilFont(style: .body2, weight: .medium).attributedString(text: emotion.emotionDescription) + descriptionLabel.numberOfLines = 2 + descriptionLabel.font = BitnagilFont(style: .body2, weight: .medium).font + descriptionLabel.textColor = BitnagilColor.gray40 + + closeButtonImage.image = BitnagilIcon.closeIcon + closeButtonImage.contentMode = .scaleAspectFit + closeButton.addTarget(self, action: #selector(didTapCloseButton), for: .touchUpInside) + + emotionImageView.image = emotion.emotionGraphic + emotionImageView.contentMode = .scaleAspectFit } + private func configureLayout() { + let spacerView = UIView() + [dateLabel, spacerView, closeButton].forEach { + headerStackView.addArrangedSubview($0) + } + closeButton.addSubview(closeButtonImage) + + [headerStackView, descriptionLabel, emotionImageView].forEach { + view.addSubview($0) + } + + headerStackView.snp.makeConstraints { make in + make.top.equalToSuperview().offset(Layout.headerStackViewTopSpacing) + make.leading.equalToSuperview().offset(Layout.horizontalMargin) + make.trailing.equalToSuperview().inset(Layout.headerStackViewTrailingSpacing) + make.height.equalTo(Layout.headerStackViewHeight) + } + + closeButton.snp.makeConstraints { make in + make.size.equalTo(Layout.closeButtonSize) + } + closeButtonImage.snp.makeConstraints { make in + make.center.equalToSuperview() + make.size.equalTo(Layout.closeButtonImageSize) + } + + descriptionLabel.snp.makeConstraints { make in + make.top.equalTo(headerStackView.snp.bottom) + make.leading.equalToSuperview().offset(Layout.horizontalMargin) + } + + emotionImageView.snp.makeConstraints { make in + make.top.equalTo(descriptionLabel.snp.bottom).offset(Layout.emotionImageViewTopSpacing) + make.horizontalEdges.equalToSuperview().inset(Layout.horizontalMargin) + if let image = emotion.emotionGraphic { + let aspectRatio = image.size.height / image.size.width + make.height.equalTo(emotionImageView.snp.width).multipliedBy(aspectRatio) + } + } + } + + @objc private func didTapCloseButton() { + dismiss(animated: true) + } } diff --git a/Projects/Presentation/Sources/Common/DesignSystem/BitnagilGraphic.swift b/Projects/Presentation/Sources/Common/DesignSystem/BitnagilGraphic.swift index b3e6bdf..204a5ec 100644 --- a/Projects/Presentation/Sources/Common/DesignSystem/BitnagilGraphic.swift +++ b/Projects/Presentation/Sources/Common/DesignSystem/BitnagilGraphic.swift @@ -73,4 +73,12 @@ enum BitnagilGraphic { static let routineMultipleBadgeGraphic = UIImage(named: "routine_multiple_badge", in: bundle, with: nil) static let reportSingleBadgeGraphic = UIImage(named: "report_single_badge", in: bundle, with: nil) static let reportMultipleBadgeGraphic = UIImage(named: "report_multiple_badge", in: bundle, with: nil) + + // MARK: - Emotion Marble + static let anxietyEmotionGraphic = UIImage(named: "anxiety_emotion_graphic", in: bundle, with: nil) + static let calmEmotionGraphic = UIImage(named: "calm_emotion_graphic", in: bundle, with: nil) + static let fatigueEmotionGraphic = UIImage(named: "fatigue_emotion_graphic", in: bundle, with: nil) + static let lethargyEmotionGraphic = UIImage(named: "lethargy_emotion_graphic", in: bundle, with: nil) + static let satisfactionEmotionGraphic = UIImage(named: "satisfaction_emotion_graphic", in: bundle, with: nil) + static let vitalityEmotionGraphic = UIImage(named: "vitality_emotion_graphic", in: bundle, with: nil) } diff --git a/Projects/Presentation/Sources/EmotionRegister/Model/Emotion.swift b/Projects/Presentation/Sources/EmotionRegister/Model/Emotion.swift index 6e9dec5..a270b1b 100644 --- a/Projects/Presentation/Sources/EmotionRegister/Model/Emotion.swift +++ b/Projects/Presentation/Sources/EmotionRegister/Model/Emotion.swift @@ -200,4 +200,60 @@ enum Marble:String, CaseIterable { """ } } + + var emotionDescription: String { + switch self { + case .NONE: + "" + case .CALM: + """ + 이날은 평온했나봐요! 평온함은 마음이 고요하고 + 편안해 균형을 이루는 상태예요. + """ + case .VITALITY: + """ + 이날은 활기찼나봐요! 활기참은 생기가 가득 차 + 활발하고 적극적인 상태예요. + """ + case .LETHARGY: + """ + 이날은 무기력했나봐요! 무기력함은 의욕이 없어 + 아무것도 하기 힘든 상태예요. + """ + case .ANXIETY: + """ + 이날은 불안했나봐요! 불안함은 마음이 불안정하고 + 쉽게 안심하기 어려운 상태예요. + """ + case .SATISFACTION: + """ + 이날은 만족스러웠나봐요! 만족함은 기대가 충족되어 + 더 바랄 것이 없는 상태예요. + """ + case .FATIGUE: + """ + 이날은 피곤했나봐요! 피곤함은 몸과 마음이 지쳐 + 휴식이 필요한 상태예요. + """ + } + } + + var emotionGraphic: UIImage? { + switch self { + case .NONE: + return nil + case .CALM: + return BitnagilGraphic.calmEmotionGraphic + case .VITALITY: + return BitnagilGraphic.vitalityEmotionGraphic + case .LETHARGY: + return BitnagilGraphic.lethargyEmotionGraphic + case .ANXIETY: + return BitnagilGraphic.anxietyEmotionGraphic + case .SATISFACTION: + return BitnagilGraphic.satisfactionEmotionGraphic + case .FATIGUE: + return BitnagilGraphic.fatigueEmotionGraphic + } + } } diff --git a/Projects/Shared/Sources/Extension/Date+.swift b/Projects/Shared/Sources/Extension/Date+.swift index 304494e..d532ffd 100644 --- a/Projects/Shared/Sources/Extension/Date+.swift +++ b/Projects/Shared/Sources/Extension/Date+.swift @@ -31,6 +31,7 @@ extension Date { public enum DateType { case yearMonthDate + case yearMonthDateLong case yearMonthDateShort case yearMonthDateWeek case yearMonthDateWeek2 @@ -46,6 +47,7 @@ extension Date { var formatString: String { switch self { case .yearMonthDate: "yyyy-MM-dd" + case .yearMonthDateLong: "yyyy년 M월 d일" case .yearMonthDateShort: "yy.MM.dd" case .yearMonthDateWeek: "yy.MM.dd E" case .yearMonthDateWeek2: "yyyy.MM.dd (E)"