Skip to content

Commit

Permalink
[ADD] 새로운 컬러 및 폰트 추가(#101)
Browse files Browse the repository at this point in the history
  • Loading branch information
kimscastle committed Oct 31, 2024
1 parent af691c4 commit 03b3c18
Show file tree
Hide file tree
Showing 19 changed files with 199 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0x59",
"green" : "0x59",
"red" : "0x4C"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0x95",
"green" : "0xF0",
"red" : "0x73"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0x53",
"green" : "0xEB",
"red" : "0x8F"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0x21",
"green" : "0x21",
"red" : "0x1A"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0x78",
"green" : "0xEF",
"red" : "0x78"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "btn_box.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"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" : "img_back.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"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" : "kakao_login.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"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.
28 changes: 28 additions & 0 deletions Genti_iOS/Genti_iOS/DesignSystem/Font+.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ enum GentiFont {
extension Font {

enum PretendardType {
case title1_24_bold
case title2_20_bold
case subtitle1_18_bold
case subtitle2_16_bold
case subtitle2_16_medium
case body_14_bold
case body_14_medium
case caption_12_regular
case caption_12_semiBold

case certificationDescription

case openChatHeadline
Expand Down Expand Up @@ -80,6 +90,24 @@ extension Font {
return .custom(GentiFont.Pretendard.medium, size: 16)
case .certificationDescription:
return .custom(GentiFont.Pretendard.medium, size: 12)
case .title1_24_bold:
return .custom(GentiFont.Pretendard.bold, size: 24)
case .title2_20_bold:
return .custom(GentiFont.Pretendard.bold, size: 20)
case .subtitle1_18_bold:
return .custom(GentiFont.Pretendard.bold, size: 18)
case .subtitle2_16_bold:
return .custom(GentiFont.Pretendard.bold, size: 16)
case .subtitle2_16_medium:
return .custom(GentiFont.Pretendard.medium, size: 16)
case .body_14_bold:
return .custom(GentiFont.Pretendard.bold, size: 14)
case .body_14_medium:
return .custom(GentiFont.Pretendard.medium, size: 14)
case .caption_12_regular:
return .custom(GentiFont.Pretendard.regular, size: 12)
case .caption_12_semiBold:
return .custom(GentiFont.Pretendard.semiBold, size: 12)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@ extension LinearGradient {
static let backgroundWhite = LinearGradient(colors: [.backgroundWhite, .backgroundWhite.opacity(0)], startPoint: .top, endPoint: .bottom)

static let buttonGreen = LinearGradient(colors: [.buttonGreen1, .buttonGreen2], startPoint: .leading, endPoint: .bottomTrailing)

// static let gentiGradation = Line
}

0 comments on commit 03b3c18

Please sign in to comment.