Skip to content

Commit d5532cf

Browse files
gpuntogpunto
committed
Update design of media gallery
1 parent 84c46a2 commit d5532cf

35 files changed

Lines changed: 974 additions & 385 deletions

File tree

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ public final class io/getstream/chat/android/compose/ui/attachments/factory/Unsu
760760

761761
public final class io/getstream/chat/android/compose/ui/attachments/preview/ComposableSingletons$MediaGalleryPreviewScreenKt {
762762
public static final field INSTANCE Lio/getstream/chat/android/compose/ui/attachments/preview/ComposableSingletons$MediaGalleryPreviewScreenKt;
763-
public static field lambda-1 Lkotlin/jvm/functions/Function6;
763+
public static field lambda-1 Lkotlin/jvm/functions/Function7;
764764
public static field lambda-10 Lkotlin/jvm/functions/Function2;
765765
public static field lambda-11 Lkotlin/jvm/functions/Function2;
766766
public static field lambda-12 Lkotlin/jvm/functions/Function2;
@@ -771,7 +771,7 @@ public final class io/getstream/chat/android/compose/ui/attachments/preview/Comp
771771
public static field lambda-17 Lkotlin/jvm/functions/Function2;
772772
public static field lambda-18 Lkotlin/jvm/functions/Function2;
773773
public static field lambda-19 Lkotlin/jvm/functions/Function2;
774-
public static field lambda-2 Lkotlin/jvm/functions/Function6;
774+
public static field lambda-2 Lkotlin/jvm/functions/Function7;
775775
public static field lambda-20 Lkotlin/jvm/functions/Function2;
776776
public static field lambda-21 Lkotlin/jvm/functions/Function2;
777777
public static field lambda-22 Lkotlin/jvm/functions/Function2;
@@ -788,7 +788,7 @@ public final class io/getstream/chat/android/compose/ui/attachments/preview/Comp
788788
public static field lambda-8 Lkotlin/jvm/functions/Function2;
789789
public static field lambda-9 Lkotlin/jvm/functions/Function2;
790790
public fun <init> ()V
791-
public final fun getLambda-1$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function6;
791+
public final fun getLambda-1$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function7;
792792
public final fun getLambda-10$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function2;
793793
public final fun getLambda-11$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function2;
794794
public final fun getLambda-12$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function2;
@@ -799,7 +799,7 @@ public final class io/getstream/chat/android/compose/ui/attachments/preview/Comp
799799
public final fun getLambda-17$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function2;
800800
public final fun getLambda-18$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function2;
801801
public final fun getLambda-19$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function2;
802-
public final fun getLambda-2$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function6;
802+
public final fun getLambda-2$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function7;
803803
public final fun getLambda-20$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function2;
804804
public final fun getLambda-21$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function2;
805805
public final fun getLambda-22$stream_chat_android_compose_release ()Lkotlin/jvm/functions/Function2;
@@ -861,8 +861,8 @@ public final class io/getstream/chat/android/compose/ui/attachments/preview/Medi
861861
}
862862

863863
public final class io/getstream/chat/android/compose/ui/attachments/preview/MediaGalleryPreviewScreenKt {
864-
public static final fun MediaGalleryPreviewScreen (Lio/getstream/chat/android/compose/viewmodel/mediapreview/MediaGalleryPreviewViewModel;ILkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;Lio/getstream/chat/android/compose/ui/theme/MediaGalleryConfig;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function6;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;III)V
865-
public static final fun MediaGalleryPreviewScreen (Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/ConnectionState;Lio/getstream/chat/android/models/User;ILio/getstream/chat/android/models/Attachment;ZZZLkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;Lio/getstream/chat/android/compose/ui/theme/MediaGalleryConfig;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function6;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;IIII)V
864+
public static final fun MediaGalleryPreviewScreen (Lio/getstream/chat/android/compose/viewmodel/mediapreview/MediaGalleryPreviewViewModel;ILkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;Lio/getstream/chat/android/compose/ui/theme/MediaGalleryConfig;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function7;Lkotlin/jvm/functions/Function5;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;III)V
865+
public static final fun MediaGalleryPreviewScreen (Lio/getstream/chat/android/models/Message;Lio/getstream/chat/android/models/ConnectionState;Lio/getstream/chat/android/models/User;ILio/getstream/chat/android/models/Attachment;ZZZLkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;Lio/getstream/chat/android/compose/ui/theme/MediaGalleryConfig;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function7;Lkotlin/jvm/functions/Function5;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;IIII)V
866866
}
867867

