Fix merge conflicts
This commit is contained in:
parent
751afbdd7b
commit
bdfc96ff66
|
@ -91,8 +91,8 @@ import im.vector.app.features.poll.PollMode
|
||||||
import im.vector.app.features.settings.VectorPreferences
|
import im.vector.app.features.settings.VectorPreferences
|
||||||
import im.vector.app.features.share.SharedData
|
import im.vector.app.features.share.SharedData
|
||||||
import im.vector.app.features.voice.VoiceFailure
|
import im.vector.app.features.voice.VoiceFailure
|
||||||
import kotlinx.coroutines.flow.debounce
|
|
||||||
import kotlinx.coroutines.flow.distinctUntilChanged
|
import kotlinx.coroutines.flow.distinctUntilChanged
|
||||||
|
import kotlinx.coroutines.flow.debounce
|
||||||
import kotlinx.coroutines.flow.launchIn
|
import kotlinx.coroutines.flow.launchIn
|
||||||
import kotlinx.coroutines.flow.map
|
import kotlinx.coroutines.flow.map
|
||||||
import kotlinx.coroutines.flow.onEach
|
import kotlinx.coroutines.flow.onEach
|
||||||
|
@ -207,6 +207,13 @@ class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), A
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
messageComposerViewModel.stateFlow.map { it.isFullScreen }
|
||||||
|
.distinctUntilChanged()
|
||||||
|
.onEach { isFullScreen ->
|
||||||
|
composer.toggleFullScreen(isFullScreen)
|
||||||
|
}
|
||||||
|
.launchIn(viewLifecycleOwner.lifecycleScope)
|
||||||
|
|
||||||
messageComposerViewModel.onEach(MessageComposerViewState::sendMode, MessageComposerViewState::canSendMessage) { mode, canSend ->
|
messageComposerViewModel.onEach(MessageComposerViewState::sendMode, MessageComposerViewState::canSendMessage) { mode, canSend ->
|
||||||
if (!canSend.boolean()) {
|
if (!canSend.boolean()) {
|
||||||
return@onEach
|
return@onEach
|
||||||
|
@ -220,13 +227,6 @@ class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), A
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
messageComposerViewModel.stateFlow.map { it.isFullScreen }
|
|
||||||
.distinctUntilChanged()
|
|
||||||
.onEach { isFullScreen ->
|
|
||||||
composer.toggleFullScreen(isFullScreen)
|
|
||||||
}
|
|
||||||
.launchIn(viewLifecycleOwner.lifecycleScope)
|
|
||||||
|
|
||||||
if (savedInstanceState != null) {
|
if (savedInstanceState != null) {
|
||||||
handleShareData()
|
handleShareData()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue