Skip to content

Improve the performance of changing the composer mode. #4

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

Merged
bmarty merged 1 commit into from
Dec 2, 2022
Merged

Improve the performance of changing the composer mode. #4

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
4 changes: 2 additions & 2 deletions features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,9 @@ fun MessagesContent(
.imePadding()
.let {
if (composerFullScreen) {
it.weight(1f)
it.weight(1f, fill = false)
} else {
it.height(COMPOSER_HEIGHT)
it.wrapContentHeight(Alignment.Bottom)
}
},
)
Expand Down
15 changes: 13 additions & 2 deletions ...es/textcomposer/src/main/java/io/element/android/x/textcomposer/RichTextComposerLayout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ class RichTextComposerLayout @JvmOverloads constructor(
// There is no need to persist these values since they're always updated by the parent fragment
private var isFullScreen = false
private var hasRelatedMessage = false
private var composerMode: MessageComposerMode? = null

var isTextFormattingEnabled = true
set(value) {
Expand Down Expand Up @@ -118,9 +119,15 @@ class RichTextComposerLayout @JvmOverloads constructor(

private val dimensionConverter = DimensionConverter(resources)

fun setFullScreen(isFullScreen: Boolean, manageKeyboard: Boolean) {
fun setFullScreen(isFullScreen: Boolean, animated: Boolean, manageKeyboard: Boolean) {
if (!animated && views.composerLayout.layoutParams != null) {
views.composerLayout.updateLayoutParams<ViewGroup.LayoutParams> {
height =
if (isFullScreen) ViewGroup.LayoutParams.MATCH_PARENT else ViewGroup.LayoutParams.WRAP_CONTENT
}
}
editText.updateLayoutParams<ViewGroup.LayoutParams> {
height = if (isFullScreen) 0 else ViewGroup.LayoutParams.WRAP_CONTENT
height = if (isFullScreen) ViewGroup.LayoutParams.MATCH_PARENT else ViewGroup.LayoutParams.WRAP_CONTENT
}

updateTextFieldBorder(isFullScreen)
Expand All @@ -141,6 +148,7 @@ class RichTextComposerLayout @JvmOverloads constructor(
editText.hideKeyboard()
}
}

this.isFullScreen = isFullScreen
}

Expand Down Expand Up @@ -466,6 +474,9 @@ class RichTextComposerLayout @JvmOverloads constructor(
}

override fun renderComposerMode(mode: MessageComposerMode) {
if (this.composerMode == mode) return
this.composerMode = mode

if (mode is MessageComposerMode.Special) {
views.composerModeGroup.isVisible = true
replaceFormattedContent(mode.defaultContent)
Expand Down
13 changes: 8 additions & 5 deletions libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/TextComposer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ fun TextComposer(
}

}
setFullScreen(fullscreen, true)
setFullScreen(fullscreen, animated = false, manageKeyboard = true)
(this as MessageComposerView).apply {
setup(isInDarkMode, composerMode)
}
Expand All @@ -85,8 +85,9 @@ fun TextComposer(
// whenever the state changes
// Example of Compose -> View communication
val messageComposerView = (view as MessageComposerView)
view.setFullScreen(fullscreen, false)
// TODO messageComposerView.renderComposerMode(composerMode)
view.setFullScreen(fullscreen, animated = false, manageKeyboard = false)
// TODO: un-comment once we update to a version of the lib > 0.8.0
// messageComposerView.renderComposerMode(composerMode)
messageComposerView.sendButton.isInvisible = !composerCanSendMessage
messageComposerView.setTextIfDifferent(composerText ?: "")
}
Expand Down Expand Up @@ -122,7 +123,9 @@ private fun MessageComposerView.setup(isDarkMode: Boolean, composerMode: Message
editText.setHint(ElementR.string.room_message_placeholder)
emojiButton?.isVisible = true
sendButton.isVisible = true
// TODO renderComposerMode(composerMode)
editText.maxLines = MessageComposerView.MAX_LINES_WHEN_COLLAPSED
// TODO: un-comment once we update to a version of the lib > 0.8.0
// renderComposerMode(composerMode)
}

@Preview
Expand All @@ -138,4 +141,4 @@ fun TextComposerPreview() {
composerCanSendMessage = true,
composerText = "Message",
)
}
}