Skip to content

Commit cb0f1d8

Browse files
author
Isaac Solo
authored
Fix missing collection mobile artwork (#11935)
1 parent c75ac99 commit cb0f1d8

File tree

5 files changed

+28
-20
lines changed

5 files changed

+28
-20
lines changed

packages/mobile/src/components/lineup-tile/LineupTile.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ export const LineupTile = ({
101101
isCollection={isCollection}
102102
/>
103103
<LineupTileMetadata
104-
coSign={coSign}
105104
renderImage={renderImage}
106105
onPressTitle={onPressTitle}
107106
title={title}

packages/mobile/src/components/lineup-tile/LineupTileArt.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,13 @@ export const LineupTileArt = (props: LineupTileArtProps) => {
3434
const styles = useStyles()
3535

3636
const imageElement = (
37-
<View style={styles.imageRoot}>
38-
<View style={[trackTileStyles.image, styles.backdrop]} />
39-
<FadeInView style={styles.image} startOpacity={0} duration={500}>
40-
{renderImage({ style: trackTileStyles.image })}
41-
</FadeInView>
37+
<View style={[style, trackTileStyles.image]}>
38+
<View style={styles.imageRoot}>
39+
<View style={[trackTileStyles.image, styles.backdrop]} />
40+
<FadeInView style={styles.image} startOpacity={0} duration={500}>
41+
{renderImage({ style: trackTileStyles.image })}
42+
</FadeInView>
43+
</View>
4244
</View>
4345
)
4446

packages/mobile/src/components/lineup-tile/LineupTileMetadata.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ID, Remix, User } from '@audius/common/models'
1+
import type { ID, User } from '@audius/common/models'
22
import { playerSelectors } from '@audius/common/store'
33
import { TouchableOpacity, View } from 'react-native'
44
import { useSelector } from 'react-redux'
@@ -11,7 +11,7 @@ import type { GestureResponderHandler } from 'app/types/gesture'
1111
import { useThemeColors } from 'app/utils/theme'
1212

1313
import { LineupTileArt } from './LineupTileArt'
14-
import { useStyles as useTrackTileStyles } from './styles'
14+
import { useStyles as useTileStyles } from './styles'
1515
import type { LineupTileProps } from './types'
1616

1717
const { getPlaying } = playerSelectors
@@ -36,7 +36,6 @@ const useStyles = makeStyles(({ palette }) => ({
3636
}))
3737

3838
type Props = {
39-
coSign?: Remix | null
4039
onPressTitle?: GestureResponderHandler
4140
renderImage: LineupTileProps['renderImage']
4241
title: string
@@ -47,7 +46,6 @@ type Props = {
4746
}
4847

4948
export const LineupTileMetadata = ({
50-
coSign,
5149
onPressTitle,
5250
renderImage,
5351
title,
@@ -57,7 +55,7 @@ export const LineupTileMetadata = ({
5755
trackId
5856
}: Props) => {
5957
const styles = useStyles()
60-
const trackTileStyles = useTrackTileStyles()
58+
const tileStyles = useTileStyles()
6159
const { primary } = useThemeColors()
6260

6361
const isActive = isPlayingUid
@@ -70,11 +68,13 @@ export const LineupTileMetadata = ({
7068
<View style={styles.metadata}>
7169
<LineupTileArt
7270
renderImage={renderImage}
73-
style={trackTileStyles.imageContainer}
71+
style={tileStyles.imageContainer}
7472
trackId={trackId}
7573
/>
7674
<FadeInView
77-
style={trackTileStyles.titles}
75+
style={
76+
type === 'track' ? tileStyles.titles : tileStyles.collectionTitles
77+
}
7878
startOpacity={0}
7979
duration={500}
8080
>
@@ -91,8 +91,8 @@ export const LineupTileMetadata = ({
9191

9292
<TouchableOpacity
9393
style={{
94-
...trackTileStyles.title,
95-
...(isPlaying ? trackTileStyles.titlePlaying : {})
94+
...tileStyles.title,
95+
...(isPlaying ? tileStyles.titlePlaying : {})
9696
}}
9797
onPress={onPressTitle}
9898
>

packages/mobile/src/components/lineup-tile/styles.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,19 @@ export const useStyles = makeStyles(({ palette }) => ({
3636
marginLeft: spacing(2)
3737
},
3838
titles: {
39-
justifyContent: 'center',
39+
paddingVertical: spacing(1),
4040
alignItems: 'flex-start',
4141
flexBasis: '65%',
4242
marginRight: spacing(3),
4343
marginTop: spacing(2),
44-
gap: 2
44+
gap: spacing(1)
45+
},
46+
collectionTitles: {
47+
alignItems: 'flex-start',
48+
flexBasis: '65%',
49+
marginRight: spacing(3),
50+
marginTop: spacing(2),
51+
gap: spacing(1)
4552
},
4653
title: {
4754
...flexRowCentered(),

packages/mobile/src/components/track-flair/TrackFlair.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export const TrackFlair = ({ size, children, style, trackId }: CoSignProps) => {
8585

8686
const { size: iconSize, position } = layoutBySize[size]
8787

88-
if (!track) return null
88+
if (!track) return <>{children}</>
8989

9090
const remixTrack = track.remix_of?.tracks[0]
9191
const hasRemixAuthorReposted = remixTrack?.has_remix_author_reposted ?? false
@@ -100,9 +100,9 @@ export const TrackFlair = ({ size, children, style, trackId }: CoSignProps) => {
100100
) : null
101101

102102
return (
103-
<View style={style}>
103+
<>
104104
<View>{children}</View>
105105
<View style={[styles.check, position]}>{flair}</View>
106-
</View>
106+
</>
107107
)
108108
}

0 commit comments

Comments
 (0)