Replace StreamTypography with StreamDesign.Typography across the library and samples

Author: andremion

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

@@ -80,7 +80,6 @@ import io.getstream.chat.android.compose.ui.theme.MessageComposerTheme
 import io.getstream.chat.android.compose.ui.theme.MessageOptionsTheme
 import io.getstream.chat.android.compose.ui.theme.ReactionOptionsTheme
 import io.getstream.chat.android.compose.ui.theme.StreamDesign
-import io.getstream.chat.android.compose.ui.theme.StreamTypography
 import io.getstream.chat.android.compose.ui.util.rememberMessageListState
 import io.getstream.chat.android.compose.viewmodel.messages.AttachmentsPickerViewModel
 import io.getstream.chat.android.compose.viewmodel.messages.MessageComposerViewModel
@@ -139,7 +138,7 @@ class MessagesActivity : ComponentActivity() {
     private fun SetupChatTheme() {
         val isInDarkMode = isSystemInDarkTheme()
         val colors = if (isInDarkMode) StreamDesign.Colors.defaultDark() else StreamDesign.Colors.default()
-        val typography = StreamTypography.defaultTypography()
+        val typography = StreamDesign.Typography.default()
         val messageComposerTheme = MessageComposerTheme
             .defaultTheme(isInDarkMode, typography, colors)
             .copy(

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

@@ -3912,8 +3912,6 @@ public final class io/getstream/chat/android/compose/ui/theme/StreamDesign$Typog
 public final class io/getstream/chat/android/compose/ui/theme/StreamDesign$Typography$Companion {
 	public final fun default (Landroidx/compose/ui/text/font/FontFamily;)Lio/getstream/chat/android/compose/ui/theme/StreamDesign$Typography;
 	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;
-	public final fun defaultTypography (Landroidx/compose/ui/text/font/FontFamily;)Lio/getstream/chat/android/compose/ui/theme/StreamDesign$Typography;
-	public static synthetic fun defaultTypography$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;
 }
 
 public final class io/getstream/chat/android/compose/ui/theme/StreamKeyboardBehaviour {

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/common/CountBadge.kt

@@ -36,8 +36,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import io.getstream.chat.android.compose.ui.theme.ChatTheme
+import io.getstream.chat.android.compose.ui.theme.StreamDesign
 import io.getstream.chat.android.compose.ui.theme.StreamTokens
-import io.getstream.chat.android.compose.ui.theme.StreamTypography
 
 @Composable
 internal fun CountBadge(
@@ -67,10 +67,26 @@ internal fun CountBadge(
     )
 }
 
-internal enum class CountBadgeSize(val minSize: Dp, val spacing: Dp, val textStyle: (StreamTypography) -> TextStyle) {
-    Large(minSize = 32.dp, spacing = StreamTokens.spacingXs, textStyle = StreamTypography::numericLarge),
-    Medium(minSize = 24.dp, spacing = StreamTokens.spacingXs, textStyle = StreamTypography::numericLarge),
-    Small(minSize = 20.dp, spacing = StreamTokens.spacing2xs, textStyle = StreamTypography::numericMedium),
+internal enum class CountBadgeSize(
+    val minSize: Dp,
+    val spacing: Dp,
+    val textStyle: (StreamDesign.Typography) -> TextStyle,
+) {
+    Large(
+        minSize = 32.dp,
+        spacing = StreamTokens.spacingXs,
+        textStyle = StreamDesign.Typography::numericLarge,
+    ),
+    Medium(
+        minSize = 24.dp,
+        spacing = StreamTokens.spacingXs,
+        textStyle = StreamDesign.Typography::numericLarge,
+    ),
+    Small(
+        minSize = 20.dp,
+        spacing = StreamTokens.spacing2xs,
+        textStyle = StreamDesign.Typography::numericMedium,
+    ),
 }
 
 @Preview

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/composer/InputField.kt

@@ -47,7 +47,6 @@ import androidx.compose.ui.unit.dp
 import io.getstream.chat.android.compose.ui.theme.ChatTheme
 import io.getstream.chat.android.compose.ui.theme.ComposerInputFieldTheme
 import io.getstream.chat.android.compose.ui.theme.StreamDesign
-import io.getstream.chat.android.compose.ui.theme.StreamTypography
 import io.getstream.chat.android.compose.ui.util.buildAnnotatedInputText
 
 /**
@@ -136,7 +135,7 @@ public fun InputField(
  */
 private class DefaultInputFieldVisualTransformation(
     val inputFieldTheme: ComposerInputFieldTheme,
-    val typography: StreamTypography,
+    val typography: StreamDesign.Typography,
     val colors: StreamDesign.Colors,
 ) : VisualTransformation {
     override fun filter(text: AnnotatedString): TransformedText {

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/poll/PollOptionInput.kt

@@ -59,8 +59,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import io.getstream.chat.android.compose.R
 import io.getstream.chat.android.compose.ui.theme.ChatTheme
+import io.getstream.chat.android.compose.ui.theme.StreamDesign
 import io.getstream.chat.android.compose.ui.theme.StreamTokens
-import io.getstream.chat.android.compose.ui.theme.StreamTypography
 import io.getstream.chat.android.compose.ui.util.buildAnnotatedInputText
 
 /**
@@ -135,7 +135,7 @@ public fun PollOptionInput(
                 )
                 TransformedText(styledText, OffsetMapping.Identity)
             },
-            textStyle = StreamTypography.default().bodyDefault.copy(
+            textStyle = StreamDesign.Typography.default().bodyDefault.copy(
                 textDirection = TextDirection.Content,
             ),
             cursorBrush = SolidColor(ChatTheme.colors.accentPrimary),

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/composer/internal/MessageComposerInputCenterContent.kt

@@ -48,7 +48,6 @@ import io.getstream.chat.android.compose.ui.theme.ChatTheme
 import io.getstream.chat.android.compose.ui.theme.ComposerInputFieldTheme
 import io.getstream.chat.android.compose.ui.theme.StreamDesign
 import io.getstream.chat.android.compose.ui.theme.StreamTokens
-import io.getstream.chat.android.compose.ui.theme.StreamTypography
 import io.getstream.chat.android.compose.ui.util.buildAnnotatedInputText
 import io.getstream.chat.android.ui.common.feature.messages.composer.capabilities.canSendMessage
 import io.getstream.chat.android.ui.common.feature.messages.composer.mention.Mention
@@ -150,7 +149,7 @@ private const val TextFieldMaxLines = 5
 
 private class TextFieldVisualTransformation(
     val inputFieldTheme: ComposerInputFieldTheme,
-    val typography: StreamTypography,
+    val typography: StreamDesign.Typography,
     val colors: StreamDesign.Colors,
     val mentions: Set<Mention>,
 ) : VisualTransformation {

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

@@ -81,7 +81,7 @@ private val LocalColors = compositionLocalOf<StreamDesign.Colors> {
 private val LocalDimens = compositionLocalOf<StreamDimens> {
     error("No dimens provided! Make sure to wrap all usages of Stream components in a ChatTheme.")
 }
-private val LocalTypography = compositionLocalOf<StreamTypography> {
+private val LocalTypography = compositionLocalOf<StreamDesign.Typography> {
     error("No typography provided! Make sure to wrap all usages of Stream components in a ChatTheme.")
 }
 private val LocalUserPresence = compositionLocalOf<UserPresence> {
@@ -246,7 +246,7 @@ private val LocalChatConfig = compositionLocalOf<ChatConfig> {
  * @param messageComposerFloatingStyleEnabled Whether the message composer should use the floating style or not.
  * @param colors The set of colors we provide, wrapped in [StreamDesign.Colors].
  * @param dimens The set of dimens we provide, wrapped in [StreamDimens].
- * @param typography The set of typography styles we provide, wrapped in [StreamTypography].
+ * @param typography The set of typography styles we provide, wrapped in [StreamDesign.Typography].
  * @param rippleConfiguration Defines the appearance for ripples.
  * @param userPresence The user presence display configuration.
  * @param componentFactory Provide to customize the stateless components that are used throughout the UI
@@ -294,7 +294,7 @@ public fun ChatTheme(
     colors: StreamDesign.Colors =
         if (isInDarkMode) StreamDesign.Colors.defaultDark() else StreamDesign.Colors.default(),
     dimens: StreamDimens = StreamDimens.defaultDimens(),
-    typography: StreamTypography = StreamTypography.defaultTypography(),
+    typography: StreamDesign.Typography = StreamDesign.Typography.default(),
     rippleConfiguration: StreamRippleConfiguration = StreamRippleConfiguration.defaultRippleConfiguration(
         contentColor = LocalContentColor.current,
         lightTheme = !isInDarkMode,
@@ -436,9 +436,9 @@ public object ChatTheme {
         get() = LocalDimens.current
 
     /**
-     * Retrieves the current [StreamTypography] at the call site's position in the hierarchy.
+     * Retrieves the current [StreamDesign.Typography] at the call site's position in the hierarchy.
      */
-    public val typography: StreamTypography
+    public val typography: StreamDesign.Typography
         @Composable
         @ReadOnlyComposable
         get() = LocalTypography.current

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

@@ -50,7 +50,7 @@ public data class MessageComposerTheme(
         @Composable
         public fun defaultTheme(
             isInDarkMode: Boolean = isSystemInDarkTheme(),
-            typography: StreamTypography = StreamTypography.defaultTypography(),
+            typography: StreamDesign.Typography = StreamDesign.Typography.default(),
             colors: StreamDesign.Colors = when (isInDarkMode) {
                 true -> StreamDesign.Colors.defaultDark()
                 else -> StreamDesign.Colors.default()
@@ -84,7 +84,7 @@ public data class ComposerInputFieldTheme(
     public companion object {
         @Composable
         public fun defaultTheme(
-            typography: StreamTypography = StreamTypography.defaultTypography(),
+            typography: StreamDesign.Typography = StreamDesign.Typography.default(),
             colors: StreamDesign.Colors = when (isSystemInDarkTheme()) {
                 true -> StreamDesign.Colors.defaultDark()
                 else -> StreamDesign.Colors.default()

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

@@ -54,11 +54,11 @@ internal object MessageStyling {
     fun textStyle(outgoing: Boolean): TextStyle =
         textStyle(outgoing, ChatTheme.typography, ChatTheme.colors)
 
-    fun textStyle(outgoing: Boolean, typography: StreamTypography, colors: StreamDesign.Colors): TextStyle {
+    fun textStyle(outgoing: Boolean, typography: StreamDesign.Typography, colors: StreamDesign.Colors): TextStyle {
         return typography.bodyDefault.copy(color = textColor(outgoing, colors))
     }
 
-    fun linkStyle(typography: StreamTypography, colors: StreamDesign.Colors): TextStyle =
+    fun linkStyle(typography: StreamDesign.Typography, colors: StreamDesign.Colors): TextStyle =
         typography.bodyDefault.copy(color = colors.chatTextLink)
 
     @Composable

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

@@ -456,16 +456,6 @@ public object StreamDesign {
     ) {
 
         public companion object {
-            /**
-             * Builds the default typography set for our theme, with the ability to customize the
-             * font family.
-             *
-             * @param fontFamily The font that the users want to use for the app.
-             * @return [Typography] that holds all the default text styles that we support.
-             */
-            @Deprecated("Use default()", ReplaceWith("default(fontFamily)"))
-            public fun defaultTypography(fontFamily: FontFamily? = null): Typography = default(fontFamily)
-
             /**
              * Builds the default typography set for our theme, with the ability to customize the
              * font family.