Skip to content

Commit 28d4bca

Browse files
authored
Merge pull request #165 from YAPP-Github/feat/#157-design-system-update
Feat/1.0.6 λŒ€λΉ„ λ””μžμΈ μ‹œμŠ€ν…œ 변경사항 반영
2 parents 21cd383 + 8e59ce6 commit 28d4bca

File tree

50 files changed

+850
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+850
-190
lines changed

β€ŽProjects/App/Resources/Pokit-info.plistβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<key>CFBundlePackageType</key>
2222
<string>APPL</string>
2323
<key>CFBundleShortVersionString</key>
24-
<string>1.0.5</string>
24+
<string>1.0.6</string>
2525
<key>CFBundleURLTypes</key>
2626
<array>
2727
<dict>

β€ŽProjects/App/Sources/MainTab/MainTabPath.swiftβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ public extension MainTabFeature {
216216
),
217217
title: content.title,
218218
data: content.data,
219-
memo: content.memo,
219+
memo: content.memo ?? "",
220220
createdAt: content.createdAt,
221221
favorites: nil,
222222
alertYn: .no

β€ŽProjects/CoreKit/Sources/Data/DTO/Base/ContentBaseResponse.swiftβ€Ž

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ public struct ContentBaseResponse: Decodable {
1313
public let data: String
1414
public let domain: String
1515
public let title: String
16+
public let memo: String?
1617
public let thumbNail: String
1718
public let createdAt: String
1819
public let isRead: Bool?
20+
public let isFavorite: Bool?
1921
}
2022

2123
extension ContentBaseResponse {
@@ -29,9 +31,11 @@ extension ContentBaseResponse {
2931
data: "https://www.youtube.com/watch?v=wtSwdGJzQCQ",
3032
domain: "youtube",
3133
title: "μ‹ μ„œμœ κΈ°",
34+
memo: nil,
3235
thumbNail: "https://i.ytimg.com/vi/NnOC4_kH0ok/hqdefault.jpg?sqp=-oaymwEjCNACELwBSFryq4qpAxUIARUAAAAAGAElAADIQj0AgKJDeAE=&rs=AOn4CLDN6u6mTjbaVmRZ4biJS_aDq4uvAQ",
3336
createdAt: "2024.08.08",
34-
isRead: false
37+
isRead: false,
38+
isFavorite: true
3539
)
3640
}
3741
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "icon_allcheck.svg",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"author" : "xcode",
19+
"version" : 1
20+
},
21+
"properties" : {
22+
"template-rendering-intent" : "template"
23+
}
24+
}
Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "icon_alluncheck.svg",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"author" : "xcode",
19+
"version" : 1
20+
},
21+
"properties" : {
22+
"template-rendering-intent" : "template"
23+
}
24+
}
Lines changed: 5 additions & 0 deletions
Loading
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "icon_arrow-down2.svg",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"author" : "xcode",
19+
"version" : 1
20+
},
21+
"properties" : {
22+
"template-rendering-intent" : "template"
23+
}
24+
}
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "icon_hashtag.svg",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"author" : "xcode",
19+
"version" : 1
20+
},
21+
"properties" : {
22+
"template-rendering-intent" : "template"
23+
}
24+
}

0 commit comments

Comments
Β (0)