Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { HashId, Id, full } from '@audius/sdk'
import { Id, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
Expand DownExpand Up@@ -68,7 +68,7 @@ export const useRecentlyPlayedTracks = (
queryClient
})

return data.map((trackActivity) => HashId.parse(trackActivity.item.id))
return tracks.map((track) => track.track_id)
},
select: (data) => data.pages.flat(),
...options,
Expand Down
1 change: 1 addition & 0 deletions packages/mobile/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,7 @@
"react-native-image-picker": "7.2.3",
"react-native-in-app-review": "4.3.3",
"react-native-inset-shadow": "1.0.3",
"react-native-intersection-observer": "0.2.1",
"react-native-keyboard-aware-scroll-view": "0.9.5",
"react-native-linear-gradient": "2.8.3",
"react-native-markdown-display": "7.0.2",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,30 @@ import { Divider, Flex, Paper } from '@audius/harmony-native'

import { Skeleton } from '../skeleton'

export const CollectionCardSkeleton = () => {
export const CollectionCardSkeleton = ({
noShimmer
}: {
noShimmer?: boolean
}) => {
return (
<Paper border='default'>
<Flex p='s' gap='s' alignItems='center'>
<Skeleton style={{ width: '100%', aspectRatio: 1 }} />
<Skeleton height={20} width='90%' style={{ marginBottom: 6 }} />
<Skeleton height={18} width={100} style={{ marginBottom: 4 }} />
<Skeleton
style={{ width: '100%', aspectRatio: 1 }}
noShimmer={noShimmer}
/>
<Skeleton
height={20}
width='90%'
style={{ marginBottom: 6 }}
noShimmer={noShimmer}
/>
<Skeleton
height={18}
width={100}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
</Flex>
<Divider orientation='horizontal' />
<Flex
Expand All@@ -18,7 +35,7 @@ export const CollectionCardSkeleton = () => {
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
<Skeleton height={16} width={100} />
<Skeleton height={16} width={100} noShimmer={noShimmer} />
</Flex>
</Paper>
)
Expand Down
5 changes: 3 additions & 2 deletions packages/mobile/src/components/core/CardList.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ export type CardListProps<ItemT> = Omit<FlatListProps<ItemT>, 'data'> & {
FlatListComponent?: ComponentType<FlatListProps<ItemT | LoadingCard>>
isLoading?: boolean
isLoadingMore?: boolean
LoadingCardComponent?: ComponentType
LoadingCardComponent?: ComponentType<{ noShimmer?: boolean }>
// If total count is known, use this to aid in rendering the right number
// of skeletons
totalCount?: number
Expand DownExpand Up@@ -88,14 +88,15 @@ export function CardList<ItemT extends {}>(props: CardListProps<ItemT>) {
const data = useMemo(() => {
const skeletonData = isLoading ? getSkeletonData(totalCount) : []
const moreSkeletonData = isLoadingMore ? getSkeletonData(2) : []

return [...(dataProp ?? []), ...skeletonData, ...moreSkeletonData]
}, [dataProp, isLoading, isLoadingMore, totalCount])

const handleRenderItem: ListRenderItem<ItemT | LoadingCard> = useCallback(
(info) => {
const itemElement =
'_loading' in info.item ? (
<LoadingCardComponent />
<LoadingCardComponent noShimmer />
) : (
(renderItem?.(info as ListRenderItemInfo<ItemT>) ?? null)
)
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
import {
Divider,
Flex,
IconHeart,
IconRepost,
IconShare,
Paper
} from '@audius/harmony-native'
import Skeleton from 'app/components/skeleton'

interface CollectionTileSkeletonProps {
noShimmer?: boolean
}

export const CollectionTileSkeleton = ({
noShimmer
}: CollectionTileSkeletonProps) => {
return (
<Paper>
<Flex h={317} justifyContent='space-between'>
{/* Top section with image and metadata */}
<Flex direction='row' alignItems='flex-start' p='s' gap='m'>
{/* Collection image skeleton */}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comments helpful, should have done that on the web ones 😅

<Skeleton height={80} width={80} noShimmer={noShimmer} />

{/* Title and type skeleton */}
<Flex gap='s' flex={1}>
{/* Collection type label */}
<Skeleton width={60} height={16} noShimmer={noShimmer} />
{/* Collection title */}
<Skeleton width='90%' height={20} noShimmer={noShimmer} />
{/* User name */}
<Skeleton width='70%' height={18} noShimmer={noShimmer} />
</Flex>
</Flex>

{/* Track list skeleton */}
<Flex ph='s' gap='l'>
<Skeleton width='100%' height={16} noShimmer={noShimmer} />
<Skeleton width='90%' height={16} noShimmer={noShimmer} />
<Skeleton width='85%' height={16} noShimmer={noShimmer} />
</Flex>

<Flex>
{/* Bottom section with action buttons */}
<Divider mh='s' />
<Flex
direction='row'
justifyContent='space-between'
alignItems='center'
p='s'
>
<Flex direction='row' gap='2xl'>
<IconRepost color='disabled' />
<IconHeart color='disabled' />
<IconShare color='disabled' />
</Flex>
</Flex>
</Flex>
</Flex>
</Paper>
)
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,15 +8,19 @@ import {
} from '@audius/harmony-native'
import Skeleton from 'app/components/skeleton'

export const LineupTileSkeleton = () => {
interface LineupTileSkeletonProps {
noShimmer?: boolean
}

export const LineupTileSkeleton = ({ noShimmer }: LineupTileSkeletonProps) => {
return (
<Paper>
<Flex flex={1} justifyContent='space-between'>
<Flex direction='row' alignItems='center' p='s' gap='m'>
<Skeleton height={80} width={80} />
<Skeleton height={80} width={80} noShimmer={noShimmer} />
<Flex gap='s' flex={1}>
<Skeleton width='80%' height={20} />
<Skeleton width='60%' height={20} />
<Skeleton width='80%' height={20} noShimmer={noShimmer} />
<Skeleton width='60%' height={20} noShimmer={noShimmer} />
</Flex>
</Flex>
<Divider mh='s' pt='l' />
Expand Down
1 change: 1 addition & 0 deletions packages/mobile/src/components/lineup-tile/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { CollectionTile } from './CollectionTile'
export { CollectionTileSkeleton } from './CollectionTileSkeleton'
export { LineupTileSkeleton } from './LineupTileSkeleton'
export { TrackTile } from './TrackTile'
43 changes: 0 additions & 43 deletions packages/mobile/src/components/remix-carousel/RemixCarousel.tsx

This file was deleted.

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,8 @@ import {
} from '@audius/harmony-native'
import type { AppTabScreenParamList } from 'app/screens/app-screen'

import { CollectionCardSkeleton } from '../collection-list/CollectionCardSkeleton'
import { TrackImage } from '../image/TrackImage'
import { TrackCardSkeleton } from '../track/TrackCardSkeleton'
import { UserLink } from '../user-link'

const messages = {
Expand DownExpand Up@@ -46,7 +46,7 @@ export const RemixContestCard = (props: RemixContestCardProps) => {
}, [navigation, trackId])

if (!track || !remixContest) {
return <CollectionCardSkeleton />
return <TrackCardSkeleton />
}
return (
<Paper border='default' onPress={handlePress}>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,8 @@ import { getFollowIds } from 'common/store/pages/signon/selectors'
import LinearGradient from 'react-native-linear-gradient'
import { useDispatch, useSelector } from 'react-redux'

import type { UserListProps } from 'app/components/user-list'
import { ProfileCard, UserList } from 'app/components/user-list'
import type { UserCardListProps } from 'app/components/user-card-list'
import { ProfileCard, UserCardList } from 'app/components/user-card-list'
import { makeStyles } from 'app/styles'
import { useThemeColors } from 'app/utils/theme'

Expand All@@ -21,7 +21,7 @@ const useStyles = makeStyles(({ palette }) => ({
}
}))

type SuggestedArtistsListProps = Partial<UserListProps>
type SuggestedArtistsListProps = Partial<UserCardListProps>

export const SuggestedArtistsList = (props: SuggestedArtistsListProps) => {
const styles = useStyles()
Expand All@@ -44,7 +44,7 @@ export const SuggestedArtistsList = (props: SuggestedArtistsListProps) => {
)

return (
<UserList
<UserCardList
profiles={suggestedArtists}
renderItem={({ item: artist }) => {
const { user_id } = artist
Expand Down
34 changes: 34 additions & 0 deletions packages/mobile/src/components/track-card-list/TrackCardList.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import type { ID } from '@audius/common/models'

import type { CardListProps } from 'app/components/core'
import { CardList } from 'app/components/core'

import { TrackCard } from '../track/TrackCard'
import { TrackCardSkeleton } from '../track/TrackCardSkeleton'

type ListProps = Omit<CardListProps<{ trackId: ID }>, 'data'>

export type TrackCardListProps = {
trackIds: ID[] | undefined
onCardPress?: (trackId: ID) => void
} & Partial<ListProps>

export const TrackCardList = (props: TrackCardListProps) => {
const { trackIds, onCardPress, ...other } = props

const data = trackIds?.map((trackId) => ({ trackId }))

return (
<CardList
data={data}
renderItem={({ item }) => (
<TrackCard
id={item.trackId}
onPress={() => onCardPress?.(item.trackId)}
/>
)}
LoadingCardComponent={TrackCardSkeleton}
{...other}
/>
)
}
1 change: 1 addition & 0 deletions packages/mobile/src/components/track-card-list/index.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export * from './TrackCardList'
30 changes: 24 additions & 6 deletions packages/mobile/src/components/track/TrackCardSkeleton.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,32 @@ import { Divider, Flex, Paper } from '@audius/harmony-native'

import { Skeleton } from '../skeleton'

export const TrackCardSkeleton = () => {
export const TrackCardSkeleton = ({ noShimmer }: { noShimmer?: boolean }) => {
return (
<Paper border='default'>
<Flex p='s' gap='s' alignItems='center'>
<Skeleton style={{ width: '100%', aspectRatio: 1 }} />
<Skeleton height={20} width='90%' style={{ marginBottom: 6 }} />
<Skeleton height={18} width={100} style={{ marginBottom: 4 }} />
<Skeleton height={16} width={60} style={{ marginBottom: 4 }} />
<Skeleton
style={{ width: '100%', aspectRatio: 1 }}
noShimmer={noShimmer}
/>
<Skeleton
height={20}
width='90%'
style={{ marginBottom: 6 }}
noShimmer={noShimmer}
/>
<Skeleton
height={18}
width={100}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
<Skeleton
height={16}
width={60}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
</Flex>
<Divider orientation='horizontal' />
<Flex
Expand All@@ -19,7 +37,7 @@ export const TrackCardSkeleton = () => {
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
<Skeleton height={16} width={100} />
<Skeleton height={16} width={100} noShimmer={noShimmer} />
</Flex>
</Paper>
)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,8 +51,9 @@ export const UserCard = (props: UserCardProps) => {
size: SquareSizes.SIZE_480_BY_480
})

if (!handle || follower_count === undefined || source === undefined)
if (!handle || follower_count === undefined) {
return null
}

return (
<Paper border='default' onPress={handlePress} {...other}>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { HashId, Id, full } from '@audius/sdk'
import { Id, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
Expand DownExpand Up@@ -68,7 +68,7 @@ export const useRecentlyPlayedTracks = (
queryClient
})

return data.map((trackActivity) => HashId.parse(trackActivity.item.id))
return tracks.map((track) => track.track_id)
},
select: (data) => data.pages.flat(),
...options,
Expand Down
1 change: 1 addition & 0 deletions packages/mobile/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,7 @@
"react-native-image-picker": "7.2.3",
"react-native-in-app-review": "4.3.3",
"react-native-inset-shadow": "1.0.3",
"react-native-intersection-observer": "0.2.1",
"react-native-keyboard-aware-scroll-view": "0.9.5",
"react-native-linear-gradient": "2.8.3",
"react-native-markdown-display": "7.0.2",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,30 @@ import { Divider, Flex, Paper } from '@audius/harmony-native'

import { Skeleton } from '../skeleton'

export const CollectionCardSkeleton = () => {
export const CollectionCardSkeleton = ({
noShimmer
}: {
noShimmer?: boolean
}) => {
return (
<Paper border='default'>
<Flex p='s' gap='s' alignItems='center'>
<Skeleton style={{ width: '100%', aspectRatio: 1 }} />
<Skeleton height={20} width='90%' style={{ marginBottom: 6 }} />
<Skeleton height={18} width={100} style={{ marginBottom: 4 }} />
<Skeleton
style={{ width: '100%', aspectRatio: 1 }}
noShimmer={noShimmer}
/>
<Skeleton
height={20}
width='90%'
style={{ marginBottom: 6 }}
noShimmer={noShimmer}
/>
<Skeleton
height={18}
width={100}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
</Flex>
<Divider orientation='horizontal' />
<Flex
Expand All@@ -18,7 +35,7 @@ export const CollectionCardSkeleton = () => {
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
<Skeleton height={16} width={100} />
<Skeleton height={16} width={100} noShimmer={noShimmer} />
</Flex>
</Paper>
)
Expand Down
5 changes: 3 additions & 2 deletions packages/mobile/src/components/core/CardList.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ export type CardListProps<ItemT> = Omit<FlatListProps<ItemT>, 'data'> & {
FlatListComponent?: ComponentType<FlatListProps<ItemT | LoadingCard>>
isLoading?: boolean
isLoadingMore?: boolean
LoadingCardComponent?: ComponentType
LoadingCardComponent?: ComponentType<{ noShimmer?: boolean }>
// If total count is known, use this to aid in rendering the right number
// of skeletons
totalCount?: number
Expand DownExpand Up@@ -88,14 +88,15 @@ export function CardList<ItemT extends {}>(props: CardListProps<ItemT>) {
const data = useMemo(() => {
const skeletonData = isLoading ? getSkeletonData(totalCount) : []
const moreSkeletonData = isLoadingMore ? getSkeletonData(2) : []

return [...(dataProp ?? []), ...skeletonData, ...moreSkeletonData]
}, [dataProp, isLoading, isLoadingMore, totalCount])

const handleRenderItem: ListRenderItem<ItemT | LoadingCard> = useCallback(
(info) => {
const itemElement =
'_loading' in info.item ? (
<LoadingCardComponent />
<LoadingCardComponent noShimmer />
) : (
(renderItem?.(info as ListRenderItemInfo<ItemT>) ?? null)
)
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
import {
Divider,
Flex,
IconHeart,
IconRepost,
IconShare,
Paper
} from '@audius/harmony-native'
import Skeleton from 'app/components/skeleton'

interface CollectionTileSkeletonProps {
noShimmer?: boolean
}

export const CollectionTileSkeleton = ({
noShimmer
}: CollectionTileSkeletonProps) => {
return (
<Paper>
<Flex h={317} justifyContent='space-between'>
{/* Top section with image and metadata */}
<Flex direction='row' alignItems='flex-start' p='s' gap='m'>
{/* Collection image skeleton */}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comments helpful, should have done that on the web ones 😅

<Skeleton height={80} width={80} noShimmer={noShimmer} />

{/* Title and type skeleton */}
<Flex gap='s' flex={1}>
{/* Collection type label */}
<Skeleton width={60} height={16} noShimmer={noShimmer} />
{/* Collection title */}
<Skeleton width='90%' height={20} noShimmer={noShimmer} />
{/* User name */}
<Skeleton width='70%' height={18} noShimmer={noShimmer} />
</Flex>
</Flex>

{/* Track list skeleton */}
<Flex ph='s' gap='l'>
<Skeleton width='100%' height={16} noShimmer={noShimmer} />
<Skeleton width='90%' height={16} noShimmer={noShimmer} />
<Skeleton width='85%' height={16} noShimmer={noShimmer} />
</Flex>

<Flex>
{/* Bottom section with action buttons */}
<Divider mh='s' />
<Flex
direction='row'
justifyContent='space-between'
alignItems='center'
p='s'
>
<Flex direction='row' gap='2xl'>
<IconRepost color='disabled' />
<IconHeart color='disabled' />
<IconShare color='disabled' />
</Flex>
</Flex>
</Flex>
</Flex>
</Paper>
)
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,15 +8,19 @@ import {
} from '@audius/harmony-native'
import Skeleton from 'app/components/skeleton'

export const LineupTileSkeleton = () => {
interface LineupTileSkeletonProps {
noShimmer?: boolean
}

export const LineupTileSkeleton = ({ noShimmer }: LineupTileSkeletonProps) => {
return (
<Paper>
<Flex flex={1} justifyContent='space-between'>
<Flex direction='row' alignItems='center' p='s' gap='m'>
<Skeleton height={80} width={80} />
<Skeleton height={80} width={80} noShimmer={noShimmer} />
<Flex gap='s' flex={1}>
<Skeleton width='80%' height={20} />
<Skeleton width='60%' height={20} />
<Skeleton width='80%' height={20} noShimmer={noShimmer} />
<Skeleton width='60%' height={20} noShimmer={noShimmer} />
</Flex>
</Flex>
<Divider mh='s' pt='l' />
Expand Down
1 change: 1 addition & 0 deletions packages/mobile/src/components/lineup-tile/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { CollectionTile } from './CollectionTile'
export { CollectionTileSkeleton } from './CollectionTileSkeleton'
export { LineupTileSkeleton } from './LineupTileSkeleton'
export { TrackTile } from './TrackTile'
43 changes: 0 additions & 43 deletions packages/mobile/src/components/remix-carousel/RemixCarousel.tsx

This file was deleted.

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,8 @@ import {
} from '@audius/harmony-native'
import type { AppTabScreenParamList } from 'app/screens/app-screen'

import { CollectionCardSkeleton } from '../collection-list/CollectionCardSkeleton'
import { TrackImage } from '../image/TrackImage'
import { TrackCardSkeleton } from '../track/TrackCardSkeleton'
import { UserLink } from '../user-link'

const messages = {
Expand DownExpand Up@@ -46,7 +46,7 @@ export const RemixContestCard = (props: RemixContestCardProps) => {
}, [navigation, trackId])

if (!track || !remixContest) {
return <CollectionCardSkeleton />
return <TrackCardSkeleton />
}
return (
<Paper border='default' onPress={handlePress}>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,8 @@ import { getFollowIds } from 'common/store/pages/signon/selectors'
import LinearGradient from 'react-native-linear-gradient'
import { useDispatch, useSelector } from 'react-redux'

import type { UserListProps } from 'app/components/user-list'
import { ProfileCard, UserList } from 'app/components/user-list'
import type { UserCardListProps } from 'app/components/user-card-list'
import { ProfileCard, UserCardList } from 'app/components/user-card-list'
import { makeStyles } from 'app/styles'
import { useThemeColors } from 'app/utils/theme'

Expand All@@ -21,7 +21,7 @@ const useStyles = makeStyles(({ palette }) => ({
}
}))

type SuggestedArtistsListProps = Partial<UserListProps>
type SuggestedArtistsListProps = Partial<UserCardListProps>

export const SuggestedArtistsList = (props: SuggestedArtistsListProps) => {
const styles = useStyles()
Expand All@@ -44,7 +44,7 @@ export const SuggestedArtistsList = (props: SuggestedArtistsListProps) => {
)

return (
<UserList
<UserCardList
profiles={suggestedArtists}
renderItem={({ item: artist }) => {
const { user_id } = artist
Expand Down
34 changes: 34 additions & 0 deletions packages/mobile/src/components/track-card-list/TrackCardList.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import type { ID } from '@audius/common/models'

import type { CardListProps } from 'app/components/core'
import { CardList } from 'app/components/core'

import { TrackCard } from '../track/TrackCard'
import { TrackCardSkeleton } from '../track/TrackCardSkeleton'

type ListProps = Omit<CardListProps<{ trackId: ID }>, 'data'>

export type TrackCardListProps = {
trackIds: ID[] | undefined
onCardPress?: (trackId: ID) => void
} & Partial<ListProps>

export const TrackCardList = (props: TrackCardListProps) => {
const { trackIds, onCardPress, ...other } = props

const data = trackIds?.map((trackId) => ({ trackId }))

return (
<CardList
data={data}
renderItem={({ item }) => (
<TrackCard
id={item.trackId}
onPress={() => onCardPress?.(item.trackId)}
/>
)}
LoadingCardComponent={TrackCardSkeleton}
{...other}
/>
)
}
1 change: 1 addition & 0 deletions packages/mobile/src/components/track-card-list/index.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export * from './TrackCardList'
30 changes: 24 additions & 6 deletions packages/mobile/src/components/track/TrackCardSkeleton.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,32 @@ import { Divider, Flex, Paper } from '@audius/harmony-native'

import { Skeleton } from '../skeleton'

export const TrackCardSkeleton = () => {
export const TrackCardSkeleton = ({ noShimmer }: { noShimmer?: boolean }) => {
return (
<Paper border='default'>
<Flex p='s' gap='s' alignItems='center'>
<Skeleton style={{ width: '100%', aspectRatio: 1 }} />
<Skeleton height={20} width='90%' style={{ marginBottom: 6 }} />
<Skeleton height={18} width={100} style={{ marginBottom: 4 }} />
<Skeleton height={16} width={60} style={{ marginBottom: 4 }} />
<Skeleton
style={{ width: '100%', aspectRatio: 1 }}
noShimmer={noShimmer}
/>
<Skeleton
height={20}
width='90%'
style={{ marginBottom: 6 }}
noShimmer={noShimmer}
/>
<Skeleton
height={18}
width={100}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
<Skeleton
height={16}
width={60}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
</Flex>
<Divider orientation='horizontal' />
<Flex
Expand All@@ -19,7 +37,7 @@ export const TrackCardSkeleton = () => {
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
<Skeleton height={16} width={100} />
<Skeleton height={16} width={100} noShimmer={noShimmer} />
</Flex>
</Paper>
)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,8 +51,9 @@ export const UserCard = (props: UserCardProps) => {
size: SquareSizes.SIZE_480_BY_480
})

if (!handle || follower_count === undefined || source === undefined)
if (!handle || follower_count === undefined) {
return null
}

return (
<Paper border='default' onPress={handlePress} {...other}>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { HashId, Id, full } from '@audius/sdk'
import { Id, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
Expand DownExpand Up@@ -68,7 +68,7 @@ export const useRecentlyPlayedTracks = (
queryClient
})

return data.map((trackActivity) => HashId.parse(trackActivity.item.id))
return tracks.map((track) => track.track_id)
},
select: (data) => data.pages.flat(),
...options,
Expand Down
1 change: 1 addition & 0 deletions packages/mobile/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,7 @@
"react-native-image-picker": "7.2.3",
"react-native-in-app-review": "4.3.3",
"react-native-inset-shadow": "1.0.3",
"react-native-intersection-observer": "0.2.1",
"react-native-keyboard-aware-scroll-view": "0.9.5",
"react-native-linear-gradient": "2.8.3",
"react-native-markdown-display": "7.0.2",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,30 @@ import { Divider, Flex, Paper } from '@audius/harmony-native'

import { Skeleton } from '../skeleton'

export const CollectionCardSkeleton = () => {
export const CollectionCardSkeleton = ({
noShimmer
}: {
noShimmer?: boolean
}) => {
return (
<Paper border='default'>
<Flex p='s' gap='s' alignItems='center'>
<Skeleton style={{ width: '100%', aspectRatio: 1 }} />
<Skeleton height={20} width='90%' style={{ marginBottom: 6 }} />
<Skeleton height={18} width={100} style={{ marginBottom: 4 }} />
<Skeleton
style={{ width: '100%', aspectRatio: 1 }}
noShimmer={noShimmer}
/>
<Skeleton
height={20}
width='90%'
style={{ marginBottom: 6 }}
noShimmer={noShimmer}
/>
<Skeleton
height={18}
width={100}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
</Flex>
<Divider orientation='horizontal' />
<Flex
Expand All@@ -18,7 +35,7 @@ export const CollectionCardSkeleton = () => {
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
<Skeleton height={16} width={100} />
<Skeleton height={16} width={100} noShimmer={noShimmer} />
</Flex>
</Paper>
)
Expand Down
5 changes: 3 additions & 2 deletions packages/mobile/src/components/core/CardList.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ export type CardListProps<ItemT> = Omit<FlatListProps<ItemT>, 'data'> & {
FlatListComponent?: ComponentType<FlatListProps<ItemT | LoadingCard>>
isLoading?: boolean
isLoadingMore?: boolean
LoadingCardComponent?: ComponentType
LoadingCardComponent?: ComponentType<{ noShimmer?: boolean }>
// If total count is known, use this to aid in rendering the right number
// of skeletons
totalCount?: number
Expand DownExpand Up@@ -88,14 +88,15 @@ export function CardList<ItemT extends {}>(props: CardListProps<ItemT>) {
const data = useMemo(() => {
const skeletonData = isLoading ? getSkeletonData(totalCount) : []
const moreSkeletonData = isLoadingMore ? getSkeletonData(2) : []

return [...(dataProp ?? []), ...skeletonData, ...moreSkeletonData]
}, [dataProp, isLoading, isLoadingMore, totalCount])

const handleRenderItem: ListRenderItem<ItemT | LoadingCard> = useCallback(
(info) => {
const itemElement =
'_loading' in info.item ? (
<LoadingCardComponent />
<LoadingCardComponent noShimmer />
) : (
(renderItem?.(info as ListRenderItemInfo<ItemT>) ?? null)
)
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
import {
Divider,
Flex,
IconHeart,
IconRepost,
IconShare,
Paper
} from '@audius/harmony-native'
import Skeleton from 'app/components/skeleton'

interface CollectionTileSkeletonProps {
noShimmer?: boolean
}

export const CollectionTileSkeleton = ({
noShimmer
}: CollectionTileSkeletonProps) => {
return (
<Paper>
<Flex h={317} justifyContent='space-between'>
{/* Top section with image and metadata */}
<Flex direction='row' alignItems='flex-start' p='s' gap='m'>
{/* Collection image skeleton */}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comments helpful, should have done that on the web ones 😅

<Skeleton height={80} width={80} noShimmer={noShimmer} />

{/* Title and type skeleton */}
<Flex gap='s' flex={1}>
{/* Collection type label */}
<Skeleton width={60} height={16} noShimmer={noShimmer} />
{/* Collection title */}
<Skeleton width='90%' height={20} noShimmer={noShimmer} />
{/* User name */}
<Skeleton width='70%' height={18} noShimmer={noShimmer} />
</Flex>
</Flex>

{/* Track list skeleton */}
<Flex ph='s' gap='l'>
<Skeleton width='100%' height={16} noShimmer={noShimmer} />
<Skeleton width='90%' height={16} noShimmer={noShimmer} />
<Skeleton width='85%' height={16} noShimmer={noShimmer} />
</Flex>

<Flex>
{/* Bottom section with action buttons */}
<Divider mh='s' />
<Flex
direction='row'
justifyContent='space-between'
alignItems='center'
p='s'
>
<Flex direction='row' gap='2xl'>
<IconRepost color='disabled' />
<IconHeart color='disabled' />
<IconShare color='disabled' />
</Flex>
</Flex>
</Flex>
</Flex>
</Paper>
)
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,15 +8,19 @@ import {
} from '@audius/harmony-native'
import Skeleton from 'app/components/skeleton'

export const LineupTileSkeleton = () => {
interface LineupTileSkeletonProps {
noShimmer?: boolean
}

export const LineupTileSkeleton = ({ noShimmer }: LineupTileSkeletonProps) => {
return (
<Paper>
<Flex flex={1} justifyContent='space-between'>
<Flex direction='row' alignItems='center' p='s' gap='m'>
<Skeleton height={80} width={80} />
<Skeleton height={80} width={80} noShimmer={noShimmer} />
<Flex gap='s' flex={1}>
<Skeleton width='80%' height={20} />
<Skeleton width='60%' height={20} />
<Skeleton width='80%' height={20} noShimmer={noShimmer} />
<Skeleton width='60%' height={20} noShimmer={noShimmer} />
</Flex>
</Flex>
<Divider mh='s' pt='l' />
Expand Down
1 change: 1 addition & 0 deletions packages/mobile/src/components/lineup-tile/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { CollectionTile } from './CollectionTile'
export { CollectionTileSkeleton } from './CollectionTileSkeleton'
export { LineupTileSkeleton } from './LineupTileSkeleton'
export { TrackTile } from './TrackTile'
43 changes: 0 additions & 43 deletions packages/mobile/src/components/remix-carousel/RemixCarousel.tsx

This file was deleted.

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,8 @@ import {
} from '@audius/harmony-native'
import type { AppTabScreenParamList } from 'app/screens/app-screen'

import { CollectionCardSkeleton } from '../collection-list/CollectionCardSkeleton'
import { TrackImage } from '../image/TrackImage'
import { TrackCardSkeleton } from '../track/TrackCardSkeleton'
import { UserLink } from '../user-link'

const messages = {
Expand DownExpand Up@@ -46,7 +46,7 @@ export const RemixContestCard = (props: RemixContestCardProps) => {
}, [navigation, trackId])

if (!track || !remixContest) {
return <CollectionCardSkeleton />
return <TrackCardSkeleton />
}
return (
<Paper border='default' onPress={handlePress}>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,8 @@ import { getFollowIds } from 'common/store/pages/signon/selectors'
import LinearGradient from 'react-native-linear-gradient'
import { useDispatch, useSelector } from 'react-redux'

import type { UserListProps } from 'app/components/user-list'
import { ProfileCard, UserList } from 'app/components/user-list'
import type { UserCardListProps } from 'app/components/user-card-list'
import { ProfileCard, UserCardList } from 'app/components/user-card-list'
import { makeStyles } from 'app/styles'
import { useThemeColors } from 'app/utils/theme'

Expand All@@ -21,7 +21,7 @@ const useStyles = makeStyles(({ palette }) => ({
}
}))

type SuggestedArtistsListProps = Partial<UserListProps>
type SuggestedArtistsListProps = Partial<UserCardListProps>

export const SuggestedArtistsList = (props: SuggestedArtistsListProps) => {
const styles = useStyles()
Expand All@@ -44,7 +44,7 @@ export const SuggestedArtistsList = (props: SuggestedArtistsListProps) => {
)

return (
<UserList
<UserCardList
profiles={suggestedArtists}
renderItem={({ item: artist }) => {
const { user_id } = artist
Expand Down
34 changes: 34 additions & 0 deletions packages/mobile/src/components/track-card-list/TrackCardList.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import type { ID } from '@audius/common/models'

import type { CardListProps } from 'app/components/core'
import { CardList } from 'app/components/core'

import { TrackCard } from '../track/TrackCard'
import { TrackCardSkeleton } from '../track/TrackCardSkeleton'

type ListProps = Omit<CardListProps<{ trackId: ID }>, 'data'>

export type TrackCardListProps = {
trackIds: ID[] | undefined
onCardPress?: (trackId: ID) => void
} & Partial<ListProps>

export const TrackCardList = (props: TrackCardListProps) => {
const { trackIds, onCardPress, ...other } = props

const data = trackIds?.map((trackId) => ({ trackId }))

return (
<CardList
data={data}
renderItem={({ item }) => (
<TrackCard
id={item.trackId}
onPress={() => onCardPress?.(item.trackId)}
/>
)}
LoadingCardComponent={TrackCardSkeleton}
{...other}
/>
)
}
1 change: 1 addition & 0 deletions packages/mobile/src/components/track-card-list/index.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export * from './TrackCardList'
30 changes: 24 additions & 6 deletions packages/mobile/src/components/track/TrackCardSkeleton.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,32 @@ import { Divider, Flex, Paper } from '@audius/harmony-native'

import { Skeleton } from '../skeleton'

export const TrackCardSkeleton = () => {
export const TrackCardSkeleton = ({ noShimmer }: { noShimmer?: boolean }) => {
return (
<Paper border='default'>
<Flex p='s' gap='s' alignItems='center'>
<Skeleton style={{ width: '100%', aspectRatio: 1 }} />
<Skeleton height={20} width='90%' style={{ marginBottom: 6 }} />
<Skeleton height={18} width={100} style={{ marginBottom: 4 }} />
<Skeleton height={16} width={60} style={{ marginBottom: 4 }} />
<Skeleton
style={{ width: '100%', aspectRatio: 1 }}
noShimmer={noShimmer}
/>
<Skeleton
height={20}
width='90%'
style={{ marginBottom: 6 }}
noShimmer={noShimmer}
/>
<Skeleton
height={18}
width={100}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
<Skeleton
height={16}
width={60}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
</Flex>
<Divider orientation='horizontal' />
<Flex
Expand All@@ -19,7 +37,7 @@ export const TrackCardSkeleton = () => {
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
<Skeleton height={16} width={100} />
<Skeleton height={16} width={100} noShimmer={noShimmer} />
</Flex>
</Paper>
)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,8 +51,9 @@ export const UserCard = (props: UserCardProps) => {
size: SquareSizes.SIZE_480_BY_480
})

if (!handle || follower_count === undefined || source === undefined)
if (!handle || follower_count === undefined) {
return null
}

return (
<Paper border='default' onPress={handlePress} {...other}>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { HashId, Id, full } from '@audius/sdk'
import { Id, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
Expand DownExpand Up@@ -68,7 +68,7 @@ export const useRecentlyPlayedTracks = (
queryClient
})

return data.map((trackActivity) => HashId.parse(trackActivity.item.id))
return tracks.map((track) => track.track_id)
},
select: (data) => data.pages.flat(),
...options,
Expand Down
1 change: 1 addition & 0 deletions packages/mobile/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,7 @@
"react-native-image-picker": "7.2.3",
"react-native-in-app-review": "4.3.3",
"react-native-inset-shadow": "1.0.3",
"react-native-intersection-observer": "0.2.1",
"react-native-keyboard-aware-scroll-view": "0.9.5",
"react-native-linear-gradient": "2.8.3",
"react-native-markdown-display": "7.0.2",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,30 @@ import { Divider, Flex, Paper } from '@audius/harmony-native'

import { Skeleton } from '../skeleton'

export const CollectionCardSkeleton = () => {
export const CollectionCardSkeleton = ({
noShimmer
}: {
noShimmer?: boolean
}) => {
return (
<Paper border='default'>
<Flex p='s' gap='s' alignItems='center'>
<Skeleton style={{ width: '100%', aspectRatio: 1 }} />
<Skeleton height={20} width='90%' style={{ marginBottom: 6 }} />
<Skeleton height={18} width={100} style={{ marginBottom: 4 }} />
<Skeleton
style={{ width: '100%', aspectRatio: 1 }}
noShimmer={noShimmer}
/>
<Skeleton
height={20}
width='90%'
style={{ marginBottom: 6 }}
noShimmer={noShimmer}
/>
<Skeleton
height={18}
width={100}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
</Flex>
<Divider orientation='horizontal' />
<Flex
Expand All@@ -18,7 +35,7 @@ export const CollectionCardSkeleton = () => {
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
<Skeleton height={16} width={100} />
<Skeleton height={16} width={100} noShimmer={noShimmer} />
</Flex>
</Paper>
)
Expand Down
5 changes: 3 additions & 2 deletions packages/mobile/src/components/core/CardList.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ export type CardListProps<ItemT> = Omit<FlatListProps<ItemT>, 'data'> & {
FlatListComponent?: ComponentType<FlatListProps<ItemT | LoadingCard>>
isLoading?: boolean
isLoadingMore?: boolean
LoadingCardComponent?: ComponentType
LoadingCardComponent?: ComponentType<{ noShimmer?: boolean }>
// If total count is known, use this to aid in rendering the right number
// of skeletons
totalCount?: number
Expand DownExpand Up@@ -88,14 +88,15 @@ export function CardList<ItemT extends {}>(props: CardListProps<ItemT>) {
const data = useMemo(() => {
const skeletonData = isLoading ? getSkeletonData(totalCount) : []
const moreSkeletonData = isLoadingMore ? getSkeletonData(2) : []

return [...(dataProp ?? []), ...skeletonData, ...moreSkeletonData]
}, [dataProp, isLoading, isLoadingMore, totalCount])

const handleRenderItem: ListRenderItem<ItemT | LoadingCard> = useCallback(
(info) => {
const itemElement =
'_loading' in info.item ? (
<LoadingCardComponent />
<LoadingCardComponent noShimmer />
) : (
(renderItem?.(info as ListRenderItemInfo<ItemT>) ?? null)
)
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
import {
Divider,
Flex,
IconHeart,
IconRepost,
IconShare,
Paper
} from '@audius/harmony-native'
import Skeleton from 'app/components/skeleton'

interface CollectionTileSkeletonProps {
noShimmer?: boolean
}

export const CollectionTileSkeleton = ({
noShimmer
}: CollectionTileSkeletonProps) => {
return (
<Paper>
<Flex h={317} justifyContent='space-between'>
{/* Top section with image and metadata */}
<Flex direction='row' alignItems='flex-start' p='s' gap='m'>
{/* Collection image skeleton */}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comments helpful, should have done that on the web ones 😅

<Skeleton height={80} width={80} noShimmer={noShimmer} />

{/* Title and type skeleton */}
<Flex gap='s' flex={1}>
{/* Collection type label */}
<Skeleton width={60} height={16} noShimmer={noShimmer} />
{/* Collection title */}
<Skeleton width='90%' height={20} noShimmer={noShimmer} />
{/* User name */}
<Skeleton width='70%' height={18} noShimmer={noShimmer} />
</Flex>
</Flex>

{/* Track list skeleton */}
<Flex ph='s' gap='l'>
<Skeleton width='100%' height={16} noShimmer={noShimmer} />
<Skeleton width='90%' height={16} noShimmer={noShimmer} />
<Skeleton width='85%' height={16} noShimmer={noShimmer} />
</Flex>

<Flex>
{/* Bottom section with action buttons */}
<Divider mh='s' />
<Flex
direction='row'
justifyContent='space-between'
alignItems='center'
p='s'
>
<Flex direction='row' gap='2xl'>
<IconRepost color='disabled' />
<IconHeart color='disabled' />
<IconShare color='disabled' />
</Flex>
</Flex>
</Flex>
</Flex>
</Paper>
)
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,15 +8,19 @@ import {
} from '@audius/harmony-native'
import Skeleton from 'app/components/skeleton'

export const LineupTileSkeleton = () => {
interface LineupTileSkeletonProps {
noShimmer?: boolean
}

export const LineupTileSkeleton = ({ noShimmer }: LineupTileSkeletonProps) => {
return (
<Paper>
<Flex flex={1} justifyContent='space-between'>
<Flex direction='row' alignItems='center' p='s' gap='m'>
<Skeleton height={80} width={80} />
<Skeleton height={80} width={80} noShimmer={noShimmer} />
<Flex gap='s' flex={1}>
<Skeleton width='80%' height={20} />
<Skeleton width='60%' height={20} />
<Skeleton width='80%' height={20} noShimmer={noShimmer} />
<Skeleton width='60%' height={20} noShimmer={noShimmer} />
</Flex>
</Flex>
<Divider mh='s' pt='l' />
Expand Down
1 change: 1 addition & 0 deletions packages/mobile/src/components/lineup-tile/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { CollectionTile } from './CollectionTile'
export { CollectionTileSkeleton } from './CollectionTileSkeleton'
export { LineupTileSkeleton } from './LineupTileSkeleton'
export { TrackTile } from './TrackTile'
43 changes: 0 additions & 43 deletions packages/mobile/src/components/remix-carousel/RemixCarousel.tsx

This file was deleted.

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,8 @@ import {
} from '@audius/harmony-native'
import type { AppTabScreenParamList } from 'app/screens/app-screen'

import { CollectionCardSkeleton } from '../collection-list/CollectionCardSkeleton'
import { TrackImage } from '../image/TrackImage'
import { TrackCardSkeleton } from '../track/TrackCardSkeleton'
import { UserLink } from '../user-link'

const messages = {
Expand DownExpand Up@@ -46,7 +46,7 @@ export const RemixContestCard = (props: RemixContestCardProps) => {
}, [navigation, trackId])

if (!track || !remixContest) {
return <CollectionCardSkeleton />
return <TrackCardSkeleton />
}
return (
<Paper border='default' onPress={handlePress}>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,8 @@ import { getFollowIds } from 'common/store/pages/signon/selectors'
import LinearGradient from 'react-native-linear-gradient'
import { useDispatch, useSelector } from 'react-redux'

import type { UserListProps } from 'app/components/user-list'
import { ProfileCard, UserList } from 'app/components/user-list'
import type { UserCardListProps } from 'app/components/user-card-list'
import { ProfileCard, UserCardList } from 'app/components/user-card-list'
import { makeStyles } from 'app/styles'
import { useThemeColors } from 'app/utils/theme'

Expand All@@ -21,7 +21,7 @@ const useStyles = makeStyles(({ palette }) => ({
}
}))

type SuggestedArtistsListProps = Partial<UserListProps>
type SuggestedArtistsListProps = Partial<UserCardListProps>

export const SuggestedArtistsList = (props: SuggestedArtistsListProps) => {
const styles = useStyles()
Expand All@@ -44,7 +44,7 @@ export const SuggestedArtistsList = (props: SuggestedArtistsListProps) => {
)

return (
<UserList
<UserCardList
profiles={suggestedArtists}
renderItem={({ item: artist }) => {
const { user_id } = artist
Expand Down
34 changes: 34 additions & 0 deletions packages/mobile/src/components/track-card-list/TrackCardList.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import type { ID } from '@audius/common/models'

import type { CardListProps } from 'app/components/core'
import { CardList } from 'app/components/core'

import { TrackCard } from '../track/TrackCard'
import { TrackCardSkeleton } from '../track/TrackCardSkeleton'

type ListProps = Omit<CardListProps<{ trackId: ID }>, 'data'>

export type TrackCardListProps = {
trackIds: ID[] | undefined
onCardPress?: (trackId: ID) => void
} & Partial<ListProps>

export const TrackCardList = (props: TrackCardListProps) => {
const { trackIds, onCardPress, ...other } = props

const data = trackIds?.map((trackId) => ({ trackId }))

return (
<CardList
data={data}
renderItem={({ item }) => (
<TrackCard
id={item.trackId}
onPress={() => onCardPress?.(item.trackId)}
/>
)}
LoadingCardComponent={TrackCardSkeleton}
{...other}
/>
)
}
1 change: 1 addition & 0 deletions packages/mobile/src/components/track-card-list/index.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export * from './TrackCardList'
30 changes: 24 additions & 6 deletions packages/mobile/src/components/track/TrackCardSkeleton.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,32 @@ import { Divider, Flex, Paper } from '@audius/harmony-native'

import { Skeleton } from '../skeleton'

export const TrackCardSkeleton = () => {
export const TrackCardSkeleton = ({ noShimmer }: { noShimmer?: boolean }) => {
return (
<Paper border='default'>
<Flex p='s' gap='s' alignItems='center'>
<Skeleton style={{ width: '100%', aspectRatio: 1 }} />
<Skeleton height={20} width='90%' style={{ marginBottom: 6 }} />
<Skeleton height={18} width={100} style={{ marginBottom: 4 }} />
<Skeleton height={16} width={60} style={{ marginBottom: 4 }} />
<Skeleton
style={{ width: '100%', aspectRatio: 1 }}
noShimmer={noShimmer}
/>
<Skeleton
height={20}
width='90%'
style={{ marginBottom: 6 }}
noShimmer={noShimmer}
/>
<Skeleton
height={18}
width={100}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
<Skeleton
height={16}
width={60}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
</Flex>
<Divider orientation='horizontal' />
<Flex
Expand All@@ -19,7 +37,7 @@ export const TrackCardSkeleton = () => {
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
<Skeleton height={16} width={100} />
<Skeleton height={16} width={100} noShimmer={noShimmer} />
</Flex>
</Paper>
)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,8 +51,9 @@ export const UserCard = (props: UserCardProps) => {
size: SquareSizes.SIZE_480_BY_480
})

if (!handle || follower_count === undefined || source === undefined)
if (!handle || follower_count === undefined) {
return null
}

return (
<Paper border='default' onPress={handlePress} {...other}>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { HashId, Id, full } from '@audius/sdk'
import { Id, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
Expand DownExpand Up@@ -68,7 +68,7 @@ export const useRecentlyPlayedTracks = (
queryClient
})

return data.map((trackActivity) => HashId.parse(trackActivity.item.id))
return tracks.map((track) => track.track_id)
},
select: (data) => data.pages.flat(),
...options,
Expand Down
1 change: 1 addition & 0 deletions packages/mobile/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,7 @@
"react-native-image-picker": "7.2.3",
"react-native-in-app-review": "4.3.3",
"react-native-inset-shadow": "1.0.3",
"react-native-intersection-observer": "0.2.1",
"react-native-keyboard-aware-scroll-view": "0.9.5",
"react-native-linear-gradient": "2.8.3",
"react-native-markdown-display": "7.0.2",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,30 @@ import { Divider, Flex, Paper } from '@audius/harmony-native'

import { Skeleton } from '../skeleton'

export const CollectionCardSkeleton = () => {
export const CollectionCardSkeleton = ({
noShimmer
}: {
noShimmer?: boolean
}) => {
return (
<Paper border='default'>
<Flex p='s' gap='s' alignItems='center'>
<Skeleton style={{ width: '100%', aspectRatio: 1 }} />
<Skeleton height={20} width='90%' style={{ marginBottom: 6 }} />
<Skeleton height={18} width={100} style={{ marginBottom: 4 }} />
<Skeleton
style={{ width: '100%', aspectRatio: 1 }}
noShimmer={noShimmer}
/>
<Skeleton
height={20}
width='90%'
style={{ marginBottom: 6 }}
noShimmer={noShimmer}
/>
<Skeleton
height={18}
width={100}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
</Flex>
<Divider orientation='horizontal' />
<Flex
Expand All@@ -18,7 +35,7 @@ export const CollectionCardSkeleton = () => {
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
<Skeleton height={16} width={100} />
<Skeleton height={16} width={100} noShimmer={noShimmer} />
</Flex>
</Paper>
)
Expand Down
5 changes: 3 additions & 2 deletions packages/mobile/src/components/core/CardList.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ export type CardListProps<ItemT> = Omit<FlatListProps<ItemT>, 'data'> & {
FlatListComponent?: ComponentType<FlatListProps<ItemT | LoadingCard>>
isLoading?: boolean
isLoadingMore?: boolean
LoadingCardComponent?: ComponentType
LoadingCardComponent?: ComponentType<{ noShimmer?: boolean }>
// If total count is known, use this to aid in rendering the right number
// of skeletons
totalCount?: number
Expand DownExpand Up@@ -88,14 +88,15 @@ export function CardList<ItemT extends {}>(props: CardListProps<ItemT>) {
const data = useMemo(() => {
const skeletonData = isLoading ? getSkeletonData(totalCount) : []
const moreSkeletonData = isLoadingMore ? getSkeletonData(2) : []

return [...(dataProp ?? []), ...skeletonData, ...moreSkeletonData]
}, [dataProp, isLoading, isLoadingMore, totalCount])

const handleRenderItem: ListRenderItem<ItemT | LoadingCard> = useCallback(
(info) => {
const itemElement =
'_loading' in info.item ? (
<LoadingCardComponent />
<LoadingCardComponent noShimmer />
) : (
(renderItem?.(info as ListRenderItemInfo<ItemT>) ?? null)
)
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
import {
Divider,
Flex,
IconHeart,
IconRepost,
IconShare,
Paper
} from '@audius/harmony-native'
import Skeleton from 'app/components/skeleton'

interface CollectionTileSkeletonProps {
noShimmer?: boolean
}

export const CollectionTileSkeleton = ({
noShimmer
}: CollectionTileSkeletonProps) => {
return (
<Paper>
<Flex h={317} justifyContent='space-between'>
{/* Top section with image and metadata */}
<Flex direction='row' alignItems='flex-start' p='s' gap='m'>
{/* Collection image skeleton */}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comments helpful, should have done that on the web ones 😅

<Skeleton height={80} width={80} noShimmer={noShimmer} />

{/* Title and type skeleton */}
<Flex gap='s' flex={1}>
{/* Collection type label */}
<Skeleton width={60} height={16} noShimmer={noShimmer} />
{/* Collection title */}
<Skeleton width='90%' height={20} noShimmer={noShimmer} />
{/* User name */}
<Skeleton width='70%' height={18} noShimmer={noShimmer} />
</Flex>
</Flex>

{/* Track list skeleton */}
<Flex ph='s' gap='l'>
<Skeleton width='100%' height={16} noShimmer={noShimmer} />
<Skeleton width='90%' height={16} noShimmer={noShimmer} />
<Skeleton width='85%' height={16} noShimmer={noShimmer} />
</Flex>

<Flex>
{/* Bottom section with action buttons */}
<Divider mh='s' />
<Flex
direction='row'
justifyContent='space-between'
alignItems='center'
p='s'
>
<Flex direction='row' gap='2xl'>
<IconRepost color='disabled' />
<IconHeart color='disabled' />
<IconShare color='disabled' />
</Flex>
</Flex>
</Flex>
</Flex>
</Paper>
)
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,15 +8,19 @@ import {
} from '@audius/harmony-native'
import Skeleton from 'app/components/skeleton'

export const LineupTileSkeleton = () => {
interface LineupTileSkeletonProps {
noShimmer?: boolean
}

export const LineupTileSkeleton = ({ noShimmer }: LineupTileSkeletonProps) => {
return (
<Paper>
<Flex flex={1} justifyContent='space-between'>
<Flex direction='row' alignItems='center' p='s' gap='m'>
<Skeleton height={80} width={80} />
<Skeleton height={80} width={80} noShimmer={noShimmer} />
<Flex gap='s' flex={1}>
<Skeleton width='80%' height={20} />
<Skeleton width='60%' height={20} />
<Skeleton width='80%' height={20} noShimmer={noShimmer} />
<Skeleton width='60%' height={20} noShimmer={noShimmer} />
</Flex>
</Flex>
<Divider mh='s' pt='l' />
Expand Down
1 change: 1 addition & 0 deletions packages/mobile/src/components/lineup-tile/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { CollectionTile } from './CollectionTile'
export { CollectionTileSkeleton } from './CollectionTileSkeleton'
export { LineupTileSkeleton } from './LineupTileSkeleton'
export { TrackTile } from './TrackTile'
43 changes: 0 additions & 43 deletions packages/mobile/src/components/remix-carousel/RemixCarousel.tsx

This file was deleted.

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,8 @@ import {
} from '@audius/harmony-native'
import type { AppTabScreenParamList } from 'app/screens/app-screen'

import { CollectionCardSkeleton } from '../collection-list/CollectionCardSkeleton'
import { TrackImage } from '../image/TrackImage'
import { TrackCardSkeleton } from '../track/TrackCardSkeleton'
import { UserLink } from '../user-link'

const messages = {
Expand DownExpand Up@@ -46,7 +46,7 @@ export const RemixContestCard = (props: RemixContestCardProps) => {
}, [navigation, trackId])

if (!track || !remixContest) {
return <CollectionCardSkeleton />
return <TrackCardSkeleton />
}
return (
<Paper border='default' onPress={handlePress}>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,8 @@ import { getFollowIds } from 'common/store/pages/signon/selectors'
import LinearGradient from 'react-native-linear-gradient'
import { useDispatch, useSelector } from 'react-redux'

import type { UserListProps } from 'app/components/user-list'
import { ProfileCard, UserList } from 'app/components/user-list'
import type { UserCardListProps } from 'app/components/user-card-list'
import { ProfileCard, UserCardList } from 'app/components/user-card-list'
import { makeStyles } from 'app/styles'
import { useThemeColors } from 'app/utils/theme'

Expand All@@ -21,7 +21,7 @@ const useStyles = makeStyles(({ palette }) => ({
}
}))

type SuggestedArtistsListProps = Partial<UserListProps>
type SuggestedArtistsListProps = Partial<UserCardListProps>

export const SuggestedArtistsList = (props: SuggestedArtistsListProps) => {
const styles = useStyles()
Expand All@@ -44,7 +44,7 @@ export const SuggestedArtistsList = (props: SuggestedArtistsListProps) => {
)

return (
<UserList
<UserCardList
profiles={suggestedArtists}
renderItem={({ item: artist }) => {
const { user_id } = artist
Expand Down
34 changes: 34 additions & 0 deletions packages/mobile/src/components/track-card-list/TrackCardList.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import type { ID } from '@audius/common/models'

import type { CardListProps } from 'app/components/core'
import { CardList } from 'app/components/core'

import { TrackCard } from '../track/TrackCard'
import { TrackCardSkeleton } from '../track/TrackCardSkeleton'

type ListProps = Omit<CardListProps<{ trackId: ID }>, 'data'>

export type TrackCardListProps = {
trackIds: ID[] | undefined
onCardPress?: (trackId: ID) => void
} & Partial<ListProps>

export const TrackCardList = (props: TrackCardListProps) => {
const { trackIds, onCardPress, ...other } = props

const data = trackIds?.map((trackId) => ({ trackId }))

return (
<CardList
data={data}
renderItem={({ item }) => (
<TrackCard
id={item.trackId}
onPress={() => onCardPress?.(item.trackId)}
/>
)}
LoadingCardComponent={TrackCardSkeleton}
{...other}
/>
)
}
1 change: 1 addition & 0 deletions packages/mobile/src/components/track-card-list/index.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export * from './TrackCardList'
30 changes: 24 additions & 6 deletions packages/mobile/src/components/track/TrackCardSkeleton.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,32 @@ import { Divider, Flex, Paper } from '@audius/harmony-native'

import { Skeleton } from '../skeleton'

export const TrackCardSkeleton = () => {
export const TrackCardSkeleton = ({ noShimmer }: { noShimmer?: boolean }) => {
return (
<Paper border='default'>
<Flex p='s' gap='s' alignItems='center'>
<Skeleton style={{ width: '100%', aspectRatio: 1 }} />
<Skeleton height={20} width='90%' style={{ marginBottom: 6 }} />
<Skeleton height={18} width={100} style={{ marginBottom: 4 }} />
<Skeleton height={16} width={60} style={{ marginBottom: 4 }} />
<Skeleton
style={{ width: '100%', aspectRatio: 1 }}
noShimmer={noShimmer}
/>
<Skeleton
height={20}
width='90%'
style={{ marginBottom: 6 }}
noShimmer={noShimmer}
/>
<Skeleton
height={18}
width={100}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
<Skeleton
height={16}
width={60}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
</Flex>
<Divider orientation='horizontal' />
<Flex
Expand All@@ -19,7 +37,7 @@ export const TrackCardSkeleton = () => {
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
<Skeleton height={16} width={100} />
<Skeleton height={16} width={100} noShimmer={noShimmer} />
</Flex>
</Paper>
)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,8 +51,9 @@ export const UserCard = (props: UserCardProps) => {
size: SquareSizes.SIZE_480_BY_480
})

if (!handle || follower_count === undefined || source === undefined)
if (!handle || follower_count === undefined) {
return null
}

return (
<Paper border='default' onPress={handlePress} {...other}>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { HashId, Id, full } from '@audius/sdk'
import { Id, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
Expand DownExpand Up@@ -68,7 +68,7 @@ export const useRecentlyPlayedTracks = (
queryClient
})

return data.map((trackActivity) => HashId.parse(trackActivity.item.id))
return tracks.map((track) => track.track_id)
},
select: (data) => data.pages.flat(),
...options,
Expand Down
1 change: 1 addition & 0 deletions packages/mobile/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,7 @@
"react-native-image-picker": "7.2.3",
"react-native-in-app-review": "4.3.3",
"react-native-inset-shadow": "1.0.3",
"react-native-intersection-observer": "0.2.1",
"react-native-keyboard-aware-scroll-view": "0.9.5",
"react-native-linear-gradient": "2.8.3",
"react-native-markdown-display": "7.0.2",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,30 @@ import { Divider, Flex, Paper } from '@audius/harmony-native'

import { Skeleton } from '../skeleton'

export const CollectionCardSkeleton = () => {
export const CollectionCardSkeleton = ({
noShimmer
}: {
noShimmer?: boolean
}) => {
return (
<Paper border='default'>
<Flex p='s' gap='s' alignItems='center'>
<Skeleton style={{ width: '100%', aspectRatio: 1 }} />
<Skeleton height={20} width='90%' style={{ marginBottom: 6 }} />
<Skeleton height={18} width={100} style={{ marginBottom: 4 }} />
<Skeleton
style={{ width: '100%', aspectRatio: 1 }}
noShimmer={noShimmer}
/>
<Skeleton
height={20}
width='90%'
style={{ marginBottom: 6 }}
noShimmer={noShimmer}
/>
<Skeleton
height={18}
width={100}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
</Flex>
<Divider orientation='horizontal' />
<Flex
Expand All@@ -18,7 +35,7 @@ export const CollectionCardSkeleton = () => {
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
<Skeleton height={16} width={100} />
<Skeleton height={16} width={100} noShimmer={noShimmer} />
</Flex>
</Paper>
)
Expand Down
5 changes: 3 additions & 2 deletions packages/mobile/src/components/core/CardList.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ export type CardListProps<ItemT> = Omit<FlatListProps<ItemT>, 'data'> & {
FlatListComponent?: ComponentType<FlatListProps<ItemT | LoadingCard>>
isLoading?: boolean
isLoadingMore?: boolean
LoadingCardComponent?: ComponentType
LoadingCardComponent?: ComponentType<{ noShimmer?: boolean }>
// If total count is known, use this to aid in rendering the right number
// of skeletons
totalCount?: number
Expand DownExpand Up@@ -88,14 +88,15 @@ export function CardList<ItemT extends {}>(props: CardListProps<ItemT>) {
const data = useMemo(() => {
const skeletonData = isLoading ? getSkeletonData(totalCount) : []
const moreSkeletonData = isLoadingMore ? getSkeletonData(2) : []

return [...(dataProp ?? []), ...skeletonData, ...moreSkeletonData]
}, [dataProp, isLoading, isLoadingMore, totalCount])

const handleRenderItem: ListRenderItem<ItemT | LoadingCard> = useCallback(
(info) => {
const itemElement =
'_loading' in info.item ? (
<LoadingCardComponent />
<LoadingCardComponent noShimmer />
) : (
(renderItem?.(info as ListRenderItemInfo<ItemT>) ?? null)
)
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
import {
Divider,
Flex,
IconHeart,
IconRepost,
IconShare,
Paper
} from '@audius/harmony-native'
import Skeleton from 'app/components/skeleton'

interface CollectionTileSkeletonProps {
noShimmer?: boolean
}

export const CollectionTileSkeleton = ({
noShimmer
}: CollectionTileSkeletonProps) => {
return (
<Paper>
<Flex h={317} justifyContent='space-between'>
{/* Top section with image and metadata */}
<Flex direction='row' alignItems='flex-start' p='s' gap='m'>
{/* Collection image skeleton */}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comments helpful, should have done that on the web ones 😅

<Skeleton height={80} width={80} noShimmer={noShimmer} />

{/* Title and type skeleton */}
<Flex gap='s' flex={1}>
{/* Collection type label */}
<Skeleton width={60} height={16} noShimmer={noShimmer} />
{/* Collection title */}
<Skeleton width='90%' height={20} noShimmer={noShimmer} />
{/* User name */}
<Skeleton width='70%' height={18} noShimmer={noShimmer} />
</Flex>
</Flex>

{/* Track list skeleton */}
<Flex ph='s' gap='l'>
<Skeleton width='100%' height={16} noShimmer={noShimmer} />
<Skeleton width='90%' height={16} noShimmer={noShimmer} />
<Skeleton width='85%' height={16} noShimmer={noShimmer} />
</Flex>

<Flex>
{/* Bottom section with action buttons */}
<Divider mh='s' />
<Flex
direction='row'
justifyContent='space-between'
alignItems='center'
p='s'
>
<Flex direction='row' gap='2xl'>
<IconRepost color='disabled' />
<IconHeart color='disabled' />
<IconShare color='disabled' />
</Flex>
</Flex>
</Flex>
</Flex>
</Paper>
)
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,15 +8,19 @@ import {
} from '@audius/harmony-native'
import Skeleton from 'app/components/skeleton'

export const LineupTileSkeleton = () => {
interface LineupTileSkeletonProps {
noShimmer?: boolean
}

export const LineupTileSkeleton = ({ noShimmer }: LineupTileSkeletonProps) => {
return (
<Paper>
<Flex flex={1} justifyContent='space-between'>
<Flex direction='row' alignItems='center' p='s' gap='m'>
<Skeleton height={80} width={80} />
<Skeleton height={80} width={80} noShimmer={noShimmer} />
<Flex gap='s' flex={1}>
<Skeleton width='80%' height={20} />
<Skeleton width='60%' height={20} />
<Skeleton width='80%' height={20} noShimmer={noShimmer} />
<Skeleton width='60%' height={20} noShimmer={noShimmer} />
</Flex>
</Flex>
<Divider mh='s' pt='l' />
Expand Down
1 change: 1 addition & 0 deletions packages/mobile/src/components/lineup-tile/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { CollectionTile } from './CollectionTile'
export { CollectionTileSkeleton } from './CollectionTileSkeleton'
export { LineupTileSkeleton } from './LineupTileSkeleton'
export { TrackTile } from './TrackTile'
43 changes: 0 additions & 43 deletions packages/mobile/src/components/remix-carousel/RemixCarousel.tsx

This file was deleted.

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,8 @@ import {
} from '@audius/harmony-native'
import type { AppTabScreenParamList } from 'app/screens/app-screen'

import { CollectionCardSkeleton } from '../collection-list/CollectionCardSkeleton'
import { TrackImage } from '../image/TrackImage'
import { TrackCardSkeleton } from '../track/TrackCardSkeleton'
import { UserLink } from '../user-link'

const messages = {
Expand DownExpand Up@@ -46,7 +46,7 @@ export const RemixContestCard = (props: RemixContestCardProps) => {
}, [navigation, trackId])

if (!track || !remixContest) {
return <CollectionCardSkeleton />
return <TrackCardSkeleton />
}
return (
<Paper border='default' onPress={handlePress}>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,8 @@ import { getFollowIds } from 'common/store/pages/signon/selectors'
import LinearGradient from 'react-native-linear-gradient'
import { useDispatch, useSelector } from 'react-redux'

import type { UserListProps } from 'app/components/user-list'
import { ProfileCard, UserList } from 'app/components/user-list'
import type { UserCardListProps } from 'app/components/user-card-list'
import { ProfileCard, UserCardList } from 'app/components/user-card-list'
import { makeStyles } from 'app/styles'
import { useThemeColors } from 'app/utils/theme'

Expand All@@ -21,7 +21,7 @@ const useStyles = makeStyles(({ palette }) => ({
}
}))

type SuggestedArtistsListProps = Partial<UserListProps>
type SuggestedArtistsListProps = Partial<UserCardListProps>

export const SuggestedArtistsList = (props: SuggestedArtistsListProps) => {
const styles = useStyles()
Expand All@@ -44,7 +44,7 @@ export const SuggestedArtistsList = (props: SuggestedArtistsListProps) => {
)

return (
<UserList
<UserCardList
profiles={suggestedArtists}
renderItem={({ item: artist }) => {
const { user_id } = artist
Expand Down
34 changes: 34 additions & 0 deletions packages/mobile/src/components/track-card-list/TrackCardList.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import type { ID } from '@audius/common/models'

import type { CardListProps } from 'app/components/core'
import { CardList } from 'app/components/core'

import { TrackCard } from '../track/TrackCard'
import { TrackCardSkeleton } from '../track/TrackCardSkeleton'

type ListProps = Omit<CardListProps<{ trackId: ID }>, 'data'>

export type TrackCardListProps = {
trackIds: ID[] | undefined
onCardPress?: (trackId: ID) => void
} & Partial<ListProps>

export const TrackCardList = (props: TrackCardListProps) => {
const { trackIds, onCardPress, ...other } = props

const data = trackIds?.map((trackId) => ({ trackId }))

return (
<CardList
data={data}
renderItem={({ item }) => (
<TrackCard
id={item.trackId}
onPress={() => onCardPress?.(item.trackId)}
/>
)}
LoadingCardComponent={TrackCardSkeleton}
{...other}
/>
)
}
1 change: 1 addition & 0 deletions packages/mobile/src/components/track-card-list/index.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export * from './TrackCardList'
30 changes: 24 additions & 6 deletions packages/mobile/src/components/track/TrackCardSkeleton.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,32 @@ import { Divider, Flex, Paper } from '@audius/harmony-native'

import { Skeleton } from '../skeleton'

export const TrackCardSkeleton = () => {
export const TrackCardSkeleton = ({ noShimmer }: { noShimmer?: boolean }) => {
return (
<Paper border='default'>
<Flex p='s' gap='s' alignItems='center'>
<Skeleton style={{ width: '100%', aspectRatio: 1 }} />
<Skeleton height={20} width='90%' style={{ marginBottom: 6 }} />
<Skeleton height={18} width={100} style={{ marginBottom: 4 }} />
<Skeleton height={16} width={60} style={{ marginBottom: 4 }} />
<Skeleton
style={{ width: '100%', aspectRatio: 1 }}
noShimmer={noShimmer}
/>
<Skeleton
height={20}
width='90%'
style={{ marginBottom: 6 }}
noShimmer={noShimmer}
/>
<Skeleton
height={18}
width={100}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
<Skeleton
height={16}
width={60}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
</Flex>
<Divider orientation='horizontal' />
<Flex
Expand All@@ -19,7 +37,7 @@ export const TrackCardSkeleton = () => {
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
<Skeleton height={16} width={100} />
<Skeleton height={16} width={100} noShimmer={noShimmer} />
</Flex>
</Paper>
)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,8 +51,9 @@ export const UserCard = (props: UserCardProps) => {
size: SquareSizes.SIZE_480_BY_480
})

if (!handle || follower_count === undefined || source === undefined)
if (!handle || follower_count === undefined) {
return null
}

return (
<Paper border='default' onPress={handlePress} {...other}>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { HashId, Id, full } from '@audius/sdk'
import { Id, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
Expand DownExpand Up@@ -68,7 +68,7 @@ export const useRecentlyPlayedTracks = (
queryClient
})

return data.map((trackActivity) => HashId.parse(trackActivity.item.id))
return tracks.map((track) => track.track_id)
},
select: (data) => data.pages.flat(),
...options,
Expand Down
1 change: 1 addition & 0 deletions packages/mobile/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,7 @@
"react-native-image-picker": "7.2.3",
"react-native-in-app-review": "4.3.3",
"react-native-inset-shadow": "1.0.3",
"react-native-intersection-observer": "0.2.1",
"react-native-keyboard-aware-scroll-view": "0.9.5",
"react-native-linear-gradient": "2.8.3",
"react-native-markdown-display": "7.0.2",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,30 @@ import { Divider, Flex, Paper } from '@audius/harmony-native'

import { Skeleton } from '../skeleton'

export const CollectionCardSkeleton = () => {
export const CollectionCardSkeleton = ({
noShimmer
}: {
noShimmer?: boolean
}) => {
return (
<Paper border='default'>
<Flex p='s' gap='s' alignItems='center'>
<Skeleton style={{ width: '100%', aspectRatio: 1 }} />
<Skeleton height={20} width='90%' style={{ marginBottom: 6 }} />
<Skeleton height={18} width={100} style={{ marginBottom: 4 }} />
<Skeleton
style={{ width: '100%', aspectRatio: 1 }}
noShimmer={noShimmer}
/>
<Skeleton
height={20}
width='90%'
style={{ marginBottom: 6 }}
noShimmer={noShimmer}
/>
<Skeleton
height={18}
width={100}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
</Flex>
<Divider orientation='horizontal' />
<Flex
Expand All@@ -18,7 +35,7 @@ export const CollectionCardSkeleton = () => {
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
<Skeleton height={16} width={100} />
<Skeleton height={16} width={100} noShimmer={noShimmer} />
</Flex>
</Paper>
)
Expand Down
5 changes: 3 additions & 2 deletions packages/mobile/src/components/core/CardList.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ export type CardListProps<ItemT> = Omit<FlatListProps<ItemT>, 'data'> & {
FlatListComponent?: ComponentType<FlatListProps<ItemT | LoadingCard>>
isLoading?: boolean
isLoadingMore?: boolean
LoadingCardComponent?: ComponentType
LoadingCardComponent?: ComponentType<{ noShimmer?: boolean }>
// If total count is known, use this to aid in rendering the right number
// of skeletons
totalCount?: number
Expand DownExpand Up@@ -88,14 +88,15 @@ export function CardList<ItemT extends {}>(props: CardListProps<ItemT>) {
const data = useMemo(() => {
const skeletonData = isLoading ? getSkeletonData(totalCount) : []
const moreSkeletonData = isLoadingMore ? getSkeletonData(2) : []

return [...(dataProp ?? []), ...skeletonData, ...moreSkeletonData]
}, [dataProp, isLoading, isLoadingMore, totalCount])

const handleRenderItem: ListRenderItem<ItemT | LoadingCard> = useCallback(
(info) => {
const itemElement =
'_loading' in info.item ? (
<LoadingCardComponent />
<LoadingCardComponent noShimmer />
) : (
(renderItem?.(info as ListRenderItemInfo<ItemT>) ?? null)
)
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
import {
Divider,
Flex,
IconHeart,
IconRepost,
IconShare,
Paper
} from '@audius/harmony-native'
import Skeleton from 'app/components/skeleton'

interface CollectionTileSkeletonProps {
noShimmer?: boolean
}

export const CollectionTileSkeleton = ({
noShimmer
}: CollectionTileSkeletonProps) => {
return (
<Paper>
<Flex h={317} justifyContent='space-between'>
{/* Top section with image and metadata */}
<Flex direction='row' alignItems='flex-start' p='s' gap='m'>
{/* Collection image skeleton */}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comments helpful, should have done that on the web ones 😅

<Skeleton height={80} width={80} noShimmer={noShimmer} />

{/* Title and type skeleton */}
<Flex gap='s' flex={1}>
{/* Collection type label */}
<Skeleton width={60} height={16} noShimmer={noShimmer} />
{/* Collection title */}
<Skeleton width='90%' height={20} noShimmer={noShimmer} />
{/* User name */}
<Skeleton width='70%' height={18} noShimmer={noShimmer} />
</Flex>
</Flex>

{/* Track list skeleton */}
<Flex ph='s' gap='l'>
<Skeleton width='100%' height={16} noShimmer={noShimmer} />
<Skeleton width='90%' height={16} noShimmer={noShimmer} />
<Skeleton width='85%' height={16} noShimmer={noShimmer} />
</Flex>

<Flex>
{/* Bottom section with action buttons */}
<Divider mh='s' />
<Flex
direction='row'
justifyContent='space-between'
alignItems='center'
p='s'
>
<Flex direction='row' gap='2xl'>
<IconRepost color='disabled' />
<IconHeart color='disabled' />
<IconShare color='disabled' />
</Flex>
</Flex>
</Flex>
</Flex>
</Paper>
)
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,15 +8,19 @@ import {
} from '@audius/harmony-native'
import Skeleton from 'app/components/skeleton'

export const LineupTileSkeleton = () => {
interface LineupTileSkeletonProps {
noShimmer?: boolean
}

export const LineupTileSkeleton = ({ noShimmer }: LineupTileSkeletonProps) => {
return (
<Paper>
<Flex flex={1} justifyContent='space-between'>
<Flex direction='row' alignItems='center' p='s' gap='m'>
<Skeleton height={80} width={80} />
<Skeleton height={80} width={80} noShimmer={noShimmer} />
<Flex gap='s' flex={1}>
<Skeleton width='80%' height={20} />
<Skeleton width='60%' height={20} />
<Skeleton width='80%' height={20} noShimmer={noShimmer} />
<Skeleton width='60%' height={20} noShimmer={noShimmer} />
</Flex>
</Flex>
<Divider mh='s' pt='l' />
Expand Down
1 change: 1 addition & 0 deletions packages/mobile/src/components/lineup-tile/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { CollectionTile } from './CollectionTile'
export { CollectionTileSkeleton } from './CollectionTileSkeleton'
export { LineupTileSkeleton } from './LineupTileSkeleton'
export { TrackTile } from './TrackTile'
43 changes: 0 additions & 43 deletions packages/mobile/src/components/remix-carousel/RemixCarousel.tsx

This file was deleted.

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,8 @@ import {
} from '@audius/harmony-native'
import type { AppTabScreenParamList } from 'app/screens/app-screen'

import { CollectionCardSkeleton } from '../collection-list/CollectionCardSkeleton'
import { TrackImage } from '../image/TrackImage'
import { TrackCardSkeleton } from '../track/TrackCardSkeleton'
import { UserLink } from '../user-link'

const messages = {
Expand DownExpand Up@@ -46,7 +46,7 @@ export const RemixContestCard = (props: RemixContestCardProps) => {
}, [navigation, trackId])

if (!track || !remixContest) {
return <CollectionCardSkeleton />
return <TrackCardSkeleton />
}
return (
<Paper border='default' onPress={handlePress}>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,8 @@ import { getFollowIds } from 'common/store/pages/signon/selectors'
import LinearGradient from 'react-native-linear-gradient'
import { useDispatch, useSelector } from 'react-redux'

import type { UserListProps } from 'app/components/user-list'
import { ProfileCard, UserList } from 'app/components/user-list'
import type { UserCardListProps } from 'app/components/user-card-list'
import { ProfileCard, UserCardList } from 'app/components/user-card-list'
import { makeStyles } from 'app/styles'
import { useThemeColors } from 'app/utils/theme'

Expand All@@ -21,7 +21,7 @@ const useStyles = makeStyles(({ palette }) => ({
}
}))

type SuggestedArtistsListProps = Partial<UserListProps>
type SuggestedArtistsListProps = Partial<UserCardListProps>

export const SuggestedArtistsList = (props: SuggestedArtistsListProps) => {
const styles = useStyles()
Expand All@@ -44,7 +44,7 @@ export const SuggestedArtistsList = (props: SuggestedArtistsListProps) => {
)

return (
<UserList
<UserCardList
profiles={suggestedArtists}
renderItem={({ item: artist }) => {
const { user_id } = artist
Expand Down
34 changes: 34 additions & 0 deletions packages/mobile/src/components/track-card-list/TrackCardList.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import type { ID } from '@audius/common/models'

import type { CardListProps } from 'app/components/core'
import { CardList } from 'app/components/core'

import { TrackCard } from '../track/TrackCard'
import { TrackCardSkeleton } from '../track/TrackCardSkeleton'

type ListProps = Omit<CardListProps<{ trackId: ID }>, 'data'>

export type TrackCardListProps = {
trackIds: ID[] | undefined
onCardPress?: (trackId: ID) => void
} & Partial<ListProps>

export const TrackCardList = (props: TrackCardListProps) => {
const { trackIds, onCardPress, ...other } = props

const data = trackIds?.map((trackId) => ({ trackId }))

return (
<CardList
data={data}
renderItem={({ item }) => (
<TrackCard
id={item.trackId}
onPress={() => onCardPress?.(item.trackId)}
/>
)}
LoadingCardComponent={TrackCardSkeleton}
{...other}
/>
)
}
1 change: 1 addition & 0 deletions packages/mobile/src/components/track-card-list/index.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export * from './TrackCardList'
30 changes: 24 additions & 6 deletions packages/mobile/src/components/track/TrackCardSkeleton.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,32 @@ import { Divider, Flex, Paper } from '@audius/harmony-native'

import { Skeleton } from '../skeleton'

export const TrackCardSkeleton = () => {
export const TrackCardSkeleton = ({ noShimmer }: { noShimmer?: boolean }) => {
return (
<Paper border='default'>
<Flex p='s' gap='s' alignItems='center'>
<Skeleton style={{ width: '100%', aspectRatio: 1 }} />
<Skeleton height={20} width='90%' style={{ marginBottom: 6 }} />
<Skeleton height={18} width={100} style={{ marginBottom: 4 }} />
<Skeleton height={16} width={60} style={{ marginBottom: 4 }} />
<Skeleton
style={{ width: '100%', aspectRatio: 1 }}
noShimmer={noShimmer}
/>
<Skeleton
height={20}
width='90%'
style={{ marginBottom: 6 }}
noShimmer={noShimmer}
/>
<Skeleton
height={18}
width={100}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
<Skeleton
height={16}
width={60}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
</Flex>
<Divider orientation='horizontal' />
<Flex
Expand All@@ -19,7 +37,7 @@ export const TrackCardSkeleton = () => {
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
<Skeleton height={16} width={100} />
<Skeleton height={16} width={100} noShimmer={noShimmer} />
</Flex>
</Paper>
)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,8 +51,9 @@ export const UserCard = (props: UserCardProps) => {
size: SquareSizes.SIZE_480_BY_480
})

if (!handle || follower_count === undefined || source === undefined)
if (!handle || follower_count === undefined) {
return null
}

return (
<Paper border='default' onPress={handlePress} {...other}>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { HashId, Id, full } from '@audius/sdk'
import { Id, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
Expand DownExpand Up@@ -68,7 +68,7 @@ export const useRecentlyPlayedTracks = (
queryClient
})

return data.map((trackActivity) => HashId.parse(trackActivity.item.id))
return tracks.map((track) => track.track_id)
},
select: (data) => data.pages.flat(),
...options,
Expand Down
1 change: 1 addition & 0 deletions packages/mobile/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,7 @@
"react-native-image-picker": "7.2.3",
"react-native-in-app-review": "4.3.3",
"react-native-inset-shadow": "1.0.3",
"react-native-intersection-observer": "0.2.1",
"react-native-keyboard-aware-scroll-view": "0.9.5",
"react-native-linear-gradient": "2.8.3",
"react-native-markdown-display": "7.0.2",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,30 @@ import { Divider, Flex, Paper } from '@audius/harmony-native'

import { Skeleton } from '../skeleton'

export const CollectionCardSkeleton = () => {
export const CollectionCardSkeleton = ({
noShimmer
}: {
noShimmer?: boolean
}) => {
return (
<Paper border='default'>
<Flex p='s' gap='s' alignItems='center'>
<Skeleton style={{ width: '100%', aspectRatio: 1 }} />
<Skeleton height={20} width='90%' style={{ marginBottom: 6 }} />
<Skeleton height={18} width={100} style={{ marginBottom: 4 }} />
<Skeleton
style={{ width: '100%', aspectRatio: 1 }}
noShimmer={noShimmer}
/>
<Skeleton
height={20}
width='90%'
style={{ marginBottom: 6 }}
noShimmer={noShimmer}
/>
<Skeleton
height={18}
width={100}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
</Flex>
<Divider orientation='horizontal' />
<Flex
Expand All@@ -18,7 +35,7 @@ export const CollectionCardSkeleton = () => {
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
<Skeleton height={16} width={100} />
<Skeleton height={16} width={100} noShimmer={noShimmer} />
</Flex>
</Paper>
)
Expand Down
5 changes: 3 additions & 2 deletions packages/mobile/src/components/core/CardList.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ export type CardListProps<ItemT> = Omit<FlatListProps<ItemT>, 'data'> & {
FlatListComponent?: ComponentType<FlatListProps<ItemT | LoadingCard>>
isLoading?: boolean
isLoadingMore?: boolean
LoadingCardComponent?: ComponentType
LoadingCardComponent?: ComponentType<{ noShimmer?: boolean }>
// If total count is known, use this to aid in rendering the right number
// of skeletons
totalCount?: number
Expand DownExpand Up@@ -88,14 +88,15 @@ export function CardList<ItemT extends {}>(props: CardListProps<ItemT>) {
const data = useMemo(() => {
const skeletonData = isLoading ? getSkeletonData(totalCount) : []
const moreSkeletonData = isLoadingMore ? getSkeletonData(2) : []

return [...(dataProp ?? []), ...skeletonData, ...moreSkeletonData]
}, [dataProp, isLoading, isLoadingMore, totalCount])

const handleRenderItem: ListRenderItem<ItemT | LoadingCard> = useCallback(
(info) => {
const itemElement =
'_loading' in info.item ? (
<LoadingCardComponent />
<LoadingCardComponent noShimmer />
) : (
(renderItem?.(info as ListRenderItemInfo<ItemT>) ?? null)
)
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
import {
Divider,
Flex,
IconHeart,
IconRepost,
IconShare,
Paper
} from '@audius/harmony-native'
import Skeleton from 'app/components/skeleton'

interface CollectionTileSkeletonProps {
noShimmer?: boolean
}

export const CollectionTileSkeleton = ({
noShimmer
}: CollectionTileSkeletonProps) => {
return (
<Paper>
<Flex h={317} justifyContent='space-between'>
{/* Top section with image and metadata */}
<Flex direction='row' alignItems='flex-start' p='s' gap='m'>
{/* Collection image skeleton */}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comments helpful, should have done that on the web ones 😅

<Skeleton height={80} width={80} noShimmer={noShimmer} />

{/* Title and type skeleton */}
<Flex gap='s' flex={1}>
{/* Collection type label */}
<Skeleton width={60} height={16} noShimmer={noShimmer} />
{/* Collection title */}
<Skeleton width='90%' height={20} noShimmer={noShimmer} />
{/* User name */}
<Skeleton width='70%' height={18} noShimmer={noShimmer} />
</Flex>
</Flex>

{/* Track list skeleton */}
<Flex ph='s' gap='l'>
<Skeleton width='100%' height={16} noShimmer={noShimmer} />
<Skeleton width='90%' height={16} noShimmer={noShimmer} />
<Skeleton width='85%' height={16} noShimmer={noShimmer} />
</Flex>

<Flex>
{/* Bottom section with action buttons */}
<Divider mh='s' />
<Flex
direction='row'
justifyContent='space-between'
alignItems='center'
p='s'
>
<Flex direction='row' gap='2xl'>
<IconRepost color='disabled' />
<IconHeart color='disabled' />
<IconShare color='disabled' />
</Flex>
</Flex>
</Flex>
</Flex>
</Paper>
)
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,15 +8,19 @@ import {
} from '@audius/harmony-native'
import Skeleton from 'app/components/skeleton'

export const LineupTileSkeleton = () => {
interface LineupTileSkeletonProps {
noShimmer?: boolean
}

export const LineupTileSkeleton = ({ noShimmer }: LineupTileSkeletonProps) => {
return (
<Paper>
<Flex flex={1} justifyContent='space-between'>
<Flex direction='row' alignItems='center' p='s' gap='m'>
<Skeleton height={80} width={80} />
<Skeleton height={80} width={80} noShimmer={noShimmer} />
<Flex gap='s' flex={1}>
<Skeleton width='80%' height={20} />
<Skeleton width='60%' height={20} />
<Skeleton width='80%' height={20} noShimmer={noShimmer} />
<Skeleton width='60%' height={20} noShimmer={noShimmer} />
</Flex>
</Flex>
<Divider mh='s' pt='l' />
Expand Down
1 change: 1 addition & 0 deletions packages/mobile/src/components/lineup-tile/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { CollectionTile } from './CollectionTile'
export { CollectionTileSkeleton } from './CollectionTileSkeleton'
export { LineupTileSkeleton } from './LineupTileSkeleton'
export { TrackTile } from './TrackTile'
43 changes: 0 additions & 43 deletions packages/mobile/src/components/remix-carousel/RemixCarousel.tsx

This file was deleted.

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,8 @@ import {
} from '@audius/harmony-native'
import type { AppTabScreenParamList } from 'app/screens/app-screen'

import { CollectionCardSkeleton } from '../collection-list/CollectionCardSkeleton'
import { TrackImage } from '../image/TrackImage'
import { TrackCardSkeleton } from '../track/TrackCardSkeleton'
import { UserLink } from '../user-link'

const messages = {
Expand DownExpand Up@@ -46,7 +46,7 @@ export const RemixContestCard = (props: RemixContestCardProps) => {
}, [navigation, trackId])

if (!track || !remixContest) {
return <CollectionCardSkeleton />
return <TrackCardSkeleton />
}
return (
<Paper border='default' onPress={handlePress}>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,8 @@ import { getFollowIds } from 'common/store/pages/signon/selectors'
import LinearGradient from 'react-native-linear-gradient'
import { useDispatch, useSelector } from 'react-redux'

import type { UserListProps } from 'app/components/user-list'
import { ProfileCard, UserList } from 'app/components/user-list'
import type { UserCardListProps } from 'app/components/user-card-list'
import { ProfileCard, UserCardList } from 'app/components/user-card-list'
import { makeStyles } from 'app/styles'
import { useThemeColors } from 'app/utils/theme'

Expand All@@ -21,7 +21,7 @@ const useStyles = makeStyles(({ palette }) => ({
}
}))

type SuggestedArtistsListProps = Partial<UserListProps>
type SuggestedArtistsListProps = Partial<UserCardListProps>

export const SuggestedArtistsList = (props: SuggestedArtistsListProps) => {
const styles = useStyles()
Expand All@@ -44,7 +44,7 @@ export const SuggestedArtistsList = (props: SuggestedArtistsListProps) => {
)

return (
<UserList
<UserCardList
profiles={suggestedArtists}
renderItem={({ item: artist }) => {
const { user_id } = artist
Expand Down
34 changes: 34 additions & 0 deletions packages/mobile/src/components/track-card-list/TrackCardList.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import type { ID } from '@audius/common/models'

import type { CardListProps } from 'app/components/core'
import { CardList } from 'app/components/core'

import { TrackCard } from '../track/TrackCard'
import { TrackCardSkeleton } from '../track/TrackCardSkeleton'

type ListProps = Omit<CardListProps<{ trackId: ID }>, 'data'>

export type TrackCardListProps = {
trackIds: ID[] | undefined
onCardPress?: (trackId: ID) => void
} & Partial<ListProps>

export const TrackCardList = (props: TrackCardListProps) => {
const { trackIds, onCardPress, ...other } = props

const data = trackIds?.map((trackId) => ({ trackId }))

return (
<CardList
data={data}
renderItem={({ item }) => (
<TrackCard
id={item.trackId}
onPress={() => onCardPress?.(item.trackId)}
/>
)}
LoadingCardComponent={TrackCardSkeleton}
{...other}
/>
)
}
1 change: 1 addition & 0 deletions packages/mobile/src/components/track-card-list/index.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export * from './TrackCardList'
30 changes: 24 additions & 6 deletions packages/mobile/src/components/track/TrackCardSkeleton.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,32 @@ import { Divider, Flex, Paper } from '@audius/harmony-native'

import { Skeleton } from '../skeleton'

export const TrackCardSkeleton = () => {
export const TrackCardSkeleton = ({ noShimmer }: { noShimmer?: boolean }) => {
return (
<Paper border='default'>
<Flex p='s' gap='s' alignItems='center'>
<Skeleton style={{ width: '100%', aspectRatio: 1 }} />
<Skeleton height={20} width='90%' style={{ marginBottom: 6 }} />
<Skeleton height={18} width={100} style={{ marginBottom: 4 }} />
<Skeleton height={16} width={60} style={{ marginBottom: 4 }} />
<Skeleton
style={{ width: '100%', aspectRatio: 1 }}
noShimmer={noShimmer}
/>
<Skeleton
height={20}
width='90%'
style={{ marginBottom: 6 }}
noShimmer={noShimmer}
/>
<Skeleton
height={18}
width={100}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
<Skeleton
height={16}
width={60}
style={{ marginBottom: 4 }}
noShimmer={noShimmer}
/>
</Flex>
<Divider orientation='horizontal' />
<Flex
Expand All@@ -19,7 +37,7 @@ export const TrackCardSkeleton = () => {
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
<Skeleton height={16} width={100} />
<Skeleton height={16} width={100} noShimmer={noShimmer} />
</Flex>
</Paper>
)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,8 +51,9 @@ export const UserCard = (props: UserCardProps) => {
size: SquareSizes.SIZE_480_BY_480
})

if (!handle || follower_count === undefined || source === undefined)
if (!handle || follower_count === undefined) {
return null
}

return (
<Paper border='default' onPress={handlePress} {...other}>
Expand Down
Loading