From acf944ebac7d23e13187b63dc506f96979ea38e9 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 14 May 2025 18:28:49 -0400 Subject: [PATCH] Avoids item drawing mishandling of multiple incognitos in the same chat screen --- .../com/vitorpamplona/amethyst/ui/StringResourceCache.kt | 3 +++ .../main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt | 5 +++-- .../java/com/vitorpamplona/quartz/nip01Core/core/Event.kt | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/StringResourceCache.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/StringResourceCache.kt index 367b48c9e..c1a25736f 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/StringResourceCache.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/StringResourceCache.kt @@ -125,6 +125,9 @@ fun stringRes( ) } +/** + * This cache can only be used if the painter is the only copy on the screen + */ @Composable fun painterRes( @DrawableRes id: Int, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt index 0efada898..abd01796a 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt @@ -49,6 +49,7 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import com.vitorpamplona.amethyst.R @@ -518,7 +519,7 @@ fun IncognitoIconOn( tint: Color, ) { Icon( - painter = painterRes(id = R.drawable.incognito), + painter = painterResource(id = R.drawable.incognito), contentDescription = stringRes(id = R.string.accessibility_turn_off_sealed_message), modifier = modifier, tint = tint, @@ -531,7 +532,7 @@ fun IncognitoIconOff( tint: Color, ) { Icon( - painter = painterRes(id = R.drawable.incognito_off), + painter = painterResource(id = R.drawable.incognito_off), contentDescription = stringRes(id = R.string.accessibility_turn_on_sealed_message), modifier = modifier, tint = tint, diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/core/Event.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/core/Event.kt index 8f26c7c98..feaf49559 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/core/Event.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/core/Event.kt @@ -39,6 +39,10 @@ open class Event( val content: String, val sig: HexKey, ) : IEvent { + /** + * Set this to true if the .content is encrypted or encoded in a + * way that it should not be indexed for local search. + */ open fun isContentEncoded() = false open fun countMemory(): Long =