From f6c2c66f23f99d1b2152ab391040c5e5ccccc8c9 Mon Sep 17 00:00:00 2001 From: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com> Date: Tue, 14 Mar 2023 14:47:27 +0100 Subject: [PATCH] Renaming package to selectusers --- .../createroom/impl/CreateRoomFlowNode.kt | 4 +-- .../SelectUsersEvents.kt} | 8 ++--- .../SelectUsersNode.kt} | 8 ++--- .../SelectUsersPresenter.kt} | 14 ++++----- .../SelectUsersState.kt} | 6 ++-- .../SelectUsersStateProvider.kt} | 12 ++++---- .../SelectUsersView.kt} | 29 +++++++++---------- 7 files changed, 40 insertions(+), 41 deletions(-) rename features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/{selectmembers/SelectMembersEvents.kt => selectusers/SelectUsersEvents.kt} (84%) rename features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/{selectmembers/SelectMembersNode.kt => selectusers/SelectUsersNode.kt} (87%) rename features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/{selectmembers/SelectMembersPresenter.kt => selectusers/SelectUsersPresenter.kt} (70%) rename features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/{selectmembers/SelectMembersState.kt => selectusers/SelectUsersState.kt} (83%) rename features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/{selectmembers/SelectMembersStateProvider.kt => selectusers/SelectUsersStateProvider.kt} (80%) rename features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/{selectmembers/SelectMembersView.kt => selectusers/SelectUsersView.kt} (90%) diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt index 805d11a319..f03decf561 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt @@ -29,7 +29,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.anvilannotations.ContributesNode import io.element.android.features.createroom.impl.root.CreateRoomRootNode -import io.element.android.features.createroom.impl.selectmembers.SelectMembersNode +import io.element.android.features.createroom.impl.selectusers.SelectUsersNode import io.element.android.libraries.architecture.BackstackNode import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler import io.element.android.libraries.architecture.createNode @@ -67,7 +67,7 @@ class CreateRoomFlowNode @AssistedInject constructor( } createNode(buildContext, plugins = listOf(callback)) } - NavTarget.NewRoom -> createNode(buildContext) + NavTarget.NewRoom -> createNode(buildContext) } } diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectmembers/SelectMembersEvents.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersEvents.kt similarity index 84% rename from features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectmembers/SelectMembersEvents.kt rename to features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersEvents.kt index 7343cb3377..97e6af4d7e 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectmembers/SelectMembersEvents.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersEvents.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.features.createroom.impl.selectmembers +package io.element.android.features.createroom.impl.selectusers import io.element.android.libraries.matrix.ui.model.MatrixUser -sealed interface SelectMembersEvents { - data class AddToSelection(val matrixUser: MatrixUser) : SelectMembersEvents - data class RemoveFromSelection(val matrixUser: MatrixUser) : SelectMembersEvents +sealed interface SelectUsersEvents { + data class AddToSelection(val matrixUser: MatrixUser) : SelectUsersEvents + data class RemoveFromSelection(val matrixUser: MatrixUser) : SelectUsersEvents } diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectmembers/SelectMembersNode.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersNode.kt similarity index 87% rename from features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectmembers/SelectMembersNode.kt rename to features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersNode.kt index 2fd6227e38..7ca9747c5c 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectmembers/SelectMembersNode.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.createroom.impl.selectmembers +package io.element.android.features.createroom.impl.selectusers import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -27,16 +27,16 @@ import io.element.android.anvilannotations.ContributesNode import io.element.android.libraries.di.AppScope @ContributesNode(AppScope::class) -class SelectMembersNode @AssistedInject constructor( +class SelectUsersNode @AssistedInject constructor( @Assisted buildContext: BuildContext, @Assisted plugins: List, - private val presenter: SelectMembersPresenter, + private val presenter: SelectUsersPresenter, ) : Node(buildContext, plugins = plugins) { @Composable override fun View(modifier: Modifier) { val state = presenter.present() - SelectMembersView( + SelectUsersView( state = state, modifier = modifier, onBackPressed = { navigateUp() }, diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectmembers/SelectMembersPresenter.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersPresenter.kt similarity index 70% rename from features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectmembers/SelectMembersPresenter.kt rename to features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersPresenter.kt index 9ea20b3df9..bd040f91a0 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectmembers/SelectMembersPresenter.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.createroom.impl.selectmembers +package io.element.android.features.createroom.impl.selectusers import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState @@ -28,20 +28,20 @@ import kotlinx.collections.immutable.toImmutableList import javax.inject.Inject // TODO add unit tests -class SelectMembersPresenter @Inject constructor() : Presenter { +class SelectUsersPresenter @Inject constructor() : Presenter { @Composable - override fun present(): SelectMembersState { + override fun present(): SelectUsersState { val selectedUsers: MutableState> = remember { mutableStateOf(persistentListOf()) } - fun handleEvents(event: SelectMembersEvents) { + fun handleEvents(event: SelectUsersEvents) { when (event) { - is SelectMembersEvents.AddToSelection -> selectedUsers.value = selectedUsers.value.plus(event.matrixUser).toImmutableList() - is SelectMembersEvents.RemoveFromSelection -> selectedUsers.value = selectedUsers.value.minus(event.matrixUser).toImmutableList() + is SelectUsersEvents.AddToSelection -> selectedUsers.value = selectedUsers.value.plus(event.matrixUser).toImmutableList() + is SelectUsersEvents.RemoveFromSelection -> selectedUsers.value = selectedUsers.value.minus(event.matrixUser).toImmutableList() } } - return SelectMembersState( + return SelectUsersState( selectedUsers = selectedUsers.value, eventSink = ::handleEvents, ) diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectmembers/SelectMembersState.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersState.kt similarity index 83% rename from features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectmembers/SelectMembersState.kt rename to features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersState.kt index 500a6e1570..84c0da9466 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectmembers/SelectMembersState.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersState.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.element.android.features.createroom.impl.selectmembers +package io.element.android.features.createroom.impl.selectusers import io.element.android.libraries.matrix.ui.model.MatrixUser import kotlinx.collections.immutable.ImmutableList -data class SelectMembersState( +data class SelectUsersState( val selectedUsers: ImmutableList, - val eventSink: (SelectMembersEvents) -> Unit, + val eventSink: (SelectUsersEvents) -> Unit, ) diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectmembers/SelectMembersStateProvider.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersStateProvider.kt similarity index 80% rename from features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectmembers/SelectMembersStateProvider.kt rename to features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersStateProvider.kt index 8b2bfa9b30..4dd64013c3 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectmembers/SelectMembersStateProvider.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersStateProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.createroom.impl.selectmembers +package io.element.android.features.createroom.impl.selectusers import androidx.compose.ui.tooling.preview.PreviewParameterProvider import io.element.android.libraries.designsystem.components.avatar.AvatarData @@ -22,11 +22,11 @@ import io.element.android.libraries.matrix.api.core.UserId import io.element.android.libraries.matrix.ui.model.MatrixUser import kotlinx.collections.immutable.persistentListOf -open class SelectMembersStateProvider : PreviewParameterProvider { - override val values: Sequence +open class SelectUsersStateProvider : PreviewParameterProvider { + override val values: Sequence get() = sequenceOf( - aSelectMembersState(), - aSelectMembersState().copy( + aSelectUsersState(), + aSelectUsersState().copy( selectedUsers = persistentListOf( aMatrixUser(userName = "User"), aMatrixUser(userName = "User with long name"), @@ -35,7 +35,7 @@ open class SelectMembersStateProvider : PreviewParameterProvider Unit = {}, onNextPressed: () -> Unit = {}, @@ -67,7 +67,7 @@ fun SelectMembersView( Scaffold( topBar = { - SelectMembersViewTopBar( + SelectUsersViewTopBar( hasSelectedUsers = state.selectedUsers.isNotEmpty(), onBackPressed = onBackPressed, onNextPressed = onNextPressed, @@ -80,10 +80,10 @@ fun SelectMembersView( .padding(padding) ) { // TODO create a SearchUserView with multi selection option + callbacks - SelectedMembersList( + SelectedUsersList( modifier = Modifier.padding(horizontal = 16.dp), selectedUsers = state.selectedUsers, - onUserRemoved = { eventSink(SelectMembersEvents.RemoveFromSelection(it)) } + onUserRemoved = { eventSink(SelectUsersEvents.RemoveFromSelection(it)) } ) } } @@ -91,7 +91,7 @@ fun SelectMembersView( @OptIn(ExperimentalMaterial3Api::class) @Composable -fun SelectMembersViewTopBar( +fun SelectUsersViewTopBar( hasSelectedUsers: Boolean, modifier: Modifier = Modifier, onBackPressed: () -> Unit = {}, @@ -123,7 +123,7 @@ fun SelectMembersViewTopBar( } @Composable -fun SelectedMembersList( +fun SelectedUsersList( selectedUsers: List, modifier: Modifier = Modifier, onUserRemoved: (MatrixUser) -> Unit = {}, @@ -133,7 +133,7 @@ fun SelectedMembersList( horizontalArrangement = Arrangement.spacedBy(24.dp), ) { items(selectedUsers) { matrixUser -> - SelectedMember( + SelectedUser( matrixUser = matrixUser, onUserRemoved = onUserRemoved, ) @@ -142,7 +142,7 @@ fun SelectedMembersList( } @Composable -fun SelectedMember( +fun SelectedUser( matrixUser: MatrixUser, modifier: Modifier = Modifier, onUserRemoved: (MatrixUser) -> Unit, @@ -151,7 +151,6 @@ fun SelectedMember( Column( horizontalAlignment = Alignment.CenterHorizontally, ) { - // TODO set the size using custom Avatar size set to 56.dp Avatar(matrixUser.avatarData) Text( text = matrixUser.username.orEmpty(), @@ -179,15 +178,15 @@ fun SelectedMember( @Preview @Composable -internal fun ChangeServerViewLightPreview(@PreviewParameter(SelectMembersStateProvider::class) state: SelectMembersState) = +internal fun ChangeServerViewLightPreview(@PreviewParameter(SelectUsersStateProvider::class) state: SelectUsersState) = ElementPreviewLight { ContentToPreview(state) } @Preview @Composable -internal fun ChangeServerViewDarkPreview(@PreviewParameter(SelectMembersStateProvider::class) state: SelectMembersState) = +internal fun ChangeServerViewDarkPreview(@PreviewParameter(SelectUsersStateProvider::class) state: SelectUsersState) = ElementPreviewDark { ContentToPreview(state) } @Composable -private fun ContentToPreview(state: SelectMembersState) { - SelectMembersView(state = state) +private fun ContentToPreview(state: SelectUsersState) { + SelectUsersView(state = state) }