-
Notifications
You must be signed in to change notification settings - Fork 29
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.
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
feat: add and remove conversation favorite [WPB-11639] #3653
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
7c645ae
feat: favorite folder management
Garzas 224253d
kalium update
Garzas ccd6ef4
Merge branch 'develop' into feat/favorite-folder-management
Garzas 7e2785c
feat: add and remove conversation favorite
Garzas 18431b5
Merge branch 'develop' into feat/favorite-folder-management
Garzas 30683c7
review fixes
Garzas 315c28d
kalium update
Garzas 3d797f4
detekt fix
Garzas File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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
26 changes: 26 additions & 0 deletions
26
...tlin/com/wire/android/ui/common/bottomsheet/folder/ChangeConversationFavoriteStateArgs.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,26 @@ | ||
/* | ||
* Wire | ||
* Copyright (C) 2024 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.common.bottomsheet.folder | ||
|
||
import com.wire.android.di.ScopedArgs | ||
import kotlinx.serialization.Serializable | ||
|
||
@Serializable | ||
object ChangeConversationFavoriteStateArgs : ScopedArgs { | ||
override val key = "ConnectionActionButtonArgsKey" | ||
} |
71 changes: 71 additions & 0 deletions
71
...main/kotlin/com/wire/android/ui/common/bottomsheet/folder/ChangeConversationFavoriteVM.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,71 @@ | ||
/* | ||
* Wire | ||
* Copyright (C) 2024 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.common.bottomsheet.folder | ||
|
||
import androidx.lifecycle.ViewModel | ||
import androidx.lifecycle.viewModelScope | ||
import com.wire.android.R | ||
import com.wire.android.di.ViewModelScopedPreview | ||
import com.wire.android.model.SnackBarMessage | ||
import com.wire.android.model.asSnackBarMessage | ||
import com.wire.android.ui.home.conversationslist.model.GroupDialogState | ||
import com.wire.android.util.ui.UIText | ||
import com.wire.kalium.logic.feature.conversation.folder.AddConversationToFavoritesUseCase | ||
import com.wire.kalium.logic.feature.conversation.folder.RemoveConversationFromFavoritesUseCase | ||
import dagger.hilt.android.lifecycle.HiltViewModel | ||
import kotlinx.coroutines.flow.MutableSharedFlow | ||
import kotlinx.coroutines.flow.SharedFlow | ||
import kotlinx.coroutines.flow.asSharedFlow | ||
import kotlinx.coroutines.launch | ||
import javax.inject.Inject | ||
|
||
@ViewModelScopedPreview | ||
interface ChangeConversationFavoriteVM { | ||
val infoMessage: SharedFlow<SnackBarMessage> | ||
get() = MutableSharedFlow() | ||
|
||
fun changeFavoriteState(dialogState: GroupDialogState, addToFavorite: Boolean) {} | ||
} | ||
|
||
@HiltViewModel | ||
class ChangeConversationFavoriteVMImpl @Inject constructor( | ||
private val addConversationToFavorites: AddConversationToFavoritesUseCase, | ||
private val removeConversationFromFavorites: RemoveConversationFromFavoritesUseCase, | ||
) : ChangeConversationFavoriteVM, ViewModel() { | ||
|
||
private val _infoMessage = MutableSharedFlow<SnackBarMessage>() | ||
override val infoMessage = _infoMessage.asSharedFlow() | ||
|
||
override fun changeFavoriteState(dialogState: GroupDialogState, addToFavorite: Boolean) { | ||
viewModelScope.launch { | ||
val messageResource = if (addToFavorite) { | ||
when (addConversationToFavorites(dialogState.conversationId)) { | ||
is AddConversationToFavoritesUseCase.Result.Failure -> R.string.error_adding_to_favorite | ||
AddConversationToFavoritesUseCase.Result.Success -> R.string.success_adding_to_favorite | ||
} | ||
} else { | ||
when (removeConversationFromFavorites(dialogState.conversationId)) { | ||
is RemoveConversationFromFavoritesUseCase.Result.Failure -> R.string.error_removing_from_favorite | ||
RemoveConversationFromFavoritesUseCase.Result.Success -> R.string.success_removing_from_favorite | ||
} | ||
} | ||
_infoMessage.emit(UIText.StringResource(messageResource, dialogState.conversationName).asSnackBarMessage()) | ||
} | ||
} | ||
} |
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
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
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggestion: move the
// TODO(profile): enable when implemented
line below this one so that it's right next to commented line// moveConversationToFolder: () -> Unit,