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

[SES-337] Add rounded corners to thumbnail in QuoteView #1285

Merged
merged 8 commits into from
Jun 30, 2024
Merged

[SES-337] Add rounded corners to thumbnail in QuoteView #1285

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1d5d147
Add rounded corners to thumbnail in QuoteView
bemusementpark Jul 31, 2023
67fb05f
Simplify ThumbnailView
bemusementpark Aug 9, 2023
4a403d4
Cleanup ThumbnailView
bemusementpark Aug 10, 2023
54cf63e
Merge branch 'oxen-io:master' into quote-corners
AL-Session Apr 3, 2024
8449470
Merge branch 'dev' into pr/1285
ThomasSession Jun 26, 2024
67f899f
Removed include custom attributes
ThomasSession Jun 26, 2024
5337f57
Clipping whole thumbnail view instead of just the image requests
ThomasSession Jun 27, 2024
dbc6735
Merge branch 'dev' into pr/1285
ThomasSession Jun 27, 2024
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
9 changes: 7 additions & 2 deletions app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/ThumbnailView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ open class ThumbnailView: FrameLayout {

val dimens = dimensDelegate.resourceSize()

val request = glide.load(DecryptableUri(slide.thumbnailUri!!))
var request = glide.load(DecryptableUri(slide.thumbnailUri!!))
.diskCacheStrategy(DiskCacheStrategy.NONE)
.let { request ->
if (dimens[WIDTH] == 0 || dimens[HEIGHT] == 0) {
Expand All @@ -150,7 +150,12 @@ open class ThumbnailView: FrameLayout {
}
}
.transition(DrawableTransitionOptions.withCrossFade())
.centerCrop()

request = if (radius > 0) {
bemusementpark marked this conversation as resolved.
Show resolved Hide resolved
request.transforms(CenterCrop(), RoundedCorners(radius))
} else {
request.transforms(CenterCrop())
}

return if (slide.isInProgress) request else request.apply(RequestOptions.errorOf(R.drawable.ic_missing_thumbnail_picture))
}
Expand Down