Skip to content
Snippets Groups Projects
Commit 3d05f174 authored by Charles Wright's avatar Charles Wright
Browse files

Merge branch 'dmytro/384-fix-like-post-bug' into 'v1_0_6'

384: Fix a bug with a like on post after scrolling down

See merge request !206
parents de0a3023 71378305
No related branches found
No related tags found
2 merge requests!207Circles iOS v1.0.6,!206384: Fix a bug with a like on post after scrolling down
...@@ -68,6 +68,10 @@ struct ImageContentView: View { ...@@ -68,6 +68,10 @@ struct ImageContentView: View {
} }
} }
class MessageCardViewModel: ObservableObject {
@Published var showReactionSheet = false // stupid hack that I used to fix a bug with the sheet that sometimes doesn't appear for posts located further down (after scrolling)
}
struct MessageCard: MessageView { struct MessageCard: MessageView {
@ObservedObject var message: Matrix.Message @ObservedObject var message: Matrix.Message
var isLocalEcho = false var isLocalEcho = false
...@@ -79,6 +83,7 @@ struct MessageCard: MessageView { ...@@ -79,6 +83,7 @@ struct MessageCard: MessageView {
private let debug = false private let debug = false
@State var sheetType: MessageSheetType? = nil @State var sheetType: MessageSheetType? = nil
@State var showAllReactions = false @State var showAllReactions = false
@StateObject private var viewModel = MessageCardViewModel()
var iCanReact: Bool var iCanReact: Bool
@State var showMessageDeleteConfirmation = false @State var showMessageDeleteConfirmation = false
@AppStorage("mediaViewWidth") var mediaViewWidth: Double = 0 @AppStorage("mediaViewWidth") var mediaViewWidth: Double = 0
...@@ -258,7 +263,7 @@ struct MessageCard: MessageView { ...@@ -258,7 +263,7 @@ struct MessageCard: MessageView {
var likeButton: some View { var likeButton: some View {
Button(action: { Button(action: {
self.sheetType = .reactions viewModel.showReactionSheet = true
}) { }) {
//Label("Like", systemImage: "heart") //Label("Like", systemImage: "heart")
Image(systemName: SystemImages.heart.rawValue) Image(systemName: SystemImages.heart.rawValue)
...@@ -485,9 +490,6 @@ struct MessageCard: MessageView { ...@@ -485,9 +490,6 @@ struct MessageCard: MessageView {
case .edit: case .edit:
PostComposer(room: message.room, editing: message) PostComposer(room: message.room, editing: message)
case .reactions:
EmojiPicker(message: message)
case .reporting: case .reporting:
MessageReportingSheet(message: message) MessageReportingSheet(message: message)
...@@ -495,6 +497,9 @@ struct MessageCard: MessageView { ...@@ -495,6 +497,9 @@ struct MessageCard: MessageView {
LikedEmojiView(message: message, emojiUsersListModel: emojiUsersListModel) LikedEmojiView(message: message, emojiUsersListModel: emojiUsersListModel)
} }
} }
.sheet(isPresented: $viewModel.showReactionSheet) {
EmojiPicker(message: message)
}
} }
} }
} }
...@@ -9,7 +9,6 @@ import Foundation ...@@ -9,7 +9,6 @@ import Foundation
enum MessageSheetType: String { enum MessageSheetType: String {
case edit case edit
case reactions
case reporting case reporting
case liked case liked
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment