Skip to content

Commit 0df0b42

Browse files
VelikovPetarclaude
andauthored
Align UI config flag defaults (#6323)
* Align UI config defaults: enable audio recording, drafts, and show-original translation by default Co-Authored-By: Claude <noreply@anthropic.com> * Set autoTranslation flag to true. * Fix E2E compilation error. --------- Co-authored-by: Claude <noreply@anthropic.com>
1 parent c7a5360 commit 0df0b42

File tree

28 files changed

+87
-93
lines changed

28 files changed

+87
-93
lines changed

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/notifications/handler/NotificationConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public data class NotificationConfig @JvmOverloads constructor(
7676
/**
7777
* Whether or not the auto-translation feature is enabled.
7878
*/
79-
val autoTranslationEnabled: Boolean = false,
79+
val autoTranslationEnabled: Boolean = true,
8080

8181
/**
8282
* A token provider to be used on case of restoring user credentials and an expired token needs to be refreshed.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ class ChatApp : Application() {
7676
lateinit var sharedLocationService: SharedLocationService
7777
private set
7878

79-
public const val autoTranslationEnabled: Boolean = true
80-
8179
public const val isComposerLinkPreviewEnabled: Boolean = true
8280
}
8381
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ object ChatHelper {
5959
providerName = "chat-android-firebase",
6060
),
6161
),
62-
autoTranslationEnabled = ChatApp.autoTranslationEnabled,
6362
)
6463
val notificationHandler = NotificationHandlerFactory.createNotificationHandler(
6564
context = context,

stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/feature/channel/list/ChannelsActivity.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ import io.getstream.chat.android.compose.ui.components.channels.buildDefaultChan
8888
import io.getstream.chat.android.compose.ui.mentions.MentionList
8989
import io.getstream.chat.android.compose.ui.theme.ChannelOptionsTheme
9090
import io.getstream.chat.android.compose.ui.theme.ChatTheme
91-
import io.getstream.chat.android.compose.ui.theme.ChatUiConfig
92-
import io.getstream.chat.android.compose.ui.theme.TranslationConfig
9391
import io.getstream.chat.android.compose.ui.threads.ThreadList
9492
import io.getstream.chat.android.compose.viewmodel.channels.ChannelListViewModel
9593
import io.getstream.chat.android.compose.viewmodel.channels.ChannelViewModelFactory
@@ -127,7 +125,6 @@ class ChannelsActivity : ComponentActivity() {
127125
Filters.or(Filters.notExists(CHANNEL_ARG_DRAFT), Filters.eq(CHANNEL_ARG_DRAFT, false)),
128126
),
129127
chatEventHandlerFactory = CustomChatEventHandlerFactory(),
130-
isDraftMessageEnabled = true,
131128
)
132129
}
133130

@@ -160,9 +157,6 @@ class ChannelsActivity : ComponentActivity() {
160157

161158
ChatTheme(
162159
dateFormatter = ChatApp.dateFormatter,
163-
config = ChatUiConfig(
164-
translation = TranslationConfig(enabled = ChatApp.autoTranslationEnabled),
165-
),
166160
allowUIAutomationTest = true,
167161
componentFactory = CustomChatComponentFactory(),
168162
channelOptionsTheme = ChannelOptionsTheme.defaultTheme(

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ import io.getstream.chat.android.compose.ui.theme.MessageComposerTheme
4444
import io.getstream.chat.android.compose.ui.theme.MessageOptionsTheme
4545
import io.getstream.chat.android.compose.ui.theme.ReactionOptionsTheme
4646
import io.getstream.chat.android.compose.ui.theme.StreamDesign
47-
import io.getstream.chat.android.compose.ui.theme.TranslationConfig
4847
import io.getstream.chat.android.compose.viewmodel.messages.MessagesViewModelFactory
4948
import io.getstream.chat.android.models.Channel
5049
import io.getstream.chat.android.models.ReactionSortingByLastReactionAt
@@ -62,7 +61,6 @@ class MessagesActivity : ComponentActivity() {
6261
MessagesViewModelFactory(
6362
context = this,
6463
channelId = cid,
65-
autoTranslationEnabled = ChatApp.autoTranslationEnabled,
6664
isComposerLinkPreviewEnabled = ChatApp.isComposerLinkPreviewEnabled,
6765
deletedMessageVisibility = DeletedMessageVisibility.ALWAYS_VISIBLE,
6866
messageId = intent.getStringExtra(KEY_MESSAGE_ID),
@@ -105,11 +103,9 @@ class MessagesActivity : ComponentActivity() {
105103
dateFormatter = ChatApp.dateFormatter,
106104
config = ChatUiConfig(
107105
composer = ComposerConfig(
108-
audioRecordingEnabled = true,
109106
linkPreviewEnabled = ChatApp.isComposerLinkPreviewEnabled,
110107
floatingStyleEnabled = settings.isComposerFloatingStyleEnabled,
111108
),
112-
translation = TranslationConfig(enabled = ChatApp.autoTranslationEnabled),
113109
attachmentPicker = AttachmentPickerConfig(useSystemPicker = settings.isSystemAttachmentPickerEnabled),
114110
),
115111
allowUIAutomationTest = true,

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,9 @@ import io.getstream.chat.android.compose.ui.components.channels.ChannelOptionIte
7373
import io.getstream.chat.android.compose.ui.theme.ChannelOptionsTheme
7474
import io.getstream.chat.android.compose.ui.theme.ChatComponentFactory
7575
import io.getstream.chat.android.compose.ui.theme.ChatTheme
76-
import io.getstream.chat.android.compose.ui.theme.ChatUiConfig
7776
import io.getstream.chat.android.compose.ui.theme.CompoundComponentFactory
7877
import io.getstream.chat.android.compose.ui.theme.DirectChannelInfoTopBarParams
7978
import io.getstream.chat.android.compose.ui.theme.GroupChannelInfoTopBarParams
80-
import io.getstream.chat.android.compose.ui.theme.TranslationConfig
8179
import io.getstream.chat.android.compose.ui.util.adaptivelayout.AdaptiveLayoutInfo
8280
import io.getstream.chat.android.compose.ui.util.adaptivelayout.ThreePaneDestination
8381
import io.getstream.chat.android.compose.ui.util.adaptivelayout.ThreePaneNavigator
@@ -166,9 +164,6 @@ class ChatsActivity : ComponentActivity() {
166164
setContent {
167165
ChatTheme(
168166
dateFormatter = ChatApp.dateFormatter,
169-
config = ChatUiConfig(
170-
translation = TranslationConfig(enabled = ChatApp.autoTranslationEnabled),
171-
),
172167
allowUIAutomationTest = true,
173168
componentFactory = CustomChatComponentFactory(),
174169
channelOptionsTheme = ChannelOptionsTheme.defaultTheme(
@@ -619,7 +614,6 @@ class ChatsActivity : ComponentActivity() {
619614
channelId = channelId,
620615
messageId = messageId,
621616
parentMessageId = parentMessageId,
622-
autoTranslationEnabled = ChatApp.autoTranslationEnabled,
623617
deletedMessageVisibility = DeletedMessageVisibility.ALWAYS_VISIBLE,
624618
isComposerLinkPreviewEnabled = ChatApp.isComposerLinkPreviewEnabled,
625619
)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ public data class ChatUiConfig(
110110
* @param showOriginalEnabled Whether users can toggle to see the original (untranslated) text.
111111
*/
112112
public data class TranslationConfig(
113-
val enabled: Boolean = false,
114-
val showOriginalEnabled: Boolean = false,
113+
val enabled: Boolean = true,
114+
val showOriginalEnabled: Boolean = true,
115115
)
116116

117117
/**
@@ -176,8 +176,8 @@ public data class MediaGalleryOptionsConfig(
176176
* @param floatingStyleEnabled Whether the message composer uses the floating style.
177177
*/
178178
public data class ComposerConfig(
179-
val audioRecordingEnabled: Boolean = false,
180-
val audioRecordingSendOnComplete: Boolean = true,
179+
val audioRecordingEnabled: Boolean = true,
180+
val audioRecordingSendOnComplete: Boolean = false,
181181
val linkPreviewEnabled: Boolean = false,
182182
val floatingStyleEnabled: Boolean = false,
183183
)

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/viewmodel/channels/ChannelListViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public class ChannelListViewModel(
104104
private val messageLimit: Int? = null,
105105
private val chatEventHandlerFactory: ChatEventHandlerFactory = ChatEventHandlerFactory(chatClient.clientState),
106106
searchDebounceMs: Long = SEARCH_DEBOUNCE_MS,
107-
private val isDraftMessageEnabled: Boolean = false,
107+
private val isDraftMessageEnabled: Boolean = true,
108108
private val messageSearchSort: QuerySorter<Message>? = null,
109109
private val globalState: Flow<GlobalState> = chatClient.globalStateFlow,
110110
) : ViewModel() {

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/viewmodel/channels/ChannelViewModelFactory.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import io.getstream.chat.android.models.querysort.QuerySorter
4040
* @param messageLimit How many messages are fetched for each channel item when loading channels.
4141
* When `null`, the server-side default is used.
4242
* @param chatEventHandlerFactory The instance of [ChatEventHandlerFactory] used to create [ChatEventHandler].
43+
* @param isDraftMessageEnabled If the draft message feature is enabled.
4344
* @param messageSearchSort Optional sorting for message search results. When `null`, the server-side default is used.
4445
*/
4546
public class ChannelViewModelFactory(
@@ -50,7 +51,7 @@ public class ChannelViewModelFactory(
5051
private val memberLimit: Int? = null,
5152
private val messageLimit: Int? = null,
5253
private val chatEventHandlerFactory: ChatEventHandlerFactory = ChatEventHandlerFactory(chatClient.clientState),
53-
private val isDraftMessageEnabled: Boolean = false,
54+
private val isDraftMessageEnabled: Boolean = true,
5455
private val messageSearchSort: QuerySorter<Message>? = null,
5556
) : ViewModelProvider.Factory {
5657

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/viewmodel/messages/MessagesViewModelFactory.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public class MessagesViewModelFactory(
8686
internal val channelId: String,
8787
internal val messageId: String? = null,
8888
internal val parentMessageId: String? = null,
89-
private val autoTranslationEnabled: Boolean = false,
89+
private val autoTranslationEnabled: Boolean = true,
9090
private val chatClient: ChatClient = ChatClient.instance(),
9191
private val clientState: ClientState = chatClient.clientState,
9292
private val mediaRecorder: StreamMediaRecorder = DefaultStreamMediaRecorder(context.applicationContext),
@@ -111,7 +111,7 @@ public class MessagesViewModelFactory(
111111
private val showThreadSeparatorInEmptyThread: Boolean = false,
112112
private val threadLoadOlderToNewer: Boolean = false,
113113
private val isComposerLinkPreviewEnabled: Boolean = false,
114-
private val isComposerDraftMessageEnabled: Boolean = false,
114+
private val isComposerDraftMessageEnabled: Boolean = true,
115115
) : ViewModelProvider.Factory {
116116

117117
private val channelStateFlow: StateFlow<ChannelState?> by lazy {

0 commit comments

Comments
 (0)