From a74c510c906b1366d29e4206afaebec0e8518d90 Mon Sep 17 00:00:00 2001 From: HongSJae Date: Fri, 5 Apr 2024 11:36:42 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=A7=A9=20::=20Color=20=ED=8C=94?= =?UTF-8?q?=EB=A0=88=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Blue 10.colorset/Contents.json | 4 ++-- .../Blue 20.colorset/Contents.json | 12 +++++----- .../Blue 30.colorset/Contents.json | 12 +++++----- .../Blue 40.colorset/Contents.json | 6 ++--- .../Bell On Primary.imageset/Bell.svg | 9 +++++++ .../Bell On Primary.imageset/Contents.json | 24 +++++++++++++++++++ .../Bookmark On.imageset/Bookmark.svg | 6 ++--- .../Icons.xcassets/Bug Box.imageset/box.svg | 6 ++--- .../Bug Report.imageset/Report.svg | 6 ++--- .../Change Password.imageset/lock_reset.svg | 6 ++--- .../Icons.xcassets/Code.imageset/code.svg | 6 ++--- .../Door.imageset/meeting_room.svg | 10 ++++---- .../Rectangle 371.svg | 2 +- .../Sound.imageset/Contents.json | 2 +- .../fluent_speaker-2-48-regular.svg | 3 --- .../Icons.xcassets/Sound.imageset/notice.svg | 8 +++++++ .../ToastIcon.imageset/Contents.json | 2 +- .../{ToastIcon.svg => check_circle.svg} | 6 ++--- .../Icons.xcassets/info.imageset/info.svg | 2 +- 19 files changed, 85 insertions(+), 47 deletions(-) create mode 100644 Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bell On Primary.imageset/Bell.svg create mode 100644 Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bell On Primary.imageset/Contents.json delete mode 100644 Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Sound.imageset/fluent_speaker-2-48-regular.svg create mode 100644 Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Sound.imageset/notice.svg rename Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/ToastIcon.imageset/{ToastIcon.svg => check_circle.svg} (90%) diff --git a/Projects/Modules/DesignSystem/Resources/Colors/Primary.xcassets/Blue 10.colorset/Contents.json b/Projects/Modules/DesignSystem/Resources/Colors/Primary.xcassets/Blue 10.colorset/Contents.json index 2165e74c..7c2e8f60 100644 --- a/Projects/Modules/DesignSystem/Resources/Colors/Primary.xcassets/Blue 10.colorset/Contents.json +++ b/Projects/Modules/DesignSystem/Resources/Colors/Primary.xcassets/Blue 10.colorset/Contents.json @@ -23,8 +23,8 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x59", - "green" : "0x25", + "blue" : "0x8E", + "green" : "0x0D", "red" : "0x00" } }, diff --git a/Projects/Modules/DesignSystem/Resources/Colors/Primary.xcassets/Blue 20.colorset/Contents.json b/Projects/Modules/DesignSystem/Resources/Colors/Primary.xcassets/Blue 20.colorset/Contents.json index 36148a3e..38ec3784 100644 --- a/Projects/Modules/DesignSystem/Resources/Colors/Primary.xcassets/Blue 20.colorset/Contents.json +++ b/Projects/Modules/DesignSystem/Resources/Colors/Primary.xcassets/Blue 20.colorset/Contents.json @@ -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" diff --git a/Projects/Modules/DesignSystem/Resources/Colors/Primary.xcassets/Blue 30.colorset/Contents.json b/Projects/Modules/DesignSystem/Resources/Colors/Primary.xcassets/Blue 30.colorset/Contents.json index ed65b1ef..4d6310c5 100644 --- a/Projects/Modules/DesignSystem/Resources/Colors/Primary.xcassets/Blue 30.colorset/Contents.json +++ b/Projects/Modules/DesignSystem/Resources/Colors/Primary.xcassets/Blue 30.colorset/Contents.json @@ -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" diff --git a/Projects/Modules/DesignSystem/Resources/Colors/Primary.xcassets/Blue 40.colorset/Contents.json b/Projects/Modules/DesignSystem/Resources/Colors/Primary.xcassets/Blue 40.colorset/Contents.json index 10c5b0b5..51461ad9 100644 --- a/Projects/Modules/DesignSystem/Resources/Colors/Primary.xcassets/Blue 40.colorset/Contents.json +++ b/Projects/Modules/DesignSystem/Resources/Colors/Primary.xcassets/Blue 40.colorset/Contents.json @@ -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" diff --git a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bell On Primary.imageset/Bell.svg b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bell On Primary.imageset/Bell.svg new file mode 100644 index 00000000..8b8764e7 --- /dev/null +++ b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bell On Primary.imageset/Bell.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bell On Primary.imageset/Contents.json b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bell On Primary.imageset/Contents.json new file mode 100644 index 00000000..5d6486e4 --- /dev/null +++ b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bell On Primary.imageset/Contents.json @@ -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 + } +} diff --git a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bookmark On.imageset/Bookmark.svg b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bookmark On.imageset/Bookmark.svg index 4a5acb5a..3b7f125e 100644 --- a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bookmark On.imageset/Bookmark.svg +++ b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bookmark On.imageset/Bookmark.svg @@ -1,8 +1,8 @@ - + - - + + diff --git a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bug Box.imageset/box.svg b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bug Box.imageset/box.svg index 4a67c363..137b89b8 100644 --- a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bug Box.imageset/box.svg +++ b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bug Box.imageset/box.svg @@ -1,8 +1,8 @@ - + - - + + diff --git a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bug Report.imageset/Report.svg b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bug Report.imageset/Report.svg index 9391f082..9eec41fa 100644 --- a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bug Report.imageset/Report.svg +++ b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Bug Report.imageset/Report.svg @@ -1,8 +1,8 @@ - + - - + + diff --git a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Change Password.imageset/lock_reset.svg b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Change Password.imageset/lock_reset.svg index 326bd9f5..23ee9495 100644 --- a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Change Password.imageset/lock_reset.svg +++ b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Change Password.imageset/lock_reset.svg @@ -1,8 +1,8 @@ - + - - + + diff --git a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Code.imageset/code.svg b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Code.imageset/code.svg index 9eb1bf43..927d95e3 100644 --- a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Code.imageset/code.svg +++ b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Code.imageset/code.svg @@ -1,8 +1,8 @@ - + - - + + diff --git a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Door.imageset/meeting_room.svg b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Door.imageset/meeting_room.svg index dd49b689..f558c1fc 100644 --- a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Door.imageset/meeting_room.svg +++ b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Door.imageset/meeting_room.svg @@ -1,8 +1,8 @@ - - - + + + - - + + diff --git a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Home/Current Page Control.imageset/Rectangle 371.svg b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Home/Current Page Control.imageset/Rectangle 371.svg index 0d28117d..c2b26874 100644 --- a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Home/Current Page Control.imageset/Rectangle 371.svg +++ b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Home/Current Page Control.imageset/Rectangle 371.svg @@ -1,3 +1,3 @@ - + diff --git a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Sound.imageset/Contents.json b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Sound.imageset/Contents.json index 6f2dd8dd..f9f7fbce 100644 --- a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Sound.imageset/Contents.json +++ b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Sound.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "fluent_speaker-2-48-regular.svg", + "filename" : "notice.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Sound.imageset/fluent_speaker-2-48-regular.svg b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Sound.imageset/fluent_speaker-2-48-regular.svg deleted file mode 100644 index e407be70..00000000 --- a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Sound.imageset/fluent_speaker-2-48-regular.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Sound.imageset/notice.svg b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Sound.imageset/notice.svg new file mode 100644 index 00000000..0ec7a669 --- /dev/null +++ b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Sound.imageset/notice.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/ToastIcon.imageset/Contents.json b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/ToastIcon.imageset/Contents.json index bdaeabdd..11de1faa 100644 --- a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/ToastIcon.imageset/Contents.json +++ b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/ToastIcon.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "ToastIcon.svg", + "filename" : "check_circle.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/ToastIcon.imageset/ToastIcon.svg b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/ToastIcon.imageset/check_circle.svg similarity index 90% rename from Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/ToastIcon.imageset/ToastIcon.svg rename to Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/ToastIcon.imageset/check_circle.svg index 8b44ad2e..7ffd9338 100644 --- a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/ToastIcon.imageset/ToastIcon.svg +++ b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/ToastIcon.imageset/check_circle.svg @@ -1,8 +1,8 @@ - + - - + + diff --git a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/info.imageset/info.svg b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/info.imageset/info.svg index 34307dc5..f21f06a2 100644 --- a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/info.imageset/info.svg +++ b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/info.imageset/info.svg @@ -1,3 +1,3 @@ - + From 187136b73e5adba5d42948f520517363ea703b8d Mon Sep 17 00:00:00 2001 From: HongSJae Date: Fri, 5 Apr 2024 11:37:16 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20::=20Dependency=20?= =?UTF-8?q?=EB=92=A4=EC=97=90=20.git=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tuist/Dependencies.swift | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Tuist/Dependencies.swift b/Tuist/Dependencies.swift index 0d268d73..c47b2d7e 100644 --- a/Tuist/Dependencies.swift +++ b/Tuist/Dependencies.swift @@ -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") ) From d6d3e4aaeac60da9cd519c3dabb8b5393c85e655 Mon Sep 17 00:00:00 2001 From: HongSJae Date: Fri, 5 Apr 2024 11:37:49 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=A7=A9=20::=20=EB=B9=84=EB=B0=80?= =?UTF-8?q?=EB=B2=88=ED=98=B8=20info=20description=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/ChangePassword/ChangePasswordViewController.swift | 2 +- .../Sources/RenewalPassword/RenewalPasswordViewController.swift | 2 +- .../Signup/PasswordSetting/PasswordSettingViewController.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Projects/Presentation/Sources/ChangePassword/ChangePasswordViewController.swift b/Projects/Presentation/Sources/ChangePassword/ChangePasswordViewController.swift index 07c0e064..4702d672 100644 --- a/Projects/Presentation/Sources/ChangePassword/ChangePasswordViewController.swift +++ b/Projects/Presentation/Sources/ChangePassword/ChangePasswordViewController.swift @@ -20,7 +20,7 @@ public final class ChangePasswordViewController: BaseViewController Date: Fri, 5 Apr 2024 11:38:18 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=A7=A9=20::=20Color=20Palette=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=EC=97=90=20=EC=9D=98=ED=95=9C=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Projects/Presentation/Sources/Signin/SigninViewController.swift | 2 +- .../Signup/ProfileSetting/Components/EditProfileButton.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Projects/Presentation/Sources/Signin/SigninViewController.swift b/Projects/Presentation/Sources/Signin/SigninViewController.swift index ee73e4b4..481e3d3b 100644 --- a/Projects/Presentation/Sources/Signin/SigninViewController.swift +++ b/Projects/Presentation/Sources/Signin/SigninViewController.swift @@ -17,7 +17,7 @@ public final class SigninViewController: BaseReactorViewController