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 d0d7e5013b..d1d323f95c 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,12 +16,12 @@ */ package im.vector.app.features.crypto.verification.epoxy +import android.widget.ImageView 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 /** @@ -35,10 +35,23 @@ abstract class BottomSheetVerificationBigImageItem : VectorEpoxyModel { + holder.image.contentDescription = holder.view.context.getString(R.string.a11y_trust_level_default) + holder.image.setImageResource(R.drawable.ic_shield_black) + } + RoomEncryptionTrustLevel.Warning -> { + holder.image.contentDescription = holder.view.context.getString(R.string.a11y_trust_level_warning) + holder.image.setImageResource(R.drawable.ic_shield_warning_no_border) + } + RoomEncryptionTrustLevel.Trusted -> { + holder.image.contentDescription = holder.view.context.getString(R.string.a11y_trust_level_trusted) + holder.image.setImageResource(R.drawable.ic_shield_trusted_no_border) + } + } } class Holder : VectorEpoxyHolder() { - val image by bind(R.id.itemVerificationBigImage) + val image by bind(R.id.itemVerificationBigImage) } } diff --git a/vector/src/main/res/drawable/ic_shield_trusted_no_border.xml b/vector/src/main/res/drawable/ic_shield_trusted_no_border.xml new file mode 100644 index 0000000000..2266c23548 --- /dev/null +++ b/vector/src/main/res/drawable/ic_shield_trusted_no_border.xml @@ -0,0 +1,12 @@ + + + + diff --git a/vector/src/main/res/drawable/ic_shield_warning_no_border.xml b/vector/src/main/res/drawable/ic_shield_warning_no_border.xml new file mode 100644 index 0000000000..2266c23548 --- /dev/null +++ b/vector/src/main/res/drawable/ic_shield_warning_no_border.xml @@ -0,0 +1,12 @@ + + + + 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 8d23f342cd..7c036d298f 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,8 @@ -QR code - Almost there! Is %s showing the same shield? + Almost there! Is %s showing a tick? Yes No @@ -3051,7 +3051,7 @@ Add a topic "Topic: " - Almost there! Is the other device showing the same shield? + Almost there! Is the other device showing a tick? Almost there! Waiting for confirmation… Waiting for %s…