Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4002 from vector-im/feature/bma/fix_check_result

Browse Source 
Fix annoying issue detected by lint (CheckResult)
This commit is contained in:
Benoit Marty 2021-09-13 11:27:28 +02:00 committed by GitHub
commit 60004f02c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vector/lint.xml
View File

@ -47,6 +47,7 @@
<issue id="Recycle" severity="error" /> <issue id="Recycle" severity="error" />
<issue id="KotlinPropertyAccess" severity="error" /> <issue id="KotlinPropertyAccess" severity="error" />
<issue id="DefaultLocale" severity="error" /> <issue id="DefaultLocale" severity="error" />
<issue id="CheckResult" severity="error" />
<issue id="InvalidPackage"> <issue id="InvalidPackage">
<!-- Ignore error from HtmlCompressor lib --> <!-- Ignore error from HtmlCompressor lib -->

12
vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
View File

@ -138,13 +138,13 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
target: Target<Drawable>) { target: Target<Drawable>) {
val placeholder = getPlaceholderDrawable(matrixItem) val placeholder = getPlaceholderDrawable(matrixItem)
glideRequests.loadResolvedUrl(matrixItem.avatarUrl) glideRequests.loadResolvedUrl(matrixItem.avatarUrl)
.apply { .let {
when (matrixItem) { when (matrixItem) {
is MatrixItem.SpaceItem -> { is MatrixItem.SpaceItem -> {
transform(MultiTransformation(CenterCrop(), RoundedCorners(dimensionConverter.dpToPx(8)))) it.transform(MultiTransformation(CenterCrop(), RoundedCorners(dimensionConverter.dpToPx(8))))
} }
else -> { else -> {
apply(RequestOptions.circleCropTransform()) it.apply(RequestOptions.circleCropTransform())
} }
} }
} }
@ -157,13 +157,13 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
fun shortcutDrawable(glideRequests: GlideRequests, matrixItem: MatrixItem, iconSize: Int): Bitmap { fun shortcutDrawable(glideRequests: GlideRequests, matrixItem: MatrixItem, iconSize: Int): Bitmap {
return glideRequests return glideRequests
.asBitmap() .asBitmap()
.apply { .let {
val resolvedUrl = resolvedUrl(matrixItem.avatarUrl) val resolvedUrl = resolvedUrl(matrixItem.avatarUrl)
if (resolvedUrl != null) { if (resolvedUrl != null) {
load(resolvedUrl) it.load(resolvedUrl)
} else { } else {
val avatarColor = matrixItemColorProvider.getColor(matrixItem) val avatarColor = matrixItemColorProvider.getColor(matrixItem)
load(TextDrawable.builder() it.load(TextDrawable.builder()
.beginConfig() .beginConfig()
.bold() .bold()
.endConfig() .endConfig()

6
vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryItem.kt
View File

@ -60,9 +60,11 @@ abstract class RoomDirectoryItem : VectorEpoxyModel<RoomDirectoryItem.Holder>()
// Avatar // Avatar
GlideApp.with(holder.avatarView) GlideApp.with(holder.avatarView)
.load(directoryAvatarUrl) .load(directoryAvatarUrl)
.apply { .let {
if (!includeAllNetworks) { if (!includeAllNetworks) {
placeholder(R.drawable.network_matrix) it.placeholder(R.drawable.network_matrix)
} else {
it
} }
} }
.into(holder.avatarView) .into(holder.avatarView)

1
vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
View File

@ -312,6 +312,7 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
_viewEvents.post(RoomSettingsViewEvents.Failure(it)) _viewEvents.post(RoomSettingsViewEvents.Failure(it))
} }
) )
.disposeOnClear()
} }
private fun postLoading(isLoading: Boolean) { private fun postLoading(isLoading: Boolean) {