gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

set application name in call screens from String nc_app_name

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2021-03-22 12:39:06 +01:00
parent 404d4eb79c
commit 24f1a1831c
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
4 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View File

@ -2174,7 +2174,7 @@ public class CallController extends BaseController {
} }
callConversationNameTextView.setText(conversationName); callConversationNameTextView.setText(conversationName);
callVoiceOrVideoTextView.setText(isVoiceOnlyCall ? R.string.nc_voice_call : R.string.nc_video_call); callVoiceOrVideoTextView.setText(getDescriptionForCallType());
if (callStateView.getVisibility() != View.VISIBLE) { if (callStateView.getVisibility() != View.VISIBLE) {
callStateView.setVisibility(View.VISIBLE); callStateView.setVisibility(View.VISIBLE);
@ -2197,7 +2197,7 @@ public class CallController extends BaseController {
handler.post(() -> { handler.post(() -> {
hangup(false); hangup(false);
callStateTextView.setText(R.string.nc_call_timeout); callStateTextView.setText(R.string.nc_call_timeout);
callVoiceOrVideoTextView.setText(isVoiceOnlyCall ? R.string.nc_voice_call : R.string.nc_video_call); callVoiceOrVideoTextView.setText(getDescriptionForCallType());
if (callStateView.getVisibility() != View.VISIBLE) { if (callStateView.getVisibility() != View.VISIBLE) {
callStateView.setVisibility(View.VISIBLE); callStateView.setVisibility(View.VISIBLE);
} }
@ -2221,7 +2221,7 @@ public class CallController extends BaseController {
handler.post(() -> { handler.post(() -> {
playCallingSound(); playCallingSound();
callStateTextView.setText(R.string.nc_call_reconnecting); callStateTextView.setText(R.string.nc_call_reconnecting);
callVoiceOrVideoTextView.setText(isVoiceOnlyCall ? R.string.nc_voice_call : R.string.nc_video_call); callVoiceOrVideoTextView.setText(getDescriptionForCallType());
if (callStateView.getVisibility() != View.VISIBLE) { if (callStateView.getVisibility() != View.VISIBLE) {
callStateView.setVisibility(View.VISIBLE); callStateView.setVisibility(View.VISIBLE);
} }
@ -2240,7 +2240,7 @@ public class CallController extends BaseController {
case JOINED: case JOINED:
handler.postDelayed(() -> setCallState(CallStatus.CALLING_TIMEOUT), 45000); handler.postDelayed(() -> setCallState(CallStatus.CALLING_TIMEOUT), 45000);
handler.post(() -> { handler.post(() -> {
callVoiceOrVideoTextView.setText(isVoiceOnlyCall ? R.string.nc_voice_call : R.string.nc_video_call); callVoiceOrVideoTextView.setText(getDescriptionForCallType());
if (callStateView != null) { if (callStateView != null) {
if (isIncomingCallFromNotification) { if (isIncomingCallFromNotification) {
callStateTextView.setText(R.string.nc_call_incoming); callStateTextView.setText(R.string.nc_call_incoming);
@ -2274,7 +2274,7 @@ public class CallController extends BaseController {
case IN_CONVERSATION: case IN_CONVERSATION:
handler.post(() -> { handler.post(() -> {
stopCallingSound(); stopCallingSound();
callVoiceOrVideoTextView.setText(isVoiceOnlyCall ? R.string.nc_voice_call : R.string.nc_video_call); callVoiceOrVideoTextView.setText(getDescriptionForCallType());
if (!isVoiceOnlyCall) { if (!isVoiceOnlyCall) {
callInfosLinearLayout.setVisibility(View.GONE); callInfosLinearLayout.setVisibility(View.GONE);
@ -2346,7 +2346,7 @@ public class CallController extends BaseController {
handler.post(() -> { handler.post(() -> {
if (!isDestroyed() && !isBeingDestroyed()) { if (!isDestroyed() && !isBeingDestroyed()) {
stopCallingSound(); stopCallingSound();
callVoiceOrVideoTextView.setText(isVoiceOnlyCall ? R.string.nc_voice_call : R.string.nc_video_call); callVoiceOrVideoTextView.setText(getDescriptionForCallType());
callStateTextView.setText(R.string.nc_leaving_call); callStateTextView.setText(R.string.nc_leaving_call);
callStateView.setVisibility(View.VISIBLE); callStateView.setVisibility(View.VISIBLE);
remoteRenderersLayout.setVisibility(View.INVISIBLE); remoteRenderersLayout.setVisibility(View.INVISIBLE);
@ -2360,6 +2360,17 @@ public class CallController extends BaseController {
} }
} }
private String getDescriptionForCallType() {
String appName = getResources().getString(R.string.nc_app_name);
if (isVoiceOnlyCall){
return String.format(getResources().getString(R.string.nc_call_voice),
getResources().getString(R.string.nc_app_name));
} else {
return String.format(getResources().getString(R.string.nc_call_video),
getResources().getString(R.string.nc_app_name));
}
}
private void playCallingSound() { private void playCallingSound() {
stopCallingSound(); stopCallingSound();
Uri ringtoneUri; Uri ringtoneUri;

15
app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
View File

@ -280,9 +280,11 @@ public class CallNotificationController extends BaseController {
boolean hasCallFlags = userBeingCalled.hasSpreedFeatureCapability("conversation-call-flags"); boolean hasCallFlags = userBeingCalled.hasSpreedFeatureCapability("conversation-call-flags");
if (hasCallFlags) { if (hasCallFlags) {
if (isInCallWithVideo(currentConversation.callFlag)){ if (isInCallWithVideo(currentConversation.callFlag)){
incomingCallVoiceOrVideoTextView.setText(R.string.nc_video_call); incomingCallVoiceOrVideoTextView.setText(String.format(getResources().getString(R.string.nc_call_video),
getResources().getString(R.string.nc_app_name)));
} else { } else {
incomingCallVoiceOrVideoTextView.setText(R.string.nc_voice_call); incomingCallVoiceOrVideoTextView.setText(String.format(getResources().getString(R.string.nc_call_voice),
getResources().getString(R.string.nc_app_name)));
} }
} }
} }
@ -343,11 +345,17 @@ public class CallNotificationController extends BaseController {
showAnswerControls(); showAnswerControls();
} }
@SuppressLint("LongLogTag") @SuppressLint({"LongLogTag"})
@Override @Override
protected void onViewBound(@NonNull View view) { protected void onViewBound(@NonNull View view) {
super.onViewBound(view); super.onViewBound(view);
String callDescriptionWithoutTypeInfo =
String.format(getResources().getString(R.string.nc_call_unknown), getResources().getString(R.string.nc_app_name));
incomingCallVoiceOrVideoTextView.setText(callDescriptionWithoutTypeInfo);
renderScript = RenderScript.create(getActivity()); renderScript = RenderScript.create(getActivity());
if (handler == null) { if (handler == null) {
@ -395,7 +403,6 @@ public class CallNotificationController extends BaseController {
protected void onAttach(@NonNull View view) { protected void onAttach(@NonNull View view) {
super.onAttach(view); super.onAttach(view);
eventBus.register(this); eventBus.register(this);
} }
private void loadAvatar() { private void loadAvatar() {

2
app/src/main/res/layout/controller_call_notification.xml
View File

@ -81,7 +81,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="@string/nc_unknown_call" android:text="@string/nc_call_unknown"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/controller_call_incomingCallTextView" android:textColor="@color/controller_call_incomingCallTextView"
android:textSize="16sp" android:textSize="16sp"

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

@ -188,9 +188,9 @@
<string name="nc_permissions_settings">Open settings</string> <string name="nc_permissions_settings">Open settings</string>
<!-- Call --> <!-- Call -->
<string name="nc_voice_call">Nextcloud Talk voice call</string> <string name="nc_call_voice">%s voice call</string>
<string name="nc_video_call">Nextcloud Talk video call</string> <string name="nc_call_video">%s video call</string>
<string name="nc_unknown_call">Nextcloud Talk call</string> <string name="nc_call_unknown">%s call</string>
<string name="nc_call_incoming">INCOMING</string> <string name="nc_call_incoming">INCOMING</string>
<string name="nc_call_ringing">RINGING</string> <string name="nc_call_ringing">RINGING</string>
<string name="nc_connecting_call">Connecting…</string> <string name="nc_connecting_call">Connecting…</string>