From a605c5df9f7807485f70ab37b62ec055b9abb813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Thu, 15 Sep 2022 20:58:26 +0200 Subject: [PATCH 1/3] Rename dimension to better describe its purpose MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Calviño Sánchez --- .../java/com/nextcloud/talk/activities/CallActivity.java | 8 ++++---- app/src/main/res/layout/call_activity.xml | 2 +- app/src/main/res/values/dimens.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java index 0f691f353..365442a34 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java @@ -2028,14 +2028,14 @@ public class CallActivity extends CallBaseActivity { } if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) { - layoutParams.height = (int) getResources().getDimension(R.dimen.large_preview_dimension); + layoutParams.height = (int) getResources().getDimension(R.dimen.call_self_video_short_side_length); layoutParams.width = FrameLayout.LayoutParams.WRAP_CONTENT; - newXafterRotate = (float) (screenWidthDp - getResources().getDimension(R.dimen.large_preview_dimension) * 0.8); + newXafterRotate = (float) (screenWidthDp - getResources().getDimension(R.dimen.call_self_video_short_side_length) * 0.8); } else if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { layoutParams.height = FrameLayout.LayoutParams.WRAP_CONTENT; - layoutParams.width = (int) getResources().getDimension(R.dimen.large_preview_dimension); - newXafterRotate = (float) (screenWidthDp - getResources().getDimension(R.dimen.large_preview_dimension) * 0.5); + layoutParams.width = (int) getResources().getDimension(R.dimen.call_self_video_short_side_length); + newXafterRotate = (float) (screenWidthDp - getResources().getDimension(R.dimen.call_self_video_short_side_length) * 0.5); } binding.selfVideoRenderer.setLayoutParams(layoutParams); diff --git a/app/src/main/res/layout/call_activity.xml b/app/src/main/res/layout/call_activity.xml index 897c6ed06..03f7afee2 100644 --- a/app/src/main/res/layout/call_activity.xml +++ b/app/src/main/res/layout/call_activity.xml @@ -61,7 +61,7 @@ 192dp - 80dp 16dp 24dp 16dp @@ -64,6 +63,7 @@ 24dp 18dp + 80dp 180dp 110dp 0dp From 85c644e5b3e3d3fcc9795ee5fb45098959a5a6b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Thu, 15 Sep 2022 20:58:55 +0200 Subject: [PATCH 2/3] Add named dimension for the long side of the self video MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Calviño Sánchez --- app/src/main/res/layout/call_activity.xml | 2 +- app/src/main/res/values/dimens.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/call_activity.xml b/app/src/main/res/layout/call_activity.xml index 03f7afee2..2b43482a3 100644 --- a/app/src/main/res/layout/call_activity.xml +++ b/app/src/main/res/layout/call_activity.xml @@ -62,7 +62,7 @@ 24dp 18dp + 150dp 80dp 180dp 110dp From 892ffe87dd45a61e8e84769af3f18f4e89ea08e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Thu, 15 Sep 2022 20:59:53 +0200 Subject: [PATCH 3/3] Fix self video size after coming back from PiP mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When coming back from PiP mode the self video occupied the full height of the window. Now the height is set to the default value set in the layout, so it matches the size used when starting the call activity. Signed-off-by: Daniel Calviño Sánchez --- .../main/java/com/nextcloud/talk/activities/CallActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java index 365442a34..a9c5edf42 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java @@ -2029,11 +2029,11 @@ public class CallActivity extends CallBaseActivity { if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) { layoutParams.height = (int) getResources().getDimension(R.dimen.call_self_video_short_side_length); - layoutParams.width = FrameLayout.LayoutParams.WRAP_CONTENT; + layoutParams.width = (int) getResources().getDimension(R.dimen.call_self_video_long_side_length); newXafterRotate = (float) (screenWidthDp - getResources().getDimension(R.dimen.call_self_video_short_side_length) * 0.8); } else if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { - layoutParams.height = FrameLayout.LayoutParams.WRAP_CONTENT; + layoutParams.height = (int) getResources().getDimension(R.dimen.call_self_video_long_side_length); layoutParams.width = (int) getResources().getDimension(R.dimen.call_self_video_short_side_length); newXafterRotate = (float) (screenWidthDp - getResources().getDimension(R.dimen.call_self_video_short_side_length) * 0.5); }