868868
public final class io/getstream/chat/android/compose/ui/attachments/preview/MediaPreviewActivity : androidx/appcompat/app/AppCompatActivity {
@@ -2659,16 +2659,18 @@ public final class io/getstream/chat/android/compose/ui/theme/ChannelListConfig
26592659

26602660
public final class io/getstream/chat/android/compose/ui/theme/ChannelMediaAttachmentsPreviewBottomBarParams {
26612661
public static final field $stable I
2662-
public fun <init> (Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;)V
2663-
public synthetic fun <init> (Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
2662+
public fun <init> (Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;)V
2663+
public synthetic fun <init> (Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
26642664
public final fun component1 ()Lkotlin/jvm/functions/Function2;
26652665
public final fun component2 ()Lkotlin/jvm/functions/Function2;
26662666
public final fun component3 ()Lkotlin/jvm/functions/Function2;
2667-
public final fun copy (Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;)Lio/getstream/chat/android/compose/ui/theme/ChannelMediaAttachmentsPreviewBottomBarParams;
2668-
public static synthetic fun copy$default (Lio/getstream/chat/android/compose/ui/theme/ChannelMediaAttachmentsPreviewBottomBarParams;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lio/getstream/chat/android/compose/ui/theme/ChannelMediaAttachmentsPreviewBottomBarParams;
2667+
public final fun component4 ()Lkotlin/jvm/functions/Function2;
2668+
public final fun copy (Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;)Lio/getstream/chat/android/compose/ui/theme/ChannelMediaAttachmentsPreviewBottomBarParams;
2669+
public static synthetic fun copy$default (Lio/getstream/chat/android/compose/ui/theme/ChannelMediaAttachmentsPreviewBottomBarParams;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lio/getstream/chat/android/compose/ui/theme/ChannelMediaAttachmentsPreviewBottomBarParams;
26692670
public fun equals (Ljava/lang/Object;)Z
26702671
public final fun getCenterContent ()Lkotlin/jvm/functions/Function2;
26712672
public final fun getLeadingContent ()Lkotlin/jvm/functions/Function2;
2673+
public final fun getTopContent ()Lkotlin/jvm/functions/Function2;
26722674
public final fun getTrailingContent ()Lkotlin/jvm/functions/Function2;
26732675
public fun hashCode ()I
26742676
public fun toString ()Ljava/lang/String;
@@ -2744,7 +2746,6 @@ public abstract interface class io/getstream/chat/android/compose/ui/theme/ChatC
27442746
public abstract fun ChannelMediaAttachmentsLoadingIndicator (Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
27452747
public abstract fun ChannelMediaAttachmentsLoadingItem (Landroidx/compose/foundation/lazy/grid/LazyGridItemScope;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
27462748
public abstract fun ChannelMediaAttachmentsPreviewBottomBar (Lio/getstream/chat/android/compose/ui/theme/ChannelMediaAttachmentsPreviewBottomBarParams;Landroidx/compose/runtime/Composer;I)V
2747-
public abstract fun ChannelMediaAttachmentsPreviewBottomBar (Ljava/lang/String;Landroidx/compose/runtime/Composer;I)V
27482749
public abstract fun ChannelMediaAttachmentsPreviewTopBar (Lio/getstream/chat/android/ui/common/state/channel/attachments/ChannelAttachmentsViewState$Content$Item;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;I)V
27492750
public abstract fun ChannelMediaAttachmentsPreviewTopBarTitle (Lio/getstream/chat/android/ui/common/state/channel/attachments/ChannelAttachmentsViewState$Content$Item;Landroidx/compose/runtime/Composer;I)V
27502751
public abstract fun ChannelMediaAttachmentsTopBar (Landroidx/compose/foundation/lazy/grid/LazyGridState;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;I)V
@@ -2930,7 +2931,6 @@ public final class io/getstream/chat/android/compose/ui/theme/ChatComponentFacto
29302931
public static fun ChannelMediaAttachmentsLoadingIndicator (Lio/getstream/chat/android/compose/ui/theme/ChatComponentFactory;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
29312932
public static fun ChannelMediaAttachmentsLoadingItem (Lio/getstream/chat/android/compose/ui/theme/ChatComponentFactory;Landroidx/compose/foundation/lazy/grid/LazyGridItemScope;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
29322933
public static fun ChannelMediaAttachmentsPreviewBottomBar (Lio/getstream/chat/android/compose/ui/theme/ChatComponentFactory;Lio/getstream/chat/android/compose/ui/theme/ChannelMediaAttachmentsPreviewBottomBarParams;Landroidx/compose/runtime/Composer;I)V
2933-
public static fun ChannelMediaAttachmentsPreviewBottomBar (Lio/getstream/chat/android/compose/ui/theme/ChatComponentFactory;Ljava/lang/String;Landroidx/compose/runtime/Composer;I)V
29342934
public static fun ChannelMediaAttachmentsPreviewTopBar (Lio/getstream/chat/android/compose/ui/theme/ChatComponentFactory;Lio/getstream/chat/android/ui/common/state/channel/attachments/ChannelAttachmentsViewState$Content$Item;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;I)V
29352935
public static fun ChannelMediaAttachmentsPreviewTopBarTitle (Lio/getstream/chat/android/compose/ui/theme/ChatComponentFactory;Lio/getstream/chat/android/ui/common/state/channel/attachments/ChannelAttachmentsViewState$Content$Item;Landroidx/compose/runtime/Composer;I)V
29362936
public static fun ChannelMediaAttachmentsTopBar (Lio/getstream/chat/android/compose/ui/theme/ChatComponentFactory;Landroidx/compose/foundation/lazy/grid/LazyGridState;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;I)V

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

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package io.getstream.chat.android.compose.ui.attachments.content
1818

1919
import androidx.compose.foundation.background
20-
import androidx.compose.foundation.border
2120
import androidx.compose.foundation.layout.Arrangement
2221
import androidx.compose.foundation.layout.Column
2322
import androidx.compose.foundation.layout.Row
@@ -38,7 +37,6 @@ import androidx.compose.runtime.rememberUpdatedState
3837
import androidx.compose.runtime.setValue
3938
import androidx.compose.ui.Alignment
4039
import androidx.compose.ui.Modifier
41-
import androidx.compose.ui.draw.clip
4240
import androidx.compose.ui.graphics.Color
4341
import androidx.compose.ui.res.painterResource
4442
import androidx.compose.ui.tooling.preview.Preview
@@ -58,18 +56,17 @@ import io.getstream.chat.android.compose.state.messages.attachments.AttachmentSt
5856
import io.getstream.chat.android.compose.ui.components.LoadingIndicator
5957
import io.getstream.chat.android.compose.ui.components.audio.PlaybackTimerText
6058
import io.getstream.chat.android.compose.ui.components.audio.StaticWaveformSlider
59+
import io.getstream.chat.android.compose.ui.components.button.SpeedButton
6160
import io.getstream.chat.android.compose.ui.components.button.StreamButton
6261
import io.getstream.chat.android.compose.ui.components.button.StreamButtonStyleDefaults
6362
import io.getstream.chat.android.compose.ui.theme.ChatPreviewTheme
6463
import io.getstream.chat.android.compose.ui.theme.ChatTheme
6564
import io.getstream.chat.android.compose.ui.theme.MessageStyling
6665
import io.getstream.chat.android.compose.ui.theme.StreamTokens
6766
import io.getstream.chat.android.compose.ui.util.applyIf
68-
import io.getstream.chat.android.compose.ui.util.clickable
6967
import io.getstream.chat.android.compose.ui.util.shouldBeDisplayedAsFullSizeAttachment
7068
import io.getstream.chat.android.compose.viewmodel.messages.AudioPlayerViewModel
7169
import io.getstream.chat.android.compose.viewmodel.messages.AudioPlayerViewModelFactory
72-
import io.getstream.chat.android.extensions.isInt
7370
import io.getstream.chat.android.models.Attachment
7471
import io.getstream.chat.android.models.Attachment.UploadState
7572
import io.getstream.chat.android.ui.common.state.messages.list.AudioPlayerState
@@ -307,36 +304,6 @@ internal fun PlaybackToggleButton(
307304
}
308305
}
309306

310-
private val speedButtonShape = RoundedCornerShape(StreamTokens.radiusLg)
311-
312-
/**
313-
* Represents the speed button.
314-
*/
315-
@Composable
316-
private fun SpeedButton(
317-
speed: Float,
318-
outlineColor: Color,
319-
enabled: Boolean = true,
320-
onClick: () -> Unit,
321-
) {
322-
val colors = ChatTheme.colors
323-
val textColor = if (enabled) colors.controlPlaybackToggleText else colors.textDisabled
324-
val borderColor = if (enabled) outlineColor else colors.borderUtilityDisabled
325-
Text(
326-
text = when (speed.isInt()) {
327-
true -> "x${speed.toInt()}"
328-
else -> "x$speed"
329-
},
330-
style = ChatTheme.typography.metadataEmphasis,
331-
color = textColor,
332-
modifier = Modifier
333-
.border(1.dp, borderColor, speedButtonShape)
334-
.clip(speedButtonShape)
335-
.applyIf(enabled) { clickable(onClick = onClick) }
336-
.padding(horizontal = StreamTokens.spacingXs, vertical = StreamTokens.spacing2xs),
337-
)
338-
}
339-
340307
@Composable
341308
private fun UploadProgressIndicator(
342309
uploadState: UploadState.InProgress,

0 commit comments

Comments
 (0)