Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved scheduled meeting display in reply

Browse source
This commit is contained in:
Sylvain Berfini 2022-07-04 16:07:19 +02:00
parent 5c79ccfe3a
commit 024b51e1c7
2 changed files with 20 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/res/layout/chat_message_reply_content_cell.xml
View file

@ -22,7 +22,7 @@
android:maxHeight="@dimen/chat_message_bubble_image_height_small" android:maxHeight="@dimen/chat_message_bubble_image_height_small"
android:layout_size="@{data.alone ? 0f : @dimen/chat_message_small_bubble_file_size}" android:layout_size="@{data.alone ? 0f : @dimen/chat_message_small_bubble_file_size}"
coil="@{data.filePath}" coil="@{data.filePath}"
android:visibility="@{data.image ? View.VISIBLE : View.GONE}" android:visibility="@{data.image ? View.VISIBLE : View.GONE, default=gone}"
android:scaleType="@{ScaleType.CENTER_CROP}" android:scaleType="@{ScaleType.CENTER_CROP}"
android:adjustViewBounds="true" /> android:adjustViewBounds="true" />
@ -33,12 +33,12 @@
android:maxHeight="@dimen/chat_message_bubble_image_height_small" android:maxHeight="@dimen/chat_message_bubble_image_height_small"
android:layout_size="@{data.alone ? 0f : @dimen/chat_message_small_bubble_file_size}" android:layout_size="@{data.alone ? 0f : @dimen/chat_message_small_bubble_file_size}"
coilVideoPreview="@{data.filePath}" coilVideoPreview="@{data.filePath}"
android:visibility="@{data.video ? View.VISIBLE : View.GONE}" android:visibility="@{data.video ? View.VISIBLE : View.GONE, default=gone}"
android:scaleType="@{ScaleType.CENTER_CROP}" android:scaleType="@{ScaleType.CENTER_CROP}"
android:adjustViewBounds="true" /> android:adjustViewBounds="true" />
<ImageView <ImageView
android:visibility="@{data.video ? View.VISIBLE : View.GONE}" android:visibility="@{data.video ? View.VISIBLE : View.GONE, default=gone}"
android:layout_width="@dimen/play_pause_button_size" android:layout_width="@dimen/play_pause_button_size"
android:layout_height="@dimen/play_pause_button_size" android:layout_height="@dimen/play_pause_button_size"
android:padding="9dp" android:padding="9dp"
@ -48,7 +48,7 @@
android:layout_centerInParent="true"/> android:layout_centerInParent="true"/>
<TextView <TextView
android:visibility="@{data.isVoiceRecording ? View.VISIBLE : View.GONE}" android:visibility="@{data.isVoiceRecording ? View.VISIBLE : View.GONE, default=gone}"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawablePadding="2dp" android:drawablePadding="2dp"
@ -57,16 +57,16 @@
android:textColor="@color/light_primary_text_color" android:textColor="@color/light_primary_text_color"
app:drawableTopCompat="@drawable/audio_recording_reply_preview_default" /> app:drawableTopCompat="@drawable/audio_recording_reply_preview_default" />
<ImageView <TextView
android:visibility="@{data.isConferenceSchedule ? View.VISIBLE : View.GONE}" android:visibility="@{data.isConferenceSchedule ? View.VISIBLE : View.GONE, default=gone}"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxHeight="@dimen/chat_message_bubble_image_height_small" android:text="@{data.conferenceSubject, default=`Lorem Ipsum`}"
android:padding="10dp" android:textColor="@color/light_primary_text_color"
android:src="@drawable/icon_meeting_schedule" android:padding="5dp"
android:background="@drawable/chat_bubble_reply_file_background" android:drawableTop="@drawable/icon_meeting_schedule"
android:contentDescription="@string/content_description_chat_message_meeting_attachment" android:maxLines="3"
android:layout_alignParentStart="true" android:ellipsize="end"
android:layout_centerVertical="true"/> android:layout_centerVertical="true"/>
<ImageView <ImageView

