From dffb49b071397d9f94e36b04e9250c6e6f426611 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Sat, 30 Sep 2023 11:45:46 -0400 Subject: [PATCH] Uses Lists name instead of d-tag on the Top Bar --- .../com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt | 2 +- .../java/com/vitorpamplona/quartz/events/GeneralListEvent.kt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt index 0681df466..0659d6a0b 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt @@ -595,7 +595,7 @@ class ResourceName(val resourceId: Int, val context: Context) : 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() { override fun name() = "/n/${(note.dTag() ?: "")}" diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/GeneralListEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/GeneralListEvent.kt index e52094c66..422e27bf6 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/events/GeneralListEvent.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/GeneralListEvent.kt @@ -22,6 +22,10 @@ abstract class GeneralListEvent( fun bookmarkedPosts() = taggedEvents() 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? { if (content.isBlank()) return null