diff --git a/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt index d4f85304a..f2f5fe9a6 100644 --- a/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt +++ b/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt @@ -261,22 +261,6 @@ class ActiveCallFragment : GenericCallFragment() { } } } - - actionsBottomSheetBehavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() { - override fun onStateChanged(bottomSheet: View, newState: Int) { - when (newState) { - BottomSheetBehavior.STATE_COLLAPSED, BottomSheetBehavior.STATE_HIDDEN -> { - callViewModel.isActionsMenuExpanded.value = false - } - BottomSheetBehavior.STATE_EXPANDED -> { - callViewModel.isActionsMenuExpanded.value = true - } - else -> {} - } - } - - override fun onSlide(bottomSheet: View, slideOffset: Float) {} - }) } @SuppressLint("ClickableViewAccessibility") diff --git a/app/src/main/java/org/linphone/ui/call/fragment/ActiveConferenceCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/ActiveConferenceCallFragment.kt index b096c1ebe..892307fb1 100644 --- a/app/src/main/java/org/linphone/ui/call/fragment/ActiveConferenceCallFragment.kt +++ b/app/src/main/java/org/linphone/ui/call/fragment/ActiveConferenceCallFragment.kt @@ -98,22 +98,6 @@ class ActiveConferenceCallFragment : GenericCallFragment() { sharedViewModel.toggleFullScreenEvent.value = Event(hide) } - actionsBottomSheetBehavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() { - override fun onStateChanged(bottomSheet: View, newState: Int) { - when (newState) { - BottomSheetBehavior.STATE_COLLAPSED, BottomSheetBehavior.STATE_HIDDEN -> { - callViewModel.isActionsMenuExpanded.value = false - } - BottomSheetBehavior.STATE_EXPANDED -> { - callViewModel.isActionsMenuExpanded.value = true - } - else -> {} - } - } - - override fun onSlide(bottomSheet: View, slideOffset: Float) {} - }) - binding.setCallsListClickListener { Log.i("$TAG Going to calls list fragment") val action = ActiveConferenceCallFragmentDirections.actionActiveConferenceCallFragmentToCallsListFragment() diff --git a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt index 75bb18931..9c73a7fe3 100644 --- a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt +++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt @@ -140,8 +140,6 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() { // Extras actions - val isActionsMenuExpanded = MutableLiveData() - val toggleExtraActionsBottomSheetEvent: MutableLiveData> by lazy { MutableLiveData>() } @@ -377,7 +375,6 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() { isVideoEnabled.value = false isMicrophoneMuted.value = false fullScreenMode.value = false - isActionsMenuExpanded.value = false coreContext.postOnCoreThread { core -> core.addListener(coreListener) diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt index aa246e42c..fa061b912 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt @@ -483,6 +483,26 @@ class ConversationViewModel @UiThread constructor() : ViewModel() { } } + @UiThread + fun startVoiceMessageRecording() { + } + + @UiThread + fun stopVoiceMessageRecording() { + } + + @UiThread + fun cancelVoiceMessageRecording() { + } + + @UiThread + fun playVoiceMessageRecording() { + } + + @UiThread + fun pauseVoiceMessageRecording() { + } + @WorkerThread private fun configureChatRoom() { scrollingPosition = SCROLLING_POSITION_NOT_SET diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt index fa5f91a2f..6b58ece1f 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt @@ -207,13 +207,14 @@ class MainViewModel @UiThread constructor() : ViewModel() { } callsStatus.postValue(LinphoneUtils.callStateToString(currentCall.state)) } + + Log.i("$TAG At least a call, asking fragment to change status bar color") + changeSystemTopBarColorEvent.postValue(Event(IN_CALL)) } else { callLabel.postValue( AppUtils.getFormattedString(R.string.calls_count_label, core.callsNb) ) callsStatus.postValue("") // TODO: improve ? } - Log.i("$TAG At least a call, asking fragment to change status bar color") - changeSystemTopBarColorEvent.postValue(Event(IN_CALL)) } } diff --git a/app/src/main/res/drawable/shape_numpad_call_background.xml b/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml similarity index 100% rename from app/src/main/res/drawable/shape_numpad_call_background.xml rename to app/src/main/res/drawable/shape_call_bottom_sheet_background.xml diff --git a/app/src/main/res/layout-land/call_extra_actions.xml b/app/src/main/res/layout-land/call_actions_bottom_sheet.xml similarity index 98% rename from app/src/main/res/layout-land/call_extra_actions.xml rename to app/src/main/res/layout-land/call_actions_bottom_sheet.xml index 461bf50e3..1ec726828 100644 --- a/app/src/main/res/layout-land/call_extra_actions.xml +++ b/app/src/main/res/layout-land/call_actions_bottom_sheet.xml @@ -25,14 +25,14 @@ diff --git a/app/src/main/res/layout/call_main_actions.xml b/app/src/main/res/layout/call_common_actions.xml similarity index 94% rename from app/src/main/res/layout/call_main_actions.xml rename to app/src/main/res/layout/call_common_actions.xml index 91de13d52..e6deafddc 100644 --- a/app/src/main/res/layout/call_main_actions.xml +++ b/app/src/main/res/layout/call_common_actions.xml @@ -16,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/call_main_actions_menu_height" android:paddingBottom="5dp" - android:background="@color/gray_900"> + android:background="@drawable/shape_call_bottom_sheet_background"> + app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/call_numpad.xml b/app/src/main/res/layout/call_numpad_bottom_sheet.xml similarity index 98% rename from app/src/main/res/layout/call_numpad.xml rename to app/src/main/res/layout/call_numpad_bottom_sheet.xml index df8fdd9e0..3b06f4eae 100644 --- a/app/src/main/res/layout/call_numpad.xml +++ b/app/src/main/res/layout/call_numpad_bottom_sheet.xml @@ -15,7 +15,7 @@ diff --git a/app/src/main/res/layout/call_outgoing_fragment.xml b/app/src/main/res/layout/call_outgoing_fragment.xml index acf79d83a..42e97fd2c 100644 --- a/app/src/main/res/layout/call_outgoing_fragment.xml +++ b/app/src/main/res/layout/call_outgoing_fragment.xml @@ -148,7 +148,7 @@ bind:viewModel="@{viewModel}" bind:showExpandToggle="@{false}" android:id="@+id/bottom_bar" - layout="@layout/call_main_actions" + layout="@layout/call_common_actions" android:layout_width="0dp" android:layout_height="@dimen/call_main_actions_menu_height" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml index d9b7dc2b4..118c61e4e 100644 --- a/app/src/main/res/layout/chat_conversation_fragment.xml +++ b/app/src/main/res/layout/chat_conversation_fragment.xml @@ -233,7 +233,7 @@ openFilePickerClickListener="@{openFilePickerClickListener}" viewModel="@{viewModel}" android:visibility="@{viewModel.isReadOnly ? View.GONE : View.VISIBLE}" - layout="@layout/chat_conversation_send_area"/> + layout="@layout/chat_conversation_send_area_bottom_sheet"/> + + \ No newline at end of file diff --git a/app/src/main/res/layout/start_call_fragment.xml b/app/src/main/res/layout/start_call_fragment.xml index cf5d10015..eb18c485e 100644 --- a/app/src/main/res/layout/start_call_fragment.xml +++ b/app/src/main/res/layout/start_call_fragment.xml @@ -204,7 +204,7 @@ android:id="@+id/numpad_layout" bind:handleClickedListener="@{hideNumpadClickListener}" bind:model="@{viewModel.numpadModel}" - layout="@layout/start_call_numpad" /> + layout="@layout/start_call_numpad_bottom_sheet" /> diff --git a/app/src/main/res/layout/start_call_numpad.xml b/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml similarity index 100% rename from app/src/main/res/layout/start_call_numpad.xml rename to app/src/main/res/layout/start_call_numpad_bottom_sheet.xml