27
app/src/main/res/layout/chat_message_reply_preview_content_cell.xml
View file

@ -20,7 +20,7 @@
android:layout_height="@dimen/chat_message_small_bubble_file_size" android:layout_height="@dimen/chat_message_small_bubble_file_size"
android:layout_margin="5dp" android:layout_margin="5dp"
coil="@{data.filePath}" coil="@{data.filePath}"
android:visibility="@{data.image ? View.VISIBLE : View.GONE}" android:visibility="@{data.image ? View.VISIBLE : View.GONE, default=gone}"
android:scaleType="@{ScaleType.CENTER_CROP}" android:scaleType="@{ScaleType.CENTER_CROP}"
android:adjustViewBounds="true" /> android:adjustViewBounds="true" />
@ -30,12 +30,12 @@
android:layout_height="@dimen/chat_message_small_bubble_file_size" android:layout_height="@dimen/chat_message_small_bubble_file_size"
android:layout_margin="5dp" android:layout_margin="5dp"
coilVideoPreview="@{data.filePath}" coilVideoPreview="@{data.filePath}"
android:visibility="@{data.video ? View.VISIBLE : View.GONE}" android:visibility="@{data.video ? View.VISIBLE : View.GONE, default=gone}"
android:scaleType="@{ScaleType.CENTER_CROP}" android:scaleType="@{ScaleType.CENTER_CROP}"
android:adjustViewBounds="true" /> android:adjustViewBounds="true" />
<ImageView <ImageView
android:visibility="@{data.video ? View.VISIBLE : View.GONE}" android:visibility="@{data.video ? View.VISIBLE : View.GONE, default=gone}"
android:layout_width="@dimen/play_pause_button_size" android:layout_width="@dimen/play_pause_button_size"
android:layout_height="@dimen/play_pause_button_size" android:layout_height="@dimen/play_pause_button_size"
android:layout_margin="5dp" android:layout_margin="5dp"
@ -46,7 +46,7 @@
android:layout_centerInParent="true"/> android:layout_centerInParent="true"/>
<TextView <TextView
android:visibility="@{data.isVoiceRecording ? View.VISIBLE : View.GONE}" android:visibility="@{data.isVoiceRecording ? View.VISIBLE : View.GONE, default=gone}"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/progress_bar_height" android:layout_height="@dimen/progress_bar_height"
android:drawablePadding="5dp" android:drawablePadding="5dp"
@ -55,26 +55,15 @@
android:textColor="@color/light_primary_text_color" android:textColor="@color/light_primary_text_color"
app:drawableLeftCompat="@drawable/audio_recording_reply_preview_default" /> app:drawableLeftCompat="@drawable/audio_recording_reply_preview_default" />
<ImageView
android:id="@+id/conference_icon"
android:visibility="@{data.isConferenceSchedule ? View.VISIBLE : View.GONE}"
android:layout_width="@dimen/chat_message_small_bubble_file_size"
android:layout_height="@dimen/chat_message_small_bubble_file_size"
android:background="@drawable/chat_bubble_reply_file_background"
android:padding="10dp"
android:src="@drawable/icon_meeting_schedule"
android:contentDescription="@string/content_description_chat_message_meeting_attachment"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"/>
<TextView <TextView
android:visibility="@{data.isConferenceSchedule ? View.VISIBLE : View.GONE}" android:visibility="@{data.isConferenceSchedule ? View.VISIBLE : View.GONE, default=gone}"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{data.conferenceSubject, default=`Lorem Ipsum`}" android:text="@{data.conferenceSubject, default=`Lorem Ipsum`}"
android:layout_marginStart="10dp"
android:textColor="@color/light_primary_text_color" android:textColor="@color/light_primary_text_color"
android:layout_toEndOf="@id/conference_icon" android:drawablePadding="5dp"
android:padding="5dp"
android:drawableTop="@drawable/icon_meeting_schedule"
android:layout_centerVertical="true"/> android:layout_centerVertical="true"/>
<ImageView <ImageView