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 ffc2fb21a31ee7615649550df04d599600c1d8b2..497112a8fb87ed5858eb21df13c861c585992b68 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 825a1af45a754a0fff16d56f419ff6de79d188d4..a2049aa0651e947d546cc350746efe588ae78629 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 c6d1c96e2f0c4d0b80d0a117bb425b8bdcbb7a1e..5ec366f1c79cf4443341b02dacb0a9a400bd1443 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 5d6f5407f5bf9c95ab97ee7b6cfbc14660e57092..d94c4652a3e42f43828bc071c7a28f3dcc09921c 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 d88137d2bf5b7fa44e5e8292a5992f5f5adfda67..3f1789e80792ca7b731b8c5b0043820d763f507f 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 1e1a0e7d88d36a5e302d10ffa996e7dc7f2ef3d4..a45dac5068d10234b33bf9eb47535b7ff9bf20b2 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 2f2de08c3b42bfd2e7b494c1a049dcc0965d0f5a..85b859b6d4ce8bd903668f7bb15b33a24e1dae92 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 ed9932c065042c79aac4ddc5bee7b327b3097d62..1a39fb1f1fcafac17b6e4113caf97236cee69321 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 9c5427d0b746a971a31edabe141ec0961ba139a5..b7d17fbd59ca7f6ece8d5308c00ad135b58688bd 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 d1809d518c77802badb602c5c93f634056dd645d..4241e6132c1f1688e7c17da929d074e2610b68dc 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 ccdb753136590a5034c49f5d307bc21ab0e69b6a..05a3f325b4c2d0b095b5dbd066bea0682470fc5f 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 b3e289626e8d78382923c91391bcc3997c007b07..408e0010eed654e8f115650bba5478d2460d6991 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 9cc340fd5895270782cc8da35148a9c545aa9438..688e37ad5cc17aebd1b1b7ac4dd5425d9e42ecf1 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 c4af0b5687f1dc23f6ca90aaba7815302fba3831..6350af574a2762c8643250bc18409d9309f7d916 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)) }