Skip to content

Allow voters to add poll comments in UI Components #6444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gpunto wants to merge 1 commit into
base: v6
Choose a base branch
from
Open

Allow voters to add poll comments in UI Components #6444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions stream-chat-android-core/src/testFixtures/kotlin/io/getstream/chat/android/Mother.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,6 +917,22 @@ public fun randomOption(
text = text,
)

public fun randomVote(
id: String = randomString(),
pollId: String = randomString(),
optionId: String = randomString(),
createdAt: Date = randomDate(),
updatedAt: Date = randomDate(),
user: User? = randomUser(),
): Vote = Vote(
id = id,
pollId = pollId,
optionId = optionId,
createdAt = createdAt,
updatedAt = updatedAt,
user = user,
)

public fun randomPollOption(
id: String? = randomString(),
text: String = randomString(),
Expand Down
37 changes: 34 additions & 3 deletions stream-chat-android-ui-components/api/stream-chat-android-ui-components.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2338,6 +2338,7 @@ public final class io/getstream/chat/android/ui/feature/messages/list/MessageLis
public final fun setModeratedMessageHandler (Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$ModeratedMessageOptionHandler;)V
public final fun setModeratedMessageLongClickListener (Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$ModeratedMessageLongClickListener;)V
public final fun setNewMessagesBehaviour (Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$NewMessagesBehaviour;)V
public final fun setOnAddPollCommentClickListener (Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnAddPollCommentClickListener;)V
public final fun setOnAttachmentClickListener (Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnAttachmentClickListener;)V
public final fun setOnAttachmentDownloadClickListener (Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnAttachmentDownloadClickListener;)V
public final fun setOnEnterThreadListener (Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnEnterThreadListener;)V
Expand All @@ -2359,6 +2360,7 @@ public final class io/getstream/chat/android/ui/feature/messages/list/MessageLis
public final fun setOnUnreadLabelReachedListener (Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnUnreadLabelReachedListener;)V
public final fun setOnUserClickListener (Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnUserClickListener;)V
public final fun setOnUserReactionClickListener (Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnUserReactionClickListener;)V
public final fun setOnViewPollCommentsClickListener (Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnViewPollCommentsClickListener;)V
public final fun setOnViewPollResultClickListener (Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnViewPollResultClickListener;)V
public final fun setOpenThreadHandler (Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OpenThreadHandler;)V
public final fun setOwnCapabilities (Ljava/util/Set;)V
Expand Down Expand Up @@ -2533,6 +2535,10 @@ public final class io/getstream/chat/android/ui/feature/messages/list/MessageLis
public static fun values ()[Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$NewMessagesBehaviour;
}

public abstract interface class io/getstream/chat/android/ui/feature/messages/list/MessageListView$OnAddPollCommentClickListener {
public abstract fun onAddPollCommentClick (Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/Poll;)Z
}

public abstract interface class io/getstream/chat/android/ui/feature/messages/list/MessageListView$OnAttachmentClickListener {
public abstract fun onAttachmentClick (Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/Attachment;)Z
}
Expand Down Expand Up @@ -2629,6 +2635,10 @@ public abstract interface class io/getstream/chat/android/ui/feature/messages/li
public abstract fun onUserReactionClick (Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/User;Lio/getstream/chat/android/models/Reaction;)Z
}

public abstract interface class io/getstream/chat/android/ui/feature/messages/list/MessageListView$OnViewPollCommentsClickListener {
public abstract fun onViewPollCommentsClick (Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/Poll;)Z
}

