Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Open thread timeline keyboard when user navigates from reply in thread action

Browse Source
This commit is contained in:
ariskotsomitopoulos 2022-05-04 14:27:34 +03:00
parent 88babbb17c
commit f4b1e06ad1
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
View File

@ -1517,7 +1517,7 @@ class TimelineFragment @Inject constructor(
views.composerLayout.views.composerEmojiButton.isVisible = vectorPreferences.showEmojiKeyboard() views.composerLayout.views.composerEmojiButton.isVisible = vectorPreferences.showEmojiKeyboard()
if (isThreadTimeLine() && timelineArgs.threadTimelineArgs?.startsThread == true) { if (isThreadTimeLine() && timelineArgs.threadTimelineArgs?.showKeyboard == true) {
// Show keyboard when the user started a thread // Show keyboard when the user started a thread
views.composerLayout.views.composerEditText.showKeyboard(andRequestFocus = true) views.composerLayout.views.composerEditText.showKeyboard(andRequestFocus = true)
} }
@ -2422,7 +2422,7 @@ class TimelineFragment @Inject constructor(
private fun onReplyInThreadClicked(action: EventSharedAction.ReplyInThread) { private fun onReplyInThreadClicked(action: EventSharedAction.ReplyInThread) {
if (vectorPreferences.areThreadMessagesEnabled()) { if (vectorPreferences.areThreadMessagesEnabled()) {
navigateToThreadTimeline(action.eventId, action.startsThread) navigateToThreadTimeline(action.eventId, action.startsThread, true)
} else { } else {
displayThreadsBetaOptInDialog() displayThreadsBetaOptInDialog()
} }
@ -2433,7 +2433,7 @@ class TimelineFragment @Inject constructor(
* using the ThreadsActivity * using the ThreadsActivity
*/ */
private fun navigateToThreadTimeline(rootThreadEventId: String, startsThread: Boolean = false) { private fun navigateToThreadTimeline(rootThreadEventId: String, startsThread: Boolean = false, showKeyboard: Boolean = false) {
analyticsTracker.capture(Interaction.Name.MobileRoomThreadSummaryItem.toAnalyticsInteraction()) analyticsTracker.capture(Interaction.Name.MobileRoomThreadSummaryItem.toAnalyticsInteraction())
context?.let { context?.let {
val roomThreadDetailArgs = ThreadTimelineArgs( val roomThreadDetailArgs = ThreadTimelineArgs(
@ -2442,7 +2442,9 @@ class TimelineFragment @Inject constructor(
displayName = timelineViewModel.getRoomSummary()?.displayName, displayName = timelineViewModel.getRoomSummary()?.displayName,
avatarUrl = timelineViewModel.getRoomSummary()?.avatarUrl, avatarUrl = timelineViewModel.getRoomSummary()?.avatarUrl,
roomEncryptionTrustLevel = timelineViewModel.getRoomSummary()?.roomEncryptionTrustLevel, roomEncryptionTrustLevel = timelineViewModel.getRoomSummary()?.roomEncryptionTrustLevel,
rootThreadEventId = rootThreadEventId) rootThreadEventId = rootThreadEventId,
showKeyboard = showKeyboard
)
navigator.openThread(it, roomThreadDetailArgs) navigator.openThread(it, roomThreadDetailArgs)
} }
} }

3
vector/src/main/java/im/vector/app/features/home/room/threads/arguments/ThreadTimelineArgs.kt
View File

@ -27,5 +27,6 @@ data class ThreadTimelineArgs(
val avatarUrl: String?, val avatarUrl: String?,
val roomEncryptionTrustLevel: RoomEncryptionTrustLevel?, val roomEncryptionTrustLevel: RoomEncryptionTrustLevel?,
val rootThreadEventId: String? = null, val rootThreadEventId: String? = null,
val startsThread: Boolean = false val startsThread: Boolean = false,
val showKeyboard: Boolean = false
) : Parcelable ) : Parcelable