mirror of
https://github.com/element-hq/element-android
synced 2024-10-24 19:57:03 +03:00
Split into 4 files
This commit is contained in:
parent
236f7f8e28
commit
ba163dbf5c
4 changed files with 104 additions and 46 deletions
|
@ -0,0 +1,32 @@
|
||||||
|
/*
|
||||||
|
* 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 im.vector.app.core.platform.VectorViewModelAction
|
||||||
|
|
||||||
|
sealed class VectorCallViewActions : VectorViewModelAction {
|
||||||
|
object EndCall : VectorCallViewActions()
|
||||||
|
object AcceptCall : VectorCallViewActions()
|
||||||
|
object DeclineCall : VectorCallViewActions()
|
||||||
|
object ToggleMute : VectorCallViewActions()
|
||||||
|
object ToggleVideo : VectorCallViewActions()
|
||||||
|
data class ChangeAudioDevice(val device: CallAudioManager.SoundDevice) : VectorCallViewActions()
|
||||||
|
object SwitchSoundDevice : VectorCallViewActions()
|
||||||
|
object HeadSetButtonPressed : VectorCallViewActions()
|
||||||
|
object ToggleCamera : VectorCallViewActions()
|
||||||
|
object ToggleHDSD : VectorCallViewActions()
|
||||||
|
}
|
|
@ -0,0 +1,33 @@
|
||||||
|
/*
|
||||||
|
* 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 im.vector.app.core.platform.VectorViewEvents
|
||||||
|
import org.matrix.android.sdk.api.session.call.TurnServerResponse
|
||||||
|
|
||||||
|
sealed class VectorCallViewEvents : VectorViewEvents {
|
||||||
|
|
||||||
|
object DismissNoCall : VectorCallViewEvents()
|
||||||
|
data class ConnectionTimeout(val turn: TurnServerResponse?) : VectorCallViewEvents()
|
||||||
|
data class ShowSoundDeviceChooser(
|
||||||
|
val available: List<CallAudioManager.SoundDevice>,
|
||||||
|
val current: CallAudioManager.SoundDevice
|
||||||
|
) : VectorCallViewEvents()
|
||||||
|
// data class CallAnswered(val content: CallAnswerContent) : VectorCallViewEvents()
|
||||||
|
// data class CallHangup(val content: CallHangupContent) : VectorCallViewEvents()
|
||||||
|
// object CallAccepted : VectorCallViewEvents()
|
||||||
|
}
|
|
@ -16,10 +16,8 @@
|
||||||
|
|
||||||
package im.vector.app.features.call
|
package im.vector.app.features.call
|
||||||
|
|
||||||
import com.airbnb.mvrx.Async
|
|
||||||
import com.airbnb.mvrx.Fail
|
import com.airbnb.mvrx.Fail
|
||||||
import com.airbnb.mvrx.Loading
|
import com.airbnb.mvrx.Loading
|
||||||
import com.airbnb.mvrx.MvRxState
|
|
||||||
import com.airbnb.mvrx.MvRxViewModelFactory
|
import com.airbnb.mvrx.MvRxViewModelFactory
|
||||||
import com.airbnb.mvrx.Success
|
import com.airbnb.mvrx.Success
|
||||||
import com.airbnb.mvrx.Uninitialized
|
import com.airbnb.mvrx.Uninitialized
|
||||||
|
@ -27,9 +25,7 @@ import com.airbnb.mvrx.ViewModelContext
|
||||||
import com.squareup.inject.assisted.Assisted
|
import com.squareup.inject.assisted.Assisted
|
||||||
import com.squareup.inject.assisted.AssistedInject
|
import com.squareup.inject.assisted.AssistedInject
|
||||||
import im.vector.app.core.extensions.exhaustive
|
import im.vector.app.core.extensions.exhaustive
|
||||||
import im.vector.app.core.platform.VectorViewEvents
|
|
||||||
import im.vector.app.core.platform.VectorViewModel
|
import im.vector.app.core.platform.VectorViewModel
|
||||||
import im.vector.app.core.platform.VectorViewModelAction
|
|
||||||
import org.matrix.android.sdk.api.MatrixCallback
|
import org.matrix.android.sdk.api.MatrixCallback
|
||||||
import org.matrix.android.sdk.api.session.Session
|
import org.matrix.android.sdk.api.session.Session
|
||||||
import org.matrix.android.sdk.api.session.call.CallState
|
import org.matrix.android.sdk.api.session.call.CallState
|
||||||
|
@ -41,48 +37,6 @@ import org.webrtc.PeerConnection
|
||||||
import java.util.Timer
|
import java.util.Timer
|
||||||
import java.util.TimerTask
|
import java.util.TimerTask
|
||||||
|
|
||||||
data class VectorCallViewState(
|
|
||||||
val callId: String? = null,
|
|
||||||
val roomId: String = "",
|
|
||||||
val isVideoCall: Boolean,
|
|
||||||
val isAudioMuted: Boolean = false,
|
|
||||||
val isVideoEnabled: Boolean = true,
|
|
||||||
val isVideoCaptureInError: Boolean = false,
|
|
||||||
val isHD: Boolean = false,
|
|
||||||
val isFrontCamera: Boolean = true,
|
|
||||||
val canSwitchCamera: Boolean = true,
|
|
||||||
val soundDevice: CallAudioManager.SoundDevice = CallAudioManager.SoundDevice.PHONE,
|
|
||||||
val availableSoundDevices: List<CallAudioManager.SoundDevice> = emptyList(),
|
|
||||||
val otherUserMatrixItem: Async<MatrixItem> = Uninitialized,
|
|
||||||
val callState: Async<CallState> = Uninitialized
|
|
||||||
) : MvRxState
|
|
||||||
|
|
||||||
sealed class VectorCallViewActions : VectorViewModelAction {
|
|
||||||
object EndCall : VectorCallViewActions()
|
|
||||||
object AcceptCall : VectorCallViewActions()
|
|
||||||
object DeclineCall : VectorCallViewActions()
|
|
||||||
object ToggleMute : VectorCallViewActions()
|
|
||||||
object ToggleVideo : VectorCallViewActions()
|
|
||||||
data class ChangeAudioDevice(val device: CallAudioManager.SoundDevice) : VectorCallViewActions()
|
|
||||||
object SwitchSoundDevice : VectorCallViewActions()
|
|
||||||
object HeadSetButtonPressed : VectorCallViewActions()
|
|
||||||
object ToggleCamera : VectorCallViewActions()
|
|
||||||
object ToggleHDSD : VectorCallViewActions()
|
|
||||||
}
|
|
||||||
|
|
||||||
sealed class VectorCallViewEvents : VectorViewEvents {
|
|
||||||
|
|
||||||
object DismissNoCall : VectorCallViewEvents()
|
|
||||||
data class ConnectionTimeout(val turn: TurnServerResponse?) : VectorCallViewEvents()
|
|
||||||
data class ShowSoundDeviceChooser(
|
|
||||||
val available: List<CallAudioManager.SoundDevice>,
|
|
||||||
val current: CallAudioManager.SoundDevice
|
|
||||||
) : VectorCallViewEvents()
|
|
||||||
// data class CallAnswered(val content: CallAnswerContent) : VectorCallViewEvents()
|
|
||||||
// data class CallHangup(val content: CallHangupContent) : VectorCallViewEvents()
|
|
||||||
// object CallAccepted : VectorCallViewEvents()
|
|
||||||
}
|
|
||||||
|
|
||||||
class VectorCallViewModel @AssistedInject constructor(
|
class VectorCallViewModel @AssistedInject constructor(
|
||||||
@Assisted initialState: VectorCallViewState,
|
@Assisted initialState: VectorCallViewState,
|
||||||
@Assisted val args: CallArgs,
|
@Assisted val args: CallArgs,
|
||||||
|
|
|
@ -0,0 +1,39 @@
|
||||||
|
/*
|
||||||
|
* 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 com.airbnb.mvrx.Async
|
||||||
|
import com.airbnb.mvrx.MvRxState
|
||||||
|
import com.airbnb.mvrx.Uninitialized
|
||||||
|
import org.matrix.android.sdk.api.session.call.CallState
|
||||||
|
import org.matrix.android.sdk.api.util.MatrixItem
|
||||||
|
|
||||||
|
data class VectorCallViewState(
|
||||||
|
val callId: String? = null,
|
||||||
|
val roomId: String = "",
|
||||||
|
val isVideoCall: Boolean,
|
||||||
|
val isAudioMuted: Boolean = false,
|
||||||
|
val isVideoEnabled: Boolean = true,
|
||||||
|
val isVideoCaptureInError: Boolean = false,
|
||||||
|
val isHD: Boolean = false,
|
||||||
|
val isFrontCamera: Boolean = true,
|
||||||
|
val canSwitchCamera: Boolean = true,
|
||||||
|
val soundDevice: CallAudioManager.SoundDevice = CallAudioManager.SoundDevice.PHONE,
|
||||||
|
val availableSoundDevices: List<CallAudioManager.SoundDevice> = emptyList(),
|
||||||
|
val otherUserMatrixItem: Async<MatrixItem> = Uninitialized,
|
||||||
|
val callState: Async<CallState> = Uninitialized
|
||||||
|
) : MvRxState
|
Loading…
Reference in a new issue