mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-09 13:59:48 +01:00
Replaced EmojiPicker in ChatActivity
Signed-off-by: Smarshal21 <lcb2021048@iiitl.ac.in>
This commit is contained in:
parent
ed3117bc9f
commit
d6ff39a8fa
@ -94,6 +94,7 @@ import androidx.core.content.PermissionChecker.PERMISSION_GRANTED
|
|||||||
import androidx.core.graphics.drawable.toBitmap
|
import androidx.core.graphics.drawable.toBitmap
|
||||||
import androidx.core.text.bold
|
import androidx.core.text.bold
|
||||||
import androidx.core.widget.doAfterTextChanged
|
import androidx.core.widget.doAfterTextChanged
|
||||||
|
import androidx.emoji2.emojipicker.EmojiPickerView
|
||||||
import androidx.emoji2.text.EmojiCompat
|
import androidx.emoji2.text.EmojiCompat
|
||||||
import androidx.emoji2.widget.EmojiTextView
|
import androidx.emoji2.widget.EmojiTextView
|
||||||
import androidx.fragment.app.DialogFragment
|
import androidx.fragment.app.DialogFragment
|
||||||
@ -237,7 +238,6 @@ import com.stfalcon.chatkit.messages.MessageHolders
|
|||||||
import com.stfalcon.chatkit.messages.MessageHolders.ContentChecker
|
import com.stfalcon.chatkit.messages.MessageHolders.ContentChecker
|
||||||
import com.stfalcon.chatkit.messages.MessagesListAdapter
|
import com.stfalcon.chatkit.messages.MessagesListAdapter
|
||||||
import com.stfalcon.chatkit.utils.DateFormatter
|
import com.stfalcon.chatkit.utils.DateFormatter
|
||||||
import com.vanniktech.emoji.EmojiPopup
|
|
||||||
import io.reactivex.Observer
|
import io.reactivex.Observer
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||||
import io.reactivex.disposables.Disposable
|
import io.reactivex.disposables.Disposable
|
||||||
@ -322,7 +322,6 @@ class ChatActivity :
|
|||||||
lateinit var roomId: String
|
lateinit var roomId: String
|
||||||
var voiceOnly: Boolean = true
|
var voiceOnly: Boolean = true
|
||||||
var isFirstMessagesProcessing = true
|
var isFirstMessagesProcessing = true
|
||||||
private var emojiPopup: EmojiPopup? = null
|
|
||||||
private lateinit var path: String
|
private lateinit var path: String
|
||||||
|
|
||||||
var myFirstMessage: CharSequence? = null
|
var myFirstMessage: CharSequence? = null
|
||||||
@ -351,6 +350,7 @@ class ChatActivity :
|
|||||||
private var voicePreviewObjectAnimator: ObjectAnimator? = null
|
private var voicePreviewObjectAnimator: ObjectAnimator? = null
|
||||||
var mediaPlayer: MediaPlayer? = null
|
var mediaPlayer: MediaPlayer? = null
|
||||||
lateinit var mediaPlayerHandler: Handler
|
lateinit var mediaPlayerHandler: Handler
|
||||||
|
private var isEmojiPickerVisible = false
|
||||||
private var currentlyPlayedVoiceMessage: ChatMessage? = null
|
private var currentlyPlayedVoiceMessage: ChatMessage? = null
|
||||||
private lateinit var micInputAudioRecorder: AudioRecord
|
private lateinit var micInputAudioRecorder: AudioRecord
|
||||||
private var micInputAudioRecordThread: Thread? = null
|
private var micInputAudioRecordThread: Thread? = null
|
||||||
@ -452,7 +452,6 @@ class ChatActivity :
|
|||||||
binding.progressBar.visibility = View.VISIBLE
|
binding.progressBar.visibility = View.VISIBLE
|
||||||
|
|
||||||
onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
|
onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
|
||||||
|
|
||||||
initObservers()
|
initObservers()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -644,7 +643,6 @@ class ChatActivity :
|
|||||||
logConversationInfos("onResume")
|
logConversationInfos("onResume")
|
||||||
|
|
||||||
pullChatMessagesPending = false
|
pullChatMessagesPending = false
|
||||||
|
|
||||||
setupWebsocket()
|
setupWebsocket()
|
||||||
webSocketInstance?.getSignalingMessageReceiver()?.addListener(localParticipantMessageListener)
|
webSocketInstance?.getSignalingMessageReceiver()?.addListener(localParticipantMessageListener)
|
||||||
webSocketInstance?.getSignalingMessageReceiver()?.addListener(conversationMessageListener)
|
webSocketInstance?.getSignalingMessageReceiver()?.addListener(conversationMessageListener)
|
||||||
@ -1429,30 +1427,18 @@ class ChatActivity :
|
|||||||
private fun initSmileyKeyboardToggler() {
|
private fun initSmileyKeyboardToggler() {
|
||||||
val smileyButton = binding.messageInputView.findViewById<ImageButton>(R.id.smileyButton)
|
val smileyButton = binding.messageInputView.findViewById<ImageButton>(R.id.smileyButton)
|
||||||
|
|
||||||
emojiPopup = binding.messageInputView.inputEditText?.let {
|
|
||||||
EmojiPopup(
|
|
||||||
rootView = binding.root,
|
|
||||||
editText = it,
|
|
||||||
onEmojiPopupShownListener = {
|
|
||||||
if (resources != null) {
|
|
||||||
smileyButton?.setImageDrawable(
|
|
||||||
ContextCompat.getDrawable(context, R.drawable.ic_baseline_keyboard_24)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
onEmojiPopupDismissListener = {
|
|
||||||
smileyButton?.setImageDrawable(
|
|
||||||
ContextCompat.getDrawable(context, R.drawable.ic_insert_emoticon_black_24dp)
|
|
||||||
)
|
|
||||||
},
|
|
||||||
onEmojiClickListener = {
|
|
||||||
binding.messageInputView.inputEditText?.editableText?.append(" ")
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
smileyButton?.setOnClickListener {
|
smileyButton?.setOnClickListener {
|
||||||
emojiPopup?.toggle()
|
|
||||||
|
if (!isEmojiPickerVisible) {
|
||||||
|
binding.messageInputView.findViewById<FrameLayout>(R.id.emoji_picker).visibility = View.VISIBLE
|
||||||
|
isEmojiPickerVisible = true
|
||||||
|
} else {
|
||||||
|
binding.messageInputView.findViewById<EmojiPickerView>(R.id.emoji_picker).visibility = View.GONE
|
||||||
|
isEmojiPickerVisible = false
|
||||||
|
}
|
||||||
|
binding.messageInputView.findViewById<EmojiPickerView>(R.id.emoji_picker).setOnEmojiPickedListener() {
|
||||||
|
binding.messageInputView.inputEditText.editableText?.append(it.emoji)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -78,9 +78,16 @@
|
|||||||
android:lineSpacingMultiplier="1.2"
|
android:lineSpacingMultiplier="1.2"
|
||||||
android:minHeight="48dp"
|
android:minHeight="48dp"
|
||||||
android:textAlignment="viewStart"
|
android:textAlignment="viewStart"
|
||||||
android:layoutDirection="locale"
|
|
||||||
tools:hint="@string/nc_hint_enter_a_message" />
|
tools:hint="@string/nc_hint_enter_a_message" />
|
||||||
|
|
||||||
|
<androidx.emoji2.emojipicker.EmojiPickerView
|
||||||
|
android:id="@+id/emoji_picker"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_below="@id/messageInput"
|
||||||
|
android:visibility="gone"
|
||||||
|
android:layout_height="350dp"
|
||||||
|
app:emojiGridColumns="9" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/slideToCancelDescription"
|
android:id="@+id/slideToCancelDescription"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
Loading…
Reference in New Issue
Block a user