diff --git a/app/build.gradle b/app/build.gradle index 51d1287ee..20858e80e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -216,6 +216,7 @@ dependencies { implementation "androidx.window:window:1.0.0" implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation "androidx.gridlayout:gridlayout:1.0.0" implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1' implementation 'androidx.recyclerview:recyclerview:1.2.1' diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt index 8e02435fa..981f61e94 100644 --- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt +++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt @@ -251,8 +251,7 @@ private fun setEntries( viewGroup.removeAllViews() if (entries != null) { val inflater = viewGroup.context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater - for (i in entries.indices) { - val entry = entries[i] + for (entry in entries) { val binding = DataBindingUtil.inflate( inflater, layoutId, diff --git a/app/src/main/res/layout/voip_conference_audio_only.xml b/app/src/main/res/layout/voip_conference_audio_only.xml index c27070038..79044516b 100644 --- a/app/src/main/res/layout/voip_conference_audio_only.xml +++ b/app/src/main/res/layout/voip_conference_audio_only.xml @@ -25,40 +25,29 @@ android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/voip_remote_margin_full_screen : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}" android:visibility="@{inflatedVisibility}"> - + + + + - - - - - - - - - - - - + android:layout_below="@id/remote_recording" + android:layout_marginTop="10dp" + app:entries="@{conferenceViewModel.conferenceParticipantDevices}" + app:layout="@{@layout/voip_conference_participant_remote_audio_only}" + app:columnCount="2" + app:orientation="horizontal" /> diff --git a/app/src/main/res/layout/voip_conference_header.xml b/app/src/main/res/layout/voip_conference_header.xml index 5416788ff..b71a04475 100644 --- a/app/src/main/res/layout/voip_conference_header.xml +++ b/app/src/main/res/layout/voip_conference_header.xml @@ -13,7 +13,9 @@ + android:layout_height="wrap_content" + android:layout_marginStart="5dp" + android:layout_marginEnd="5dp"> + + android:layout_width="0dp" + android:layout_height="@dimen/voip_conference_audio_only_participant_cell_height" + app:layout_columnWeight="1" + app:layout_gravity="fill_horizontal"> - - - - - - + + + + + + diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index 220d1a51a..39f9c87a3 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -61,7 +61,7 @@ 137dp 200dp 60dp - 60dp + 80dp 40dp 1dp 280dp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 25736aaa0..1b8a63cb5 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -184,6 +184,15 @@ @dimen/settings_granularity_step + +