mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-17 11:28:06 +00:00
Improved long press menu on chat bubble when text was very long
This commit is contained in:
Sylvain Berfini
parent
2ad4e76bc3
commit
ec07d54ed9
4 changed files with 155 additions and 129 deletions
|
|
@ -135,7 +135,6 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@{model.isFromGroup ? @dimen/chat_bubble_start_margin_when_avatar_displayed : @dimen/zero, default=@dimen/chat_bubble_start_margin_when_avatar_displayed}"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:padding="10dp"
|
||||
android:orientation="vertical"
|
||||
android:selected="@{model.isSelected}"
|
||||
|
|
|
|||
|
|
@ -37,116 +37,6 @@
|
|||
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_top_barrier"/>
|
||||
|
||||
<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" />
|
||||
|
||||
<androidx.constraintlayout.widget.Barrier
|
||||
android:id="@+id/bubble_top_barrier"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -154,17 +44,24 @@
|
|||
app:barrierDirection="top"
|
||||
app:constraint_referenced_ids="incoming_bubble, outgoing_bubble" />
|
||||
|
||||
<androidx.constraintlayout.widget.Barrier
|
||||
android:id="@+id/bottom_barrier"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:barrierDirection="top"
|
||||
app:constraint_referenced_ids="reply, resend" />
|
||||
|
||||
<include
|
||||
android:id="@+id/outgoing_bubble"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginStart="32dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:visibility="@{model.outgoing ? View.VISIBLE : View.GONE, default=gone}"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/emojis"
|
||||
app:layout_constraintBottom_toTopOf="@id/bottom_barrier"
|
||||
app:layout_constraintHeight_max="@dimen/chat_bubble_max_height_long_press"
|
||||
bind:model="@{model}"
|
||||
layout="@layout/chat_bubble_outgoing"/>
|
||||
|
||||
|
|
@ -172,16 +69,31 @@
|
|||
android:id="@+id/incoming_bubble"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="32dp"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:visibility="@{model.outgoing ? View.GONE : View.VISIBLE}"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@id/bottom_barrier"
|
||||
app:layout_constraintTop_toBottomOf="@id/emojis"
|
||||
app:layout_constraintBottom_toBottomOf="@id/bottom_barrier"
|
||||
app:layout_constraintHeight_max="@dimen/chat_bubble_max_height_long_press"
|
||||
bind:model="@{model}"
|
||||
layout="@layout/chat_bubble_incoming"/>
|
||||
|
||||
<include
|
||||
android:id="@+id/emojis"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:visibility="@{model.chatRoomIsReadOnly ? View.GONE : View.VISIBLE}"
|
||||
layout="@layout/chat_emoji_reaction_picker"
|
||||
bind:model="@{model}"
|
||||
bind:pickEmojiClickListener="@{pickEmojiClickListener}"
|
||||
app:layout_constraintVertical_bias="1"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@id/bubble_top_barrier"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
<View
|
||||
android:id="@+id/actions_background"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -190,13 +102,6 @@
|
|||
app:layout_constraintTop_toTopOf="@id/bottom_barrier"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
<androidx.constraintlayout.widget.Barrier
|
||||
android:id="@+id/bottom_barrier"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:barrierDirection="top"
|
||||
app:constraint_referenced_ids="reply, resend" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/context_menu_action_label_style"
|
||||
android:id="@+id/resend"
|
||||
|
|
|
|||
121
app/src/main/res/layout/chat_emoji_reaction_picker.xml
Normal file
121
app/src/main/res/layout/chat_emoji_reaction_picker.xml
Normal file
|
|
@ -0,0 +1,121 @@
|
|||
<?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="pickEmojiClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="model"
|
||||
type="org.linphone.ui.main.chat.model.MessageModel" />
|
||||
</data>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/emojis_background"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="60dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:src="@drawable/shape_squircle_white_background"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"/>
|
||||
|
||||
<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" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</layout>
|
||||
|
|
@ -76,6 +76,7 @@
|
|||
<dimen name="chat_room_emoji_picker_height">300dp</dimen>
|
||||
<dimen name="chat_room_participants_list_max_height">300dp</dimen>
|
||||
<dimen name="chat_bubble_emoji_picker_height">425dp</dimen>
|
||||
<dimen name="chat_bubble_max_height_long_press">300dp</dimen>
|
||||
|
||||
<dimen name="recycler_view_min_height">200dp</dimen>
|
||||
</resources>
|
||||
Loading…
Add table
Reference in a new issue