Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Check

Browse source
This commit is contained in:
Benoit Marty 2022-12-22 18:39:18 +01:00
parent 3d9ba211a3
commit 0fcdd25919
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.gradle.kts
View file

@ -95,6 +95,8 @@ allprojects {
"experimental:kdoc-wrapping", "experimental:kdoc-wrapping",
// Ignore error "Redundant curly braces", since we use it to fix false positives, for instance in "elementLogs.${i}.txt" // Ignore error "Redundant curly braces", since we use it to fix false positives, for instance in "elementLogs.${i}.txt"
"string-template", "string-template",
// Not the same order than Android Studio formatter...
"import-ordering",
) )
) )
} }

18
features/preferences/src/main/java/io/element/android/x/features/preferences/user/UserPreferences.kt
View file

@ -22,10 +22,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.airbnb.mvrx.Fail
import com.airbnb.mvrx.Loading
import com.airbnb.mvrx.Success
import com.airbnb.mvrx.Uninitialized
import com.airbnb.mvrx.compose.collectAsState import com.airbnb.mvrx.compose.collectAsState
import com.airbnb.mvrx.compose.mavericksViewModel import com.airbnb.mvrx.compose.mavericksViewModel
import io.element.android.x.matrix.ui.components.MatrixUserHeader import io.element.android.x.matrix.ui.components.MatrixUserHeader
@ -34,13 +30,15 @@ import io.element.android.x.matrix.ui.viewmodels.user.UserViewState
@Composable @Composable
fun UserPreferences( fun UserPreferences(
viewModel: UserViewModel = mavericksViewModel() modifier: Modifier = Modifier,
viewModel: UserViewModel = mavericksViewModel(),
) { ) {
val user by viewModel.collectAsState(UserViewState::user) val user by viewModel.collectAsState(UserViewState::user)
when (user) { when (user()) {
is Fail -> Spacer(modifier = Modifier.height(1.dp)) null -> Spacer(modifier = modifier.height(1.dp))
is Loading -> Spacer(modifier = Modifier.height(1.dp)) else -> MatrixUserHeader(
is Success -> MatrixUserHeader(matrixUser = user.invoke()!!) modifier = modifier,
Uninitialized -> Spacer(modifier = Modifier.height(1.dp)) matrixUser = user.invoke()!!
)
} }
} }