Creepso/stremio-web
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-web.git synced 2026-03-11 21:27:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'development' into feat/shell-volume-booster

Browse source
This commit is contained in:
Ivelin Megdanov 2025-02-07 14:15:08 +02:00
commit 2d28973fea
6 changed files with 37 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package-lock.json generated
View file

@ -14,7 +14,7 @@
"@stremio/stremio-colors": "5.2.0",
"@stremio/stremio-core-web": "0.48.5",
"@stremio/stremio-icons": "5.4.1",
"@stremio/stremio-video": "0.0.48",
"@stremio/stremio-video": "0.0.52",
"a-color-picker": "1.2.1",
"bowser": "2.11.0",
"buffer": "6.0.3",
@ -3409,9 +3409,9 @@
]
},
"node_modules/@stremio/stremio-video": {
"version": "0.0.48",
"resolved": "https://registry.npmjs.org/@stremio/stremio-video/-/stremio-video-0.0.48.tgz",
"integrity": "sha512-6ALGXCZC4NPsfhPcrwFWQzvH6UMMRsgSkHetnOhv9WmZ5ubiyUdbBzj9atGiGuuQz8pRcze66ztrub+dsaQbpw==",
"version": "0.0.52",
"resolved": "https://registry.npmjs.org/@stremio/stremio-video/-/stremio-video-0.0.52.tgz",
"integrity": "sha512-OlHC8FIvYEyGXcNAM4W044Dqx6CmGb5BV3fDU361SyUjO9gKXXUWdL7LwmwHeWFeuy2sK1MEg4AT2JPptvJ0rg==",
"license": "MIT",
"dependencies": {
"buffer": "6.0.3",

2
package.json
View file

@ -18,7 +18,7 @@
"@stremio/stremio-colors": "5.2.0",
"@stremio/stremio-core-web": "0.48.5",
"@stremio/stremio-icons": "5.4.1",
"@stremio/stremio-video": "0.0.48",
"@stremio/stremio-video": "0.0.52",
"a-color-picker": "1.2.1",
"bowser": "2.11.0",
"buffer": "6.0.3",

5
src/routes/MetaDetails/StreamsList/Stream/Stream.js
View file

@ -181,12 +181,17 @@ const Stream = ({ className, videoId, videoReleased, addonName, name, descriptio
const renderMenu = React.useMemo(() => function renderMenu() {
return (
<div className={styles['context-menu-content']} onPointerDown={popupMenuOnPointerDown} onContextMenu={popupMenuOnContextMenu} onClick={popupMenuOnClick} onKeyDown={popupMenuOnKeyDown}>
<div className={styles['context-menu-title']}>
{description}
</div>
<Button className={styles['context-menu-option-container']} title={t('CTX_PLAY')}>
<Icon className={styles['menu-icon']} name={'play'} />
<div className={styles['context-menu-option-label']}>{t('CTX_PLAY')}</div>
</Button>
{
streamLink &&
<Button className={styles['context-menu-option-container']} title={t('CTX_COPY_STREAM_LINK')} onClick={copyStreamLink}>
<Icon className={styles['menu-icon']} name={'link'} />
<div className={styles['context-menu-option-label']}>{t('CTX_COPY_STREAM_LINK')}</div>
</Button>
}

22
src/routes/MetaDetails/StreamsList/Stream/styles.less
View file

@ -111,12 +111,29 @@
background-color: var(--secondary-accent-color);
}
.menu-icon {
flex: none;
width: 1.7rem;
height: 1.7rem;
margin-right: 1rem;
color: var(--color-placeholder);
}
.context-menu-container {
max-width: calc(90% - 1.5rem);
z-index: 2;
.context-menu-content {
--spatial-navigation-contain: contain;
.context-menu-title {
font-size: 0.9rem;
padding: 1rem 1.5rem;
font-weight: 100;
border-bottom: 1px solid var(--color-placeholder);
color: var(--primary-foreground-color);
white-space: break-spaces;
}
.context-menu-option-container {
display: flex;
@ -131,8 +148,9 @@
.context-menu-option-label {
font-size: 1rem;
font-weight: 500;
color:var(--primary-foreground-color);
font-weight: 300;
color: var(--primary-foreground-color);
text-transform: capitalize;
}
}
}

1
src/routes/Player/ControlBar/ControlBar.js
View file

@ -138,6 +138,7 @@ const ControlBar = ({
<VolumeSlider
className={styles['volume-slider']}
volume={volume}
muted={muted}
onVolumeChangeRequested={onVolumeChangeRequested}
/>
<div className={styles['spacing']} />

9
src/routes/Player/ControlBar/VolumeSlider/VolumeSlider.js
View file

@ -9,7 +9,7 @@ const { useServices } = require('stremio/services');
const { Slider } = require('stremio/components');
const styles = require('./styles');
const VolumeSlider = ({ className, volume, onVolumeChangeRequested }) => {
const VolumeSlider = ({ className, volume, onVolumeChangeRequested, muted }) => {
const { shell } = useServices();
const disabled = volume === null || isNaN(volume);
const routeFocused = useRouteFocused();
@ -48,7 +48,9 @@ const VolumeSlider = ({ className, volume, onVolumeChangeRequested }) => {
className={classnames(className, styles['volume-slider'], { 'active': slidingVolume !== null })}
value={
!disabled ?
slidingVolume !== null ? slidingVolume : volume
!muted ?
slidingVolume !== null ? slidingVolume : volume
: 0
:
100
}
@ -65,7 +67,8 @@ const VolumeSlider = ({ className, volume, onVolumeChangeRequested }) => {
VolumeSlider.propTypes = {
className: PropTypes.string,
volume: PropTypes.number,
onVolumeChangeRequested: PropTypes.func
onVolumeChangeRequested: PropTypes.func,
muted: PropTypes.bool,
};
module.exports = VolumeSlider;