Skip to content
This repository has been archived by the owner on Oct 4, 2023. It is now read-only.

Fix android double play #2309

Merged
merged 1 commit into from
Nov 27, 2022
Merged

Fix android double play #2309

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
94 changes: 46 additions & 48 deletions packages/mobile/src/components/now-playing-drawer/NowPlayingDrawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,55 +294,53 @@ export const NowPlayingDrawer = memo(function NowPlayingDrawer(
// Disable safe area view edges because they are handled manually
disableSafeAreaView
>
{track ? (
<View
style={[
styles.container,
{ paddingTop: staticTopInset.current, paddingBottom: insets.bottom }
]}
>
<View style={styles.playBarContainer}>
<PlayBar
track={track}
user={user}
onPress={onDrawerOpen}
translationAnim={translationAnim}
/>
</View>
<Logo translationAnim={translationAnim} />
<View style={styles.titleBarContainer}>
<TitleBar onClose={handleDrawerCloseFromSwipe} />
</View>
<Pressable onPress={handlePressTitle} style={styles.artworkContainer}>
<Artwork track={track} />
</Pressable>
<View style={styles.trackInfoContainer}>
<TrackInfo
onPressArtist={handlePressArtist}
onPressTitle={handlePressTitle}
track={track}
user={user}
/>
</View>
<View style={styles.scrubberContainer}>
<Scrubber
mediaKey={`${mediaKey}`}
isPlaying={isPlaying}
onPressIn={onPressScrubberIn}
onPressOut={onPressScrubberOut}
duration={track?.duration ?? 0}
/>
</View>
<View style={styles.controlsContainer}>
<AudioControls
onNext={onNext}
onPrevious={onPrevious}
isPodcast={track?.genre === Genre.PODCASTS}
/>
<ActionsBar track={track} />
</View>
<View
style={[
styles.container,
{ paddingTop: staticTopInset.current, paddingBottom: insets.bottom }
]}
>
<View style={styles.playBarContainer}>
<PlayBar
track={track}
user={user}
onPress={onDrawerOpen}
translationAnim={translationAnim}
/>
</View>
) : null}
<Logo translationAnim={translationAnim} />
<View style={styles.titleBarContainer}>
<TitleBar onClose={handleDrawerCloseFromSwipe} />
</View>
<Pressable onPress={handlePressTitle} style={styles.artworkContainer}>
<Artwork track={track} />
</Pressable>
<View style={styles.trackInfoContainer}>
<TrackInfo
onPressArtist={handlePressArtist}
onPressTitle={handlePressTitle}
track={track}
user={user}
/>
</View>
<View style={styles.scrubberContainer}>
<Scrubber
mediaKey={`${mediaKey}`}
isPlaying={isPlaying}
onPressIn={onPressScrubberIn}
onPressOut={onPressScrubberOut}
duration={track?.duration ?? 0}
/>
</View>
<View style={styles.controlsContainer}>
<AudioControls
onNext={onNext}
onPrevious={onPrevious}
isPodcast={track?.genre === Genre.PODCASTS}
/>
<ActionsBar track={track} />
</View>
</View>
</Drawer>
)
})