mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-19 11:39:42 +01:00
style(ktlint): Fix formatting
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
parent
68811b0ed3
commit
26876c21d7
@ -20,7 +20,6 @@ import androidx.core.content.ContextCompat
|
|||||||
import androidx.core.content.res.ResourcesCompat
|
import androidx.core.content.res.ResourcesCompat
|
||||||
import com.nextcloud.talk.R
|
import com.nextcloud.talk.R
|
||||||
import com.nextcloud.talk.adapters.items.ConversationItem.ConversationItemViewHolder
|
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.application.NextcloudTalkApplication.Companion.sharedApplication
|
||||||
import com.nextcloud.talk.chat.data.model.ChatMessage.MessageType
|
import com.nextcloud.talk.chat.data.model.ChatMessage.MessageType
|
||||||
import com.nextcloud.talk.data.database.mappers.asModel
|
import com.nextcloud.talk.data.database.mappers.asModel
|
||||||
|
@ -138,7 +138,8 @@ class ParticipantItem(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (model.invitedActorId?.isNotEmpty() == true &&
|
if (model.invitedActorId?.isNotEmpty() == true &&
|
||||||
ConversationUtils.isParticipantOwnerOrModerator(conversation)) {
|
ConversationUtils.isParticipantOwnerOrModerator(conversation)
|
||||||
|
) {
|
||||||
holder.binding.conversationInfoStatusMessage.text = model.invitedActorId
|
holder.binding.conversationInfoStatusMessage.text = model.invitedActorId
|
||||||
alignUsernameVertical(holder, 0f)
|
alignUsernameVertical(holder, 0f)
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,6 @@ import android.annotation.SuppressLint
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.text.TextUtils
|
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.widget.ImageView
|
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.ChatActivity
|
||||||
import com.nextcloud.talk.chat.data.model.ChatMessage
|
import com.nextcloud.talk.chat.data.model.ChatMessage
|
||||||
import com.nextcloud.talk.databinding.ItemCustomIncomingDeckCardMessageBinding
|
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.ui.theme.ViewThemeUtils
|
||||||
import com.nextcloud.talk.utils.ApiUtils
|
import com.nextcloud.talk.utils.ApiUtils
|
||||||
import com.nextcloud.talk.utils.ChatMessageUtils
|
import com.nextcloud.talk.utils.ChatMessageUtils
|
||||||
|
@ -9,7 +9,6 @@ package com.nextcloud.talk.adapters.messages
|
|||||||
|
|
||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.text.TextUtils
|
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import androidx.core.content.ContextCompat
|
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.ChatActivity
|
||||||
import com.nextcloud.talk.chat.data.model.ChatMessage
|
import com.nextcloud.talk.chat.data.model.ChatMessage
|
||||||
import com.nextcloud.talk.databinding.ItemCustomIncomingLinkPreviewMessageBinding
|
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.ui.theme.ViewThemeUtils
|
||||||
import com.nextcloud.talk.utils.ApiUtils
|
import com.nextcloud.talk.utils.ApiUtils
|
||||||
import com.nextcloud.talk.utils.ChatMessageUtils
|
import com.nextcloud.talk.utils.ChatMessageUtils
|
||||||
|
@ -13,7 +13,6 @@ import android.annotation.SuppressLint
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.text.TextUtils
|
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import android.util.TypedValue
|
import android.util.TypedValue
|
||||||
import android.view.MotionEvent
|
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.ChatActivity
|
||||||
import com.nextcloud.talk.chat.data.model.ChatMessage
|
import com.nextcloud.talk.chat.data.model.ChatMessage
|
||||||
import com.nextcloud.talk.databinding.ItemCustomIncomingLocationMessageBinding
|
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.ui.theme.ViewThemeUtils
|
||||||
import com.nextcloud.talk.utils.ApiUtils
|
import com.nextcloud.talk.utils.ApiUtils
|
||||||
import com.nextcloud.talk.utils.ChatMessageUtils
|
import com.nextcloud.talk.utils.ChatMessageUtils
|
||||||
|
@ -8,7 +8,6 @@ package com.nextcloud.talk.adapters.messages
|
|||||||
|
|
||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.text.TextUtils
|
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import androidx.core.content.ContextCompat
|
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.ChatActivity
|
||||||
import com.nextcloud.talk.chat.data.model.ChatMessage
|
import com.nextcloud.talk.chat.data.model.ChatMessage
|
||||||
import com.nextcloud.talk.databinding.ItemCustomIncomingPollMessageBinding
|
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.polls.ui.PollMainDialogFragment
|
||||||
import com.nextcloud.talk.ui.theme.ViewThemeUtils
|
import com.nextcloud.talk.ui.theme.ViewThemeUtils
|
||||||
import com.nextcloud.talk.utils.ApiUtils
|
import com.nextcloud.talk.utils.ApiUtils
|
||||||
|
@ -10,7 +10,6 @@
|
|||||||
package com.nextcloud.talk.adapters.messages
|
package com.nextcloud.talk.adapters.messages
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.text.TextUtils
|
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import android.util.TypedValue
|
import android.util.TypedValue
|
||||||
import android.view.View
|
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.ChatActivity
|
||||||
import com.nextcloud.talk.chat.data.model.ChatMessage
|
import com.nextcloud.talk.chat.data.model.ChatMessage
|
||||||
import com.nextcloud.talk.databinding.ItemCustomIncomingTextMessageBinding
|
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.ui.theme.ViewThemeUtils
|
||||||
import com.nextcloud.talk.utils.ApiUtils
|
import com.nextcloud.talk.utils.ApiUtils
|
||||||
import com.nextcloud.talk.utils.ChatMessageUtils
|
import com.nextcloud.talk.utils.ChatMessageUtils
|
||||||
|
@ -11,7 +11,6 @@ package com.nextcloud.talk.adapters.messages
|
|||||||
|
|
||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.text.TextUtils
|
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.widget.SeekBar
|
import android.widget.SeekBar
|
||||||
@ -27,9 +26,6 @@ import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedA
|
|||||||
import com.nextcloud.talk.chat.ChatActivity
|
import com.nextcloud.talk.chat.ChatActivity
|
||||||
import com.nextcloud.talk.chat.data.model.ChatMessage
|
import com.nextcloud.talk.chat.data.model.ChatMessage
|
||||||
import com.nextcloud.talk.databinding.ItemCustomIncomingVoiceMessageBinding
|
import com.nextcloud.talk.databinding.ItemCustomIncomingVoiceMessageBinding
|
||||||
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.ui.theme.ViewThemeUtils
|
||||||
import com.nextcloud.talk.utils.ApiUtils
|
import com.nextcloud.talk.utils.ApiUtils
|
||||||
import com.nextcloud.talk.utils.ChatMessageUtils
|
import com.nextcloud.talk.utils.ChatMessageUtils
|
||||||
|
@ -18,7 +18,7 @@ import com.nextcloud.talk.ui.theme.ViewThemeUtils
|
|||||||
|
|
||||||
class ChatMessageUtils {
|
class ChatMessageUtils {
|
||||||
|
|
||||||
fun setAvatarOnMessage(view: ImageView, message: ChatMessage, viewThemeUtils : ViewThemeUtils) {
|
fun setAvatarOnMessage(view: ImageView, message: ChatMessage, viewThemeUtils: ViewThemeUtils) {
|
||||||
view.visibility = View.VISIBLE
|
view.visibility = View.VISIBLE
|
||||||
if (message.actorType == "guests" || message.actorType == "emails") {
|
if (message.actorType == "guests" || message.actorType == "emails") {
|
||||||
val actorName = message.actorDisplayName
|
val actorName = message.actorDisplayName
|
||||||
|
@ -545,9 +545,11 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun getShowNotificationWarning(): Boolean {
|
override fun getShowNotificationWarning(): Boolean {
|
||||||
return runBlocking { async {
|
return runBlocking {
|
||||||
|
async {
|
||||||
readBoolean(SHOW_NOTIFICATION_WARNING, true).first()
|
readBoolean(SHOW_NOTIFICATION_WARNING, true).first()
|
||||||
} }.getCompleted()
|
}
|
||||||
|
}.getCompleted()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun setShowNotificationWarning(showNotificationWarning: Boolean) =
|
override fun setShowNotificationWarning(showNotificationWarning: Boolean) =
|
||||||
|
Loading…
Reference in New Issue
Block a user