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

Showing icon when replying to an ICS message + updated side menu icon for meetings

Browse source
This commit is contained in:
Sylvain Berfini 2022-07-04 15:06:38 +02:00
parent 6d50317330
commit 1c8705933f
7 changed files with 48 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/src/main/res/drawable-xhdpi/voip_meeting_schedule.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

7
app/src/main/res/drawable/icon_meeting_schedule.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<bitmap android:src="@drawable/voip_meeting_schedule"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

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

@ -58,15 +58,27 @@
app:drawableTopCompat="@drawable/audio_recording_reply_preview_default" />
<ImageView
android:visibility="@{data.isConferenceSchedule ? View.VISIBLE : View.GONE}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxHeight="@dimen/chat_message_bubble_image_height_small"
android:padding="10dp"
android:src="@drawable/icon_meeting_schedule"
android:background="@drawable/chat_bubble_reply_file_background"
android:contentDescription="@string/content_description_chat_message_meeting_attachment"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_size="@{data.alone ? 0f : @dimen/chat_message_small_bubble_file_size}"
android:background="@drawable/chat_bubble_reply_file_background"
android:padding="10dp"
android:contentDescription="@{data.fileName}"
android:visibility="@{data.downloadable || data.pdf || data.audio || data.genericFile ? View.VISIBLE : View.GONE}"
android:src="@{data.video ? @drawable/file_video : (data.image ? @drawable/file_picture : (data.pdf ? @drawable/file_pdf : (data.audio ? @drawable/file_audio : @drawable/file))), default=@drawable/file}" />
android:maxHeight="@dimen/chat_message_bubble_image_height_small"
android:padding="10dp"
android:src="@{data.video ? @drawable/file_video : (data.image ? @drawable/file_picture : (data.pdf ? @drawable/file_pdf : (data.audio ? @drawable/file_audio : @drawable/file))), default=@drawable/file}"
android:visibility="@{data.downloadable || data.pdf || data.audio || data.genericFile ? View.VISIBLE : View.GONE}" />
</RelativeLayout>

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

@ -55,6 +55,28 @@
android:textColor="@color/light_primary_text_color"
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
android:visibility="@{data.isConferenceSchedule ? View.VISIBLE : View.GONE}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{data.conferenceSubject, default=`Lorem Ipsum`}"
android:layout_marginStart="10dp"
android:textColor="@color/light_primary_text_color"
android:layout_toEndOf="@id/conference_icon"
android:layout_centerVertical="true"/>
<ImageView
android:layout_width="@dimen/chat_message_small_bubble_file_size"
android:layout_height="@dimen/chat_message_small_bubble_file_size"

4
app/src/main/res/layout/side_menu_fragment.xml
View file

@ -241,9 +241,9 @@
<ImageView
android:layout_width="45dp"
android:layout_height="45dp"
android:padding="5dp"
android:padding="7dp"
android:contentDescription="@string/conference_scheduled"
android:src="@drawable/icon_video_conf_new" />
android:src="@drawable/icon_meeting_schedule" />
<TextView
android:text="@string/conference_scheduled"

1
app/src/main/res/values-fr/strings.xml
View file

@ -736,4 +736,5 @@
<string name="conference_no_terminated_schedule">Aucune réunion terminée pour le moment.</string>
<string name="conference_scheduled_terminated_filter">Terminées</string>
<string name="conference_scheduled_future_filter">Programmées</string>
<string name="content_description_chat_message_meeting_attachment">Invitation à une réunion</string>
</resources>

1
app/src/main/res/values/strings.xml
View file

@ -836,6 +836,7 @@
<string name="content_description_call_secured">Call is secured</string>
<string name="content_description_call_security_pending">Call security is pending</string>
<string name="content_description_chat_message_video_attachment">Video attachment</string>
<string name="content_description_chat_message_meeting_attachment">Meeting attachment</string>
<string name="content_description_take_screenshot">Take a screenshot of received video</string>
<string name="content_description_close_bubble">Close notification bubble</string>
<string name="content_description_open_app">Open conversation in app instead of bubble</string>