Merge branch 'Dev' of https://github.com/DDD-Community/PINGPONG-IOS i…

…nto Dev
DDD-Community · Nov 21, 2023 · bdd6f84 · bdd6f84
2 parents 82a4ec8 + 6cc469b
commit bdd6f84
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/PingPong/Projects/Feature/Core/Sources/UI/View/TabView/CoreView.swift b/PingPong/Projects/Feature/Core/Sources/UI/View/TabView/CoreView.swift
@@ -42,8 +42,7 @@ public struct CoreView: View {
                     }
 
                     mainTabBar()
-//                        .keyboardAdaptive()
-
+                        .ignoresSafeArea(.keyboard)
                 }
                 .modal(with: sheetManager, viewModel: viewModel)
                 .onAppear {
@@ -105,8 +104,6 @@ public struct CoreView: View {
                 appState.isGoToProfileView = false
                 }, 
                 authViewModel: authViewModel)
-//
-
         }
     }
 

diff --git a/PingPong/Projects/Feature/Core/Sources/UI/View/TabView/FamousSayingDetailView.swift b/PingPong/Projects/Feature/Core/Sources/UI/View/TabView/FamousSayingDetailView.swift
@@ -184,17 +184,23 @@ public struct FamousSayingDetailView: View {
                                             .padding(EdgeInsets(top: 0, leading: 0, bottom: 26, trailing: 16))
                                             .foregroundColor(viewModel.selectedCard.isBookrmark ? colorSet.icon : colorSet.iconBackground)
                                             .onTapGesture {
+                                                print("??")
                                                 if viewModel.selectedCard.isBookrmark {
+                                                    print("isBook", viewModel.selectedCard.likeId)
                                                     Task {
                                                         if let likeId = viewModel.selectedCard.likeId {
                                                             await viewModel.deleteLikeQuote(likeID: likeId)
                                                             viewModel.selectedCard.isBookrmark = false
+                                                            print(viewModel.selectedCard.isBookrmark)
                                                             viewModel.removeLike(card: viewModel.selectedCard)
                                                         }
                                                     }
                                                 } else {
+                                                    print("isNotBook")
                                                     Task {
-                                                        await viewModel.quoteLikeRequest(userID: "\(authViewModel.userid)", quoteId: viewModel.selectedCard.qouteId, completion: {})
+                                                        await viewModel.quoteLikeRequest(userID: "\(authViewModel.userid)", quoteId: viewModel.selectedCard.qouteId, completion: {
+                                                            viewModel.selectedCard.likeId = viewModel.homeBaseModel?.data
+                                                        })
                                                         viewModel.selectedCard.isBookrmark = true
                                                         viewModel.addLike(card: viewModel.selectedCard)
                                                     }
@@ -209,8 +215,6 @@ public struct FamousSayingDetailView: View {
                 .onChange(of: viewModel.selectedCard.isBookrmark , perform: { newValue in
 
                     homeViewModel.randomQuoteRequest(userID: "\(authViewModel.userid)") {
-                        // 종아요일 때
-
                         for quoteContent in homeViewModel.homeRandomQuoteModel?.data?.content ?? [] {
                             let hashTags = viewModel.getHashtags(post: quoteContent)
                             viewModel.cards.append(CardInfomation(qouteId: quoteContent.quoteID ?? .zero, hashtags: hashTags, image: "", title: quoteContent.content ?? "", sources: quoteContent.author ?? "", isBookrmark: newValue, likeId: quoteContent.likeID))

diff --git a/PingPong/Projects/Feature/Search/Sources/UI/View/ExploreView.swift b/PingPong/Projects/Feature/Search/Sources/UI/View/ExploreView.swift
@@ -57,7 +57,6 @@ public struct ExploreView: View {
                     }
                     .frame(height: UIScreen.main.bounds.height * 0.6)
                 }
-
             }
         }
         .task {
@@ -99,7 +98,6 @@ public struct ExploreView: View {
                 }
             }
         })
-
     }
 
 
@@ -119,7 +117,6 @@ public struct ExploreView: View {
                         .frame(width: 17, height: 17)
                         .padding(15)
                         .onTapGesture {
-                            //                            viewModel.filterPostsByText()
                         }
                 }
             )