TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 02:08:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make top gradient disappear with call controls.

Browse Source 
Fixes [#9951](https://github.com/signalapp/Signal-Android/issues/9951)
This commit is contained in:
Cody Henthorne 2020-08-27 16:26:15 -04:00 committed by GitHub
parent a96093f1b7
commit 0449795725
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ import androidx.annotation.Nullable;
import androidx.appcompat.content.res.AppCompatResources; import androidx.appcompat.content.res.AppCompatResources;
import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.ConstraintSet; import androidx.constraintlayout.widget.ConstraintSet;
import androidx.constraintlayout.widget.Guideline;
import androidx.core.util.Consumer; import androidx.core.util.Consumer;
import androidx.transition.AutoTransition; import androidx.transition.AutoTransition;
import androidx.transition.Transition; import androidx.transition.Transition;
@ -117,12 +118,13 @@ public class WebRtcCallView extends FrameLayout {
answerWithAudioLabel = findViewById(R.id.call_screen_answer_with_audio_label); answerWithAudioLabel = findViewById(R.id.call_screen_answer_with_audio_label);
ongoingFooterGradient = findViewById(R.id.call_screen_ongoing_footer_gradient); ongoingFooterGradient = findViewById(R.id.call_screen_ongoing_footer_gradient);
View topGradient = findViewById(R.id.call_screen_header_gradient); View topGradient = findViewById(R.id.call_screen_header_gradient);
View downCaret = findViewById(R.id.call_screen_down_arrow); View downCaret = findViewById(R.id.call_screen_down_arrow);
View decline = findViewById(R.id.call_screen_decline_call); View decline = findViewById(R.id.call_screen_decline_call);
View answerLabel = findViewById(R.id.call_screen_answer_call_label); View answerLabel = findViewById(R.id.call_screen_answer_call_label);
View declineLabel = findViewById(R.id.call_screen_decline_call_label); View declineLabel = findViewById(R.id.call_screen_decline_call_label);
View incomingFooterGradient = findViewById(R.id.call_screen_incoming_footer_gradient); View incomingFooterGradient = findViewById(R.id.call_screen_incoming_footer_gradient);
Guideline statusBarGuideline = findViewById(R.id.call_screen_status_bar_guideline);
topViews.add(status); topViews.add(status);
topViews.add(topGradient); topViews.add(topGradient);
@ -166,11 +168,8 @@ public class WebRtcCallView extends FrameLayout {
pictureInPictureGestureHelper = PictureInPictureGestureHelper.applyTo(localRenderPipFrame); pictureInPictureGestureHelper = PictureInPictureGestureHelper.applyTo(localRenderPipFrame);
int statusBarHeight = ViewUtil.getStatusBarHeight(this); int statusBarHeight = ViewUtil.getStatusBarHeight(this);
MarginLayoutParams params = (MarginLayoutParams) parent.getLayoutParams(); statusBarGuideline.setGuidelineBegin(statusBarHeight);
params.topMargin = statusBarHeight;
parent.setLayoutParams(params);
} }
@Override @Override

38
app/src/main/res/layout/webrtc_call_view.xml
View File

@ -27,34 +27,36 @@
android:id="@+id/call_screen_remote_renderer_holder" android:id="@+id/call_screen_remote_renderer_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone" android:visibility="gone" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<FrameLayout <FrameLayout
android:id="@+id/call_screen_large_local_renderer_holder" android:id="@+id/call_screen_large_local_renderer_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/black" android:background="@color/black"
android:visibility="gone" android:visibility="gone" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/call_screen_header_gradient"
android:layout_width="match_parent"
android:layout_height="160dp"
android:background="@drawable/webrtc_call_screen_header_gradient" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/call_screen" android:id="@+id/call_screen"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/call_screen_status_bar_guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
tools:layout_constraintGuide_begin="48dp" />
<View
android:id="@+id/call_screen_header_gradient"
android:layout_width="0dp"
android:layout_height="160dp"
android:background="@drawable/webrtc_call_screen_header_gradient"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View <View
android:id="@+id/call_screen_ongoing_footer_gradient" android:id="@+id/call_screen_ongoing_footer_gradient"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -83,7 +85,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1" app:layout_constraintHorizontal_bias="1"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="@id/call_screen_status_bar_guideline"
app:layout_constraintVertical_bias="0"> app:layout_constraintVertical_bias="0">
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
@ -129,7 +131,7 @@
android:textColor="@color/core_white" android:textColor="@color/core_white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="@id/call_screen_status_bar_guideline"
tools:text="Kiera Thompson" /> tools:text="Kiera Thompson" />
<TextView <TextView