bitmessage/Abit
bitmessage/Abit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

🎨 minor multi-identicon improvements/fixes

Browse Source
This commit is contained in:
Christian Basler 2018-04-13 07:19:43 +02:00
parent 1426b786e8
commit a89f80f400
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/ch/dissem/apps/abit/Identicon.kt
View File

@ -124,7 +124,7 @@ class MultiIdenticon(input: List<BitmessageAddress>, @ColorInt private val backg
color = backgroundColor color = backgroundColor
} }
private val identicons = input.map { Identicon(it) }.take(4) private val identicons = input.sortedBy { it.isChan }.map { Identicon(it) }.take(4)
override fun draw(canvas: Canvas) { override fun draw(canvas: Canvas) {
val width = canvas.width.toFloat() val width = canvas.width.toFloat()
@ -145,17 +145,18 @@ class MultiIdenticon(input: List<BitmessageAddress>, @ColorInt private val backg
} }
} }
3 -> { 3 -> {
val scale = 1f / (1f + 2f * sqrt(3f)) val scale = 2f / (1f + 2f * sqrt(3f))
val w = width * scale val w = width * scale
val h = height * scale val h = height * scale
canvas.drawCircle(width / 2, height / 2, width / 2, paint)
identicons[0].draw(canvas, (width - w) / 2, 0f, w, h) identicons[0].draw(canvas, (width - w) / 2, 0f, w, h)
identicons[1].draw(canvas, (width - 2 * w) / 2, h * sqrt(3f) / 2, w, h) identicons[1].draw(canvas, (width - 2 * w) / 2, h * sqrt(3f) / 2, w, h)
identicons[2].draw(canvas, width / 2, h * sqrt(3f) / 2, w, h) identicons[2].draw(canvas, width / 2, h * sqrt(3f) / 2, w, h)
} }
4 -> { 4 -> {
canvas.drawCircle(width / 2, height / 2, width / 2, paint) canvas.drawCircle(width / 2, height / 2, width / 2, paint)
val scale = 1f / (1f + sqrt(2f)) val scale = 2f / (1f + sqrt(2f))
val borderScale = 0.5f - scale val borderScale = 0.5f - scale
val w = width * scale val w = width * scale
val h = height * scale val h = height * scale