This commit is contained in:
Violet Caulfield
2025-01-25 11:03:43 -06:00
parent 07ff75d265
commit 92a4cf08d9
11 changed files with 14 additions and 13 deletions

View File

@@ -87,7 +87,7 @@ export default function Album(props: AlbumProps): React.JSX.Element {
<XStack marginTop={"$3"} justifyContent="flex-end">
<Text
color={"$purpleGray"}
color={"$amethyst"}
style={{ display: "block"}}
marginRight={"$1"}
>

View File

@@ -27,7 +27,7 @@ export default function IconButton({
height={size}
alignContent="center"
justifyContent="center"
backgroundColor={"$borderColor"}
backgroundColor={"$backgroundColor"}
>
<Icon
large

View File

@@ -28,7 +28,7 @@ export default function Icon({
return (
<MaterialCommunityIcons
color={color ? color
: isDarkMode ? getTokens().color.$grape.val
: isDarkMode ? getTokens().color.$white.val
: getTokens().color.$purpleDark.val
}
name={name}

View File

@@ -10,11 +10,11 @@ interface SliderProps {
const JellifySliderThumb = styled(Slider.Thumb, {
backgroundColor: getTokens().color.$purpleDark,
borderColor: getTokens().color.$grape,
borderColor: getTokens().color.$amethyst,
})
const JellifySliderTrack = styled(Slider.Track, {
backgroundColor: getTokens().color.$grape
backgroundColor: getTokens().color.$amethyst
});
const JellifyActiveSliderTrack = styled(Slider.TrackActive, {

View File

@@ -12,7 +12,7 @@ export function RunTimeTicks({ children } : { children?: number | null | undefin
let time = calculateRunTimeFromTicks(children);
return <Text color="$purpleGray">{ time }</Text>
return <Text color="$amethyst">{ time }</Text>
}
function calculateRunTimeFromSeconds(seconds: number) : string {

View File

@@ -106,7 +106,7 @@ export default function ItemDetail({
<Text
textAlign="center"
fontSize={"$6"}
color={"$purpleGray"}
color={"$amethyst"}
>
{ item.Album ?? "" }
</Text>

View File

@@ -110,7 +110,7 @@ export default function PlayerScreen({ navigation }: { navigation: NativeStackNa
<TextTicker {...TextTickerConfig}>
<Text
fontSize={"$6"}
color={"$purpleGray"}
color={"$amethyst"}
>
{ nowPlaying!.album ?? "" }
</Text>

View File

@@ -74,7 +74,7 @@ export default function Playlist(props: PlaylistProps): React.JSX.Element {
<XStack justifyContent="flex-end">
<Text
color={"$purpleGray"}
color={"$amethyst"}
style={{ display: "block"}}
>
Total Runtime:

View File

@@ -32,9 +32,9 @@ export function Tabs() : React.JSX.Element {
<>
<Separator />
<Miniplayer navigation={props.navigation} />
<Separator />
</>
)}
<Separator />
<BottomTabBar {...props} />
</>
)}

View File

@@ -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,
},

View File

@@ -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,