mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-17 11:28:06 +00:00
Reworked emoji reaction picker & display
This commit is contained in:
Sylvain Berfini
parent
19a15bedfa
commit
c166c87479
11 changed files with 327 additions and 251 deletions
|
|
@ -54,8 +54,8 @@ import org.linphone.LinphoneApplication.Companion.coreContext
|
|||
import org.linphone.R
|
||||
import org.linphone.core.ChatMessage
|
||||
import org.linphone.core.tools.Log
|
||||
import org.linphone.databinding.ChatBubbleLongPressMenuBinding
|
||||
import org.linphone.databinding.ChatConversationFragmentBinding
|
||||
import org.linphone.databinding.ChatConversationLongPressMenuBinding
|
||||
import org.linphone.ui.main.chat.adapter.ChatMessageBottomSheetAdapter
|
||||
import org.linphone.ui.main.chat.adapter.ConversationEventAdapter
|
||||
import org.linphone.ui.main.chat.model.ChatMessageDeliveryModel
|
||||
|
|
@ -278,9 +278,9 @@ class ConversationFragment : GenericFragment() {
|
|||
val dialog = Dialog(requireContext(), R.style.Theme_LinphoneDialog)
|
||||
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
|
||||
|
||||
val layout: ChatConversationLongPressMenuBinding = DataBindingUtil.inflate(
|
||||
val layout: ChatBubbleLongPressMenuBinding = DataBindingUtil.inflate(
|
||||
LayoutInflater.from(context),
|
||||
R.layout.chat_conversation_long_press_menu,
|
||||
R.layout.chat_bubble_long_press_menu,
|
||||
null,
|
||||
false
|
||||
)
|
||||
|
|
@ -304,7 +304,8 @@ class ConversationFragment : GenericFragment() {
|
|||
}
|
||||
|
||||
layout.setPickEmojiClickListener {
|
||||
layout.emojiPicker.visibility = View.VISIBLE
|
||||
val emojiSheetBehavior = BottomSheetBehavior.from(layout.emojiPickerBottomSheet.root)
|
||||
emojiSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
|
||||
}
|
||||
|
||||
layout.model = chatMessageModel
|
||||
|
|
|
|||
|
|
@ -111,10 +111,19 @@ class ChatMessageModel @WorkerThread constructor(
|
|||
var reactionsList = ""
|
||||
val allReactions = chatMessage.reactions
|
||||
|
||||
var sameReactionTwiceOrMore = false
|
||||
if (allReactions.isNotEmpty()) {
|
||||
for (reaction in allReactions) {
|
||||
val body = reaction.body
|
||||
reactionsList += body
|
||||
if (!reactionsList.contains(body)) {
|
||||
reactionsList += body
|
||||
} else {
|
||||
sameReactionTwiceOrMore = true
|
||||
}
|
||||
}
|
||||
|
||||
if (sameReactionTwiceOrMore) {
|
||||
reactionsList += allReactions.size.toString()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
|
||||
<corners android:radius="20dp" />
|
||||
<solid android:color="@color/gray_main2_100"/>
|
||||
<stroke android:color="@color/white" android:width="2dp" />
|
||||
</shape>
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
|
||||
<corners android:radius="20dp" />
|
||||
<solid android:color="@color/orange_main_100"/>
|
||||
<stroke android:color="@color/white" android:width="2dp" />
|
||||
</shape>
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<data>
|
||||
<import type="android.view.View" />
|
||||
<variable
|
||||
name="model"
|
||||
type="org.linphone.ui.main.chat.model.ChatMessageModel" />
|
||||
</data>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/shape_bottom_sheet_white_background"
|
||||
android:elevation="16dp"
|
||||
app:behavior_hideable="true"
|
||||
app:behavior_peekHeight="0dp"
|
||||
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
|
||||
|
||||
<com.google.android.material.bottomsheet.BottomSheetDragHandleView
|
||||
android:id="@+id/handle"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="11dp"
|
||||
android:src="@drawable/shape_drawer_handle"
|
||||
app:tint="@color/gray_main2_300"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
||||
<androidx.emoji2.emojipicker.EmojiPickerView
|
||||
android:id="@+id/emoji_picker"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/chat_bubble_emoji_picker_height"
|
||||
android:nestedScrollingEnabled="true"
|
||||
app:emojiPickedListener="@{(emoji) -> model.sendReaction(emoji.emoji)}"
|
||||
app:layout_constraintTop_toBottomOf="@id/handle"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</layout>
|
||||
|
|
@ -136,17 +136,20 @@
|
|||
android:onClick="@{showReactionInfoClickListener}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="2dp"
|
||||
android:layout_marginTop="-10dp"
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:layout_marginTop="-5dp"
|
||||
android:layout_marginStart="-35dp"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:orientation="horizontal"
|
||||
android:background="@drawable/shape_chat_bubble_reactions_incoming_background"
|
||||
android:text="@{model.reactions, default=@string/emoji_love}"
|
||||
android:textSize="20sp"
|
||||
android:textSize="15sp"
|
||||
android:textColor="@color/gray_main2_600"
|
||||
android:paddingStart="16dp"
|
||||
android:paddingEnd="16dp"
|
||||
android:paddingTop="12dp"
|
||||
android:paddingBottom="12dp"
|
||||
android:visibility="@{model.reactions.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
|
||||
app:layout_constraintStart_toStartOf="@id/background"
|
||||
app:layout_constraintStart_toEndOf="@id/background"
|
||||
app:layout_constraintTop_toBottomOf="@id/background"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
|
|
|
|||
233
app/src/main/res/layout/chat_bubble_long_press_menu.xml
Normal file
233
app/src/main/res/layout/chat_bubble_long_press_menu.xml
Normal file
|
|
@ -0,0 +1,233 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<data>
|
||||
<import type="android.view.View" />
|
||||
<variable
|
||||
name="replyClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="copyClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="forwardClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="deleteClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="pickEmojiClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="model"
|
||||
type="org.linphone.ui.main.chat.model.ChatMessageModel" />
|
||||
</data>
|
||||
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/constraint_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<androidx.constraintlayout.widget.Group
|
||||
android:id="@+id/emojis_group"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:constraint_referenced_ids="thumbs_up, love, laughing, surprised, tear, plus, emojis_background"
|
||||
android:visibility="@{model.chatRoomIsReadOnly ? View.GONE : View.VISIBLE}" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/emojis_background"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="60dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:src="@drawable/shape_squircle_white_background"
|
||||
app:layout_constraintVertical_bias="1"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@id/bubble"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style"
|
||||
android:id="@+id/thumbs_up"
|
||||
android:onClick="@{() -> model.sendReaction(@string/emoji_thumbs_up)}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="@string/emoji_thumbs_up"
|
||||
android:textSize="@dimen/chat_bubble_long_press_emoji_reaction_size"
|
||||
app:layout_constraintHorizontal_chainStyle="spread_inside"
|
||||
app:layout_constraintTop_toTopOf="@id/emojis_background"
|
||||
app:layout_constraintBottom_toBottomOf="@id/emojis_background"
|
||||
app:layout_constraintStart_toStartOf="@id/emojis_background"
|
||||
app:layout_constraintEnd_toStartOf="@id/love"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style"
|
||||
android:id="@+id/love"
|
||||
android:onClick="@{() -> model.sendReaction(@string/emoji_love)}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="@string/emoji_love"
|
||||
android:textSize="@dimen/chat_bubble_long_press_emoji_reaction_size"
|
||||
app:layout_constraintTop_toTopOf="@id/thumbs_up"
|
||||
app:layout_constraintBottom_toBottomOf="@id/emojis_background"
|
||||
app:layout_constraintStart_toEndOf="@id/thumbs_up"
|
||||
app:layout_constraintEnd_toStartOf="@id/laughing"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style"
|
||||
android:id="@+id/laughing"
|
||||
android:onClick="@{() -> model.sendReaction(@string/emoji_laughing)}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="@string/emoji_laughing"
|
||||
android:textSize="@dimen/chat_bubble_long_press_emoji_reaction_size"
|
||||
app:layout_constraintTop_toTopOf="@id/thumbs_up"
|
||||
app:layout_constraintBottom_toBottomOf="@id/emojis_background"
|
||||
app:layout_constraintStart_toEndOf="@id/love"
|
||||
app:layout_constraintEnd_toStartOf="@id/surprised"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style"
|
||||
android:id="@+id/surprised"
|
||||
android:onClick="@{() -> model.sendReaction(@string/emoji_surprised)}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="@string/emoji_surprised"
|
||||
android:textSize="@dimen/chat_bubble_long_press_emoji_reaction_size"
|
||||
app:layout_constraintTop_toTopOf="@id/thumbs_up"
|
||||
app:layout_constraintBottom_toBottomOf="@id/emojis_background"
|
||||
app:layout_constraintStart_toEndOf="@id/laughing"
|
||||
app:layout_constraintEnd_toStartOf="@id/tear"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style"
|
||||
android:id="@+id/tear"
|
||||
android:onClick="@{() -> model.sendReaction(@string/emoji_tear)}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="@string/emoji_tear"
|
||||
android:textSize="@dimen/chat_bubble_long_press_emoji_reaction_size"
|
||||
app:layout_constraintTop_toTopOf="@id/thumbs_up"
|
||||
app:layout_constraintBottom_toBottomOf="@id/emojis_background"
|
||||
app:layout_constraintStart_toEndOf="@id/surprised"
|
||||
app:layout_constraintEnd_toStartOf="@id/plus"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/plus"
|
||||
android:onClick="@{pickEmojiClickListener}"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:src="@drawable/plus_circle"
|
||||
app:layout_constraintStart_toEndOf="@id/tear"
|
||||
app:layout_constraintEnd_toEndOf="@id/emojis_background"
|
||||
app:layout_constraintTop_toTopOf="@id/thumbs_up"
|
||||
app:layout_constraintBottom_toBottomOf="@id/emojis_background" />
|
||||
|
||||
<include
|
||||
android:id="@+id/bubble"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@id/reply"
|
||||
model="@{model}"
|
||||
layout="@layout/chat_bubble_incoming"/>
|
||||
|
||||
<View
|
||||
android:id="@+id/actions_background"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:background="@color/gray_main2_200"
|
||||
app:layout_constraintTop_toTopOf="@id/reply"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/context_menu_action_label_style"
|
||||
android:id="@+id/reply"
|
||||
android:onClick="@{replyClickListener}"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/menu_reply_to_chat_message"
|
||||
android:enabled="@{!model.chatRoomIsReadOnly}"
|
||||
android:background="@drawable/menu_item_background"
|
||||
android:layout_marginBottom="1dp"
|
||||
android:drawableStart="@drawable/arrow_bend_up_left_bold"
|
||||
app:layout_constraintBottom_toTopOf="@id/copy"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/context_menu_action_label_style"
|
||||
android:id="@+id/copy"
|
||||
android:onClick="@{copyClickListener}"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/menu_copy_chat_message"
|
||||
android:background="@drawable/menu_item_background"
|
||||
android:layout_marginBottom="1dp"
|
||||
android:drawableStart="@drawable/copy"
|
||||
app:layout_constraintBottom_toTopOf="@id/forward"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/context_menu_action_label_style"
|
||||
android:id="@+id/forward"
|
||||
android:onClick="@{forwardClickListener}"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/menu_forward_chat_message"
|
||||
android:background="@drawable/menu_item_background"
|
||||
android:layout_marginBottom="1dp"
|
||||
android:drawableStart="@drawable/arrow_bend_up_right_bold"
|
||||
app:layout_constraintBottom_toTopOf="@id/delete"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/context_menu_danger_action_label_style"
|
||||
android:id="@+id/delete"
|
||||
android:onClick="@{deleteClickListener}"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/menu_delete_selected_item"
|
||||
android:background="@drawable/menu_item_background"
|
||||
android:layout_marginBottom="1dp"
|
||||
android:drawableStart="@drawable/trash_simple"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<include
|
||||
android:id="@+id/emoji_picker_bottom_sheet"
|
||||
layout="@layout/chat_bubble_emoji_picker_bottom_sheet"
|
||||
model="@{model}"/>
|
||||
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
|
||||
</layout>
|
||||
|
|
@ -99,17 +99,21 @@
|
|||
android:onClick="@{showReactionInfoClickListener}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="2dp"
|
||||
android:layout_marginTop="-10dp"
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:orientation="horizontal"
|
||||
android:background="@drawable/shape_chat_bubble_reactions_outgoing_background"
|
||||
android:text="@{model.reactions, default=@string/emoji_love}"
|
||||
android:textSize="20sp"
|
||||
android:textColor="@color/gray_main2_600"
|
||||
android:paddingStart="16dp"
|
||||
android:paddingEnd="16dp"
|
||||
android:paddingTop="12dp"
|
||||
android:paddingBottom="12dp"
|
||||
android:visibility="@{model.reactions.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
|
||||
app:layout_constraintStart_toStartOf="@id/background"
|
||||
app:layout_constraintEnd_toEndOf="@id/background"
|
||||
app:layout_constraintTop_toBottomOf="@id/background"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
|
|
|
|||
|
|
@ -1,232 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<data>
|
||||
<import type="android.view.View" />
|
||||
<variable
|
||||
name="replyClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="copyClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="forwardClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="deleteClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="pickEmojiClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="model"
|
||||
type="org.linphone.ui.main.chat.model.ChatMessageModel" />
|
||||
</data>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/constraint_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<androidx.constraintlayout.widget.Group
|
||||
android:id="@+id/emojis_group"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:constraint_referenced_ids="thumbs_up, love, laughing, surprised, tear, plus, emojis_background"
|
||||
android:visibility="@{model.chatRoomIsReadOnly ? View.GONE : View.VISIBLE}" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/emojis_background"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="60dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:src="@drawable/shape_squircle_white_background"
|
||||
app:layout_constraintVertical_bias="1"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@id/bubble"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style"
|
||||
android:id="@+id/thumbs_up"
|
||||
android:onClick="@{() -> model.sendReaction(@string/emoji_thumbs_up)}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="@string/emoji_thumbs_up"
|
||||
android:textSize="@dimen/chat_bubble_long_press_emoji_reaction_size"
|
||||
app:layout_constraintHorizontal_chainStyle="spread_inside"
|
||||
app:layout_constraintTop_toTopOf="@id/emojis_background"
|
||||
app:layout_constraintBottom_toBottomOf="@id/emojis_background"
|
||||
app:layout_constraintStart_toStartOf="@id/emojis_background"
|
||||
app:layout_constraintEnd_toStartOf="@id/love"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style"
|
||||
android:id="@+id/love"
|
||||
android:onClick="@{() -> model.sendReaction(@string/emoji_love)}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="@string/emoji_love"
|
||||
android:textSize="@dimen/chat_bubble_long_press_emoji_reaction_size"
|
||||
app:layout_constraintTop_toTopOf="@id/thumbs_up"
|
||||
app:layout_constraintBottom_toBottomOf="@id/emojis_background"
|
||||
app:layout_constraintStart_toEndOf="@id/thumbs_up"
|
||||
app:layout_constraintEnd_toStartOf="@id/laughing"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style"
|
||||
android:id="@+id/laughing"
|
||||
android:onClick="@{() -> model.sendReaction(@string/emoji_laughing)}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="@string/emoji_laughing"
|
||||
android:textSize="@dimen/chat_bubble_long_press_emoji_reaction_size"
|
||||
app:layout_constraintTop_toTopOf="@id/thumbs_up"
|
||||
app:layout_constraintBottom_toBottomOf="@id/emojis_background"
|
||||
app:layout_constraintStart_toEndOf="@id/love"
|
||||
app:layout_constraintEnd_toStartOf="@id/surprised"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style"
|
||||
android:id="@+id/surprised"
|
||||
android:onClick="@{() -> model.sendReaction(@string/emoji_surprised)}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="@string/emoji_surprised"
|
||||
android:textSize="@dimen/chat_bubble_long_press_emoji_reaction_size"
|
||||
app:layout_constraintTop_toTopOf="@id/thumbs_up"
|
||||
app:layout_constraintBottom_toBottomOf="@id/emojis_background"
|
||||
app:layout_constraintStart_toEndOf="@id/laughing"
|
||||
app:layout_constraintEnd_toStartOf="@id/tear"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style"
|
||||
android:id="@+id/tear"
|
||||
android:onClick="@{() -> model.sendReaction(@string/emoji_tear)}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="@string/emoji_tear"
|
||||
android:textSize="@dimen/chat_bubble_long_press_emoji_reaction_size"
|
||||
app:layout_constraintTop_toTopOf="@id/thumbs_up"
|
||||
app:layout_constraintBottom_toBottomOf="@id/emojis_background"
|
||||
app:layout_constraintStart_toEndOf="@id/surprised"
|
||||
app:layout_constraintEnd_toStartOf="@id/plus"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/plus"
|
||||
android:onClick="@{pickEmojiClickListener}"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:src="@drawable/plus_circle"
|
||||
app:layout_constraintStart_toEndOf="@id/tear"
|
||||
app:layout_constraintEnd_toEndOf="@id/emojis_background"
|
||||
app:layout_constraintTop_toTopOf="@id/thumbs_up"
|
||||
app:layout_constraintBottom_toBottomOf="@id/emojis_background" />
|
||||
|
||||
<include
|
||||
android:id="@+id/bubble"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@id/reply"
|
||||
model="@{model}"
|
||||
layout="@layout/chat_bubble_incoming"/>
|
||||
|
||||
<View
|
||||
android:id="@+id/actions_background"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:background="@color/gray_main2_200"
|
||||
app:layout_constraintTop_toTopOf="@id/reply"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/context_menu_action_label_style"
|
||||
android:id="@+id/reply"
|
||||
android:onClick="@{replyClickListener}"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/menu_reply_to_chat_message"
|
||||
android:enabled="@{!model.chatRoomIsReadOnly}"
|
||||
android:background="@drawable/menu_item_background"
|
||||
android:layout_marginBottom="1dp"
|
||||
android:drawableStart="@drawable/arrow_bend_up_left_bold"
|
||||
app:layout_constraintBottom_toTopOf="@id/copy"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/context_menu_action_label_style"
|
||||
android:id="@+id/copy"
|
||||
android:onClick="@{copyClickListener}"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/menu_copy_chat_message"
|
||||
android:background="@drawable/menu_item_background"
|
||||
android:layout_marginBottom="1dp"
|
||||
android:drawableStart="@drawable/copy"
|
||||
app:layout_constraintBottom_toTopOf="@id/forward"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/context_menu_action_label_style"
|
||||
android:id="@+id/forward"
|
||||
android:onClick="@{forwardClickListener}"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/menu_forward_chat_message"
|
||||
android:background="@drawable/menu_item_background"
|
||||
android:layout_marginBottom="1dp"
|
||||
android:drawableStart="@drawable/arrow_bend_up_right_bold"
|
||||
app:layout_constraintBottom_toTopOf="@id/delete"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/context_menu_danger_action_label_style"
|
||||
android:id="@+id/delete"
|
||||
android:onClick="@{deleteClickListener}"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/menu_delete_selected_item"
|
||||
android:background="@drawable/menu_item_background"
|
||||
android:layout_marginBottom="1dp"
|
||||
android:drawableStart="@drawable/trash_simple"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
<androidx.emoji2.emojipicker.EmojiPickerView
|
||||
android:id="@+id/emoji_picker"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:background="@color/gray_100"
|
||||
android:visibility="gone"
|
||||
app:emojiPickedListener="@{(emoji) -> model.sendReaction(emoji.emoji)}"
|
||||
app:layout_constraintTop_toTopOf="@id/reply"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</layout>
|
||||
|
|
@ -66,4 +66,5 @@
|
|||
<dimen name="chat_bubble_long_press_emoji_reaction_size">30sp</dimen>
|
||||
|
||||
<dimen name="chat_room_emoji_picker_height">290dp</dimen>
|
||||
<dimen name="chat_bubble_emoji_picker_height">425dp</dimen>
|
||||
</resources>
|
||||
|
|
@ -365,12 +365,12 @@
|
|||
<string name="conversation_info_admin_menu_set_participant_admin">Give admin rights</string>
|
||||
<string name="conversation_info_admin_menu_unset_participant_admin">Remove admin rights</string>
|
||||
|
||||
<string name="message_delivery_info_read_title">Read (%s)</string>
|
||||
<string name="message_delivery_info_received_title">Received (%s)</string>
|
||||
<string name="message_delivery_info_sent_title">Sent (%s)</string>
|
||||
<string name="message_delivery_info_error_title">Error (%s)</string>
|
||||
<string name="message_reactions_info_all_title">Reactions (%s)</string>
|
||||
<string name="message_reactions_info_emoji_title">%s (%s)</string>
|
||||
<string name="message_delivery_info_read_title">Read %s</string>
|
||||
<string name="message_delivery_info_received_title">Received %s</string>
|
||||
<string name="message_delivery_info_sent_title">Sent %s</string>
|
||||
<string name="message_delivery_info_error_title">Error %s</string>
|
||||
<string name="message_reactions_info_all_title">Reactions %s</string>
|
||||
<string name="message_reactions_info_emoji_title">%s %s</string>
|
||||
|
||||
<string name="meetings_list_empty">No meeting for the moment…</string>
|
||||
<string name="meeting_schedule_title">New meeting</string>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue