nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Uses Lists name instead of d-tag on the Top Bar

Browse Source
This commit is contained in:
Vitor Pamplona
2023-09-30 11:45:46 -04:00
parent 7387d9060f
commit dffb49b071
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
+1 -1
View File
@@ -595,7 +595,7 @@ class ResourceName(val resourceId: Int, val context: Context) : Name() {
} }
class PeopleListName(val note: AddressableNote) : Name() { class PeopleListName(val note: AddressableNote) : Name() {
override fun name() = note.dTag() ?: "" override fun name() = (note.event as? PeopleListEvent)?.nameOrTitle() ?: note.dTag() ?: ""
} }
class CommunityName(val note: AddressableNote) : Name() { class CommunityName(val note: AddressableNote) : Name() {
override fun name() = "/n/${(note.dTag() ?: "")}" override fun name() = "/n/${(note.dTag() ?: "")}"
quartz/src/main/java/com/vitorpamplona/quartz/events/GeneralListEvent.kt
+4
View File
@@ -22,6 +22,10 @@ abstract class GeneralListEvent(
fun bookmarkedPosts() = taggedEvents() fun bookmarkedPosts() = taggedEvents()
fun bookmarkedPeople() = taggedUsers() fun bookmarkedPeople() = taggedUsers()
fun name() = tags.firstOrNull { it.size > 1 && it[0] == "name" }?.get(1)
fun title() = tags.firstOrNull { it.size > 1 && it[0] == "title" }?.get(1)
fun nameOrTitle() = name() ?: title()
fun plainContent(privKey: ByteArray): String? { fun plainContent(privKey: ByteArray): String? {
if (content.isBlank()) return null if (content.isBlank()) return null