mirror of
https://github.com/LiveFastEatTrashRaccoon/RaccoonForLemmy.git
synced 2025-02-09 17:00:42 +01:00
fix home and inbox title, text and footer padding (#802)
This commit is contained in:
Diego Beraldin
GitHub
parent
ddb51e2ed0
commit
621d9f971d
@ -110,7 +110,7 @@ fun InboxCard(
|
||||
modifier = Modifier.padding(
|
||||
start = Spacing.s,
|
||||
end = Spacing.s,
|
||||
top = Spacing.xs,
|
||||
top = Spacing.s,
|
||||
),
|
||||
creator = mention.creator,
|
||||
community = mention.community,
|
||||
|
||||
@ -78,7 +78,7 @@ fun InboxReplySubtitle(
|
||||
onOptionSelected: ((OptionId) -> Unit)? = null,
|
||||
onReply: (() -> Unit)? = null,
|
||||
) {
|
||||
val buttonModifier = Modifier.size(IconSize.m).padding(3.dp)
|
||||
val buttonModifier = Modifier.size(IconSize.m)
|
||||
val themeRepository = remember { getThemeRepository() }
|
||||
val upVoteColor by themeRepository.upVoteColor.collectAsState()
|
||||
val downVoteColor by themeRepository.downVoteColor.collectAsState()
|
||||
@ -90,6 +90,7 @@ fun InboxReplySubtitle(
|
||||
|
||||
Column(
|
||||
modifier = modifier,
|
||||
verticalArrangement = Arrangement.spacedBy(Spacing.xxs),
|
||||
) {
|
||||
val communityName = community?.readableName(preferNicknames).orEmpty()
|
||||
val communityIcon = community?.icon.orEmpty()
|
||||
@ -97,6 +98,7 @@ fun InboxReplySubtitle(
|
||||
val creatorAvatar = creator?.avatar.orEmpty()
|
||||
if (communityName.isNotEmpty() || creatorName.isNotEmpty()) {
|
||||
Row(
|
||||
modifier = Modifier.padding(horizontal = Spacing.xxs),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(Spacing.xs),
|
||||
) {
|
||||
@ -176,119 +178,130 @@ fun InboxReplySubtitle(
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Box {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(Spacing.xxs),
|
||||
) {
|
||||
Icon(
|
||||
modifier = buttonModifier.padding(1.dp)
|
||||
.onClick(
|
||||
Box {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(Spacing.xxs),
|
||||
) {
|
||||
Icon(
|
||||
modifier = buttonModifier.padding(
|
||||
top = 3.5.dp,
|
||||
bottom = 3.5.dp,
|
||||
end = 3.5.dp,
|
||||
).onClick(
|
||||
onClick = {
|
||||
onReply?.invoke()
|
||||
},
|
||||
),
|
||||
imageVector = Icons.AutoMirrored.Default.Chat,
|
||||
contentDescription = null,
|
||||
tint = ancillaryColor,
|
||||
)
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
) {
|
||||
Icon(
|
||||
modifier = Modifier.size(IconSize.s).padding(0.5.dp),
|
||||
imageVector = Icons.Default.Schedule,
|
||||
imageVector = Icons.AutoMirrored.Default.Chat,
|
||||
contentDescription = null,
|
||||
tint = ancillaryColor,
|
||||
)
|
||||
Text(
|
||||
modifier = Modifier.padding(start = Spacing.xxs),
|
||||
text = date?.prettifyDate() ?: "",
|
||||
style = MaterialTheme.typography.labelMedium,
|
||||
color = ancillaryColor,
|
||||
)
|
||||
}
|
||||
if (options.isNotEmpty()) {
|
||||
Icon(
|
||||
modifier = Modifier.size(IconSize.m)
|
||||
.padding(Spacing.xs)
|
||||
.onGloballyPositioned {
|
||||
optionsOffset = it.positionInParent()
|
||||
}
|
||||
.onClick(
|
||||
onClick = {
|
||||
optionsExpanded = true
|
||||
},
|
||||
),
|
||||
imageVector = Icons.Default.MoreHoriz,
|
||||
contentDescription = null,
|
||||
tint = ancillaryColor
|
||||
)
|
||||
}
|
||||
Spacer(modifier = Modifier.weight(1f))
|
||||
FeedbackButton(
|
||||
modifier = buttonModifier.onClick(),
|
||||
imageVector = Icons.Default.ArrowCircleUp,
|
||||
tintColor = if (upVoted) {
|
||||
upVoteColor ?: defaultUpvoteColor
|
||||
} else {
|
||||
ancillaryColor
|
||||
},
|
||||
onClick = {
|
||||
onUpVote?.invoke()
|
||||
},
|
||||
)
|
||||
if (showScores) {
|
||||
Text(
|
||||
text = formatToReadableValue(
|
||||
voteFormat = voteFormat,
|
||||
score = score,
|
||||
upVotes = upVotes,
|
||||
downVotes = downVotes,
|
||||
upVoteColor = upVoteColor ?: defaultUpvoteColor,
|
||||
downVoteColor = downVoteColor ?: defaultDownVoteColor,
|
||||
upVoted = upVoted,
|
||||
downVoted = downVoted,
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
) {
|
||||
Icon(
|
||||
modifier = Modifier.size(IconSize.s).padding(0.5.dp),
|
||||
imageVector = Icons.Default.Schedule,
|
||||
contentDescription = null,
|
||||
tint = ancillaryColor,
|
||||
)
|
||||
Text(
|
||||
modifier = Modifier.padding(start = Spacing.xxs),
|
||||
text = date?.prettifyDate() ?: "",
|
||||
style = MaterialTheme.typography.labelMedium,
|
||||
color = ancillaryColor,
|
||||
)
|
||||
}
|
||||
if (options.isNotEmpty()) {
|
||||
Icon(
|
||||
modifier = Modifier.size(IconSize.m)
|
||||
.padding(Spacing.xs)
|
||||
.onGloballyPositioned {
|
||||
optionsOffset = it.positionInParent()
|
||||
}
|
||||
.onClick(
|
||||
onClick = {
|
||||
optionsExpanded = true
|
||||
},
|
||||
),
|
||||
imageVector = Icons.Default.MoreHoriz,
|
||||
contentDescription = null,
|
||||
tint = ancillaryColor
|
||||
)
|
||||
}
|
||||
Spacer(modifier = Modifier.weight(1f))
|
||||
FeedbackButton(
|
||||
modifier = buttonModifier.padding(
|
||||
top = 2.5.dp,
|
||||
bottom = 2.5.dp,
|
||||
end = 2.5.dp,
|
||||
),
|
||||
style = MaterialTheme.typography.labelMedium,
|
||||
color = ancillaryColor,
|
||||
)
|
||||
}
|
||||
FeedbackButton(
|
||||
modifier = buttonModifier.onClick(),
|
||||
imageVector = Icons.Default.ArrowCircleDown,
|
||||
tintColor = if (downVoted) {
|
||||
downVoteColor ?: defaultDownVoteColor
|
||||
} else {
|
||||
ancillaryColor
|
||||
},
|
||||
onClick = {
|
||||
onDownVote?.invoke()
|
||||
},
|
||||
)
|
||||
}
|
||||
CustomDropDown(
|
||||
expanded = optionsExpanded,
|
||||
onDismiss = {
|
||||
optionsExpanded = false
|
||||
},
|
||||
offset = DpOffset(
|
||||
x = optionsOffset.x.toLocalDp(),
|
||||
y = optionsOffset.y.toLocalDp(),
|
||||
),
|
||||
) {
|
||||
options.forEach { option ->
|
||||
DropdownMenuItem(
|
||||
text = {
|
||||
Text(option.text)
|
||||
imageVector = Icons.Default.ArrowCircleUp,
|
||||
tintColor = if (upVoted) {
|
||||
upVoteColor ?: defaultUpvoteColor
|
||||
} else {
|
||||
ancillaryColor
|
||||
},
|
||||
onClick = {
|
||||
optionsExpanded = false
|
||||
onOptionSelected?.invoke(option.id)
|
||||
onUpVote?.invoke()
|
||||
},
|
||||
)
|
||||
if (showScores) {
|
||||
Text(
|
||||
text = formatToReadableValue(
|
||||
voteFormat = voteFormat,
|
||||
score = score,
|
||||
upVotes = upVotes,
|
||||
downVotes = downVotes,
|
||||
upVoteColor = upVoteColor ?: defaultUpvoteColor,
|
||||
downVoteColor = downVoteColor ?: defaultDownVoteColor,
|
||||
upVoted = upVoted,
|
||||
downVoted = downVoted,
|
||||
),
|
||||
style = MaterialTheme.typography.labelMedium,
|
||||
color = ancillaryColor,
|
||||
)
|
||||
}
|
||||
FeedbackButton(
|
||||
modifier = buttonModifier.padding(
|
||||
top = 2.5.dp,
|
||||
bottom = 2.5.dp,
|
||||
start = 2.5.dp,
|
||||
),
|
||||
imageVector = Icons.Default.ArrowCircleDown,
|
||||
tintColor = if (downVoted) {
|
||||
downVoteColor ?: defaultDownVoteColor
|
||||
} else {
|
||||
ancillaryColor
|
||||
},
|
||||
onClick = {
|
||||
onDownVote?.invoke()
|
||||
},
|
||||
)
|
||||
}
|
||||
CustomDropDown(
|
||||
expanded = optionsExpanded,
|
||||
onDismiss = {
|
||||
optionsExpanded = false
|
||||
},
|
||||
offset = DpOffset(
|
||||
x = optionsOffset.x.toLocalDp(),
|
||||
y = optionsOffset.y.toLocalDp(),
|
||||
),
|
||||
) {
|
||||
options.forEach { option ->
|
||||
DropdownMenuItem(
|
||||
text = {
|
||||
Text(option.text)
|
||||
},
|
||||
onClick = {
|
||||
optionsExpanded = false
|
||||
onOptionSelected?.invoke(option.id)
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.github.diegoberaldin.raccoonforlemmy.core.commonui.lemmyui
|
||||
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.collectAsState
|
||||
@ -10,6 +11,7 @@ import androidx.compose.ui.platform.LocalUriHandler
|
||||
import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.font.FontStyle
|
||||
import com.github.diegoberaldin.raccoonforlemmy.core.appearance.di.getThemeRepository
|
||||
import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.Spacing
|
||||
import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.readContentAlpha
|
||||
import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.toTypography
|
||||
import com.github.diegoberaldin.raccoonforlemmy.core.markdown.CustomMarkdownWrapper
|
||||
@ -51,7 +53,7 @@ fun PostCardBody(
|
||||
|
||||
if (text.isNotEmpty()) {
|
||||
CustomMarkdownWrapper(
|
||||
modifier = modifier,
|
||||
modifier = modifier.padding(horizontal = Spacing.xxs),
|
||||
content = text,
|
||||
maxLines = maxLines,
|
||||
autoLoadImages = autoLoadImages,
|
||||
|
||||
@ -91,13 +91,17 @@ fun PostCardFooter(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(Spacing.xxs),
|
||||
) {
|
||||
val buttonModifier = Modifier.size(IconSize.m).padding(2.5.dp)
|
||||
val buttonModifier = Modifier.size(IconSize.m)
|
||||
if (comments != null) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
) {
|
||||
Icon(
|
||||
modifier = buttonModifier.padding(1.dp)
|
||||
modifier = buttonModifier.padding(
|
||||
top = 3.5.dp,
|
||||
end = 3.5.dp,
|
||||
bottom = 3.5.dp,
|
||||
)
|
||||
.onClick(
|
||||
onClick = {
|
||||
onReply?.invoke()
|
||||
@ -183,7 +187,11 @@ fun PostCardFooter(
|
||||
Spacer(modifier = Modifier.weight(1f))
|
||||
if (actionButtonsActive) {
|
||||
FeedbackButton(
|
||||
modifier = buttonModifier,
|
||||
modifier = buttonModifier.padding(
|
||||
top = 2.5.dp,
|
||||
bottom = 2.5.dp,
|
||||
end = 2.5.dp,
|
||||
),
|
||||
imageVector = if (!saved) {
|
||||
Icons.Default.BookmarkBorder
|
||||
} else {
|
||||
@ -200,7 +208,7 @@ fun PostCardFooter(
|
||||
)
|
||||
}
|
||||
FeedbackButton(
|
||||
modifier = buttonModifier,
|
||||
modifier = buttonModifier.padding(all = 2.5.dp),
|
||||
imageVector = if (actionButtonsActive) {
|
||||
Icons.Default.ArrowCircleUp
|
||||
} else {
|
||||
@ -232,7 +240,11 @@ fun PostCardFooter(
|
||||
)
|
||||
}
|
||||
FeedbackButton(
|
||||
modifier = buttonModifier,
|
||||
modifier = buttonModifier.padding(
|
||||
top = 2.5.dp,
|
||||
bottom = 2.5.dp,
|
||||
end = 2.5.dp,
|
||||
),
|
||||
imageVector = if (actionButtonsActive) {
|
||||
Icons.Default.ArrowCircleDown
|
||||
} else {
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.github.diegoberaldin.raccoonforlemmy.core.commonui.lemmyui
|
||||
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.collectAsState
|
||||
@ -11,6 +12,7 @@ import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.font.FontStyle
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import com.github.diegoberaldin.raccoonforlemmy.core.appearance.di.getThemeRepository
|
||||
import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.Spacing
|
||||
import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.readContentAlpha
|
||||
import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.toTypography
|
||||
import com.github.diegoberaldin.raccoonforlemmy.core.markdown.CustomMarkdownWrapper
|
||||
@ -61,7 +63,7 @@ fun PostCardTitle(
|
||||
val additionalAlphaFactor = if (markRead) readContentAlpha else 1f
|
||||
|
||||
CustomMarkdownWrapper(
|
||||
modifier = modifier,
|
||||
modifier = modifier.padding(horizontal = Spacing.xxs),
|
||||
content = text,
|
||||
autoLoadImages = autoLoadImages,
|
||||
typography = markdownTypography(
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user