Fix / design update
This commit is contained in:
parent
68323057aa
commit
fccfd00949
@ -23,6 +23,7 @@ import im.vector.riotx.core.resources.ColorProvider
|
|||||||
import im.vector.riotx.core.resources.StringProvider
|
import im.vector.riotx.core.resources.StringProvider
|
||||||
import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewState
|
import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewState
|
||||||
import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
|
import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
|
||||||
|
import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationBigImageItem
|
||||||
import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
|
import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
@ -55,23 +56,15 @@ class VerificationQrScannedByOtherController @Inject constructor(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bottomSheetVerificationBigImageItem {
|
||||||
|
id("image")
|
||||||
|
imageRes(R.drawable.ic_shield_trusted)
|
||||||
|
}
|
||||||
|
|
||||||
dividerItem {
|
dividerItem {
|
||||||
id("sep0")
|
id("sep0")
|
||||||
}
|
}
|
||||||
|
|
||||||
bottomSheetVerificationActionItem {
|
|
||||||
id("confirm")
|
|
||||||
title(stringProvider.getString(R.string.qr_code_scanned_by_other_yes))
|
|
||||||
titleColor(colorProvider.getColor(R.color.riotx_accent))
|
|
||||||
iconRes(R.drawable.ic_check_on)
|
|
||||||
iconColor(colorProvider.getColor(R.color.riotx_accent))
|
|
||||||
listener { listener?.onUserConfirmsQrCodeScanned() }
|
|
||||||
}
|
|
||||||
|
|
||||||
dividerItem {
|
|
||||||
id("sep1")
|
|
||||||
}
|
|
||||||
|
|
||||||
bottomSheetVerificationActionItem {
|
bottomSheetVerificationActionItem {
|
||||||
id("deny")
|
id("deny")
|
||||||
title(stringProvider.getString(R.string.qr_code_scanned_by_other_no))
|
title(stringProvider.getString(R.string.qr_code_scanned_by_other_no))
|
||||||
@ -80,6 +73,19 @@ class VerificationQrScannedByOtherController @Inject constructor(
|
|||||||
iconColor(colorProvider.getColor(R.color.vector_error_color))
|
iconColor(colorProvider.getColor(R.color.vector_error_color))
|
||||||
listener { listener?.onUserDeniesQrCodeScanned() }
|
listener { listener?.onUserDeniesQrCodeScanned() }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dividerItem {
|
||||||
|
id("sep1")
|
||||||
|
}
|
||||||
|
|
||||||
|
bottomSheetVerificationActionItem {
|
||||||
|
id("confirm")
|
||||||
|
title(stringProvider.getString(R.string.qr_code_scanned_by_other_yes))
|
||||||
|
titleColor(colorProvider.getColor(R.color.riotx_accent))
|
||||||
|
iconRes(R.drawable.ic_check_on)
|
||||||
|
iconColor(colorProvider.getColor(R.color.riotx_accent))
|
||||||
|
listener { listener?.onUserConfirmsQrCodeScanned() }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
interface Listener {
|
interface Listener {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user