Skip to content

Fix small border of zoom out marker, add shadow #84

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
QuocNguyen-w3w merged 1 commit into from
Jan 20, 2025
Merged

Fix small border of zoom out marker, add shadow #84

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
29 changes: 19 additions & 10 deletions lib-compose/src/main/java/com/what3words/components/compose/maps/utils/BitmapUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,23 +75,27 @@ fun getPinBitmap(

return getBitMapFromPathData(
listOf(
DrawPath(context.getString(R.string.path_pin_circle),
Paint().apply {
style = Paint.Style.STROKE
strokeWidth = 2f * density
isAntiAlias = true
color = android.graphics.Color.WHITE
}
),
DrawPath(context.getString(R.string.path_pin_circle),
Paint().apply {
color = colorMarker.background.toArgb()
// Draw shadow with radius 3dp (+2dp) of the stroke
// The design has 2 shadow layers
setShadowLayer(5 * density, 0f, 0f, Color(0x26000000).toArgb())
setShadowLayer(4 * density, 0f, 0f, Color(0x4D000000).toArgb())
}
),
DrawPath(context.getString(R.string.path_pin_slashes),
Paint().apply {
color = colorMarker.slash.toArgb()
}
),
DrawPath(context.getString(R.string.path_pin_circle),
Paint().apply {
style = Paint.Style.STROKE
strokeWidth = 2f * density
isAntiAlias = true
color = android.graphics.Color.WHITE
}
)
),
pinSize,
Expand All @@ -109,15 +113,17 @@ fun getBitMapFromPathData(
listDrawPath: List<DrawPath>,
width: Int,
height: Int,
scaleFactor: Float
scaleFactor: Float,
padding: Int = 4, // Default padding for shadow in dp
): Bitmap {
// Calculate scaled dimensions
val widthScaled = (width * scaleFactor).toInt()
val heightScaled = (height * scaleFactor).toInt()
val paddingPx = (padding * scaleFactor).toInt()

// Create a Bitmap of the target size
val bitmap = try {
Bitmap.createBitmap(widthScaled, heightScaled, Bitmap.Config.ARGB_8888)
Bitmap.createBitmap(widthScaled + paddingPx * 2, heightScaled + paddingPx * 2, Bitmap.Config.ARGB_8888)
} catch (e: OutOfMemoryError) {
throw IllegalArgumentException("Bitmap too large to allocate", e)
}
Expand All @@ -128,6 +134,9 @@ fun getBitMapFromPathData(
// Create and apply scaling transformation
val matrix = Matrix().apply { setScale(scaleFactor, scaleFactor) }

// Translate canvas to account for padding
canvas.translate(paddingPx.toFloat(), paddingPx.toFloat())

// Draw each path onto the canvas
listDrawPath.forEach { drawPath ->
try {
Expand Down
Loading