Merge branch 'develop' into ci/sonar-cloud

GetStream · Jan 7, 2025 · cb2d3f3 · cb2d3f3
2 parents 64be734 + 44fad1a
commit cb2d3f3
Show file tree

Hide file tree

Showing 147 changed files with 527 additions and 433 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,6 +51,7 @@
 
 ## stream-chat-android-ui-common
 ### 🐞 Fixed
+- Fix `MessageListController` not respecting the `showSystemMessages` property when set to `false`. [#5546](https://github.com/GetStream/stream-chat-android/pull/5546)
 
 ### ⬆️ Improved
 
@@ -81,6 +82,7 @@
 - Add "Unblock user" message menu option shown for messages from blocked users. [#5533](https://github.com/GetStream/stream-chat-android/pull/5533)
 
 ### ⚠️ Changed
+- Replace usage of `material` with `material3` components. [#5537](https://github.com/GetStream/stream-chat-android/pull/5537)
 
 ### ❌ Removed
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -99,7 +99,6 @@ androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "a
 androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "macroBenchmark"}
 androidx-compose-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidxComposeConstraintLayout"}
 androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidxCompose"}
-androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "androidxCompose"}
 androidx-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "androidxComposeMaterial3"}
 androidx-compose-material-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "androidxCompose"}
 androidx-compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "androidxCompose"}

diff --git a/stream-chat-android-compose-sample/build.gradle.kts b/stream-chat-android-compose-sample/build.gradle.kts
@@ -144,7 +144,7 @@ dependencies {
     implementation(libs.androidx.compose.ui)
     implementation(libs.androidx.compose.ui.tooling)
     implementation(libs.androidx.compose.foundation)
-    implementation(libs.androidx.compose.material)
+    implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material.icons.core)
 
     implementation(libs.androidx.activity.compose)

diff --git a/...pose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/ChannelsActivity.kt b/...pose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/ChannelsActivity.kt
@@ -32,8 +32,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue

diff --git a/...pose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/MessagesActivity.kt b/...pose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/MessagesActivity.kt
@@ -41,10 +41,10 @@ import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Icon
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
-import androidx.compose.material.ripple
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue

diff --git a/.../src/main/java/io/getstream/chat/android/compose/sample/ui/channel/ChannelInfoActivity.kt b/.../src/main/java/io/getstream/chat/android/compose/sample/ui/channel/ChannelInfoActivity.kt
@@ -27,8 +27,8 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState

diff --git a/...le/src/main/java/io/getstream/chat/android/compose/sample/ui/channel/ChannelInfoHeader.kt b/...le/src/main/java/io/getstream/chat/android/compose/sample/ui/channel/ChannelInfoHeader.kt
@@ -25,9 +25,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.Text
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier

diff --git a/...rc/main/java/io/getstream/chat/android/compose/sample/ui/channel/ChannelInfoMemberItem.kt b/...rc/main/java/io/getstream/chat/android/compose/sample/ui/channel/ChannelInfoMemberItem.kt
@@ -25,7 +25,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.Text
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier

diff --git a/...rc/main/java/io/getstream/chat/android/compose/sample/ui/channel/ChannelInfoOptionItem.kt b/...rc/main/java/io/getstream/chat/android/compose/sample/ui/channel/ChannelInfoOptionItem.kt
@@ -26,10 +26,10 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.Icon
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier

diff --git a/...main/java/io/getstream/chat/android/compose/sample/ui/channel/GroupChannelInfoActivity.kt b/...main/java/io/getstream/chat/android/compose/sample/ui/channel/GroupChannelInfoActivity.kt
@@ -29,8 +29,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue

diff --git a/...ample/src/main/java/io/getstream/chat/android/compose/sample/ui/component/AppBottomBar.kt b/...ample/src/main/java/io/getstream/chat/android/compose/sample/ui/component/AppBottomBar.kt
@@ -28,8 +28,8 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Icon
-import androidx.compose.material.Text
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier

