Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: media gallery [WPB-4989] (#2490)
- Loading branch information
Showing
20 changed files
with
871 additions
and
98 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
app/src/main/kotlin/com/wire/android/mapper/UIAssetMapper.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2023 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| */ | ||
| package com.wire.android.mapper | ||
|
|
||
| import com.wire.android.R | ||
| import com.wire.android.ui.home.conversations.model.messagetypes.asset.UIAssetMessage | ||
| import com.wire.android.util.ui.UIText | ||
| import com.wire.kalium.logic.data.asset.AssetMessage | ||
| import javax.inject.Inject | ||
|
|
||
| class UIAssetMapper @Inject constructor() { | ||
|
|
||
| fun toUIAsset(assetMessage: AssetMessage): UIAssetMessage { | ||
| return UIAssetMessage( | ||
| assetId = assetMessage.assetId, | ||
| time = assetMessage.time, | ||
| username = assetMessage.username?.let { UIText.DynamicString(it) } | ||
| ?: UIText.StringResource(R.string.username_unavailable_label), | ||
| conversationId = assetMessage.conversationId, | ||
| messageId = assetMessage.messageId, | ||
| assetPath = assetMessage.assetPath, | ||
| downloadStatus = assetMessage.downloadStatus, | ||
| isSelfAsset = assetMessage.isSelfAsset | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
app/src/main/kotlin/com/wire/android/ui/home/conversations/details/SearchAndMediaRow.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2023 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| */ | ||
| package com.wire.android.ui.home.conversations.details | ||
|
|
||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import com.wire.android.ui.common.dimensions | ||
| import com.wire.android.ui.common.spacers.HorizontalSpace | ||
| import com.wire.android.ui.home.conversations.media.ConversationMediaButton | ||
| import com.wire.android.ui.home.conversations.search.messages.SearchConversationMessagesButton | ||
|
|
||
| @Composable | ||
| fun SearchAndMediaRow( | ||
| onSearchConversationMessagesClick: () -> Unit, | ||
| onConversationMediaClick: () -> Unit | ||
| ) { | ||
| Row(modifier = Modifier.padding(horizontal = dimensions().spacing16x)) { | ||
| SearchConversationMessagesButton( | ||
| modifier = Modifier.weight(1F), | ||
| onClick = onSearchConversationMessagesClick | ||
| ) | ||
| HorizontalSpace.x8() | ||
| ConversationMediaButton( | ||
| modifier = Modifier.weight(1F), | ||
| onClick = onConversationMediaClick | ||
| ) | ||
| } | ||
| } |
134 changes: 134 additions & 0 deletions
134
...kotlin/com/wire/android/ui/home/conversations/media/ConversationAssetMessagesViewModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2023 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| */ | ||
|
|
||
| package com.wire.android.ui.home.conversations.media | ||
|
|
||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.setValue | ||
| import androidx.lifecycle.SavedStateHandle | ||
| import androidx.lifecycle.viewModelScope | ||
| import com.wire.android.mapper.UIAssetMapper | ||
| import com.wire.android.navigation.SavedStateViewModel | ||
| import com.wire.android.ui.home.conversations.ConversationNavArgs | ||
| import com.wire.android.ui.navArgs | ||
| import com.wire.android.util.dispatchers.DispatcherProvider | ||
| import com.wire.kalium.logic.data.id.QualifiedID | ||
| import com.wire.kalium.logic.data.message.Message | ||
| import com.wire.kalium.logic.feature.asset.GetAssetMessagesForConversationUseCase | ||
| import com.wire.kalium.logic.feature.asset.GetMessageAssetUseCase | ||
| import com.wire.kalium.logic.feature.asset.MessageAssetResult | ||
| import dagger.hilt.android.lifecycle.HiltViewModel | ||
| import kotlinx.collections.immutable.toImmutableList | ||
| import kotlinx.coroutines.launch | ||
| import kotlinx.coroutines.withContext | ||
| import javax.inject.Inject | ||
|
|
||
| @HiltViewModel | ||
| @Suppress("LongParameterList", "TooManyFunctions") | ||
| class ConversationAssetMessagesViewModel @Inject constructor( | ||
| override val savedStateHandle: SavedStateHandle, | ||
| private val dispatchers: DispatcherProvider, | ||
| private val getAssets: GetAssetMessagesForConversationUseCase, | ||
| private val getPrivateAsset: GetMessageAssetUseCase, | ||
| private val assetMapper: UIAssetMapper, | ||
| ) : SavedStateViewModel(savedStateHandle) { | ||
|
|
||
| private val conversationNavArgs: ConversationNavArgs = savedStateHandle.navArgs() | ||
| val conversationId: QualifiedID = conversationNavArgs.conversationId | ||
|
|
||
| var viewState by mutableStateOf(ConversationAssetMessagesViewState()) | ||
| private set | ||
|
|
||
| private var continueLoading = true | ||
| private var isLoading = false | ||
| private var currentOffset: Int = 0 | ||
|
|
||
| init { | ||
| loadAssets() | ||
| } | ||
|
|
||
| fun continueLoading(shouldContinue: Boolean) { | ||
| if (shouldContinue) { | ||
| if (!continueLoading) { | ||
| continueLoading = true | ||
| loadAssets() | ||
| } | ||
| } else { | ||
| continueLoading = false | ||
| } | ||
| } | ||
|
|
||
| private fun loadAssets() = viewModelScope.launch { | ||
| if (isLoading) { | ||
| return@launch | ||
| } | ||
| isLoading = true | ||
| try { | ||
| while (continueLoading) { | ||
| val uiAssetList = withContext(dispatchers.io()) { | ||
| getAssets.invoke( | ||
| conversationId = conversationId, | ||
| limit = BATCH_SIZE, | ||
| offset = currentOffset | ||
| ).map(assetMapper::toUIAsset) | ||
| } | ||
|
|
||
| // imitate loading new asset batch | ||
| viewState = viewState.copy(messages = viewState.messages.plus(uiAssetList.map { | ||
| it.copy( | ||
| downloadStatus = if (it.assetPath == null && it.downloadStatus != Message.DownloadStatus.FAILED_DOWNLOAD) { | ||
| Message.DownloadStatus.DOWNLOAD_IN_PROGRESS | ||
| } else { | ||
| it.downloadStatus | ||
| } | ||
| ) | ||
| }).toImmutableList()) | ||
|
|
||
| if (uiAssetList.size >= BATCH_SIZE) { | ||
| val uiMessages = uiAssetList.map { uiAsset -> | ||
| if (uiAsset.assetPath == null) { | ||
| val assetPath = withContext(dispatchers.io()) { | ||
| when (val asset = getPrivateAsset.invoke(uiAsset.conversationId, uiAsset.messageId).await()) { | ||
| is MessageAssetResult.Failure -> null | ||
| is MessageAssetResult.Success -> asset.decodedAssetPath | ||
| } | ||
| } | ||
| uiAsset.copy(assetPath = assetPath) | ||
| } else { | ||
| uiAsset | ||
| } | ||
| } | ||
| currentOffset += BATCH_SIZE | ||
|
|
||
| viewState = viewState.copy( | ||
| messages = viewState.messages.dropLast(uiMessages.size).plus(uiMessages).toImmutableList(), | ||
| ) | ||
| } else { | ||
| continueLoading = false | ||
| } | ||
| } | ||
| } finally { | ||
| isLoading = false | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| const val BATCH_SIZE = 5 | ||
| } | ||
| } |
31 changes: 31 additions & 0 deletions
31
...kotlin/com/wire/android/ui/home/conversations/media/ConversationAssetMessagesViewState.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2023 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| * | ||
| * | ||
| */ | ||
|
|
||
| package com.wire.android.ui.home.conversations.media | ||
|
|
||
| import androidx.compose.runtime.Stable | ||
| import com.wire.android.ui.home.conversations.model.messagetypes.asset.UIAssetMessage | ||
| import kotlinx.collections.immutable.ImmutableList | ||
| import kotlinx.collections.immutable.persistentListOf | ||
|
|
||
| @Stable | ||
| data class ConversationAssetMessagesViewState( | ||
| val messages: ImmutableList<UIAssetMessage> = persistentListOf() | ||
| ) |
Oops, something went wrong.