Skip to content

Commit b81f8ae

Browse files
authored
Fixes AND-153 (#269)
* Update token placeholder * Add error placeholder
1 parent 1aadc72 commit b81f8ae

File tree

8 files changed

+29
-20
lines changed

8 files changed

+29
-20
lines changed

app/src/main/java/com/concordium/wallet/ui/cis2/SendTokenActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ class SendTokenActivity : BaseActivity(R.layout.activity_send_token, R.string.ci
333333
.load(tokenMetadata.thumbnail.url)
334334
.override(resources.getDimensionPixelSize(R.dimen.cis_token_icon_size))
335335
.placeholder(ThemedCircularProgressDrawable(this))
336+
.error(R.drawable.mw24_ic_token_placeholder)
336337
.fitCenter()
337338
.into(binding.tokenIcon)
338339
} else if (token.isCcd) {
@@ -341,7 +342,7 @@ class SendTokenActivity : BaseActivity(R.layout.activity_send_token, R.string.ci
341342
.into(binding.tokenIcon)
342343
} else {
343344
Glide.with(this)
344-
.load(R.drawable.ic_token_no_image)
345+
.load(R.drawable.mw24_ic_token_placeholder)
345346
.into(binding.tokenIcon)
346347
}
347348
}

app/src/main/java/com/concordium/wallet/ui/cis2/TokenDetailsActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,14 +298,15 @@ class TokenDetailsActivity : BaseActivity(R.layout.activity_token_details),
298298
}
299299
!thumbnail.isNullOrBlank() -> loadImage(iconView, thumbnail)
300300
isCCD -> iconView.setImageResource(R.drawable.mw24_ic_ccd)
301-
else -> iconView.setImageResource(R.drawable.ic_token_no_image)
301+
else -> iconView.setImageResource(R.drawable.mw24_ic_token_placeholder)
302302
}
303303
}
304304

305305
private fun loadImage(view: AppCompatImageView, url: String) {
306306
Glide.with(view.context)
307307
.load(url)
308308
.placeholder(ThemedCircularProgressDrawable(view.context))
309+
.error(R.drawable.mw24_ic_token_placeholder)
309310
.fitCenter()
310311
.into(view)
311312
}

app/src/main/java/com/concordium/wallet/ui/cis2/TokensAccountDetailsAdapter.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ class TokensAccountDetailsAdapter(
9595
.load(tokenMetadata.thumbnail.url)
9696
.override(iconSize)
9797
.placeholder(ThemedCircularProgressDrawable(context))
98+
.error(R.drawable.mw24_ic_token_placeholder)
9899
.fitCenter()
99100
.into(holder.binding.tokenIcon)
100101
} else if (token.isCcd) {
@@ -121,7 +122,7 @@ class TokensAccountDetailsAdapter(
121122
}
122123
} else {
123124
Glide.with(context)
124-
.load(R.drawable.ic_token_no_image)
125+
.load(R.drawable.mw24_ic_token_placeholder)
125126
.into(holder.binding.tokenIcon)
126127
}
127128

app/src/main/java/com/concordium/wallet/ui/cis2/manage/AddTokenDetailsActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class AddTokenDetailsActivity : BaseActivity(
7272
tokenMetadata.display?.url?.let { loadImage(binding.detailsLayout.nftIcon, it) }
7373
}
7474
} else {
75-
binding.detailsLayout.icon.setImageResource(R.drawable.ic_token_no_image)
75+
binding.detailsLayout.icon.setImageResource(R.drawable.mw24_ic_token_placeholder)
7676
}
7777
binding.detailsLayout.name.text = name
7878
}
@@ -81,6 +81,7 @@ class AddTokenDetailsActivity : BaseActivity(
8181
Glide.with(view.context)
8282
.load(url)
8383
.placeholder(ThemedCircularProgressDrawable(view.context))
84+
.error(R.drawable.mw24_ic_token_placeholder)
8485
.fitCenter()
8586
.into(view)
8687
}

app/src/main/java/com/concordium/wallet/ui/cis2/manage/ManageTokensListAdapter.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,14 @@ class ManageTokensListAdapter(
6363
.placeholder(ThemedCircularProgressDrawable(context))
6464
.override(iconSize)
6565
.fitCenter()
66+
.error(R.drawable.mw24_ic_token_placeholder)
6667
.into(holder.binding.tokenIcon)
6768
} else if (token.isCcd) {
6869
Glide.with(context)
6970
.load(R.drawable.mw24_ic_ccd)
7071
.into(holder.binding.tokenIcon)
7172
} else if (tokenMetadata != null) {
72-
holder.binding.tokenIcon.setImageResource(R.drawable.ic_token_no_image)
73+
holder.binding.tokenIcon.setImageResource(R.drawable.mw24_ic_token_placeholder)
7374
} else {
7475
// While the metadata is loading, show progress in the icon view.
7576
holder.binding.tokenIcon.setImageDrawable(ThemedCircularProgressDrawable(context))

app/src/main/java/com/concordium/wallet/ui/cis2/manage/ManageTokensSelectionAdapter.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,12 @@ class ManageTokensSelectionAdapter(
5050
Glide.with(context)
5151
.load(thumbnailUrl)
5252
.placeholder(ThemedCircularProgressDrawable(context))
53+
.error(R.drawable.mw24_ic_token_placeholder)
5354
.override(iconSize)
5455
.fitCenter()
5556
.into(holder.binding.tokenIcon)
5657
} else if (tokenMetadata != null) {
57-
holder.binding.tokenIcon.setImageResource(R.drawable.ic_token_no_image)
58+
holder.binding.tokenIcon.setImageResource(R.drawable.mw24_ic_token_placeholder)
5859
} else {
5960
// While the metadata is loading, show progress in the icon view.
6061
holder.binding.tokenIcon.setImageDrawable(ThemedCircularProgressDrawable(context))

app/src/main/res/drawable/ic_token_no_image.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="20dp"
3+
android:height="20dp"
4+
android:viewportWidth="20"
5+
android:viewportHeight="20">
6+
<group>
7+
<clip-path
8+
android:pathData="M0,0h20v20h-20z"/>
9+
<path
10+
android:pathData="M10,7.012L12.988,10L10,12.988L7.012,10L10,7.012Z"
11+
android:fillColor="#8D9297"/>
12+
<path
13+
android:pathData="M10,20C15.523,20 20,15.523 20,10C20,4.477 15.523,0 10,0C4.477,0 0,4.477 0,10C0,15.523 4.477,20 10,20ZM14.167,8.821L11.179,5.833C10.528,5.182 9.472,5.182 8.821,5.833L5.833,8.821C5.182,9.472 5.182,10.528 5.833,11.179L8.821,14.167C9.472,14.818 10.528,14.818 11.179,14.167L14.167,11.179C14.818,10.528 14.818,9.472 14.167,8.821Z"
14+
android:fillColor="#8D9297"
15+
android:fillType="evenOdd"/>
16+
</group>
17+
</vector>

0 commit comments

Comments
 (0)