Skip to content

fix(notifications): pre-crop contact photo to circle to prevent adaptive icon clipping #828

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

Merged
bmc08gt merged 1 commit into from
Jun 2, 2026
+26 −5
Merged

fix(notifications): pre-crop contact photo to circle to prevent adaptive icon clipping #828

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
31 changes: 26 additions & 5 deletions ...hared/notifications/src/main/kotlin/com/flipcash/app/notifications/NotificationService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ import android.content.Intent
import android.content.pm.PackageManager
import android.os.Build
import android.graphics.Bitmap
import android.graphics.Canvas
import android.graphics.ImageDecoder
import android.graphics.Paint
import android.graphics.PorterDuff
import android.graphics.PorterDuffXfermode
import android.media.RingtoneManager
import androidx.core.app.ActivityCompat
import androidx.core.app.NotificationCompat
Expand Down Expand Up @@ -152,7 +156,7 @@ class NotificationService : FirebaseMessagingService(),
}

val notificationId = if (isContactChat) {
applyContactChatStyle(builder, groupKey, body)
builder.applyContactChatStyle(groupKey, body)
} else {
builder.setContentTitle(title).setContentText(body)
SecureRandom().nextInt(Int.MAX_VALUE)
Expand All @@ -173,8 +177,7 @@ class NotificationService : FirebaseMessagingService(),
}
}

private suspend fun applyContactChatStyle(
builder: NotificationCompat.Builder,
private suspend fun NotificationCompat.Builder.applyContactChatStyle(
groupKey: String,
body: String?,
): Int {
Expand All @@ -195,7 +198,7 @@ class NotificationService : FirebaseMessagingService(),
.setName(senderName)
.setKey(groupKey)
.apply {
if (contactPhoto != null) setIcon(IconCompat.createWithAdaptiveBitmap(contactPhoto))
if (contactPhoto != null) setIcon(IconCompat.createWithBitmap(contactPhoto.toCircularBitmap()))
}
.build()

Expand All @@ -209,7 +212,7 @@ class NotificationService : FirebaseMessagingService(),

style.addMessage(body.orEmpty(), System.currentTimeMillis(), senderPerson)

builder.setStyle(style)
setStyle(style)
.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)

return notificationId
Expand Down Expand Up @@ -253,6 +256,24 @@ class NotificationService : FirebaseMessagingService(),
}
}

private fun Bitmap.toCircularBitmap(): Bitmap {
val size = minOf(width, height)
val xOffset = (width - size) / 2
val yOffset = (height - size) / 2

val output = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
val canvas = Canvas(output)

val paint = Paint(Paint.ANTI_ALIAS_FLAG)
val half = size / 2f
canvas.drawCircle(half, half, half, paint)

paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.SRC_IN)
canvas.drawBitmap(this, -xOffset.toFloat(), -yOffset.toFloat(), paint)

return output
}

internal fun Context.buildContentIntent(navigation: NavigationTrigger?): PendingIntent {
val target = when (navigation) {
is NavigationTrigger.CurrencyInfo -> Intent(Intent.ACTION_VIEW).apply {
Expand Down
Loading