refactor: drop dead purple constants and fix FAB glyph contrast

Two cleanup passes on the mobile theme: - Remove definition-only colour constants from Color.kt that had no references anywhere (the Primary50..80 purple ramp, DEFAULT_PRIMARY, LIGHT_PURPLE, Purple700, FollowsFollow, NIP05Verified, the base Nip05EmailColor, DarkerGreen and LighterRedColor). - Point the "new item" FloatingActionButton glyphs at onPrimary instead of a hardcoded Color.White. With a light accent in the dark theme the container is a pale pastel, so a white glyph was low-contrast; onPrimary resolves to the correct high-contrast on-colour in both themes. Only FAB glyphs on a primary container were changed; white icons on dark overlays were left as-is. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01D1F9jXNwRGTP8qmsV3Wd69
2026-08-10 16:33:27 +00:00 · 2026-07-16 21:08:28 +00:00
parent abdb3be021
commit e61b3fbebd
25 changed files with 41 additions and 80 deletions
@@ -24,7 +24,6 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
 import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
@@ -46,7 +45,7 @@ fun NewArticleButton(nav: INav) {
            symbol = MaterialSymbols.Add,
            contentDescription = stringRes(id = R.string.new_long_form_post),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -29,7 +29,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.graphics.Color
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.painterRes
@@ -63,7 +62,7 @@ fun NewBadgeButton(accountViewModel: AccountViewModel) {
            painter = painterRes(R.drawable.ic_compose, 5),
            contentDescription = stringRes(id = R.string.new_badge),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -37,7 +37,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
@@ -74,7 +73,7 @@ fun NewCalendarButton(nav: INav) {
                        // string is ambiguous out of context.
                        contentDescription = stringRes(R.string.calendar_fab_new_collection),
                        modifier = Size26Modifier,
-                        tint = Color.White,
+                        tint = MaterialTheme.colorScheme.onPrimary,
                    )
                }

@@ -93,7 +92,7 @@ fun NewCalendarButton(nav: INav) {
                        symbol = MaterialSymbols.Add,
                        contentDescription = stringRes(R.string.calendar_fab_new_event),
                        modifier = Size26Modifier,
-                        tint = Color.White,
+                        tint = MaterialTheme.colorScheme.onPrimary,
                    )
                }

@@ -116,7 +115,7 @@ fun NewCalendarButton(nav: INav) {
                    symbol = MaterialSymbols.Close,
                    contentDescription = stringRes(R.string.calendar_fab_toggle),
                    modifier = Size26Modifier,
-                    tint = Color.White,
+                    tint = MaterialTheme.colorScheme.onPrimary,
                )
            }

@@ -130,7 +129,7 @@ fun NewCalendarButton(nav: INav) {
                    // Top FAB toggles the sub-FABs in/out — describe that, not the sub-action.
                    contentDescription = stringRes(R.string.calendar_fab_toggle),
                    modifier = Size26Modifier,
-                    tint = Color.White,
+                    tint = MaterialTheme.colorScheme.onPrimary,
                )
            }
        }
@@ -26,7 +26,6 @@ import androidx.compose.material3.FloatingActionButton
 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.unit.dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
