mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-30 10:19:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved stats layouts, video full screen & bottom sheets animations

Browse source
This commit is contained in:
Sylvain Berfini 2024-02-26 17:02:58 +01:00
parent 7ba19364b9
commit c9eb856f19
9 changed files with 28 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt
View file

@ -189,16 +189,12 @@ class ActiveCallFragment : GenericCallFragment() {
}
binding.setCallStatisticsClickListener {
actionsBottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
numpadBottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
callMediaEncryptionStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
callMediaEncryptionStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
callStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
}
binding.setCallMediaEncryptionStatisticsClickListener {
actionsBottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
numpadBottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
callStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
callStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
callMediaEncryptionStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
}

6
app/src/main/java/org/linphone/ui/call/fragment/ActiveConferenceCallFragment.kt
View file

@ -190,14 +190,12 @@ class ActiveConferenceCallFragment : GenericCallFragment() {
}
binding.setCallStatisticsClickListener {
actionsBottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
callMediaEncryptionStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
callMediaEncryptionStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
callStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
}
binding.setCallMediaEncryptionStatisticsClickListener {
actionsBottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
callStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
callStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
callMediaEncryptionStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
}
}

2
app/src/main/res/layout-land/call_media_encryption_stats_bottom_sheet.xml
View file

@ -15,7 +15,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/black"
android:background="@drawable/shape_call_bottom_sheet_background"
android:visibility="@{viewModel.fullScreenMode || viewModel.pipMode ? View.INVISIBLE : View.VISIBLE}"
app:behavior_hideable="true"
app:behavior_peekHeight="0dp"

2
app/src/main/res/layout-land/call_stats_bottom_sheet.xml
View file

@ -15,7 +15,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/black"
android:background="@drawable/shape_call_bottom_sheet_background"
android:visibility="@{viewModel.fullScreenMode || viewModel.pipMode ? View.INVISIBLE : View.VISIBLE}"
app:behavior_hideable="true"
app:behavior_peekHeight="0dp"

23
app/src/main/res/layout/call_active_conference_fragment.xml
View file

@ -124,22 +124,22 @@
<ImageView
android:id="@+id/switch_camera"
android:onClick="@{() -> viewModel.switchCamera()}"
android:layout_width="@dimen/call_top_bar_info_height"
android:layout_height="@dimen/call_top_bar_info_height"
android:layout_width="@dimen/big_icon_size"
android:layout_height="0dp"
android:padding="10dp"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:src="@drawable/camera_rotate"
android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; viewModel.showSwitchCamera &amp;&amp; conferenceViewModel.participantDevices.size() > 1 &amp;&amp; conferenceViewModel.isMeParticipantSendingVideo ? View.VISIBLE : View.GONE}"
app:tint="@color/white"
app:layout_constraintTop_toTopOf="@id/conference_subject"
app:layout_constraintBottom_toBottomOf="@id/conference_subject"
app:layout_constraintTop_toTopOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/back"
app:layout_constraintEnd_toStartOf="@+id/paused" />
<ImageView
android:id="@+id/paused"
android:layout_width="@dimen/call_top_bar_info_height"
android:layout_height="@dimen/call_top_bar_info_height"
android:layout_width="@dimen/big_icon_size"
android:layout_height="0dp"
android:padding="10dp"
android:src="@drawable/pause"
android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; conferenceViewModel.isPaused ? View.VISIBLE : View.GONE, default=gone}"
@ -151,14 +151,14 @@
<ImageView
android:id="@+id/stats"
android:onClick="@{callStatisticsClickListener}"
android:layout_width="@dimen/call_top_bar_info_height"
android:layout_height="@dimen/call_top_bar_info_height"
android:layout_width="@dimen/big_icon_size"
android:layout_height="0dp"
android:padding="10dp"
android:src="@{viewModel.qualityIcon, default=@drawable/cell_signal_full}"
android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; !conferenceViewModel.isPaused ? View.VISIBLE : View.GONE}"
android:tint="@{viewModel.qualityValue >= 2 ? @color/white : viewModel.qualityValue >= 1 ? @color/orange_warning_600 : @color/red_danger_500, default=@color/white}"
app:layout_constraintTop_toTopOf="@id/conference_subject"
app:layout_constraintBottom_toBottomOf="@id/conference_subject"
app:layout_constraintTop_toTopOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/back"
app:layout_constraintEnd_toEndOf="parent"
bind:ignore="UseAppTint" />
@ -242,11 +242,12 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="@{viewModel.fullScreenMode || viewModel.pipMode ? @dimen/zero : @dimen/call_main_actions_menu_margin, default=@dimen/call_main_actions_menu_margin}"
android:layout_marginTop="@{viewModel.fullScreenMode || viewModel.pipMode ? @dimen/zero : @dimen/call_remote_video_top_margin, default=@dimen/call_remote_video_top_margin}"
android:visibility="@{conferenceViewModel.participantDevices.size() > 1 &amp;&amp; !conferenceViewModel.isPaused ? View.VISIBLE : View.GONE}"
app:navGraph="@navigation/conference_nav_graph"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/media_encryption_icon"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<ImageView