public abstract interface class io/getstream/chat/android/ui/feature/messages/list/MessageListView$OnViewPollResultClickListener {
public abstract fun onViewPollResultClick (Lio/getstream/chat/android/models/Poll;)Z
}
Expand Down Expand Up @@ -3155,10 +3165,12 @@ public abstract interface class io/getstream/chat/android/ui/feature/messages/li
public abstract fun getMessageClickListener ()Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnMessageClickListener;
public abstract fun getMessageLongClickListener ()Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnMessageLongClickListener;
public abstract fun getMessageRetryListener ()Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnMessageRetryListener;
public abstract fun getOnAddPollCommentClickListener ()Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnAddPollCommentClickListener;
public abstract fun getOnPollCloseClickListener ()Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnPollCloseClickListener;
public abstract fun getOnPollOptionClickListener ()Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnPollOptionClickListener;
public abstract fun getOnShowAllPollOptionClickListener ()Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnShowAllPollOptionClickListener;
public abstract fun getOnSuggestPollOptionClickListener ()Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnSuggestPollOptionClickListener;
public abstract fun getOnViewPollCommentsClickListener ()Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnViewPollCommentsClickListener;
Comment thread
gpunto marked this conversation as resolved.
public abstract fun getOnViewPollResultClickListener ()Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnViewPollResultClickListener;
public abstract fun getReactionViewClickListener ()Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnReactionViewClickListener;
public abstract fun getThreadClickListener ()Lio/getstream/chat/android/ui/feature/messages/list/MessageListView$OnThreadClickListener;
Expand Down Expand Up @@ -3239,8 +3251,10 @@ public final class io/getstream/chat/android/ui/feature/messages/list/adapter/vi
}

public final class io/getstream/chat/android/ui/feature/messages/list/adapter/view/PollViewStyle : io/getstream/chat/android/ui/helper/ViewStyle {
public fun <init> (Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Landroid/graphics/drawable/Drawable;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;)V
public fun <init> (Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Landroid/graphics/drawable/Drawable;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;)V
public final fun component1 ()Lio/getstream/chat/android/ui/font/TextStyle;
public final fun component10 ()Lio/getstream/chat/android/ui/font/TextStyle;
public final fun component11 ()Lio/getstream/chat/android/ui/font/TextStyle;
public final fun component2 ()Lio/getstream/chat/android/ui/font/TextStyle;
public final fun component3 ()Landroid/graphics/drawable/Drawable;
public final fun component4 ()Lio/getstream/chat/android/ui/font/TextStyle;
Expand All @@ -3249,9 +3263,10 @@ public final class io/getstream/chat/android/ui/feature/messages/list/adapter/vi
public final fun component7 ()Lio/getstream/chat/android/ui/font/TextStyle;
public final fun component8 ()Lio/getstream/chat/android/ui/font/TextStyle;
public final fun component9 ()Lio/getstream/chat/android/ui/font/TextStyle;
public final fun copy (Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Landroid/graphics/drawable/Drawable;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;)Lio/getstream/chat/android/ui/feature/messages/list/adapter/view/PollViewStyle;
public static synthetic fun copy$default (Lio/getstream/chat/android/ui/feature/messages/list/adapter/view/PollViewStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Landroid/graphics/drawable/Drawable;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;ILjava/lang/Object;)Lio/getstream/chat/android/ui/feature/messages/list/adapter/view/PollViewStyle;
public final fun copy (Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Landroid/graphics/drawable/Drawable;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;)Lio/getstream/chat/android/ui/feature/messages/list/adapter/view/PollViewStyle;
public static synthetic fun copy$default (Lio/getstream/chat/android/ui/feature/messages/list/adapter/view/PollViewStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Landroid/graphics/drawable/Drawable;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;Lio/getstream/chat/android/ui/font/TextStyle;ILjava/lang/Object;)Lio/getstream/chat/android/ui/feature/messages/list/adapter/view/PollViewStyle;
public fun equals (Ljava/lang/Object;)Z
public final fun getPollAddCommentTextStyle ()Lio/getstream/chat/android/ui/font/TextStyle;
public final fun getPollCloseTextStyle ()Lio/getstream/chat/android/ui/font/TextStyle;
public final fun getPollOptionCheckDrawable ()Landroid/graphics/drawable/Drawable;
public final fun getPollOptionTextStyle ()Lio/getstream/chat/android/ui/font/TextStyle;
Expand All @@ -3261,6 +3276,7 @@ public final class io/getstream/chat/android/ui/feature/messages/list/adapter/vi
public final fun getPollSubtitleTextStyle ()Lio/getstream/chat/android/ui/font/TextStyle;
public final fun getPollSuggestOptionTextStyle ()Lio/getstream/chat/android/ui/font/TextStyle;
public final fun getPollTitleTextStyle ()Lio/getstream/chat/android/ui/font/TextStyle;
public final fun getPollViewCommentsTextStyle ()Lio/getstream/chat/android/ui/font/TextStyle;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
}
Expand Down Expand Up @@ -4990,6 +5006,21 @@ public final class io/getstream/chat/android/ui/viewmodel/messages/MessageListVi
public fun toString ()Ljava/lang/String;
}

public final class io/getstream/chat/android/ui/viewmodel/messages/MessageListViewModel$Event$PollAnswerCast : io/getstream/chat/android/ui/viewmodel/messages/MessageListViewModel$Event {
public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public final fun component1 ()Ljava/lang/String;
public final fun component2 ()Ljava/lang/String;
public final fun component3 ()Ljava/lang/String;
public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/getstream/chat/android/ui/viewmodel/messages/MessageListViewModel$Event$PollAnswerCast;
public static synthetic fun copy$default (Lio/getstream/chat/android/ui/viewmodel/messages/MessageListViewModel$Event$PollAnswerCast;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lio/getstream/chat/android/ui/viewmodel/messages/MessageListViewModel$Event$PollAnswerCast;
public fun equals (Ljava/lang/Object;)Z
public final fun getAnswer ()Ljava/lang/String;
public final fun getMessageId ()Ljava/lang/String;
public final fun getPollId ()Ljava/lang/String;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
}
Comment thread
gpunto marked this conversation as resolved.

public final class io/getstream/chat/android/ui/viewmodel/messages/MessageListViewModel$Event$PollClosed : io/getstream/chat/android/ui/viewmodel/messages/MessageListViewModel$Event {
public fun <init> (Lio/getstream/chat/android/models/Poll;)V
public final fun component1 ()Lio/getstream/chat/android/models/Poll;
Expand Down
55 changes: 55 additions & 0 deletions ...nts/src/main/kotlin/io/getstream/chat/android/ui/feature/messages/list/MessageListView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ import io.getstream.chat.android.ui.feature.messages.list.internal.HiddenMessage
import io.getstream.chat.android.ui.feature.messages.list.internal.MessageListScrollHelper
import io.getstream.chat.android.ui.feature.messages.list.internal.SwipeReplyCallback
import io.getstream.chat.android.ui.feature.messages.list.internal.canReplyToMessage
import io.getstream.chat.android.ui.feature.messages.list.internal.poll.AddPollCommentDialogFragment
import io.getstream.chat.android.ui.feature.messages.list.internal.poll.AllPollOptionsDialogFragment
import io.getstream.chat.android.ui.feature.messages.list.internal.poll.PollCommentsDialogFragment
import io.getstream.chat.android.ui.feature.messages.list.internal.poll.PollResultsDialogFragment
import io.getstream.chat.android.ui.feature.messages.list.internal.poll.SuggestPollOptionDialogFragment
import io.getstream.chat.android.ui.feature.messages.list.options.message.MessageOptionItem
Expand Down Expand Up @@ -623,6 +625,21 @@ public class MessageListView : ConstraintLayout {
true
} ?: false
}
private val defaultOnAddPollCommentClickListener = OnAddPollCommentClickListener { message, poll ->
context.getFragmentManager()?.let { fragmentManager ->
AddPollCommentDialogFragment.newInstance(messageId = message.id, pollId = poll.id)
.show(fragmentManager, AddPollCommentDialogFragment.TAG)
true
} ?: false
}
private val defaultOnViewPollCommentsClickListener = OnViewPollCommentsClickListener { message, _ ->
context.getFragmentManager()?.let { fragmentManager ->
PollCommentsDialogFragment
.newInstance(cid = message.cid, messageId = message.id)
.show(fragmentManager, PollCommentsDialogFragment.TAG)
true
} ?: false
}

private val listenerContainer = MessageListListenerContainerImpl(
messageClickListener = defaultMessageClickListener,
Expand All @@ -641,6 +658,8 @@ public class MessageListView : ConstraintLayout {
onPollCloseClickListener = defaultOnPollCloseClickListener,
onViewPollResultClickListener = defaultOnViewPollResultClickListener,
onSuggestPollOptionClickListener = defaultOnSuggestPollOptionClickListener,
onAddPollCommentClickListener = defaultOnAddPollCommentClickListener,
onViewPollCommentsClickListener = defaultOnViewPollCommentsClickListener,
)
private var enterThreadListener = defaultEnterThreadListener
private var userReactionClickListener = defaultUserReactionClickListener
Expand Down Expand Up @@ -1456,6 +1475,34 @@ public class MessageListView : ConstraintLayout {
}
}

/**
* Set the Add Poll Comment click listener to be used by MessageListView.
*
* @param listener The listener to use. If null, the default will be used instead.
*/
public fun setOnAddPollCommentClickListener(listener: OnAddPollCommentClickListener?) {
listenerContainer.onAddPollCommentClickListener =
if (listener == null) {
defaultOnAddPollCommentClickListener
} else {
OnAddPollCommentClickListener(listener::onAddPollCommentClick)
}
}

/**
* Set the View Poll Comments click listener to be used by MessageListView.
*
* @param listener The listener to use. If null, the default will be used instead.
*/
public fun setOnViewPollCommentsClickListener(listener: OnViewPollCommentsClickListener?) {
listenerContainer.onViewPollCommentsClickListener =
if (listener == null) {
defaultOnViewPollCommentsClickListener
} else {
OnViewPollCommentsClickListener(listener::onViewPollCommentsClick)
}
}

/**
* Sets the message long click listener to be used by MessageListView.
*
Expand Down Expand Up @@ -2338,6 +2385,14 @@ public class MessageListView : ConstraintLayout {
public fun onSuggestPollOptionClick(poll: Poll): Boolean
}

public fun interface OnAddPollCommentClickListener {
public fun onAddPollCommentClick(message: Message, poll: Poll): Boolean
}

public fun interface OnViewPollCommentsClickListener {
public fun onViewPollCommentsClick(message: Message, poll: Poll): Boolean
}

@Deprecated(
message = "Use ReplyMessageClickListener instead",
replaceWith = ReplaceWith("ReplyMessageClickListener"),
Expand Down
4 changes: 4 additions & 0 deletions ...o/getstream/chat/android/ui/feature/messages/list/adapter/MessageListListenerContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import io.getstream.chat.android.ui.feature.messages.list.MessageListView.LinkCl
import io.getstream.chat.android.ui.feature.messages.list.MessageListView.MessageClickListener
import io.getstream.chat.android.ui.feature.messages.list.MessageListView.MessageLongClickListener
import io.getstream.chat.android.ui.feature.messages.list.MessageListView.MessageRetryListener
import io.getstream.chat.android.ui.feature.messages.list.MessageListView.OnAddPollCommentClickListener
import io.getstream.chat.android.ui.feature.messages.list.MessageListView.OnAttachmentClickListener
import io.getstream.chat.android.ui.feature.messages.list.MessageListView.OnAttachmentDownloadClickListener
import io.getstream.chat.android.ui.feature.messages.list.MessageListView.OnGiphySendListener
Expand All @@ -40,6 +41,7 @@ import io.getstream.chat.android.ui.feature.messages.list.MessageListView.OnThre
import io.getstream.chat.android.ui.feature.messages.list.MessageListView.OnTranslatedLabelClickListener
import io.getstream.chat.android.ui.feature.messages.list.MessageListView.OnUnreadLabelReachedListener
import io.getstream.chat.android.ui.feature.messages.list.MessageListView.OnUserClickListener
import io.getstream.chat.android.ui.feature.messages.list.MessageListView.OnViewPollCommentsClickListener
import io.getstream.chat.android.ui.feature.messages.list.MessageListView.OnViewPollResultClickListener
import io.getstream.chat.android.ui.feature.messages.list.MessageListView.ReactionViewClickListener
import io.getstream.chat.android.ui.feature.messages.list.MessageListView.ThreadClickListener
Expand Down Expand Up @@ -82,6 +84,8 @@ public sealed interface MessageListListeners {
public val onPollCloseClickListener: OnPollCloseClickListener
public val onViewPollResultClickListener: OnViewPollResultClickListener
public val onSuggestPollOptionClickListener: OnSuggestPollOptionClickListener
public val onAddPollCommentClickListener: OnAddPollCommentClickListener
public val onViewPollCommentsClickListener: OnViewPollCommentsClickListener
}

@Deprecated(
Expand Down
Loading
Loading