From 73e49c1a36870cc7aa835b1653d02e9ef377bb2f Mon Sep 17 00:00:00 2001 From: nklhrstv Date: Sun, 15 Mar 2020 00:02:18 +0200 Subject: [PATCH] CONSTANTS module created --- src/common/CONSTANTS.js | 7 +++++++ src/common/index.js | 2 ++ src/routes/Player/SubtitlesPicker/SubtitlesPicker.js | 8 +++----- src/routes/Settings/useProfileSettingsInputs.js | 6 ++---- 4 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 src/common/CONSTANTS.js diff --git a/src/common/CONSTANTS.js b/src/common/CONSTANTS.js new file mode 100644 index 000000000..20bb87fc0 --- /dev/null +++ b/src/common/CONSTANTS.js @@ -0,0 +1,7 @@ +const SUBTITLES_SIZES = [75, 100, 125, 150, 175, 200, 250]; +const SUBTITLES_FONTS = ['Roboto', 'Arial', 'Halvetica', 'Times New Roman', 'Verdana', 'Courier', 'Lucida Console', 'sans-serif', 'serif', 'monospace']; + +module.exports = { + SUBTITLES_SIZES, + SUBTITLES_FONTS +}; diff --git a/src/common/index.js b/src/common/index.js index 77e787718..efeb21981 100644 --- a/src/common/index.js +++ b/src/common/index.js @@ -17,6 +17,7 @@ const SharePrompt = require('./SharePrompt'); const Slider = require('./Slider'); const TextInput = require('./TextInput'); const { ToastProvider, useToast } = require('./Toast'); +const CONSTANTS = require('./CONSTANTS'); const languageNames = require('./languageNames'); const routesRegexp = require('./routesRegexp'); const useAnimationFrame = require('./useAnimationFrame'); @@ -52,6 +53,7 @@ module.exports = { TextInput, ToastProvider, useToast, + CONSTANTS, languageNames, routesRegexp, useAnimationFrame, diff --git a/src/routes/Player/SubtitlesPicker/SubtitlesPicker.js b/src/routes/Player/SubtitlesPicker/SubtitlesPicker.js index 3703b6da1..873b29bf4 100644 --- a/src/routes/Player/SubtitlesPicker/SubtitlesPicker.js +++ b/src/routes/Player/SubtitlesPicker/SubtitlesPicker.js @@ -1,12 +1,10 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); -const Icon = require('stremio-icons/dom'); -const { Button, ColorInput, languageNames } = require('stremio/common'); +const { Button, CONSTANTS, languageNames } = require('stremio/common'); const DiscreteSelectInput = require('./DiscreteSelectInput'); const styles = require('./styles'); -const SUBTITLES_SIZES = [75, 100, 125, 150, 175, 200, 250]; const ORIGIN_PRIORITIES = { 'EMBEDDED': 1 }; @@ -92,9 +90,9 @@ const SubtitlesPicker = (props) => { }, [props.delay, props.onDelayChanged]); const onSizeChanged = React.useCallback((event) => { if (props.size !== null && !isNaN(props.size)) { - const sizeIndex = SUBTITLES_SIZES.indexOf(props.size); + const sizeIndex = CONSTANTS.SUBTITLES_SIZES.indexOf(props.size); const delta = event.value === 'increment' ? 1 : -1; - const size = SUBTITLES_SIZES[Math.max(0, Math.min(SUBTITLES_SIZES.length, sizeIndex + delta))]; + const size = CONSTANTS.SUBTITLES_SIZES[Math.max(0, Math.min(CONSTANTS.SUBTITLES_SIZES.length, sizeIndex + delta))]; if (typeof props.onSizeChanged === 'function') { props.onSizeChanged(size); } diff --git a/src/routes/Settings/useProfileSettingsInputs.js b/src/routes/Settings/useProfileSettingsInputs.js index 770381ea7..4eb1f919c 100644 --- a/src/routes/Settings/useProfileSettingsInputs.js +++ b/src/routes/Settings/useProfileSettingsInputs.js @@ -1,8 +1,6 @@ const React = require('react'); const { useServices } = require('stremio/services'); -const { languageNames } = require('stremio/common'); - -const SUBTITLES_SIZES = [75, 100, 125, 150, 175, 200, 250]; +const { CONSTANTS, languageNames } = require('stremio/common'); const useProfileSettingsInputs = (profile) => { const { core } = useServices(); @@ -57,7 +55,7 @@ const useProfileSettingsInputs = (profile) => { } }), [profile.settings]); const subtitlesSizeSelect = React.useMemo(() => ({ - options: SUBTITLES_SIZES.map((size) => ({ + options: CONSTANTS.SUBTITLES_SIZES.map((size) => ({ value: `${size}`, label: `${size}%` })),