From 1acd6ac8600db73a53a7907e0cfc90cc1014c16d Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Tue, 2 Jan 2024 17:05:01 +0200
Subject: [PATCH] Change values() to entries fro enums
---
.../org/futo/circles/feature/circles/list/CirclesListAdapter.kt | 2 +-
.../org/futo/circles/feature/groups/list/GroupsListAdapter.kt | 2 +-
.../futo/circles/feature/room/select/SelectRoomsDataSource.kt | 2 +-
.../org/futo/circles/feature/timeline/list/TimelineAdapter.kt | 2 +-
.../auth/feature/active_sessions/list/ActiveSessionsAdapter.kt | 2 +-
.../auth/feature/workspace/list/WorkspaceTasksListAdapter.kt | 2 +-
.../org/futo/circles/core/extensions/TimelineEventExtensions.kt | 2 +-
.../circles/core/feature/picker/helper/MediaPickerHelper.kt | 2 +-
.../manage_members/change_role/ChangeAccessLevelDataSource.kt | 2 +-
.../core/feature/room/manage_members/list/MembersListAdapter.kt | 2 +-
.../select_users/list/search/InviteMembersSearchListAdapter.kt | 2 +-
.../futo/circles/core/feature/user/list/UsersCirclesAdapter.kt | 2 +-
.../main/java/org/futo/circles/core/model/ShareUrlTypeArg.kt | 2 +-
.../java/org/futo/circles/gallery/feature/PhotosListAdapter.kt | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/app/src/main/java/org/futo/circles/feature/circles/list/CirclesListAdapter.kt b/app/src/main/java/org/futo/circles/feature/circles/list/CirclesListAdapter.kt
index ffc2fb21a..497112a8f 100644
--- a/app/src/main/java/org/futo/circles/feature/circles/list/CirclesListAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/list/CirclesListAdapter.kt
@@ -34,7 +34,7 @@ class CirclesListAdapter(
override fun onCreateViewHolder(
parent: ViewGroup,
viewType: Int
- ) = when (CirclesListItemViewType.values()[viewType]) {
+ ) = when (CirclesListItemViewType.entries[viewType]) {
CirclesListItemViewType.JoinedCircle -> JoinedCircleViewHolder(
parent = parent,
onCircleClicked = { position -> onRoomClicked(getItem(position)) }
diff --git a/app/src/main/java/org/futo/circles/feature/groups/list/GroupsListAdapter.kt b/app/src/main/java/org/futo/circles/feature/groups/list/GroupsListAdapter.kt
index 825a1af45..a2049aa06 100644
--- a/app/src/main/java/org/futo/circles/feature/groups/list/GroupsListAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/groups/list/GroupsListAdapter.kt
@@ -33,7 +33,7 @@ class GroupsListAdapter(
override fun onCreateViewHolder(
parent: ViewGroup, viewType: Int
- ) = when (GroupListItemViewType.values()[viewType]) {
+ ) = when (GroupListItemViewType.entries[viewType]) {
GroupListItemViewType.JoinedGroup -> JoinedGroupViewHolder(parent = parent,
onGroupClicked = { position -> onRoomClicked(getItem(position)) })
diff --git a/app/src/main/java/org/futo/circles/feature/room/select/SelectRoomsDataSource.kt b/app/src/main/java/org/futo/circles/feature/room/select/SelectRoomsDataSource.kt
index c6d1c96e2..5ec366f1c 100644
--- a/app/src/main/java/org/futo/circles/feature/room/select/SelectRoomsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/select/SelectRoomsDataSource.kt
@@ -32,7 +32,7 @@ class SelectRoomsDataSource @Inject constructor(
private val ordinal = savedStateHandle.getOrThrow<Int>(SelectRoomsFragment.TYPE_ORDINAL)
private val roomType: CircleRoomTypeArg =
- CircleRoomTypeArg.values().firstOrNull { it.ordinal == ordinal }
+ CircleRoomTypeArg.entries.firstOrNull { it.ordinal == ordinal }
?: CircleRoomTypeArg.Circle
private val session by lazy { MatrixSessionProvider.currentSession }
diff --git a/app/src/main/java/org/futo/circles/feature/timeline/list/TimelineAdapter.kt b/app/src/main/java/org/futo/circles/feature/timeline/list/TimelineAdapter.kt
index 5d6f5407f..d94c4652a 100644
--- a/app/src/main/java/org/futo/circles/feature/timeline/list/TimelineAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/list/TimelineAdapter.kt
@@ -35,7 +35,7 @@ class TimelineAdapter(
override fun getItemViewType(position: Int): Int = getItem(position).content.type.ordinal
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PostViewHolder {
- return when (PostContentType.values()[viewType]) {
+ return when (PostContentType.entries[viewType]) {
PostContentType.POLL_CONTENT -> PollPostViewHolder(
parent, postOptionsListener, isThread
)
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/active_sessions/list/ActiveSessionsAdapter.kt b/auth/src/main/java/org/futo/circles/auth/feature/active_sessions/list/ActiveSessionsAdapter.kt
index d88137d2b..3f1789e80 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/active_sessions/list/ActiveSessionsAdapter.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/active_sessions/list/ActiveSessionsAdapter.kt
@@ -27,7 +27,7 @@ class ActiveSessionsAdapter(
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ActiveSessionsViewHolder {
- return when (ActiveSessionViewTypes.values()[viewType]) {
+ return when (ActiveSessionViewTypes.entries[viewType]) {
ActiveSessionViewTypes.Header -> SessionHeaderViewHolder(parent)
ActiveSessionViewTypes.Session -> SessionItemViewHolder(
parent = parent,
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/workspace/list/WorkspaceTasksListAdapter.kt b/auth/src/main/java/org/futo/circles/auth/feature/workspace/list/WorkspaceTasksListAdapter.kt
index 1e1a0e7d8..a45dac506 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/workspace/list/WorkspaceTasksListAdapter.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/workspace/list/WorkspaceTasksListAdapter.kt
@@ -20,7 +20,7 @@ class WorkspaceTasksListAdapter(
override fun onCreateViewHolder(
parent: ViewGroup,
viewType: Int
- ) = when (WorkspaceTaskViewType.values()[viewType]) {
+ ) = when (WorkspaceTaskViewType.entries[viewType]) {
WorkspaceTaskViewType.Mandatory -> MandatoryWorkspaceTaskViewHolder(parent = parent)
WorkspaceTaskViewType.Optional -> OptionalWorkspaceTaskViewHolder(
diff --git a/core/src/main/java/org/futo/circles/core/extensions/TimelineEventExtensions.kt b/core/src/main/java/org/futo/circles/core/extensions/TimelineEventExtensions.kt
index 2f2de08c3..85b859b6d 100644
--- a/core/src/main/java/org/futo/circles/core/extensions/TimelineEventExtensions.kt
+++ b/core/src/main/java/org/futo/circles/core/extensions/TimelineEventExtensions.kt
@@ -12,5 +12,5 @@ fun TimelineEvent.getPostContentType(): PostContentType? {
val messageType = if (root.getClearType() == EventType.MESSAGE) root.getClearContent()
.toModel<MessageContent>()?.msgType
else getLastMessageContent()?.msgType
- return PostContentType.values().firstOrNull { it.typeKey == messageType }
+ return PostContentType.entries.firstOrNull { it.typeKey == messageType }
}
\ No newline at end of file
diff --git a/core/src/main/java/org/futo/circles/core/feature/picker/helper/MediaPickerHelper.kt b/core/src/main/java/org/futo/circles/core/feature/picker/helper/MediaPickerHelper.kt
index ed9932c06..1a39fb1f1 100644
--- a/core/src/main/java/org/futo/circles/core/feature/picker/helper/MediaPickerHelper.kt
+++ b/core/src/main/java/org/futo/circles/core/feature/picker/helper/MediaPickerHelper.kt
@@ -118,7 +118,7 @@ open class MediaPickerHelper(
Array<PickGalleryMediaResultItem>::class.java
)
}?.forEach {
- when (MediaType.values()[it.mediaTypeOrdinal]) {
+ when (MediaType.entries[it.mediaTypeOrdinal]) {
MediaType.Image -> onImageSelected?.invoke(itemId, Uri.parse(it.uriString))
MediaType.Video -> onVideoSelected?.invoke(Uri.parse(it.uriString))
}
diff --git a/core/src/main/java/org/futo/circles/core/feature/room/manage_members/change_role/ChangeAccessLevelDataSource.kt b/core/src/main/java/org/futo/circles/core/feature/room/manage_members/change_role/ChangeAccessLevelDataSource.kt
index 9c5427d0b..b7d17fbd5 100644
--- a/core/src/main/java/org/futo/circles/core/feature/room/manage_members/change_role/ChangeAccessLevelDataSource.kt
+++ b/core/src/main/java/org/futo/circles/core/feature/room/manage_members/change_role/ChangeAccessLevelDataSource.kt
@@ -17,7 +17,7 @@ class ChangeAccessLevelDataSource @Inject constructor(
private val levelValue: Int = savedStateHandle.getOrThrow("levelValue")
private val myUserLevelValue: Int = savedStateHandle.getOrThrow("myUserLevelValue")
- fun getRolesList() = AccessLevel.values().map {
+ fun getRolesList() = AccessLevel.entries.map {
AccessLevelListItem(
Role.fromValue(it.levelValue, Role.Default.value),
it.levelValue == levelValue
diff --git a/core/src/main/java/org/futo/circles/core/feature/room/manage_members/list/MembersListAdapter.kt b/core/src/main/java/org/futo/circles/core/feature/room/manage_members/list/MembersListAdapter.kt
index d1809d518..4241e6132 100644
--- a/core/src/main/java/org/futo/circles/core/feature/room/manage_members/list/MembersListAdapter.kt
+++ b/core/src/main/java/org/futo/circles/core/feature/room/manage_members/list/MembersListAdapter.kt
@@ -27,7 +27,7 @@ class GroupMembersListAdapter(
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ManageMembersViewHolder {
- return when (ManageGroupMembersViewTypes.values()[viewType]) {
+ return when (ManageGroupMembersViewTypes.entries[viewType]) {
ManageGroupMembersViewTypes.Header -> ManageMembersHeaderViewHolder(parent)
ManageGroupMembersViewTypes.Member -> MemberViewHolder(
parent = parent,
diff --git a/core/src/main/java/org/futo/circles/core/feature/select_users/list/search/InviteMembersSearchListAdapter.kt b/core/src/main/java/org/futo/circles/core/feature/select_users/list/search/InviteMembersSearchListAdapter.kt
index ccdb75313..05a3f325b 100644
--- a/core/src/main/java/org/futo/circles/core/feature/select_users/list/search/InviteMembersSearchListAdapter.kt
+++ b/core/src/main/java/org/futo/circles/core/feature/select_users/list/search/InviteMembersSearchListAdapter.kt
@@ -22,7 +22,7 @@ class InviteMembersSearchListAdapter(
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): InviteMemberViewHolder {
- return when (InviteListViewType.values()[viewType]) {
+ return when (InviteListViewType.entries[viewType]) {
InviteListViewType.Header -> HeaderViewHolder(parent)
InviteListViewType.User -> UserViewHolder(
parent,
diff --git a/core/src/main/java/org/futo/circles/core/feature/user/list/UsersCirclesAdapter.kt b/core/src/main/java/org/futo/circles/core/feature/user/list/UsersCirclesAdapter.kt
index b3e289626..408e0010e 100644
--- a/core/src/main/java/org/futo/circles/core/feature/user/list/UsersCirclesAdapter.kt
+++ b/core/src/main/java/org/futo/circles/core/feature/user/list/UsersCirclesAdapter.kt
@@ -23,7 +23,7 @@ class UsersCirclesAdapter(
override fun onCreateViewHolder(
parent: ViewGroup,
viewType: Int
- ): UserTimelineViewHolder = when (values()[viewType]) {
+ ): UserTimelineViewHolder = when (TimelineViewType.entries[viewType]) {
Header -> UserTimelineHeaderViewHolder(parent)
Room -> UsersTimelineRoomViewHolder(
parent,
diff --git a/core/src/main/java/org/futo/circles/core/model/ShareUrlTypeArg.kt b/core/src/main/java/org/futo/circles/core/model/ShareUrlTypeArg.kt
index 9cc340fd5..688e37ad5 100644
--- a/core/src/main/java/org/futo/circles/core/model/ShareUrlTypeArg.kt
+++ b/core/src/main/java/org/futo/circles/core/model/ShareUrlTypeArg.kt
@@ -10,6 +10,6 @@ enum class ShareUrlTypeArg(val typeKey: String) {
fun shareUrlTypeArgFromType(type: String): ShareUrlTypeArg? {
val urlType: ShareUrlTypeArg? = null
- ShareUrlTypeArg.values().forEach { if (type == it.typeKey) return it }
+ ShareUrlTypeArg.entries.forEach { if (type == it.typeKey) return it }
return urlType
}
\ No newline at end of file
diff --git a/gallery/src/main/java/org/futo/circles/gallery/feature/PhotosListAdapter.kt b/gallery/src/main/java/org/futo/circles/gallery/feature/PhotosListAdapter.kt
index c4af0b568..6350af574 100644
--- a/gallery/src/main/java/org/futo/circles/gallery/feature/PhotosListAdapter.kt
+++ b/gallery/src/main/java/org/futo/circles/gallery/feature/PhotosListAdapter.kt
@@ -24,7 +24,7 @@ class PhotosListAdapter(
override fun onCreateViewHolder(
parent: ViewGroup,
viewType: Int
- ) = when (GalleryListItemViewType.values()[viewType]) {
+ ) = when (GalleryListItemViewType.entries[viewType]) {
GalleryListItemViewType.JoinedGallery -> JoinedGalleryViewHolder(
parent = parent,
onGalleryClicked = { position -> onRoomClicked(getItem(position)) }
--
GitLab