PR 알림 확인용입니다.

.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
       - name: Send Discord notification
         uses: stegzilla/discord-notify@v2
         with:
-          webhook_url: https://discord.com/api/webhooks/1279764424533610537/ebmxzQxzmoekP7d3UIo6q9e8RuwQKIZMm497Txy12oVvtEdehMedh4jcdH7uZmVbyqtw
+          webhook_url: https://discord.com/api/webhooks/1336664047818506280/witcWkjuUYR7BrBcc_WE3u0dZjKZfqZDRkfqsL1WwHdcBgj91fcB0vfAeuYwBLgpxFMs
           title: New PR opened
           message: "**${{ github.event.pull_request.title }}**\n**Creator:** ${{ github.event.pull_request.user.login }}\n${{ github.event.pull_request.html_url }}"
           include_image: true

Kabinett/Presentation/Commons/CustomTabView/ImportDialog.swift

@@ -17,12 +17,10 @@ struct ImportDialog: View {
                 Button("촬영하기") {
                     viewModel.hideOptions()
                     viewModel.showCamera = true
-                    envelopeStampSelectionViewModel.reset()
                 }
                 Button("앨범에서 가져오기") {
                     viewModel.hideOptions()
                     viewModel.showPhotoLibrary = true
-                    envelopeStampSelectionViewModel.reset()
                 }
                 Button("취소", role: .cancel) {
                     viewModel.showImportDialog = false

Kabinett/Presentation/Utils/Extension/Extension+NotificationName.swift

@@ -0,0 +1,12 @@
+//
+//  Extension+NotificationName.swift
+//  Kabinett
+//
+//  Created by JIHYE SEOK on 2/3/25.
+//
+
+import Foundation
+
+extension Notification.Name {
+    static let showToast = Notification.Name("showToast")
+}

Kabinett/Presentation/View/ImportLetter/PhotoImporting/ImagePreview.swift

@@ -52,6 +52,7 @@ struct ImagePreview: View {
                     }
                     .padding(.horizontal, UIScreen.main.bounds.width * 0.06)
                 }
+                .padding(.bottom, LayoutHelper.shared.getSize(forSE: 0.03, forOthers: 0.0))
             }
             .navigationTitle("")
             .navigationBarTitleDisplayMode(.inline)

Kabinett/Presentation/View/ImportLetter/PhotoImporting/LetterCompletionView.swift

@@ -135,17 +135,17 @@ struct LetterCompletionView: View {
             customTabViewModel.navigateToLetterBox()
             dismiss()
             customTabViewModel.selectedTab = 0
-            envelopeStampSelectionViewModel.reset()
 
             Task {
                 if viewModel.postScript == nil {
                     viewModel.postScript = letterContent.postScript
                 }
 
                 let success = await viewModel.saveImportingImage()
-                if !success {
-                    print("Failed to save letter")
-                }
+                NotificationCenter.default.post(
+                    name: .showToast,
+                    object: nil,
+                    userInfo: success ? ["message": "편지가 성공적으로 보관되었어요.", "color": Color.primary900] : ["message": "앗..!! 편지 보관을 실패했어요..", "color": Color.alert])
             }
         }) {
             Text("편지 보관하기")
@@ -157,6 +157,7 @@ struct LetterCompletionView: View {
                 .cornerRadius(16)
         }
         .padding(.horizontal, UIScreen.main.bounds.width * 0.06)
+        .padding(.bottom, LayoutHelper.shared.getSize(forSE: 0.03, forOthers: 0.0))
         .disabled(viewModel.isLoading)
     }
 }

Kabinett/Presentation/View/ImportLetter/PhotoImporting/LetterWritingView.swift

@@ -119,7 +119,7 @@ struct LetterWritingView: View {
         letterContent.toUserName = viewModel.toUserName
         letterContent.date = viewModel.date
         letterContent.photoContents = viewModel.photoContents
-        letterContent.dataSource = .fromImagePicker
+        letterContent.dataSource = .importLetter
     }
 }
 

Kabinett/Presentation/View/LetterBox/Components/ToastView.swift

