blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add insecure call ability to recipient settings.

master
Alan Evans 2020-06-17 16:41:17 -03:00
parent 2fb9514890
commit a6384d1b73
8 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientFragment.java
View File

@ -90,6 +90,7 @@ public class ManageRecipientFragment extends Fragment {
private TextView groupsInCommonCount;
private View messageButton;
private View secureCallButton;
private View insecureCallButton;
private View secureVideoCallButton;
static ManageRecipientFragment newInstance(@NonNull RecipientId recipientId) {
@ -138,6 +139,7 @@ public class ManageRecipientFragment extends Fragment {
toggleAllGroups = view.findViewById(R.id.toggle_all_groups);
messageButton = view.findViewById(R.id.recipient_message);
secureCallButton = view.findViewById(R.id.recipient_voice_call);
insecureCallButton = view.findViewById(R.id.recipient_insecure_voice_call);
secureVideoCallButton = view.findViewById(R.id.recipient_video_call);
return view;
@ -228,6 +230,7 @@ public class ManageRecipientFragment extends Fragment {
messageButton.setOnClickListener(v -> viewModel.onMessage(requireActivity()));
secureCallButton.setOnClickListener(v -> viewModel.onSecureCall(requireActivity()));
insecureCallButton.setOnClickListener(v -> viewModel.onInsecureCall(requireActivity()));
secureVideoCallButton.setOnClickListener(v -> viewModel.onSecureVideoCall(requireActivity()));
}
@ -263,6 +266,7 @@ public class ManageRecipientFragment extends Fragment {
colorRow.setOnClickListener(v -> handleColorSelection(color));
secureCallButton.setVisibility(recipient.isRegistered() && !recipient.isLocalNumber() ? View.VISIBLE : View.GONE);
insecureCallButton.setVisibility(!recipient.isRegistered() && !recipient.isLocalNumber() ? View.VISIBLE : View.GONE);
secureVideoCallButton.setVisibility(recipient.isRegistered() && !recipient.isLocalNumber() ? View.VISIBLE : View.GONE);
}

4
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientViewModel.java
View File

@ -229,6 +229,10 @@ public final class ManageRecipientViewModel extends ViewModel {
withRecipient(r -> CommunicationActions.startVoiceCall(activity, r));
}
void onInsecureCall(@NonNull FragmentActivity activity) {
withRecipient(r -> CommunicationActions.startInsecureCall(activity, r));
}
void onSecureVideoCall(@NonNull FragmentActivity activity) {
withRecipient(r -> CommunicationActions.startVideoCall(activity, r));
}

9
app/src/main/res/drawable/ic_phone_right_unlock_outline_ultramarine_24.xml 100644
View File

File diff suppressed because one or more lines are too long

9
app/src/main/res/drawable/ic_phone_right_unlock_solid_ultramarine_light_24.xml 100644
View File

File diff suppressed because one or more lines are too long

16
app/src/main/res/layout/recipient_manage_fragment.xml
View File

@ -68,6 +68,16 @@
app:icon="?recipient_message_circle_icon"
app:rippleColor="@color/core_ultramarine" />
<com.google.android.material.button.MaterialButton
android:id="@+id/recipient_video_call"
style="@style/Widget.Signal.Button.Icon.Circular"
android:layout_marginStart="36dp"
android:contentDescription="@string/ManageRecipientActivity_video_call_description"
android:visibility="gone"
app:backgroundTint="?recipient_contact_button_color"
app:icon="?recipient_video_call_circle_icon"
tools:visibility="visible" />
<com.google.android.material.button.MaterialButton
android:id="@+id/recipient_voice_call"
style="@style/Widget.Signal.Button.Icon.Circular"
@ -79,13 +89,13 @@
tools:visibility="visible" />
<com.google.android.material.button.MaterialButton
android:id="@+id/recipient_video_call"
android:id="@+id/recipient_insecure_voice_call"
style="@style/Widget.Signal.Button.Icon.Circular"
android:layout_marginStart="36dp"
android:contentDescription="@string/ManageRecipientActivity_video_call_description"
android:contentDescription="@string/ManageRecipientActivity_insecure_voice_call_description"
android:visibility="gone"
app:backgroundTint="?recipient_contact_button_color"
app:icon="?recipient_video_call_circle_icon"
app:icon="?recipient_insecure_call_circle_icon"
tools:visibility="visible" />
</LinearLayout>

1
app/src/main/res/values/attrs.xml
View File

@ -303,6 +303,7 @@
<attr name="recipient_message_circle_icon" format="reference"/>
<attr name="recipient_call_circle_icon" format="reference"/>
<attr name="recipient_insecure_call_circle_icon" format="reference"/>
<attr name="recipient_video_call_circle_icon" format="reference"/>
<attr name="recipient_contact_button_color" format="reference"/>

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

@ -560,6 +560,7 @@
<string name="ManageRecipientActivity_edit_name_and_picture">Edit name and picture</string>
<string name="ManageRecipientActivity_message_description">Message</string>
<string name="ManageRecipientActivity_voice_call_description">Voice call</string>
<string name="ManageRecipientActivity_insecure_voice_call_description">Insecure voice call</string>
<string name="ManageRecipientActivity_video_call_description">Video call</string>
<plurals name="GroupMemberList_invited">

2
app/src/main/res/values/themes.xml
View File

@ -440,6 +440,7 @@
<item name="recipient_message_circle_icon">@drawable/ic_message_outline_ultramarine_24</item>
<item name="recipient_call_circle_icon">@drawable/ic_phone_right_outline_ultramarine_24</item>
<item name="recipient_insecure_call_circle_icon">@drawable/ic_phone_right_unlock_outline_ultramarine_24</item>
<item name="recipient_video_call_circle_icon">@drawable/ic_video_outline_ultramarine_24</item>
<item name="recipient_contact_button_color">@color/core_grey_02</item>
</style>
@ -735,6 +736,7 @@
<item name="recipient_message_circle_icon">@drawable/ic_message_solid_ultramarine_light_24</item>
<item name="recipient_call_circle_icon">@drawable/ic_phone_right_solid_ultramarine_light_24</item>
<item name="recipient_insecure_call_circle_icon">@drawable/ic_phone_right_unlock_solid_ultramarine_light_24</item>
<item name="recipient_video_call_circle_icon">@drawable/ic_video_solid_ultramarine_light_24</item>
<item name="recipient_contact_button_color">@color/core_grey_80</item>
</style>