From 162fb639ce2051adf72f9afbec4a7a1307ab93b1 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 29 Nov 2024 11:24:29 +0100 Subject: [PATCH] style(ktlint): Fix formatting Signed-off-by: Andy Scherzinger --- .../com/nextcloud/talk/adapters/items/ConversationItem.kt | 1 - .../com/nextcloud/talk/adapters/items/ParticipantItem.kt | 3 ++- .../talk/adapters/messages/IncomingDeckCardViewHolder.kt | 4 ---- .../messages/IncomingLinkPreviewMessageViewHolder.kt | 4 ---- .../messages/IncomingLocationMessageViewHolder.kt | 4 ---- .../adapters/messages/IncomingPollMessageViewHolder.kt | 4 ---- .../adapters/messages/IncomingTextMessageViewHolder.kt | 6 ------ .../java/com/nextcloud/talk/utils/ChatMessageUtils.kt | 2 +- .../talk/utils/preferences/AppPreferencesImpl.kt | 8 +++++--- 9 files changed, 8 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt index d08ff37a45..f03b815a3c 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt @@ -20,7 +20,6 @@ import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import com.nextcloud.talk.R import com.nextcloud.talk.adapters.items.ConversationItem.ConversationItemViewHolder -import com.nextcloud.talk.adapters.messages.MessagePayload import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication import com.nextcloud.talk.chat.data.model.ChatMessage.MessageType import com.nextcloud.talk.data.database.mappers.asModel diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ParticipantItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ParticipantItem.kt index e23df84091..dd6b40b778 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/ParticipantItem.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ParticipantItem.kt @@ -138,7 +138,8 @@ class ParticipantItem( } if (model.invitedActorId?.isNotEmpty() == true && - ConversationUtils.isParticipantOwnerOrModerator(conversation)) { + ConversationUtils.isParticipantOwnerOrModerator(conversation) + ) { holder.binding.conversationInfoStatusMessage.text = model.invitedActorId alignUsernameVertical(holder, 0f) } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingDeckCardViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingDeckCardViewHolder.kt index 17486dc824..149d818db6 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingDeckCardViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingDeckCardViewHolder.kt @@ -11,7 +11,6 @@ import android.annotation.SuppressLint import android.content.Context import android.content.Intent import android.net.Uri -import android.text.TextUtils import android.util.Log import android.view.View import android.widget.ImageView @@ -26,9 +25,6 @@ import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedA import com.nextcloud.talk.chat.ChatActivity import com.nextcloud.talk.chat.data.model.ChatMessage import com.nextcloud.talk.databinding.ItemCustomIncomingDeckCardMessageBinding -import com.nextcloud.talk.extensions.loadBotsAvatar -import com.nextcloud.talk.extensions.loadChangelogBotAvatar -import com.nextcloud.talk.extensions.loadFederatedUserAvatar import com.nextcloud.talk.ui.theme.ViewThemeUtils import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.ChatMessageUtils diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt index d450213b95..b17a38da76 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt @@ -9,7 +9,6 @@ package com.nextcloud.talk.adapters.messages import android.annotation.SuppressLint import android.content.Context -import android.text.TextUtils import android.util.Log import android.view.View import androidx.core.content.ContextCompat @@ -23,9 +22,6 @@ import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedA import com.nextcloud.talk.chat.ChatActivity import com.nextcloud.talk.chat.data.model.ChatMessage import com.nextcloud.talk.databinding.ItemCustomIncomingLinkPreviewMessageBinding -import com.nextcloud.talk.extensions.loadBotsAvatar -import com.nextcloud.talk.extensions.loadChangelogBotAvatar -import com.nextcloud.talk.extensions.loadFederatedUserAvatar import com.nextcloud.talk.ui.theme.ViewThemeUtils import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.ChatMessageUtils diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt index e5ba4f2d82..d8f3d0a56d 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt @@ -13,7 +13,6 @@ import android.annotation.SuppressLint import android.content.Context import android.content.Intent import android.net.Uri -import android.text.TextUtils import android.util.Log import android.util.TypedValue import android.view.MotionEvent @@ -30,9 +29,6 @@ import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedA import com.nextcloud.talk.chat.ChatActivity import com.nextcloud.talk.chat.data.model.ChatMessage import com.nextcloud.talk.databinding.ItemCustomIncomingLocationMessageBinding -import com.nextcloud.talk.extensions.loadBotsAvatar -import com.nextcloud.talk.extensions.loadChangelogBotAvatar -import com.nextcloud.talk.extensions.loadFederatedUserAvatar import com.nextcloud.talk.ui.theme.ViewThemeUtils import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.ChatMessageUtils diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt index 56b0936bc5..c121acc7f9 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt @@ -8,7 +8,6 @@ package com.nextcloud.talk.adapters.messages import android.annotation.SuppressLint import android.content.Context -import android.text.TextUtils import android.util.Log import android.view.View import androidx.core.content.ContextCompat @@ -22,9 +21,6 @@ import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedA import com.nextcloud.talk.chat.ChatActivity import com.nextcloud.talk.chat.data.model.ChatMessage import com.nextcloud.talk.databinding.ItemCustomIncomingPollMessageBinding -import com.nextcloud.talk.extensions.loadBotsAvatar -import com.nextcloud.talk.extensions.loadChangelogBotAvatar -import com.nextcloud.talk.extensions.loadFederatedUserAvatar import com.nextcloud.talk.polls.ui.PollMainDialogFragment import com.nextcloud.talk.ui.theme.ViewThemeUtils import com.nextcloud.talk.utils.ApiUtils diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt index 2a587270c4..cb7175caa1 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt @@ -10,7 +10,6 @@ package com.nextcloud.talk.adapters.messages import android.content.Context -import android.text.TextUtils import android.util.Log import android.util.TypedValue import android.view.View @@ -24,11 +23,6 @@ import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedA import com.nextcloud.talk.chat.ChatActivity import com.nextcloud.talk.chat.data.model.ChatMessage import com.nextcloud.talk.databinding.ItemCustomIncomingTextMessageBinding -import com.nextcloud.talk.extensions.loadBotsAvatar -import com.nextcloud.talk.extensions.loadChangelogBotAvatar -import com.nextcloud.talk.extensions.loadDefaultAvatar -import com.nextcloud.talk.extensions.loadFederatedUserAvatar -import com.nextcloud.talk.extensions.loadFirstLetterAvatar import com.nextcloud.talk.ui.theme.ViewThemeUtils import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.ChatMessageUtils diff --git a/app/src/main/java/com/nextcloud/talk/utils/ChatMessageUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/ChatMessageUtils.kt index 1f0c5e13fc..f004964482 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ChatMessageUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/ChatMessageUtils.kt @@ -18,7 +18,7 @@ import com.nextcloud.talk.ui.theme.ViewThemeUtils class ChatMessageUtils { - fun setAvatarOnMessage(view: ImageView, message: ChatMessage, viewThemeUtils : ViewThemeUtils) { + fun setAvatarOnMessage(view: ImageView, message: ChatMessage, viewThemeUtils: ViewThemeUtils) { view.visibility = View.VISIBLE if (message.actorType == "guests" || message.actorType == "emails") { val actorName = message.actorDisplayName diff --git a/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferencesImpl.kt b/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferencesImpl.kt index a576fe9a0b..1b6725162c 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferencesImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferencesImpl.kt @@ -545,9 +545,11 @@ class AppPreferencesImpl(val context: Context) : AppPreferences { } override fun getShowNotificationWarning(): Boolean { - return runBlocking { async { - readBoolean(SHOW_NOTIFICATION_WARNING, true).first() - } }.getCompleted() + return runBlocking { + async { + readBoolean(SHOW_NOTIFICATION_WARNING, true).first() + } + }.getCompleted() } override fun setShowNotificationWarning(showNotificationWarning: Boolean) =