@@ -8,22 +8,20 @@
 import SwiftUI
 
 struct ToastView: View {
-    let message: String
-    @Binding var showToast: Bool
-
+    @ObservedObject var toastViewModel: ToastViewModel
     @State private var actualCurrentOffset: CGSize = CGSize(width: 0, height: UIScreen.main.bounds.height)
 
     var body: some View {
-        if showToast {
+        if toastViewModel.showToast {
             ZStack {
                 Rectangle()
                     .fill(.clear)
-                    .background(.primary900)
+                    .background(toastViewModel.backgroundColor)
                     .frame(height: 50)
                     .cornerRadius(28)
                     .padding(.horizontal, 50)
 
-                Text(message)
+                Text(toastViewModel.message)
                     .font(.system(size: 16, weight: .heavy))
                     .foregroundStyle(.white)
             }
@@ -34,15 +32,11 @@ struct ToastView: View {
                 } completion: {
                     withAnimation(Animation.easeInOut(duration: 1.5).delay(1.2)) {
                         actualCurrentOffset = CGSize(width: 0, height: UIScreen.main.bounds.height)
-                        showToast = false
+                        toastViewModel.showToast = false
                     }
                 }
             }
             .padding(.bottom, LayoutHelper.shared.getSize(forSE: 0.01, forOthers: 0.01))
         }
     }
 }
-
-#Preview {
-    ToastView(message: "카비넷 팀이 보낸 편지가 도착했어요.", showToast: .constant(true))
-}

Kabinett/Presentation/View/LetterBox/LetterBoxView.swift

