fix(2198): removed volumebar on mobile devices

keep-around/e01e6cc23405cdf81218a6099e04605a625bf7f5
Mirlan 4 years ago
parent a321a9186f
commit e01e6cc234
  1. 2
      src/features/MultiSourcePlayer/components/Settings/styled.tsx
  2. 24
      src/features/MultiSourcePlayer/index.tsx
  3. 2
      src/features/MultiSourcePlayer/styled.tsx
  4. 8
      src/features/StreamPlayer/index.tsx
  5. 4
      src/features/StreamPlayer/styled.tsx

@ -12,7 +12,7 @@ export const SettingsButton = styled(ButtonBase)`
? css` ? css`
width: 20px; width: 20px;
height: 18px; height: 18px;
margin-left: 8px; margin-left: 15px;
cursor: pointer; cursor: pointer;
` `
: ''}; : ''};

@ -178,12 +178,16 @@ export const MultiSourcePlayer = (props: Props) => {
disabled={isLastChapterPlaying} disabled={isLastChapterPlaying}
onClick={() => playNextChapter()} onClick={() => playNextChapter()}
/> />
<VolumeBar {
value={volumeInPercent} !isMobileDevice && (
muted={muted} <VolumeBar
onChange={onVolumeChange} value={volumeInPercent}
onClick={onVolumeClick} muted={muted}
/> onChange={onVolumeChange}
onClick={onVolumeClick}
/>
)
}
<PlaybackTime width={duration > HOUR_IN_MILLISECONDS ? 150 : 130}> <PlaybackTime width={duration > HOUR_IN_MILLISECONDS ? 150 : 130}>
{secondsToHms(allPlayedProgress / 1000)} {secondsToHms(allPlayedProgress / 1000)}
{' / '} {' / '}
@ -202,15 +206,15 @@ export const MultiSourcePlayer = (props: Props) => {
</ControlsGroup> </ControlsGroup>
<ControlsGroup> <ControlsGroup>
<Fullscreen
onClick={onFullscreenClick}
isFullscreen={isFullscreen}
/>
<Settings <Settings
onSelect={onQualitySelect} onSelect={onQualitySelect}
selectedQuality={selectedQuality} selectedQuality={selectedQuality}
videoQualities={videoQualities} videoQualities={videoQualities}
/> />
<Fullscreen
onClick={onFullscreenClick}
isFullscreen={isFullscreen}
/>
</ControlsGroup> </ControlsGroup>
</ControlsRow> </ControlsRow>
</Controls> </Controls>

@ -14,7 +14,7 @@ export const ChaptersText = styled.span`
? css` ? css`
margin: 0 5px; margin: 0 5px;
font-size: 12px; font-size: 12px;
width: 15%; width: 20%;
` `
: ''}; : ''};
` `

@ -149,15 +149,15 @@ export const StreamPlayer = (props: Props) => {
</LiveBtn> </LiveBtn>
) )
} }
<Fullscreen
onClick={onFullscreenClick}
isFullscreen={isFullscreen}
/>
<Settings <Settings
onSelect={onQualitySelect} onSelect={onQualitySelect}
selectedQuality={selectedQuality} selectedQuality={selectedQuality}
videoQualities={videoQualities} videoQualities={videoQualities}
/> />
<Fullscreen
onClick={onFullscreenClick}
isFullscreen={isFullscreen}
/>
</ControlsGroup> </ControlsGroup>
</ControlsRow> </ControlsRow>
</Controls> </Controls>

@ -182,7 +182,7 @@ type FullscreenProps = {
export const Fullscreen = styled(ButtonBase)<FullscreenProps>` export const Fullscreen = styled(ButtonBase)<FullscreenProps>`
width: 22px; width: 22px;
height: 20px; height: 20px;
margin-left: 31px; margin-left: 26px;
background-image: ${({ isFullscreen }) => ( background-image: ${({ isFullscreen }) => (
isFullscreen isFullscreen
? 'url(/images/player-fullscreen-off.svg)' ? 'url(/images/player-fullscreen-off.svg)'
@ -193,7 +193,7 @@ export const Fullscreen = styled(ButtonBase)<FullscreenProps>`
? css` ? css`
width: 20px; width: 20px;
height: 18px; height: 18px;
margin-left: 0; margin-left: 15px;
` `
: ''}; : ''};
` `

Loading…
Cancel
Save