srctree

Roee Hershberg parent c49e6ff4 dff83f9d
Move colorByContactStatus to AvatarImageView

atox/src/main/kotlin/ui/AvatarImageView.kt added: 9, removed: 9, total 0

@@ -5,6 +5,7 @@ import android.graphics.Canvas

import android.graphics.Paint

import android.net.Uri

import android.util.AttributeSet

import androidx.core.content.ContextCompat

import androidx.core.content.res.use

import androidx.core.view.doOnPreDraw

import com.google.android.material.imageview.ShapeableImageView

@@ -12,6 +13,7 @@ import kotlin.math.min

import kotlin.math.pow

import kotlin.math.sqrt

import ltd.evilcorp.atox.R

import ltd.evilcorp.core.vo.ConnectionStatus

import ltd.evilcorp.core.vo.Contact

import ltd.evilcorp.core.vo.UserStatus

@@ -32,6 +34,11 @@ class AvatarImageView @JvmOverloads constructor(context: Context, attrs: Attribu

0, 0

).use { it.getBoolean(R.styleable.AvatarImageView_statusIndicatorVisible, true) }

private fun colorByContactStatus(context: Context, contact: Contact) =

if (contact.connectionStatus == ConnectionStatus.None)

ContextCompat.getColor(context, R.color.statusOffline)

else colorFromStatus(context, contact.status)

private var name = ""

private var publicKey = ""

private var avatarUri = ""

atox/src/main/kotlin/ui/Util.kt added: 9, removed: 9, total 0

@@ -9,15 +9,8 @@ import android.content.res.Resources

import android.util.TypedValue

import androidx.core.content.ContextCompat

import ltd.evilcorp.atox.R

import ltd.evilcorp.core.vo.ConnectionStatus

import ltd.evilcorp.core.vo.Contact

import ltd.evilcorp.core.vo.UserStatus

internal fun colorByContactStatus(context: Context, contact: Contact) =

if (contact.connectionStatus == ConnectionStatus.None)

ContextCompat.getColor(context, R.color.statusOffline)

else colorFromStatus(context, contact.status)

internal fun colorFromStatus(context: Context, status: UserStatus) = when (status) {

UserStatus.None -> ContextCompat.getColor(context, R.color.statusAvailable)

UserStatus.Away -> ContextCompat.getColor(context, R.color.statusAway)