diff --git a/...sample/src/main/java/io/getstream/chat/android/compose/sample/ui/component/MembersList.kt b/...sample/src/main/java/io/getstream/chat/android/compose/sample/ui/component/MembersList.kt
@@ -23,7 +23,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material.Text
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment

diff --git a/...le/src/main/java/io/getstream/chat/android/compose/sample/ui/login/CustomLoginActivity.kt b/...le/src/main/java/io/getstream/chat/android/compose/sample/ui/login/CustomLoginActivity.kt
@@ -30,15 +30,17 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Button
-import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
-import androidx.compose.material.TextField
-import androidx.compose.material.TextFieldDefaults
-import androidx.compose.material.TopAppBar
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -169,6 +171,7 @@ class CustomLoginActivity : AppCompatActivity() {
         )
     }
 
+    @OptIn(ExperimentalMaterial3Api::class)
     @Composable
     private fun CustomLoginToolbar(onClick: () -> Unit) {
         TopAppBar(
@@ -186,8 +189,7 @@ class CustomLoginActivity : AppCompatActivity() {
                     )
                 }
             },
-            backgroundColor = Color.White,
-            elevation = 0.dp,
+            colors = TopAppBarDefaults.topAppBarColors(containerColor = Color.White),
         )
     }
 
@@ -206,9 +208,11 @@ class CustomLoginActivity : AppCompatActivity() {
             onValueChange = { onValueChange(it) },
             singleLine = true,
             label = { Text(hint) },
-            colors = TextFieldDefaults.textFieldColors(
-                textColor = ChatTheme.colors.textHighEmphasis,
-                backgroundColor = ChatTheme.colors.inputBackground,
+            colors = TextFieldDefaults.colors(
+                focusedTextColor = ChatTheme.colors.textHighEmphasis,
+                unfocusedTextColor = ChatTheme.colors.textHighEmphasis,
+                focusedContainerColor = ChatTheme.colors.inputBackground,
+                unfocusedContainerColor = ChatTheme.colors.inputBackground,
                 cursorColor = ChatTheme.colors.primaryAccent,
                 focusedIndicatorColor = ChatTheme.colors.primaryAccent,
                 focusedLabelColor = ChatTheme.colors.primaryAccent,
@@ -229,8 +233,8 @@ class CustomLoginActivity : AppCompatActivity() {
             enabled = enabled,
             shape = RoundedCornerShape(8.dp),
             colors = ButtonDefaults.buttonColors(
-                backgroundColor = ChatTheme.colors.primaryAccent,
-                disabledBackgroundColor = ChatTheme.colors.disabled,
+                containerColor = ChatTheme.colors.primaryAccent,
+                disabledContainerColor = ChatTheme.colors.disabled,
             ),
             onClick = onClick,
         ) {

diff --git a/...mple/src/main/java/io/getstream/chat/android/compose/sample/ui/login/UserLoginActivity.kt b/...mple/src/main/java/io/getstream/chat/android/compose/sample/ui/login/UserLoginActivity.kt
@@ -38,9 +38,9 @@ import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Icon
-import androidx.compose.material.Text
-import androidx.compose.material.ripple
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment

diff --git a/...rc/main/java/io/getstream/chat/android/compose/sample/ui/pinned/PinnedMessagesActivity.kt b/...rc/main/java/io/getstream/chat/android/compose/sample/ui/pinned/PinnedMessagesActivity.kt
@@ -32,11 +32,11 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -126,11 +126,12 @@ class PinnedMessagesActivity : BaseConnectedActivity() {
                 .fillMaxWidth()
                 .height(60.dp)
                 .background(ChatTheme.colors.barsBackground),
-            elevation = 2.dp,
+            shadowElevation = 2.dp,
         ) {
             Row(
                 modifier = Modifier
                     .fillMaxWidth()
+                    .background(ChatTheme.colors.barsBackground)
                     .padding(8.dp),
                 verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.SpaceBetween,

diff --git a/stream-chat-android-compose/build.gradle.kts b/stream-chat-android-compose/build.gradle.kts
@@ -84,7 +84,6 @@ dependencies {
     implementation(libs.androidx.lifecycle.runtime.compose)
     implementation(libs.androidx.compose.foundation)
     implementation(libs.androidx.compose.constraintlayout.compose)
-    implementation(libs.androidx.compose.material)
     implementation(libs.androidx.compose.material3)
 
     implementation(libs.androidx.activity.compose)

diff --git a/.../io/getstream/chat/android/compose/ui/attachments/content/AudioRecordAttachmentContent.kt b/.../io/getstream/chat/android/compose/ui/attachments/content/AudioRecordAttachmentContent.kt
@@ -26,12 +26,12 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Card
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.IconButton
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -41,6 +41,7 @@ import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.net.toUri
@@ -312,8 +313,9 @@ internal fun PlaybackToggleButton(
     onClick: () -> Unit = {},
 ) {
     Card(
-        elevation = 1.dp,
+        elevation = CardDefaults.cardElevation(defaultElevation = 1.dp),
         shape = CircleShape,
+        colors = CardDefaults.cardColors(containerColor = Color.White),
     ) {
         IconButton(
             onClick = onClick,
@@ -335,19 +337,18 @@ internal fun PlaybackToggleButton(
  * Represents the speed button.
  */
 @Composable
-@OptIn(ExperimentalMaterialApi::class)
 private fun SpeedButton(
     speed: Float,
     style: TextContainerStyle,
     onClick: () -> Unit,
 ) {
     Card(
         onClick = onClick,
-        elevation = 1.dp,
+        elevation = CardDefaults.cardElevation(defaultElevation = 1.dp),
         shape = CircleShape,
         modifier = Modifier
             .size(style.size),
-        backgroundColor = style.backgroundColor,
+        colors = CardDefaults.cardColors(containerColor = style.backgroundColor),
     ) {
         Box(
             modifier = Modifier.fillMaxSize(),

diff --git a/...in/java/io/getstream/chat/android/compose/ui/attachments/content/FileAttachmentContent.kt b/...in/java/io/getstream/chat/android/compose/ui/attachments/content/FileAttachmentContent.kt
@@ -28,10 +28,10 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.Icon
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.ripple
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment

diff --git a/.../io/getstream/chat/android/compose/ui/attachments/content/FileAttachmentPreviewContent.kt b/.../io/getstream/chat/android/compose/ui/attachments/content/FileAttachmentPreviewContent.kt
@@ -26,8 +26,8 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier

diff --git a/...c/main/java/io/getstream/chat/android/compose/ui/attachments/content/FileUploadContent.kt b/...c/main/java/io/getstream/chat/android/compose/ui/attachments/content/FileUploadContent.kt
@@ -27,8 +27,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment

diff --git a/...in/java/io/getstream/chat/android/compose/ui/attachments/content/LinkAttachmentContent.kt b/...in/java/io/getstream/chat/android/compose/ui/attachments/content/LinkAttachmentContent.kt
@@ -33,7 +33,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.layout.wrapContentWidth
-import androidx.compose.material.Text
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment

diff --git a/...n/java/io/getstream/chat/android/compose/ui/attachments/content/MediaAttachmentContent.kt b/...n/java/io/getstream/chat/android/compose/ui/attachments/content/MediaAttachmentContent.kt
@@ -36,9 +36,9 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentSize
-import androidx.compose.material.Icon
-import androidx.compose.material.Text
-import androidx.compose.material.ripple
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf

diff --git a/.../io/getstream/chat/android/compose/ui/attachments/content/UnsupportedAttachmentContent.kt b/.../io/getstream/chat/android/compose/ui/attachments/content/UnsupportedAttachmentContent.kt
@@ -22,8 +22,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier