Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AND-201] Migrate material to material3 components. #5537

Merged
merged 11 commits into from
Jan 7, 2025
+486 −423
Merged

[AND-201] Migrate material to material3 components. #5537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2c01e7f
[AND-201] Migrate stream-chat-android-compose material to material3.
Dec 25, 2024
a906047
[AND-201] Migrate stream-chat-android-compose-sample material to mate…
Dec 26, 2024
4cfbe34
[AND-201] Migrate stream-chat-android-ui-uitests material to material3.
Dec 26, 2024
30a7ffa
[AND-201] Migrate stream-chat-android-ui-guides material to material3.
Dec 26, 2024
5b031a3
[AND-201] Migrate stream-chat-android-docs material to material3.
Dec 26, 2024
54a79b1
[AND-201] Remove material dependency.
Dec 26, 2024
548dc02
[AND-201] Update CHANGELOG.md.
Dec 26, 2024
c4e2d11
Merge branch 'develop' into feature/migrate-material-to-material3
Jan 2, 2025
438bbeb
[AND-201] Remove material dependency.
Jan 2, 2025
42353c2
Merge branch 'develop' into feature/migrate-material-to-material3
Jan 7, 2025
c8f9e10
Merge branch 'develop' into feature/migrate-material-to-material3
JcMinarro Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,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

Expand Down
1 change: 0 additions & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,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"}
Expand Down
2 changes: 1 addition & 1 deletion stream-chat-android-compose-sample/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions ...pose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/ChannelsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ...pose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/MessagesActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .../src/main/java/io/getstream/chat/android/compose/sample/ui/channel/ChannelInfoActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...le/src/main/java/io/getstream/chat/android/compose/sample/ui/channel/ChannelInfoHeader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/io/getstream/chat/android/compose/sample/ui/channel/ChannelInfoMemberItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...rc/main/java/io/getstream/chat/android/compose/sample/ui/channel/ChannelInfoOptionItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/io/getstream/chat/android/compose/sample/ui/channel/GroupChannelInfoActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...ample/src/main/java/io/getstream/chat/android/compose/sample/ui/component/AppBottomBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...sample/src/main/java/io/getstream/chat/android/compose/sample/ui/component/MembersList.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 20 additions & 16 deletions ...le/src/main/java/io/getstream/chat/android/compose/sample/ui/login/CustomLoginActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -169,6 +171,7 @@ class CustomLoginActivity : AppCompatActivity() {
)
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun CustomLoginToolbar(onClick: () -> Unit) {
TopAppBar(
Expand All @@ -186,8 +189,7 @@ class CustomLoginActivity : AppCompatActivity() {
)
}
},
backgroundColor = Color.White,
elevation = 0.dp,
colors = TopAppBarDefaults.topAppBarColors(containerColor = Color.White),
)
}

Expand All @@ -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,
Expand All @@ -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,
) {
Expand Down
6 changes: 3 additions & 3 deletions ...mple/src/main/java/io/getstream/chat/android/compose/sample/ui/login/UserLoginActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 7 additions & 6 deletions ...rc/main/java/io/getstream/chat/android/compose/sample/ui/pinned/PinnedMessagesActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion stream-chat-android-compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
19 changes: 10 additions & 9 deletions .../io/getstream/chat/android/compose/ui/attachments/content/AudioRecordAttachmentContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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(),
Expand Down
8 changes: 4 additions & 4 deletions ...in/java/io/getstream/chat/android/compose/ui/attachments/content/FileAttachmentContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .../io/getstream/chat/android/compose/ui/attachments/content/FileAttachmentPreviewContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/io/getstream/chat/android/compose/ui/attachments/content/FileUploadContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/io/getstream/chat/android/compose/ui/attachments/content/LinkAttachmentContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...n/java/io/getstream/chat/android/compose/ui/attachments/content/MediaAttachmentContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .../io/getstream/chat/android/compose/ui/attachments/content/UnsupportedAttachmentContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading