diff --git a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/ChatFragmentViewModel.kt b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/ChatFragmentViewModel.kt index 0d793822..91d7e7df 100644 --- a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/ChatFragmentViewModel.kt +++ b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/ChatFragmentViewModel.kt @@ -28,6 +28,18 @@ class ChatFragmentViewModel @Inject constructor( } override fun onResume() { + observerWithInitPlayer() + repository.getPastChats() + } + + override fun onPause() { + onPauseSubject.onNext(INVOCATION) + } + + override fun onStop() { + } + + private fun observerWithInitPlayer() { repository.observePastChat .observeOn(AndroidSchedulers.mainThread()) .takeUntil(onPauseSubject.toFlowable(BackpressureStrategy.LATEST)) @@ -49,13 +61,6 @@ class ChatFragmentViewModel @Inject constructor( } } - override fun onPause() { - onPauseSubject.onNext(INVOCATION) - } - - override fun onStop() { - } - private fun convertToViewModel(chats: List): List { return chats.map { ChatViewModel(ObservableField(it)) } } diff --git a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/PlayListFragmentViewModel.kt b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/PlayListFragmentViewModel.kt index 65863c9b..7390d138 100644 --- a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/PlayListFragmentViewModel.kt +++ b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/PlayListFragmentViewModel.kt @@ -38,6 +38,20 @@ class PlayListFragmentViewModel @Inject constructor( } override fun onResume() { + observerWithInitPlayer() + repository.getPlayList() + } + + override fun onPause() { + onPauseSubject.onNext(INVOCATION) + } + + override fun onStop() { + } + + fun searchVideo() = navigator.navigateToSearchVideoActivity() + + private fun observerWithInitPlayer() { repository.playListObservable .takeUntil(onPauseSubject.toFlowable(BackpressureStrategy.LATEST)) .map { convertToViewModel(it) } @@ -66,15 +80,6 @@ class PlayListFragmentViewModel @Inject constructor( } } - override fun onPause() { - onPauseSubject.onNext(INVOCATION) - } - - override fun onStop() { - } - - fun searchVideo() = navigator.navigateToSearchVideoActivity() - private fun convertToViewModel(videos: List