From 5b13be633211ce215680d803b183ca8eaf4bf210 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 7 Feb 2020 19:58:14 +0100 Subject: [PATCH] Rename --- .../createdirect/CreateDirectRoomKnownUsersFragment.kt | 4 ++-- ...ateDirectViewEvents.kt => CreateDirectRoomViewEvents.kt} | 4 ++-- .../features/createdirect/CreateDirectRoomViewModel.kt | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) rename vector/src/main/java/im/vector/riotx/features/createdirect/{CreateDirectViewEvents.kt => CreateDirectRoomViewEvents.kt} (91%) diff --git a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomKnownUsersFragment.kt b/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomKnownUsersFragment.kt index 370cac0100..e06df21be5 100644 --- a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomKnownUsersFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomKnownUsersFragment.kt @@ -63,7 +63,7 @@ class CreateDirectRoomKnownUsersFragment @Inject constructor( setupCloseView() viewModel.observeViewEvents { when (it) { - is CreateDirectViewEvents.SelectUserAction -> updateChipsView(it) + is CreateDirectRoomViewEvents.SelectUserAction -> updateChipsView(it) }.exhaustive } viewModel.selectSubscribe(this, CreateDirectRoomViewState::selectedUsers) { @@ -138,7 +138,7 @@ class CreateDirectRoomKnownUsersFragment @Inject constructor( knownUsersController.setData(it) } - private fun updateChipsView(data: CreateDirectViewEvents.SelectUserAction) { + private fun updateChipsView(data: CreateDirectRoomViewEvents.SelectUserAction) { if (data.isAdded) { addChipToGroup(data.user, chipGroup) } else { diff --git a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectViewEvents.kt b/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewEvents.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectViewEvents.kt rename to vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewEvents.kt index 4ef2fcd966..a836e82304 100644 --- a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectViewEvents.kt +++ b/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewEvents.kt @@ -22,7 +22,7 @@ import im.vector.riotx.core.platform.VectorViewEvents /** * Transient events for create direct room screen */ -sealed class CreateDirectViewEvents : VectorViewEvents { +sealed class CreateDirectRoomViewEvents : VectorViewEvents { // data class Loading(val message: CharSequence? = null) : RoomDirectoryViewEvents() // data class Failure(val throwable: Throwable) : CreateDirectViewEvents() @@ -30,5 +30,5 @@ sealed class CreateDirectViewEvents : VectorViewEvents { val user: User, val isAdded: Boolean, val index: Int - ) : CreateDirectViewEvents() + ) : CreateDirectRoomViewEvents() } diff --git a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewModel.kt b/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewModel.kt index 79bbdb9ffb..b115a623a8 100644 --- a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewModel.kt @@ -41,7 +41,7 @@ private typealias DirectoryUsersSearch = String class CreateDirectRoomViewModel @AssistedInject constructor(@Assisted initialState: CreateDirectRoomViewState, private val session: Session) - : VectorViewModel(initialState) { + : VectorViewModel(initialState) { @AssistedInject.Factory interface Factory { @@ -94,7 +94,7 @@ class CreateDirectRoomViewModel @AssistedInject constructor(@Assisted val index = state.selectedUsers.indexOfFirst { it.userId == action.user.userId } val selectedUsers = state.selectedUsers.minus(action.user) setState { copy(selectedUsers = selectedUsers) } - _viewEvents.post(CreateDirectViewEvents.SelectUserAction(action.user, false, index)) + _viewEvents.post(CreateDirectRoomViewEvents.SelectUserAction(action.user, false, index)) } private fun handleSelectUser(action: CreateDirectRoomAction.SelectUser) = withState { state -> @@ -114,7 +114,7 @@ class CreateDirectRoomViewModel @AssistedInject constructor(@Assisted isAddOperation = false } setState { copy(selectedUsers = selectedUsers) } - _viewEvents.post(CreateDirectViewEvents.SelectUserAction(action.user, isAddOperation, changeIndex)) + _viewEvents.post(CreateDirectRoomViewEvents.SelectUserAction(action.user, isAddOperation, changeIndex)) } private fun observeDirectoryUsers() {