From d06935fd78e56f6fc0cc1e2e6c870c043230f8e9 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 14 May 2021 14:06:35 +0200 Subject: [PATCH] Fix ktlint Signed-off-by: Joas Schilling --- .../talk/controllers/ChatController.kt | 12 ++++----- .../drawable/ic_content_copy_white_24dp.xml | 5 ---- .../res/drawable/ic_delete_white_24dp.xml | 25 ------------------- .../main/res/drawable/ic_reply_white_24dp.xml | 5 ---- 4 files changed, 5 insertions(+), 42 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_content_copy_white_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_delete_white_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_reply_white_24dp.xml diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index 7717cd0ab..a5ec23a8b 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -547,8 +547,7 @@ class ChatController(args: Bundle) : override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) { if (s.length >= lengthFilter) { messageInput?.error = String.format( - Objects.requireNonNull - (resources).getString(R.string.nc_limit_hit), + Objects.requireNonNull (resources).getString(R.string.nc_limit_hit), Integer.toString(lengthFilter) ) } else { @@ -624,8 +623,7 @@ class ChatController(args: Bundle) : conversationVideoMenuItem?.icon?.alpha = 255 } - if (currentConversation != null && currentConversation!!.shouldShowLobby - (conversationUser) + if (currentConversation != null && currentConversation!!.shouldShowLobby(conversationUser) ) { messageInputView?.visibility = View.GONE } else { @@ -1309,9 +1307,9 @@ class ChatController(args: Bundle) : TextUtils.isEmpty(chatMessageList[i + 1].systemMessage) && chatMessageList[i + 1].actorId == chatMessageList[i].actorId && countGroupedMessages < 4 && DateFormatter.isSameDay( - chatMessageList[i].createdAt, - chatMessageList[i + 1].createdAt - ) + chatMessageList[i].createdAt, + chatMessageList[i + 1].createdAt + ) ) { chatMessageList[i].isGrouped = true countGroupedMessages++ diff --git a/app/src/main/res/drawable/ic_content_copy_white_24dp.xml b/app/src/main/res/drawable/ic_content_copy_white_24dp.xml deleted file mode 100644 index c211821b4..000000000 --- a/app/src/main/res/drawable/ic_content_copy_white_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable/ic_delete_white_24dp.xml deleted file mode 100644 index 4c3a52e84..000000000 --- a/app/src/main/res/drawable/ic_delete_white_24dp.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_reply_white_24dp.xml b/app/src/main/res/drawable/ic_reply_white_24dp.xml deleted file mode 100644 index bfe58aa51..000000000 --- a/app/src/main/res/drawable/ic_reply_white_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - -