Maxime NATUREL
2 years ago
committed by
Florian Renaud
17 changed files with 579 additions and 82 deletions
@ -0,0 +1,24 @@ |
|||||||
|
/* |
||||||
|
* Copyright (c) 2023 New Vector Ltd |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
package io.element.android.features.createroom.impl.addpeople |
||||||
|
|
||||||
|
import io.element.android.libraries.matrix.ui.model.MatrixUser |
||||||
|
import kotlinx.collections.immutable.ImmutableList |
||||||
|
|
||||||
|
sealed interface AddPeopleEvents { |
||||||
|
data class UpdateSelection(val users: ImmutableList<MatrixUser>) : AddPeopleEvents |
||||||
|
} |
@ -0,0 +1,25 @@ |
|||||||
|
/* |
||||||
|
* Copyright (c) 2023 New Vector Ltd |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
package io.element.android.features.createroom.impl.addpeople |
||||||
|
|
||||||
|
import io.element.android.libraries.matrix.ui.model.MatrixUser |
||||||
|
import kotlinx.collections.immutable.ImmutableList |
||||||
|
|
||||||
|
data class AddPeopleState( |
||||||
|
val selectedUsers: ImmutableList<MatrixUser>, |
||||||
|
val eventSink: (AddPeopleEvents) -> Unit, |
||||||
|
) |
@ -0,0 +1,46 @@ |
|||||||
|
/* |
||||||
|
* Copyright (c) 2023 New Vector Ltd |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
package io.element.android.features.createroom.impl.addpeople |
||||||
|
|
||||||
|
import androidx.compose.ui.tooling.preview.PreviewParameterProvider |
||||||
|
import io.element.android.libraries.designsystem.components.avatar.AvatarData |
||||||
|
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 AddPeopleStateProvider : PreviewParameterProvider<AddPeopleState> { |
||||||
|
override val values: Sequence<AddPeopleState> |
||||||
|
get() = sequenceOf( |
||||||
|
aAddPeopleState(), |
||||||
|
aAddPeopleState().copy( |
||||||
|
selectedUsers = persistentListOf( |
||||||
|
aMatrixUser(userName = ""), |
||||||
|
aMatrixUser(userName = "User"), |
||||||
|
aMatrixUser(userName = "User with long name"), |
||||||
|
) |
||||||
|
) |
||||||
|
) |
||||||
|
} |
||||||
|
|
||||||
|
fun aAddPeopleState() = AddPeopleState( |
||||||
|
selectedUsers = persistentListOf(), |
||||||
|
eventSink = {} |
||||||
|
) |
||||||
|
|
||||||
|
fun aMatrixUser(userName: String): MatrixUser { |
||||||
|
return MatrixUser(id = UserId("@id"), username = userName, avatarData = AvatarData("@id", "U")) |
||||||
|
} |
@ -0,0 +1,120 @@ |
|||||||
|
/* |
||||||
|
* Copyright (c) 2022 New Vector Ltd |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
package io.element.android.features.createroom.impl.addpeople |
||||||
|
|
||||||
|
import androidx.compose.foundation.layout.Column |
||||||
|
import androidx.compose.foundation.layout.fillMaxSize |
||||||
|
import androidx.compose.foundation.layout.padding |
||||||
|
import androidx.compose.material3.ExperimentalMaterial3Api |
||||||
|
import androidx.compose.runtime.Composable |
||||||
|
import androidx.compose.runtime.getValue |
||||||
|
import androidx.compose.runtime.mutableStateOf |
||||||
|
import androidx.compose.runtime.saveable.rememberSaveable |
||||||
|
import androidx.compose.runtime.setValue |
||||||
|
import androidx.compose.ui.Modifier |
||||||
|
import androidx.compose.ui.res.stringResource |
||||||
|
import androidx.compose.ui.text.font.FontWeight |
||||||
|
import androidx.compose.ui.tooling.preview.Preview |
||||||
|
import androidx.compose.ui.tooling.preview.PreviewParameter |
||||||
|
import androidx.compose.ui.unit.dp |
||||||
|
import androidx.compose.ui.unit.sp |
||||||
|
import io.element.android.libraries.designsystem.components.button.BackButton |
||||||
|
import io.element.android.libraries.designsystem.preview.ElementPreviewDark |
||||||
|
import io.element.android.libraries.designsystem.preview.ElementPreviewLight |
||||||
|
import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar |
||||||
|
import io.element.android.libraries.designsystem.theme.components.Scaffold |
||||||
|
import io.element.android.libraries.designsystem.theme.components.Text |
||||||
|
import io.element.android.libraries.designsystem.theme.components.TextButton |
||||||
|
import io.element.android.libraries.ui.strings.R as StringR |
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class) |
||||||
|
@Composable |
||||||
|
fun AddPeopleView( |
||||||
|
state: AddPeopleState, |
||||||
|
modifier: Modifier = Modifier, |
||||||
|
onBackPressed: () -> Unit = {}, |
||||||
|
onNextPressed: () -> Unit = {}, |
||||||
|
) { |
||||||
|
var isSearchActive by rememberSaveable { mutableStateOf(false) } |
||||||
|
val eventSink = state.eventSink |
||||||
|
|
||||||
|
Scaffold( |
||||||
|
topBar = { |
||||||
|
AddPeopleViewTopBar( |
||||||
|
hasSelectedUsers = state.selectedUsers.isNotEmpty(), |
||||||
|
onBackPressed = onBackPressed, |
||||||
|
onNextPressed = onNextPressed, |
||||||
|
) |
||||||
|
} |
||||||
|
) { padding -> |
||||||
|
Column( |
||||||
|
modifier = modifier |
||||||
|
.fillMaxSize() |
||||||
|
.padding(padding), |
||||||
|
) { |
||||||
|
// TODO use reusable searchUser bar with multi selection |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class) |
||||||
|
@Composable |
||||||
|
fun AddPeopleViewTopBar( |
||||||
|
hasSelectedUsers: Boolean, |
||||||
|
modifier: Modifier = Modifier, |
||||||
|
onBackPressed: () -> Unit = {}, |
||||||
|
onNextPressed: () -> Unit = {}, |
||||||
|
) { |
||||||
|
CenterAlignedTopAppBar( |
||||||
|
modifier = modifier, |
||||||
|
title = { |
||||||
|
Text( |
||||||
|
text = stringResource(id = StringR.string.add_people), |
||||||
|
fontSize = 16.sp, |
||||||
|
fontWeight = FontWeight.SemiBold, |
||||||
|
) |
||||||
|
}, |
||||||
|
navigationIcon = { BackButton(onClick = onBackPressed) }, |
||||||
|
actions = { |
||||||
|
TextButton( |
||||||
|
modifier = Modifier.padding(horizontal = 8.dp), |
||||||
|
onClick = onNextPressed, |
||||||
|
) { |
||||||
|
val textActionResId = if (hasSelectedUsers) StringR.string.action_next else StringR.string.action_skip |
||||||
|
Text( |
||||||
|
text = stringResource(id = textActionResId), |
||||||
|
fontSize = 16.sp, |
||||||
|
) |
||||||
|
} |
||||||
|
} |
||||||
|
) |
||||||
|
} |
||||||
|
|
||||||
|
@Preview |
||||||
|
@Composable |
||||||
|
internal fun ChangeServerViewLightPreview(@PreviewParameter(AddPeopleStateProvider::class) state: AddPeopleState) = |
||||||
|
ElementPreviewLight { ContentToPreview(state) } |
||||||
|
|
||||||
|
@Preview |
||||||
|
@Composable |
||||||
|
internal fun ChangeServerViewDarkPreview(@PreviewParameter(AddPeopleStateProvider::class) state: AddPeopleState) = |
||||||
|
ElementPreviewDark { ContentToPreview(state) } |
||||||
|
|
||||||
|
@Composable |
||||||
|
private fun ContentToPreview(state: AddPeopleState) { |
||||||
|
AddPeopleView(state = state) |
||||||
|
} |
@ -0,0 +1,30 @@ |
|||||||
|
/* |
||||||
|
* Copyright (c) 2023 New Vector Ltd |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
plugins { |
||||||
|
id("io.element.android-compose-library") |
||||||
|
} |
||||||
|
|
||||||
|
android { |
||||||
|
namespace = "io.element.android.features.selectusers.api" |
||||||
|
} |
||||||
|
|
||||||
|
dependencies { |
||||||
|
implementation(projects.libraries.architecture) |
||||||
|
implementation(projects.libraries.designsystem) |
||||||
|
implementation(projects.libraries.uiStrings) |
||||||
|
implementation(projects.libraries.matrixui) |
||||||
|
} |
@ -0,0 +1,21 @@ |
|||||||
|
/* |
||||||
|
* Copyright (c) 2023 New Vector Ltd |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
package io.element.android.features.selectusers.api |
||||||
|
|
||||||
|
import io.element.android.libraries.architecture.Presenter |
||||||
|
|
||||||
|
interface SelectUsersPresenter : Presenter<SelectUsersState> |
@ -0,0 +1,55 @@ |
|||||||
|
/* |
||||||
|
* Copyright (c) 2022 New Vector Ltd |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed |
||||||
|
@Suppress("DSL_SCOPE_VIOLATION") |
||||||
|
plugins { |
||||||
|
id("io.element.android-compose-library") |
||||||
|
alias(libs.plugins.anvil) |
||||||
|
alias(libs.plugins.ksp) |
||||||
|
} |
||||||
|
|
||||||
|
android { |
||||||
|
namespace = "io.element.android.features.selectusers.impl" |
||||||
|
} |
||||||
|
|
||||||
|
anvil { |
||||||
|
generateDaggerFactories.set(true) |
||||||
|
} |
||||||
|
|
||||||
|
dependencies { |
||||||
|
implementation(projects.anvilannotations) |
||||||
|
anvil(projects.anvilcodegen) |
||||||
|
implementation(projects.libraries.core) |
||||||
|
implementation(projects.libraries.architecture) |
||||||
|
implementation(projects.libraries.matrix.api) |
||||||
|
implementation(projects.libraries.matrixui) |
||||||
|
implementation(projects.libraries.designsystem) |
||||||
|
implementation(projects.libraries.elementresources) |
||||||
|
implementation(projects.libraries.testtags) |
||||||
|
implementation(projects.libraries.uiStrings) |
||||||
|
api(projects.features.selectusers.api) |
||||||
|
ksp(libs.showkase.processor) |
||||||
|
|
||||||
|
testImplementation(libs.test.junit) |
||||||
|
testImplementation(libs.coroutines.test) |
||||||
|
testImplementation(libs.molecule.runtime) |
||||||
|
testImplementation(libs.test.truth) |
||||||
|
testImplementation(libs.test.turbine) |
||||||
|
testImplementation(projects.libraries.matrix.test) |
||||||
|
|
||||||
|
androidTestImplementation(libs.test.junitext) |
||||||
|
} |
@ -0,0 +1,20 @@ |
|||||||
|
<?xml version="1.0" encoding="utf-8"?> |
||||||
|
<!-- |
||||||
|
~ Copyright (c) 2023 New Vector Ltd |
||||||
|
~ |
||||||
|
~ Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
~ you may not use this file except in compliance with the License. |
||||||
|
~ You may obtain a copy of the License at |
||||||
|
~ |
||||||
|
~ http://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
~ |
||||||
|
~ Unless required by applicable law or agreed to in writing, software |
||||||
|
~ distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
~ See the License for the specific language governing permissions and |
||||||
|
~ limitations under the License. |
||||||
|
--> |
||||||
|
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> |
||||||
|
|
||||||
|
</manifest> |
@ -0,0 +1,89 @@ |
|||||||
|
/* |
||||||
|
* Copyright (c) 2023 New Vector Ltd |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
package io.element.android.features.selectusers.impl |
||||||
|
|
||||||
|
import androidx.compose.runtime.Composable |
||||||
|
import androidx.compose.runtime.LaunchedEffect |
||||||
|
import androidx.compose.runtime.MutableState |
||||||
|
import androidx.compose.runtime.getValue |
||||||
|
import androidx.compose.runtime.mutableStateOf |
||||||
|
import androidx.compose.runtime.remember |
||||||
|
import androidx.compose.runtime.saveable.rememberSaveable |
||||||
|
import androidx.compose.runtime.setValue |
||||||
|
import com.squareup.anvil.annotations.ContributesBinding |
||||||
|
import io.element.android.features.selectusers.api.SelectUsersEvents |
||||||
|
import io.element.android.features.selectusers.api.SelectUsersPresenter |
||||||
|
import io.element.android.features.selectusers.api.SelectUsersState |
||||||
|
import io.element.android.libraries.di.SessionScope |
||||||
|
import io.element.android.libraries.matrix.api.core.MatrixPatterns |
||||||
|
import io.element.android.libraries.matrix.api.core.UserId |
||||||
|
import io.element.android.libraries.matrix.ui.model.MatrixUser |
||||||
|
import kotlinx.collections.immutable.ImmutableList |
||||||
|
import kotlinx.collections.immutable.persistentListOf |
||||||
|
import kotlinx.collections.immutable.toImmutableList |
||||||
|
import javax.inject.Inject |
||||||
|
|
||||||
|
// TODO add unit tests |
||||||
|
@ContributesBinding(SessionScope::class) |
||||||
|
class DefaultSelectUsersPresenter @Inject constructor() : SelectUsersPresenter { |
||||||
|
|
||||||
|
@Composable |
||||||
|
override fun present(): SelectUsersState { |
||||||
|
val selectedUsers: MutableState<ImmutableList<MatrixUser>> = remember { mutableStateOf(persistentListOf()) } |
||||||
|
var searchQuery by rememberSaveable { mutableStateOf("") } |
||||||
|
val searchResults: MutableState<ImmutableList<MatrixUser>> = remember { |
||||||
|
mutableStateOf(persistentListOf()) |
||||||
|
} |
||||||
|
|
||||||
|
fun handleEvents(event: SelectUsersEvents) { |
||||||
|
when (event) { |
||||||
|
is SelectUsersEvents.UpdateSearchQuery -> searchQuery = event.query |
||||||
|
is SelectUsersEvents.AddToSelection -> selectedUsers.value = selectedUsers.value.plus(event.matrixUser).toImmutableList() |
||||||
|
is SelectUsersEvents.RemoveFromSelection -> selectedUsers.value = selectedUsers.value.minus(event.matrixUser).toImmutableList() |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
LaunchedEffect(searchQuery) { |
||||||
|
searchResults.value = if (MatrixPatterns.isUserId(searchQuery)) { |
||||||
|
persistentListOf(MatrixUser(UserId(searchQuery))) |
||||||
|
} else { |
||||||
|
persistentListOf() |
||||||
|
} |
||||||
|
if (searchQuery.isNotEmpty()) { |
||||||
|
searchResults.value = performSearch(searchQuery) |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
return SelectUsersState( |
||||||
|
searchQuery = searchQuery, |
||||||
|
searchResults = searchResults.value, |
||||||
|
selectedUsers = selectedUsers.value, |
||||||
|
eventSink = ::handleEvents, |
||||||
|
) |
||||||
|
} |
||||||
|
|
||||||
|
private fun performSearch(query: String): ImmutableList<MatrixUser> { |
||||||
|
val isMatrixId = MatrixPatterns.isUserId(query) |
||||||
|
val results = mutableListOf<MatrixUser>()// TODO trigger /search request |
||||||
|
if (isMatrixId && results.none { it.id.value == query }) { |
||||||
|
val getProfileResult: MatrixUser? = null // TODO trigger /profile request |
||||||
|
val profile = getProfileResult ?: MatrixUser(UserId(query)) |
||||||
|
results.add(0, profile) |
||||||
|
} |
||||||
|
return results.toImmutableList() |
||||||
|
} |
||||||
|
} |
Loading…
Reference in new issue