Clear before setting resource (#4801)

MixinNetwork · Jul 22, 2024 · 44cf1e6 · 44cf1e6
1 parent 64b7f38
commit 44cf1e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/src/main/java/one/mixin/android/extension/ImageViewExtension.kt b/app/src/main/java/one/mixin/android/extension/ImageViewExtension.kt
@@ -37,7 +37,6 @@ fun ImageView.loadImage(
     onError: ((request: ImageRequest, result: ErrorResult) -> Unit)? = null,
     transformation: Transformation? = null,
 ) {
-    this.clear()
     this.load(data) {
         if (base64Holder != null) {
             placeholder(base64Holder.toDrawable(layoutParams.width, layoutParams.height))
@@ -69,7 +68,6 @@ fun ImageView.loadImageCompat(
     onError: ((request: ImageRequest, result: ErrorResult) -> Unit)? = null,
     transformation: Transformation? = null,
 ) {
-    this.clear()
     this.load(data) {
         if (base64Holder != null) {
             placeholder(base64Holder.toDrawable(layoutParams.width, layoutParams.height))
@@ -94,7 +92,6 @@ fun ImageView.loadImage(
     @DrawableRes holder: Int? = null,
     base64Holder: String? = null,
 ) {
-    this.clear()
     this.load(uri) {
         if (base64Holder != null) {
             placeholder(base64Holder.toDrawable(layoutParams.width, layoutParams.height))

diff --git a/app/src/main/java/one/mixin/android/widget/AvatarView.kt b/app/src/main/java/one/mixin/android/widget/AvatarView.kt
@@ -87,6 +87,7 @@ class AvatarView : ViewAnimator {
 
     fun setNet(padding: Int = context.dpToPx(8f)) {
         displayedChild = POS_AVATAR
+        avatarSimple.clear()
         avatarSimple.setBackgroundResource(R.drawable.bg_circle_70_solid_gray)
         avatarSimple.setImageResource(R.drawable.ic_transfer_address)
         avatarSimple.setPadding(padding)
@@ -95,15 +96,18 @@ class AvatarView : ViewAnimator {
     fun setDeposit() {
         displayedChild = POS_AVATAR
         avatarSimple.setImageResource(R.drawable.ic_snapshot_deposit)
+        avatarSimple.clear()
     }
 
     fun setWithdrawal() {
         displayedChild = POS_AVATAR
+        avatarSimple.clear()
         avatarSimple.setImageResource(R.drawable.ic_snapshot_withdrawal)
     }
 
     fun setAnonymous() {
         displayedChild = POS_AVATAR
+        avatarSimple.clear()
         avatarSimple.setImageResource(R.drawable.ic_snapshot_anonymous)
     }
 
@@ -120,6 +124,7 @@ class AvatarView : ViewAnimator {
         displayedChild =
             if (!url.isNullOrEmpty()) {
                 avatarSimple.setBackgroundResource(0)
+                avatarSimple.clear()
                 avatarSimple.setImageResource(0)
                 avatarSimple.setPadding(0)
                 avatarSimple.loadImage(url, R.drawable.ic_avatar_place_holder)