diff --git a/components/Album/component.tsx b/components/Album/component.tsx index abfcfb3c..bf8d2d91 100644 --- a/components/Album/component.tsx +++ b/components/Album/component.tsx @@ -87,7 +87,7 @@ export default function Album(props: AlbumProps): React.JSX.Element { diff --git a/components/Global/helpers/icon-button.tsx b/components/Global/helpers/icon-button.tsx index 3b8bb9db..049b5aa0 100644 --- a/components/Global/helpers/icon-button.tsx +++ b/components/Global/helpers/icon-button.tsx @@ -27,7 +27,7 @@ export default function IconButton({ height={size} alignContent="center" justifyContent="center" - backgroundColor={"$borderColor"} + backgroundColor={"$backgroundColor"} > { time } + return { time } } function calculateRunTimeFromSeconds(seconds: number) : string { diff --git a/components/ItemDetail/component.tsx b/components/ItemDetail/component.tsx index 96af3ac6..a425d6a9 100644 --- a/components/ItemDetail/component.tsx +++ b/components/ItemDetail/component.tsx @@ -106,7 +106,7 @@ export default function ItemDetail({ { item.Album ?? "" } diff --git a/components/Player/screens/index.tsx b/components/Player/screens/index.tsx index 37b3196c..177a862d 100644 --- a/components/Player/screens/index.tsx +++ b/components/Player/screens/index.tsx @@ -110,7 +110,7 @@ export default function PlayerScreen({ navigation }: { navigation: NativeStackNa { nowPlaying!.album ?? "" } diff --git a/components/Playlist/component.tsx b/components/Playlist/component.tsx index 211185c1..0a509b93 100644 --- a/components/Playlist/component.tsx +++ b/components/Playlist/component.tsx @@ -74,7 +74,7 @@ export default function Playlist(props: PlaylistProps): React.JSX.Element { Total Runtime: diff --git a/components/tabs.tsx b/components/tabs.tsx index fc8b30f6..9b4e10a5 100644 --- a/components/tabs.tsx +++ b/components/tabs.tsx @@ -32,9 +32,9 @@ export function Tabs() : React.JSX.Element { <> + )} - )} diff --git a/components/theme.ts b/components/theme.ts index 98f4b05c..8881229d 100644 --- a/components/theme.ts +++ b/components/theme.ts @@ -5,7 +5,7 @@ export const JellifyDarkTheme = { colors: { ...DarkTheme.colors, card: getTokens().color.$purpleDark.val, - border: getTokens().color.$purpleGray.val, + border: getTokens().color.$amethyst.val, background: getTokens().color.$purpleDark.val, primary: getTokens().color.$telemagenta.val, }, diff --git a/tamagui.config.ts b/tamagui.config.ts index 38990799..6df89dc6 100644 --- a/tamagui.config.ts +++ b/tamagui.config.ts @@ -8,6 +8,7 @@ const tokens = createTokens({ purpleDark: "#0C0622", purple: "#100538", purpleGray: "#66617B", + amethyst: "#7E72AF", grape: "#5638BB", telemagenta: "#cc2f71", white: "#ffffff", @@ -27,13 +28,13 @@ const jellifyConfig = createTamagui({ themes: { dark: { background: tokens.color.purpleDark, - borderColor: tokens.color.purpleGray, + borderColor: tokens.color.amethyst, color: tokens.color.white }, dark_purple: { color: tokens.color.purpleDark, borderColor: tokens.color.grape, - background: tokens.color.purpleGray + background: tokens.color.amethyst }, light: { background: tokens.color.white,