[Feat] #470 - isWriting 연결

Team-ShortcutsZip · Aug 13, 2023 · caf5adf · caf5adf
1 parent 82cebc1
commit caf5adf
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/HappyAnding/HappyAnding/Extensions/View/View+Navigation.swift b/HappyAnding/HappyAnding/Extensions/View/View+Navigation.swift
@@ -68,7 +68,7 @@ extension View {
     func getDestination<T: Hashable>(data: T, isPresented: Binding<Bool>) -> some View {
         switch data {
         case is WriteCurationViewModel:
-            WriteCurationInfoView(viewModel: data as! WriteCurationViewModel)
+            WriteCurationInfoView(viewModel: data as! WriteCurationViewModel, isWriting: isPresented)
         default:
             EmptyView()
         }

diff --git a/HappyAnding/HappyAnding/ViewModel/WriteCurationViewModel.swift b/HappyAnding/HappyAnding/ViewModel/WriteCurationViewModel.swift
@@ -19,7 +19,6 @@ final class WriteCurationViewModel: ObservableObject, Hashable {
     private var shortcutsZipViewModel = ShortcutsZipViewModel.share
 
     //WriteCurationSet
-    @Published var isWriting = false
     @Published var isEdit = false
 
     //좋아요 + 내가 작성한 단축어 목록
@@ -68,7 +67,6 @@ final class WriteCurationViewModel: ObservableObject, Hashable {
     func addCuration() {
         shortcutsZipViewModel.addCuration(curation: curation, isEdit: isEdit, deletedShortcutCells: deletedShortcutCells)
 
-        self.isWriting.toggle()
         if #available(iOS 16.1, *) {
             writeCurationNavigation.navigationPath = .init()
         }

diff --git a/HappyAnding/HappyAnding/Views/Components/UserCurationListView.swift b/HappyAnding/HappyAnding/Views/Components/UserCurationListView.swift
@@ -23,7 +23,7 @@ struct UserCurationListView: View {
     var body: some View {
         VStack(spacing: 0) {
             HStack(alignment: .bottom) {
-                SubtitleTextView(text: data.title ?? "")
+                SubtitleTextView(text: data.title )
                     .onTapGesture { }
                 Spacer()
 
@@ -77,9 +77,9 @@ struct UserCurationListView: View {
 
     @ViewBuilder
     private func writeCurationView() -> some View {
-        WriteCurationSetView(viewModel: WriteCurationViewModel())
+        WriteCurationSetView(isWriting: $isWriting, viewModel: WriteCurationViewModel())
             .navigationDestination(for: WriteCurationViewModel.self) { data in
-                WriteCurationInfoView(viewModel: data)
+                WriteCurationInfoView(viewModel: data, isWriting: $isWriting)
             }
     }
 }

diff --git a/HappyAnding/HappyAnding/Views/ExploreCurationViews/ReadCurationView.swift b/HappyAnding/HappyAnding/Views/ExploreCurationViews/ReadCurationView.swift
@@ -102,9 +102,9 @@ extension ReadCurationView {
 
     @ViewBuilder
     private func editView() -> some View {
-        WriteCurationSetView(viewModel: WriteCurationViewModel(data: data.curation))
+        WriteCurationSetView(isWriting: $viewModel.isWriting, viewModel: WriteCurationViewModel(data: viewModel.curation))
             .navigationDestination(for: WriteCurationViewModel.self) { data in
-                WriteCurationInfoView(viewModel: data)
+                WriteCurationInfoView(viewModel: data, isWriting: $viewModel.isWriting)
         }
     }
 

diff --git a/HappyAnding/HappyAnding/Views/WriteCurationViews/WriteCurationInfoView.swift b/HappyAnding/HappyAnding/Views/WriteCurationViews/WriteCurationInfoView.swift
@@ -9,7 +9,8 @@ import SwiftUI
 
 struct WriteCurationInfoView: View {
     @StateObject var viewModel: WriteCurationViewModel
-
+    @Binding var isWriting: Bool
+
     @FocusState var isDescriptionFieldFocused: Bool
 
     var body: some View {
@@ -48,6 +49,7 @@ struct WriteCurationInfoView: View {
             ToolbarItem(placement: .navigationBarTrailing) {
                 Button {
                     viewModel.addCuration()
+                    self.isWriting.toggle()
                 } label: {
                     Text(TextLiteral.upload)
                         .shortcutsZipHeadline()

diff --git a/HappyAnding/HappyAnding/Views/WriteCurationViews/WriteCurationSetView.swift b/HappyAnding/HappyAnding/Views/WriteCurationViews/WriteCurationSetView.swift
@@ -9,6 +9,7 @@ import SwiftUI
 
 struct WriteCurationSetView: View {
 
+    @Binding var isWriting: Bool
     @StateObject var viewModel: WriteCurationViewModel
     var body: some View {
         VStack {
@@ -38,7 +39,7 @@ struct WriteCurationSetView: View {
         .toolbar {
             ToolbarItem(placement: .navigationBarLeading) {
                 Button {
-                    viewModel.isWriting.toggle()
+                    self.isWriting.toggle()
                 } label: {
                     Text(TextLiteral.cancel)
                         .shortcutsZipBody1()
@@ -48,7 +49,7 @@ struct WriteCurationSetView: View {
 
             ToolbarItem(placement: .navigationBarTrailing) {
                 Text(TextLiteral.next)
-                    .navigationLinkRouter(data: viewModel, isPresented: $viewModel.isWriting)
+                    .navigationLinkRouter(data: viewModel, isPresented: $isWriting)
                     .shortcutsZipHeadline()
                     .foregroundColor(viewModel.curation.shortcuts.isEmpty ? .shortcutsZipPrimary.opacity(0.3) : .shortcutsZipPrimary)
                     .disabled(viewModel.curation.shortcuts.isEmpty)