Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking β€œSign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

πŸ”— :: (#245) DesignSystem Color Palette #246

Merged
merged 4 commits into from
Apr 5, 2024
Merged
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
@@ -23,8 +23,8 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x59",
"green" : "0x25",
"blue" : "0x8E",
"green" : "0x0D",
"red" : "0x00"
}
},
Original file line number Diff line number Diff line change
@@ -5,9 +5,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x9D",
"green" : "0x5C",
"red" : "0x13"
"blue" : "0xEF",
"green" : "0x4D",
"red" : "0x2F"
}
},
"idiom" : "universal"
@@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x9D",
"green" : "0x5C",
"red" : "0x13"
"blue" : "0xEF",
"green" : "0x4D",
"red" : "0x2F"
}
},
"idiom" : "universal"
Original file line number Diff line number Diff line change
@@ -5,9 +5,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x82",
"green" : "0x4C",
"red" : "0x0F"
"blue" : "0xBF",
"green" : "0x3E",
"red" : "0x26"
}
},
"idiom" : "universal"
@@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xB1",
"green" : "0x70",
"red" : "0x27"
"blue" : "0xD4",
"green" : "0x6E",
"red" : "0x5B"
}
},
"idiom" : "universal"
Original file line number Diff line number Diff line change
@@ -5,9 +5,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x53",
"green" : "0x2C",
"red" : "0x00"
"blue" : "0xAC",
"green" : "0x2B",
"red" : "0x13"
}
},
"idiom" : "universal"
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,24 @@
{
"images" : [
{
"filename" : "Bell.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
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.
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.
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
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "fluent_speaker-2-48-regular.svg",
"filename" : "notice.svg",
"idiom" : "universal",
"scale" : "1x"
},

This file was deleted.

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
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "ToastIcon.svg",
"filename" : "check_circle.svg",
"idiom" : "universal",
"scale" : "1x"
},
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
@@ -20,7 +20,7 @@ public final class ChangePasswordViewController: BaseViewController<ChangePasswo
$0.setTextField(
title: "λΉ„λ°€λ²ˆν˜Έ",
placeholder: "κ³„μ •μ˜ λΉ„λ°€λ²ˆν˜Έλ₯Ό μ„€μ •ν•΄μ£Όμ„Έμš”.",
descriptionType: .info(description: "8 ~ 16자, 영문자, 숫자, 특수문자 포함"),
descriptionType: .info(description: "8 ~ 16자, 영문자, 숫자, 특수문자(!@#$%^&*) 포함"),
textFieldType: .secure
)
}
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ public final class RenewalPasswordViewController: BaseViewController<RenewalPass
$0.setTextField(
title: "λΉ„λ°€λ²ˆν˜Έ",
placeholder: "κ³„μ •μ˜ λΉ„λ°€λ²ˆν˜Έλ₯Ό μ„€μ •ν•΄μ£Όμ„Έμš”.",
descriptionType: .info(description: "8 ~ 16자, 영문자, 숫자, 특수문자 포함"),
descriptionType: .info(description: "8 ~ 16자, 영문자, 숫자, 특수문자(!@#$%^&*) 포함"),
textFieldType: .secure
)
}
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ public final class SigninViewController: BaseReactorViewController<SigninReactor
$0.backgroundColor = .GrayScale.gray90
}
private let titleImageView = UIImageView().then {
$0.image = .jobisIcon(.door)
$0.image = .jobisIcon(.door).resize(size: 32)
}
private let emailTextField = JobisTextField().then {
$0.setTextField(
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ public final class PasswordSettingViewController: SignupViewController<PasswordS
$0.setTextField(
title: "λΉ„λ°€λ²ˆν˜Έ",
placeholder: "κ³„μ •μ˜ λΉ„λ°€λ²ˆν˜Έλ₯Ό μ„€μ •ν•΄μ£Όμ„Έμš”.",
descriptionType: .info(description: "8 ~ 16자, 영문자, 숫자, 특수문자 포함"),
descriptionType: .info(description: "8 ~ 16자, 영문자, 숫자, 특수문자(!@#$%^&*) 포함"),
textFieldType: .secure
)
}
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ class EditProfileButton: BaseView {
private let disposeBag = DisposeBag()
private let editImageView = UIImageView().then {
$0.image = .jobisIcon(.edit)
$0.tintColor = .Primary.blue20
$0.tintColor = .Primary.blue30
}
private let editLabel = UILabel().then {
$0.setJobisText("이미지 μˆ˜μ •ν•˜κΈ°", font: .subHeadLine, color: .Primary.blue30)
12 changes: 6 additions & 6 deletions Tuist/Dependencies.swift
Original file line number Diff line number Diff line change
@@ -29,27 +29,27 @@ let dependencies = Dependencies(
requirement: .branch("master")
),
.remote(
url: "https://github.com/airbnb/lottie-ios",
url: "https://github.com/airbnb/lottie-ios.git",
requirement: .upToNextMajor(from: "4.3.3")
),
.remote(
url: "https://github.com/onevcat/Kingfisher",
url: "https://github.com/onevcat/Kingfisher.git",
requirement: .upToNextMajor(from: "7.0.0")
),
.remote(
url: "https://github.com/evgenyneu/keychain-swift",
url: "https://github.com/evgenyneu/keychain-swift.git",
requirement: .upToNextMajor(from: "20.0.0")
),
.remote(
url: "https://github.com/ReactorKit/ReactorKit",
url: "https://github.com/ReactorKit/ReactorKit.git",
requirement: .upToNextMajor(from: "3.2.0")
),
.remote(
url: "https://github.com/RxSwiftCommunity/RxGesture",
url: "https://github.com/RxSwiftCommunity/RxGesture.git",
requirement: .upToNextMajor(from: "4.0.0")
),
.remote(
url: "https://github.com/firebase/firebase-ios-sdk",
url: "https://github.com/firebase/firebase-ios-sdk.git",
requirement: .upToNextMajor(from: "10.3.0")
)