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

Implement several polish items for Call Links.

Browse Source
This commit is contained in:
Alex Hart
2024-01-23 15:50:47 -04:00
committed by Nicholas Tinsley
parent 56a2d8891f
commit 4ada7c9be9
7 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/LayoutPositions.kt
View File

@@ -20,7 +20,7 @@ enum class LayoutPositions(
SMALL_GROUP(
participantBottomViewId = ConstraintSet.PARENT_ID,
participantBottomMargin = 0,
reactionBottomViewId = R.id.call_screen_above_controls_guideline,
reactionBottomViewId = R.id.call_screen_pending_recipients,
reactionBottomMargin = 8
),
@@ -28,7 +28,7 @@ enum class LayoutPositions(
LARGE_GROUP(
participantBottomViewId = R.id.call_screen_participants_recycler,
participantBottomMargin = 16,
reactionBottomViewId = R.id.call_screen_participants_recycler,
reactionBottomViewId = R.id.call_screen_pending_recipients,
reactionBottomMargin = 20
);

32
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
View File

@@ -25,6 +25,7 @@ import androidx.annotation.StringRes;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.appcompat.widget.Toolbar;
import androidx.compose.ui.platform.ComposeView;
import androidx.constraintlayout.widget.Barrier;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.ConstraintSet;
import androidx.constraintlayout.widget.Guideline;
@@ -124,6 +125,7 @@ public class WebRtcCallView extends InsetAwareConstraintLayout {
private RecyclerView groupReactionsFeed;
private MultiReactionBurstLayout reactionViews;
private ComposeView raiseHandSnackbar;
private Barrier pipBottomBoundaryBarrier;
@@ -203,6 +205,7 @@ public class WebRtcCallView extends InsetAwareConstraintLayout {
groupReactionsFeed = findViewById(R.id.call_screen_reactions_feed);
reactionViews = findViewById(R.id.call_screen_reactions_container);
raiseHandSnackbar = findViewById(R.id.call_screen_raise_hand_view);
pipBottomBoundaryBarrier = findViewById(R.id.pip_bottom_boundary_barrier);
View decline = findViewById(R.id.call_screen_decline_call);
View answerLabel = findViewById(R.id.call_screen_answer_call_label);
@@ -355,6 +358,12 @@ public class WebRtcCallView extends InsetAwareConstraintLayout {
rotatableControls.add(decline);
rotatableControls.add(smallLocalAudioIndicator);
rotatableControls.add(ringToggle);
pipBottomBoundaryBarrier.addOnLayoutChangeListener((v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
if (bottom != oldBottom) {
onBarrierBottomChanged(bottom);
}
});
}
@Override
@@ -851,17 +860,17 @@ public class WebRtcCallView extends InsetAwareConstraintLayout {
private void moveSnackbarAboveParticipantRail(boolean aboveRail) {
if (aboveRail) {
updateSnackbarBottomConstraint(callParticipantsRecycler);
updatePendingParticipantsBottomConstraint(callParticipantsRecycler);
} else {
updateSnackbarBottomConstraint(aboveControlsGuideline);
updatePendingParticipantsBottomConstraint(aboveControlsGuideline);
}
}
private void updateSnackbarBottomConstraint(View anchor) {
private void updatePendingParticipantsBottomConstraint(View anchor) {
ConstraintSet constraintSet = new ConstraintSet();
constraintSet.clone(this);
constraintSet.connect(R.id.call_screen_raise_hand_view,
constraintSet.connect(R.id.call_screen_pending_recipients,
ConstraintSet.BOTTOM,
anchor.getId(),
ConstraintSet.TOP,
@@ -938,15 +947,12 @@ public class WebRtcCallView extends InsetAwareConstraintLayout {
ringToggle.setActivated(enabled);
}
public void onControlTopChanged(int guidelineTop, int snackBarHeight) {
int offset = 0;
if (lastState != null) {
CallParticipantsState state = lastState.getCallParticipantsState();
if (!state.isViewingFocusedParticipant() && !state.isLargeVideoGroup()) {
offset = snackBarHeight;
}
pictureInPictureGestureHelper.setBottomVerticalBoundary(guidelineTop - offset);
}
public void onControlTopChanged() {
onBarrierBottomChanged(pipBottomBoundaryBarrier.getBottom());
}
private void onBarrierBottomChanged(int barrierBottom) {
pictureInPictureGestureHelper.setBottomVerticalBoundary(barrierBottom);
}
public interface ControlsListener {

10
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/ControlsAndInfoController.kt
View File

@@ -147,8 +147,8 @@ class ControlsAndInfoController(
webRtcCallView.post { onControlTopChanged() }
}
raiseHandComposeView.addOnLayoutChangeListener { _, _, top, _, bottom, _, _, _, _ ->
onControlTopChanged(composeViewSize = bottom - top)
raiseHandComposeView.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
onControlTopChanged()
}
callControls.viewTreeObserver.addOnGlobalLayoutListener {
@@ -184,8 +184,6 @@ class ControlsAndInfoController(
callInfoComposeView.alpha = alphaCallInfo(slideOffset)
callInfoComposeView.translationY = infoTranslationDistance - (infoTranslationDistance * callInfoComposeView.alpha)
onControlTopChanged()
}
})
@@ -210,10 +208,10 @@ class ControlsAndInfoController(
}
}
fun onControlTopChanged(composeViewSize: Int = raiseHandComposeView.height) {
fun onControlTopChanged() {
val guidelineTop = max(frame.top, coordinator.height - behavior.peekHeight)
aboveControlsGuideline.setGuidelineBegin(guidelineTop)
webRtcCallView.onControlTopChanged(guidelineTop, composeViewSize)
webRtcCallView.onControlTopChanged()
}
fun addVisibilityListener(listener: BottomSheetVisibilityListener): Boolean {

2
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/RaiseHandSnackbar.kt
View File

@@ -120,7 +120,7 @@ private fun RaiseHand(
modifier = modifier
.padding(horizontal = 16.dp)
.clip(shape = RoundedCornerShape(16.dp, 16.dp, 16.dp, 16.dp))
.background(MaterialTheme.colorScheme.surface)
.background(SignalTheme.colors.colorSurface1)
.animateContentSize()
) {
val boxModifier = modifier