Skip to content

Fix flair positioning on mobile #11952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 28, 2025
Merged

Fix flair positioning on mobile #11952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3c2e80
Fix flair positioning for tracks
Apr 26, 2025
bbf9729
update icon
Apr 26, 2025
c69dbab
lint
Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/harmony/src/assets/icons/ContestSign.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 5 additions & 7 deletions packages/mobile/src/components/lineup-tile/LineupTileArt.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,11 @@ export const LineupTileArt = (props: LineupTileArtProps) => {
const styles = useStyles()

const imageElement = (
<View style={[style, trackTileStyles.image]}>
<View style={styles.imageRoot}>
<View style={[trackTileStyles.image, styles.backdrop]} />
<FadeInView style={styles.image} startOpacity={0} duration={500}>
{renderImage({ style: trackTileStyles.image })}
</FadeInView>
</View>
<View style={styles.imageRoot}>
<View style={[trackTileStyles.image, styles.backdrop]} />
<FadeInView style={styles.image} startOpacity={0} duration={500}>
{renderImage({ style: trackTileStyles.image })}
</FadeInView>
</View>
)

Expand Down
10 changes: 4 additions & 6 deletions packages/mobile/src/components/track-flair/TrackFlair.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,7 @@ export const TrackFlair = ({ size, children, style, trackId }: CoSignProps) => {

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

if (!track) return <>{children}</>

const remixTrack = track.remix_of?.tracks[0]
const remixTrack = track?.remix_of?.tracks[0]
const hasRemixAuthorReposted = remixTrack?.has_remix_author_reposted ?? false
const hasRemixAuthorSaved = remixTrack?.has_remix_author_saved ?? false

Expand All @@ -100,9 +98,9 @@ export const TrackFlair = ({ size, children, style, trackId }: CoSignProps) => {
) : null

return (
<>
<View style={style}>
<View>{children}</View>
<View style={[styles.check, position]}>{flair}</View>
</>
{flair ? <View style={[styles.check, position]}>{flair}</View> : null}
</View>
)
}
12 changes: 4 additions & 8 deletions packages/mobile/src/screens/track-screen/TrackScreenRemix.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const TrackScreenRemixComponent = ({
const styles = useStyles()
const { spacing, color } = useTheme()

const { _co_sign, track_id } = track
const { track_id } = track
const { name, handle } = user
const navigation = useNavigation()

Expand Down Expand Up @@ -138,13 +138,9 @@ const TrackScreenRemixComponent = ({
return (
<View style={[styles.root, style, stylesProp?.root]}>
<Pressable onPress={handlePressTrack}>
{_co_sign ? (
<TrackFlair trackId={track_id} size={Size.MEDIUM} style={{ flex: 0 }}>
{images}
</TrackFlair>
) : (
images
)}
<TrackFlair trackId={track_id} size={Size.MEDIUM}>
{images}
</TrackFlair>
</Pressable>
<Pressable style={styles.artist} onPress={handlePressArtist}>
<View style={styles.name}>
Expand Down