Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ final class CollectedSentenceView: BaseView {
)

private let pageLabel = BKLabel(
fontStyle: .label1(weight: .medium),
fontStyle: .italic,
color: .bkContentColor(.brand),
alignment: .right
)
Expand Down Expand Up @@ -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")
}
}
Expand Down