Caches app icons as painters

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/StringResourceCache.kt

@@ -22,10 +22,14 @@ package com.vitorpamplona.amethyst.ui
 
 import android.content.Context
 import android.util.LruCache
+import androidx.annotation.DrawableRes
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.compose.LifecycleResumeEffect
+import com.vitorpamplona.amethyst.logTime
 
 /**
  * Cache for stringResource because it seems to be > 1ms function in some phones
@@ -33,6 +37,9 @@ import androidx.lifecycle.compose.LifecycleResumeEffect
 private val resourceCache = LruCache<Int, String>(300)
 private var resourceCacheLanguage: String? = null
 
+// Caches most common icons in the app to avoid using disk
+private val iconCache = LruCache<Int, Painter>(30)
+
 fun checkLanguage(currentLanguage: String) {
     if (resourceCacheLanguage == null) {
         resourceCacheLanguage = currentLanguage
@@ -118,3 +125,22 @@ fun stringRes(
             *args,
         )
 }
+
+@Composable
+fun painterRes(
+    @DrawableRes id: Int,
+): Painter {
+    val cached = iconCache.get(id)
+    if (cached != null) {
+        return cached
+    }
+
+    val loaded =
+        logTime("loading icon") {
+            painterResource(id)
+        }
+
+    iconCache.put(id, loaded)
+
+    return loaded
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostView.kt

@@ -71,7 +71,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.TextDirection
@@ -93,6 +92,7 @@ import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.note.creators.invoice.InvoiceRequest
 import com.vitorpamplona.amethyst.ui.note.creators.uploads.ImageVideoDescription
 import com.vitorpamplona.amethyst.ui.note.creators.userSuggestions.ShowUserSuggestionList
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.CloseButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.PostButton
@@ -169,7 +169,7 @@ fun EditPostView(
                                     onClick = { showRelaysDialog = true },
                                 ) {
                                     Icon(
-                                        painter = painterResource(R.drawable.relays),
+                                        painter = painterRes(R.drawable.relays),
                                         contentDescription = stringRes(id = R.string.relay_list_selector),
                                         modifier = Modifier.height(25.dp),
                                         tint = MaterialTheme.colorScheme.onBackground,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt

@@ -56,7 +56,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -69,6 +68,7 @@ import com.vitorpamplona.amethyst.ui.actions.uploads.ShowImageUploadGallery
 import com.vitorpamplona.amethyst.ui.components.SetDialogToEdgeToEdge
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.note.creators.contentWarning.SettingSwitchItem
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.CloseButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.PostButton
@@ -130,7 +130,7 @@ fun NewMediaView(
                                     onClick = { showRelaysDialog = true },
                                 ) {
                                     Icon(
-                                        painter = painterResource(R.drawable.relays),
+                                        painter = painterRes(R.drawable.relays),
                                         contentDescription = stringRes(id = R.string.relay_list_selector),
                                         modifier = Modifier.height(25.dp),
                                         tint = MaterialTheme.colorScheme.onBackground,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/toasts/multiline/ErrorList.kt

@@ -39,7 +39,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.vitorpamplona.amethyst.R
@@ -49,6 +48,7 @@ import com.vitorpamplona.amethyst.ui.navigation.EmptyNav
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.navigation.routeToMessage
 import com.vitorpamplona.amethyst.ui.note.UserPicture
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.mockAccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
@@ -140,7 +140,7 @@ fun ErrorRow(
                         } ?: stringRes(R.string.error_dialog_talk_to_user)
 
                     Icon(
-                        painter = painterResource(R.drawable.ic_dm),
+                        painter = painterRes(R.drawable.ic_dm),
                         contentDescription = descriptor,
                         modifier = Size20Modifier,
                         tint = MaterialTheme.colorScheme.primary,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/layouts/ChatHeaderLayout.kt

@@ -36,11 +36,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.note.elements.TimeAgo
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.rooms.NewItemsBubble
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
@@ -56,7 +56,7 @@ fun ChannelNamePreview() {
         ChatHeaderLayout(
             channelPicture = {
                 Image(
-                    painter = painterResource(R.drawable.github),
+                    painter = painterRes(R.drawable.github),
                     contentDescription = stringRes(id = R.string.profile_banner),
                     contentScale = ContentScale.FillWidth,
                 )
@@ -89,7 +89,7 @@ fun ChannelNamePreview() {
             },
             leadingContent = {
                 Image(
-                    painter = painterResource(R.drawable.github),
+                    painter = painterRes(R.drawable.github),
                     contentDescription = stringRes(id = R.string.profile_banner),
                     contentScale = ContentScale.FillWidth,
                     modifier = Size55Modifier,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/layouts/LeftPictureLayout.kt

@@ -36,7 +36,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
@@ -45,6 +44,7 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.note.LikeIcon
 import com.vitorpamplona.amethyst.ui.note.TextCount
 import com.vitorpamplona.amethyst.ui.note.ZappedIcon
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
@@ -65,7 +65,7 @@ fun LeftPictureLayoutPreviewCard() {
     LeftPictureLayout(
         onImage = {
             Image(
-                painter = painterResource(R.drawable.github),
+                painter = painterRes(R.drawable.github),
                 contentDescription = stringRes(id = R.string.profile_banner),
                 contentScale = ContentScale.FillWidth,
                 modifier = Modifier.fillMaxSize().clip(QuoteBorder),

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt

@@ -48,10 +48,10 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalView
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
@@ -185,7 +185,7 @@ private fun NotifiableIcon(
 ) {
     Box(route.notifSize) {
         Icon(
-            painter = painterResource(id = route.icon),
+            painter = painterRes(id = route.icon),
             contentDescription = stringRes(route.contentDescriptor),
             modifier = route.iconSize,
             tint = if (selected) MaterialTheme.colorScheme.primary else Color.Unspecified,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt

@@ -76,7 +76,6 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.LinkAnnotation
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.TextLinkStyles
@@ -102,6 +101,7 @@ import com.vitorpamplona.amethyst.ui.actions.mediaServers.MediaServersListView
 import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.RobohashFallbackAsyncImage
 import com.vitorpamplona.amethyst.ui.note.LoadStatuses
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.keyBackup.AccountBackupDialog
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.qrcode.ShowQRDialog
@@ -226,7 +226,7 @@ fun ProfileContentTemplate(
             )
         } else {
             Image(
-                painter = painterResource(R.drawable.profile_banner),
+                painter = painterRes(R.drawable.profile_banner),
                 contentDescription = stringRes(R.string.profile_banner),
                 contentScale = ContentScale.FillWidth,
                 modifier = bannerModifier,
@@ -615,7 +615,7 @@ fun IconRow(
             verticalAlignment = Alignment.CenterVertically,
         ) {
             Icon(
-                painter = painterResource(icon),
+                painter = painterRes(icon),
                 contentDescription = stringRes(title),
                 modifier = Size22Modifier,
                 tint = tint,
@@ -683,7 +683,7 @@ fun IconRowRelays(
             verticalAlignment = Alignment.CenterVertically,
         ) {
             Icon(
-                painter = painterResource(R.drawable.relays),
+                painter = painterRes(R.drawable.relays),
                 null,
                 modifier = Modifier.size(22.dp),
                 tint = MaterialTheme.colorScheme.onSurface,
@@ -761,7 +761,7 @@ fun BottomContent(
                 },
             ) {
                 Icon(
-                    painter = painterResource(R.drawable.ic_qrcode),
+                    painter = painterRes(R.drawable.ic_qrcode),
                     contentDescription = stringRes(id = R.string.show_npub_as_a_qr_code),
                     modifier = Modifier.size(24.dp),
                     tint = MaterialTheme.colorScheme.primary,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ErrorMessageDialog.kt

@@ -39,10 +39,10 @@ import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.Size16dp
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
@@ -81,7 +81,7 @@ fun ErrorMessageDialog(
                 onClickStartMessage?.let {
                     TextButton(onClick = onClickStartMessage) {
                         Icon(
-                            painter = painterResource(R.drawable.ic_dm),
+                            painter = painterRes(R.drawable.ic_dm),
                             contentDescription = null,
                         )
                         Spacer(StdHorzSpacer)

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt

@@ -49,7 +49,6 @@ 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
@@ -64,6 +63,7 @@ import com.vitorpamplona.amethyst.commons.icons.Repost
 import com.vitorpamplona.amethyst.commons.icons.Reposted
 import com.vitorpamplona.amethyst.commons.icons.Search
 import com.vitorpamplona.amethyst.commons.icons.Zap
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import com.vitorpamplona.amethyst.ui.theme.Size19Modifier
@@ -110,7 +110,7 @@ fun ArrowBackIcon(tint: Color = MaterialTheme.colorScheme.grayText) {
 @Composable
 fun MessageIcon(modifier: Modifier) {
     Icon(
-        painter = painterResource(R.drawable.ic_dm),
+        painter = painterRes(R.drawable.ic_dm),
         null,
         modifier = modifier,
         tint = MaterialTheme.colorScheme.primary,
@@ -133,7 +133,7 @@ fun DownloadForOfflineIcon(
 @Composable
 fun HashCheckIcon(iconSize: Dp) {
     Icon(
-        painter = painterResource(R.drawable.original),
+        painter = painterRes(R.drawable.original),
         contentDescription = stringRes(id = R.string.hash_verification_passed),
         modifier = remember(iconSize) { Modifier.size(iconSize) },
         tint = Color.Unspecified,
@@ -363,7 +363,7 @@ fun CommentIcon(
 @Composable
 fun PollIcon() {
     Icon(
-        painter = painterResource(R.drawable.ic_poll),
+        painter = painterRes(R.drawable.ic_poll),
         contentDescription = stringRes(id = R.string.poll),
         modifier = Size20Modifier,
         tint = MaterialTheme.colorScheme.onBackground,
@@ -373,7 +373,7 @@ fun PollIcon() {
 @Composable
 fun RegularPostIcon() {
     Icon(
-        painter = painterResource(R.drawable.ic_lists),
+        painter = painterRes(R.drawable.ic_lists),
         contentDescription = stringRes(id = R.string.disable_poll),
         modifier = Size20Modifier,
         tint = MaterialTheme.colorScheme.onBackground,
@@ -495,7 +495,7 @@ fun NIP05CheckingIcon(modifier: Modifier) {
 @Composable
 fun NIP05VerifiedIcon(modifier: Modifier) {
     Icon(
-        painter = painterResource(R.drawable.nip_05),
+        painter = painterRes(R.drawable.nip_05),
         contentDescription = stringRes(id = R.string.nip05_verified),
         modifier = modifier,
         tint = Color.Unspecified,
@@ -518,7 +518,7 @@ fun IncognitoIconOn(
     tint: Color,
 ) {
     Icon(
-        painter = painterResource(id = R.drawable.incognito),
+        painter = painterRes(id = R.drawable.incognito),
         contentDescription = stringRes(id = R.string.accessibility_turn_off_sealed_message),
         modifier = modifier,
         tint = tint,
@@ -531,7 +531,7 @@ fun IncognitoIconOff(
     tint: Color,
 ) {
     Icon(
-        painter = painterResource(id = R.drawable.incognito_off),
+        painter = painterRes(id = R.drawable.incognito_off),
         contentDescription = stringRes(id = R.string.accessibility_turn_on_sealed_message),
         modifier = modifier,
         tint = tint,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt

@@ -71,7 +71,6 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextAlign
@@ -86,6 +85,7 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.navigation.EmptyNav
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.navigation.Route
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.report.ReportNoteDialog
 import com.vitorpamplona.amethyst.ui.stringRes
@@ -539,7 +539,7 @@ fun QuickActionAlertDialog(
         textContent = textContent,
         icon = {
             Icon(
-                painter = painterResource(buttonIconResource),
+                painter = painterRes(buttonIconResource),
                 contentDescription = null,
             )
         },
@@ -636,7 +636,7 @@ fun QuickActionAlertDialogOneButton(
         textContent = textContent,
         icon = {
             Icon(
-                painter = painterResource(buttonIconResource),
+                painter = painterRes(buttonIconResource),
                 contentDescription = null,
             )
         },

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt

@@ -71,7 +71,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.KeyboardType
@@ -87,6 +86,7 @@ import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.CloseButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SaveButton
@@ -460,7 +460,7 @@ fun UpdateZapAmountContent(
                 },
             ) {
                 Icon(
-                    painter = painterResource(R.drawable.alby),
+                    painter = painterRes(R.drawable.alby),
                     contentDescription = stringRes(id = R.string.accessibility_navigate_to_alby),
                     modifier = Modifier.size(24.dp),
                     tint = Color.Unspecified,
@@ -482,7 +482,7 @@ fun UpdateZapAmountContent(
 
             IconButton(onClick = { qrScanning = true }) {
                 Icon(
-                    painter = painterResource(R.drawable.ic_qrcode),
+                    painter = painterRes(R.drawable.ic_qrcode),
                     contentDescription = stringRes(id = R.string.accessibility_scan_qr_code),
                     modifier = Modifier.size(24.dp),
                     tint = MaterialTheme.colorScheme.primary,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/zappolls/PollField.kt

@@ -29,11 +29,11 @@ import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.ui.actions.NewPollOption
 import com.vitorpamplona.amethyst.ui.actions.NewPollVoteValueRange
 import com.vitorpamplona.amethyst.ui.actions.NewPostViewModel
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.theme.Size18Modifier
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 
@@ -65,7 +65,7 @@ fun PollField(postViewModel: NewPostViewModel) {
                 ),
         ) {
             Image(
-                painterResource(id = android.R.drawable.ic_input_add),
+                painterRes(id = android.R.drawable.ic_input_add),
                 contentDescription = "Add poll option button",
                 modifier = Size18Modifier,
             )

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DefaultImageHeader.kt

@@ -29,7 +29,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
@@ -38,6 +37,7 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.user.observeUserBanner
 import com.vitorpamplona.amethyst.ui.note.BaseUserPicture
 import com.vitorpamplona.amethyst.ui.note.WatchAuthor
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.Size55dp
@@ -84,11 +84,11 @@ fun BannerImage(
                 ),
             contentScale = ContentScale.Crop,
             modifier = modifier,
-            placeholder = painterResource(R.drawable.profile_banner),
+            placeholder = painterRes(R.drawable.profile_banner),
         )
     } else {
         Image(
-            painter = painterResource(R.drawable.profile_banner),
+            painter = painterRes(R.drawable.profile_banner),
             contentDescription = stringRes(R.string.profile_banner),
             contentScale = ContentScale.Crop,
             modifier = modifier,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/AppDefinition.kt

@@ -49,7 +49,6 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
@@ -64,6 +63,7 @@ import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.components.ZoomableImageDialog
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.note.LinkIcon
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.Size16Modifier
@@ -122,7 +122,7 @@ fun RenderAppDefinition(
                 }
             } else {
                 Image(
-                    painter = painterResource(R.drawable.profile_banner),
+                    painter = painterRes(R.drawable.profile_banner),
                     contentDescription = stringRes(id = R.string.profile_banner),
                     contentScale = ContentScale.FillWidth,
                     modifier =

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NewPostScreen.kt

@@ -70,7 +70,6 @@ import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.TextAlign
@@ -117,6 +116,7 @@ import com.vitorpamplona.amethyst.ui.note.creators.zapraiser.AddZapraiserButton
 import com.vitorpamplona.amethyst.ui.note.creators.zapraiser.ZapRaiserRequest
 import com.vitorpamplona.amethyst.ui.note.creators.zapsplits.ForwardZapTo
 import com.vitorpamplona.amethyst.ui.note.creators.zapsplits.ForwardZapToButton
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.SettingsRow
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
@@ -234,7 +234,7 @@ fun NewPostScreen(
                                 onClick = { showRelaysDialog = true },
                             ) {
                                 Icon(
-                                    painter = painterResource(R.drawable.relays),
+                                    painter = painterRes(R.drawable.relays),
                                     contentDescription = stringRes(id = R.string.relay_list_selector),
                                     modifier = Modifier.height(25.dp),
                                     tint = MaterialTheme.colorScheme.onBackground,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/IncognitoBadge.kt

@@ -24,9 +24,9 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.painterResource
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.incognitoIconModifier
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
@@ -37,7 +37,7 @@ import com.vitorpamplona.quartz.nip17Dm.base.NIP17Group
 fun IncognitoBadge(baseNote: Note) {
     if (baseNote.event is NIP17Group) {
         Icon(
-            painter = painterResource(id = R.drawable.incognito),
+            painter = painterRes(id = R.drawable.incognito),
             null,
             modifier = incognitoIconModifier,
             tint = MaterialTheme.colorScheme.placeholderText,
@@ -45,7 +45,7 @@ fun IncognitoBadge(baseNote: Note) {
         Spacer(modifier = StdHorzSpacer)
     } else if (baseNote.event is PrivateDmEvent) {
         Icon(
-            painter = painterResource(id = R.drawable.incognito_off),
+            painter = painterRes(id = R.drawable.incognito_off),
             null,
             modifier = incognitoIconModifier,
             tint = MaterialTheme.colorScheme.placeholderText,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/NewCommunityNoteButton.kt

@@ -28,13 +28,13 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.components.LoadNote
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.navigation.Route
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.Size55Modifier
@@ -69,7 +69,7 @@ fun NewCommunityNoteButton(
         containerColor = MaterialTheme.colorScheme.primary,
     ) {
         Icon(
-            painter = painterResource(R.drawable.ic_compose),
+            painter = painterRes(R.drawable.ic_compose),
             contentDescription = stringRes(id = R.string.new_community_note),
             modifier = Modifier.size(26.dp),
             tint = Color.White,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/marketplace/NewProductScreen.kt

@@ -58,7 +58,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -92,6 +91,7 @@ import com.vitorpamplona.amethyst.ui.note.creators.zapraiser.AddZapraiserButton
 import com.vitorpamplona.amethyst.ui.note.creators.zapraiser.ZapRaiserRequest
 import com.vitorpamplona.amethyst.ui.note.creators.zapsplits.ForwardZapTo
 import com.vitorpamplona.amethyst.ui.note.creators.zapsplits.ForwardZapToButton
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.CloseButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.PostButton
@@ -182,7 +182,7 @@ fun NewProductScreen(
                                 onClick = { showRelaysDialog = true },
                             ) {
                                 Icon(
-                                    painter = painterResource(R.drawable.relays),
+                                    painter = painterRes(R.drawable.relays),
                                     contentDescription = stringRes(id = R.string.relay_list_selector),
                                     modifier = Modifier.height(25.dp),
                                     tint = MaterialTheme.colorScheme.onBackground,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/NewNoteButton.kt

@@ -28,11 +28,11 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.navigation.Route
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.Size55Modifier
 
@@ -50,7 +50,7 @@ fun NewNoteButton(
         containerColor = MaterialTheme.colorScheme.primary,
     ) {
         Icon(
-            painter = painterResource(R.drawable.ic_compose),
+            painter = painterRes(R.drawable.ic_compose),
             contentDescription = stringRes(R.string.new_post),
             modifier = Modifier.size(26.dp),
             tint = Color.White,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/keyBackup/AccountBackupDialog.kt

@@ -72,7 +72,6 @@ import androidx.compose.ui.platform.LocalAutofill
 import androidx.compose.ui.platform.LocalAutofillTree
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
@@ -94,6 +93,7 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.ui.note.ArrowBackIcon
 import com.vitorpamplona.amethyst.ui.note.authenticate
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.mockAccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.qrcode.BackButton
@@ -503,7 +503,7 @@ private fun QrCodeButtonBase(
         },
     ) {
         Icon(
-            painter = painterResource(R.drawable.ic_qrcode),
+            painter = painterRes(R.drawable.ic_qrcode),
             contentDescription = stringRes(id = contentDescription),
             modifier = Modifier.size(24.dp),
             tint = if (isEnabled) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.grayText,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/header/DrawAdditionalInfo.kt

@@ -41,7 +41,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
@@ -55,6 +54,7 @@ import com.vitorpamplona.amethyst.ui.components.DisplayNip05ProfileStatus
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.note.DrawPlayName
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.profile.header.apps.DisplayAppRecommendations
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.profile.header.apps.UserAppRecommendationsFeedViewModel
@@ -146,7 +146,7 @@ fun DrawAdditionalInfo(
             onClick = { dialogOpen = true },
         ) {
             Icon(
-                painter = painterResource(R.drawable.ic_qrcode),
+                painter = painterRes(R.drawable.ic_qrcode),
                 contentDescription = stringRes(id = R.string.show_npub_as_a_qr_code),
                 modifier = Size15Modifier,
                 tint = MaterialTheme.colorScheme.placeholderText,
@@ -196,7 +196,7 @@ fun DrawAdditionalInfo(
             Row(verticalAlignment = Alignment.CenterVertically) {
                 Icon(
                     tint = Color.Unspecified,
-                    painter = painterResource(id = getIdentityClaimIcon(identity)),
+                    painter = painterRes(id = getIdentityClaimIcon(identity)),
                     contentDescription = stringRes(getIdentityClaimDescription(identity)),
                     modifier = Modifier.size(16.dp),
                 )

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/header/DrawBanner.kt

@@ -33,7 +33,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalClipboardManager
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
@@ -42,6 +41,7 @@ import com.vitorpamplona.amethyst.commons.richtext.RichTextParser
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.user.observeUserBanner
 import com.vitorpamplona.amethyst.ui.components.ZoomableImageDialog
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 
@@ -70,7 +70,7 @@ fun DrawBanner(
             model = banner,
             contentDescription = stringRes(id = R.string.profile_image),
             contentScale = ContentScale.FillWidth,
-            placeholder = painterResource(R.drawable.profile_banner),
+            placeholder = painterRes(R.drawable.profile_banner),
             modifier =
                 Modifier
                     .fillMaxWidth()
@@ -90,7 +90,7 @@ fun DrawBanner(
         }
     } else {
         Image(
-            painter = painterResource(R.drawable.profile_banner),
+            painter = painterRes(R.drawable.profile_banner),
             contentDescription = stringRes(id = R.string.profile_banner),
             contentScale = ContentScale.FillWidth,
             modifier =

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/header/MessageButton.kt

@@ -27,12 +27,12 @@ import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.navigation.Route
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
@@ -59,7 +59,7 @@ fun MessageButton(
         contentPadding = ZeroPadding,
     ) {
         Icon(
-            painter = painterResource(R.drawable.ic_dm),
+            painter = painterRes(R.drawable.ic_dm),
             stringRes(R.string.send_a_direct_message),
             modifier = Size20Modifier,
         )

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/kind3/Kind3RelayListView.kt

@@ -60,7 +60,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
@@ -76,6 +75,7 @@ import com.vitorpamplona.amethyst.ui.actions.RelayInfoDialog
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.navigation.rememberExtendedNav
 import com.vitorpamplona.amethyst.ui.note.RenderRelayIcon
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.RelayInformationDialog
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.recommendations.Kind3RelayProposalSetupInfo
@@ -555,7 +555,7 @@ private fun ActiveToggles(
         onClick = { onToggleFollows(item) },
     ) {
         Icon(
-            painterResource(R.drawable.ic_home),
+            painterRes(R.drawable.ic_home),
             stringRes(R.string.home_feed),
             modifier =
                 Modifier
@@ -589,7 +589,7 @@ private fun ActiveToggles(
         onClick = { onTogglePrivateDMs(item) },
     ) {
         Icon(
-            painterResource(R.drawable.ic_dm),
+            painterRes(R.drawable.ic_dm),
             stringRes(R.string.private_message_feed),
             modifier =
                 Modifier

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/ThreadFeedView.kt

@@ -59,7 +59,6 @@ import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardCapitalization
@@ -147,6 +146,7 @@ import com.vitorpamplona.amethyst.ui.note.types.RenderTextModificationEvent
 import com.vitorpamplona.amethyst.ui.note.types.RenderTorrent
 import com.vitorpamplona.amethyst.ui.note.types.RenderTorrentComment
 import com.vitorpamplona.amethyst.ui.note.types.VideoDisplay
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.RenderFeedState
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.publicChannels.ChannelHeader
@@ -845,7 +845,7 @@ private fun RenderClassifiedsReaderForThread(
                 verticalAlignment = Alignment.CenterVertically,
             ) {
                 Icon(
-                    painter = painterResource(R.drawable.ic_dm),
+                    painter = painterRes(R.drawable.ic_dm),
                     stringRes(R.string.send_a_direct_message),
                     modifier = Modifier.size(20.dp),
                     tint = MaterialTheme.colorScheme.primary,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/NewImageButton.kt

@@ -45,7 +45,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
@@ -55,6 +54,7 @@ import com.vitorpamplona.amethyst.ui.actions.uploads.GallerySelect
 import com.vitorpamplona.amethyst.ui.actions.uploads.SelectedMedia
 import com.vitorpamplona.amethyst.ui.actions.uploads.TakePicture
 import com.vitorpamplona.amethyst.ui.navigation.INav
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.Size55Modifier
@@ -189,7 +189,7 @@ fun NewImageButton(
                 exit = fadeOut(),
             ) {
                 Icon(
-                    painter = painterResource(R.drawable.ic_compose),
+                    painter = painterRes(R.drawable.ic_compose),
                     contentDescription = stringRes(id = R.string.new_short),
                     modifier = Modifier.size(26.dp),
                     tint = Color.White,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt

@@ -76,7 +76,6 @@ import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalAutofill
 import androidx.compose.ui.platform.LocalAutofillTree
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
@@ -94,6 +93,7 @@ import com.vitorpamplona.amethyst.service.PackageUtils
 import com.vitorpamplona.amethyst.ui.MainActivity
 import com.vitorpamplona.amethyst.ui.components.LoadingAnimation
 import com.vitorpamplona.amethyst.ui.components.getActivity
+import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.qrcode.SimpleQrCodeScanner
 import com.vitorpamplona.amethyst.ui.stringRes
@@ -592,7 +592,7 @@ fun KeyTextField(
             }
             IconButton(onClick = { dialogOpen = true }) {
                 Icon(
-                    painter = painterResource(R.drawable.ic_qrcode),
+                    painter = painterRes(R.drawable.ic_qrcode),
                     contentDescription =
                         stringRes(
                             R.string.login_with_qr_code,