@@ -54,7 +53,7 @@ fun ChannelFabColumn(nav: INav) {
            symbol = MaterialSymbols.Add,
            contentDescription = stringRes(R.string.messages_create_public_private_chat_description),
            modifier = Modifier.size(26.dp),
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -24,7 +24,6 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
 import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
@@ -48,7 +47,7 @@ fun NewChessGameButton(onClick: () -> Unit) {
            symbol = MaterialSymbols.Add,
            contentDescription = stringRes(R.string.new_chess_game),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -25,7 +25,6 @@ import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.components.LoadNote
@@ -70,7 +69,7 @@ fun NewCommunityNoteButton(
            painter = painterRes(R.drawable.ic_compose, 2),
            contentDescription = stringRes(id = R.string.new_community_note),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -24,7 +24,6 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
 import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
@@ -46,7 +45,7 @@ fun NewCommunityButton(nav: INav) {
            symbol = MaterialSymbols.Add,
            contentDescription = stringRes(id = R.string.new_community),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -48,7 +48,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.vitorpamplona.amethyst.R
@@ -370,7 +369,7 @@ fun NewProductButton(
            symbol = MaterialSymbols.Add,
            contentDescription = stringRes(id = R.string.new_product),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -392,7 +391,7 @@ fun NewLongFormMarkdownButton(
            symbol = MaterialSymbols.Add,
            contentDescription = stringRes(id = R.string.new_long_form_post),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -25,7 +25,6 @@ import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.navigation.routes.Route
@@ -53,7 +52,7 @@ fun NewGeoPostButton(
            painter = painterRes(R.drawable.ic_compose, 1),
            contentDescription = stringRes(id = R.string.new_community_note),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -25,7 +25,6 @@ import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.navigation.routes.Route
@@ -53,7 +52,7 @@ fun NewHashtagPostButton(
            painter = painterRes(R.drawable.ic_compose, 3),
            contentDescription = stringRes(id = R.string.new_community_note),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -29,7 +29,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
@@ -66,7 +65,7 @@ fun NewNoteButton(nav: INav) {
            painter = painterRes(R.drawable.ic_compose, 4),
            contentDescription = stringRes(R.string.new_post),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -40,7 +40,6 @@ import androidx.compose.runtime.remember
 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.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
@@ -130,7 +129,7 @@ fun NewLongVideoButton(
                        symbol = MaterialSymbols.Videocam,
                        contentDescription = stringRes(id = R.string.record_a_video),
                        modifier = Modifier.size(26.dp),
-                        tint = Color.White,
+                        tint = MaterialTheme.colorScheme.onPrimary,
                    )
                }

@@ -149,7 +148,7 @@ fun NewLongVideoButton(
                        symbol = MaterialSymbols.AddPhotoAlternate,
                        contentDescription = stringRes(id = R.string.upload_image),
                        modifier = Modifier.size(26.dp),
-                        tint = Color.White,
+                        tint = MaterialTheme.colorScheme.onPrimary,
                    )
                }

@@ -172,7 +171,7 @@ fun NewLongVideoButton(
                    symbol = MaterialSymbols.Close,
                    contentDescription = stringRes(id = R.string.new_long_video),
                    modifier = Size26Modifier,
-                    tint = Color.White,
+                    tint = MaterialTheme.colorScheme.onPrimary,
                )
            }

@@ -185,7 +184,7 @@ fun NewLongVideoButton(
                    painter = painterRes(R.drawable.ic_compose, 5),
                    contentDescription = stringRes(id = R.string.new_long_video),
                    modifier = Size26Modifier,
-                    tint = Color.White,
+                    tint = MaterialTheme.colorScheme.onPrimary,
                )
            }
        }
@@ -24,7 +24,6 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
@@ -52,7 +51,7 @@ fun NewMusicPlaylistFab(nav: INav) {
            symbol = MaterialSymbols.AutoMirrored.PlaylistAdd,
            contentDescription = stringRes(R.string.new_music_playlist),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -24,7 +24,6 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
@@ -54,7 +53,7 @@ fun NewMusicTrackButton(
            symbol = MaterialSymbols.MusicNote,
            contentDescription = stringRes(R.string.new_music_track),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -40,7 +40,6 @@ import androidx.compose.runtime.remember
 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.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
@@ -130,7 +129,7 @@ fun NewPictureButton(
                        symbol = MaterialSymbols.CameraAlt,
                        contentDescription = stringRes(id = R.string.take_a_picture),
                        modifier = Modifier.size(26.dp),
-                        tint = Color.White,
+                        tint = MaterialTheme.colorScheme.onPrimary,
                    )
                }

@@ -149,7 +148,7 @@ fun NewPictureButton(
                        symbol = MaterialSymbols.AddPhotoAlternate,
                        contentDescription = stringRes(id = R.string.upload_image),
                        modifier = Modifier.size(26.dp),
-                        tint = Color.White,
+                        tint = MaterialTheme.colorScheme.onPrimary,
                    )
                }

@@ -172,7 +171,7 @@ fun NewPictureButton(
                    symbol = MaterialSymbols.Close,
                    contentDescription = stringRes(id = R.string.new_picture),
                    modifier = Size26Modifier,
-                    tint = Color.White,
+                    tint = MaterialTheme.colorScheme.onPrimary,
                )
            }

@@ -185,7 +184,7 @@ fun NewPictureButton(
                    painter = painterRes(R.drawable.ic_compose, 5),
                    contentDescription = stringRes(id = R.string.new_picture),
                    modifier = Size26Modifier,
-                    tint = Color.White,
+                    tint = MaterialTheme.colorScheme.onPrimary,
                )
            }
        }
@@ -26,7 +26,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.vitorpamplona.amethyst.R
@@ -101,7 +100,7 @@ fun PodcastsScreen(
                    Icon(
                        symbol = MaterialSymbols.Mic,
                        contentDescription = stringRes(R.string.podcast_your_podcast),
-                        tint = Color.White,
+                        tint = MaterialTheme.colorScheme.onPrimary,
                    )
                }
            }
