Skip to content

Commit 70e0c4a

Browse files
andremionandremion
committed
Remove StreamKeyboardBehaviour and always close keyboard on attachment picker open
1 parent 045959e commit 70e0c4a

4 files changed

Lines changed: 2 additions & 74 deletions

File tree

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3190,7 +3190,6 @@ public final class io/getstream/chat/android/compose/ui/theme/ChatTheme {
31903190
public final fun getDateFormatter (Landroidx/compose/runtime/Composer;I)Lio/getstream/chat/android/ui/common/helper/DateFormatter;
31913191
public final fun getDimens (Landroidx/compose/runtime/Composer;I)Lio/getstream/chat/android/compose/ui/theme/StreamDesign$Dimens;
31923192
public final fun getDurationFormatter (Landroidx/compose/runtime/Composer;I)Lio/getstream/chat/android/ui/common/helper/DurationFormatter;
3193-
public final fun getKeyboardBehaviour (Landroidx/compose/runtime/Composer;I)Lio/getstream/chat/android/compose/ui/theme/StreamKeyboardBehaviour;
31943193
public final fun getMediaGalleryConfig (Landroidx/compose/runtime/Composer;I)Lio/getstream/chat/android/compose/ui/attachments/preview/MediaGalleryConfig;
31953194
public final fun getMessageAlignmentProvider (Landroidx/compose/runtime/Composer;I)Lio/getstream/chat/android/compose/ui/util/MessageAlignmentProvider;
31963195
public final fun getMessageComposerFloatingStyleEnabled (Landroidx/compose/runtime/Composer;I)Z
@@ -3219,7 +3218,7 @@ public final class io/getstream/chat/android/compose/ui/theme/ChatTheme {
32193218
}
32203219

32213220
public final class io/getstream/chat/android/compose/ui/theme/ChatThemeKt {
3222-
public static final fun ChatTheme (ZLio/getstream/chat/android/compose/ui/theme/ChatConfig;ZZZLio/getstream/chat/android/compose/state/messages/attachments/AttachmentPickerConfig;ZLio/getstream/chat/android/compose/ui/theme/StreamDesign$Colors;Lio/getstream/chat/android/compose/ui/theme/StreamDesign$Dimens;Lio/getstream/chat/android/compose/ui/theme/StreamDesign$Typography;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;Ljava/util/List;Lio/getstream/chat/android/compose/ui/util/ReactionResolver;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;ZLio/getstream/chat/android/ui/common/images/resizing/StreamCdnImageResizing;ZLio/getstream/chat/android/compose/ui/theme/MessageComposerTheme;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;IIIIIII)V
3221+
public static final fun ChatTheme (ZLio/getstream/chat/android/compose/ui/theme/ChatConfig;ZZZLio/getstream/chat/android/compose/state/messages/attachments/AttachmentPickerConfig;ZLio/getstream/chat/android/compose/ui/theme/StreamDesign$Colors;Lio/getstream/chat/android/compose/ui/theme/StreamDesign$Dimens;Lio/getstream/chat/android/compose/ui/theme/StreamDesign$Typography;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;Ljava/util/List;Lio/getstream/chat/android/compose/ui/util/ReactionResolver;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;ZLio/getstream/chat/android/ui/common/images/resizing/StreamCdnImageResizing;ZLio/getstream/chat/android/compose/ui/theme/MessageComposerTheme;Lio/getstream/chat/android/compose/ui/util/MessageTextFormatter;Lio/getstream/sdk/chat/audio/recording/StreamMediaRecorder;Lio/getstream/chat/android/compose/ui/attachments/preview/MediaGalleryConfig;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;IIIIIII)V
32233222
public static final fun getLocalAttachmentPickerConfig ()Landroidx/compose/runtime/ProvidableCompositionLocal;
32243223
public static final fun getLocalComponentFactory ()Landroidx/compose/runtime/ProvidableCompositionLocal;
32253224
public static final fun getLocalComposerLinkPreviewEnabled ()Landroidx/compose/runtime/ProvidableCompositionLocal;
@@ -3913,23 +3912,6 @@ public final class io/getstream/chat/android/compose/ui/theme/StreamDesign$Typog
39133912
public static synthetic fun default$default (Lio/getstream/chat/android/compose/ui/theme/StreamDesign$Typography$Companion;Landroidx/compose/ui/text/font/FontFamily;ILjava/lang/Object;)Lio/getstream/chat/android/compose/ui/theme/StreamDesign$Typography;
39143913
}
39153914

3916-
public final class io/getstream/chat/android/compose/ui/theme/StreamKeyboardBehaviour {
3917-
public static final field $stable I
3918-
public static final field Companion Lio/getstream/chat/android/compose/ui/theme/StreamKeyboardBehaviour$Companion;
3919-
public fun <init> (Z)V
3920-
public final fun component1 ()Z
3921-
public final fun copy (Z)Lio/getstream/chat/android/compose/ui/theme/StreamKeyboardBehaviour;
3922-
public static synthetic fun copy$default (Lio/getstream/chat/android/compose/ui/theme/StreamKeyboardBehaviour;ZILjava/lang/Object;)Lio/getstream/chat/android/compose/ui/theme/StreamKeyboardBehaviour;
3923-
public fun equals (Ljava/lang/Object;)Z
3924-
public final fun getCloseKeyboardOnAttachmentPickerOpen ()Z
3925-
public fun hashCode ()I
3926-
public fun toString ()Ljava/lang/String;
3927-
}
3928-
3929-
public final class io/getstream/chat/android/compose/ui/theme/StreamKeyboardBehaviour$Companion {
3930-
public final fun defaultBehaviour ()Lio/getstream/chat/android/compose/ui/theme/StreamKeyboardBehaviour;
3931-
}
3932-
39333915
public final class io/getstream/chat/android/compose/ui/theme/StreamRippleConfiguration {
39343916
public static final field $stable I
39353917
public static final field Companion Lio/getstream/chat/android/compose/ui/theme/StreamRippleConfiguration$Companion;

‎stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/AttachmentPickerMenu.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,8 @@ public fun AttachmentPickerMenu(
7575

7676
// Dismiss the keyboard when the attachments picker is shown (if instructed by ChatTheme).
7777
val focusManager = LocalFocusManager.current
78-
val shouldCloseKeyboard = ChatTheme.keyboardBehaviour.closeKeyboardOnAttachmentPickerOpen
7978
LaunchedEffect(isPickerVisible) {
80-
if (shouldCloseKeyboard && isPickerVisible) {
79+
if (isPickerVisible) {
8180
focusManager.clearFocus()
8281
}
8382
}

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,6 @@ public val LocalComposerLinkPreviewEnabled: ProvidableCompositionLocal<Boolean>
223223
private val LocalStreamMediaRecorder = compositionLocalOf<StreamMediaRecorder> {
224224
error("No StreamMediaRecorder provided! Make sure to wrap all usages of Stream components in a ChatTheme.")
225225
}
226-
private val LocalKeyboardBehaviour = compositionLocalOf<StreamKeyboardBehaviour> {
227-
error("No StreamKeyboardBehaviour provided! Make sure to wrap all usages of Stream components in a ChatTheme.")
228-
}
229226
private val LocalMediaGalleryConfig = compositionLocalOf<MediaGalleryConfig> {
230227
error("No MediaGalleryConfig provided! Make sure to wrap all usages of Stream components in a ChatTheme.")
231228
}
@@ -277,7 +274,6 @@ private val LocalChatConfig = compositionLocalOf<ChatConfig> {
277274
* applies only to images hosted on Stream's CDN which contain the original height (oh) and width (ow) query parameters.
278275
* @param messageComposerTheme Theme of the message composer.
279276
* @param streamMediaRecorder Used for recording audio messages.
280-
* @param keyboardBehaviour Configuration for different keyboard behaviours.
281277
* @param mediaGalleryConfig Configuration for the media gallery screen.
282278
* @param content The content shown within the theme wrapper.
283279
*/
@@ -343,7 +339,6 @@ public fun ChatTheme(
343339
colors = colors,
344340
),
345341
streamMediaRecorder: StreamMediaRecorder = DefaultStreamMediaRecorder(LocalContext.current),
346-
keyboardBehaviour: StreamKeyboardBehaviour = StreamKeyboardBehaviour.defaultBehaviour(),
347342
mediaGalleryConfig: MediaGalleryConfig = MediaGalleryConfig(),
348343
content: @Composable () -> Unit,
349344
) {
@@ -391,7 +386,6 @@ public fun ChatTheme(
391386
LocalAutoTranslationEnabled provides autoTranslationEnabled,
392387
LocalShowOriginalTranslationEnabled provides showOriginalTranslationEnabled,
393388
LocalComposerLinkPreviewEnabled provides isComposerLinkPreviewEnabled,
394-
LocalKeyboardBehaviour provides keyboardBehaviour,
395389
LocalMediaGalleryConfig provides mediaGalleryConfig,
396390
) {
397391
if (allowUIAutomationTest) {
@@ -692,14 +686,6 @@ public object ChatTheme {
692686
@ReadOnlyComposable
693687
get() = LocalStreamMediaRecorder.current
694688

695-
/**
696-
* Retrieves the current [StreamKeyboardBehaviour] at the call site's position in the hierarchy.
697-
*/
698-
public val keyboardBehaviour: StreamKeyboardBehaviour
699-
@Composable
700-
@ReadOnlyComposable
701-
get() = LocalKeyboardBehaviour.current
702-
703689
/**
704690
* Retrieves the current [MediaGalleryConfig] at the call site's position in the hierarchy.
705691
*/

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

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)