jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6757 from eidonia/bugfix/#5029-disbale-emoji-keyboard-not-applies-reply 

[Bugfix #5029] disable emoji keyboard not applies to reply
This commit is contained in:
Benoit Marty 2022-10-04 16:16:36 +02:00 committed by GitHub
parent 8311138bf1 cd71abeb9f
commit 304fb09f57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5029.bugfix Normal file
View File

@ -0,0 +1 @@
Disable emoji keyboard not applies in reply

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

@ -359,6 +359,8 @@ class TimelineFragment :
private var lockSendButton = false
private val currentCallsViewPresenter = CurrentCallsViewPresenter()
private val isEmojiKeyboardVisible: Boolean
get() = vectorPreferences.showEmojiKeyboard()
private val lazyLoadedViews = RoomDetailLazyLoadedViews()
private val emojiPopup: EmojiPopup by lifecycleAwareLazy {
@ -1583,6 +1585,10 @@ class TimelineFragment :
attachmentTypeSelector.show(views.composerLayout.views.attachmentButton)
}
override fun onExpandOrCompactChange() {
views.composerLayout.views.composerEmojiButton.isVisible = isEmojiKeyboardVisible
}
override fun onSendMessage(text: CharSequence) {
sendTextMessage(text)
}

3
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt
View File

@ -46,6 +46,7 @@ class MessageComposerView @JvmOverloads constructor(
fun onCloseRelatedMessage()
fun onSendMessage(text: CharSequence)
fun onAddAttachment()
fun onExpandOrCompactChange()
}
val views: ComposerLayoutBinding
@ -96,6 +97,7 @@ class MessageComposerView @JvmOverloads constructor(
}
currentConstraintSetId = R.layout.composer_layout_constraint_set_compact
applyNewConstraintSet(animate, transitionComplete)
callback?.onExpandOrCompactChange()
}
fun expand(animate: Boolean = true, transitionComplete: (() -> Unit)? = null) {
@ -105,6 +107,7 @@ class MessageComposerView @JvmOverloads constructor(
}
currentConstraintSetId = R.layout.composer_layout_constraint_set_expanded
applyNewConstraintSet(animate, transitionComplete)
callback?.onExpandOrCompactChange()
}
fun setTextIfDifferent(text: CharSequence?): Boolean {

4
vector/src/main/res/layout/composer_layout.xml
View File

@ -119,8 +119,10 @@
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/a11y_open_emoji_picker"
android:src="@drawable/ic_insert_emoji"
android:visibility="invisible"
app:tint="?vctr_content_tertiary"
tools:ignore="MissingConstraints,MissingPrefix" />
tools:ignore="MissingConstraints,MissingPrefix"
tools:visibility="visible" />
<ImageButton
android:id="@+id/sendButton"

4
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
View File

@ -155,13 +155,15 @@
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/a11y_open_emoji_picker"
android:src="@drawable/ic_insert_emoji"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@id/attachmentButton"
app:layout_constraintEnd_toEndOf="@id/composerEditTextOuterBorder"
app:layout_constraintStart_toEndOf="@id/composerEditText"
app:layout_constraintTop_toTopOf="@id/attachmentButton"
app:layout_goneMarginEnd="8dp"
app:tint="?vctr_content_quaternary"
tools:ignore="MissingPrefix" />
tools:ignore="MissingPrefix"
tools:visibility="visible" />
<ImageButton
android:id="@+id/sendButton"

4
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
View File

@ -166,6 +166,7 @@
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/a11y_open_emoji_picker"
android:src="@drawable/ic_insert_emoji"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@id/sendButton"
app:layout_constraintEnd_toEndOf="@id/composerEditTextOuterBorder"
app:layout_constraintStart_toEndOf="@id/composerEditText"
@ -173,7 +174,8 @@
app:layout_goneMarginBottom="52dp"
app:layout_goneMarginEnd="8dp"
app:tint="?vctr_content_quaternary"
tools:ignore="MissingPrefix" />
tools:ignore="MissingPrefix"
tools:visibility="visible" />
<ImageButton
android:id="@+id/sendButton"