Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-27 04:04:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

CallLink treatment for ConversationItem.

Browse Source
This commit is contained in:
Alex Hart
2023-06-05 13:55:01 -03:00
committed by Cody Henthorne
parent 8f96abb41e
commit 93df01e266
15 changed files with 180 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/res/layout/call_link_join_button.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2023 Signal Messenger, LLC
~ SPDX-License-Identifier: AGPL-3.0-only
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:background="@color/core_white" />
<com.google.android.material.button.MaterialButton
android:id="@+id/join_button"
style="@style/Widget.Signal.Button.TextButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/ConversationItem__join_call" />
</merge>

8
app/src/main/res/layout/conversation_item_join_button.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2023 Signal Messenger, LLC
~ SPDX-License-Identifier: AGPL-3.0-only
-->
<org.thoughtcrime.securesms.calls.links.CallLinkJoinButton
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

6
app/src/main/res/layout/conversation_item_received_multimedia.xml
View File

@@ -230,6 +230,12 @@
app:scaleEmojis="true"
tools:text="Mango pickle lorem ipsum" />
<ViewStub
android:id="@+id/conversation_item_join_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout="@layout/conversation_item_join_button" />
<ViewStub
android:id="@+id/conversation_item_call_to_action_stub"
android:layout_width="match_parent"

6
app/src/main/res/layout/conversation_item_sent_multimedia.xml
View File

@@ -171,6 +171,12 @@
app:scaleEmojis="true"
tools:text="Mango pickle lorem ipsum" />
<ViewStub
android:id="@+id/conversation_item_join_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout="@layout/conversation_item_join_button" />
<org.thoughtcrime.securesms.components.ConversationItemFooter
android:id="@+id/conversation_item_footer"
android:layout_width="wrap_content"

4
app/src/main/res/values/strings.xml
View File

@@ -236,6 +236,8 @@
<string name="CommunicationActions_call">Call</string>
<string name="CommunicationActions_insecure_call">Insecure call</string>
<string name="CommunicationActions_carrier_charges_may_apply">Carrier charges may apply. The number you are calling is not registered with Signal. This call will be placed through your mobile carrier, not over the internet.</string>
<string name="CommunicationActions_cant_join_call">Can\'t join call</string>
<string name="CommunicationActions_this_call_link_is_no_longer_valid">This call link is no longer valid.</string>
<!-- ConfirmIdentityDialog -->
@@ -316,6 +318,8 @@
<string name="ConversationItem_cant_download_video_you_will_need_to_send_it_again">Can\'t download video. You will need to send it again.</string>
<!-- Display as the timestamp footer in a message bubble in a conversation when a message has been edited. The timestamp will go from \'11m\' to \'edited 11m\' -->
<string name="ConversationItem_edited_timestamp_footer">edited\u2000%1$s</string>
<!-- Displayed if the link preview in the conversation item is for a call link call -->
<string name="ConversationItem__join_call">Join call</string>
<!-- ConversationActivity -->
<string name="ConversationActivity_add_attachment">Add attachment</string>