@@ -25,7 +25,6 @@ import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.navigation.routes.Route
@@ -46,7 +45,7 @@ fun NewPollButton(nav: INav) {
            painter = painterRes(R.drawable.ic_compose, 4),
            contentDescription = stringRes(id = R.string.new_poll),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -24,7 +24,6 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
 import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
@@ -52,7 +51,7 @@ fun NewProductButton(
            symbol = MaterialSymbols.Add,
            contentDescription = stringRes(id = R.string.new_product),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -24,7 +24,6 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
 import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
@@ -46,7 +45,7 @@ fun NewPublicChatButton(nav: INav) {
            symbol = MaterialSymbols.Add,
            contentDescription = stringRes(id = R.string.new_public_chat),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -25,7 +25,6 @@ import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.navigation.routes.Route
@@ -52,7 +51,7 @@ fun NewRelayNoteButton(
            painter = painterRes(R.drawable.ic_compose, 3),
            contentDescription = stringRes(id = R.string.new_community_note),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -40,7 +40,6 @@ import androidx.compose.runtime.remember
 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.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
@@ -130,7 +129,7 @@ fun NewShortVideoButton(
                        symbol = MaterialSymbols.Videocam,
                        contentDescription = stringRes(id = R.string.record_a_video),
                        modifier = Modifier.size(26.dp),
-                        tint = Color.White,
+                        tint = MaterialTheme.colorScheme.onPrimary,
                    )
                }

@@ -149,7 +148,7 @@ fun NewShortVideoButton(
                        symbol = MaterialSymbols.AddPhotoAlternate,
                        contentDescription = stringRes(id = R.string.upload_image),
                        modifier = Modifier.size(26.dp),
-                        tint = Color.White,
+                        tint = MaterialTheme.colorScheme.onPrimary,
                    )
                }

@@ -172,7 +171,7 @@ fun NewShortVideoButton(
                    symbol = MaterialSymbols.Close,
                    contentDescription = stringRes(id = R.string.new_short_video),
                    modifier = Size26Modifier,
-                    tint = Color.White,
+                    tint = MaterialTheme.colorScheme.onPrimary,
                )
            }

@@ -185,7 +184,7 @@ fun NewShortVideoButton(
                    painter = painterRes(R.drawable.ic_compose, 5),
                    contentDescription = stringRes(id = R.string.new_short_video),
                    modifier = Size26Modifier,
-                    tint = Color.White,
+                    tint = MaterialTheme.colorScheme.onPrimary,
                )
            }
        }
