Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import io.getstream.chat.android.compose.sample.data.customSettings
import io.getstream.chat.android.compose.sample.feature.channel.isGroupChannel
import io.getstream.chat.android.compose.sample.ui.channel.DirectChannelInfoActivity
import io.getstream.chat.android.compose.sample.ui.channel.GroupChannelInfoActivity
import io.getstream.chat.android.compose.sample.ui.component.CustomChatComponentFactory
import io.getstream.chat.android.compose.sample.ui.location.LocationComponentFactory
import io.getstream.chat.android.compose.sample.vm.SharedLocationViewModelFactory
import io.getstream.chat.android.compose.ui.messages.ChannelScreen
import io.getstream.chat.android.compose.ui.theme.AttachmentPickerConfig
Expand Down Expand Up @@ -75,7 +75,7 @@ class MessagesActivity : ComponentActivity() {
private fun SetupChatTheme() {
val locationViewModelFactory = SharedLocationViewModelFactory(cid)
SampleChatTheme(
componentFactory = CustomChatComponentFactory(locationViewModelFactory = locationViewModelFactory),
componentFactory = LocationComponentFactory(locationViewModelFactory = locationViewModelFactory),
config = ChatUiConfig(
composer = ComposerConfig(
linkPreviewEnabled = ChatApp.isComposerLinkPreviewEnabled,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,19 @@ 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.sample.ui.component.CustomChatComponentFactory
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

/**
* Sample app wrapper around [ChatTheme] that enables test tags as resource IDs for UIAutomator
* E2E tests and sets [ChatApp.dateFormatter] and [CustomChatComponentFactory] as defaults.
* E2E tests and sets [ChatApp.dateFormatter] as defaults.
*/
@Composable
internal fun SampleChatTheme(
config: ChatUiConfig = ChatUiConfig(),
componentFactory: ChatComponentFactory = CustomChatComponentFactory(),
componentFactory: ChatComponentFactory = object : ChatComponentFactory {},
channelOptionsTheme: ChannelOptionsTheme = ChannelOptionsTheme.defaultTheme(),
content: @Composable () -> Unit,
) {
Expand Down

This file was deleted.

Loading