From f2b86a9d86e6db3821283eadadc0095c36c3c5c5 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 5 Dec 2023 15:58:51 +0100 Subject: [PATCH] ktlint: Enum entry should start on a separate line Signed-off-by: Andy Scherzinger --- .../nextcloud/talk/activities/BaseActivity.kt | 4 +++- .../nextcloud/talk/activities/CallStatus.kt | 9 ++++++++- .../com/nextcloud/talk/chat/ChatActivity.kt | 8 +++++++- .../talk/models/domain/ConversationModel.kt | 19 +++++++++++++++---- .../talk/models/json/chat/ChatMessage.kt | 6 ++++-- .../talk/models/json/chat/ReadStatus.kt | 4 +++- .../models/json/conversations/Conversation.kt | 11 ++++++++--- .../models/json/participants/Participant.kt | 15 +++++++++++++-- .../models/json/reactions/ReactionVoter.kt | 4 +++- 9 files changed, 64 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt index 9d147d8ad..a33027f16 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt @@ -62,7 +62,9 @@ import javax.inject.Inject open class BaseActivity : AppCompatActivity() { enum class AppBarLayoutType { - TOOLBAR, SEARCH_BAR, EMPTY + TOOLBAR, + SEARCH_BAR, + EMPTY } @Inject diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallStatus.kt b/app/src/main/java/com/nextcloud/talk/activities/CallStatus.kt index d717ea02d..268e2ac68 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallStatus.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/CallStatus.kt @@ -24,5 +24,12 @@ import kotlinx.parcelize.Parcelize @Parcelize enum class CallStatus : Parcelable { - CONNECTING, CALLING_TIMEOUT, JOINED, IN_CONVERSATION, RECONNECTING, OFFLINE, LEAVING, PUBLISHER_FAILED + CONNECTING, + CALLING_TIMEOUT, + JOINED, + IN_CONVERSATION, + RECONNECTING, + OFFLINE, + LEAVING, + PUBLISHER_FAILED } diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index 1db37dc2d..45f446bfd 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -348,7 +348,13 @@ class ChatActivity : private var recorder: MediaRecorder? = null private enum class MediaRecorderState { - INITIAL, INITIALIZED, CONFIGURED, PREPARED, RECORDING, RELEASED, ERROR + INITIAL, + INITIALIZED, + CONFIGURED, + PREPARED, + RECORDING, + RELEASED, + ERROR } private var mediaRecorderState: MediaRecorderState = MediaRecorderState.INITIAL diff --git a/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt b/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt index 9859d3b8d..df194cb30 100644 --- a/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt +++ b/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt @@ -113,7 +113,13 @@ enum class ConversationType { } enum class ParticipantType { - DUMMY, OWNER, MODERATOR, USER, GUEST, USER_FOLLOWING_LINK, GUEST_MODERATOR + DUMMY, + OWNER, + MODERATOR, + USER, + GUEST, + USER_FOLLOWING_LINK, + GUEST_MODERATOR } enum class ObjectType { @@ -124,13 +130,18 @@ enum class ObjectType { } enum class NotificationLevel { - DEFAULT, ALWAYS, MENTION, NEVER + DEFAULT, + ALWAYS, + MENTION, + NEVER } enum class ConversationReadOnlyState { - CONVERSATION_READ_WRITE, CONVERSATION_READ_ONLY + CONVERSATION_READ_WRITE, + CONVERSATION_READ_ONLY } enum class LobbyState { - LOBBY_STATE_ALL_PARTICIPANTS, LOBBY_STATE_MODERATORS_ONLY + LOBBY_STATE_ALL_PARTICIPANTS, + LOBBY_STATE_MODERATORS_ONLY } diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt index bb68e697d..7f711343a 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt @@ -471,7 +471,8 @@ data class ChatMessage( * see https://nextcloud-talk.readthedocs.io/en/latest/chat/#system-messages */ enum class SystemMessageType { - DUMMY, CONVERSATION_CREATED, + DUMMY, + CONVERSATION_CREATED, CONVERSATION_RENAMED, DESCRIPTION_REMOVED, DESCRIPTION_SET, @@ -505,7 +506,8 @@ data class ChatMessage( GUEST_MODERATOR_PROMOTED, GUEST_MODERATOR_DEMOTED, MESSAGE_DELETED, - FILE_SHARED, OBJECT_SHARED, + FILE_SHARED, + OBJECT_SHARED, MATTERBRIDGE_CONFIG_ADDED, MATTERBRIDGE_CONFIG_EDITED, MATTERBRIDGE_CONFIG_REMOVED, diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ReadStatus.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ReadStatus.kt index d91368995..07259466d 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ReadStatus.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ReadStatus.kt @@ -20,5 +20,7 @@ package com.nextcloud.talk.models.json.chat enum class ReadStatus { - NONE, SENT, READ + NONE, + SENT, + READ } diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt index e3dd2ea92..57dc17779 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt @@ -229,15 +229,20 @@ data class Conversation( } enum class NotificationLevel { - DEFAULT, ALWAYS, MENTION, NEVER + DEFAULT, + ALWAYS, + MENTION, + NEVER } enum class LobbyState { - LOBBY_STATE_ALL_PARTICIPANTS, LOBBY_STATE_MODERATORS_ONLY + LOBBY_STATE_ALL_PARTICIPANTS, + LOBBY_STATE_MODERATORS_ONLY } enum class ConversationReadOnlyState { - CONVERSATION_READ_WRITE, CONVERSATION_READ_ONLY + CONVERSATION_READ_WRITE, + CONVERSATION_READ_ONLY } @Parcelize diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.kt b/app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.kt index 3b085025b..68f0c7bf9 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.kt @@ -124,11 +124,22 @@ data class Participant( } enum class ActorType { - DUMMY, EMAILS, GROUPS, GUESTS, USERS, CIRCLES + DUMMY, + EMAILS, + GROUPS, + GUESTS, + USERS, + CIRCLES } enum class ParticipantType { - DUMMY, OWNER, MODERATOR, USER, GUEST, USER_FOLLOWING_LINK, GUEST_MODERATOR + DUMMY, + OWNER, + MODERATOR, + USER, + GUEST, + USER_FOLLOWING_LINK, + GUEST_MODERATOR } object InCallFlags { diff --git a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionVoter.kt b/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionVoter.kt index c50015587..74eeec9a3 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionVoter.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionVoter.kt @@ -41,6 +41,8 @@ data class ReactionVoter( constructor() : this(null, null, null, 0) enum class ReactionActorType { - DUMMY, GUESTS, USERS + DUMMY, + GUESTS, + USERS } }