mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Animate caret to handle and back while in call

Browse source
This commit is contained in:
Sylvain Berfini 2024-02-01 12:35:27 +01:00
parent 1c24c805df
commit 58e41d99c9
5 changed files with 88 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,7 @@ import androidx.annotation.UiThread
import androidx.constraintlayout.widget.ConstraintSet
import androidx.lifecycle.ViewModelProvider
import androidx.navigation.fragment.findNavController
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
import androidx.window.layout.FoldingFeature
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
@ -50,6 +51,7 @@ import org.linphone.utils.DialogUtils
import org.linphone.utils.Event
import org.linphone.utils.addCharacterAtPosition
import org.linphone.utils.removeCharacterAtPosition
import org.linphone.utils.startAnimatedDrawable
@UiThread
class ActiveCallFragment : GenericCallFragment() {
@ -107,7 +109,19 @@ class ActiveCallFragment : GenericCallFragment() {
private val actionsBottomSheetCallback = object : BottomSheetBehavior.BottomSheetCallback() {
override fun onStateChanged(bottomSheet: View, newState: Int) {
callViewModel.extraActionsBottomSheetVisible.value = newState != BottomSheetBehavior.STATE_COLLAPSED
if (newState == BottomSheetBehavior.STATE_EXPANDED) {
val drawable = AnimatedVectorDrawableCompat.create(
requireContext(),
R.drawable.animated_handle_to_caret
)
binding.bottomBar.mainActions.handle.setImageDrawable(drawable)
} else if (newState == BottomSheetBehavior.STATE_COLLAPSED) {
val drawable = AnimatedVectorDrawableCompat.create(
requireContext(),
R.drawable.animated_caret_to_handle
)
binding.bottomBar.mainActions.handle.setImageDrawable(drawable)
}
}
override fun onSlide(bottomSheet: View, slideOffset: Float) { }
@ -235,8 +249,20 @@ class ActiveCallFragment : GenericCallFragment() {
it.consume {
val state = actionsBottomSheetBehavior.state
if (state == BottomSheetBehavior.STATE_COLLAPSED) {
val drawable = AnimatedVectorDrawableCompat.create(
requireContext(),
R.drawable.animated_caret_to_handle
)
binding.bottomBar.mainActions.handle.setImageDrawable(drawable)
binding.bottomBar.mainActions.handle.startAnimatedDrawable()
actionsBottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
} else if (state == BottomSheetBehavior.STATE_EXPANDED) {
val drawable = AnimatedVectorDrawableCompat.create(
requireContext(),
R.drawable.animated_handle_to_caret
)
binding.bottomBar.mainActions.handle.setImageDrawable(drawable)
binding.bottomBar.mainActions.handle.startAnimatedDrawable()
actionsBottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
}
}

2
app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
View file

@ -151,8 +151,6 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
// Extras actions
val extraActionsBottomSheetVisible = MutableLiveData<Boolean>()
val toggleExtraActionsBottomSheetEvent: MutableLiveData<Event<Boolean>> by lazy {
MutableLiveData<Event<Boolean>>()
}

29
app/src/main/res/drawable/animated_caret_to_handle.xml Normal file
View file

@ -0,0 +1,29 @@
<animated-vector
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt">
<aapt:attr name="android:drawable">
<vector
android:name="vector"
android:width="38dp"
android:height="9dp"
android:viewportWidth="38"
android:viewportHeight="9">
<path
android:name="path"
android:pathData="M 0 6.907 C 0 6 1 5 2 5 L 19 0 L 36 5 C 37 5 38 6 38 6.907 C 38 7.944 37 9 36 9 L 19 4 L 2 9 C 1 9 0 7.944 0 6.907 Z"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
</vector>
</aapt:attr>
<target android:name="path">
<aapt:attr name="android:animation">
<objectAnimator
android:propertyName="pathData"
android:duration="500"
android:valueFrom="M 0 6.907 C 0 6 1 5 2 5 L 19 0 L 36 5 C 37 5 38 6 38 6.907 C 38 7.944 37 9 36 9 L 19 4 L 2 9 C 1 9 0 7.944 0 6.907 Z"
android:valueTo="M 0 6.907 C 0 6 1 5 2 5 L 19 5 L 36 5 C 37 5 38 6 38 6.907 C 38 7.944 37 9 36 9 L 19 9 L 2 9 C 1 9 0 7.944 0 6.907 Z"
android:valueType="pathType"
android:interpolator="@android:interpolator/fast_out_slow_in"/>
</aapt:attr>
</target>
</animated-vector>

29
app/src/main/res/drawable/animated_handle_to_caret.xml Normal file
View file

@ -0,0 +1,29 @@
<animated-vector
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt">
<aapt:attr name="android:drawable">
<vector
android:name="vector"
android:width="38dp"
android:height="9dp"
android:viewportWidth="38"
android:viewportHeight="9">
<path
android:name="path"
android:pathData="M 0 6.907 C 0 6 1 5 2 5 L 19 5 L 36 5 C 37 5 38 6 38 6.907 C 38 7.944 37 9 36 9 L 19 9 L 2 9 C 1 9 0 7.944 0 6.907 Z"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
</vector>
</aapt:attr>
<target android:name="path">
<aapt:attr name="android:animation">
<objectAnimator
android:propertyName="pathData"
android:duration="500"
android:valueFrom="M 0 6.907 C 0 6 1 5 2 5 L 19 5 L 36 5 C 37 5 38 6 38 6.907 C 38 7.944 37 9 36 9 L 19 9 L 2 9 C 1 9 0 7.944 0 6.907 Z"
android:valueTo="M 0 6.907 C 0 6 1 5 2 5 L 19 0 L 36 5 C 37 5 38 6 38 6.907 C 38 7.944 37 9 36 9 L 19 4 L 2 9 C 1 9 0 7.944 0 6.907 Z"
android:valueType="pathType"
android:interpolator="@android:interpolator/fast_out_slow_in"/>
</aapt:attr>
</target>
</animated-vector>

6
app/src/main/res/layout/call_actions_generic.xml
View file

@ -15,13 +15,13 @@
android:paddingBottom="5dp"
android:background="@drawable/shape_call_bottom_sheet_background">
<com.google.android.material.bottomsheet.BottomSheetDragHandleView
<ImageView
android:onClick="@{() -> viewModel.toggleExpandActionsMenu()}"
android:id="@+id/toggle_expand"
android:id="@+id/handle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="11dp"
android:src="@{viewModel.extraActionsBottomSheetVisible ? @drawable/caret_down : @drawable/handle, default=@drawable/handle}"
android:src="@drawable/animated_caret_to_handle"
app:tint="@color/white"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"