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

Jump to bottom

Make post pictures wider. Fixes #196 #218

Merged
merged 1 commit into from Oct 2, 2022
Merged

Make post pictures wider. Fixes #196 #218

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 4 additions & 10 deletions app/src/main/java/com/jerboa/ui/components/common/PictrsImage.kt
View file
Open in desktop
Expand Up @@ -18,7 +18,6 @@ import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import coil.annotation.ExperimentalCoilApi
import coil.compose.rememberImagePainter
import coil.size.OriginalSize
Expand Down Expand Up @@ -94,23 +93,18 @@ fun PictrsUrlImage(
modifier: Modifier = Modifier
) {
val configuration = LocalConfiguration.current
val screenHeight = (configuration.screenHeightDp - 150).dp

Image(
painter = rememberImagePainter(
data = pictrsImageThumbnail(url, MAX_IMAGE_SIZE),
builder = {
size(OriginalSize)
crossfade(true)
placeholder(R.drawable.ic_launcher_foreground)
transformations(RoundedCornersTransformation(12f))
}
),
contentScale = ContentScale.Fit,
contentScale = ContentScale.FillWidth,
contentDescription = null,
modifier = modifier
.fillMaxWidth()
.heightIn(100.dp, screenHeight)
modifier = modifier.fillMaxWidth()
)
}

Expand All @@ -129,9 +123,9 @@ fun PictrsBannerImage(
placeholder(R.drawable.ic_launcher_foreground)
}
),
contentScale = ContentScale.Crop,
contentScale = ContentScale.FillWidth,
contentDescription = null,
modifier = modifier
modifier = modifier.fillMaxWidth()
)
}

Expand Down
28 changes: 16 additions & 12 deletions app/src/main/java/com/jerboa/ui/components/post/PostListing.kt
View file
Open in desktop
Expand Up @@ -37,10 +37,12 @@ fun PostHeaderLine(
onPersonClick: (personId: Int) -> Unit,
isModerator: Boolean,
isSameInstance: Boolean = false,
showCommunityName: Boolean = true
showCommunityName: Boolean = true,
modifier: Modifier = Modifier
) {
FlowRow(
crossAxisAlignment = FlowCrossAxisAlignment.Center
crossAxisAlignment = FlowCrossAxisAlignment.Center,
modifier = modifier
) {
if (postView.post.stickied) {
Icon(
Expand Down Expand Up @@ -163,11 +165,10 @@ fun PostTitleAndImageLink(
text = postView.post.name,
style = MaterialTheme.typography.subtitle1,
color = if (postView.read) { MaterialTheme.colors.onBackground.muted } else { MaterialTheme.colors.onSurface },
modifier = Modifier.padding(bottom = MEDIUM_PADDING)
modifier = Modifier.padding(bottom = MEDIUM_PADDING, start = LARGE_PADDING, end = LARGE_PADDING)
)

val postLinkPicMod = Modifier
.fillMaxWidth()
.clickable { onPostLinkClick(url) }
PictrsUrlImage(
url = url,
Expand All @@ -189,7 +190,7 @@ fun PostTitleAndThumbnail(
text = post.name,
style = MaterialTheme.typography.subtitle1,
color = if (postView.read) { MaterialTheme.colors.onBackground.muted } else { MaterialTheme.colors.onSurface },
modifier = Modifier.weight(1f)
modifier = Modifier.weight(1f).padding(horizontal = LARGE_PADDING)
)

post.url?.also { url ->
Expand Down Expand Up @@ -251,7 +252,7 @@ fun PostBody(
Card(
shape = MaterialTheme.shapes.medium,
modifier = Modifier
.padding(vertical = MEDIUM_PADDING)
.padding(vertical = MEDIUM_PADDING, horizontal = LARGE_PADDING)
.fillMaxWidth(),
elevation = BODY_ELEVATION,
content = {
Expand Down Expand Up @@ -300,7 +301,8 @@ fun PostFooterLine(
onBlockCreatorClick: (person: PersonSafe) -> Unit,
onBlockCommunityClick: (community: CommunitySafe) -> Unit,
showReply: Boolean = false,
account: Account?
account: Account?,
modifier: Modifier = Modifier
) {
// TODO val score = postView.counts.score
val myVote = postView.my_vote
Expand Down Expand Up @@ -344,7 +346,7 @@ fun PostFooterLine(
Row(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
modifier = modifier
.fillMaxWidth()
.padding(bottom = SMALL_PADDING)
) {
Expand Down Expand Up @@ -576,7 +578,7 @@ fun PostListing(
.clickable { onPostClick(postView) }
) {
Column(
modifier = Modifier.padding(vertical = MEDIUM_PADDING, horizontal = LARGE_PADDING),
modifier = Modifier.padding(vertical = MEDIUM_PADDING),
verticalArrangement = Arrangement.spacedBy(LARGE_PADDING)
) {
// Header
Expand All @@ -586,7 +588,8 @@ fun PostListing(
onPersonClick = onPersonClick,
isModerator = isModerator,
isSameInstance = postView.post.url?.let { hostName(it) } == account?.instance,
showCommunityName = showCommunityName
showCommunityName = showCommunityName,
modifier = Modifier.padding(horizontal = LARGE_PADDING)
)

// Title + metadata
Expand All @@ -610,7 +613,8 @@ fun PostListing(
onBlockCommunityClick = onBlockCommunityClick,
onBlockCreatorClick = onBlockCreatorClick,
showReply = showReply,
account = account
account = account,
modifier = Modifier.padding(horizontal = LARGE_PADDING)
)
}
}
Expand Down Expand Up @@ -644,7 +648,7 @@ fun MetadataCard(post: Post) {
Card(
shape = MaterialTheme.shapes.medium,
modifier = Modifier
.padding(vertical = MEDIUM_PADDING)
.padding(vertical = MEDIUM_PADDING, horizontal = LARGE_PADDING)
.fillMaxWidth(),
elevation = BODY_ELEVATION,
content = {
Expand Down