From 2def8c8aeb315a38053306b5e104d83c9e57117f Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 27 Apr 2023 11:34:33 +0200 Subject: [PATCH] Manage new and older way of displaying pictures --- .../pokeranalytics/android/ui/view/PlayerImageView.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt index 34888d01..7ffcdbd6 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt @@ -13,6 +13,7 @@ import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat.getColor import androidx.core.content.res.ResourcesCompat +import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory import androidx.core.net.toUri import net.pokeranalytics.android.R import net.pokeranalytics.android.model.realm.Player @@ -93,7 +94,13 @@ class PlayerImageView : FrameLayout { // Picture player.picture?.let { picture -> Timber.d("picture = $picture") - this.playerImage.setImageURI(picture.toUri()) + if (picture.startsWith("content://")) { + this.playerImage.setImageURI(picture.toUri()) + } else { // older way + val rDrawable = RoundedBitmapDrawableFactory.create(resources, picture) + rDrawable.isCircular = true + this.playerImage.setImageDrawable(rDrawable) + } } ?: run { // no pic this.playerStroke.background = ResourcesCompat.getDrawable(resources, R.drawable.circle_stroke_kaki, null) this.playerImage.setImageDrawable(null)