empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

#13658 Fix call popup width issue on orientation change

Browse source 
Fixed Issue #13658: Call popup window has incorrect width when flipping phone after opening a chat #13658
This commit is contained in:
mohsin363 2024-10-03 17:47:36 +05:00
parent 69e1146e2c
commit 95c8d7a76e
2 changed files with 58 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
View file

@ -704,6 +704,12 @@ class ConversationFragment :
super.onConfigurationChanged(newConfig)
ToolbarDependentMarginListener(binding.toolbar)
inlineQueryController.onOrientationChange(newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE)
// Recreate start call dialog on orientation change
val recipient: Recipient = viewModel.recipientSnapshot ?: return
CommunicationActions.startVoiceCall(this@ConversationFragment, recipient) {
YouAreAlreadyInACallSnackbar.show(requireView())
}
}
override fun onDestroyView() {

55
app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
View file

@ -4,7 +4,9 @@ import android.Manifest;
import android.app.Activity;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Configuration;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
@ -12,10 +14,14 @@ import android.os.Handler;
import android.os.Looper;
import android.os.ResultReceiver;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.view.Window;
import android.view.WindowManager;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.core.app.TaskStackBuilder;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
@ -62,6 +68,7 @@ import java.util.concurrent.TimeUnit;
public class CommunicationActions {
private static final String TAG = Log.tag(CommunicationActions.class);
private static AlertDialog alertDialog = null;
/**
* Start a voice call. Assumes that permission request results will be routed to a handler on the Fragment.
@ -98,12 +105,19 @@ public class CommunicationActions {
onUserAlreadyInAnotherCall.onUserAlreadyInAnotherCall();
}
} else {
new MaterialAlertDialogBuilder(callContext.getContext())
if (alertDialog != null) {
alertDialog.dismiss();
alertDialog = null;
}
alertDialog = new MaterialAlertDialogBuilder(callContext.getContext())
.setMessage(R.string.CommunicationActions_start_voice_call)
.setPositiveButton(R.string.CommunicationActions_call, (d, w) -> startCallInternal(callContext, recipient, false, false))
.setNegativeButton(R.string.CommunicationActions_cancel, (d, w) -> d.dismiss())
.setCancelable(true)
.show();
.setCancelable(true).create();
adjustDialogSize(callContext, alertDialog);
alertDialog.show();
}
}
});
@ -485,6 +499,41 @@ public class CommunicationActions {
});
}
/**
* Adjusts the size of the dialog window based on the device orientation.
*/
public static void adjustDialogSize(@NonNull CallContext callContext, DialogInterface dialog) {
Window window = ((AlertDialog) dialog).getWindow();
if (window != null) {
DisplayMetrics displayMetrics = new DisplayMetrics();
window.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
// Get current orientation
int orientation = callContext.getContext().getResources().getConfiguration().orientation;
// Set width and height based on orientation
if (orientation == Configuration.ORIENTATION_PORTRAIT) {
// Case when both dialog and it's page opened in Portrait orientation
if (displayMetrics.heightPixels > displayMetrics.widthPixels) {
window.setLayout((int) (displayMetrics.widthPixels * 0.8), WindowManager.LayoutParams.WRAP_CONTENT);
} else { // When page opened in Portrait orientation and dialog showing in Landscape orientation
window.setLayout((int) (displayMetrics.heightPixels * 0.8), WindowManager.LayoutParams.WRAP_CONTENT);
}
} else {
// Case when both dialog and it's page opened in Landscape orientation
if (displayMetrics.widthPixels > displayMetrics.heightPixels) {
window.setLayout((int) (displayMetrics.widthPixels * 0.6), WindowManager.LayoutParams.WRAP_CONTENT);
} else {// When page opened in Landscape orientation and dialog showing in Portrait orientation
window.setLayout((int) (displayMetrics.heightPixels * 0.6), WindowManager.LayoutParams.WRAP_CONTENT);
}
}
}
}
private interface CallContext {
@NonNull Permissions.PermissionsBuilder getPermissionsBuilder();
void startActivity(@NonNull Intent intent);