Skip to content

Commit e316231

Browse files
gpuntogpunto
committed
Remove QuotedMessageTextFormatter
1 parent c9888de commit e316231

4 files changed

Lines changed: 4 additions & 585 deletions

File tree

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3199,7 +3199,6 @@ public final class io/getstream/chat/android/compose/ui/theme/ChatTheme {
31993199
public final fun getOwnMessageTheme (Landroidx/compose/runtime/Composer;I)Lio/getstream/chat/android/compose/ui/theme/MessageTheme;
32003200
public final fun getPollSwitchitemFactory (Landroidx/compose/runtime/Composer;I)Lio/getstream/chat/android/compose/ui/util/PollSwitchItemFactory;
32013201
public final fun getQuotedAttachmentFactories (Landroidx/compose/runtime/Composer;I)Ljava/util/List;
3202-
public final fun getQuotedMessageTextFormatter (Landroidx/compose/runtime/Composer;I)Lio/getstream/chat/android/compose/ui/util/QuotedMessageTextFormatter;
32033202
public final fun getReactionIconFactory (Landroidx/compose/runtime/Composer;I)Lio/getstream/chat/android/compose/ui/util/ReactionIconFactory;
32043203
public final fun getReactionOptionsTheme (Landroidx/compose/runtime/Composer;I)Lio/getstream/chat/android/compose/ui/theme/ReactionOptionsTheme;
32053204
public final fun getReactionPushEmojiFactory (Landroidx/compose/runtime/Composer;I)Lio/getstream/chat/android/ui/common/helper/ReactionPushEmojiFactory;
@@ -3222,7 +3221,7 @@ public final class io/getstream/chat/android/compose/ui/theme/ChatTheme {
32223221
}
32233222

32243223
public final class io/getstream/chat/android/compose/ui/theme/ChatThemeKt {
3225-
public static final fun ChatTheme (ZZZZZLio/getstream/chat/android/ui/common/permissions/SystemAttachmentsPickerConfig;Lio/getstream/chat/android/compose/ui/theme/StreamColors;Lio/getstream/chat/android/compose/ui/theme/StreamDimens;Lio/getstream/chat/android/compose/ui/theme/StreamTypography;Lio/getstream/chat/android/compose/ui/theme/StreamShapes;Lio/getstream/chat/android/compose/ui/theme/StreamRippleConfiguration;Lio/getstream/chat/android/ui/common/model/UserPresence;Lio/getstream/chat/android/compose/ui/theme/ChatComponentFactory;Ljava/util/List;Lio/getstream/chat/android/compose/ui/components/messages/factory/MessageContentFactory;Ljava/util/List;Ljava/util/List;Lio/getstream/chat/android/compose/ui/util/ReactionIconFactory;Lio/getstream/chat/android/ui/common/helper/ReactionPushEmojiFactory;Lio/getstream/chat/android/compose/ui/theme/ReactionOptionsTheme;Lio/getstream/chat/android/compose/ui/util/MessagePreviewIconFactory;Lio/getstream/chat/android/compose/ui/util/PollSwitchItemFactory;ZLio/getstream/chat/android/ui/common/helper/DateFormatter;Lio/getstream/chat/android/ui/common/helper/TimeProvider;Lio/getstream/chat/android/ui/common/helper/DurationFormatter;Lio/getstream/chat/android/ui/common/utils/ChannelNameFormatter;Lio/getstream/chat/android/compose/ui/util/MessagePreviewFormatter;Lio/getstream/chat/android/compose/ui/util/SearchResultNameFormatter;Lio/getstream/chat/android/compose/ui/util/StreamCoilImageLoaderFactory;Lio/getstream/chat/android/ui/common/helper/ImageHeadersProvider;Lio/getstream/chat/android/ui/common/helper/DownloadAttachmentUriGenerator;Lio/getstream/chat/android/ui/common/helper/DownloadRequestInterceptor;Lio/getstream/chat/android/ui/common/helper/ImageAssetTransformer;Lio/getstream/chat/android/compose/ui/util/MessageAlignmentProvider;Lio/getstream/chat/android/compose/ui/theme/MessageOptionsTheme;Lio/getstream/chat/android/compose/ui/theme/ChannelOptionsTheme;Lio/getstream/chat/android/ui/common/state/messages/list/MessageOptionsUserReactionAlignment;Ljava/util/List;ZLio/getstream/chat/android/ui/common/images/resizing/StreamCdnImageResizing;ZLio/getstream/chat/android/compose/ui/theme/MessageTheme;Lio/getstream/chat/android/compose/ui/theme/MessageTheme;Lio/getstream/chat/android/compose/ui/theme/MessageDateSeparatorTheme;Lio/getstream/chat/android/compose/ui/theme/MessageUnreadSeparatorTheme;Lio/getstream/chat/android/compose/ui/theme/MessageComposerTheme;Lio/getstream/chat/android/compose/ui/theme/AttachmentPickerTheme;Lio/getstream/chat/android/compose/ui/util/MessageTextFormatter;Lio/getstream/chat/android/compose/ui/util/QuotedMessageTextFormatter;Lio/getstream/sdk/chat/audio/recording/StreamMediaRecorder;Lio/getstream/chat/android/compose/ui/theme/StreamKeyboardBehaviour;Lio/getstream/chat/android/compose/ui/attachments/preview/MediaGalleryConfig;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;IIIIIIII)V
3224+
public static final fun ChatTheme (ZZZZZLio/getstream/chat/android/ui/common/permissions/SystemAttachmentsPickerConfig;Lio/getstream/chat/android/compose/ui/theme/StreamColors;Lio/getstream/chat/android/compose/ui/theme/StreamDimens;Lio/getstream/chat/android/compose/ui/theme/StreamTypography;Lio/getstream/chat/android/compose/ui/theme/StreamShapes;Lio/getstream/chat/android/compose/ui/theme/StreamRippleConfiguration;Lio/getstream/chat/android/ui/common/model/UserPresence;Lio/getstream/chat/android/compose/ui/theme/ChatComponentFactory;Ljava/util/List;Lio/getstream/chat/android/compose/ui/components/messages/factory/MessageContentFactory;Ljava/util/List;Ljava/util/List;Lio/getstream/chat/android/compose/ui/util/ReactionIconFactory;Lio/getstream/chat/android/ui/common/helper/ReactionPushEmojiFactory;Lio/getstream/chat/android/compose/ui/theme/ReactionOptionsTheme;Lio/getstream/chat/android/compose/ui/util/MessagePreviewIconFactory;Lio/getstream/chat/android/compose/ui/util/PollSwitchItemFactory;ZLio/getstream/chat/android/ui/common/helper/DateFormatter;Lio/getstream/chat/android/ui/common/helper/TimeProvider;Lio/getstream/chat/android/ui/common/helper/DurationFormatter;Lio/getstream/chat/android/ui/common/utils/ChannelNameFormatter;Lio/getstream/chat/android/compose/ui/util/MessagePreviewFormatter;Lio/getstream/chat/android/compose/ui/util/SearchResultNameFormatter;Lio/getstream/chat/android/compose/ui/util/StreamCoilImageLoaderFactory;Lio/getstream/chat/android/ui/common/helper/ImageHeadersProvider;Lio/getstream/chat/android/ui/common/helper/DownloadAttachmentUriGenerator;Lio/getstream/chat/android/ui/common/helper/DownloadRequestInterceptor;Lio/getstream/chat/android/ui/common/helper/ImageAssetTransformer;Lio/getstream/chat/android/compose/ui/util/MessageAlignmentProvider;Lio/getstream/chat/android/compose/ui/theme/MessageOptionsTheme;Lio/getstream/chat/android/compose/ui/theme/ChannelOptionsTheme;Lio/getstream/chat/android/ui/common/state/messages/list/MessageOptionsUserReactionAlignment;Ljava/util/List;ZLio/getstream/chat/android/ui/common/images/resizing/StreamCdnImageResizing;ZLio/getstream/chat/android/compose/ui/theme/MessageTheme;Lio/getstream/chat/android/compose/ui/theme/MessageTheme;Lio/getstream/chat/android/compose/ui/theme/MessageDateSeparatorTheme;Lio/getstream/chat/android/compose/ui/theme/MessageUnreadSeparatorTheme;Lio/getstream/chat/android/compose/ui/theme/MessageComposerTheme;Lio/getstream/chat/android/compose/ui/theme/AttachmentPickerTheme;Lio/getstream/chat/android/compose/ui/util/MessageTextFormatter;Lio/getstream/sdk/chat/audio/recording/StreamMediaRecorder;Lio/getstream/chat/android/compose/ui/theme/StreamKeyboardBehaviour;Lio/getstream/chat/android/compose/ui/attachments/preview/MediaGalleryConfig;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;IIIIIIII)V
32263225
public static final fun getLocalComponentFactory ()Landroidx/compose/runtime/ProvidableCompositionLocal;
32273226
}
32283227

@@ -4528,17 +4527,6 @@ public final class io/getstream/chat/android/compose/ui/util/PollSwitchItemFacto
45284527
public final fun defaultFactory (Landroid/content/Context;)Lio/getstream/chat/android/compose/ui/util/PollSwitchItemFactory;
45294528
}
45304529

