jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename

This commit is contained in:
Benoit Marty 2020-02-07 19:58:14 +01:00
parent abeb741cad
commit 5b13be6332
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomKnownUsersFragment.kt
View File

@ -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 {

4
vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectViewEvents.kt → vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewEvents.kt
View File

@ -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()
}

6
vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewModel.kt
View File

@ -41,7 +41,7 @@ private typealias DirectoryUsersSearch = String
class CreateDirectRoomViewModel @AssistedInject constructor(@Assisted
initialState: CreateDirectRoomViewState,
private val session: Session)
: VectorViewModel<CreateDirectRoomViewState, CreateDirectRoomAction, CreateDirectViewEvents>(initialState) {
: VectorViewModel<CreateDirectRoomViewState, CreateDirectRoomAction, CreateDirectRoomViewEvents>(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() {