14
app/src/main/res/layout/call_active_fragment.xml
View file

@ -114,7 +114,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="@{viewModel.fullScreenMode || viewModel.pipMode || viewModel.halfOpenedFolded ? @dimen/zero : @dimen/call_main_actions_menu_margin, default=@dimen/call_main_actions_menu_margin}"
android:layout_marginTop="@{viewModel.fullScreenMode || viewModel.pipMode || viewModel.halfOpenedFolded ? @dimen/zero : @dimen/call_top_bar_info_height, default=@dimen/call_top_bar_info_height}"
android:layout_marginTop="@{viewModel.fullScreenMode || viewModel.pipMode || viewModel.halfOpenedFolded ? @dimen/zero : @dimen/call_remote_video_top_margin, default=@dimen/call_remote_video_top_margin}"
android:onClick="@{() -> viewModel.toggleFullScreen()}"
android:visibility="@{viewModel.isVideoEnabled &amp;&amp; !(viewModel.isPaused || viewModel.isPausedByRemote) ? View.VISIBLE : View.GONE}"
app:layout_constraintTop_toTopOf="parent"
@ -197,8 +197,8 @@
<ImageView
android:onClick="@{() -> viewModel.switchCamera()}"
android:id="@+id/switch_camera"
android:layout_width="@dimen/call_top_bar_info_height"
android:layout_height="@dimen/call_top_bar_info_height"
android:layout_width="@dimen/big_icon_size"
android:layout_height="0dp"
android:padding="10dp"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
@ -211,8 +211,8 @@
<ImageView
android:id="@+id/paused"
android:layout_width="@dimen/call_top_bar_info_height"
android:layout_height="@dimen/call_top_bar_info_height"
android:layout_width="@dimen/big_icon_size"
android:layout_height="0dp"
android:padding="10dp"
android:src="@drawable/pause"
android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; (viewModel.isPaused || viewModel.isPausedByRemote) ? View.VISIBLE : View.GONE, default=gone}"
@ -224,8 +224,8 @@
<ImageView
android:id="@+id/stats"
android:onClick="@{callStatisticsClickListener}"
android:layout_width="@dimen/call_top_bar_info_height"
android:layout_height="@dimen/call_top_bar_info_height"
android:layout_width="@dimen/big_icon_size"
android:layout_height="0dp"
android:padding="10dp"
android:src="@{viewModel.qualityIcon, default=@drawable/cell_signal_full}"
android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; !(viewModel.isPaused || viewModel.isPausedByRemote) ? View.VISIBLE : View.GONE}"

2
app/src/main/res/layout/call_media_encryption_stats_bottom_sheet.xml
View file

@ -15,7 +15,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/black"
android:background="@drawable/shape_call_bottom_sheet_background"
android:visibility="@{viewModel.fullScreenMode || viewModel.pipMode ? View.INVISIBLE : View.VISIBLE}"
app:behavior_hideable="true"
app:behavior_peekHeight="0dp"

2
app/src/main/res/layout/call_stats_bottom_sheet.xml
View file

@ -15,7 +15,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/black"
android:background="@drawable/shape_call_bottom_sheet_background"
android:visibility="@{viewModel.fullScreenMode || viewModel.pipMode ? View.INVISIBLE : View.VISIBLE}"
app:behavior_hideable="true"
app:behavior_peekHeight="0dp"

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

@ -52,7 +52,7 @@
<dimen name="popup_menu_item_top_margin">20dp</dimen>
<dimen name="call_top_bar_text_height">28dp</dimen>
<dimen name="call_top_bar_info_height">48dp</dimen> <!-- Size of top text + top & bottom margins -->
<dimen name="call_remote_video_top_margin">70dp</dimen> <!-- Size of top text + top & bottom margins -->
<dimen name="call_main_actions_menu_height">110dp</dimen>
<dimen name="call_all_actions_menu_height">345dp</dimen> <!-- sum of above two -->
<dimen name="call_main_actions_menu_margin">120dp</dimen>