Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TIQR-427, TIQR-429: Fixes #156

Merged
merged 1 commit into from
Jul 11, 2024
Merged

TIQR-427, TIQR-429: Fixes #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions app/src/main/kotlin/nl/eduid/screens/personalinfo/verified/VerifiedPersonalInfoScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Delete
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.LinearProgressIndicator
Expand Down Expand Up @@ -200,8 +198,8 @@ fun VerifiedPersonalInfoScreen(
verticalAlignment = Alignment.CenterVertically
) {
Icon(
imageVector = Icons.Outlined.Delete,
contentDescription = "",
painter = painterResource(id = R.drawable.ic_delete_icon),
contentDescription = null,
modifier = Modifier.size(24.dp)
)
Text(
Expand Down
247 changes: 126 additions & 121 deletions app/src/main/kotlin/nl/eduid/ui/LoginInfoCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.shape.CornerSize
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Delete
import androidx.compose.material.icons.outlined.KeyboardArrowDown
import androidx.compose.material.icons.outlined.KeyboardArrowUp
import androidx.compose.material3.Button
Expand Down Expand Up @@ -75,15 +74,16 @@ fun LoginInfoCard(
) {
var isExpanded by remember { mutableStateOf(isExpanded) }
val containerColor = if (isExpanded) ColorSupport_Blue_100 else MaterialTheme.colorScheme.surface
val borderColor = if (isExpanded) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onBackground
val titleColor = if (isExpanded) MaterialTheme.colorScheme.onSurface else MaterialTheme.colorScheme.onSurfaceVariant

ListItem(
colors =
ListItemDefaults.colors(
containerColor = containerColor,
headlineColor = titleColor,
trailingIconColor = titleColor,
),
ListItemDefaults.colors(
containerColor = containerColor,
headlineColor = titleColor,
trailingIconColor = titleColor,
),
headlineContent = {
Row(
verticalAlignment = Alignment.CenterVertically,
Expand Down Expand Up @@ -138,8 +138,8 @@ fun LoginInfoCard(
verticalAlignment = Alignment.CenterVertically,
) {
Icon(
imageVector = Icons.Outlined.Delete,
contentDescription = "",
painter = painterResource(id = R.drawable.ic_delete_icon),
contentDescription = null,
modifier = Modifier.size(24.dp),
)
Text(
Expand Down Expand Up @@ -174,8 +174,8 @@ fun LoginInfoCard(
verticalAlignment = Alignment.CenterVertically,
) {
Icon(
imageVector = Icons.Outlined.Delete,
contentDescription = "",
painter = painterResource(id = R.drawable.ic_delete_icon),
contentDescription = null,
modifier = Modifier.size(24.dp),
)
Text(
Expand All @@ -193,14 +193,15 @@ fun LoginInfoCard(
}
},
modifier =
modifier
.border(
color = MaterialTheme.colorScheme.onBackground,
shape = RoundedCornerShape(6.dp),
width = 2.dp,
).clickable {
isExpanded = !isExpanded
},
modifier
.border(
color = borderColor,
shape = RoundedCornerShape(6.dp),
width = 2.dp,
)
.clickable {
isExpanded = !isExpanded
},
)
}

Expand All @@ -217,97 +218,100 @@ fun LoginInfoCardOld(
Spacer(Modifier.height(6.dp))
Box(
modifier =
Modifier
.clip(RoundedCornerShape(6.dp))
.border(
width = 3.dp,
color = BlueButton,
).sizeIn(minHeight = 72.dp)
.fillMaxWidth()
.clickable {
if (serviceProviderInfo != null) {
isOpen.value = !isOpen.value
}
}.background(InfoTabDarkFill)
.animateContentSize(),
Modifier
.clip(RoundedCornerShape(6.dp))
.border(
width = 3.dp,
color = BlueButton,
)
.sizeIn(minHeight = 72.dp)
.fillMaxWidth()
.clickable {
if (serviceProviderInfo != null) {
isOpen.value = !isOpen.value
}
}
.background(InfoTabDarkFill)
.animateContentSize(),
) {
ConstraintLayout(
modifier =
Modifier
.fillMaxWidth()
.padding(start = 18.dp, end = 18.dp, top = 12.dp, bottom = 12.dp),
Modifier
.fillMaxWidth()
.padding(start = 18.dp, end = 18.dp, top = 12.dp, bottom = 12.dp),
) {
val (startImage, titleArea, endImage, expandedArea) = createRefs()
Box(
modifier =
Modifier
.constrainAs(startImage) {
top.linkTo(titleArea.top)
bottom.linkTo(titleArea.bottom)
start.linkTo(parent.start)
}.height(48.dp),
Modifier
.constrainAs(startImage) {
top.linkTo(titleArea.top)
bottom.linkTo(titleArea.bottom)
start.linkTo(parent.start)
}
.height(48.dp),
) {
if (startIconLargeUrl.isNotBlank()) {
AsyncImage(
model = startIconLargeUrl,
contentDescription = null,
modifier =
Modifier
.align(Alignment.Center)
.padding(end = 12.dp)
.heightIn(max = 48.dp)
.widthIn(max = 48.dp),
Modifier
.align(Alignment.Center)
.padding(end = 12.dp)
.heightIn(max = 48.dp)
.widthIn(max = 48.dp),
)
}
}

Column(
horizontalAlignment = Alignment.Start,
modifier =
Modifier.constrainAs(titleArea) {
top.linkTo(parent.top)
start.linkTo(startImage.end)
end.linkTo(endImage.start)
width = Dimension.fillToConstraints
},
Modifier.constrainAs(titleArea) {
top.linkTo(parent.top)
start.linkTo(startImage.end)
end.linkTo(endImage.start)
width = Dimension.fillToConstraints
},
) {
Text(
text =
title.replaceFirstChar {
if (it.isLowerCase()) {
it.titlecase(
Locale.getDefault(),
)
} else {
it.toString()
}
},
title.replaceFirstChar {
if (it.isLowerCase()) {
it.titlecase(
Locale.getDefault(),
)
} else {
it.toString()
}
},
style =
MaterialTheme.typography.bodyLarge.copy(
textAlign = TextAlign.Start,
fontWeight = FontWeight.Bold,
lineHeight = 20.sp,
),
MaterialTheme.typography.bodyLarge.copy(
textAlign = TextAlign.Start,
fontWeight = FontWeight.Bold,
lineHeight = 20.sp,
),
)
Spacer(Modifier.height(4.dp))
Text(
text = subtitle,
style =
MaterialTheme.typography.bodySmall.copy(
textAlign = TextAlign.Start,
color = ColorScale_Gray_500,
),
MaterialTheme.typography.bodySmall.copy(
textAlign = TextAlign.Start,
color = ColorScale_Gray_500,
),
)
}
if (isOpen.value && serviceProviderInfo != null) {
Column(
horizontalAlignment = Alignment.Start,
modifier =
Modifier.constrainAs(expandedArea) {
top.linkTo(titleArea.bottom, margin = 24.dp)
start.linkTo(parent.start)
end.linkTo(parent.end)
},
Modifier.constrainAs(expandedArea) {
top.linkTo(titleArea.bottom, margin = 24.dp)
start.linkTo(parent.start)
end.linkTo(parent.end)
},
) {
ServiceProviderBlock(serviceProviderInfo, onDeleteButtonClicked)
}
Expand All @@ -316,12 +320,13 @@ fun LoginInfoCardOld(
painter = painterResource(R.drawable.chevron_down),
contentDescription = "",
modifier =
Modifier
.constrainAs(endImage) {
top.linkTo(titleArea.top)
bottom.linkTo(titleArea.bottom)
end.linkTo(parent.end)
}.padding(start = 12.dp),
Modifier
.constrainAs(endImage) {
top.linkTo(titleArea.top)
bottom.linkTo(titleArea.bottom)
end.linkTo(parent.end)
}
.padding(start = 12.dp),
)
}
}
Expand Down Expand Up @@ -355,27 +360,27 @@ private fun ServiceProviderBlock(serviceProviderInfo: ServiceProvider, onDeleteB
border = BorderStroke(1.dp, Color.Red),
colors = ButtonDefaults.outlinedButtonColors(contentColor = ColorAlertRed),
modifier =
Modifier
.sizeIn(minHeight = 48.dp)
.fillMaxWidth(),
Modifier
.sizeIn(minHeight = 48.dp)
.fillMaxWidth(),
) {
Text(
text = stringResource(R.string.DataActivity_Details_Delete_COPY),
style =
MaterialTheme.typography.bodyLarge.copy(
color = ColorAlertRed,
fontWeight = FontWeight.SemiBold,
),
MaterialTheme.typography.bodyLarge.copy(
color = ColorAlertRed,
fontWeight = FontWeight.SemiBold,
),
)
}
Spacer(Modifier.height(24.dp))
Text(
text = stringResource(R.string.DataActivity_Details_DeleteDisclaimer_COPY),
style =
MaterialTheme.typography.bodySmall.copy(
textAlign = TextAlign.Start,
color = ColorScale_Gray_Black,
),
MaterialTheme.typography.bodySmall.copy(
textAlign = TextAlign.Start,
color = ColorScale_Gray_Black,
),
)
Spacer(Modifier.height(32.dp))
}
Expand All @@ -387,14 +392,14 @@ private fun PreviewLoginInfoCard() = EduidAppAndroidTheme {
LoginInfoCard(
title = "My eduid",
serviceProviderInfo =
ServiceProvider(
providerName = "Provider name",
createdStamp = 0L,
firstLoginStamp = 0L,
uniqueId = "15a6dObf-fOfd-466d-a3b1-ff19df2dcc3e",
serviceProviderEntityId = "service provider id",
providerLogoUrl = "https://static.surfconext.nl/media/sp/eduid.png",
),
ServiceProvider(
providerName = "Provider name",
createdStamp = 0L,
firstLoginStamp = 0L,
uniqueId = "15a6dObf-fOfd-466d-a3b1-ff19df2dcc3e",
serviceProviderEntityId = "service provider id",
providerLogoUrl = "https://static.surfconext.nl/media/sp/eduid.png",
),
isExpanded = false,
modifier = Modifier
.fillMaxWidth()
Expand All @@ -403,37 +408,37 @@ private fun PreviewLoginInfoCard() = EduidAppAndroidTheme {
LoginInfoCard(
title = "eduID invite with a very long name",
serviceProviderInfo =
ServiceProvider(
providerName = "Provider name",
createdStamp = 0L,
firstLoginStamp = 0L,
uniqueId = "15a6dObf-fOfd-466d-a3b1-ff19df2dcc3e",
serviceProviderEntityId = "service provider id",
availableTokens = listOf(
ScopeAccessGrant(
clientId = "test.eduid.nl",
forProviderName = "eduid mobile app",
scopeDescription = "Allow this app to read and update your eduID data",
grantedOn = "2024-06-13T14:25:57.054+00:00",
expireAt = "2024-06-13T14:25:57.054+00:00",
),
ServiceProvider(
providerName = "Provider name",
createdStamp = 0L,
firstLoginStamp = 0L,
uniqueId = "15a6dObf-fOfd-466d-a3b1-ff19df2dcc3e",
serviceProviderEntityId = "service provider id",
availableTokens = listOf(
ScopeAccessGrant(
clientId = "test.eduid.nl",
forProviderName = "eduid mobile app",
scopeDescription = "Allow this app to read and update your eduID data",
grantedOn = "2024-06-13T14:25:57.054+00:00",
expireAt = "2024-06-13T14:25:57.054+00:00",
),
),
),
isExpanded = true,
modifier = Modifier.fillMaxWidth(),
)
LoginInfoCardOld(
title = "My eduid",
subtitle = "on Date",
serviceProviderInfo =
ServiceProvider(
providerName = "Provider name",
createdStamp = 0L,
firstLoginStamp = 0L,
uniqueId = "15a6dObf-fOfd-466d-a3b1-ff19df2dcc3e",
serviceProviderEntityId = "service provider id",
providerLogoUrl = "https://static.surfconext.nl/media/sp/eduid.png",
),
ServiceProvider(
providerName = "Provider name",
createdStamp = 0L,
firstLoginStamp = 0L,
uniqueId = "15a6dObf-fOfd-466d-a3b1-ff19df2dcc3e",
serviceProviderEntityId = "service provider id",
providerLogoUrl = "https://static.surfconext.nl/media/sp/eduid.png",
),
isExpanded = true,
)
}
Expand Down
Loading
Loading