Remove ChannelOptionsTheme and move options visibility to config

Author: gpunto

stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/SampleChatTheme.kt

@@ -25,7 +25,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
 import io.getstream.chat.android.compose.sample.ChatApp
-import io.getstream.chat.android.compose.ui.theme.ChannelOptionsTheme
 import io.getstream.chat.android.compose.ui.theme.ChatComponentFactory
 import io.getstream.chat.android.compose.ui.theme.ChatTheme
 import io.getstream.chat.android.compose.ui.theme.ChatUiConfig
@@ -38,15 +37,13 @@ import io.getstream.chat.android.compose.ui.theme.ChatUiConfig
 internal fun SampleChatTheme(
     config: ChatUiConfig = ChatUiConfig(),
     componentFactory: ChatComponentFactory = object : ChatComponentFactory {},
-    channelOptionsTheme: ChannelOptionsTheme = ChannelOptionsTheme.defaultTheme(),
     content: @Composable () -> Unit,
 ) {
     Box(modifier = Modifier.semantics { testTagsAsResourceId = true }) {
         ChatTheme(
             dateFormatter = ChatApp.dateFormatter,
             config = config,
             componentFactory = componentFactory,
-            channelOptionsTheme = channelOptionsTheme,
             content = content,
         )
     }

stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/chats/ChatsActivity.kt

@@ -68,10 +68,11 @@ import io.getstream.chat.android.compose.ui.channels.SearchMode
 import io.getstream.chat.android.compose.ui.chats.ChatListContentMode
 import io.getstream.chat.android.compose.ui.chats.ChatMessageSelection
 import io.getstream.chat.android.compose.ui.chats.ChatsScreen
-import io.getstream.chat.android.compose.ui.components.channels.ChannelOptionItemVisibility
-import io.getstream.chat.android.compose.ui.theme.ChannelOptionsTheme
+import io.getstream.chat.android.compose.ui.components.channels.ChannelOptionsVisibility
+import io.getstream.chat.android.compose.ui.theme.ChannelListConfig
 import io.getstream.chat.android.compose.ui.theme.ChatComponentFactory
 import io.getstream.chat.android.compose.ui.theme.ChatTheme
+import io.getstream.chat.android.compose.ui.theme.ChatUiConfig
 import io.getstream.chat.android.compose.ui.theme.CompoundComponentFactory
 import io.getstream.chat.android.compose.ui.theme.DirectChannelInfoTopBarParams
 import io.getstream.chat.android.compose.ui.theme.GroupChannelInfoTopBarParams
@@ -159,9 +160,11 @@ class ChatsActivity : ComponentActivity() {
 
         setContent {
             SampleChatTheme(
-                channelOptionsTheme = ChannelOptionsTheme.defaultTheme(
-                    optionVisibility = ChannelOptionItemVisibility(
-                        isViewInfoVisible = AdaptiveLayoutInfo.singlePaneWindow(),
+                config = ChatUiConfig(
+                    channelList = ChannelListConfig(
+                        optionsVisibility = ChannelOptionsVisibility(
+                            isViewInfoVisible = AdaptiveLayoutInfo.singlePaneWindow(),
+                        ),
                     ),
                 ),
             ) {

stream-chat-android-compose/api/stream-chat-android-compose.api

@@ -92,7 +92,7 @@ private fun rememberPrimarySwipeAction(
 ): ChannelAction? {
     val resources = LocalResources.current
     val handlerState = rememberUpdatedState(handler)
-    val canMute = ChatTheme.channelOptionsTheme.optionVisibility.isMuteChannelVisible &&
+    val canMute = ChatTheme.config.channelList.optionsVisibility.isMuteChannelVisible &&
         channel.ownCapabilities.contains(ChannelCapabilities.MUTE_CHANNEL)
 
     return remember(channel.cid, isMuted, canMute) {

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/channels/list/DefaultChannelSwipeActions.kt

@@ -114,7 +114,7 @@ public fun buildDefaultChannelActions(
     viewModel: ChannelListViewModel,
     onViewInfoAction: (Channel) -> Unit,
 ): List<ChannelAction> {
-    val optionVisibility = ChatTheme.channelOptionsTheme.optionVisibility
+    val optionVisibility = ChatTheme.config.channelList.optionsVisibility
     val currentUser by viewModel.user.collectAsState()
     val channelName = ChatTheme.channelNameFormatter.formatChannelName(
         selectedChannel,
@@ -154,7 +154,7 @@ private fun buildDmChannelActions(
     selectedChannel: Channel,
     currentUser: User?,
     ownCapabilities: Set<String>,
-    optionVisibility: ChannelOptionItemVisibility,
+    optionVisibility: ChannelOptionsVisibility,
     channelName: String,
     viewModel: ChannelListViewModel,
     onViewInfoAction: (Channel) -> Unit,
@@ -298,7 +298,7 @@ private fun buildDmDeleteAction(
 private fun buildGroupChannelActions(
     selectedChannel: Channel,
     ownCapabilities: Set<String>,
-    optionVisibility: ChannelOptionItemVisibility,
+    optionVisibility: ChannelOptionsVisibility,
     channelName: String,
     viewModel: ChannelListViewModel,
     onViewInfoAction: (Channel) -> Unit,

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/channels/ChannelOptions.kt

@@ -29,7 +29,7 @@ package io.getstream.chat.android.compose.ui.components.channels
  *
  * @see [ChannelOptions]
  */
-public data class ChannelOptionItemVisibility(
+public data class ChannelOptionsVisibility(
     val isViewInfoVisible: Boolean = true,
     val isLeaveChannelVisible: Boolean = true,
     val isMuteChannelVisible: Boolean = true,

…/channels/ChannelOptionItemVisibility.kt …nts/channels/ChannelOptionsVisibility.ktstream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/channels/ChannelOptionItemVisibility.kt renamed to stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/channels/ChannelOptionsVisibility.kt stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/channels/ChannelOptionItemVisibility.kt renamed to stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/channels/ChannelOptionsVisibility.kt

@@ -108,9 +108,6 @@ private val LocalSearchResultNameFormatter = compositionLocalOf<SearchResultName
 private val LocalMessageAlignmentProvider = compositionLocalOf<MessageAlignmentProvider> {
     error("No MessageAlignmentProvider provided! Make sure to wrap all usages of Stream components in a ChatTheme.")
 }
-private val LocalChannelOptionsTheme = compositionLocalOf<ChannelOptionsTheme> {
-    error("No ChannelOptionsTheme provided! Make sure to wrap all usages of Stream components in a ChatTheme.")
-}
 
 private val LocalStreamCdnImageResizing = compositionLocalOf<StreamCdnImageResizing> {
     error(
@@ -142,7 +139,6 @@ private val LocalStreamMediaRecorder = compositionLocalOf<StreamMediaRecorder> {
  * @param searchResultNameFormatter [SearchResultNameFormatter] Used to format names in search results.
  * @param imageLoaderFactory A factory that creates new Coil [ImageLoader] instances.
  * @param messageAlignmentProvider [MessageAlignmentProvider] Used to provide message alignment for the given message.
- * @param channelOptionsTheme [ChannelOptionsTheme] Theme for the channel option list in the channel info screen.
  * @param streamCdnImageResizing Sets the strategy for resizing images hosted on Stream's CDN. Disabled by default,
  * set [StreamCdnImageResizing.imageResizingEnabled] to true if you wish to enable resizing images. Note that resizing
  * applies only to images hosted on Stream's CDN which contain the original height (oh) and width (ow) query parameters.
@@ -178,7 +174,6 @@ public fun ChatTheme(
     searchResultNameFormatter: SearchResultNameFormatter = SearchResultNameFormatter.defaultFormatter(),
     imageLoaderFactory: StreamCoilImageLoaderFactory = StreamCoilImageLoaderFactory.defaultFactory(),
     messageAlignmentProvider: MessageAlignmentProvider = MessageAlignmentProvider.defaultMessageAlignmentProvider(),
-    channelOptionsTheme: ChannelOptionsTheme = ChannelOptionsTheme.defaultTheme(),
     streamCdnImageResizing: StreamCdnImageResizing = StreamCdnImageResizing.defaultStreamCdnImageResizing(),
     messageTextFormatter: MessageTextFormatter = MessageTextFormatter.defaultFormatter(
         autoTranslationEnabled = config.translation.enabled,
@@ -225,7 +220,6 @@ public fun ChatTheme(
         LocalSearchResultNameFormatter provides searchResultNameFormatter,
         LocalStreamImageLoader provides imageLoader,
         LocalMessageAlignmentProvider provides messageAlignmentProvider,
-        LocalChannelOptionsTheme provides channelOptionsTheme,
         LocalStreamCdnImageResizing provides streamCdnImageResizing,
         LocalStreamMediaRecorder provides streamMediaRecorder,
     ) {
@@ -358,14 +352,6 @@ public object ChatTheme {
         @ReadOnlyComposable
         get() = LocalMessageAlignmentProvider.current
 
-    /**
-     * Retrieves the current [ChannelOptionsTheme] at the call site's position in the hierarchy.
-     */
-    public val channelOptionsTheme: ChannelOptionsTheme
-        @Composable
-        @ReadOnlyComposable
-        get() = LocalChannelOptionsTheme.current
-
     /**
      * Retrieves the value of [StreamCdnImageResizing] at the call site's position in the hierarchy.
      */

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/theme/ChannelOptionsTheme.kt

@@ -23,6 +23,7 @@ import io.getstream.chat.android.compose.state.messages.attachments.CommandPicke
 import io.getstream.chat.android.compose.state.messages.attachments.FilePickerMode
 import io.getstream.chat.android.compose.state.messages.attachments.GalleryPickerMode
 import io.getstream.chat.android.compose.state.messages.attachments.PollPickerMode
+import io.getstream.chat.android.compose.ui.components.channels.ChannelOptionsVisibility
 import io.getstream.chat.android.compose.ui.components.messageoptions.MessageActionsOptionsVisibility
 import kotlinx.parcelize.Parcelize
 
@@ -42,10 +43,12 @@ public enum class MuteIndicatorPosition {
  *
  * @param muteIndicatorPosition Where the mute icon is placed in the channel list item.
  * @param swipeActionsEnabled Whether swipe-to-reveal actions are enabled on channel list items.
+ * @param optionsVisibility Controls which options are visible in the channel options menu.
  */
 public data class ChannelListConfig(
     val muteIndicatorPosition: MuteIndicatorPosition = MuteIndicatorPosition.InlineTitle,
     val swipeActionsEnabled: Boolean = true,
+    val optionsVisibility: ChannelOptionsVisibility = ChannelOptionsVisibility(),
 )
 
 /**