mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-12-22 07:44:00 +01:00
Fix annoying issue detected by lint (CheckResult) and consider that's errors from now
This commit is contained in:
parent
938540d9e9
commit
449eac0d99
@ -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 -->
|
||||
|
@ -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()
|
||||
|
@ -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)
|
||||
|
@ -312,6 +312,7 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
|
||||
_viewEvents.post(RoomSettingsViewEvents.Failure(it))
|
||||
}
|
||||
)
|
||||
.disposeOnClear()
|
||||
}
|
||||
|
||||
private fun postLoading(isLoading: Boolean) {
|
||||
|
Loading…
Reference in New Issue
Block a user