Skip to content
Snippets Groups Projects
Commit 1acd6ac8 authored by Taras's avatar Taras
Browse files

Change values() to entries fro enums

parent 8c53dd53
No related branches found
No related tags found
No related merge requests found
Showing
with 14 additions and 14 deletions
...@@ -34,7 +34,7 @@ class CirclesListAdapter( ...@@ -34,7 +34,7 @@ class CirclesListAdapter(
override fun onCreateViewHolder( override fun onCreateViewHolder(
parent: ViewGroup, parent: ViewGroup,
viewType: Int viewType: Int
) = when (CirclesListItemViewType.values()[viewType]) { ) = when (CirclesListItemViewType.entries[viewType]) {
CirclesListItemViewType.JoinedCircle -> JoinedCircleViewHolder( CirclesListItemViewType.JoinedCircle -> JoinedCircleViewHolder(
parent = parent, parent = parent,
onCircleClicked = { position -> onRoomClicked(getItem(position)) } onCircleClicked = { position -> onRoomClicked(getItem(position)) }
......
...@@ -33,7 +33,7 @@ class GroupsListAdapter( ...@@ -33,7 +33,7 @@ class GroupsListAdapter(
override fun onCreateViewHolder( override fun onCreateViewHolder(
parent: ViewGroup, viewType: Int parent: ViewGroup, viewType: Int
) = when (GroupListItemViewType.values()[viewType]) { ) = when (GroupListItemViewType.entries[viewType]) {
GroupListItemViewType.JoinedGroup -> JoinedGroupViewHolder(parent = parent, GroupListItemViewType.JoinedGroup -> JoinedGroupViewHolder(parent = parent,
onGroupClicked = { position -> onRoomClicked(getItem(position)) }) onGroupClicked = { position -> onRoomClicked(getItem(position)) })
......
...@@ -32,7 +32,7 @@ class SelectRoomsDataSource @Inject constructor( ...@@ -32,7 +32,7 @@ class SelectRoomsDataSource @Inject constructor(
private val ordinal = savedStateHandle.getOrThrow<Int>(SelectRoomsFragment.TYPE_ORDINAL) private val ordinal = savedStateHandle.getOrThrow<Int>(SelectRoomsFragment.TYPE_ORDINAL)
private val roomType: CircleRoomTypeArg = private val roomType: CircleRoomTypeArg =
CircleRoomTypeArg.values().firstOrNull { it.ordinal == ordinal } CircleRoomTypeArg.entries.firstOrNull { it.ordinal == ordinal }
?: CircleRoomTypeArg.Circle ?: CircleRoomTypeArg.Circle
private val session by lazy { MatrixSessionProvider.currentSession } private val session by lazy { MatrixSessionProvider.currentSession }
......
...@@ -35,7 +35,7 @@ class TimelineAdapter( ...@@ -35,7 +35,7 @@ class TimelineAdapter(
override fun getItemViewType(position: Int): Int = getItem(position).content.type.ordinal override fun getItemViewType(position: Int): Int = getItem(position).content.type.ordinal
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PostViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PostViewHolder {
return when (PostContentType.values()[viewType]) { return when (PostContentType.entries[viewType]) {
PostContentType.POLL_CONTENT -> PollPostViewHolder( PostContentType.POLL_CONTENT -> PollPostViewHolder(
parent, postOptionsListener, isThread parent, postOptionsListener, isThread
) )
......
...@@ -27,7 +27,7 @@ class ActiveSessionsAdapter( ...@@ -27,7 +27,7 @@ class ActiveSessionsAdapter(
} }
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ActiveSessionsViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ActiveSessionsViewHolder {
return when (ActiveSessionViewTypes.values()[viewType]) { return when (ActiveSessionViewTypes.entries[viewType]) {
ActiveSessionViewTypes.Header -> SessionHeaderViewHolder(parent) ActiveSessionViewTypes.Header -> SessionHeaderViewHolder(parent)
ActiveSessionViewTypes.Session -> SessionItemViewHolder( ActiveSessionViewTypes.Session -> SessionItemViewHolder(
parent = parent, parent = parent,
......
...@@ -20,7 +20,7 @@ class WorkspaceTasksListAdapter( ...@@ -20,7 +20,7 @@ class WorkspaceTasksListAdapter(
override fun onCreateViewHolder( override fun onCreateViewHolder(
parent: ViewGroup, parent: ViewGroup,
viewType: Int viewType: Int
) = when (WorkspaceTaskViewType.values()[viewType]) { ) = when (WorkspaceTaskViewType.entries[viewType]) {
WorkspaceTaskViewType.Mandatory -> MandatoryWorkspaceTaskViewHolder(parent = parent) WorkspaceTaskViewType.Mandatory -> MandatoryWorkspaceTaskViewHolder(parent = parent)
WorkspaceTaskViewType.Optional -> OptionalWorkspaceTaskViewHolder( WorkspaceTaskViewType.Optional -> OptionalWorkspaceTaskViewHolder(
......
...@@ -12,5 +12,5 @@ fun TimelineEvent.getPostContentType(): PostContentType? { ...@@ -12,5 +12,5 @@ fun TimelineEvent.getPostContentType(): PostContentType? {
val messageType = if (root.getClearType() == EventType.MESSAGE) root.getClearContent() val messageType = if (root.getClearType() == EventType.MESSAGE) root.getClearContent()
.toModel<MessageContent>()?.msgType .toModel<MessageContent>()?.msgType
else getLastMessageContent()?.msgType else getLastMessageContent()?.msgType
return PostContentType.values().firstOrNull { it.typeKey == messageType } return PostContentType.entries.firstOrNull { it.typeKey == messageType }
} }
\ No newline at end of file
...@@ -118,7 +118,7 @@ open class MediaPickerHelper( ...@@ -118,7 +118,7 @@ open class MediaPickerHelper(
Array<PickGalleryMediaResultItem>::class.java Array<PickGalleryMediaResultItem>::class.java
) )
}?.forEach { }?.forEach {
when (MediaType.values()[it.mediaTypeOrdinal]) { when (MediaType.entries[it.mediaTypeOrdinal]) {
MediaType.Image -> onImageSelected?.invoke(itemId, Uri.parse(it.uriString)) MediaType.Image -> onImageSelected?.invoke(itemId, Uri.parse(it.uriString))
MediaType.Video -> onVideoSelected?.invoke(Uri.parse(it.uriString)) MediaType.Video -> onVideoSelected?.invoke(Uri.parse(it.uriString))
} }
......
...@@ -17,7 +17,7 @@ class ChangeAccessLevelDataSource @Inject constructor( ...@@ -17,7 +17,7 @@ class ChangeAccessLevelDataSource @Inject constructor(
private val levelValue: Int = savedStateHandle.getOrThrow("levelValue") private val levelValue: Int = savedStateHandle.getOrThrow("levelValue")
private val myUserLevelValue: Int = savedStateHandle.getOrThrow("myUserLevelValue") private val myUserLevelValue: Int = savedStateHandle.getOrThrow("myUserLevelValue")
fun getRolesList() = AccessLevel.values().map { fun getRolesList() = AccessLevel.entries.map {
AccessLevelListItem( AccessLevelListItem(
Role.fromValue(it.levelValue, Role.Default.value), Role.fromValue(it.levelValue, Role.Default.value),
it.levelValue == levelValue it.levelValue == levelValue
......
...@@ -27,7 +27,7 @@ class GroupMembersListAdapter( ...@@ -27,7 +27,7 @@ class GroupMembersListAdapter(
} }
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ManageMembersViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ManageMembersViewHolder {
return when (ManageGroupMembersViewTypes.values()[viewType]) { return when (ManageGroupMembersViewTypes.entries[viewType]) {
ManageGroupMembersViewTypes.Header -> ManageMembersHeaderViewHolder(parent) ManageGroupMembersViewTypes.Header -> ManageMembersHeaderViewHolder(parent)
ManageGroupMembersViewTypes.Member -> MemberViewHolder( ManageGroupMembersViewTypes.Member -> MemberViewHolder(
parent = parent, parent = parent,
......
...@@ -22,7 +22,7 @@ class InviteMembersSearchListAdapter( ...@@ -22,7 +22,7 @@ class InviteMembersSearchListAdapter(
} }
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): InviteMemberViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): InviteMemberViewHolder {
return when (InviteListViewType.values()[viewType]) { return when (InviteListViewType.entries[viewType]) {
InviteListViewType.Header -> HeaderViewHolder(parent) InviteListViewType.Header -> HeaderViewHolder(parent)
InviteListViewType.User -> UserViewHolder( InviteListViewType.User -> UserViewHolder(
parent, parent,
......
...@@ -23,7 +23,7 @@ class UsersCirclesAdapter( ...@@ -23,7 +23,7 @@ class UsersCirclesAdapter(
override fun onCreateViewHolder( override fun onCreateViewHolder(
parent: ViewGroup, parent: ViewGroup,
viewType: Int viewType: Int
): UserTimelineViewHolder = when (values()[viewType]) { ): UserTimelineViewHolder = when (TimelineViewType.entries[viewType]) {
Header -> UserTimelineHeaderViewHolder(parent) Header -> UserTimelineHeaderViewHolder(parent)
Room -> UsersTimelineRoomViewHolder( Room -> UsersTimelineRoomViewHolder(
parent, parent,
......
...@@ -10,6 +10,6 @@ enum class ShareUrlTypeArg(val typeKey: String) { ...@@ -10,6 +10,6 @@ enum class ShareUrlTypeArg(val typeKey: String) {
fun shareUrlTypeArgFromType(type: String): ShareUrlTypeArg? { fun shareUrlTypeArgFromType(type: String): ShareUrlTypeArg? {
val urlType: ShareUrlTypeArg? = null val urlType: ShareUrlTypeArg? = null
ShareUrlTypeArg.values().forEach { if (type == it.typeKey) return it } ShareUrlTypeArg.entries.forEach { if (type == it.typeKey) return it }
return urlType return urlType
} }
\ No newline at end of file
...@@ -24,7 +24,7 @@ class PhotosListAdapter( ...@@ -24,7 +24,7 @@ class PhotosListAdapter(
override fun onCreateViewHolder( override fun onCreateViewHolder(
parent: ViewGroup, parent: ViewGroup,
viewType: Int viewType: Int
) = when (GalleryListItemViewType.values()[viewType]) { ) = when (GalleryListItemViewType.entries[viewType]) {
GalleryListItemViewType.JoinedGallery -> JoinedGalleryViewHolder( GalleryListItemViewType.JoinedGallery -> JoinedGalleryViewHolder(
parent = parent, parent = parent,
onGalleryClicked = { position -> onRoomClicked(getItem(position)) } onGalleryClicked = { position -> onRoomClicked(getItem(position)) }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment