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
14 changes: 7 additions & 7 deletions Projects/Feature/Auth/Sources/View/AuthView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,13 @@ private extension AuthView {
}

var titleView: some View {
VStack(alignment: .leading, spacing: 0) {
Text("함께니까 멈추지 않아요.")
.typography(.h3_22eb)
Text("지금 바로 키피럽 시작하기!")
.typography(.h3_22eb)
}
.foregroundStyle(Color.Gray.gray500)
Text("""
함께니까 멈추지 않아요.
지금 바로 키피럽 시작하기!
""")
.typography(.h3_22eb)
.foregroundStyle(Color.Gray.gray500)
.frame(maxWidth: .infinity, alignment: .leading)
}

var loginButtonsSection: some View {
Expand Down
1 change: 1 addition & 0 deletions Projects/Feature/Notification/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ let project = Project.makeModule(
.feature(interface: .notification),
.domain(interface: .notification),
.shared(implements: .designSystem),
.shared(implements: .util),
.external(dependency: .ComposableArchitecture)
]
)
Expand Down
23 changes: 16 additions & 7 deletions Projects/Feature/Notification/Sources/NotificationView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import ComposableArchitecture
import FeatureNotificationInterface
import SharedDesignSystem
import SharedUtil
import SwiftUI

/// 알림 화면입니다.
Expand Down Expand Up @@ -134,13 +135,21 @@ private extension NotificationView {
Button {
store.send(.notificationTapped(item))
} label: {
HStack(spacing: 0) {
Text(item.message)
.typography(.b1_14b)
.foregroundStyle(Color.Gray.gray500)
.multilineTextAlignment(.leading)
.lineLimit(2)
.frame(width: 276, alignment: .leading)
HStack(spacing: Spacing.spacing9) {
HStack(alignment: .firstTextBaseline, spacing: 0) {
Text(item.message)
.typography(.b1_14b)
.foregroundStyle(Color.Gray.gray500)
.multilineTextAlignment(.leading)
.lineLimit(2)

Text(RelativeTimeFormatter().displayText(from: item.createdAt))
.typography(.b1_14b)
.foregroundStyle(Color.Gray.gray200)
.fixedSize(horizontal: true, vertical: false)
.padding(.leading, Spacing.spacing3)
}
.frame(width: 280, alignment: .leading)

Spacer(minLength: 0)

Expand Down
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

svg 쓸 때 single scale, prevserve Vector Data 체크 안해주면 깨져보여서 그것들 다 설정해줘
https://medium.com/@Jager-yoo/swiftui-svg-%ED%8F%AC%EB%A7%B7-%EC%9D%B4%EB%AF%B8%EC%A7%80%EB%A1%9C-%EA%B9%A8%EB%81%97%ED%95%9C-ui-%EB%A7%8C%EB%93%A4%EA%B8%B0-7e902a8b5ded

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

처음 안 사실이다... 반영했어!

Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
{
"images" : [
{
"filename" : "illust_invite.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "illust_invite@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "illust_invite@3x.png",
"idiom" : "universal",
"scale" : "3x"
"filename" : "illust_invite.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
{
"images" : [
{
"filename" : "illust_singing.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "illust_singing@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "illust_singing@3x.png",
"idiom" : "universal",
"scale" : "3x"
"filename" : "illust_singing.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Loading