From e888f2b15a42c2563450cd102740153b0fd67acf Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 29 Jun 2021 11:09:18 +0200 Subject: [PATCH 01/40] Call controls: move choose sound device out of overflow menu --- .../features/call/CallControlsBottomSheet.kt | 66 ----------------- .../app/features/call/CallControlsView.kt | 12 +-- .../call/CallSoundDeviceChooserBottomSheet.kt | 74 +++++++++++++++++++ .../app/features/call/VectorCallActivity.kt | 9 ++- .../features/call/audio/CallAudioManager.kt | 13 ++-- .../res/drawable/ic_call_audio_settings.xml | 15 ++++ .../res/drawable/ic_call_speaker_active.xml | 11 --- .../res/drawable/ic_call_speaker_default.xml | 7 -- .../drawable/ic_sound_device_headphone.xml | 9 +++ .../res/drawable/ic_sound_device_phone.xml | 9 +++ .../res/drawable/ic_sound_device_speaker.xml | 15 ++++ .../res/layout/bottom_sheet_call_controls.xml | 10 --- ...bottom_sheet_call_sound_device_chooser.xml | 60 +++++++++++++++ .../res/layout/bottom_sheet_generic_list.xml | 2 +- .../main/res/layout/view_call_controls.xml | 49 ++++++------ 15 files changed, 233 insertions(+), 128 deletions(-) create mode 100644 vector/src/main/java/im/vector/app/features/call/CallSoundDeviceChooserBottomSheet.kt create mode 100644 vector/src/main/res/drawable/ic_call_audio_settings.xml delete mode 100644 vector/src/main/res/drawable/ic_call_speaker_active.xml delete mode 100644 vector/src/main/res/drawable/ic_call_speaker_default.xml create mode 100644 vector/src/main/res/drawable/ic_sound_device_headphone.xml create mode 100644 vector/src/main/res/drawable/ic_sound_device_phone.xml create mode 100644 vector/src/main/res/drawable/ic_sound_device_speaker.xml create mode 100644 vector/src/main/res/layout/bottom_sheet_call_sound_device_chooser.xml diff --git a/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt index f23b26883a..a3e3a5d71d 100644 --- a/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt @@ -45,10 +45,6 @@ class CallControlsBottomSheet : VectorBaseBottomSheetDialogFragment { - showSoundDeviceChooser(it.available, it.current) - } - else -> { - } - } - } - } - - private fun showSoundDeviceChooser(available: Set, current: CallAudioManager.Device) { - val soundDevices = available.map { - when (it) { - CallAudioManager.Device.WIRELESS_HEADSET -> span { - text = getString(R.string.sound_device_wireless_headset) - textStyle = if (current == it) "bold" else "normal" - } - CallAudioManager.Device.PHONE -> span { - text = getString(R.string.sound_device_phone) - textStyle = if (current == it) "bold" else "normal" - } - CallAudioManager.Device.SPEAKER -> span { - text = getString(R.string.sound_device_speaker) - textStyle = if (current == it) "bold" else "normal" - } - CallAudioManager.Device.HEADSET -> span { - text = getString(R.string.sound_device_headset) - textStyle = if (current == it) "bold" else "normal" - } - } - } - MaterialAlertDialogBuilder(requireContext()) - .setItems(soundDevices.toTypedArray()) { d, n -> - d.cancel() - when (soundDevices[n].toString()) { - // TODO Make an adapter and handle multiple Bluetooth headsets. Also do not use translations. - getString(R.string.sound_device_phone) -> { - callViewModel.handle(VectorCallViewActions.ChangeAudioDevice(CallAudioManager.Device.PHONE)) - } - getString(R.string.sound_device_speaker) -> { - callViewModel.handle(VectorCallViewActions.ChangeAudioDevice(CallAudioManager.Device.SPEAKER)) - } - getString(R.string.sound_device_headset) -> { - callViewModel.handle(VectorCallViewActions.ChangeAudioDevice(CallAudioManager.Device.HEADSET)) - } - getString(R.string.sound_device_wireless_headset) -> { - callViewModel.handle(VectorCallViewActions.ChangeAudioDevice(CallAudioManager.Device.WIRELESS_HEADSET)) - } - } - } - .setNegativeButton(R.string.cancel, null) - .show() } private fun renderState(state: VectorCallViewState) { - views.callControlsSoundDevice.title = getString(R.string.call_select_sound_device) - views.callControlsSoundDevice.subTitle = when (state.device) { - CallAudioManager.Device.PHONE -> getString(R.string.sound_device_phone) - CallAudioManager.Device.SPEAKER -> getString(R.string.sound_device_speaker) - CallAudioManager.Device.HEADSET -> getString(R.string.sound_device_headset) - CallAudioManager.Device.WIRELESS_HEADSET -> getString(R.string.sound_device_wireless_headset) - } - views.callControlsSwitchCamera.isVisible = state.isVideoCall && state.canSwitchCamera views.callControlsSwitchCamera.subTitle = getString(if (state.isFrontCamera) R.string.call_camera_front else R.string.call_camera_back) diff --git a/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt b/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt index 1a54551072..2f771b3a8d 100644 --- a/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt +++ b/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt @@ -36,16 +36,19 @@ class CallControlsView @JvmOverloads constructor( init { inflate(context, R.layout.view_call_controls, this) views = ViewCallControlsBinding.bind(this) - + views.audioSettingsIcon.setOnClickListener { didTapAudioSettings() } views.ringingControlAccept.setOnClickListener { acceptIncomingCall() } views.ringingControlDecline.setOnClickListener { declineIncomingCall() } views.endCallIcon.setOnClickListener { endOngoingCall() } views.muteIcon.setOnClickListener { toggleMute() } views.videoToggleIcon.setOnClickListener { toggleVideo() } - views.openChatIcon.setOnClickListener { returnToChat() } views.moreIcon.setOnClickListener { moreControlOption() } } + private fun didTapAudioSettings() { + interactionListener?.didTapAudioSettings() + } + private fun acceptIncomingCall() { interactionListener?.didAcceptIncomingCall() } @@ -66,9 +69,6 @@ class CallControlsView @JvmOverloads constructor( interactionListener?.didTapToggleVideo() } - private fun returnToChat() { - interactionListener?.returnToChat() - } private fun moreControlOption() { interactionListener?.didTapMore() @@ -127,12 +127,12 @@ class CallControlsView @JvmOverloads constructor( } interface InteractionListener { + fun didTapAudioSettings() fun didAcceptIncomingCall() fun didDeclineIncomingCall() fun didEndCall() fun didTapToggleMute() fun didTapToggleVideo() - fun returnToChat() fun didTapMore() } } diff --git a/vector/src/main/java/im/vector/app/features/call/CallSoundDeviceChooserBottomSheet.kt b/vector/src/main/java/im/vector/app/features/call/CallSoundDeviceChooserBottomSheet.kt new file mode 100644 index 0000000000..a011952549 --- /dev/null +++ b/vector/src/main/java/im/vector/app/features/call/CallSoundDeviceChooserBottomSheet.kt @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2020 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package im.vector.app.features.call + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.airbnb.mvrx.activityViewModel +import im.vector.app.R +import im.vector.app.core.epoxy.bottomsheet.bottomSheetActionItem +import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment +import im.vector.app.databinding.BottomSheetGenericListBinding +import im.vector.app.features.call.audio.CallAudioManager +import im.vector.app.features.home.room.list.actions.RoomListQuickActionsBottomSheet + +class CallSoundDeviceChooserBottomSheet : VectorBaseBottomSheetDialogFragment() { + override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetGenericListBinding { + return BottomSheetGenericListBinding.inflate(inflater, container, false) + } + + private val callViewModel: VectorCallViewModel by activityViewModel() + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + callViewModel.observeViewEvents { + when (it) { + is VectorCallViewEvents.ShowSoundDeviceChooser -> { + render(it.available, it.current) + } + else -> { + } + } + } + callViewModel.handle(VectorCallViewActions.SwitchSoundDevice) + } + + private fun render(available: Set, current: CallAudioManager.Device) { + views.bottomSheetRecyclerView.withModels { + available.forEach { device -> + bottomSheetActionItem { + id(device.ordinal) + textRes(device.titleRes) + iconRes(device.drawableRes) + selected(current == device) + listener { + callViewModel.handle(VectorCallViewActions.ChangeAudioDevice(device)) + dismiss() + } + } + } + } + } + + companion object { + fun newInstance(): RoomListQuickActionsBottomSheet { + return RoomListQuickActionsBottomSheet() + } + } +} diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt index 21939bd42b..b933e1e69d 100644 --- a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt +++ b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt @@ -26,6 +26,7 @@ import android.os.Bundle import android.os.Parcelable import android.view.View import android.view.WindowManager +import androidx.core.content.ContentProviderCompat.requireContext import androidx.core.content.ContextCompat import androidx.core.content.getSystemService import androidx.core.view.isInvisible @@ -43,6 +44,7 @@ import im.vector.app.core.utils.PERMISSIONS_FOR_VIDEO_IP_CALL import im.vector.app.core.utils.allGranted import im.vector.app.core.utils.checkPermissions import im.vector.app.databinding.ActivityCallBinding +import im.vector.app.features.call.audio.CallAudioManager import im.vector.app.features.call.dialpad.CallDialPadBottomSheet import im.vector.app.features.call.dialpad.DialPadFragment import im.vector.app.features.call.utils.EglUtils @@ -53,6 +55,7 @@ import im.vector.app.features.home.room.detail.RoomDetailActivity import im.vector.app.features.home.room.detail.RoomDetailArgs import io.reactivex.android.schedulers.AndroidSchedulers import kotlinx.parcelize.Parcelize +import me.gujun.android.span.span import org.matrix.android.sdk.api.extensions.orFalse import org.matrix.android.sdk.api.session.call.CallState import org.matrix.android.sdk.api.session.call.MxPeerConnectionState @@ -404,6 +407,10 @@ class VectorCallActivity : VectorBaseActivity(), CallContro } } + override fun didTapAudioSettings() { + CallSoundDeviceChooserBottomSheet().show(supportFragmentManager, "SoundDeviceChooser") + } + override fun didAcceptIncomingCall() { callViewModel.handle(VectorCallViewActions.AcceptCall) } @@ -424,7 +431,7 @@ class VectorCallActivity : VectorBaseActivity(), CallContro callViewModel.handle(VectorCallViewActions.ToggleVideo) } - override fun returnToChat() { + private fun returnToChat() { val args = RoomDetailArgs(callArgs.signalingRoomId) val intent = RoomDetailActivity.newIntent(this, args).apply { flags = FLAG_ACTIVITY_CLEAR_TOP diff --git a/vector/src/main/java/im/vector/app/features/call/audio/CallAudioManager.kt b/vector/src/main/java/im/vector/app/features/call/audio/CallAudioManager.kt index 36a11b5923..7797cec929 100644 --- a/vector/src/main/java/im/vector/app/features/call/audio/CallAudioManager.kt +++ b/vector/src/main/java/im/vector/app/features/call/audio/CallAudioManager.kt @@ -19,7 +19,10 @@ package im.vector.app.features.call.audio import android.content.Context import android.media.AudioManager import android.os.Build +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes import androidx.core.content.getSystemService +import im.vector.app.R import org.matrix.android.sdk.api.extensions.orFalse import timber.log.Timber import java.util.HashSet @@ -31,11 +34,11 @@ class CallAudioManager(private val context: Context, val configChange: (() -> Un private var audioDeviceDetector: AudioDeviceDetector? = null private var audioDeviceRouter: AudioDeviceRouter? = null - enum class Device { - PHONE, - SPEAKER, - HEADSET, - WIRELESS_HEADSET + enum class Device(@StringRes val titleRes: Int, @DrawableRes val drawableRes: Int) { + PHONE(R.string.sound_device_phone,R.drawable.ic_sound_device_phone), + SPEAKER(R.string.sound_device_speaker,R.drawable.ic_sound_device_speaker), + HEADSET(R.string.sound_device_headset,R.drawable.ic_sound_device_headphone), + WIRELESS_HEADSET(R.string.sound_device_wireless_headset,R.drawable.ic_sound_device_headphone) } enum class Mode { diff --git a/vector/src/main/res/drawable/ic_call_audio_settings.xml b/vector/src/main/res/drawable/ic_call_audio_settings.xml new file mode 100644 index 0000000000..8a47d27d9a --- /dev/null +++ b/vector/src/main/res/drawable/ic_call_audio_settings.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/vector/src/main/res/drawable/ic_call_speaker_active.xml b/vector/src/main/res/drawable/ic_call_speaker_active.xml deleted file mode 100644 index 97035b1915..0000000000 --- a/vector/src/main/res/drawable/ic_call_speaker_active.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/vector/src/main/res/drawable/ic_call_speaker_default.xml b/vector/src/main/res/drawable/ic_call_speaker_default.xml deleted file mode 100644 index 2fc06a5795..0000000000 --- a/vector/src/main/res/drawable/ic_call_speaker_default.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/vector/src/main/res/drawable/ic_sound_device_headphone.xml b/vector/src/main/res/drawable/ic_sound_device_headphone.xml new file mode 100644 index 0000000000..4648465356 --- /dev/null +++ b/vector/src/main/res/drawable/ic_sound_device_headphone.xml @@ -0,0 +1,9 @@ + + + diff --git a/vector/src/main/res/drawable/ic_sound_device_phone.xml b/vector/src/main/res/drawable/ic_sound_device_phone.xml new file mode 100644 index 0000000000..fd825c77f0 --- /dev/null +++ b/vector/src/main/res/drawable/ic_sound_device_phone.xml @@ -0,0 +1,9 @@ + + + diff --git a/vector/src/main/res/drawable/ic_sound_device_speaker.xml b/vector/src/main/res/drawable/ic_sound_device_speaker.xml new file mode 100644 index 0000000000..eb786d3fe1 --- /dev/null +++ b/vector/src/main/res/drawable/ic_sound_device_speaker.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/vector/src/main/res/layout/bottom_sheet_call_controls.xml b/vector/src/main/res/layout/bottom_sheet_call_controls.xml index bb4a91ea72..e751ac412a 100644 --- a/vector/src/main/res/layout/bottom_sheet_call_controls.xml +++ b/vector/src/main/res/layout/bottom_sheet_call_controls.xml @@ -7,16 +7,6 @@ android:background="?colorSurface" android:orientation="vertical"> - - + + + + + + + + + + + + + diff --git a/vector/src/main/res/layout/bottom_sheet_generic_list.xml b/vector/src/main/res/layout/bottom_sheet_generic_list.xml index 87a2cb54fc..144e291bb9 100644 --- a/vector/src/main/res/layout/bottom_sheet_generic_list.xml +++ b/vector/src/main/res/layout/bottom_sheet_generic_list.xml @@ -1,5 +1,5 @@ - + + + - - + /> From 7c033b4090228b624eb7dbea357949b807d7f1ac Mon Sep 17 00:00:00 2001 From: ganfra Date: Wed, 30 Jun 2021 18:08:44 +0200 Subject: [PATCH 02/40] Call UI: add toolbar --- .../app/features/call/VectorCallActivity.kt | 50 +++++++++-------- .../res/drawable/ic_call_back_to_chat.xml | 10 ++++ vector/src/main/res/layout/activity_call.xml | 56 +++++++++---------- .../main/res/layout/view_call_controls.xml | 18 +++--- vector/src/main/res/menu/vector_call.xml | 11 ++++ vector/src/main/res/values/strings.xml | 2 + 6 files changed, 83 insertions(+), 64 deletions(-) create mode 100644 vector/src/main/res/drawable/ic_call_back_to_chat.xml create mode 100644 vector/src/main/res/menu/vector_call.xml diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt index b933e1e69d..602a68ea74 100644 --- a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt +++ b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt @@ -24,9 +24,9 @@ import android.graphics.Color import android.os.Build import android.os.Bundle import android.os.Parcelable +import android.view.MenuItem import android.view.View import android.view.WindowManager -import androidx.core.content.ContentProviderCompat.requireContext import androidx.core.content.ContextCompat import androidx.core.content.getSystemService import androidx.core.view.isInvisible @@ -38,13 +38,13 @@ import com.airbnb.mvrx.withState import com.google.android.material.dialog.MaterialAlertDialogBuilder import im.vector.app.R import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.setTextOrHide import im.vector.app.core.platform.VectorBaseActivity import im.vector.app.core.utils.PERMISSIONS_FOR_AUDIO_IP_CALL import im.vector.app.core.utils.PERMISSIONS_FOR_VIDEO_IP_CALL import im.vector.app.core.utils.allGranted import im.vector.app.core.utils.checkPermissions import im.vector.app.databinding.ActivityCallBinding -import im.vector.app.features.call.audio.CallAudioManager import im.vector.app.features.call.dialpad.CallDialPadBottomSheet import im.vector.app.features.call.dialpad.DialPadFragment import im.vector.app.features.call.utils.EglUtils @@ -55,7 +55,6 @@ import im.vector.app.features.home.room.detail.RoomDetailActivity import im.vector.app.features.home.room.detail.RoomDetailArgs import io.reactivex.android.schedulers.AndroidSchedulers import kotlinx.parcelize.Parcelize -import me.gujun.android.span.span import org.matrix.android.sdk.api.extensions.orFalse import org.matrix.android.sdk.api.session.call.CallState import org.matrix.android.sdk.api.session.call.MxPeerConnectionState @@ -127,6 +126,7 @@ class VectorCallActivity : VectorBaseActivity(), CallContro if (savedInstanceState != null) { (supportFragmentManager.findFragmentByTag(FRAGMENT_DIAL_PAD_TAG) as? CallDialPadBottomSheet)?.callback = dialPadCallback } + setSupportActionBar(views.callToolbar) configureCallViews() callViewModel.subscribe(this) { @@ -152,6 +152,16 @@ class VectorCallActivity : VectorBaseActivity(), CallContro } } + override fun getMenuRes() = R.menu.vector_call + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + if (item.itemId == R.id.menu_call_open_chat) { + returnToChat() + return true + } + return super.onOptionsItemSelected(item) + } + override fun onDestroy() { callManager.getCallById(callArgs.callId)?.detachRenderers(listOf(views.pipRenderer, views.fullscreenRenderer)) if (surfaceRenderersAreInitialized) { @@ -171,35 +181,27 @@ class VectorCallActivity : VectorBaseActivity(), CallContro views.callControlsView.updateForState(state) val callState = state.callState.invoke() - views.callConnectingProgress.isVisible = false views.callActionText.setOnClickListener(null) views.callActionText.isVisible = false views.smallIsHeldIcon.isVisible = false when (callState) { is CallState.Idle, is CallState.CreateOffer, + is CallState.LocalRinging, is CallState.Dialing -> { views.callVideoGroup.isInvisible = true views.callInfoGroup.isVisible = true - views.callStatusText.setText(R.string.call_ring) + views.callToolbar.setSubtitle(R.string.call_ring) configureCallInfo(state) } - - is CallState.LocalRinging -> { - views.callVideoGroup.isInvisible = true - views.callInfoGroup.isVisible = true - views.callStatusText.text = null - configureCallInfo(state) - } - is CallState.Answering -> { views.callVideoGroup.isInvisible = true views.callInfoGroup.isVisible = true - views.callStatusText.setText(R.string.call_connecting) - views.callConnectingProgress.isVisible = true + views.callToolbar.setSubtitle(R.string.call_connecting) configureCallInfo(state) } is CallState.Connected -> { + views.callToolbar.subtitle = state.formattedDuration if (callState.iceConnectionState == MxPeerConnectionState.CONNECTED) { if (state.isLocalOnHold || state.isRemoteOnHold) { views.smallIsHeldIcon.isVisible = true @@ -210,11 +212,11 @@ class VectorCallActivity : VectorBaseActivity(), CallContro views.callActionText.setText(R.string.call_resume_action) views.callActionText.isVisible = true views.callActionText.setOnClickListener { callViewModel.handle(VectorCallViewActions.ToggleHoldResume) } - views.callStatusText.setText(R.string.call_held_by_you) + views.callToolbar.setSubtitle(R.string.call_held_by_you) } else { views.callActionText.isInvisible = true state.callInfo?.opponentUserItem?.let { - views.callStatusText.text = getString(R.string.call_held_by_user, it.getBestName()) + views.callToolbar.subtitle = getString(R.string.call_held_by_user, it.getBestName()) } } } else if (state.transferee !is VectorCallViewState.TransfereeState.NoTransferee) { @@ -226,10 +228,8 @@ class VectorCallActivity : VectorBaseActivity(), CallContro views.callActionText.text = getString(R.string.call_transfer_transfer_to_title, transfereeName) views.callActionText.isVisible = true views.callActionText.setOnClickListener { callViewModel.handle(VectorCallViewActions.TransferCall) } - views.callStatusText.text = state.formattedDuration configureCallInfo(state) } else { - views.callStatusText.text = state.formattedDuration configureCallInfo(state) if (callArgs.isVideoCall) { views.callVideoGroup.isVisible = true @@ -245,8 +245,7 @@ class VectorCallActivity : VectorBaseActivity(), CallContro views.callVideoGroup.isInvisible = true views.callInfoGroup.isVisible = true configureCallInfo(state) - views.callStatusText.setText(R.string.call_connecting) - views.callConnectingProgress.isVisible = true + views.callToolbar.setSubtitle(R.string.call_connecting) } } is CallState.Terminated -> { @@ -262,9 +261,14 @@ class VectorCallActivity : VectorBaseActivity(), CallContro val colorFilter = ContextCompat.getColor(this, R.color.bg_call_screen_blur) avatarRenderer.renderBlur(it, views.bgCallView, sampling = 20, rounded = false, colorFilter = colorFilter, addPlaceholder = false) if (state.transferee is VectorCallViewState.TransfereeState.NoTransferee) { - views.participantNameText.text = it.getBestName() + views.participantNameText.setTextOrHide(null) + views.callToolbar.title = if (state.isVideoCall) { + getString(R.string.video_call_with_participant, it.getBestName()) + } else { + getString(R.string.audio_call_with_participant, it.getBestName()) + } } else { - views.participantNameText.text = getString(R.string.call_transfer_consulting_with, it.getBestName()) + views.participantNameText.setTextOrHide(getString(R.string.call_transfer_consulting_with, it.getBestName())) } if (blurAvatar) { avatarRenderer.renderBlur(it, views.otherMemberAvatar, sampling = 2, rounded = true, colorFilter = colorFilter, addPlaceholder = true) diff --git a/vector/src/main/res/drawable/ic_call_back_to_chat.xml b/vector/src/main/res/drawable/ic_call_back_to_chat.xml new file mode 100644 index 0000000000..b1c532f17d --- /dev/null +++ b/vector/src/main/res/drawable/ic_call_back_to_chat.xml @@ -0,0 +1,10 @@ + + + diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml index 0df28cf16a..94794799c4 100644 --- a/vector/src/main/res/layout/activity_call.xml +++ b/vector/src/main/res/layout/activity_call.xml @@ -22,9 +22,11 @@ + + - -