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" : "loading_fomo_graphic.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "loading_fomo_graphic@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "loading_fomo_graphic@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

아니 제 포모 키링 고리 부분 뿌러졌어요 ㅠ

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

쏘 샏 !!!!!!!!!!!!!!!

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" : "success_fomo_graphic.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "success_fomo_graphic@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "success_fomo_graphic@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" : "complete_icon.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "complete_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "complete_icon@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" : "loading_icon.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "loading_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "loading_icon@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 @@ -28,7 +28,6 @@ enum BitnagilGraphic {

// MARK: - Home
static let defaultEmotionHandGraphic = UIImage(named: "default_emotion_with_hand_graphic", in: bundle, with: nil)

static let defaultEmotionGraphic = UIImage(named: "default_emotion_graphic", in: bundle, with: nil)
static let logoGraphic = UIImage(named: "bitnagil_logo", in: bundle, with: nil)
static let profileGraphic = UIImage(named: "profile_graphic", in: bundle, with: nil)
Expand All @@ -39,6 +38,7 @@ enum BitnagilGraphic {
static let tutorialHomeMoreGraphic = UIImage(named: "tutorial_home_more_graphic", in: bundle, with: nil)
static let tutorialRecommendationRoutineGraphic = UIImage(named: "tutorial_recommendation_routine_graphic", in: bundle, with: nil)
static let tutorialEditRoutineGraphic = UIImage(named: "tutorial_edit_routine_graphic", in: bundle, with: nil)

// MARK: - Emotion
static let marbleSpeechGraphic = UIImage(named: "marble_speech_graphic", in: bundle, with: nil)
static let fomoHandGraphic = UIImage(named: "fomo_hand_graphic", in: bundle, with: nil)
Expand All @@ -50,10 +50,15 @@ enum BitnagilGraphic {
static let marbleGreenGraphic = UIImage(named: "marble_green_graphic", in: bundle, with: nil)
static let marbleGrayGraphic = UIImage(named: "marble_gray_graphic", in: bundle, with: nil)
static let marblePurpleGraphic = UIImage(named: "marble_purple_graphic", in: bundle, with: nil)

// MARK: - Emotion Register Completion
static let emotionCompletionBackgroundGraphic = UIImage(named: "emotion_background_graphic", in: bundle, with: nil)
static let emotionCompletionGroundGraphic = UIImage(named: "emotion_ground_graphic", in: bundle, with: nil)
static let pomoLeftHandGraphic = UIImage(named: "marble_pomo_left_hand_graphic", in: bundle, with: nil)
static let pomoRightHandGraphic = UIImage(named: "marble_pomo_right_hand_graphic", in: bundle, with: nil)
static let marblePomoGraphic = UIImage(named: "marblePomo_graphic", in: bundle, with: nil)

// MARK: - Report
static let loadingFomoGraphic = UIImage(named: "loading_fomo_graphic", in: bundle, with: nil)
static let successFomoGraphic = UIImage(named: "success_fomo_graphic", in: bundle, with: nil)
}
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ enum BitnagilIcon {
static let lightIcon = UIImage(named: "icon_light", in: bundle, with: nil)
static let waterIcon = UIImage(named: "icon_water", in: bundle, with: nil)
static let hammerIcon = UIImage(named: "icon_hammer", in: bundle, with: nil)
static let loadingIcon = UIImage(named: "loading_icon", in: bundle, with: nil)
static let completeIcon = UIImage(named: "complete_icon", in: bundle, with: nil)

// MARK: - Routine Creation Icons
static let asteriskIcon = UIImage(named: "asterisk_icon", in: bundle, with: nil)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@ struct BitnagilFont {
return font
}

func attributedString(text: String?) -> NSAttributedString {
func attributedString(text: String?, alignment: NSTextAlignment = .left) -> NSAttributedString {
let paragraphStyle = NSMutableParagraphStyle()
paragraphStyle.maximumLineHeight = style.fontAttributes.lineHeight
paragraphStyle.minimumLineHeight = style.fontAttributes.lineHeight
paragraphStyle.alignment = alignment

var attributes: [NSAttributedString.Key: Any] = [
.font: font,
Expand Down
Loading