diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cb10aea1636..83c8b6a8466 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,6 +13,7 @@ androidxAnnotations = "1.9.1" androidxAppcompat = "1.7.0" androidxComposeBom = "2025.08.01" androidxComposeConstraintLayout = "1.1.0" +androidxCoreSplashScreen = "1.2.0" androidxCoreTest = "2.2.0" androidxFragment = "1.8.5" androidxKtx = "1.15.0" @@ -111,6 +112,7 @@ androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintLayout"} androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidxKtx"} +androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "androidxCoreSplashScreen"} androidx-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "androidxCoreTest"} androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "androidxFragment"} androidx-fragment-testing = { module = "androidx.fragment:fragment-testing", version.ref = "androidxFragment"} diff --git a/stream-chat-android-compose-sample/build.gradle.kts b/stream-chat-android-compose-sample/build.gradle.kts index 49ecae52773..dc237aeafbd 100644 --- a/stream-chat-android-compose-sample/build.gradle.kts +++ b/stream-chat-android-compose-sample/build.gradle.kts @@ -132,6 +132,7 @@ dependencies { implementation(project(":stream-chat-android-compose")) implementation(libs.androidx.core.ktx) + implementation(libs.androidx.core.splashscreen) implementation(libs.androidx.appcompat) implementation(libs.android.material) implementation(libs.stream.log) diff --git a/stream-chat-android-compose-sample/src/demo/java/io/getstream/chat/android/compose/sample/ui/StartupActivity.kt b/stream-chat-android-compose-sample/src/demo/java/io/getstream/chat/android/compose/sample/ui/StartupActivity.kt index 4367f0caa76..a806d60ff13 100644 --- a/stream-chat-android-compose-sample/src/demo/java/io/getstream/chat/android/compose/sample/ui/StartupActivity.kt +++ b/stream-chat-android-compose-sample/src/demo/java/io/getstream/chat/android/compose/sample/ui/StartupActivity.kt @@ -21,6 +21,7 @@ import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.core.app.TaskStackBuilder +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.lifecycle.lifecycleScope import io.getstream.chat.android.client.ChatClient import io.getstream.chat.android.compose.sample.BuildConfig @@ -46,6 +47,7 @@ class StartupActivity : AppCompatActivity() { private val settings by lazy { customSettings() } override fun onCreate(savedInstanceState: Bundle?) { + installSplashScreen() super.onCreate(savedInstanceState) lifecycleScope.launch { diff --git a/stream-chat-android-compose-sample/src/e2e/java/io/getstream/chat/android/compose/sample/ui/StartupActivity.kt b/stream-chat-android-compose-sample/src/e2e/java/io/getstream/chat/android/compose/sample/ui/StartupActivity.kt index 1ecac3ec15c..16e1df5f69e 100644 --- a/stream-chat-android-compose-sample/src/e2e/java/io/getstream/chat/android/compose/sample/ui/StartupActivity.kt +++ b/stream-chat-android-compose-sample/src/e2e/java/io/getstream/chat/android/compose/sample/ui/StartupActivity.kt @@ -20,6 +20,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import io.getstream.chat.android.compose.sample.ChatHelper import io.getstream.chat.android.compose.sample.data.PredefinedUserCredentials import io.getstream.chat.android.compose.sample.data.customSettings @@ -27,6 +28,7 @@ import io.getstream.chat.android.compose.sample.data.customSettings class StartupActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { + installSplashScreen() super.onCreate(savedInstanceState) ChatHelper.initializeSdk(applicationContext, PredefinedUserCredentials.API_KEY, intent.getStringExtra("BASE_URL")) customSettings().isComposerLinkPreviewEnabled = true diff --git a/stream-chat-android-compose-sample/src/main/AndroidManifest.xml b/stream-chat-android-compose-sample/src/main/AndroidManifest.xml index 59b1a5ea290..abed0274a2d 100644 --- a/stream-chat-android-compose-sample/src/main/AndroidManifest.xml +++ b/stream-chat-android-compose-sample/src/main/AndroidManifest.xml @@ -56,6 +56,7 @@ android:name=".ui.StartupActivity" android:exported="true" android:launchMode="singleInstance" + android:theme="@style/Theme.App.Splash" > diff --git a/stream-chat-android-compose-sample/src/main/ic_launcher-playstore.png b/stream-chat-android-compose-sample/src/main/ic_launcher-playstore.png index 9aa84ae01be..656dd1bc68c 100644 Binary files a/stream-chat-android-compose-sample/src/main/ic_launcher-playstore.png and b/stream-chat-android-compose-sample/src/main/ic_launcher-playstore.png differ diff --git a/stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/feature/channel/list/ChannelsActivity.kt b/stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/feature/channel/list/ChannelsActivity.kt index 44475d2c963..fa58a82d779 100644 --- a/stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/feature/channel/list/ChannelsActivity.kt +++ b/stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/feature/channel/list/ChannelsActivity.kt @@ -19,7 +19,6 @@ package io.getstream.chat.android.compose.sample.feature.channel.list import android.content.Context import android.content.Intent import android.os.Bundle -import android.widget.Toast import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.viewModels @@ -37,7 +36,6 @@ import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.lazy.LazyItemScope import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.DrawerValue -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ModalDrawerSheet import androidx.compose.material3.ModalNavigationDrawer import androidx.compose.material3.Scaffold @@ -83,7 +81,6 @@ import io.getstream.chat.android.compose.ui.channels.list.ChannelItem import io.getstream.chat.android.compose.ui.channels.list.ChannelList import io.getstream.chat.android.compose.ui.components.SearchInput import io.getstream.chat.android.compose.ui.components.channels.buildDefaultChannelActions -import io.getstream.chat.android.compose.ui.mentions.MentionList import io.getstream.chat.android.compose.ui.theme.ChannelListDividerItemParams import io.getstream.chat.android.compose.ui.theme.ChannelListItemContentParams import io.getstream.chat.android.compose.ui.theme.ChatComponentFactory @@ -91,8 +88,6 @@ import io.getstream.chat.android.compose.ui.theme.ChatTheme import io.getstream.chat.android.compose.ui.threads.ThreadsScreen import io.getstream.chat.android.compose.viewmodel.channels.ChannelListViewModel import io.getstream.chat.android.compose.viewmodel.channels.ChannelListViewModelFactory -import io.getstream.chat.android.compose.viewmodel.mentions.MentionListViewModel -import io.getstream.chat.android.compose.viewmodel.mentions.MentionListViewModelFactory import io.getstream.chat.android.compose.viewmodel.threads.ThreadsViewModelFactory import io.getstream.chat.android.models.Channel import io.getstream.chat.android.models.Filters @@ -125,7 +120,6 @@ class ChannelsActivity : ComponentActivity() { } private val channelsViewModel: ChannelListViewModel by viewModels { channelsViewModelFactory } - private val mentionListViewModel: MentionListViewModel by viewModels { MentionListViewModelFactory() } private val threadsViewModelFactory = ThreadsViewModelFactory(query = QueryThreadsRequest()) @Suppress("LongMethod") @@ -204,7 +198,6 @@ class ChannelsActivity : ComponentActivity() { }, ) - AppBottomBarOption.MENTIONS -> MentionsContent() AppBottomBarOption.THREADS -> ThreadsContent( onHeaderAvatarClick = { coroutineScope.launch { @@ -238,17 +231,6 @@ class ChannelsActivity : ComponentActivity() { // MyCustomUi() } - @OptIn(ExperimentalMaterial3Api::class) - @Composable - private fun MentionsContent() { - MentionList( - viewModel = mentionListViewModel, - modifier = Modifier.fillMaxSize(), - onItemClick = ::openMessages, - onEvent = { Toast.makeText(this, "Error", Toast.LENGTH_SHORT).show() }, - ) - } - @Composable private fun ThreadsContent(onHeaderAvatarClick: () -> Unit) { ThreadsScreen( diff --git a/stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/chats/ChatsActivity.kt b/stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/chats/ChatsActivity.kt index 12227003d9f..e5795fc6628 100644 --- a/stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/chats/ChatsActivity.kt +++ b/stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/chats/ChatsActivity.kt @@ -214,7 +214,6 @@ class ChatsActivity : ComponentActivity() { onOptionSelected = { option -> listContentMode = when (option) { AppBottomBarOption.CHATS -> ChatListContentMode.Channels - AppBottomBarOption.MENTIONS -> ChatListContentMode.Mentions AppBottomBarOption.THREADS -> ChatListContentMode.Threads } }, @@ -240,8 +239,9 @@ class ChatsActivity : ComponentActivity() { val unreadThreadsCount by remember { globalStateFlow.flatMapLatest { it.unreadThreadsCount } } .collectAsStateWithLifecycle(0) val selectedOption = when (listContentMode) { - ChatListContentMode.Channels -> AppBottomBarOption.CHATS - ChatListContentMode.Mentions -> AppBottomBarOption.MENTIONS + ChatListContentMode.Channels, + ChatListContentMode.Mentions, + -> AppBottomBarOption.CHATS ChatListContentMode.Threads -> AppBottomBarOption.THREADS } AppBottomBar( diff --git a/stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/component/AppBottomBar.kt b/stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/component/AppBottomBar.kt index 1599242a77d..69e7addfd14 100644 --- a/stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/component/AppBottomBar.kt +++ b/stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/component/AppBottomBar.kt @@ -29,6 +29,7 @@ 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.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.material3.ripple @@ -60,41 +61,40 @@ fun AppBottomBar( selectedOption: AppBottomBarOption, onOptionSelected: (AppBottomBarOption) -> Unit, ) { - Row( - modifier = Modifier - .fillMaxWidth() - .background(ChatTheme.colors.backgroundCoreElevation1), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.SpaceEvenly, - ) { - AppBottomBarOptionTile( - icon = ComposeR.drawable.stream_design_ic_message_bubble_fill, - text = R.string.app_bottom_bar_chats, - isSelected = selectedOption == AppBottomBarOption.CHATS, - onClick = { onOptionSelected(AppBottomBarOption.CHATS) }, - decorationBadge = { - if (unreadChannelsCount > 0) { - UnreadCountIndicator(unreadChannelsCount) - } - }, - ) - AppBottomBarOptionTile( - icon = ComposeR.drawable.stream_design_ic_mention, - text = R.string.app_bottom_bar_mentions, - isSelected = selectedOption == AppBottomBarOption.MENTIONS, - onClick = { onOptionSelected(AppBottomBarOption.MENTIONS) }, - ) - AppBottomBarOptionTile( - icon = ComposeR.drawable.stream_design_ic_thread, - text = R.string.app_bottom_bar_threads, - isSelected = selectedOption == AppBottomBarOption.THREADS, - onClick = { onOptionSelected(AppBottomBarOption.THREADS) }, - decorationBadge = { - if (unreadThreadsCount > 0) { - UnreadCountIndicator(unreadThreadsCount) - } - }, - ) + Column(modifier = Modifier.fillMaxWidth()) { + HorizontalDivider(thickness = 1.dp, color = ChatTheme.colors.borderCoreSubtle) + Row( + modifier = Modifier + .fillMaxWidth() + .background(ChatTheme.colors.backgroundCoreElevation1), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceEvenly, + ) { + AppBottomBarOptionTile( + selectedIcon = ComposeR.drawable.stream_design_ic_message_bubble_fill, + unselectedIcon = ComposeR.drawable.stream_design_ic_message_bubble, + text = R.string.app_bottom_bar_chats, + isSelected = selectedOption == AppBottomBarOption.CHATS, + onClick = { onOptionSelected(AppBottomBarOption.CHATS) }, + decorationBadge = { + if (unreadChannelsCount > 0) { + UnreadCountIndicator(unreadChannelsCount) + } + }, + ) + AppBottomBarOptionTile( + selectedIcon = ComposeR.drawable.stream_design_ic_thread_fill, + unselectedIcon = ComposeR.drawable.stream_design_ic_thread, + text = R.string.app_bottom_bar_threads, + isSelected = selectedOption == AppBottomBarOption.THREADS, + onClick = { onOptionSelected(AppBottomBarOption.THREADS) }, + decorationBadge = { + if (unreadThreadsCount > 0) { + UnreadCountIndicator(unreadThreadsCount) + } + }, + ) + } } } @@ -103,13 +103,13 @@ fun AppBottomBar( */ enum class AppBottomBarOption { CHATS, - MENTIONS, THREADS, } @Composable private fun AppBottomBarOptionTile( - @DrawableRes icon: Int, + @DrawableRes selectedIcon: Int, + @DrawableRes unselectedIcon: Int, @StringRes text: Int, isSelected: Boolean, onClick: () -> Unit, @@ -133,7 +133,7 @@ private fun AppBottomBarOptionTile( horizontalAlignment = Alignment.CenterHorizontally, ) { Icon( - painter = painterResource(icon), + painter = painterResource(if (isSelected) selectedIcon else unselectedIcon), contentDescription = null, tint = contentColor, ) diff --git a/stream-chat-android-compose-sample/src/main/res/drawable/ic_launcher_foreground.xml b/stream-chat-android-compose-sample/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 12f9c174f80..00000000000 --- a/stream-chat-android-compose-sample/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/stream-chat-android-compose-sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6786999bdea..af7b39a25d4 100644 --- a/stream-chat-android-compose-sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/stream-chat-android-compose-sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -16,5 +16,5 @@ --> - - \ No newline at end of file + + diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/stream-chat-android-compose-sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6786999bdea..af7b39a25d4 100644 --- a/stream-chat-android-compose-sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/stream-chat-android-compose-sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -16,5 +16,5 @@ --> - - \ No newline at end of file + + diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-hdpi/ic_launcher.png b/stream-chat-android-compose-sample/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 2fe33d8ff9a..00000000000 Binary files a/stream-chat-android-compose-sample/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-hdpi/ic_launcher.webp b/stream-chat-android-compose-sample/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 00000000000..f580a400a29 Binary files /dev/null and b/stream-chat-android-compose-sample/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/stream-chat-android-compose-sample/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000000..be258b7ebaa Binary files /dev/null and b/stream-chat-android-compose-sample/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-hdpi/ic_launcher_round.png b/stream-chat-android-compose-sample/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 2fe33d8ff9a..00000000000 Binary files a/stream-chat-android-compose-sample/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/stream-chat-android-compose-sample/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 00000000000..f580a400a29 Binary files /dev/null and b/stream-chat-android-compose-sample/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-mdpi/ic_launcher.png b/stream-chat-android-compose-sample/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 29703ea6832..00000000000 Binary files a/stream-chat-android-compose-sample/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-mdpi/ic_launcher.webp b/stream-chat-android-compose-sample/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 00000000000..9c6363d87a9 Binary files /dev/null and b/stream-chat-android-compose-sample/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/stream-chat-android-compose-sample/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000000..fc7a4865bf2 Binary files /dev/null and b/stream-chat-android-compose-sample/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-mdpi/ic_launcher_round.png b/stream-chat-android-compose-sample/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 29703ea6832..00000000000 Binary files a/stream-chat-android-compose-sample/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/stream-chat-android-compose-sample/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 00000000000..9c6363d87a9 Binary files /dev/null and b/stream-chat-android-compose-sample/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-xhdpi/ic_launcher.png b/stream-chat-android-compose-sample/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 40deb46ddfc..00000000000 Binary files a/stream-chat-android-compose-sample/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-xhdpi/ic_launcher.webp b/stream-chat-android-compose-sample/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 00000000000..e04a704e36e Binary files /dev/null and b/stream-chat-android-compose-sample/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/stream-chat-android-compose-sample/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000000..f8f167ae494 Binary files /dev/null and b/stream-chat-android-compose-sample/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/stream-chat-android-compose-sample/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 40deb46ddfc..00000000000 Binary files a/stream-chat-android-compose-sample/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/stream-chat-android-compose-sample/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 00000000000..e04a704e36e Binary files /dev/null and b/stream-chat-android-compose-sample/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-xxhdpi/ic_launcher.png b/stream-chat-android-compose-sample/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index a64e62287b3..00000000000 Binary files a/stream-chat-android-compose-sample/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/stream-chat-android-compose-sample/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 00000000000..b24a897f18f Binary files /dev/null and b/stream-chat-android-compose-sample/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/stream-chat-android-compose-sample/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000000..42d4ee4cf94 Binary files /dev/null and b/stream-chat-android-compose-sample/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/stream-chat-android-compose-sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index a64e62287b3..00000000000 Binary files a/stream-chat-android-compose-sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/stream-chat-android-compose-sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000000..b24a897f18f Binary files /dev/null and b/stream-chat-android-compose-sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/stream-chat-android-compose-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 8a8752fa75d..00000000000 Binary files a/stream-chat-android-compose-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/stream-chat-android-compose-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 00000000000..1489bc359b6 Binary files /dev/null and b/stream-chat-android-compose-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/stream-chat-android-compose-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000000..80c6533cd6f Binary files /dev/null and b/stream-chat-android-compose-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/stream-chat-android-compose-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 8a8752fa75d..00000000000 Binary files a/stream-chat-android-compose-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/stream-chat-android-compose-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/stream-chat-android-compose-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000000..1489bc359b6 Binary files /dev/null and b/stream-chat-android-compose-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/stream-chat-android-compose-sample/src/main/res/values/ic_launcher_background.xml b/stream-chat-android-compose-sample/src/main/res/values/ic_launcher_background.xml index 2e172c9688b..45c243a1c49 100644 --- a/stream-chat-android-compose-sample/src/main/res/values/ic_launcher_background.xml +++ b/stream-chat-android-compose-sample/src/main/res/values/ic_launcher_background.xml @@ -15,5 +15,5 @@ limitations under the License. --> - #005FFF - \ No newline at end of file + #000000 + diff --git a/stream-chat-android-compose-sample/src/main/res/values/strings.xml b/stream-chat-android-compose-sample/src/main/res/values/strings.xml index 58d006c48f3..33738b08da9 100644 --- a/stream-chat-android-compose-sample/src/main/res/values/strings.xml +++ b/stream-chat-android-compose-sample/src/main/res/values/strings.xml @@ -71,7 +71,6 @@ Chats - Mentions Threads diff --git a/stream-chat-android-compose-sample/src/main/res/values/themes.xml b/stream-chat-android-compose-sample/src/main/res/values/themes.xml index 92d90891826..18ac10b737a 100644 --- a/stream-chat-android-compose-sample/src/main/res/values/themes.xml +++ b/stream-chat-android-compose-sample/src/main/res/values/themes.xml @@ -22,4 +22,10 @@ #FFFFFF @android:color/transparent + + diff --git a/stream-chat-android-ui-components-sample/build.gradle.kts b/stream-chat-android-ui-components-sample/build.gradle.kts index ab102b997e4..d96b20578f4 100644 --- a/stream-chat-android-ui-components-sample/build.gradle.kts +++ b/stream-chat-android-ui-components-sample/build.gradle.kts @@ -152,6 +152,7 @@ dependencies { implementation(libs.androidx.activity.ktx) implementation(libs.androidx.appcompat) implementation(libs.androidx.core.ktx) + implementation(libs.androidx.core.splashscreen) implementation(libs.androidx.lifecycle.livedata.ktx) implementation(libs.androidx.preference) implementation(libs.androidx.constraintlayout) diff --git a/stream-chat-android-ui-components-sample/src/main/AndroidManifest.xml b/stream-chat-android-ui-components-sample/src/main/AndroidManifest.xml index 674fa27a050..df498b094b9 100644 --- a/stream-chat-android-ui-components-sample/src/main/AndroidManifest.xml +++ b/stream-chat-android-ui-components-sample/src/main/AndroidManifest.xml @@ -50,6 +50,7 @@ diff --git a/stream-chat-android-ui-components-sample/src/main/ic_launcher-playstore.png b/stream-chat-android-ui-components-sample/src/main/ic_launcher-playstore.png index 8e344640ad9..d964709db72 100644 Binary files a/stream-chat-android-ui-components-sample/src/main/ic_launcher-playstore.png and b/stream-chat-android-ui-components-sample/src/main/ic_launcher-playstore.png differ diff --git a/stream-chat-android-ui-components-sample/src/main/kotlin/io/getstream/chat/ui/sample/feature/HostActivity.kt b/stream-chat-android-ui-components-sample/src/main/kotlin/io/getstream/chat/ui/sample/feature/HostActivity.kt index 391bac5edb9..4f966791582 100644 --- a/stream-chat-android-ui-components-sample/src/main/kotlin/io/getstream/chat/ui/sample/feature/HostActivity.kt +++ b/stream-chat-android-ui-components-sample/src/main/kotlin/io/getstream/chat/ui/sample/feature/HostActivity.kt @@ -21,6 +21,7 @@ import android.content.Intent import android.os.Bundle import android.view.View import androidx.appcompat.app.AppCompatActivity +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.updatePadding @@ -34,6 +35,7 @@ const val EXTRA_PARENT_MESSAGE_ID = "extra_parent_message_id" class HostActivity : AppCompatActivity(R.layout.activity_main) { override fun onCreate(savedInstanceState: Bundle?) { + installSplashScreen() super.onCreate(savedInstanceState) setupEdgeToEdge() if (savedInstanceState != null && lastNonConfigurationInstance == null) { diff --git a/stream-chat-android-ui-components-sample/src/main/res/drawable/ic_launcher_foreground.xml b/stream-chat-android-ui-components-sample/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 1d1834332b0..00000000000 --- a/stream-chat-android-ui-components-sample/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/stream-chat-android-ui-components-sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 300a48381a0..af7b39a25d4 100644 --- a/stream-chat-android-ui-components-sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/stream-chat-android-ui-components-sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -16,5 +16,5 @@ --> - + diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/stream-chat-android-ui-components-sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 300a48381a0..af7b39a25d4 100644 --- a/stream-chat-android-ui-components-sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/stream-chat-android-ui-components-sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -16,5 +16,5 @@ --> - + diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-hdpi/ic_launcher.png b/stream-chat-android-ui-components-sample/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 9ab0abe6393..00000000000 Binary files a/stream-chat-android-ui-components-sample/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-hdpi/ic_launcher.webp b/stream-chat-android-ui-components-sample/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 00000000000..95e8593b098 Binary files /dev/null and b/stream-chat-android-ui-components-sample/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/stream-chat-android-ui-components-sample/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000000..fa1199ae509 Binary files /dev/null and b/stream-chat-android-ui-components-sample/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-hdpi/ic_launcher_round.png b/stream-chat-android-ui-components-sample/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 9ab0abe6393..00000000000 Binary files a/stream-chat-android-ui-components-sample/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/stream-chat-android-ui-components-sample/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 00000000000..95e8593b098 Binary files /dev/null and b/stream-chat-android-ui-components-sample/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-mdpi/ic_launcher.png b/stream-chat-android-ui-components-sample/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 8aa1194e733..00000000000 Binary files a/stream-chat-android-ui-components-sample/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-mdpi/ic_launcher.webp b/stream-chat-android-ui-components-sample/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 00000000000..991fe5e513c Binary files /dev/null and b/stream-chat-android-ui-components-sample/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/stream-chat-android-ui-components-sample/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000000..e8b533e6a9f Binary files /dev/null and b/stream-chat-android-ui-components-sample/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-mdpi/ic_launcher_round.png b/stream-chat-android-ui-components-sample/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 8aa1194e733..00000000000 Binary files a/stream-chat-android-ui-components-sample/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/stream-chat-android-ui-components-sample/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 00000000000..991fe5e513c Binary files /dev/null and b/stream-chat-android-ui-components-sample/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xhdpi/ic_launcher.png b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 12b6332bb53..00000000000 Binary files a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xhdpi/ic_launcher.webp b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 00000000000..af835b8f79f Binary files /dev/null and b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000000..ff53a8ea25b Binary files /dev/null and b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 12b6332bb53..00000000000 Binary files a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 00000000000..af835b8f79f Binary files /dev/null and b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxhdpi/ic_launcher.png b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 562bfc61f98..00000000000 Binary files a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 00000000000..d373027c39a Binary files /dev/null and b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000000..85030474874 Binary files /dev/null and b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 562bfc61f98..00000000000 Binary files a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000000..d373027c39a Binary files /dev/null and b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 6edff7d7186..00000000000 Binary files a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 00000000000..8e11c4572bd Binary files /dev/null and b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000000..b0aa7d7b8ad Binary files /dev/null and b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 6edff7d7186..00000000000 Binary files a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000000..8e11c4572bd Binary files /dev/null and b/stream-chat-android-ui-components-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/stream-chat-android-ui-components-sample/src/main/res/values/ic_launcher_background.xml b/stream-chat-android-ui-components-sample/src/main/res/values/ic_launcher_background.xml index 2e172c9688b..45c243a1c49 100644 --- a/stream-chat-android-ui-components-sample/src/main/res/values/ic_launcher_background.xml +++ b/stream-chat-android-ui-components-sample/src/main/res/values/ic_launcher_background.xml @@ -15,5 +15,5 @@ limitations under the License. --> - #005FFF - \ No newline at end of file + #000000 + diff --git a/stream-chat-android-ui-components-sample/src/main/res/values/themes.xml b/stream-chat-android-ui-components-sample/src/main/res/values/themes.xml index 1183b0efba6..d379e0ec7e4 100644 --- a/stream-chat-android-ui-components-sample/src/main/res/values/themes.xml +++ b/stream-chat-android-ui-components-sample/src/main/res/values/themes.xml @@ -33,4 +33,10 @@ + +