diff --git a/src/common/CONSTANTS.js b/src/common/CONSTANTS.js index e755790bb..b5ee0b4fc 100644 --- a/src/common/CONSTANTS.js +++ b/src/common/CONSTANTS.js @@ -25,6 +25,19 @@ const TYPE_PRIORITIES = { adult: 1, other: -Infinity }; +const ICON_FOR_TYPE = new Map([ + ['movie', 'ic_movies'], + ['series', 'ic_series'], + ['channel', 'ic_channels'], + ['tv', 'ic_tv'], + ['book', 'ic_book'], + ['game', 'ic_games'], + ['music', 'ic_music'], + ['adult', 'ic_adult'], + ['radio', 'ic_radio'], + ['podcast', 'ic_podcast'], + ['other', 'ic_movies'], +]); module.exports = { CHROMECAST_RECEIVER_APP_ID, @@ -39,5 +52,6 @@ module.exports = { IMDB_LINK_CATEGORY, SHARE_LINK_CATEGORY, WRITERS_LINK_CATEGORY, - TYPE_PRIORITIES + TYPE_PRIORITIES, + ICON_FOR_TYPE }; diff --git a/src/common/MetaItem/MetaItem.js b/src/common/MetaItem/MetaItem.js index 5175b2ed6..0196cbf65 100644 --- a/src/common/MetaItem/MetaItem.js +++ b/src/common/MetaItem/MetaItem.js @@ -10,22 +10,9 @@ const Image = require('stremio/common/Image'); const Multiselect = require('stremio/common/Multiselect'); const PlayIconCircleCentered = require('stremio/common/PlayIconCircleCentered'); const useBinaryState = require('stremio/common/useBinaryState'); +const { ICON_FOR_TYPE } = require('stremio/common/CONSTANTS'); const styles = require('./styles'); -const ICON_FOR_TYPE = new Map([ - ['movie', 'ic_movies'], - ['series', 'ic_series'], - ['channel', 'ic_channels'], - ['tv', 'ic_tv'], - ['book', 'ic_book'], - ['game', 'ic_games'], - ['music', 'ic_music'], - ['adult', 'ic_adult'], - ['radio', 'ic_radio'], - ['podcast', 'ic_podcast'], - ['other', 'ic_movies'], -]); - const MetaItem = React.memo(({ className, type, name, poster, posterShape, playIcon, progress, options, deepLinks, dataset, optionOnSelect, ...props }) => { const [menuOpen, onMenuOpen, onMenuClose] = useBinaryState(false); const href = React.useMemo(() => { diff --git a/src/routes/Player/NextVideoPopup/NextVideoPopup.js b/src/routes/Player/NextVideoPopup/NextVideoPopup.js index 6198a5b2a..d424920a0 100644 --- a/src/routes/Player/NextVideoPopup/NextVideoPopup.js +++ b/src/routes/Player/NextVideoPopup/NextVideoPopup.js @@ -2,23 +2,9 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const Icon = require('@stremio/stremio-icons/dom'); -const { Image, Button } = require('stremio/common'); +const { Image, Button, CONSTANTS } = require('stremio/common'); const styles = require('./styles'); -const ICON_FOR_TYPE = new Map([ - ['movie', 'ic_movies'], - ['series', 'ic_series'], - ['channel', 'ic_channels'], - ['tv', 'ic_tv'], - ['book', 'ic_book'], - ['game', 'ic_games'], - ['music', 'ic_music'], - ['adult', 'ic_adult'], - ['radio', 'ic_radio'], - ['podcast', 'ic_podcast'], - ['other', 'ic_movies'], -]); - const NextVideoPopup = ({ className, metaItem, nextVideo, onDismiss, onPlayNextVideoRequested }) => { const watchNowButtonRef = React.useRef(null); const [animationEnded, setAnimationEnded] = React.useState(false); @@ -38,7 +24,7 @@ const NextVideoPopup = ({ className, metaItem, nextVideo, onDismiss, onPlayNextV return metaItem !== null && typeof metaItem.type === 'string' ? : null;