jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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
parent e8e9278b82 449eac0d99
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="KotlinPropertyAccess" severity="error" />
<issue id="DefaultLocale" severity="error" />
<issue id="CheckResult" severity="error" />
<issue id="InvalidPackage">
<!-- 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>) {
val placeholder = getPlaceholderDrawable(matrixItem)
glideRequests.loadResolvedUrl(matrixItem.avatarUrl)
.apply {
.let {
when (matrixItem) {
is MatrixItem.SpaceItem -> {
transform(MultiTransformation(CenterCrop(), RoundedCorners(dimensionConverter.dpToPx(8))))
it.transform(MultiTransformation(CenterCrop(), RoundedCorners(dimensionConverter.dpToPx(8))))
}
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 {
return glideRequests
.asBitmap()
.apply {
.let {
val resolvedUrl = resolvedUrl(matrixItem.avatarUrl)
if (resolvedUrl != null) {
load(resolvedUrl)
it.load(resolvedUrl)
} else {
val avatarColor = matrixItemColorProvider.getColor(matrixItem)
load(TextDrawable.builder()
it.load(TextDrawable.builder()
.beginConfig()
.bold()
.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
GlideApp.with(holder.avatarView)
.load(directoryAvatarUrl)
.apply {
.let {
if (!includeAllNetworks) {
placeholder(R.drawable.network_matrix)
it.placeholder(R.drawable.network_matrix)
} else {
it
}
}
.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))
}
)
.disposeOnClear()
}
private fun postLoading(isLoading: Boolean) {