Lemmy/Raccoon
1
0
Fork 0
mirror of https://github.com/LiveFastEatTrashRaccoon/RaccoonForLemmy.git synced 2025-02-04 22:07:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

enhancement: improved community and user header

Browse Source
This commit is contained in:
Diego Beraldin 2023-10-15 19:51:36 +02:00
parent 54accc8538
commit e569468fa6
2 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/components/CommunityHeader.kt
View File

@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
@ -39,21 +38,22 @@ import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.CommunityModel
@Composable
fun CommunityHeader(
community: CommunityModel,
modifier: Modifier = Modifier,
autoLoadImages: Boolean = true,
options: List<String> = emptyList(),
onOptionSelected: ((Int) -> Unit)? = null,
onOpenImage: ((String) -> Unit)? = null,
) {
Box(
modifier = Modifier.fillMaxWidth().aspectRatio(4.5f).padding(Spacing.xs),
modifier = modifier.fillMaxWidth().padding(Spacing.s),
) {
// banner
val banner = community.banner.orEmpty()
if (banner.isNotEmpty() && autoLoadImages) {
CustomImage(
modifier = Modifier.fillMaxSize(),
modifier = Modifier.fillMaxWidth().aspectRatio(4.5f),
url = banner,
contentScale = ContentScale.FillBounds,
contentScale = ContentScale.FillWidth,
contentDescription = null,
)
}
@ -99,60 +99,60 @@ fun CommunityHeader(
}
}
}
}
Row(
modifier = Modifier.fillMaxSize(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(Spacing.m)
) {
// avatar
val communityIcon = community.icon.orEmpty()
val avatarSize = 60.dp
if (communityIcon.isNotEmpty() && autoLoadImages) {
CustomImage(
modifier = Modifier
.padding(Spacing.xxxs)
.size(avatarSize)
.clip(RoundedCornerShape(avatarSize / 2))
.onClick {
onOpenImage?.invoke(communityIcon)
},
url = communityIcon,
quality = FilterQuality.Low,
contentDescription = null,
contentScale = ContentScale.FillBounds,
)
} else {
PlaceholderImage(
size = avatarSize,
title = community.name,
)
}
// textual data
Column(
verticalArrangement = Arrangement.spacedBy(Spacing.s),
Row(
modifier = Modifier.fillMaxWidth().align(Alignment.Center),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(Spacing.m)
) {
Text(
text = community.name,
style = MaterialTheme.typography.titleLarge,
color = MaterialTheme.colorScheme.onBackground,
)
// avatar
val communityIcon = community.icon.orEmpty()
val avatarSize = 60.dp
if (communityIcon.isNotEmpty() && autoLoadImages) {
CustomImage(
modifier = Modifier
.padding(Spacing.xxxs)
.size(avatarSize)
.clip(RoundedCornerShape(avatarSize / 2))
.onClick {
onOpenImage?.invoke(communityIcon)
},
url = communityIcon,
quality = FilterQuality.Low,
contentDescription = null,
contentScale = ContentScale.FillBounds,
)
} else {
PlaceholderImage(
size = avatarSize,
title = community.name,
)
}
Text(
modifier = Modifier.padding(horizontal = Spacing.s),
text = buildString {
append(community.name)
if (community.host.isNotEmpty()) {
append("@${community.host}")
}
},
maxLines = 1,
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.titleSmall,
color = MaterialTheme.colorScheme.onBackground,
)
// textual data
Column(
verticalArrangement = Arrangement.spacedBy(Spacing.s),
) {
Text(
text = community.name,
style = MaterialTheme.typography.titleLarge,
color = MaterialTheme.colorScheme.onBackground,
)
Text(
modifier = Modifier.padding(horizontal = Spacing.s),
text = buildString {
append(community.name)
if (community.host.isNotEmpty()) {
append("@${community.host}")
}
},
maxLines = 1,
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.titleSmall,
color = MaterialTheme.colorScheme.onBackground,
)
}
}
}
}

8
core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/components/UserHeader.kt
View File

@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
@ -47,13 +46,14 @@ import dev.icerock.moko.resources.compose.stringResource
@Composable
fun UserHeader(
user: UserModel,
modifier: Modifier = Modifier,
autoLoadImages: Boolean = true,
options: List<String> = emptyList(),
onOptionSelected: ((Int) -> Unit)? = null,
onOpenImage: ((String) -> Unit)? = null,
) {
Box(
modifier = Modifier.padding(Spacing.xs),
modifier = modifier.fillMaxWidth().padding(Spacing.s),
) {
// banner
val banner = user.banner.orEmpty()
@ -62,7 +62,7 @@ fun UserHeader(
modifier = Modifier.fillMaxWidth().aspectRatio(4.5f),
url = banner,
quality = FilterQuality.Low,
contentScale = ContentScale.FillBounds,
contentScale = ContentScale.FillWidth,
contentDescription = null,
)
}
@ -110,7 +110,7 @@ fun UserHeader(
}
Row(
modifier = Modifier.fillMaxSize(),
modifier = Modifier.fillMaxWidth().align(Alignment.Center),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(Spacing.m)
) {