From 28699f594fc1a822ae9024120e8ed0eb5ff27630 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Fri, 5 Jul 2019 10:46:49 +0200 Subject: [PATCH] Avoid to display initial when user has an picture --- .../net/pokeranalytics/android/ui/view/PlayerImageView.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 5bed10e0..5ee94e8f 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 @@ -91,12 +91,12 @@ class PlayerImageView : FrameLayout { } else { NULL_TEXT } - playerImageView.playerInitial.text = playerInitial - playerImageView.playerInitial.setTextSize(TypedValue.COMPLEX_UNIT_SP, size.getFontSize()) // Picture if (player.hasPicture()) { + playerImageView.playerInitial.text = "" + Glide.with(this) .load(player.picture) .apply(RequestOptions().circleCrop()) @@ -106,6 +106,8 @@ class PlayerImageView : FrameLayout { } else { playerImageView.playerStroke.background = ResourcesCompat.getDrawable(resources, R.drawable.circle_stroke_kaki, null) playerImageView.playerImage.setImageDrawable(null) + playerImageView.playerInitial.text = playerInitial + playerImageView.playerInitial.setTextSize(TypedValue.COMPLEX_UNIT_SP, size.getFontSize()) } // Player color