From 512ae24bee36fc8adaff650a135fc219e2265c65 Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 16 Apr 2024 10:06:22 +0530 Subject: [PATCH] feat: adjust position of dots and add checks feat: Don't draw empty notification dot --- .../com/android/launcher3/icons/DotRenderer.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java b/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java index 5209c092..b5bb3b79 100644 --- a/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java +++ b/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java @@ -145,11 +145,9 @@ public class DotRenderer { float dx = dotCenterX + offsetX; float dy = dotCenterY + offsetY - 15f; - if (numNotifications > 9 && numNotifications < 100) { - canvas.translate(dx - 3f, dy); - } else if (numNotifications > 99 && numNotifications < 1000) { - canvas.translate(dx + 6f, dy); - } else { + if (numNotifications > 9 && numNotifications < 1000) { + canvas.translate(dx - 17f, dy); + } else if (numNotifications > 0) { canvas.translate(dx - 12f, dy); } @@ -159,7 +157,7 @@ public class DotRenderer { if (numNotifications >= 10 && numNotifications < 1000) { canvas.drawRoundRect(new RectF(-mCircleRadius + 10, -mCircleRadius, mCircleRadius + 20, mCircleRadius), 50, 50, mCircleShadowPaint); canvas.drawRoundRect(new RectF(-mCircleRadius + 10, -mCircleRadius, mCircleRadius + 20, mCircleRadius), 50, 50, mCirclePaint); - } else { + } else if (numNotifications > 0) { canvas.drawCircle(5, 10, mCircleRadius, mCircleShadowPaint); canvas.drawCircle(5, 10, mCircleRadius, mCirclePaint); } @@ -175,11 +173,11 @@ public class DotRenderer { if (numNotifications < 10) { canvas.drawText(text, -4f, 22f, mTextPaint); } else if (numNotifications < 100) { - canvas.drawText(text, -4f, y, mTextPaint); + canvas.drawText(text, -3f, y, mTextPaint); } else if (numNotifications >= 1000) { canvas.drawText(text, -14f, 20f, mTextPaint); } else { - canvas.drawText(text, -14f, y, mTextPaint); + canvas.drawText(text, -12f, y, mTextPaint); } } -- GitLab