diff --git a/app/src/main/java/be/ugent/sel/studeez/common/composable/TextComposable.kt b/app/src/main/java/be/ugent/sel/studeez/common/composable/TextComposable.kt index 4fca2ee..b7e4906 100644 --- a/app/src/main/java/be/ugent/sel/studeez/common/composable/TextComposable.kt +++ b/app/src/main/java/be/ugent/sel/studeez/common/composable/TextComposable.kt @@ -3,7 +3,6 @@ package be.ugent.sel.studeez.common.composable import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.size import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -18,8 +17,7 @@ fun Headline( ) { Text( text = text, - modifier = Modifier.size(34.dp) - .height(45.dp) + modifier = Modifier.height(45.dp) ) } } \ No newline at end of file diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/profile/ProfileScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/profile/ProfileScreen.kt index d08a5aa..56568c4 100644 --- a/app/src/main/java/be/ugent/sel/studeez/screens/profile/ProfileScreen.kt +++ b/app/src/main/java/be/ugent/sel/studeez/screens/profile/ProfileScreen.kt @@ -1,16 +1,11 @@ package be.ugent.sel.studeez.screens.profile -import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.* import androidx.hilt.navigation.compose.hiltViewModel import be.ugent.sel.studeez.R import be.ugent.sel.studeez.common.composable.Headline import be.ugent.sel.studeez.common.composable.PrimaryScreenTemplate import be.ugent.sel.studeez.resources -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.coroutineScope -import kotlinx.coroutines.launch import be.ugent.sel.studeez.R.string as AppText @Composable @@ -19,10 +14,10 @@ fun ProfileScreen( openAndPopUp: (String, String) -> Unit, viewModel: ProfileViewModel = hiltViewModel() ) { - val coroutineScope: CoroutineScope = rememberCoroutineScope() - - var username: String? = null - + var username: String? by remember { mutableStateOf("") } + LaunchedEffect(key1 = Unit) { + username = viewModel.getUsername() + } PrimaryScreenTemplate( title = resources().getString(AppText.profile), @@ -31,10 +26,4 @@ fun ProfileScreen( ) { Headline(text = (username ?: resources().getString(R.string.no_username))) } - - LaunchedEffect(true) { - coroutineScope.launch { - username = viewModel.getUsername() - } - } } \ No newline at end of file