4531-
public abstract interface class io/getstream/chat/android/compose/ui/util/QuotedMessageTextFormatter {
4532-
public static final field Companion Lio/getstream/chat/android/compose/ui/util/QuotedMessageTextFormatter$Companion;
4533-
public abstract fun format (Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/User;)Landroidx/compose/ui/text/AnnotatedString;
4534-
}
4535-
4536-
public final class io/getstream/chat/android/compose/ui/util/QuotedMessageTextFormatter$Companion {
4537-
public final fun composite ([Lio/getstream/chat/android/compose/ui/util/QuotedMessageTextFormatter;)Lio/getstream/chat/android/compose/ui/util/QuotedMessageTextFormatter;
4538-
public final fun defaultFormatter (ZLandroid/content/Context;ZLio/getstream/chat/android/compose/ui/theme/StreamTypography;Lio/getstream/chat/android/compose/ui/theme/StreamColors;Lio/getstream/chat/android/compose/ui/theme/StreamShapes;Lio/getstream/chat/android/compose/ui/theme/MessageTheme;Lio/getstream/chat/android/compose/ui/theme/MessageTheme;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;II)Lio/getstream/chat/android/compose/ui/util/QuotedMessageTextFormatter;
4539-
public final fun defaultFormatter (ZLandroid/content/Context;ZLio/getstream/chat/android/compose/ui/theme/StreamTypography;Lio/getstream/chat/android/compose/ui/theme/StreamColors;Lio/getstream/chat/android/compose/ui/theme/StreamShapes;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;III)Lio/getstream/chat/android/compose/ui/util/QuotedMessageTextFormatter;
4540-
}
4541-
45424530
public final class io/getstream/chat/android/compose/ui/util/ReactionDrawable {
45434531
public static final field $stable I
45444532
public fun <init> (II)V

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

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ import io.getstream.chat.android.compose.ui.attachments.preview.handler.Attachme
4747
import io.getstream.chat.android.compose.ui.components.messages.factory.MessageContentFactory
4848
import io.getstream.chat.android.compose.ui.messages.attachments.factory.AttachmentsPickerTabFactories
4949
import io.getstream.chat.android.compose.ui.messages.attachments.factory.AttachmentsPickerTabFactory
50+
import io.getstream.chat.android.compose.ui.theme.ChatTheme.autoTranslationEnabled
51+
import io.getstream.chat.android.compose.ui.theme.ChatTheme.isComposerLinkPreviewEnabled
52+
import io.getstream.chat.android.compose.ui.theme.ChatTheme.showOriginalTranslationEnabled
5053
import io.getstream.chat.android.compose.ui.theme.messages.attachments.FileAttachmentTheme
5154
import io.getstream.chat.android.compose.ui.util.DefaultPollSwitchItemFactory
5255
import io.getstream.chat.android.compose.ui.util.LocalStreamImageLoader
@@ -55,7 +58,6 @@ import io.getstream.chat.android.compose.ui.util.MessagePreviewFormatter
5558
import io.getstream.chat.android.compose.ui.util.MessagePreviewIconFactory
5659
import io.getstream.chat.android.compose.ui.util.MessageTextFormatter
5760
import io.getstream.chat.android.compose.ui.util.PollSwitchItemFactory
58-
import io.getstream.chat.android.compose.ui.util.QuotedMessageTextFormatter
5961
import io.getstream.chat.android.compose.ui.util.ReactionIconFactory
6062
import io.getstream.chat.android.compose.ui.util.SearchResultNameFormatter
6163
import io.getstream.chat.android.compose.ui.util.StreamCoilImageLoaderFactory
@@ -154,9 +156,6 @@ private val LocalMessagePreviewFormatter = compositionLocalOf<MessagePreviewForm
154156
private val LocalMessageTextFormatter = compositionLocalOf<MessageTextFormatter> {
155157
error("No MessageTextFormatter provided! Make sure to wrap all usages of Stream components in a ChatTheme.")
156158
}
157-
private val LocalQuotedMessageTextFormatter = compositionLocalOf<QuotedMessageTextFormatter> {
158-
error("No QuotedMessageTextFormatter provided! Make sure to wrap all usages of Stream components in a ChatTheme.")
159-
}
160159
private val LocalSearchResultNameFormatter = compositionLocalOf<SearchResultNameFormatter> {
161160
error("No SearchResultNameFormatter provided! Make sure to wrap all usages of Stream components in a ChatTheme.")
162161
}
@@ -412,15 +411,6 @@ public fun ChatTheme(
412411
ownMessageTheme = ownMessageTheme,
413412
otherMessageTheme = otherMessageTheme,
414413
),
415-
quotedMessageTextFormatter: QuotedMessageTextFormatter = QuotedMessageTextFormatter.defaultFormatter(
416-
autoTranslationEnabled = autoTranslationEnabled,
417-
context = LocalContext.current,
418-
typography = typography,
419-
shapes = shapes,
420-
colors = colors,
421-
ownMessageTheme = ownMessageTheme,
422-
otherMessageTheme = otherMessageTheme,
423-
),
424414
streamMediaRecorder: StreamMediaRecorder = DefaultStreamMediaRecorder(LocalContext.current),
425415
keyboardBehaviour: StreamKeyboardBehaviour = StreamKeyboardBehaviour.defaultBehaviour(),
426416
mediaGalleryConfig: MediaGalleryConfig = MediaGalleryConfig(),
@@ -455,7 +445,6 @@ public fun ChatTheme(
455445
LocalChannelNameFormatter provides channelNameFormatter,
456446
LocalMessagePreviewFormatter provides messagePreviewFormatter,
457447
LocalMessageTextFormatter provides messageTextFormatter,
458-
LocalQuotedMessageTextFormatter provides quotedMessageTextFormatter,
459448
LocalSearchResultNameFormatter provides searchResultNameFormatter,
460449
LocalOwnMessageTheme provides ownMessageTheme,
461450
LocalOtherMessageTheme provides otherMessageTheme,
@@ -676,14 +665,6 @@ public object ChatTheme {
676665
@ReadOnlyComposable
677666
get() = LocalMessageTextFormatter.current
678667

679-
/**
680-
* Retrieves the current [QuotedMessageTextFormatter] at the call site's position in the hierarchy.
681-
*/
682-
public val quotedMessageTextFormatter: QuotedMessageTextFormatter
683-
@Composable
684-
@ReadOnlyComposable
685-
get() = LocalQuotedMessageTextFormatter.current
686-
687668
/**
688669
* Retrieves the current [SearchResultNameFormatter] at the call site's position in the hierarchy.
689670
*/

0 commit comments

Comments
 (0)