@@ -25,7 +25,6 @@ import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.navigation.routes.Route
@@ -53,7 +52,7 @@ fun NewUrlPostButton(
            painter = painterRes(R.drawable.ic_compose, 1),
            contentDescription = stringRes(id = R.string.new_community_note),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -40,7 +40,6 @@ import androidx.compose.runtime.remember
 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.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
@@ -144,7 +143,7 @@ fun NewImageButton(
                        symbol = MaterialSymbols.CameraAlt,
                        contentDescription = stringRes(id = R.string.take_a_picture),
                        modifier = Modifier.size(26.dp),
-                        tint = Color.White,
+                        tint = MaterialTheme.colorScheme.onPrimary,
                    )
                }

@@ -163,7 +162,7 @@ fun NewImageButton(
                        symbol = MaterialSymbols.Videocam,
                        contentDescription = stringRes(id = R.string.record_a_video),
                        modifier = Modifier.size(26.dp),
-                        tint = Color.White,
+                        tint = MaterialTheme.colorScheme.onPrimary,
                    )
                }

@@ -182,7 +181,7 @@ fun NewImageButton(
                        symbol = MaterialSymbols.AddPhotoAlternate,
                        contentDescription = stringRes(id = R.string.upload_image),
                        modifier = Modifier.size(26.dp),
-                        tint = Color.White,
+                        tint = MaterialTheme.colorScheme.onPrimary,
                    )
                }

@@ -207,7 +206,7 @@ fun NewImageButton(
                    symbol = MaterialSymbols.Close,
                    contentDescription = stringRes(id = R.string.new_short),
                    modifier = Size26Modifier,
-                    tint = Color.White,
+                    tint = MaterialTheme.colorScheme.onPrimary,
                )
            }

@@ -220,7 +219,7 @@ fun NewImageButton(
                    painter = painterRes(R.drawable.ic_compose, 5),
                    contentDescription = stringRes(id = R.string.new_short),
                    modifier = Size26Modifier,
-                    tint = Color.White,
+                    tint = MaterialTheme.colorScheme.onPrimary,
                )
            }
        }
@@ -24,7 +24,6 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
 import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
@@ -46,7 +45,7 @@ fun NewWorkoutButton(nav: INav) {
            symbol = MaterialSymbols.Add,
            contentDescription = stringRes(id = R.string.new_workout),
            modifier = Size26Modifier,
-            tint = Color.White,
+            tint = MaterialTheme.colorScheme.onPrimary,
        )
    }
 }
@@ -24,17 +24,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.ColorMatrix

-val Primary50 = Color(red = 127, green = 103, blue = 190)
-val Primary60 = Color(red = 154, green = 130, blue = 219)
-val Primary70 = Color(red = 182, green = 157, blue = 248)
-val Primary80 = Color(red = 208, green = 188, blue = 255)
-
-val DEFAULT_PRIMARY = Color(red = 208, green = 188, blue = 255)
-val LIGHT_PURPLE = Color(red = 187, green = 134, blue = 252)
-
 val Purple200 = Color(0xFFBB86FC)
 val Purple500 = Color(0xFF6200EE)
-val Purple700 = Color(0xFF3700B3)
 val Teal200 = Color(0xFF03DAC5)

 // Accent palette options selected through Settings -> Accent Color.
@@ -56,17 +47,11 @@ val BitcoinDark = Color(0xFFF7931A)
 val BitcoinLight = Color(0xFFB66605)

 val Following = Color(0xFF03DAC5)
-val FollowsFollow = Color.Yellow
-val NIP05Verified = Color.Blue

-val Nip05EmailColor = Color(0xFFb198ec)
 val Nip05EmailColorDark = Color(0xFF765AA2)
 val Nip05EmailColorLight = Color(0xFFa770f3)

-val DarkerGreen = Color.Green.copy(alpha = 0.32f)
-
 val LightRedColor = Color(0xFFC62828)
-val LighterRedColor = Color(0xFFFF0E0E)

 val RelayIconFilter = ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0.5f) })