Send reaction method placeholder (#355)

* Send reaction method placeholder

* Removed unnecessary emoji skin parsing

* Code review fixes
This commit is contained in:
Aleksandrs Proskurins
2022-12-07 13:19:47 +02:00
committed by GitHub
parent 7db7eec98f
commit 1e197d48de
24 changed files with 88 additions and 80 deletions
@@ -22,7 +22,7 @@ struct EmojiPickerScreenCoordinatorParameters {
}
enum EmojiPickerScreenCoordinatorAction {
case selectEmoji(emojiId: String, itemId: String)
case emojiSelected(emoji: String, itemId: String)
}
final class EmojiPickerScreenCoordinator: CoordinatorProtocol {
@@ -42,8 +42,8 @@ final class EmojiPickerScreenCoordinator: CoordinatorProtocol {
guard let self else { return }
MXLog.debug("EmojiPickerScreenViewModel did complete with result: \(action).")
switch action {
case let .selectEmoji(emojiId: emojiId):
self.callback?(.selectEmoji(emojiId: emojiId, itemId: self.parameters.itemId))
case let .emojiSelected(emoji: emoji):
self.callback?(.emojiSelected(emoji: emoji, itemId: self.parameters.itemId))
}
}
}
@@ -17,7 +17,7 @@
import Foundation
enum EmojiPickerScreenViewModelAction {
case selectEmoji(emojiId: String)
case emojiSelected(emoji: String)
}
struct EmojiPickerScreenViewState: BindableState {
@@ -26,7 +26,7 @@ struct EmojiPickerScreenViewState: BindableState {
enum EmojiPickerScreenViewAction {
case search(searchString: String)
case emojiSelected(emoji: EmojiPickerEmojiViewData)
case emojiTapped(emoji: EmojiPickerEmojiViewData)
}
struct EmojiPickerEmojiCategoryViewData: Identifiable {
@@ -37,8 +37,8 @@ class EmojiPickerScreenViewModel: EmojiPickerScreenViewModelType, EmojiPickerScr
case let .search(searchString: searchString):
let categories = await emojiProvider.getCategories(searchString: searchString)
state.categories = convert(emojiCategories: categories)
case let .emojiSelected(emoji: emoji):
callback?(.selectEmoji(emojiId: emoji.id))
case let .emojiTapped(emoji: emoji):
callback?(.emojiSelected(emoji: emoji.value))
}
}
@@ -59,7 +59,7 @@ class EmojiPickerScreenViewModel: EmojiPickerScreenViewModelType, EmojiPickerScr
guard let firstSkin = emojiItem.skins.first else {
return nil
}
return EmojiPickerEmojiViewData(id: emojiItem.id, value: firstSkin.value)
return EmojiPickerEmojiViewData(id: emojiItem.id, value: firstSkin)
}
return EmojiPickerEmojiCategoryViewData(id: emojiCategory.id, emojis: emojisViewData)
@@ -36,7 +36,7 @@ struct EmojiPickerScreen: View {
Text(emoji.value)
.frame(width: 45, height: 45)
.onTapGesture {
context.send(viewAction: .emojiSelected(emoji: emoji))
context.send(viewAction: .emojiTapped(emoji: emoji))
}
}
}
@@ -22,7 +22,7 @@ struct RoomScreenCoordinatorParameters {
let mediaProvider: MediaProviderProtocol
let roomName: String?
let roomAvatarUrl: String?
let emojiProvide: EmojiProviderProtocol
let emojiProvider: EmojiProviderProtocol
}
final class RoomScreenCoordinator: CoordinatorProtocol {
@@ -113,7 +113,8 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
}
private func displayEmojiPickerScreen(for itemId: String) {
guard let emojiProvider = parameters?.emojiProvide else {
guard let emojiProvider = parameters?.emojiProvider,
let timelineController = parameters?.timelineController else {
fatalError()
}
let params = EmojiPickerScreenCoordinatorParameters(emojiProvider: emojiProvider,
@@ -121,12 +122,14 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
let coordinator = EmojiPickerScreenCoordinator(parameters: params)
coordinator.callback = { [weak self] action in
switch action {
case let .selectEmoji(emojiId: emojiId, itemId: itemId):
case let .emojiSelected(emoji: emoji, itemId: itemId):
self?.navigationController.dismissSheet()
MXLog.debug("Save \(emojiId) for \(itemId)")
Task {
await timelineController.sendReaction(emoji, for: itemId)
}
}
}
navigationController.presentSheet(coordinator)
}
}
@@ -31,6 +31,7 @@ enum RoomScreenComposerMode: Equatable {
enum RoomScreenViewAction {
case displayEmojiPicker(itemId: String)
case emojiTapped(emoji: String, itemId: String)
case paginateBackwards
case itemAppeared(id: String)
case itemDisappeared(id: String)
@@ -117,6 +117,9 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
state.composerMode = .default
case .cancelEdit:
state.composerMode = .default
case .emojiTapped(let emoji, let itemId):
await timelineController.sendReaction(emoji, for: itemId)
state.displayReactionsMenuForItemId = ""
}
}
@@ -19,13 +19,18 @@ import SwiftUI
struct TimelineItemReactionsMenuView: View {
private let emojis = ["👍🏼", "👎🏼", "😄", "🙏🏼", "😇"]
var onEmojiSelected: ((String) -> Void)?
var onDisplayEmojiPicker: (() -> Void)?
var body: some View {
HStack {
HStack(spacing: 10) {
ForEach(emojis, id: \.self) { emoji in
Text(emoji)
Button {
onEmojiSelected?(emoji)
} label: {
Text(emoji)
}
}
}
.padding(10)
@@ -183,9 +183,11 @@ struct TimelineTableView: UIViewRepresentable {
cell.contentConfiguration = UIHostingConfiguration {
VStack {
if viewModelContext.viewState.displayReactionsMenuForItemId == timelineItem.id {
TimelineItemReactionsMenuView {
TimelineItemReactionsMenuView(onEmojiSelected: { emoji in
viewModelContext.send(viewAction: .emojiTapped(emoji: emoji, itemId: timelineItem.id))
}, onDisplayEmojiPicker: {
viewModelContext.send(viewAction: .displayEmojiPicker(itemId: timelineItem.id))
}
})
}
timelineItem
.frame(maxWidth: .infinity, alignment: .leading)