Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved active speaker margins

Browse source
This commit is contained in:
Sylvain Berfini 2022-07-05 10:19:10 +02:00
parent 3b1099d202
commit cb8f25a468
4 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/org/linphone/utils/DataBindingUtils.kt
View file

@ -657,6 +657,22 @@ fun setConstraintLayoutTopMargin(view: View, margins: Float) {
view.layoutParams = params
}
@BindingAdapter("android:layout_marginBottom")
fun setConstraintLayoutBottomMargin(view: View, margins: Float) {
val params = view.layoutParams as ConstraintLayout.LayoutParams
val m = margins.toInt()
params.setMargins(params.leftMargin, params.topMargin, params.rightMargin, m)
view.layoutParams = params
}
@BindingAdapter("android:layout_marginEnd")
fun setConstraintLayoutEndMargin(view: View, margins: Float) {
val params = view.layoutParams as ConstraintLayout.LayoutParams
val m = margins.toInt()
params.marginEnd = m
view.layoutParams = params
}
@BindingAdapter("android:onTouch")
fun View.setTouchListener(listener: View.OnTouchListener) {
setOnTouchListener(listener)

6
app/src/main/res/layout-land/voip_conference_active_speaker.xml
View file

@ -34,7 +34,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@{controlsViewModel.folded ? @dimen/margin_0dp : conferenceViewModel.isRemotelyRecorded ? @dimen/voip_single_call_header_size_with_record_info : @dimen/voip_single_call_header_size, default=@dimen/voip_single_call_header_size}"/>
android:layout_marginTop="@{controlsViewModel.folded || controlsViewModel.fullScreenMode ? @dimen/margin_0dp : conferenceViewModel.isRemotelyRecorded ? @dimen/voip_single_call_header_size_with_record_info : @dimen/voip_single_call_header_size, default=@dimen/voip_single_call_header_size}"/>
<androidx.constraintlayout.widget.Guideline
android:id="@+id/hinge_top"
@ -125,7 +125,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/top_barrier"
app:layout_constraintBottom_toBottomOf="@id/hinge_bottom"
android:layout_marginEnd="5dp"
android:layout_marginEnd="@{controlsViewModel.fullScreenMode ? @dimen/margin_0dp : @dimen/voip_conference_active_speaker_dots_margin, default=@dimen/voip_conference_active_speaker_dots_margin}"
app:dotColor="@color/voip_gray_dots"
app:dotRadius="5dp"
app:scrollView="@id/miniatures"
@ -137,8 +137,6 @@
android:id="@+id/miniatures"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
app:layout_constraintTop_toBottomOf="@id/top_barrier"
app:layout_constraintEnd_toStartOf="@id/scroll_indicator"
app:layout_constraintBottom_toBottomOf="@id/hinge_bottom"

4
app/src/main/res/layout/voip_conference_active_speaker.xml
View file

@ -34,7 +34,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@{controlsViewModel.folded ? @dimen/margin_0dp : conferenceViewModel.isRemotelyRecorded ? @dimen/voip_single_call_header_size_with_record_info : @dimen/voip_single_call_header_size, default=@dimen/voip_single_call_header_size}"/>
android:layout_marginTop="@{controlsViewModel.folded || controlsViewModel.fullScreenMode ? @dimen/margin_0dp : conferenceViewModel.isRemotelyRecorded ? @dimen/voip_single_call_header_size_with_record_info : @dimen/voip_single_call_header_size, default=@dimen/voip_single_call_header_size}"/>
<androidx.constraintlayout.widget.Guideline
android:id="@+id/hinge_top"
@ -195,7 +195,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="@id/hinge_bottom"
android:layout_marginBottom="5dp"
android:layout_marginBottom="@{controlsViewModel.fullScreenMode ? @dimen/margin_0dp : @dimen/voip_conference_active_speaker_dots_margin, default=@dimen/voip_conference_active_speaker_dots_margin}"
app:dotColor="@color/voip_gray_dots"
app:dotRadius="5dp"
app:scrollView="@id/miniatures"

3
app/src/main/res/values/dimen.xml
View file

@ -68,10 +68,11 @@
<dimen name="voip_conference_audio_only_participant_avatar_size">40dp</dimen>
<dimen name="conference_schedule_form_field_border_thickness">1dp</dimen>
<dimen name="master_fragment_width">280dp</dimen>
<dimen name="voip_active_speaker_top_margin">10dp</dimen>
<dimen name="voip_active_speaker_top_margin">5dp</dimen>
<dimen name="margin_0dp">0dp</dimen>
<dimen name="voip_single_call_header_size">50dp</dimen>
<dimen name="voip_single_call_header_size_with_record_info">85dp</dimen>
<dimen name="voip_conference_header_folded_top_margin">30dp</dimen>
<dimen name="chat_message_content_preview_max_width">120dp</dimen>
<dimen name="voip_conference_active_speaker_dots_margin">5dp</dimen>
</resources>