From c7241f5755a48056ab311a52e4bc9026680a8016 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 12 Feb 2021 20:35:24 +0100 Subject: [PATCH] Last missing ContentDescription --- .../VerificationConclusionController.kt | 5 +++-- .../BottomSheetVerificationBigImageItem.kt | 20 +++++-------------- .../VerificationQRWaitingController.kt | 3 ++- .../VerificationQrScannedByOtherController.kt | 3 ++- .../layout/item_verification_big_image.xml | 2 +- 5 files changed, 13 insertions(+), 20 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt index d12b2c088f..fec27d3e01 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt @@ -25,6 +25,7 @@ import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationA import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationBigImageItem import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem import im.vector.app.features.html.EventHtmlRenderer +import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel import javax.inject.Inject class VerificationConclusionController @Inject constructor( @@ -56,7 +57,7 @@ class VerificationConclusionController @Inject constructor( bottomSheetVerificationBigImageItem { id("image") - imageRes(R.drawable.ic_shield_trusted) + roomEncryptionTrustLevel(RoomEncryptionTrustLevel.Trusted) } bottomDone() @@ -69,7 +70,7 @@ class VerificationConclusionController @Inject constructor( bottomSheetVerificationBigImageItem { id("image") - imageRes(R.drawable.ic_shield_warning) + roomEncryptionTrustLevel(RoomEncryptionTrustLevel.Warning) } bottomSheetVerificationNoticeItem { diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt index a7625688c0..d0d7e5013b 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt @@ -16,13 +16,13 @@ */ package im.vector.app.features.crypto.verification.epoxy -import android.widget.ImageView -import androidx.core.view.ViewCompat import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import im.vector.app.R import im.vector.app.core.epoxy.VectorEpoxyHolder import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.ui.views.ShieldImageView +import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel /** * A action for bottom sheet. @@ -31,24 +31,14 @@ import im.vector.app.core.epoxy.VectorEpoxyModel abstract class BottomSheetVerificationBigImageItem : VectorEpoxyModel() { @EpoxyAttribute - var imageRes: Int = 0 - - @EpoxyAttribute - var contentDescription: String? = null + lateinit var roomEncryptionTrustLevel: RoomEncryptionTrustLevel override fun bind(holder: Holder) { super.bind(holder) - holder.image.setImageResource(imageRes) - - if (contentDescription == null) { - ViewCompat.setImportantForAccessibility(holder.image, ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_NO) - } else { - ViewCompat.setImportantForAccessibility(holder.image, ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_YES) - holder.image.contentDescription = contentDescription - } + holder.image.render(roomEncryptionTrustLevel) } class Holder : VectorEpoxyHolder() { - val image by bind(R.id.itemVerificationBigImage) + val image by bind(R.id.itemVerificationBigImage) } } diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt index 8cb5068b63..4b7452b511 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt @@ -23,6 +23,7 @@ import im.vector.app.core.resources.StringProvider import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationBigImageItem import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationWaitingItem +import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel import javax.inject.Inject class VerificationQRWaitingController @Inject constructor( @@ -49,7 +50,7 @@ class VerificationQRWaitingController @Inject constructor( bottomSheetVerificationBigImageItem { id("image") - imageRes(R.drawable.ic_shield_trusted) + roomEncryptionTrustLevel(RoomEncryptionTrustLevel.Trusted) } bottomSheetVerificationWaitingItem { diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt index cabce6410d..da382f75f1 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt @@ -25,6 +25,7 @@ import im.vector.app.features.crypto.verification.VerificationBottomSheetViewSta import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationBigImageItem import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem +import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel import javax.inject.Inject class VerificationQrScannedByOtherController @Inject constructor( @@ -58,7 +59,7 @@ class VerificationQrScannedByOtherController @Inject constructor( bottomSheetVerificationBigImageItem { id("image") - imageRes(R.drawable.ic_shield_trusted) + roomEncryptionTrustLevel(RoomEncryptionTrustLevel.Trusted) } dividerItem { diff --git a/vector/src/main/res/layout/item_verification_big_image.xml b/vector/src/main/res/layout/item_verification_big_image.xml index e4a0db917f..3f75186aeb 100644 --- a/vector/src/main/res/layout/item_verification_big_image.xml +++ b/vector/src/main/res/layout/item_verification_big_image.xml @@ -1,5 +1,5 @@ -