Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-27 13:13:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix foldable camera issues.

Browse Source
This commit is contained in:
Michelle Tang
2025-02-04 15:38:49 -05:00
committed by Greyson Parrelli
parent 2186e2bf92
commit 7755aa1c4e
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraDisplay.kt
View File

@@ -72,6 +72,19 @@ enum class CameraDisplay(
cameraViewportGravity = CameraViewportGravity.BOTTOM
),
toggleBottomMargin = 54
),
DISPLAY_6_5(
aspectRatio = 5f / 6f,
roundViewFinderCorners = false,
withTogglePositionInfo = PositionInfo(
cameraCaptureMarginBottomDp = 120,
cameraViewportGravity = CameraViewportGravity.CENTER
),
withoutTogglePositionInfo = PositionInfo(
cameraCaptureMarginBottomDp = 84,
cameraViewportGravity = CameraViewportGravity.CENTER
),
toggleBottomMargin = 54
);
@Px
@@ -127,6 +140,7 @@ enum class CameraDisplay(
aspectRatio <= DISPLAY_20_9.aspectRatio -> DISPLAY_20_9
aspectRatio <= DISPLAY_19_9.aspectRatio -> DISPLAY_19_9
aspectRatio <= DISPLAY_18_9.aspectRatio -> DISPLAY_18_9
aspectRatio >= DISPLAY_6_5.aspectRatio -> DISPLAY_6_5
else -> DISPLAY_16_9
}
}

2
app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
View File

@@ -376,6 +376,8 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
constraintSet.clone((ConstraintLayout) requireView());
constraintSet.connect(R.id.camerax_camera_parent, ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP);
constraintSet.applyTo((ConstraintLayout) requireView());
ViewUtil.setTopMargin(cameraCard, ViewUtil.getStatusBarHeight(requireView()));
ViewUtil.setBottomMargin(cameraCard, ViewUtil.getNavigationBarHeight(requireView()));
} else {
ViewUtil.setBottomMargin(cameraCard, cameraDisplay.getCameraViewportMarginBottom());
}