Skip to content

Commit 150d635

Browse files
authored
[Merge] #228 - 메모 존재 여부에 따른 분기 추가
2 parents bda7793 + 12906b0 commit 150d635

12 files changed

Lines changed: 45 additions & 35 deletions

File tree

Neki-iOS/Features/Archive/Sources/Presentation/Sources/Components/ArchiveImageFooter.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ struct ArchiveImageFooter: View {
1818

1919
let style: ArchiveFooterStyle
2020

21-
/// 버튼 활성화 여부
2221
let isEnabled: Bool
23-
/// 즐겨찾기 상태 (상세 모드 전용)
2422
let isFavorite: Bool?
23+
let hasMemo: Bool
2524

26-
// 아이콘 액션
2725
let onDownload: () -> Void
2826
let onDelete: () -> Void
2927
let onFavorite: (() -> Void)?
@@ -37,6 +35,7 @@ struct ArchiveImageFooter: View {
3735
style: ArchiveFooterStyle = .detail,
3836
isEnabled: Bool = true,
3937
isFavorite: Bool? = nil,
38+
hasMemo: Bool = false,
4039
onDownload: @escaping () -> Void,
4140
onDelete: @escaping () -> Void,
4241
onFavorite: (() -> Void)? = nil,
@@ -47,6 +46,7 @@ struct ArchiveImageFooter: View {
4746
self.style = style
4847
self.isEnabled = isEnabled
4948
self.isFavorite = isFavorite
49+
self.hasMemo = hasMemo
5050
self.onDownload = onDownload
5151
self.onDelete = onDelete
5252
self.onFavorite = onFavorite
@@ -122,14 +122,14 @@ extension ArchiveImageFooter {
122122
Text(title)
123123
.nekiFont(.body14Medium)
124124
.foregroundStyle(isEnabled ? .gray700 : .gray400)
125-
125+
126126
}
127127
.frame(maxWidth: .infinity)
128128
.contentShape(Rectangle())
129129
}
130130
.disabled(!isEnabled)
131131
}
132-
132+
133133
private var detailModeFooter: some View {
134134
HStack(alignment: .center, spacing: 0) {
135135
Button(action: onDownload) {
@@ -147,7 +147,7 @@ extension ArchiveImageFooter {
147147

148148
if let onTapMemo = onTapMemo {
149149
Button(action: onTapMemo) {
150-
Image(.iconNote)
150+
Image(hasMemo ? .iconNoteFill : .iconNote)
151151
.foregroundStyle(.gray700)
152152
}
153153
.padding(.leading, 16)

Neki-iOS/Features/Archive/Sources/Presentation/Sources/View/ArchivePhotoDetailView.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ extension ArchivePhotoDetailView {
354354
ArchiveImageFooter(
355355
isEnabled: true,
356356
isFavorite: currentItem.isFavorite,
357+
hasMemo: !currentItem.memo.isEmpty,
357358
onDownload: { store.send(.onTapDownload) },
358359
onDelete: { showDeleteAlert = true },
359360
onFavorite: { store.send(.onTapFavorite) },
Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
11
{
22
"images" : [
33
{
4-
"filename" : "icon_note.svg",
5-
"idiom" : "universal"
4+
"filename" : "icon_note1.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "icon_note2.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "icon_note3.png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
617
}
718
],
819
"info" : {
920
"author" : "xcode",
1021
"version" : 1
11-
},
12-
"properties" : {
13-
"preserves-vector-representation" : true
1422
}
1523
}

Neki-iOS/Shared/DesignSystem/Resources/Assets.xcassets/Common/icon_note.imageset/icon_note.svg

Lines changed: 0 additions & 6 deletions
This file was deleted.
538 Bytes
Loading
932 Bytes
Loading
1.14 KB
Loading
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "icon_note_fill1.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "icon_note_fill2.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "icon_note_fill3.png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}
599 Bytes
Loading
954 Bytes
Loading

0 commit comments

Comments
 (0)