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

Merge pull request #2389 from nextcloud/fix-self-video-size-after-coming-back-from-pip-mode

Browse Source 
Fix self video size after coming back from pip mode
This commit is contained in:
Tim Krüger 2022-09-19 11:05:51 +02:00 committed by GitHub
commit eb18231e25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -2039,14 +2039,14 @@ public class CallActivity extends CallBaseActivity {
}
if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
layoutParams.height = (int) getResources().getDimension(R.dimen.large_preview_dimension);
layoutParams.width = FrameLayout.LayoutParams.WRAP_CONTENT;
newXafterRotate = (float) (screenWidthDp - getResources().getDimension(R.dimen.large_preview_dimension) * 0.8);
layoutParams.height = (int) getResources().getDimension(R.dimen.call_self_video_short_side_length);
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.width = (int) getResources().getDimension(R.dimen.large_preview_dimension);
newXafterRotate = (float) (screenWidthDp - getResources().getDimension(R.dimen.large_preview_dimension) * 0.5);
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);
}
binding.selfVideoRenderer.setLayoutParams(layoutParams);

4
app/src/main/res/layout/call_activity.xml
View File

@ -61,8 +61,8 @@
<org.webrtc.SurfaceViewRenderer
android:id="@+id/selfVideoRenderer"
android:layout_width="@dimen/large_preview_dimension"
android:layout_height="150dp"
android:layout_width="@dimen/call_self_video_short_side_length"
android:layout_height="@dimen/call_self_video_long_side_length"
android:layout_gravity="center"
android:layout_margin="16dp"
android:clickable="false"

3
app/src/main/res/values/dimens.xml
View File

@ -46,7 +46,6 @@
<dimen name="maximum_file_preview_size">192dp</dimen>
<dimen name="large_preview_dimension">80dp</dimen>
<dimen name="corner_radius">16dp</dimen>
<dimen name="button_corner_radius">24dp</dimen>
<dimen name="standard_margin">16dp</dimen>
@ -64,6 +63,8 @@
<dimen name="dialog_padding">24dp</dimen>
<dimen name="dialog_padding_top_bottom">18dp</dimen>
<dimen name="call_self_video_long_side_length">150dp</dimen>
<dimen name="call_self_video_short_side_length">80dp</dimen>
<dimen name="call_grid_item_min_height">180dp</dimen>
<dimen name="call_controls_height">110dp</dimen>
<dimen name="zero">0dp</dimen>