Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import io.getstream.chat.android.compose.sample.BuildConfig
import io.getstream.chat.android.compose.sample.ChatApp
import io.getstream.chat.android.compose.sample.data.customSettings
import io.getstream.chat.android.compose.sample.feature.channel.list.ChannelsActivity
import io.getstream.chat.android.compose.sample.ui.channel.ChannelActivity
import io.getstream.chat.android.compose.sample.ui.chats.ChatsActivity
import io.getstream.chat.android.compose.sample.ui.login.UserLoginActivity
import io.getstream.chat.android.models.InitializationState
Expand Down Expand Up @@ -74,7 +75,7 @@ class StartupActivity : AppCompatActivity() {
TaskStackBuilder.create(applicationContext)
.addNextIntent(ChannelsActivity.createIntent(applicationContext))
.addNextIntent(
MessagesActivity.createIntent(
ChannelActivity.createIntent(
context = applicationContext,
channelId = channelId,
messageId = messageId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
android:exported="false"
/>
<activity
android:name=".ui.MessagesActivity"
android:name=".ui.channel.ChannelActivity"
android:exported="false"
android:windowSoftInputMode="adjustResize"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import io.getstream.chat.android.compose.sample.R
import io.getstream.chat.android.compose.sample.feature.channel.add.group.AddGroupChannelActivity
import io.getstream.chat.android.compose.sample.ui.MessagesActivity
import io.getstream.chat.android.compose.sample.ui.channel.ChannelActivity
import io.getstream.chat.android.compose.ui.theme.ChatComponentFactory
import io.getstream.chat.android.compose.ui.theme.ChatTheme
import io.getstream.chat.android.compose.ui.theme.MessageComposerLeadingContentParams
Expand Down Expand Up @@ -82,7 +82,7 @@ class AddChannelActivity : ComponentActivity() {
}

private fun openChannel(cid: String) {
val intent = MessagesActivity.createIntent(this, cid)
val intent = ChannelActivity.createIntent(this, cid)
startActivity(intent)
finish()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import androidx.activity.viewModels
import androidx.compose.runtime.LaunchedEffect
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import io.getstream.chat.android.compose.sample.R
import io.getstream.chat.android.compose.sample.ui.MessagesActivity
import io.getstream.chat.android.compose.sample.ui.channel.ChannelActivity
import io.getstream.chat.android.compose.ui.theme.ChatTheme
import kotlinx.coroutines.flow.collectLatest

Expand Down Expand Up @@ -76,7 +76,7 @@ class AddGroupChannelActivity : ComponentActivity() {
}

private fun openChannel(cid: String) {
val intent = MessagesActivity.createIntent(this, cid)
val intent = ChannelActivity.createIntent(this, cid)
startActivity(intent)
finish()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Modifier
import io.getstream.chat.android.compose.sample.R
import io.getstream.chat.android.compose.sample.ui.MessagesActivity
import io.getstream.chat.android.compose.sample.ui.channel.ChannelActivity
import io.getstream.chat.android.compose.ui.theme.ChatTheme
import kotlinx.coroutines.flow.collectLatest

Expand Down Expand Up @@ -68,7 +68,7 @@ class DraftChannelActivity : ComponentActivity() {
when (event) {
is DraftChannelViewEvent.NavigateToChannel -> {
startActivity(
MessagesActivity.createIntent(
ChannelActivity.createIntent(
context = applicationContext,
channelId = event.cid,
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ import io.getstream.chat.android.compose.sample.feature.channel.add.AddChannelAc
import io.getstream.chat.android.compose.sample.feature.channel.add.group.AddGroupChannelActivity
import io.getstream.chat.android.compose.sample.feature.channel.isGroupChannel
import io.getstream.chat.android.compose.sample.feature.reminders.MessageRemindersActivity
import io.getstream.chat.android.compose.sample.ui.MessagesActivity
import io.getstream.chat.android.compose.sample.ui.SampleChatTheme
import io.getstream.chat.android.compose.sample.ui.channel.ChannelActivity
import io.getstream.chat.android.compose.sample.ui.channel.DirectChannelInfoActivity
import io.getstream.chat.android.compose.sample.ui.channel.GroupChannelInfoActivity
import io.getstream.chat.android.compose.sample.ui.component.AppBottomBar
Expand Down Expand Up @@ -359,7 +359,7 @@ class ChannelsActivity : ComponentActivity() {

private fun openMessages(channel: Channel) {
startActivity(
MessagesActivity.createIntent(
ChannelActivity.createIntent(
context = this,
channelId = channel.cid,
messageId = null,
Expand All @@ -370,7 +370,7 @@ class ChannelsActivity : ComponentActivity() {

private fun openMessages(message: Message) {
startActivity(
MessagesActivity.createIntent(
ChannelActivity.createIntent(
context = this,
channelId = message.cid,
messageId = message.id,
Expand All @@ -381,7 +381,7 @@ class ChannelsActivity : ComponentActivity() {

private fun openThread(thread: Thread) {
startActivity(
MessagesActivity.createIntent(
ChannelActivity.createIntent(
context = this,
channelId = thread.parentMessage.cid,
parentMessageId = thread.parentMessageId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.ui.Modifier
import io.getstream.chat.android.compose.sample.ui.MessagesActivity
import io.getstream.chat.android.compose.sample.ui.channel.ChannelActivity
import io.getstream.chat.android.compose.ui.theme.ChatTheme
import io.getstream.chat.android.models.Message

Expand All @@ -47,7 +47,7 @@ class MessageRemindersActivity : ComponentActivity() {

private fun openMessages(message: Message) {
startActivity(
MessagesActivity.createIntent(
ChannelActivity.createIntent(
context = this,
channelId = message.cid,
messageId = message.id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.getstream.chat.android.compose.sample.ui
package io.getstream.chat.android.compose.sample.ui.channel

import android.content.Context
import android.content.Intent
Expand All @@ -23,10 +23,11 @@ import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
import io.getstream.chat.android.compose.sample.R
import io.getstream.chat.android.compose.sample.data.customSettings
import io.getstream.chat.android.compose.sample.feature.channel.isGroupChannel
import io.getstream.chat.android.compose.sample.ui.channel.DirectChannelInfoActivity
import io.getstream.chat.android.compose.sample.ui.channel.GroupChannelInfoActivity
import io.getstream.chat.android.compose.sample.ui.SampleChatTheme
import io.getstream.chat.android.compose.ui.messages.ChannelScreen
import io.getstream.chat.android.compose.ui.theme.AttachmentPickerConfig
import io.getstream.chat.android.compose.ui.theme.ChatUiConfig
Expand All @@ -35,7 +36,7 @@ import io.getstream.chat.android.compose.viewmodel.messages.ChannelViewModelFact
import io.getstream.chat.android.compose.viewmodel.messages.ComposerOptions
import io.getstream.chat.android.models.Channel

class MessagesActivity : ComponentActivity() {
class ChannelActivity : ComponentActivity() {

private val settings by lazy { customSettings() }

Expand Down Expand Up @@ -90,6 +91,7 @@ class MessagesActivity : ComponentActivity() {
viewModelFactory = factory,
onBackPressed = { finish() },
onChannelAvatarClick = ::openChannelInfo,
onChannelAvatarClickLabel = stringResource(R.string.channel_open_info),
)
}

Expand All @@ -113,7 +115,7 @@ class MessagesActivity : ComponentActivity() {
messageId: String? = null,
parentMessageId: String? = null,
): Intent {
return Intent(context, MessagesActivity::class.java).apply {
return Intent(context, ChannelActivity::class.java).apply {
putExtra(KEY_CHANNEL_ID, channelId)
putExtra(KEY_MESSAGE_ID, messageId)
putExtra(KEY_PARENT_MESSAGE_ID, parentMessageId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Modifier
import io.getstream.chat.android.compose.sample.feature.channel.draft.DraftChannelActivity
import io.getstream.chat.android.compose.sample.ui.MessagesActivity
import io.getstream.chat.android.compose.sample.ui.channel.attachments.ChannelFilesAttachmentsActivity
import io.getstream.chat.android.compose.sample.ui.channel.attachments.ChannelMediaAttachmentsActivity
import io.getstream.chat.android.compose.sample.ui.pinned.PinnedMessagesActivity
Expand Down Expand Up @@ -111,7 +110,7 @@ class GroupChannelInfoActivity : ComponentActivity() {
openFilesAttachments()

is ChannelInfoViewEvent.NavigateToChannel ->
startActivity(MessagesActivity.createIntent(context = this, channelId = event.cid))
startActivity(ChannelActivity.createIntent(context = this, channelId = event.cid))

is ChannelInfoViewEvent.NavigateToDraftChannel ->
startActivity(DraftChannelActivity.createIntent(context = this, memberIds = listOf(event.memberId)))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import androidx.activity.compose.setContent
import androidx.activity.viewModels
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.ui.Modifier
import io.getstream.chat.android.compose.sample.ui.MessagesActivity
import io.getstream.chat.android.compose.sample.ui.channel.ChannelActivity
import io.getstream.chat.android.compose.ui.theme.ChatTheme
import io.getstream.chat.android.compose.viewmodel.pinned.PinnedMessageListViewModel
import io.getstream.chat.android.compose.viewmodel.pinned.PinnedMessageListViewModelFactory
Expand Down Expand Up @@ -71,7 +71,7 @@ class PinnedMessagesActivity : ComponentActivity() {
}

private fun openMessage(message: Message) {
val intent = MessagesActivity.createIntent(
val intent = ChannelActivity.createIntent(
context = applicationContext,
channelId = message.cid,
messageId = message.id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,5 +127,7 @@
<string name="channel_attachments_media_loading_more_error">Failed to load more media attachments</string>
<string name="channel_attachments_files_loading_more_error">Failed to load more files attachments</string>

<!-- Channel -->
<string name="channel_open_info">Open channel info</string>

</resources>
Loading
Loading