cilly/Awoocord
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "fix(Zinnia): fix incorrect spacing in replies"

Browse source 
This reverts commit 9113ee5b24.

It completely broke replies, will have a proper fix later.
This commit is contained in:
Cilly Leang 2025-10-10 16:58:16 +11:00
parent 61037e405f
commit 4235f266a1
Signed by: cilly
GPG key ID: 6500251E087653C9
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
plugins/Zinnia/src/main/kotlin/moe/lava/awoocord/zinnia/Zinnia.kt
View file

@ -14,8 +14,6 @@ import com.aliucord.utils.DimenUtils.dp
import com.aliucord.utils.ViewUtils.findViewById import com.aliucord.utils.ViewUtils.findViewById
import com.aliucord.utils.accessField import com.aliucord.utils.accessField
import com.discord.databinding.WidgetChannelMembersListItemUserBinding import com.discord.databinding.WidgetChannelMembersListItemUserBinding
import com.discord.models.member.GuildMember
import com.discord.models.user.User
import com.discord.stores.StoreStream import com.discord.stores.StoreStream
import com.discord.widgets.channels.memberlist.adapter.ChannelMembersListAdapter import com.discord.widgets.channels.memberlist.adapter.ChannelMembersListAdapter
import com.discord.widgets.channels.memberlist.adapter.ChannelMembersListViewHolderMember import com.discord.widgets.channels.memberlist.adapter.ChannelMembersListViewHolderMember
@ -26,10 +24,6 @@ import kotlin.math.abs
private val ChannelMembersListViewHolderMember.binding private val ChannelMembersListViewHolderMember.binding
by accessField<WidgetChannelMembersListItemUserBinding>() by accessField<WidgetChannelMembersListItemUserBinding>()
private val WidgetChatListAdapterItemMessage.itemName
by accessField<TextView?>()
private val WidgetChatListAdapterItemMessage.replyName
by accessField<TextView?>()
data class Colours( data class Colours(
val fgP: Int, val fgP: Int,
@ -170,17 +164,20 @@ class Zinnia : Plugin() {
Int::class.javaPrimitiveType!!, Int::class.javaPrimitiveType!!,
ChatListEntry::class.java, ChatListEntry::class.java,
) { (_, _: Int, entry: MessageEntry) -> ) { (_, _: Int, entry: MessageEntry) ->
itemName?.let { configureOn(it, entry.author?.color) } val username = itemView.findViewById<TextView?>("chat_list_adapter_item_text_name")
?: return@after
configureOn(username, entry.author?.color)
} }
// Configures for reply preview username // Configures for reply preview username
patcher.after<WidgetChatListAdapterItemMessage>( patcher.after<WidgetChatListAdapterItemMessage>(
"configureReplyAuthor", "configureReplyPreview",
User::class.java,
GuildMember::class.java,
MessageEntry::class.java, MessageEntry::class.java,
) { (_, _: User, member: GuildMember) -> ) { (_, entry: MessageEntry) ->
replyName?.let { configureOn(it, member.color) } val referencedAuthor = entry.replyData?.messageEntry?.author
val replyUsername = itemView.findViewById<TextView?>("chat_list_adapter_item_text_decorator_reply_name")
?: return@after
configureOn(replyUsername, referencedAuthor?.color)
} }
} }
} }