highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-08-04 10:12:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/HEAD'

Browse Source
This commit is contained in:
Vitor Pamplona
2023-03-03 11:36:08 -05:00
parent f4d5785710 f52bf26520
commit 756d9b17f7
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
View File

@@ -636,6 +636,18 @@ fun NoteDropDownMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Unit,
expanded = popupExpanded, expanded = popupExpanded,
onDismissRequest = onDismiss onDismissRequest = onDismiss
) { ) {
if (note.author != accountViewModel.accountLiveData.value?.account?.userProfile() && !accountViewModel.accountLiveData.value?.account?.userProfile()
!!.isFollowing(note.author!!)) {
DropdownMenuItem(onClick = {
accountViewModel.follow(
note.author ?: return@DropdownMenuItem
); onDismiss()
}) {
Text(stringResource(R.string.follow))
}
Divider()
}
DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(accountViewModel.decrypt(note) ?: "")); onDismiss() }) { DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(accountViewModel.decrypt(note) ?: "")); onDismiss() }) {
Text(stringResource(R.string.copy_text)) Text(stringResource(R.string.copy_text))
} }

4
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
View File

@@ -113,7 +113,9 @@ class AccountViewModel(private val account: Account): ViewModel() {
account.prefer(source, target, preference) account.prefer(source, target, preference)
} }
fun follow(user: User) {
account.follow(user)
}
} }