diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight.imageset/insight.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight.imageset/insight.png index 02b241cf..a18244e4 100644 Binary files a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight.imageset/insight.png and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight.imageset/insight.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight.imageset/insight@2x.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight.imageset/insight@2x.png index 744cedfc..af13d958 100644 Binary files a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight.imageset/insight@2x.png and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight.imageset/insight@2x.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight.imageset/insight@3x.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight.imageset/insight@3x.png index 81aa08db..6b218d93 100644 Binary files a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight.imageset/insight@3x.png and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight.imageset/insight@3x.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy.imageset/joy.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy.imageset/joy.png index 8fb1c724..7859ac42 100644 Binary files a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy.imageset/joy.png and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy.imageset/joy.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy.imageset/joy@2x.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy.imageset/joy@2x.png index af92b9d4..fc7d1e58 100644 Binary files a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy.imageset/joy@2x.png and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy.imageset/joy@2x.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy.imageset/joy@3x.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy.imageset/joy@3x.png index da8b4914..26e78cf7 100644 Binary files a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy.imageset/joy@3x.png and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy.imageset/joy@3x.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad.imageset/sad.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad.imageset/sad.png index 2eece77b..33cc62c9 100644 Binary files a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad.imageset/sad.png and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad.imageset/sad.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad.imageset/sad@2x.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad.imageset/sad@2x.png index c18ce84b..60ab28f7 100644 Binary files a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad.imageset/sad@2x.png and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad.imageset/sad@2x.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad.imageset/sad@3x.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad.imageset/sad@3x.png index 8c9a07e3..8f39d70d 100644 Binary files a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad.imageset/sad@3x.png and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad.imageset/sad@3x.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm.imageset/warm.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm.imageset/warm.png index a6ba432c..e6329efe 100644 Binary files a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm.imageset/warm.png and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm.imageset/warm.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm.imageset/warm@2x.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm.imageset/warm@2x.png index 55c14534..79712b6c 100644 Binary files a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm.imageset/warm@2x.png and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm.imageset/warm@2x.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm.imageset/warm@3x.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm.imageset/warm@3x.png index 8af110ab..93f2dc86 100644 Binary files a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm.imageset/warm@3x.png and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm.imageset/warm@3x.png differ diff --git a/src/Projects/BKPresentation/Sources/MainFlow/BookDetail/Models/EmotionSeed.swift b/src/Projects/BKPresentation/Sources/MainFlow/BookDetail/Models/EmotionSeed.swift index ae39a5a0..02ae94a6 100644 --- a/src/Projects/BKPresentation/Sources/MainFlow/BookDetail/Models/EmotionSeed.swift +++ b/src/Projects/BKPresentation/Sources/MainFlow/BookDetail/Models/EmotionSeed.swift @@ -8,8 +8,8 @@ import UIKit enum EmotionSeed: String, CaseIterable { case warmth = "따뜻함" case joy = "즐거움" - case insight = "깨달음" case sad = "슬픔" + case insight = "깨달음" var image: UIImage { switch self { @@ -20,6 +20,15 @@ enum EmotionSeed: String, CaseIterable { } } + var circleImage: UIImage { + switch self { + case .warmth: return BKImage.Graphics.warmCircle + case .joy: return BKImage.Graphics.joyCircle + case .sad: return BKImage.Graphics.sadCircle + case .insight: return BKImage.Graphics.insightCircle + } + } + var color: UIColor { switch self { case .warmth: return .bkEmotionColor(.warmth) diff --git a/src/Projects/BKPresentation/Sources/MainFlow/BookDetail/View/BookDetailViewCell.swift b/src/Projects/BKPresentation/Sources/MainFlow/BookDetail/View/BookDetailViewCell.swift index a040d3a9..74dcb76e 100644 --- a/src/Projects/BKPresentation/Sources/MainFlow/BookDetail/View/BookDetailViewCell.swift +++ b/src/Projects/BKPresentation/Sources/MainFlow/BookDetail/View/BookDetailViewCell.swift @@ -89,12 +89,10 @@ final class BookDetailViewCell: UICollectionViewCell { ) { let emotion = item.emotion ?? .joy - noteLabel.setText(text: item.note) - emotionIcon.image = emotion.image - emotionIcon.contentMode = .scaleAspectFill - emotionIcon.layer.cornerRadius = LayoutConstants.imageCornerRadius - emotionIcon.clipsToBounds = true - emotionIcon.backgroundColor = .bkBaseColor(.primary) + let displayedNote = "\"\(item.note)\"" + noteLabel.setText(text: displayedNote) + emotionIcon.image = emotion.circleImage + emotionIcon.contentMode = .scaleAspectFit emotionLabel.setText(text: "#\(emotion.rawValue)") creationLabel.setText(text: item.createdAt.toKoreanDotDateString()) pageLabel.setText(text: "\(item.page)p") diff --git a/src/Projects/BKPresentation/Sources/MainFlow/BookDetail/View/SentenceCardViewController.swift b/src/Projects/BKPresentation/Sources/MainFlow/BookDetail/View/SentenceCardViewController.swift index 6f3087db..cfe42142 100644 --- a/src/Projects/BKPresentation/Sources/MainFlow/BookDetail/View/SentenceCardViewController.swift +++ b/src/Projects/BKPresentation/Sources/MainFlow/BookDetail/View/SentenceCardViewController.swift @@ -130,7 +130,12 @@ extension SentenceCardViewController { if let popoverController = activityViewController.popoverPresentationController { popoverController.sourceView = self.view - popoverController.sourceRect = CGRect(x: self.view.bounds.midX, y: self.view.bounds.midY, width: 0, height: 0) + popoverController.sourceRect = CGRect( + x: self.view.bounds.midX, + y: self.view.bounds.midY, + width: 0, + height: 0 + ) popoverController.permittedArrowDirections = [] }