@@ -16,6 +16,7 @@ struct LetterBoxView: View {
 
     @StateObject private var calendarViewModel = CalendarViewModel()
     @StateObject private var searchBarViewModel = SearchBarViewModel()
+    @StateObject private var toastViewModel = ToastViewModel()
 
     @ObservedObject var customTabViewModel: CustomTabViewModel
 
@@ -57,7 +58,7 @@ struct LetterBoxView: View {
 
                     VStack {
                         Spacer()
-                        ToastView(message: "카비넷 팀의 편지가 도착했어요.", showToast: $letterBoxViewModel.showToast)
+                        ToastView(toastViewModel: toastViewModel)
                     }
                 }
                 .onAppear() {

Kabinett/Presentation/View/WriteLetter/Cells/EnvelopeCell.swift

@@ -0,0 +1,68 @@
+//
+//  EnvelopeCell.swift
+//  Kabinett
+//
+//  Created by Song Kim on 1/6/25.
+//
+
+import SwiftUI
+import Kingfisher
+
+struct EnvelopeCell: View {
+    @Binding var letterContent: LetterWriteModel
+    @Binding var envelopeImageUrl: String
+    @ObservedObject var viewModel: EnvelopeStampSelectionViewModel
+
+    var body: some View {
+        ZStack {
+            Color(.background).ignoresSafeArea()
+
+            VStack {
+                List {
+                    ForEach(0..<viewModel.envelopeNumberOfRows, id: \.self) { rowIndex in
+                        HStack {
+                            ForEach(0..<2, id: \.self) { columnIndex in
+                                let index = viewModel.envelopeIndex(row: rowIndex, column: columnIndex)
+
+                                if index < viewModel.envelopes.count {
+                                    ZStack(alignment: .topTrailing) {
+                                        KFImage(URL(string: viewModel.envelopes[index]))
+                                            .placeholder {
+                                                ProgressView()
+                                            }
+                                            .resizable()
+                                            .aspectRatio(9/4, contentMode: .fit)
+                                            .padding(10)
+                                            .shadow(color: Color(.primary300), radius: 5, x: 3, y: 3)
+                                            .onTapGesture {
+                                                viewModel.envelopeSelectStationery(coordinates: (rowIndex, columnIndex))
+                                                envelopeImageUrl = viewModel.envelopes[index]
+                                                letterContent.envelopeImageUrlString = viewModel.envelopes[index]
+                                            }
+
+                                        if viewModel.isEnvelopeSelected(coordinates: (rowIndex, columnIndex)) {
+                                            Image("checked")
+                                                .resizable()
+                                                .frame(width: 27, height: 27)
+                                                .padding([.top, .trailing], 20)
+                                                .onAppear {
+                                                    letterContent.envelopeImageUrlString = viewModel.envelopes[viewModel.envelopeIndex(row: rowIndex, column: columnIndex)]
+                                                }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        .listRowBackground(Color.clear)
+                        .listRowSeparator(.hidden)
+                        .listRowInsets(EdgeInsets())
+                        .padding(.top, 10)
+                    }
+                }
+                .listStyle(.plain)
+                .padding(.leading, -10)
+                .padding(.trailing, -5)
+            }
+        }
+    }
+}

Kabinett/Presentation/View/WriteLetter/Cells/StampCell.swift

@@ -0,0 +1,68 @@
+//
+//  StampCell.swift
+//  Kabinett
+//
+//  Created by Song Kim on 1/6/25.
+//
+
+import SwiftUI
+import Kingfisher
+
+struct StampCell: View {
+    @Binding var letterContent: LetterWriteModel
+    @Binding var stampImageUrl: String
+    @ObservedObject var viewModel: EnvelopeStampSelectionViewModel
+
+    var body: some View {
+        ZStack {
+            Color(.background).ignoresSafeArea()
+
+            VStack {
+                List {
+                    ForEach(0..<viewModel.stampNumberOfRows, id: \.self) { rowIndex in
+                        HStack {
+                            ForEach(0..<3, id: \.self) { columnIndex in
+                                let index = viewModel.stampIndex(row: rowIndex, column: columnIndex)
+
+                                if index < viewModel.stamps.count {
+                                    ZStack(alignment: .topTrailing) {
+                                        KFImage(URL(string: viewModel.stamps[index]))
+                                            .placeholder {
+                                                ProgressView()
+                                            }
+                                            .resizable()
+                                            .aspectRatio(9/9.7, contentMode: .fit)
+                                            .padding(10)
+                                            .shadow(color: Color(.primary300), radius: 5, x: 3, y: 3)
+                                            .onTapGesture {
+                                                viewModel.stampSelectStationery(coordinates: (rowIndex, columnIndex))
+                                                stampImageUrl = viewModel.stamps[index]
+                                                letterContent.stampImageUrlString = viewModel.stamps[index]
+                                            }
+
+                                        if viewModel.isStampSelected(coordinates: (rowIndex, columnIndex)) {
+                                            Image("checked")
+                                                .resizable()
+                                                .frame(width: 27, height: 27)
+                                                .padding([.top, .trailing], 20)
+                                                .onAppear {
+                                                    letterContent.stampImageUrlString = viewModel.stamps[viewModel.stampIndex(row: rowIndex, column: columnIndex)]
+                                                }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        .listRowBackground(Color.clear)
+                        .listRowSeparator(.hidden)
+                        .listRowInsets(EdgeInsets())
+                        .padding(.top, 10)
+                    }
+                }
+                .listStyle(.plain)
+                .padding(.leading, -10)
+                .padding(.trailing, -5)
+            }
+        }
+    }
+}

Kabinett/Presentation/View/WriteLetter/Cells/StationeryCell.swift

@@ -0,0 +1,48 @@
+//
+//  StationeryCell.swift
+//  Kabinett
+//
+//  Created by Song Kim on 1/6/25.
+//
+
+import SwiftUI
+import Kingfisher
+
+struct StationeryCell: View {
+    let index: Int
+    let rowIndex: Int
+    let columnIndex: Int
+    @Binding var letterContent: LetterWriteModel
+    @ObservedObject var stationerySelectionViewModel: StationerySelectionViewModel
+
+    var body: some View {
+        ZStack(alignment: .topTrailing) {
+            if stationerySelectionViewModel.stationerys.indices.contains(index) {
+                KFImage(URL(string: stationerySelectionViewModel.stationerys[index]))
+                    .placeholder {
+                        ProgressView()
+                    }
+                    .resizable()
+                    .aspectRatio(9/13, contentMode: .fit)
+                    .padding(10)
+                    .shadow(color: Color(.primary300), radius: 5, x: 3, y: 3)
+                    .onTapGesture {
+                        stationerySelectionViewModel.selectStationery(coordinates: (rowIndex, columnIndex))
+                        letterContent.stationeryImageUrlString = stationerySelectionViewModel.stationerys[index]
+                    }
+            } else {
+                EmptyView()
+            }
+
+            if stationerySelectionViewModel.isSelected(coordinates: (rowIndex, columnIndex)) {
+                Image("checked")
+                    .resizable()
+                    .frame(width: 32, height: 32)
+                    .padding([.top, .trailing], 20)
+                    .onAppear {
+                        letterContent.stationeryImageUrlString = stationerySelectionViewModel.stationerys[index]
+                    }
+            }
+        }
+    }
+}

Kabinett/Presentation/View/WriteLetter/WriteLetterEnvelopeCell.swift → Kabinett/Presentation/View/WriteLetter/Cells/WriteLetterEnvelopeCell.swift

@@ -72,5 +72,5 @@ struct WriteLetterEnvelopeCell: View {
             )
         }
     }
-
+    
 }