javier/jellyfin-audio-player
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
src/screens/Music/overlays/NowPlaying/index.tsx
View File

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

14
src/screens/Search/index.tsx
View File

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

14
src/screens/modals/Player/components/Queue.tsx
View File

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