-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: complete profile screen with regenApiToken + logout
Signed-off-by: Stefano Cappa <[email protected]>
- Loading branch information
Showing
10 changed files
with
174 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
app/src/main/java/eu/homeanthill/repository/ProfileRepository.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
app/src/main/java/eu/homeanthill/ui/components/CircleImage.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package eu.homeanthill.ui.components | ||
|
|
||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.shape.CircleShape | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.clip | ||
| import androidx.compose.ui.layout.ContentScale | ||
| import androidx.compose.ui.unit.Dp | ||
| import coil3.compose.AsyncImage | ||
|
|
||
| @Composable | ||
| fun CircleImage(imageUrl: String, size: Dp) { | ||
| Box( | ||
| modifier = Modifier | ||
| .size(size) | ||
| .clip(CircleShape) | ||
| ) { | ||
| AsyncImage( | ||
| model = imageUrl, | ||
| contentDescription = "image", | ||
| contentScale = ContentScale.Crop, | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .clip(CircleShape) | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
127 changes: 98 additions & 29 deletions
127
app/src/main/java/eu/homeanthill/ui/screens/profile/ProfileScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,65 +1,134 @@ | ||
| package eu.homeanthill.ui.screens.profile | ||
|
|
||
| import android.util.Log | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material3.Button | ||
| import androidx.compose.material3.CircularProgressIndicator | ||
| import androidx.compose.material3.HorizontalDivider | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Scaffold | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.rememberCoroutineScope | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.font.FontWeight | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.compose.ui.unit.sp | ||
| import androidx.navigation.NavController | ||
|
|
||
| import eu.homeanthill.R | ||
| import eu.homeanthill.ui.components.CircleImage | ||
| import eu.homeanthill.ui.components.TopAppBar | ||
| import eu.homeanthill.ui.navigation.MainRoute | ||
| import kotlinx.coroutines.launch | ||
|
|
||
| @Composable | ||
| fun ProfileScreen( | ||
| profileUiState: ProfileViewModel.ProfileUiState, | ||
| apiTokenUiState: ProfileViewModel.ApiTokenUiState, | ||
| profileViewModel: ProfileViewModel, | ||
| navController: NavController, | ||
| ) { | ||
| Scaffold( | ||
| topBar = { | ||
| TopAppBar( | ||
| appbarTitle = stringResource(R.string.profile), | ||
| onBackPressed = { navController.popBackStack() } | ||
| ) | ||
| }, | ||
| content = { padding -> | ||
| Column( | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .padding(padding) | ||
| .padding(horizontal = 8.dp), | ||
| verticalArrangement = Arrangement.Center, | ||
| horizontalAlignment = Alignment.CenterHorizontally | ||
| ) { | ||
| when (profileUiState) { | ||
| is ProfileViewModel.ProfileUiState.Error -> { | ||
| val coroutineScope = rememberCoroutineScope() | ||
|
|
||
| Scaffold(topBar = { | ||
| TopAppBar(appbarTitle = stringResource(R.string.profile), | ||
| onBackPressed = { navController.popBackStack() }) | ||
| }, content = { padding -> | ||
| Column( | ||
| modifier = Modifier | ||
| .padding(padding) | ||
| .fillMaxSize() | ||
| .padding(horizontal = 8.dp, vertical = 25.dp), | ||
| verticalArrangement = Arrangement.Top, | ||
| horizontalAlignment = Alignment.CenterHorizontally | ||
| ) { | ||
| when (profileUiState) { | ||
| is ProfileViewModel.ProfileUiState.Error -> { | ||
| Text( | ||
| text = profileUiState.errorMessage, | ||
| color = MaterialTheme.colorScheme.error, | ||
| ) | ||
| } | ||
| is ProfileViewModel.ProfileUiState.Loading -> { | ||
| CircularProgressIndicator() | ||
| } | ||
| is ProfileViewModel.ProfileUiState.Idle -> { | ||
| profileUiState.profile?.github?.avatarURL?.let { CircleImage(it, 150.dp) } | ||
| Spacer(modifier = Modifier.height(30.dp)) | ||
| profileUiState.profile?.github?.login?.let { | ||
| Text( | ||
| text = profileUiState.errorMessage, | ||
| color = MaterialTheme.colorScheme.error, | ||
| text = it, | ||
| style = MaterialTheme.typography.titleLarge, | ||
| fontWeight = FontWeight.Bold, | ||
| ) | ||
| } | ||
|
|
||
| is ProfileViewModel.ProfileUiState.Loading -> { | ||
| CircularProgressIndicator() | ||
| profileUiState.profile?.github?.name?.let { | ||
| Text( | ||
| text = it, | ||
| style = MaterialTheme.typography.titleMedium, | ||
| fontWeight = FontWeight.Bold, | ||
| ) | ||
| } | ||
|
|
||
| is ProfileViewModel.ProfileUiState.Idle -> { | ||
| profileUiState.profile?.github?.email?.let { | ||
| Text( | ||
| text = profileUiState.profile.toString(), | ||
| fontSize = 24.sp | ||
| text = it, | ||
| style = MaterialTheme.typography.bodySmall, | ||
| fontWeight = FontWeight.Bold, | ||
| ) | ||
| } | ||
| HorizontalDivider( | ||
| thickness = 2.dp, modifier = Modifier.padding(vertical = 20.dp) | ||
| ) | ||
| when (apiTokenUiState) { | ||
| is ProfileViewModel.ApiTokenUiState.Error -> { | ||
| Text( | ||
| text = "********-****-****-****-************", | ||
| style = MaterialTheme.typography.titleMedium, | ||
| fontWeight = FontWeight.Bold, | ||
| ) | ||
| } | ||
| is ProfileViewModel.ApiTokenUiState.Loading -> { | ||
| CircularProgressIndicator() | ||
| } | ||
| is ProfileViewModel.ApiTokenUiState.Idle -> { | ||
| Text( | ||
| text = apiTokenUiState.apiToken, | ||
| style = MaterialTheme.typography.titleMedium, | ||
| fontWeight = FontWeight.Bold, | ||
| ) | ||
| } | ||
| } | ||
| Button( | ||
| onClick = { | ||
| coroutineScope.launch { | ||
| Log.d("ProfileScreen", "id = $profileUiState.profile?.id") | ||
| profileViewModel.regenApiToken(profileUiState.profile?.id) | ||
| } | ||
| }, enabled = true, modifier = Modifier.padding(top = 10.dp, bottom = 10.dp) | ||
| ) { | ||
| Text(text = stringResource(R.string.profile_regen_apitoken)) | ||
| } | ||
| HorizontalDivider( | ||
| thickness = 2.dp, modifier = Modifier.padding(vertical = 20.dp) | ||
| ) | ||
| Button( | ||
| onClick = { | ||
| profileViewModel.logout() | ||
| navController.navigate(route = MainRoute.Login.name) | ||
| }, | ||
| enabled = true, | ||
| ) { | ||
| Text(text = stringResource(R.string.profile_logout)) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ) | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters