From d06935fd78e56f6fc0cc1e2e6c870c043230f8e9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 14 May 2021 14:06:35 +0200
Subject: [PATCH] Fix ktlint

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../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>
-                            (resources).getString(R.string.nc_limit_hit),
+                        Objects.requireNonNull<Resources> (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 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FFFFFF" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
-</vector>
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 @@
-<!--
-  ~ Nextcloud Talk application
-  ~
-  ~ @author Mario Danic
-  ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
-</vector>
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 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FFFFFF" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
-</vector>