From 2b708387c264a59857cd51abd3f046bc6f489994 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 24 Aug 2021 16:19:54 +0200 Subject: [PATCH] New voip design: makes lint happy --- .../home/room/detail/timeline/format/NoticeEventFormatter.kt | 2 +- vector/src/main/res/layout/view_remove_jitsi_widget.xml | 4 ++++ vector/src/main/res/values/strings.xml | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt index 042d93f0bb..c80a92d568 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt @@ -352,7 +352,7 @@ class NoticeEventFormatter @Inject constructor( } EventType.CALL_REJECT -> if (event.isSentByCurrentUser()) { - sp.getString(R.string.call_tile_you_declined, "") + sp.getString(R.string.call_tile_you_declined_this_call) } else { sp.getString(R.string.call_tile_other_declined, senderName) } diff --git a/vector/src/main/res/layout/view_remove_jitsi_widget.xml b/vector/src/main/res/layout/view_remove_jitsi_widget.xml index 48da677b36..0bfdfe60d1 100644 --- a/vector/src/main/res/layout/view_remove_jitsi_widget.xml +++ b/vector/src/main/res/layout/view_remove_jitsi_widget.xml @@ -65,6 +65,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:src="@drawable/ic_arrow_right" + tools:ignore="ContentDescription" app:tint="?vctr_content_quaternary" /> @@ -99,6 +102,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" + tools:ignore="ContentDescription" android:src="@drawable/ic_call_hangup" /> diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml index fc8a504659..056ecb749e 100644 --- a/vector/src/main/res/values/strings.xml +++ b/vector/src/main/res/values/strings.xml @@ -3269,7 +3269,8 @@ You started a call %1$s started a call You\'re currently in this call - You declined this call + You declined this call %s + You declined this call %1$s declined this call This call has ended Call back