Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[i209] allow override channel options visibility #5044

Merged
merged 2 commits into from
Nov 8, 2023
Merged

[i209] allow override channel options visibility #5044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34783cb
[i209] allow override channel options visibility#209
kanat Nov 7, 2023
cb09cac
[i209] add CHANGELOG
kanat Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
- Fixed channel title not being centered vertically when mo last message exists. [#5040](https://github.com/GetStream/stream-chat-android/pull/5040)

### ⬆️ Improved
- Allow override channel's delete option visibility. [#5044](https://github.com/GetStream/stream-chat-android/pull/5044)

### ✅ Added

Expand Down
17 changes: 15 additions & 2 deletions ...eam/chat/android/ui/channel/list/adapter/viewholder/ChannelListVisibilityContainerImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@
package io.getstream.chat.android.ui.channel.list.adapter.viewholder

import com.getstream.sdk.chat.utils.ListenerDelegate
import io.getstream.chat.android.client.models.ChannelCapabilities
import io.getstream.chat.android.ui.channel.list.ChannelListView.ChannelOptionVisibilityPredicate

internal class ChannelListVisibilityContainerImpl(
isMoreOptionsVisible: ChannelOptionVisibilityPredicate = ChannelOptionVisibilityPredicate.DEFAULT,
isDeleteOptionVisible: ChannelOptionVisibilityPredicate = ChannelOptionVisibilityPredicate.DEFAULT,
isMoreOptionsVisible: ChannelOptionVisibilityPredicate = moreOptionsDefault,
isDeleteOptionVisible: ChannelOptionVisibilityPredicate = deleteOptionDefault,
) : ChannelListVisibilityContainer {

override var isMoreOptionsVisible: ChannelOptionVisibilityPredicate by ListenerDelegate(isMoreOptionsVisible) { realPredicate ->
Expand All @@ -35,4 +36,16 @@ internal class ChannelListVisibilityContainerImpl(
realPredicate().invoke(channel)
}
}

private companion object {
val moreOptionsDefault: ChannelOptionVisibilityPredicate = ChannelOptionVisibilityPredicate {
// "more options" is visible by default
true
}

val deleteOptionDefault: ChannelOptionVisibilityPredicate = ChannelOptionVisibilityPredicate {
// "delete option" is visible if the channel's ownCapabilities contains the delete capability
it.ownCapabilities.contains(ChannelCapabilities.DELETE_CHANNEL)
}
}
}
5 changes: 2 additions & 3 deletions ...o/getstream/chat/android/ui/channel/list/adapter/viewholder/internal/ChannelViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import com.getstream.sdk.chat.utils.formatDate
import io.getstream.chat.android.client.ChatClient
import io.getstream.chat.android.client.extensions.isAnonymousChannel
import io.getstream.chat.android.client.models.Channel
import io.getstream.chat.android.client.models.ChannelCapabilities
import io.getstream.chat.android.client.models.Message
import io.getstream.chat.android.client.setup.state.ClientState
import io.getstream.chat.android.client.utils.SyncStatus
Expand Down Expand Up @@ -112,6 +111,7 @@ internal class ChannelViewHolder @JvmOverloads constructor(
?.user
?.let(userClickListener::onClick)
}

else -> channelClickListener.onClick(channel)
}
}
Expand Down Expand Up @@ -209,8 +209,7 @@ internal class ChannelViewHolder @JvmOverloads constructor(
}
}
binding.itemBackgroundView.deleteImageView.apply {
val canDeleteChannel = channel.ownCapabilities.contains(ChannelCapabilities.DELETE_CHANNEL)
if (style.deleteEnabled && canDeleteChannel && isDeleteOptionVisible(channel)) {
if (style.deleteEnabled && isDeleteOptionVisible(channel)) {
isVisible = true
getDeleteOptionIcon.invoke(channel)?.also { setImageDrawable(it) }
optionsCount++
Expand Down