fix: Only show single line for tracks without artists or albums

This commit is contained in:
Lei Nelissen
2022-11-13 12:09:36 +01:00
parent 0ffc5b6489
commit 7ed389ead6
3 changed files with 21 additions and 15 deletions

View File

@@ -159,9 +159,11 @@ function NowPlaying() {
</ShadowWrapper> </ShadowWrapper>
<TrackNameContainer> <TrackNameContainer>
<Text numberOfLines={1}>{track.title}</Text> <Text numberOfLines={1}>{track.title}</Text>
{(track.artist || track.album) && (
<Text style={{ opacity: 0.5 }} numberOfLines={1}> <Text style={{ opacity: 0.5 }} numberOfLines={1}>
{track.artist}{track.album ? `${track.album}` : ''} {track.artist}{track.album ? `${track.album}` : ''}
</Text> </Text>
)}
</TrackNameContainer> </TrackNameContainer>
<ActionButton> <ActionButton>
<SelectActionButton /> <SelectActionButton />

View File

@@ -295,12 +295,14 @@ export default function Search() {
<Text numberOfLines={1}> <Text numberOfLines={1}>
{trackName || album.Name} {trackName || album.Name}
</Text> </Text>
{(album.AlbumArtist || album.Name) && (
<HalfOpacity style={defaultStyles.text} numberOfLines={1}> <HalfOpacity style={defaultStyles.text} numberOfLines={1}>
{type === 'AlbumArtist' {type === 'AlbumArtist'
? `${t('album')}${album.AlbumArtist}` ? `${t('album')}${album.AlbumArtist}`
: `${t('track')}${album.AlbumArtist}${album.Name}` : `${t('track')}${album.AlbumArtist}${album.Name}`
} }
</HalfOpacity> </HalfOpacity>
)}
</View> </View>
<View style={{ marginLeft: 16 }}> <View style={{ marginLeft: 16 }}>
<DownloadIcon trackId={id} /> <DownloadIcon trackId={id} />

View File

@@ -142,12 +142,14 @@ export default function Queue({ header }: Props) {
> >
{track.title} {track.title}
</Text> </Text>
{(track.artist || track.album) && (
<TextHalfOpacity <TextHalfOpacity
style={currentIndex === index ? { color: THEME_COLOR, fontWeight: '400' } : undefined} style={currentIndex === index ? { color: THEME_COLOR, fontWeight: '400' } : undefined}
numberOfLines={1} numberOfLines={1}
> >
{track.artist}{track.album && ' — ' + track.album} {track.artist}{track.album && ' — ' + track.album}
</TextHalfOpacity> </TextHalfOpacity>
)}
</View> </View>
<View style={{ marginLeft: 'auto', marginRight: 8 }}> <View style={{ marginLeft: 'auto', marginRight: 8 }}>
<TextHalfOpacity <TextHalfOpacity