Skip to content

Commit

Permalink
✨[feat]: 둘러보기 기능추가 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
@Roy-wonji
Roy-wonji committed Dec 10, 2023
1 parent da9e9ce commit 98a9840
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 55 deletions.
2 changes: 1 addition & 1 deletion ...Pong/Plugins/PingPongs/ProjectDescriptionHelpers/Project+Templete/Project+Templates.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ extension String {
}

public static func appBuildVersion() -> String {
let buildVersion: String = "18"
let buildVersion: String = "21"
return buildVersion
}

Expand Down
2 changes: 1 addition & 1 deletion PingPong/Projects/App/Support/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>20</string>
<string>21</string>
<key>FirebaseAppDelegateProxyEnabled</key>
<true/>
<key>INIntentsSupported</key>
Expand Down
2 changes: 1 addition & 1 deletion PingPong/Projects/Core/Common/Sources/ViewModel/CommonViewViewModel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class CommonViewViewModel: ObservableObject {
isExplore = UserDefaults.standard.bool(forKey: "isExplore")

}
@AppStorage("isFirstUserPOPUP") public var isFirstUserPOPUP: Bool = false
@AppStorage("isFirstUserPOPUP") public var isFirstUserPOPUP: Bool = true

@Published public var isLoginCheck: Bool = false {
didSet {
Expand Down
34 changes: 18 additions & 16 deletions PingPong/Projects/Feature/Bake/Sources/UI/HomeBakingView/FamousSayingBakeCardView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,26 +312,28 @@ struct FamousSayingBakeCardView: View {
.foregroundColor(bakeViewModel.bakeCard?.isBookrmark ?? true ? colorSet.icon : colorSet.iconBackground)
.onTapGesture {

if bakeViewModel.bakeCard != nil {
if bakeViewModel.bakeCard!.isBookrmark {
Task {
if let likeId = bakeViewModel.bakeCard?.likeId {
await viewModel.deleteLikeQuote(likeID: likeId)
bakeViewModel.bakeCard!.isBookrmark = false
if viewModel.isLoginCheck {
if bakeViewModel.bakeCard != nil {
if bakeViewModel.bakeCard!.isBookrmark {
Task {
if let likeId = bakeViewModel.bakeCard?.likeId {
await viewModel.deleteLikeQuote(likeID: likeId)
bakeViewModel.bakeCard!.isBookrmark = false
}
}
}
} else {
Task {
await viewModel.quoteLikeRequest(userID: "\(authViewModel.userid)", quoteId: bakeViewModel.bakeCard!.qouteId) {
if let likeid = viewModel.homeBaseModel?.data {
bakeViewModel.addLike(qouteId: bakeViewModel.bakeCard!.qouteId, likeId: likeid)
bakeViewModel.bakeCard?.likeId = likeid
} else {
Task {
await viewModel.quoteLikeRequest(userID: "\(authViewModel.userid)", quoteId: bakeViewModel.bakeCard!.qouteId) {
if let likeid = viewModel.homeBaseModel?.data {
bakeViewModel.addLike(qouteId: bakeViewModel.bakeCard!.qouteId, likeId: likeid)
bakeViewModel.bakeCard?.likeId = likeid
}
}
bakeViewModel.bakeCard!.isBookrmark = true

}
bakeViewModel.bakeCard!.isBookrmark = true

}
}
}
}
//TODO: 좋아요되도록 수정
// post.isBookrmark.toggle()
Expand Down
35 changes: 17 additions & 18 deletions PingPong/Projects/Feature/Core/Sources/UI/View/TabView/FamousSayingDetailView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,25 +184,24 @@ 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)

if viewModel.isLoginCheck {
if viewModel.selectedCard.isBookrmark {
Task {
if let likeId = viewModel.selectedCard.likeId {
await viewModel.deleteLikeQuote(likeID: likeId)
viewModel.selectedCard.isBookrmark = false
viewModel.removeLike(card: viewModel.selectedCard)
}
}
} else {
Task {
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)
}
}
} else {
print("isNotBook")
Task {
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)
}
}
}
Expand Down
39 changes: 21 additions & 18 deletions PingPong/Projects/Feature/Home/Sources/UI/View/HomeView/HomeView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,15 @@ public struct HomeView: 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))
if viewModel.isLoginCheck {
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))

}
}
}
})
Expand Down Expand Up @@ -321,18 +322,20 @@ public struct HomeView: View {
.padding(EdgeInsets(top: 0, leading: 0, bottom: 26, trailing: 16))
.foregroundColor(card.isBookrmark ? colorSet.icon : colorSet.iconBackground)
.onTapGesture {
if let idx = viewModel.cards.firstIndex(of: card) {
if viewModel.cards[idx].isBookrmark {
Task {
if let likeId = viewModel.cards[idx].likeId {
await viewModel.deleteLikeQuote(likeID: likeId)
viewModel.cards[idx].isBookrmark = false
if viewModel.isLoginCheck {
if let idx = viewModel.cards.firstIndex(of: card) {
if viewModel.cards[idx].isBookrmark {
Task {
if let likeId = viewModel.cards[idx].likeId {
await viewModel.deleteLikeQuote(likeID: likeId)
viewModel.cards[idx].isBookrmark = false
}
}
} else {
Task {
await viewModel.quoteLikeRequest(userID: "\(authViewModel.userid)", quoteId: card.qouteId, completion: {})
viewModel.cards[idx].isBookrmark = true
}
}
} else {
Task {
await viewModel.quoteLikeRequest(userID: "\(authViewModel.userid)", quoteId: card.qouteId, completion: {})
viewModel.cards[idx].isBookrmark = true
}
}
}
Expand Down

0 comments on commit 98a9840

Please sign in to comment.