diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight_circle.imageset/Contents.json b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight_circle.imageset/Contents.json new file mode 100644 index 00000000..97e6bd8b --- /dev/null +++ b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight_circle.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "insight_circle.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "insight_circle@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "insight_circle@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight_circle.imageset/insight_circle.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight_circle.imageset/insight_circle.png new file mode 100644 index 00000000..7a210f50 Binary files /dev/null and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight_circle.imageset/insight_circle.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight_circle.imageset/insight_circle@2x.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight_circle.imageset/insight_circle@2x.png new file mode 100644 index 00000000..3c3487d8 Binary files /dev/null and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight_circle.imageset/insight_circle@2x.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight_circle.imageset/insight_circle@3x.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight_circle.imageset/insight_circle@3x.png new file mode 100644 index 00000000..a624fd58 Binary files /dev/null and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/insight_circle.imageset/insight_circle@3x.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy_circle.imageset/Contents.json b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy_circle.imageset/Contents.json new file mode 100644 index 00000000..2bd74af7 --- /dev/null +++ b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy_circle.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "joy_circle.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "joy_circle@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "joy_circle@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy_circle.imageset/joy_circle.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy_circle.imageset/joy_circle.png new file mode 100644 index 00000000..cd79c66d Binary files /dev/null and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy_circle.imageset/joy_circle.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy_circle.imageset/joy_circle@2x.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy_circle.imageset/joy_circle@2x.png new file mode 100644 index 00000000..a2e42bf3 Binary files /dev/null and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy_circle.imageset/joy_circle@2x.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy_circle.imageset/joy_circle@3x.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy_circle.imageset/joy_circle@3x.png new file mode 100644 index 00000000..6a47a652 Binary files /dev/null and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/joy_circle.imageset/joy_circle@3x.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad_circle.imageset/Contents.json b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad_circle.imageset/Contents.json new file mode 100644 index 00000000..8ece3c2b --- /dev/null +++ b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad_circle.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "sad_circle.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "sad_circle@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "sad_circle@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad_circle.imageset/sad_circle.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad_circle.imageset/sad_circle.png new file mode 100644 index 00000000..266269dc Binary files /dev/null and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad_circle.imageset/sad_circle.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad_circle.imageset/sad_circle@2x.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad_circle.imageset/sad_circle@2x.png new file mode 100644 index 00000000..d2de3bb0 Binary files /dev/null and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad_circle.imageset/sad_circle@2x.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad_circle.imageset/sad_circle@3x.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad_circle.imageset/sad_circle@3x.png new file mode 100644 index 00000000..77f3c98a Binary files /dev/null and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/sad_circle.imageset/sad_circle@3x.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm_circle.imageset/Contents.json b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm_circle.imageset/Contents.json new file mode 100644 index 00000000..b7a9679a --- /dev/null +++ b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm_circle.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "warm_circle.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "warm_circle@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "warm_circle@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm_circle.imageset/warm_circle.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm_circle.imageset/warm_circle.png new file mode 100644 index 00000000..f56db983 Binary files /dev/null and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm_circle.imageset/warm_circle.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm_circle.imageset/warm_circle@2x.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm_circle.imageset/warm_circle@2x.png new file mode 100644 index 00000000..b8cc1a3b Binary files /dev/null and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm_circle.imageset/warm_circle@2x.png differ diff --git a/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm_circle.imageset/warm_circle@3x.png b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm_circle.imageset/warm_circle@3x.png new file mode 100644 index 00000000..cc698753 Binary files /dev/null and b/src/Projects/BKDesign/Resources/Assets.xcassets/graphics/warm_circle.imageset/warm_circle@3x.png differ diff --git a/src/Projects/BKDesign/Sources/Foundation/GraphicSystem/BKImage.swift b/src/Projects/BKDesign/Sources/Foundation/GraphicSystem/BKImage.swift index 3e328496..a422f52d 100644 --- a/src/Projects/BKDesign/Sources/Foundation/GraphicSystem/BKImage.swift +++ b/src/Projects/BKDesign/Sources/Foundation/GraphicSystem/BKImage.swift @@ -78,6 +78,10 @@ public enum BKImage { public static let joyCard = BKDesignAsset.recordcardJoy.image public static let sadCard = BKDesignAsset.recordcardSad.image public static let warmCard = BKDesignAsset.recordcardWarm.image + public static let warmCircle = BKDesignAsset.warmCircle.image + public static let joyCircle = BKDesignAsset.joyCircle.image + public static let sadCircle = BKDesignAsset.sadCircle.image + public static let insightCircle = BKDesignAsset.insightCircle.image } public enum Logos { diff --git a/src/Projects/BKPresentation/Sources/MainFlow/NoteCompletion/View/AppreciationResultView.swift b/src/Projects/BKPresentation/Sources/MainFlow/NoteCompletion/View/AppreciationResultView.swift index ea26209d..930a83e6 100644 --- a/src/Projects/BKPresentation/Sources/MainFlow/NoteCompletion/View/AppreciationResultView.swift +++ b/src/Projects/BKPresentation/Sources/MainFlow/NoteCompletion/View/AppreciationResultView.swift @@ -13,10 +13,10 @@ enum EmotionIcon: String { var icon: UIImage { switch self { - case .warmth: return BKImage.Graphics.warm - case .joy: return BKImage.Graphics.joy - case .sadness: return BKImage.Graphics.sad - case .insight: return BKImage.Graphics.insight + case .warmth: return BKImage.Graphics.warmCircle + case .joy: return BKImage.Graphics.joyCircle + case .sadness: return BKImage.Graphics.sadCircle + case .insight: return BKImage.Graphics.insightCircle } } diff --git a/src/Projects/BKPresentation/Sources/MainFlow/NoteCompletion/View/CollectedSentenceView.swift b/src/Projects/BKPresentation/Sources/MainFlow/NoteCompletion/View/CollectedSentenceView.swift index e801afab..e0b0e405 100644 --- a/src/Projects/BKPresentation/Sources/MainFlow/NoteCompletion/View/CollectedSentenceView.swift +++ b/src/Projects/BKPresentation/Sources/MainFlow/NoteCompletion/View/CollectedSentenceView.swift @@ -27,7 +27,7 @@ final class CollectedSentenceView: BaseView { ) private let pageLabel = BKLabel( - fontStyle: .label1(weight: .medium), + fontStyle: .italic, color: .bkContentColor(.brand), alignment: .right ) @@ -78,7 +78,8 @@ final class CollectedSentenceView: BaseView { sentence: String, page: Int ) { - collectedSentenceLabel.setText(text: sentence) + let displayedText = "\"\(sentence)\"" + collectedSentenceLabel.setText(text: displayedText) pageLabel.setText(text: "\(page)p") } }