Commit 4d30e05d authored by Filipe de Lima Brito's avatar Filipe de Lima Brito

Required change: Changes MemberViewModel to MemberUiModel

parent 9c7febef
...@@ -2,7 +2,7 @@ package chat.rocket.android.createchannel.presentation ...@@ -2,7 +2,7 @@ package chat.rocket.android.createchannel.presentation
import chat.rocket.android.core.behaviours.LoadingView import chat.rocket.android.core.behaviours.LoadingView
import chat.rocket.android.core.behaviours.MessageView import chat.rocket.android.core.behaviours.MessageView
import chat.rocket.android.members.viewmodel.MemberViewModel import chat.rocket.android.members.uimodel.MemberUiModel
interface CreateChannelView : LoadingView, MessageView { interface CreateChannelView : LoadingView, MessageView {
...@@ -11,7 +11,7 @@ interface CreateChannelView : LoadingView, MessageView { ...@@ -11,7 +11,7 @@ interface CreateChannelView : LoadingView, MessageView {
* *
* @param dataSet The list of server's users to show. * @param dataSet The list of server's users to show.
*/ */
fun showUserSuggestion(dataSet: List<MemberViewModel>) fun showUserSuggestion(dataSet: List<MemberUiModel>)
/** /**
* Shows the navigation drawer with the chat item checked before showing the chat list. * Shows the navigation drawer with the chat item checked before showing the chat list.
......
...@@ -13,7 +13,7 @@ import chat.rocket.android.createchannel.presentation.CreateChannelPresenter ...@@ -13,7 +13,7 @@ import chat.rocket.android.createchannel.presentation.CreateChannelPresenter
import chat.rocket.android.createchannel.presentation.CreateChannelView import chat.rocket.android.createchannel.presentation.CreateChannelView
import chat.rocket.android.main.ui.MainActivity import chat.rocket.android.main.ui.MainActivity
import chat.rocket.android.members.adapter.MembersAdapter import chat.rocket.android.members.adapter.MembersAdapter
import chat.rocket.android.members.viewmodel.MemberViewModel import chat.rocket.android.members.uimodel.MemberUiModel
import chat.rocket.android.util.extensions.asObservable import chat.rocket.android.util.extensions.asObservable
import chat.rocket.android.util.extensions.inflate import chat.rocket.android.util.extensions.inflate
import chat.rocket.android.util.extensions.showToast import chat.rocket.android.util.extensions.showToast
...@@ -99,7 +99,7 @@ class CreateChannelFragment : Fragment(), CreateChannelView, ActionMode.Callback ...@@ -99,7 +99,7 @@ class CreateChannelFragment : Fragment(), CreateChannelView, ActionMode.Callback
showMessage(getString(R.string.msg_generic_error)) showMessage(getString(R.string.msg_generic_error))
} }
override fun showUserSuggestion(dataSet: List<MemberViewModel>) { override fun showUserSuggestion(dataSet: List<MemberUiModel>) {
// Hiding the progress because we are showing it already. // Hiding the progress because we are showing it already.
hideSuggestionViewInProgress() hideSuggestionViewInProgress()
if (dataSet.isEmpty()) { if (dataSet.isEmpty()) {
...@@ -308,7 +308,7 @@ class CreateChannelFragment : Fragment(), CreateChannelView, ActionMode.Callback ...@@ -308,7 +308,7 @@ class CreateChannelFragment : Fragment(), CreateChannelView, ActionMode.Callback
view_member_suggestion_loading.isVisible = false view_member_suggestion_loading.isVisible = false
} }
private fun showSuggestionViewResults(dataSet: List<MemberViewModel>) { private fun showSuggestionViewResults(dataSet: List<MemberUiModel>) {
adapter.clearData() adapter.clearData()
adapter.prependData(dataSet) adapter.prependData(dataSet)
text_member_not_found.isVisible = false text_member_not_found.isVisible = false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment