diff --git a/spec/components/fullscreentogglebutton.spec.ts b/spec/components/buttons/fullscreentogglebutton.spec.ts similarity index 92% rename from spec/components/fullscreentogglebutton.spec.ts rename to spec/components/buttons/fullscreentogglebutton.spec.ts index 9e89f4ec5..7ef05381f 100644 --- a/spec/components/fullscreentogglebutton.spec.ts +++ b/spec/components/buttons/fullscreentogglebutton.spec.ts @@ -1,6 +1,6 @@ -import { MockHelper, TestingPlayerAPI } from '../helper/MockHelper'; -import { UIInstanceManager } from '../../src/ts/uimanager'; -import { FullscreenToggleButton } from '../../src/ts/components/fullscreentogglebutton'; +import { MockHelper, TestingPlayerAPI } from '../../helper/MockHelper'; +import { UIInstanceManager } from '../../../src/ts/uimanager'; +import { FullscreenToggleButton } from '../../../src/ts/components/buttons/fullscreentogglebutton'; import { ViewMode } from 'bitmovin-player'; let playerMock: TestingPlayerAPI; diff --git a/spec/components/pictureinpicturetogglebutton.spec.ts b/spec/components/buttons/pictureinpicturetogglebutton.spec.ts similarity index 91% rename from spec/components/pictureinpicturetogglebutton.spec.ts rename to spec/components/buttons/pictureinpicturetogglebutton.spec.ts index edc9daec7..bdee3bf69 100644 --- a/spec/components/pictureinpicturetogglebutton.spec.ts +++ b/spec/components/buttons/pictureinpicturetogglebutton.spec.ts @@ -1,6 +1,6 @@ -import { MockHelper, TestingPlayerAPI } from '../helper/MockHelper'; -import { UIInstanceManager } from '../../src/ts/uimanager'; -import { PictureInPictureToggleButton } from '../../src/ts/components/pictureinpicturetogglebutton'; +import { MockHelper, TestingPlayerAPI } from '../../helper/MockHelper'; +import { UIInstanceManager } from '../../../src/ts/uimanager'; +import { PictureInPictureToggleButton } from '../../../src/ts/components/buttons/pictureinpicturetogglebutton'; import { ViewMode } from 'bitmovin-player'; let playerMock: TestingPlayerAPI; diff --git a/spec/components/togglebutton.spec.ts b/spec/components/buttons/togglebutton.spec.ts similarity index 85% rename from spec/components/togglebutton.spec.ts rename to spec/components/buttons/togglebutton.spec.ts index 598510d30..b0bd19fee 100644 --- a/spec/components/togglebutton.spec.ts +++ b/spec/components/buttons/togglebutton.spec.ts @@ -1,8 +1,8 @@ -import { MockHelper, TestingPlayerAPI } from '../helper/MockHelper'; -import { UIInstanceManager } from '../../src/ts/uimanager'; -import { ToggleButton } from '../../src/ts/components/togglebutton'; -import { ToggleButtonConfig } from '../../src/ts/components/togglebutton'; -import { DOM } from '../../src/ts/dom'; +import { MockHelper, TestingPlayerAPI } from '../../helper/MockHelper'; +import { UIInstanceManager } from '../../../src/ts/uimanager'; +import { ToggleButton } from '../../../src/ts/components/buttons/togglebutton'; +import { ToggleButtonConfig } from '../../../src/ts/components/buttons/togglebutton'; +import { DOM } from '../../../src/ts/dom'; let playerMock: TestingPlayerAPI; let uiInstanceManagerMock: UIInstanceManager; diff --git a/spec/components/playbacktimelabel.spec.ts b/spec/components/labels/playbacktimelabel.spec.ts similarity index 96% rename from spec/components/playbacktimelabel.spec.ts rename to spec/components/labels/playbacktimelabel.spec.ts index f5279c5b6..63573a424 100644 --- a/spec/components/playbacktimelabel.spec.ts +++ b/spec/components/labels/playbacktimelabel.spec.ts @@ -1,6 +1,6 @@ -import { MockHelper, TestingPlayerAPI } from '../helper/MockHelper'; -import { UIInstanceManager } from '../../src/ts/uimanager'; -import { PlaybackTimeLabel, PlaybackTimeLabelMode } from '../../src/ts/components/playbacktimelabel'; +import { MockHelper, TestingPlayerAPI } from '../../helper/MockHelper'; +import { UIInstanceManager } from '../../../src/ts/uimanager'; +import { PlaybackTimeLabel, PlaybackTimeLabelMode } from '../../../src/ts/components/labels/playbacktimelabel'; import { PlayerEvent, PlayerEventBase } from 'bitmovin-player'; const liveEdgeActiveCssClassName = 'ui-playbacktimelabel-live-edge'; diff --git a/spec/components/seekbarlabel.spec.ts b/spec/components/labels/seekbarlabel.spec.ts similarity index 94% rename from spec/components/seekbarlabel.spec.ts rename to spec/components/labels/seekbarlabel.spec.ts index 174e17d6c..28bfbdaf9 100644 --- a/spec/components/seekbarlabel.spec.ts +++ b/spec/components/labels/seekbarlabel.spec.ts @@ -1,8 +1,8 @@ -import { MockHelper, TestingPlayerAPI } from '../helper/MockHelper'; -import { UIInstanceManager } from '../../src/ts/uimanager'; -import { SeekBarLabel } from '../../src/ts/components/seekbarlabel'; -import { SeekPreviewEventArgs } from '../../src/ts/components/seekbar'; -import { DOM } from '../../src/ts/dom'; +import { MockHelper, TestingPlayerAPI } from '../../helper/MockHelper'; +import { UIInstanceManager } from '../../../src/ts/uimanager'; +import { SeekBarLabel } from '../../../src/ts/components/seekbar/seekbarlabel'; +import { SeekPreviewEventArgs } from '../../../src/ts/components/seekbar/seekbar'; +import { DOM } from '../../../src/ts/dom'; let playerMock: TestingPlayerAPI; let uiInstanceManagerMock: UIInstanceManager; diff --git a/spec/components/listselector.spec.ts b/spec/components/lists/listselector.spec.ts similarity index 99% rename from spec/components/listselector.spec.ts rename to spec/components/lists/listselector.spec.ts index 88483ab2e..764d612d7 100644 --- a/spec/components/listselector.spec.ts +++ b/spec/components/lists/listselector.spec.ts @@ -1,4 +1,4 @@ -import { ListItem, ListSelector, ListSelectorConfig } from '../../src/ts/components/listselector'; +import { ListItem, ListSelector, ListSelectorConfig } from '../../../src/ts/components/lists/listselector'; class ListSelectorTestClass extends ListSelector { } diff --git a/spec/components/errormessageoverlay.spec.ts b/spec/components/overlays/errormessageoverlay.spec.ts similarity index 89% rename from spec/components/errormessageoverlay.spec.ts rename to spec/components/overlays/errormessageoverlay.spec.ts index bf3550bdc..312e6b5ae 100644 --- a/spec/components/errormessageoverlay.spec.ts +++ b/spec/components/overlays/errormessageoverlay.spec.ts @@ -1,7 +1,7 @@ -import { UIInstanceManager } from './../../src/ts/uimanager'; -import { ErrorMessageOverlay } from '../../src/ts/components/errormessageoverlay'; -import { MobileV3PlayerEvent } from '../../src/ts/mobilev3playerapi'; -import { MockHelper, TestingPlayerAPI } from '../helper/MockHelper'; +import { UIInstanceManager } from '../../../src/ts/uimanager'; +import { ErrorMessageOverlay } from '../../../src/ts/components/overlays/errormessageoverlay'; +import { MobileV3PlayerEvent } from '../../../src/ts/utils/mobilev3playerapi'; +import { MockHelper, TestingPlayerAPI } from '../../helper/MockHelper'; describe('ErrorMessageOverlay', () => { describe('configure', () => { diff --git a/spec/components/subtitleoverlay.spec.ts b/spec/components/overlays/subtitleoverlay.spec.ts similarity index 91% rename from spec/components/subtitleoverlay.spec.ts rename to spec/components/overlays/subtitleoverlay.spec.ts index 2b21c24f2..c96b38c1c 100644 --- a/spec/components/subtitleoverlay.spec.ts +++ b/spec/components/overlays/subtitleoverlay.spec.ts @@ -1,13 +1,13 @@ -import { MockHelper, TestingPlayerAPI } from '../helper/MockHelper'; -import { UIInstanceManager } from '../../src/ts/uimanager'; -import { SubtitleOverlay, SubtitleRegionContainerManager } from '../../src/ts/components/subtitleoverlay'; -import { DOM } from '../../src/ts/dom'; +import { MockHelper, TestingPlayerAPI } from '../../helper/MockHelper'; +import { UIInstanceManager } from '../../../src/ts/uimanager'; +import { SubtitleOverlay, SubtitleRegionContainerManager } from '../../../src/ts/components/overlays/subtitleoverlay'; +import { DOM } from '../../../src/ts/dom'; let playerMock: jest.Mocked; let uiInstanceManagerMock: UIInstanceManager; let subtitleOverlay: SubtitleOverlay; -jest.mock('../../src/ts/components/container'); +jest.mock('../../../src/ts/components/container'); let subtitleRegionContainerManagerMock: SubtitleRegionContainerManager; diff --git a/spec/components/seekbar.spec.ts b/spec/components/seekbar/seekbar.spec.ts similarity index 96% rename from spec/components/seekbar.spec.ts rename to spec/components/seekbar/seekbar.spec.ts index d09711fcb..0413f7f96 100644 --- a/spec/components/seekbar.spec.ts +++ b/spec/components/seekbar/seekbar.spec.ts @@ -1,7 +1,7 @@ -import { MockHelper, TestingPlayerAPI } from '../helper/MockHelper'; -import { SeekBar } from '../../src/ts/components/seekbar'; -import { UIInstanceManager } from '../../src/ts/uimanager'; -import { Timeout } from '../../src/ts/timeout'; +import { MockHelper, TestingPlayerAPI } from '../../helper/MockHelper'; +import { SeekBar } from '../../../src/ts/components/seekbar/seekbar'; +import { UIInstanceManager } from '../../../src/ts/uimanager'; +import { Timeout } from '../../../src/ts/utils/timeout'; let playerMock: TestingPlayerAPI; let uiInstanceManagerMock: UIInstanceManager; diff --git a/spec/components/selectbox.spec.ts b/spec/components/settings/selectbox.spec.ts similarity index 94% rename from spec/components/selectbox.spec.ts rename to spec/components/settings/selectbox.spec.ts index cbc43941f..ae295f1c6 100644 --- a/spec/components/selectbox.spec.ts +++ b/spec/components/settings/selectbox.spec.ts @@ -1,20 +1,20 @@ import type { PlayerAPI } from 'bitmovin-player'; -import type { Component, ViewModeChangedEventArgs } from '../../src/ts/components/component'; -import { ViewMode } from '../../src/ts/components/component'; -import type { ListSelectorConfig } from '../../src/ts/components/listselector'; -import { SelectBox } from '../../src/ts/components/selectbox'; -import type { Event } from '../../src/ts/eventdispatcher'; -import { PlayerUtils } from '../../src/ts/playerutils'; -import type { UIInstanceManager } from '../../src/ts/uimanager'; -import { MockHelper } from '../helper/MockHelper'; +import type { Component, ViewModeChangedEventArgs } from '../../../src/ts/components/component'; +import { ViewMode } from '../../../src/ts/components/component'; +import type { ListSelectorConfig } from '../../../src/ts/components/lists/listselector'; +import { SelectBox } from '../../../src/ts/components/settings/selectbox'; +import type { Event } from '../../../src/ts/eventdispatcher'; +import { PlayerUtils } from '../../../src/ts/utils/playerutils'; +import type { UIInstanceManager } from '../../../src/ts/uimanager'; +import { MockHelper } from '../../helper/MockHelper'; import getUiInstanceManagerMock = MockHelper.getUiInstanceManagerMock; import getPlayerMock = MockHelper.getPlayerMock; import generateDOMMock = MockHelper.generateDOMMock; import PlayerState = PlayerUtils.PlayerState; -import type { DOM } from '../../src/ts/dom'; +import type { DOM } from '../../../src/ts/dom'; -jest.mock('../../src/ts/dom', generateDOMMock); +jest.mock('../../../src/ts/dom', generateDOMMock); describe('SelectBox', () => { let selectBox: SelectBox; diff --git a/spec/components/settingspanel.spec.ts b/spec/components/settings/settingspanel.spec.ts similarity index 91% rename from spec/components/settingspanel.spec.ts rename to spec/components/settings/settingspanel.spec.ts index ec2e092b8..808aa6e40 100644 --- a/spec/components/settingspanel.spec.ts +++ b/spec/components/settings/settingspanel.spec.ts @@ -1,18 +1,18 @@ import type { PlayerAPI } from 'bitmovin-player'; -import type { Component, ComponentConfig, ViewModeChangedEventArgs } from '../../src/ts/components/component'; -import { ViewMode } from '../../src/ts/components/component'; -import { SettingsPanel } from '../../src/ts/components/settingspanel'; -import { SettingsPanelPage } from '../../src/ts/components/settingspanelpage'; -import { EventDispatcher } from '../../src/ts/eventdispatcher'; -import type { UIInstanceManager } from '../../src/ts/uimanager'; -import { MockHelper } from '../helper/MockHelper'; +import type { Component, ComponentConfig, ViewModeChangedEventArgs } from '../../../src/ts/components/component'; +import { ViewMode } from '../../../src/ts/components/component'; +import { SettingsPanel } from '../../../src/ts/components/settings/settingspanel'; +import { SettingsPanelPage } from '../../../src/ts/components/settings/settingspanelpage'; +import { EventDispatcher } from '../../../src/ts/eventdispatcher'; +import type { UIInstanceManager } from '../../../src/ts/uimanager'; +import { MockHelper } from '../../helper/MockHelper'; import getPlayerMock = MockHelper.getPlayerMock; import getUiInstanceManagerMock = MockHelper.getUiInstanceManagerMock; -import { Label } from '../../src/ts/components/label'; -import { SelectBox } from '../../src/ts/components/selectbox'; -import { SettingsPanelItem } from '../../src/ts/components/settingspanelitem'; -import { VolumeSlider } from '../../src/ts/components/volumeslider'; +import { Label } from '../../../src/ts/components/labels/label'; +import { SelectBox } from '../../../src/ts/components/settings/selectbox'; +import { SettingsPanelItem } from '../../../src/ts/components/settings/settingspanelitem'; +import { VolumeSlider } from '../../../src/ts/components/seekbar/volumeslider'; let settingsPanel: SettingsPanel; diff --git a/spec/components/uicontainer.spec.ts b/spec/components/uicontainer.spec.ts index d188dee10..a3d6d2f93 100644 --- a/spec/components/uicontainer.spec.ts +++ b/spec/components/uicontainer.spec.ts @@ -1,5 +1,5 @@ import { UIContainer } from '../../src/ts/components/uicontainer'; -import { PlayerUtils } from '../../src/ts/playerutils'; +import { PlayerUtils } from '../../src/ts/utils/playerutils'; import type { UIInstanceManager } from '../../src/ts/uimanager'; import type { TestingPlayerAPI } from '../helper/MockHelper'; import { MockHelper } from '../helper/MockHelper'; diff --git a/spec/localization.spec.ts b/spec/localization/localization.spec.ts similarity index 96% rename from spec/localization.spec.ts rename to spec/localization/localization.spec.ts index 2e0ed027e..f9ed5cc92 100644 --- a/spec/localization.spec.ts +++ b/spec/localization/localization.spec.ts @@ -1,4 +1,4 @@ -import { i18n } from '../src/ts/localization/i18n'; +import { i18n } from '../../src/ts/localization/i18n'; const fallbackTest = 'fallback test'; const successEn = 'success'; diff --git a/spec/spatialnavigation/gethtmlelementsfromcomponents.spec.ts b/spec/spatialnavigation/gethtmlelementsfromcomponents.spec.ts index fbacff446..24ebbe204 100644 --- a/spec/spatialnavigation/gethtmlelementsfromcomponents.spec.ts +++ b/spec/spatialnavigation/gethtmlelementsfromcomponents.spec.ts @@ -1,6 +1,6 @@ import { Container } from '../../src/ts/components/container'; import { Component } from '../../src/ts/components/component'; -import { ListBox } from '../../src/ts/components/listbox'; +import { ListBox } from '../../src/ts/components/lists/listbox'; import { getHtmlElementsFromComponents } from '../../src/ts/spatialnavigation/gethtmlelementsfromcomponents'; class DummyListBox extends ListBox { diff --git a/spec/spatialnavigation/navigationgroup.spec.ts b/spec/spatialnavigation/navigationgroup.spec.ts index 229ee99ef..c584919d7 100644 --- a/spec/spatialnavigation/navigationgroup.spec.ts +++ b/spec/spatialnavigation/navigationgroup.spec.ts @@ -1,7 +1,7 @@ import { NavigationGroup } from '../../src/ts/spatialnavigation/navigationgroup'; import { UIContainer } from '../../src/ts/components/uicontainer'; -import { PlaybackToggleButton } from '../../src/ts/components/playbacktogglebutton'; -import { SettingsToggleButton } from '../../src/ts/components/settingstogglebutton'; +import { PlaybackToggleButton } from '../../src/ts/components/buttons/playbacktogglebutton'; +import { SettingsToggleButton } from '../../src/ts/components/settings/settingstogglebutton'; import { getFirstDomElement, mockComponent } from '../helper/mockComponent'; import * as navigationAlgorithm from '../../src/ts/spatialnavigation/navigationalgorithm'; import { NodeEventSubscriber } from '../../src/ts/spatialnavigation/nodeeventsubscriber'; diff --git a/spec/spatialnavigation/spatialnavigation.spec.ts b/spec/spatialnavigation/spatialnavigation.spec.ts index 7c377092d..1ecdb2bcc 100644 --- a/spec/spatialnavigation/spatialnavigation.spec.ts +++ b/spec/spatialnavigation/spatialnavigation.spec.ts @@ -2,7 +2,7 @@ import { SpatialNavigation } from '../../src/ts/spatialnavigation/spatialnavigat import { RootNavigationGroup } from '../../src/ts/spatialnavigation/rootnavigationgroup'; import { UIContainer } from '../../src/ts/components/uicontainer'; import { NavigationGroup } from '../../src/ts/spatialnavigation/navigationgroup'; -import { SettingsPanel } from '../../src/ts/components/settingspanel'; +import { SettingsPanel } from '../../src/ts/components/settings/settingspanel'; import { NodeEventSubscriber } from '../../src/ts/spatialnavigation/nodeeventsubscriber'; import { SeekBarHandler } from '../../src/ts/spatialnavigation/seekbarhandler'; import { Action, Direction } from '../../src/ts/spatialnavigation/types'; diff --git a/spec/uimanager.spec.ts b/spec/uimanager.spec.ts index f8e635263..83c6f08a0 100644 --- a/spec/uimanager.spec.ts +++ b/spec/uimanager.spec.ts @@ -7,7 +7,7 @@ import { } from '../src/ts/uimanager'; import { PlayerAPI } from 'bitmovin-player'; import { MockHelper, TestingPlayerAPI } from './helper/MockHelper'; -import { MobileV3PlayerEvent } from '../src/ts/mobilev3playerapi'; +import { MobileV3PlayerEvent } from '../src/ts/utils/mobilev3playerapi'; import { UIContainer } from '../src/ts/components/uicontainer'; import { Container } from '../src/ts/components/container'; diff --git a/spec/audioutils.spec.ts b/spec/utils/audioutils.spec.ts similarity index 93% rename from spec/audioutils.spec.ts rename to spec/utils/audioutils.spec.ts index 943010137..573ee3379 100644 --- a/spec/audioutils.spec.ts +++ b/spec/utils/audioutils.spec.ts @@ -1,6 +1,6 @@ -import { MockHelper } from './helper/MockHelper'; -import { ListSelector, ListSelectorConfig } from '../src/ts/components/listselector'; -import { AudioTrackSwitchHandler } from '../src/ts/audiotrackutils'; +import { MockHelper } from '../helper/MockHelper'; +import { ListSelector, ListSelectorConfig } from '../../src/ts/components/lists/listselector'; +import { AudioTrackSwitchHandler } from '../../src/ts/utils/audiotrackutils'; import { AudioTrack } from 'bitmovin-player'; let playerMock = MockHelper.getPlayerMock(); diff --git a/spec/browserutils.spec.ts b/spec/utils/browserutils.spec.ts similarity index 90% rename from spec/browserutils.spec.ts rename to spec/utils/browserutils.spec.ts index d96858ab1..b8a7c365c 100644 --- a/spec/browserutils.spec.ts +++ b/spec/utils/browserutils.spec.ts @@ -1,4 +1,4 @@ -import { BrowserUtils } from '../src/ts/browserutils'; +import { BrowserUtils } from '../../src/ts/utils/browserutils'; const mobileSafariUserAgent = 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A356 Safari/604.1'; diff --git a/spec/errorutils.spec.ts b/spec/utils/errorutils.spec.ts similarity index 91% rename from spec/errorutils.spec.ts rename to spec/utils/errorutils.spec.ts index b1ba01d4f..5372a06b1 100644 --- a/spec/errorutils.spec.ts +++ b/spec/utils/errorutils.spec.ts @@ -1,5 +1,5 @@ -import { MobileV3PlayerErrorEvent } from '../src/ts/mobilev3playerapi'; -import { ErrorUtils } from '../src/ts/errorutils'; +import { MobileV3PlayerErrorEvent } from '../../src/ts/utils/mobilev3playerapi'; +import { ErrorUtils } from '../../src/ts/utils/errorutils'; import defaultMobileV3ErrorMessageTranslator = ErrorUtils.defaultMobileV3ErrorMessageTranslator; import { ErrorEvent } from 'bitmovin-player'; import defaultWebErrorMessageTranslator = ErrorUtils.defaultWebErrorMessageTranslator; diff --git a/spec/focusvisibilitytracker.spec.ts b/spec/utils/focusvisibilitytracker.spec.ts similarity index 97% rename from spec/focusvisibilitytracker.spec.ts rename to spec/utils/focusvisibilitytracker.spec.ts index 06da05c70..29e589dd0 100644 --- a/spec/focusvisibilitytracker.spec.ts +++ b/spec/utils/focusvisibilitytracker.spec.ts @@ -1,5 +1,5 @@ import { JSDOM } from 'jsdom'; -import { FocusVisibilityTracker } from '../src/ts/focusvisibilitytracker'; +import { FocusVisibilityTracker } from '../../src/ts/utils/focusvisibilitytracker'; describe('FocusVisibilityTracker', () => { const bitmovinUIPrefix = 'bmpui'; diff --git a/spec/mobilev3playerapi.spec.ts b/spec/utils/mobilev3playerapi.spec.ts similarity index 90% rename from spec/mobilev3playerapi.spec.ts rename to spec/utils/mobilev3playerapi.spec.ts index c42b5aed3..9df8d0423 100644 --- a/spec/mobilev3playerapi.spec.ts +++ b/spec/utils/mobilev3playerapi.spec.ts @@ -1,6 +1,6 @@ import { PlayerAPI } from 'bitmovin-player'; -import { isMobileV3PlayerAPI, MobileV3PlayerAPI, MobileV3PlayerEvent } from '../src/ts/mobilev3playerapi'; -import { PlayerWrapper } from '../src/ts/uimanager'; +import { isMobileV3PlayerAPI, MobileV3PlayerAPI, MobileV3PlayerEvent } from '../../src/ts/utils/mobilev3playerapi'; +import { PlayerWrapper } from '../../src/ts/uimanager'; describe('isMobileV3PlayerAPI', () => { const playerApi = { exports: { PlayerEvent: { } } } as PlayerAPI; diff --git a/spec/playerutils.spec.ts b/spec/utils/playerutils.spec.ts similarity index 93% rename from spec/playerutils.spec.ts rename to spec/utils/playerutils.spec.ts index 084bda9c4..851361318 100644 --- a/spec/playerutils.spec.ts +++ b/spec/utils/playerutils.spec.ts @@ -1,6 +1,6 @@ -import { PlayerUtils } from '../src/ts/playerutils'; +import { PlayerUtils } from '../../src/ts/utils/playerutils'; import { PlayerAPI } from 'bitmovin-player'; -import { MockHelper } from './helper/MockHelper'; +import { MockHelper } from '../helper/MockHelper'; describe('PlayerUtils', () => { let playerMock: PlayerAPI; diff --git a/spec/subtitleutils.spec.ts b/spec/utils/subtitleutils.spec.ts similarity index 95% rename from spec/subtitleutils.spec.ts rename to spec/utils/subtitleutils.spec.ts index 3fa8558d5..fed3a3b03 100644 --- a/spec/subtitleutils.spec.ts +++ b/spec/utils/subtitleutils.spec.ts @@ -1,6 +1,6 @@ -import { SubtitleSwitchHandler } from '../src/ts/subtitleutils'; -import { MockHelper } from './helper/MockHelper'; -import { ListSelector, ListSelectorConfig } from '../src/ts/components/listselector'; +import { SubtitleSwitchHandler } from '../../src/ts/utils/subtitleutils'; +import { MockHelper } from '../helper/MockHelper'; +import { ListSelector, ListSelectorConfig } from '../../src/ts/components/lists/listselector'; import { PlayerSubtitlesAPI } from 'bitmovin-player'; let playerMock = MockHelper.getPlayerMock(); diff --git a/spec/components/timelinemarkershandler.spec.ts b/spec/utils/timelinemarkershandler.spec.ts similarity index 97% rename from spec/components/timelinemarkershandler.spec.ts rename to spec/utils/timelinemarkershandler.spec.ts index 061009769..5d982af53 100644 --- a/spec/components/timelinemarkershandler.spec.ts +++ b/spec/utils/timelinemarkershandler.spec.ts @@ -1,5 +1,5 @@ import { MockHelper } from '../helper/MockHelper'; -import { TimelineMarkersHandler } from '../../src/ts/components/timelinemarkershandler'; +import { TimelineMarkersHandler } from '../../src/ts/utils/timelinemarkershandler'; import { PlayerAPI } from 'bitmovin-player'; import { UIInstanceManager } from '../../src/ts/uimanager'; import { TimelineMarker } from '../../src/ts/uiconfig'; diff --git a/spec/volumecontroller.spec.ts b/spec/utils/volumecontroller.spec.ts similarity index 84% rename from spec/volumecontroller.spec.ts rename to spec/utils/volumecontroller.spec.ts index 1678166b7..ed0949fae 100644 --- a/spec/volumecontroller.spec.ts +++ b/spec/utils/volumecontroller.spec.ts @@ -1,6 +1,6 @@ import { PlayerEvent, VolumeChangedEvent } from 'bitmovin-player'; -import { VolumeController } from '../src/ts/volumecontroller'; -import { MockHelper, TestingPlayerAPI } from './helper/MockHelper'; +import { VolumeController } from '../../src/ts/utils/volumecontroller'; +import { MockHelper, TestingPlayerAPI } from '../helper/MockHelper'; describe('VolumeController', () => { let playerMock: TestingPlayerAPI; diff --git a/spec/vttutils.spec.ts b/spec/utils/vttutils.spec.ts similarity index 99% rename from spec/vttutils.spec.ts rename to spec/utils/vttutils.spec.ts index f531aaf7a..e279c5e7e 100644 --- a/spec/vttutils.spec.ts +++ b/spec/utils/vttutils.spec.ts @@ -1,8 +1,8 @@ -import { SubtitleRegionContainer, SubtitleLabel } from '../src/ts/components/subtitleoverlay'; -import { VttUtils } from '../src/ts/vttutils'; +import { SubtitleRegionContainer, SubtitleLabel } from '../../src/ts/components/overlays/subtitleoverlay'; +import { VttUtils } from '../../src/ts/utils/vttutils'; import { VTTRegionProperties, VTTProperties } from 'bitmovin-player'; -import { MockHelper } from './helper/MockHelper'; -import { Size } from '../src/ts/dom'; +import { MockHelper } from '../helper/MockHelper'; +import { Size } from '../../src/ts/dom'; describe('Vtt Utils', () => { describe('Vtt Region', () => { diff --git a/src/scss/_ads.scss b/src/scss/_ads.scss index 0432cf001..650878701 100644 --- a/src/scss/_ads.scss +++ b/src/scss/_ads.scss @@ -2,8 +2,8 @@ // sass-lint:disable nesting-depth .#{$prefix}-ui-ads { - @import 'components/adskipbutton'; - @import 'components/adstatusoverlay'; + @import 'components/ads/adskipbutton'; + @import 'components/ads/adstatusoverlay'; .#{$prefix}-ui-seekbar { .#{$prefix}-seekbar, diff --git a/src/scss/bitmovinplayer-ui.scss b/src/scss/bitmovinplayer-ui.scss index efbc7a105..e1256f713 100644 --- a/src/scss/bitmovinplayer-ui.scss +++ b/src/scss/bitmovinplayer-ui.scss @@ -1,53 +1,52 @@ -@import 'variables'; @import 'mixins'; -@import 'components/subtitletogglebutton'; +@import 'components/buttons/subtitletogglebutton'; @import 'components/component'; @import 'components/container'; @import 'components/uicontainer'; @import 'components/controlbar'; -@import 'components/button'; -@import 'components/playbacktogglebutton'; -@import 'components/quickseekbutton'; -@import 'components/fullscreentogglebutton'; -@import 'components/vrtogglebutton'; -@import 'components/volumetogglebutton'; -@import 'components/ecomodetogglebutton'; -@import 'components/seekbar'; +@import 'components/buttons/button'; +@import 'components/buttons/playbacktogglebutton'; +@import 'components/buttons/quickseekbutton'; +@import 'components/buttons/fullscreentogglebutton'; +@import 'components/buttons/vrtogglebutton'; +@import 'components/buttons/volumetogglebutton'; +@import 'components/buttons/ecomodetogglebutton'; +@import 'components/seekbar/seekbar'; @import 'components/watermark'; -@import 'components/hugeplaybacktogglebutton'; -@import 'components/label'; -@import 'components/settingspanel'; -@import 'components/settingspanelpage'; -@import 'components/settingspanelitem'; -@import 'components/settingspanelpageopenbutton'; -@import 'components/settingspanelpagebackbutton'; -@import 'components/settingstogglebutton'; -@import 'components/selectbox'; -@import 'components/listbox'; -@import 'components/seekbarlabel'; -@import 'components/volumeslider'; -@import 'components/subtitleoverlay'; -@import 'components/subtitleoverlay-cea608'; -@import 'components/volumecontrolbutton'; -@import 'components/casttogglebutton'; -@import 'components/caststatusoverlay'; -@import 'components/errormessageoverlay'; +@import 'components/buttons/hugeplaybacktogglebutton'; +@import 'components/labels/label'; +@import 'components/settings/settingspanel'; +@import 'components/settings/settingspanelpage'; +@import 'components/settings/settingspanelitem'; +@import 'components/settings/settingspanelpageopenbutton'; +@import 'components/settings/settingspanelpagebackbutton'; +@import 'components/settings/settingstogglebutton'; +@import 'components/settings/selectbox'; +@import 'components/lists/listbox'; +@import 'components/labels/seekbarlabel'; +@import 'components/seekbar/volumeslider'; +@import 'components/overlays/subtitleoverlay'; +@import 'components/overlays/subtitleoverlay-cea608'; +@import 'components/buttons/volumecontrolbutton'; +@import 'components/buttons/casttogglebutton'; +@import 'components/overlays/caststatusoverlay'; +@import 'components/overlays/errormessageoverlay'; @import 'components/titlebar'; -@import 'components/recommendationoverlay'; -@import 'components/clickoverlay'; -@import 'components/hugereplaybutton'; -@import 'components/replaybutton'; -@import 'components/playbacktimelabel'; -@import 'components/bufferingoverlay'; -@import 'components/playbacktoggleoverlay'; -@import 'components/closebutton'; -@import 'components/airplaytogglebutton'; -@import 'components/pictureinpicturetogglebutton'; +@import 'components/overlays/recommendationoverlay'; +@import 'components/overlays/clickoverlay'; +@import 'components/buttons/hugereplaybutton'; +@import 'components/buttons/replaybutton'; +@import 'components/labels/playbacktimelabel'; +@import 'components/overlays/bufferingoverlay'; +@import 'components/overlays/playbacktoggleoverlay'; +@import 'components/buttons/closebutton'; +@import 'components/buttons/airplaytogglebutton'; +@import 'components/buttons/pictureinpicturetogglebutton'; @import 'components/spacer'; -@import 'components/subtitlesettings/subtitlesettings'; -@import 'components/subtitlesettingspaneltogglebutton'; -@import 'components/touchcontroloverlay'; -@import 'components/smallcenteredplaybacktogglebutton'; +@import 'components/settings/subtitlesettings/subtitlesettings'; +@import 'components/buttons/subtitlesettingspaneltogglebutton'; +@import 'components/overlays/touchcontroloverlay'; +@import 'components/buttons/smallcenteredplaybacktogglebutton'; @import 'ads'; @import 'cast-receiver'; @import 'smallscreen'; diff --git a/src/scss/components/_adskipbutton.scss b/src/scss/components/ads/_adskipbutton.scss similarity index 96% rename from src/scss/components/_adskipbutton.scss rename to src/scss/components/ads/_adskipbutton.scss index 95a3a9d7a..9977d559d 100644 --- a/src/scss/components/_adskipbutton.scss +++ b/src/scss/components/ads/_adskipbutton.scss @@ -1,4 +1,4 @@ -@import '../variables'; +@import '../../variables'; %ui-button-ad-skip { @extend %ui-button; diff --git a/src/scss/components/_adstatusoverlay.scss b/src/scss/components/ads/_adstatusoverlay.scss similarity index 91% rename from src/scss/components/_adstatusoverlay.scss rename to src/scss/components/ads/_adstatusoverlay.scss index d97b6b7e1..6e15bfdde 100644 --- a/src/scss/components/_adstatusoverlay.scss +++ b/src/scss/components/ads/_adstatusoverlay.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; %ad-status-overlay { @extend %ui-container; diff --git a/src/scss/components/_airplaytogglebutton.scss b/src/scss/components/buttons/_airplaytogglebutton.scss similarity index 83% rename from src/scss/components/_airplaytogglebutton.scss rename to src/scss/components/buttons/_airplaytogglebutton.scss index f66d1a014..b1c839f51 100644 --- a/src/scss/components/_airplaytogglebutton.scss +++ b/src/scss/components/buttons/_airplaytogglebutton.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-airplaytogglebutton { @extend %ui-button; diff --git a/src/scss/components/_button.scss b/src/scss/components/buttons/_button.scss similarity index 96% rename from src/scss/components/_button.scss rename to src/scss/components/buttons/_button.scss index a00b3f805..bd8844a0a 100644 --- a/src/scss/components/_button.scss +++ b/src/scss/components/buttons/_button.scss @@ -1,4 +1,4 @@ -@import '../variables'; +@import '../../variables'; %ui-button { @extend %ui-component; diff --git a/src/scss/components/_casttogglebutton.scss b/src/scss/components/buttons/_casttogglebutton.scss similarity index 83% rename from src/scss/components/_casttogglebutton.scss rename to src/scss/components/buttons/_casttogglebutton.scss index f5968216c..e8498088f 100644 --- a/src/scss/components/_casttogglebutton.scss +++ b/src/scss/components/buttons/_casttogglebutton.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-casttogglebutton { @extend %ui-button; diff --git a/src/scss/components/_closebutton.scss b/src/scss/components/buttons/_closebutton.scss similarity index 89% rename from src/scss/components/_closebutton.scss rename to src/scss/components/buttons/_closebutton.scss index fa90fee57..d63be37d1 100644 --- a/src/scss/components/_closebutton.scss +++ b/src/scss/components/buttons/_closebutton.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-closebutton { @extend %ui-button; diff --git a/src/scss/components/_ecomodetogglebutton.scss b/src/scss/components/buttons/_ecomodetogglebutton.scss similarity index 93% rename from src/scss/components/_ecomodetogglebutton.scss rename to src/scss/components/buttons/_ecomodetogglebutton.scss index 0a90ca7db..db1b9cff8 100644 --- a/src/scss/components/_ecomodetogglebutton.scss +++ b/src/scss/components/buttons/_ecomodetogglebutton.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-ecomodetogglebutton { @extend %ui-button; diff --git a/src/scss/components/_fullscreentogglebutton.scss b/src/scss/components/buttons/_fullscreentogglebutton.scss similarity index 83% rename from src/scss/components/_fullscreentogglebutton.scss rename to src/scss/components/buttons/_fullscreentogglebutton.scss index f9bed75a6..7da733201 100644 --- a/src/scss/components/_fullscreentogglebutton.scss +++ b/src/scss/components/buttons/_fullscreentogglebutton.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-fullscreentogglebutton { @extend %ui-button; diff --git a/src/scss/components/_hugeplaybacktogglebutton.scss b/src/scss/components/buttons/_hugeplaybacktogglebutton.scss similarity index 98% rename from src/scss/components/_hugeplaybacktogglebutton.scss rename to src/scss/components/buttons/_hugeplaybacktogglebutton.scss index 063c344ae..10f5f108f 100644 --- a/src/scss/components/_hugeplaybacktogglebutton.scss +++ b/src/scss/components/buttons/_hugeplaybacktogglebutton.scss @@ -1,4 +1,4 @@ -@import '../variables'; +@import '../../variables'; .#{$prefix}-ui-hugeplaybacktogglebutton { @extend %ui-button; diff --git a/src/scss/components/_hugereplaybutton.scss b/src/scss/components/buttons/_hugereplaybutton.scss similarity index 91% rename from src/scss/components/_hugereplaybutton.scss rename to src/scss/components/buttons/_hugereplaybutton.scss index 0d2600723..aaa58fcfd 100644 --- a/src/scss/components/_hugereplaybutton.scss +++ b/src/scss/components/buttons/_hugereplaybutton.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-hugereplaybutton { @extend %ui-button; diff --git a/src/scss/components/_pictureinpicturetogglebutton.scss b/src/scss/components/buttons/_pictureinpicturetogglebutton.scss similarity index 82% rename from src/scss/components/_pictureinpicturetogglebutton.scss rename to src/scss/components/buttons/_pictureinpicturetogglebutton.scss index 492520214..ae59d579f 100644 --- a/src/scss/components/_pictureinpicturetogglebutton.scss +++ b/src/scss/components/buttons/_pictureinpicturetogglebutton.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-piptogglebutton { @extend %ui-button; diff --git a/src/scss/components/_playbacktogglebutton.scss b/src/scss/components/buttons/_playbacktogglebutton.scss similarity index 87% rename from src/scss/components/_playbacktogglebutton.scss rename to src/scss/components/buttons/_playbacktogglebutton.scss index 9e339a016..507c5979d 100644 --- a/src/scss/components/_playbacktogglebutton.scss +++ b/src/scss/components/buttons/_playbacktogglebutton.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-playbacktogglebutton { @extend %ui-button; diff --git a/src/scss/components/_quickseekbutton.scss b/src/scss/components/buttons/_quickseekbutton.scss similarity index 87% rename from src/scss/components/_quickseekbutton.scss rename to src/scss/components/buttons/_quickseekbutton.scss index 9e35a8433..34b6cd800 100644 --- a/src/scss/components/_quickseekbutton.scss +++ b/src/scss/components/buttons/_quickseekbutton.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-quickseekbutton { @extend %ui-button; diff --git a/src/scss/components/_replaybutton.scss b/src/scss/components/buttons/_replaybutton.scss similarity index 77% rename from src/scss/components/_replaybutton.scss rename to src/scss/components/buttons/_replaybutton.scss index 5851b7566..36ffe7c60 100644 --- a/src/scss/components/_replaybutton.scss +++ b/src/scss/components/buttons/_replaybutton.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-replaybutton { @extend %ui-button; diff --git a/src/scss/components/_smallcenteredplaybacktogglebutton.scss b/src/scss/components/buttons/_smallcenteredplaybacktogglebutton.scss similarity index 96% rename from src/scss/components/_smallcenteredplaybacktogglebutton.scss rename to src/scss/components/buttons/_smallcenteredplaybacktogglebutton.scss index 4ef443da3..45f781cfe 100644 --- a/src/scss/components/_smallcenteredplaybacktogglebutton.scss +++ b/src/scss/components/buttons/_smallcenteredplaybacktogglebutton.scss @@ -1,4 +1,4 @@ -@import '../variables'; +@import '../../variables'; .#{$prefix}-ui-smallcenteredplaybacktogglebutton { @extend %ui-button; diff --git a/src/scss/components/_subtitlesettingspaneltogglebutton.scss b/src/scss/components/buttons/_subtitlesettingspaneltogglebutton.scss similarity index 92% rename from src/scss/components/_subtitlesettingspaneltogglebutton.scss rename to src/scss/components/buttons/_subtitlesettingspaneltogglebutton.scss index 17a16492b..87d979fdc 100644 --- a/src/scss/components/_subtitlesettingspaneltogglebutton.scss +++ b/src/scss/components/buttons/_subtitlesettingspaneltogglebutton.scss @@ -1,5 +1,5 @@ // demo for extracted audio tracks and subtitle settings from the settings panel direct into the controlBar -@import '../variables'; +@import '../../variables'; .#{$prefix}-ui-subtitlesettingstogglebutton { @extend %ui-settingstogglebutton; diff --git a/src/scss/components/_subtitletogglebutton.scss b/src/scss/components/buttons/_subtitletogglebutton.scss similarity index 87% rename from src/scss/components/_subtitletogglebutton.scss rename to src/scss/components/buttons/_subtitletogglebutton.scss index aa2c5a796..b419c80dc 100644 --- a/src/scss/components/_subtitletogglebutton.scss +++ b/src/scss/components/buttons/_subtitletogglebutton.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-subtitletogglebutton { @extend %ui-button; diff --git a/src/scss/components/_volumecontrolbutton.scss b/src/scss/components/buttons/_volumecontrolbutton.scss similarity index 92% rename from src/scss/components/_volumecontrolbutton.scss rename to src/scss/components/buttons/_volumecontrolbutton.scss index ad30f4a13..ec4200dad 100644 --- a/src/scss/components/_volumecontrolbutton.scss +++ b/src/scss/components/buttons/_volumecontrolbutton.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-volumecontrolbutton { @extend %ui-container; diff --git a/src/scss/components/_volumetogglebutton.scss b/src/scss/components/buttons/_volumetogglebutton.scss similarity index 94% rename from src/scss/components/_volumetogglebutton.scss rename to src/scss/components/buttons/_volumetogglebutton.scss index b3ed927a9..22e367d05 100644 --- a/src/scss/components/_volumetogglebutton.scss +++ b/src/scss/components/buttons/_volumetogglebutton.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-volumetogglebutton { @extend %ui-button; diff --git a/src/scss/components/_vrtogglebutton.scss b/src/scss/components/buttons/_vrtogglebutton.scss similarity index 85% rename from src/scss/components/_vrtogglebutton.scss rename to src/scss/components/buttons/_vrtogglebutton.scss index 3d63a1e3f..15b7addd2 100644 --- a/src/scss/components/_vrtogglebutton.scss +++ b/src/scss/components/buttons/_vrtogglebutton.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-vrtogglebutton { @extend %ui-button; diff --git a/src/scss/components/_label.scss b/src/scss/components/labels/_label.scss similarity index 92% rename from src/scss/components/_label.scss rename to src/scss/components/labels/_label.scss index 9de508a1c..96dfe327b 100644 --- a/src/scss/components/_label.scss +++ b/src/scss/components/labels/_label.scss @@ -1,4 +1,4 @@ -@import '../variables'; +@import '../../variables'; %ui-label { @extend %ui-component; diff --git a/src/scss/components/_playbacktimelabel.scss b/src/scss/components/labels/_playbacktimelabel.scss similarity index 93% rename from src/scss/components/_playbacktimelabel.scss rename to src/scss/components/labels/_playbacktimelabel.scss index d60c65776..a51bfc72f 100644 --- a/src/scss/components/_playbacktimelabel.scss +++ b/src/scss/components/labels/_playbacktimelabel.scss @@ -1,4 +1,4 @@ -@import '../variables'; +@import '../../variables'; .#{$prefix}-ui-playbacktimelabel { @extend %ui-label; diff --git a/src/scss/components/_seekbarlabel.scss b/src/scss/components/labels/_seekbarlabel.scss similarity index 98% rename from src/scss/components/_seekbarlabel.scss rename to src/scss/components/labels/_seekbarlabel.scss index 8ae444f14..20be2ee56 100644 --- a/src/scss/components/_seekbarlabel.scss +++ b/src/scss/components/labels/_seekbarlabel.scss @@ -1,4 +1,4 @@ -@import '../variables'; +@import '../../variables'; .#{$prefix}-ui-seekbar-label { @extend %ui-container; diff --git a/src/scss/components/_listbox.scss b/src/scss/components/lists/_listbox.scss similarity index 92% rename from src/scss/components/_listbox.scss rename to src/scss/components/lists/_listbox.scss index 2bdd9b1e7..8a6c54106 100644 --- a/src/scss/components/_listbox.scss +++ b/src/scss/components/lists/_listbox.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; %ui-listbox { @extend %ui-container; diff --git a/src/scss/components/_bufferingoverlay.scss b/src/scss/components/overlays/_bufferingoverlay.scss similarity index 96% rename from src/scss/components/_bufferingoverlay.scss rename to src/scss/components/overlays/_bufferingoverlay.scss index 72caaa62c..1cff8b977 100644 --- a/src/scss/components/_bufferingoverlay.scss +++ b/src/scss/components/overlays/_bufferingoverlay.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; // H/V center items in the middle of the overlay %center-items-in-overlay { diff --git a/src/scss/components/_caststatusoverlay.scss b/src/scss/components/overlays/_caststatusoverlay.scss similarity index 90% rename from src/scss/components/_caststatusoverlay.scss rename to src/scss/components/overlays/_caststatusoverlay.scss index f2fce526e..631f139b6 100644 --- a/src/scss/components/_caststatusoverlay.scss +++ b/src/scss/components/overlays/_caststatusoverlay.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-cast-status-overlay { @extend %ui-container; diff --git a/src/scss/components/_clickoverlay.scss b/src/scss/components/overlays/_clickoverlay.scss similarity index 75% rename from src/scss/components/_clickoverlay.scss rename to src/scss/components/overlays/_clickoverlay.scss index 060fa5a6c..b1ca5c5c8 100644 --- a/src/scss/components/_clickoverlay.scss +++ b/src/scss/components/overlays/_clickoverlay.scss @@ -1,4 +1,4 @@ -@import '../variables'; +@import '../../variables'; .#{$prefix}-ui-clickoverlay { @extend %ui-button; diff --git a/src/scss/components/_errormessageoverlay.scss b/src/scss/components/overlays/_errormessageoverlay.scss similarity index 93% rename from src/scss/components/_errormessageoverlay.scss rename to src/scss/components/overlays/_errormessageoverlay.scss index 964b32481..9d950fe34 100644 --- a/src/scss/components/_errormessageoverlay.scss +++ b/src/scss/components/overlays/_errormessageoverlay.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-errormessage-overlay { @extend %ui-container; diff --git a/src/scss/components/_playbacktoggleoverlay.scss b/src/scss/components/overlays/_playbacktoggleoverlay.scss similarity index 73% rename from src/scss/components/_playbacktoggleoverlay.scss rename to src/scss/components/overlays/_playbacktoggleoverlay.scss index 7fb854b08..41759734e 100644 --- a/src/scss/components/_playbacktoggleoverlay.scss +++ b/src/scss/components/overlays/_playbacktoggleoverlay.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-playbacktoggle-overlay { @extend %ui-container; diff --git a/src/scss/components/_recommendationoverlay.scss b/src/scss/components/overlays/_recommendationoverlay.scss similarity index 97% rename from src/scss/components/_recommendationoverlay.scss rename to src/scss/components/overlays/_recommendationoverlay.scss index 71abcc5f3..537aa7a0e 100644 --- a/src/scss/components/_recommendationoverlay.scss +++ b/src/scss/components/overlays/_recommendationoverlay.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-recommendation-overlay { @extend %ui-container; diff --git a/src/scss/components/_subtitleoverlay-cea608.scss b/src/scss/components/overlays/_subtitleoverlay-cea608.scss similarity index 100% rename from src/scss/components/_subtitleoverlay-cea608.scss rename to src/scss/components/overlays/_subtitleoverlay-cea608.scss diff --git a/src/scss/components/_subtitleoverlay.scss b/src/scss/components/overlays/_subtitleoverlay.scss similarity index 97% rename from src/scss/components/_subtitleoverlay.scss rename to src/scss/components/overlays/_subtitleoverlay.scss index ba7868287..9b6ee8a23 100644 --- a/src/scss/components/_subtitleoverlay.scss +++ b/src/scss/components/overlays/_subtitleoverlay.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-uicontainer { .#{$prefix}-ui-subtitle-overlay { diff --git a/src/scss/components/_touchcontroloverlay.scss b/src/scss/components/overlays/_touchcontroloverlay.scss similarity index 95% rename from src/scss/components/_touchcontroloverlay.scss rename to src/scss/components/overlays/_touchcontroloverlay.scss index 8b6a6a2c8..f06432b3c 100644 --- a/src/scss/components/_touchcontroloverlay.scss +++ b/src/scss/components/overlays/_touchcontroloverlay.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; %opacity-transition { transition: opacity .25s ease-out; diff --git a/src/scss/components/_seekbar.scss b/src/scss/components/seekbar/_seekbar.scss similarity index 98% rename from src/scss/components/_seekbar.scss rename to src/scss/components/seekbar/_seekbar.scss index bfc749b52..dd97fe423 100644 --- a/src/scss/components/_seekbar.scss +++ b/src/scss/components/seekbar/_seekbar.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; $seekbar-height: .3125em; diff --git a/src/scss/components/_volumeslider.scss b/src/scss/components/seekbar/_volumeslider.scss similarity index 87% rename from src/scss/components/_volumeslider.scss rename to src/scss/components/seekbar/_volumeslider.scss index 5eb977271..fccbc603f 100644 --- a/src/scss/components/_volumeslider.scss +++ b/src/scss/components/seekbar/_volumeslider.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; @import 'seekbar'; .#{$prefix}-ui-volumeslider { diff --git a/src/scss/components/_selectbox.scss b/src/scss/components/settings/_selectbox.scss similarity index 85% rename from src/scss/components/_selectbox.scss rename to src/scss/components/settings/_selectbox.scss index f6e5ffc4f..9d9118fb3 100644 --- a/src/scss/components/_selectbox.scss +++ b/src/scss/components/settings/_selectbox.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; .#{$prefix}-ui-selectbox { @extend %ui-component; diff --git a/src/scss/components/_settingspanel.scss b/src/scss/components/settings/_settingspanel.scss similarity index 94% rename from src/scss/components/_settingspanel.scss rename to src/scss/components/settings/_settingspanel.scss index 2d23c440c..1bbd9931e 100644 --- a/src/scss/components/_settingspanel.scss +++ b/src/scss/components/settings/_settingspanel.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; %ui-settings-panel { @extend %ui-container; diff --git a/src/scss/components/_settingspanelitem.scss b/src/scss/components/settings/_settingspanelitem.scss similarity index 98% rename from src/scss/components/_settingspanelitem.scss rename to src/scss/components/settings/_settingspanelitem.scss index 1e421c10c..9b854a4d8 100644 --- a/src/scss/components/_settingspanelitem.scss +++ b/src/scss/components/settings/_settingspanelitem.scss @@ -1,4 +1,4 @@ -@import '../variables'; +@import '../../variables'; %ui-settings-panel-item { line-height: 1.5em; diff --git a/src/scss/components/_settingspanelpage.scss b/src/scss/components/settings/_settingspanelpage.scss similarity index 86% rename from src/scss/components/_settingspanelpage.scss rename to src/scss/components/settings/_settingspanelpage.scss index 4e687f702..507e246d8 100644 --- a/src/scss/components/_settingspanelpage.scss +++ b/src/scss/components/settings/_settingspanelpage.scss @@ -1,4 +1,4 @@ -@import '../variables'; +@import '../../variables'; %ui-settings-panel-page { display: none; diff --git a/src/scss/components/_settingspanelpagebackbutton.scss b/src/scss/components/settings/_settingspanelpagebackbutton.scss similarity index 96% rename from src/scss/components/_settingspanelpagebackbutton.scss rename to src/scss/components/settings/_settingspanelpagebackbutton.scss index 3cc43e75e..f92475665 100644 --- a/src/scss/components/_settingspanelpagebackbutton.scss +++ b/src/scss/components/settings/_settingspanelpagebackbutton.scss @@ -1,4 +1,4 @@ -@import '../variables'; +@import '../../variables'; %ui-settingspanelpagebackbutton { @extend %ui-button; diff --git a/src/scss/components/_settingspanelpageopenbutton.scss b/src/scss/components/settings/_settingspanelpageopenbutton.scss similarity index 86% rename from src/scss/components/_settingspanelpageopenbutton.scss rename to src/scss/components/settings/_settingspanelpageopenbutton.scss index 5ca1c3d44..981c55961 100644 --- a/src/scss/components/_settingspanelpageopenbutton.scss +++ b/src/scss/components/settings/_settingspanelpageopenbutton.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; %ui-settingspanelpageopenbutton { @extend %ui-button; diff --git a/src/scss/components/_settingstogglebutton.scss b/src/scss/components/settings/_settingstogglebutton.scss similarity index 85% rename from src/scss/components/_settingstogglebutton.scss rename to src/scss/components/settings/_settingstogglebutton.scss index ef85dba3e..4d0af1565 100644 --- a/src/scss/components/_settingstogglebutton.scss +++ b/src/scss/components/settings/_settingstogglebutton.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../mixins'; +@import '../../variables'; +@import '../../mixins'; %ui-settingstogglebutton { @extend %ui-button; diff --git a/src/scss/components/subtitlesettings/_subtitleoverlay-settings.scss b/src/scss/components/settings/subtitlesettings/_subtitleoverlay-settings.scss similarity index 98% rename from src/scss/components/subtitlesettings/_subtitleoverlay-settings.scss rename to src/scss/components/settings/subtitlesettings/_subtitleoverlay-settings.scss index 5f8893183..28eb839a1 100644 --- a/src/scss/components/subtitlesettings/_subtitleoverlay-settings.scss +++ b/src/scss/components/settings/subtitlesettings/_subtitleoverlay-settings.scss @@ -1,5 +1,5 @@ -@import '../../variables'; -@import '../../mixins'; +@import '../../../variables'; +@import '../../../mixins'; .#{$prefix}-ui-subtitle-overlay { diff --git a/src/scss/components/subtitlesettings/_subtitlesettings.scss b/src/scss/components/settings/subtitlesettings/_subtitlesettings.scss similarity index 100% rename from src/scss/components/subtitlesettings/_subtitlesettings.scss rename to src/scss/components/settings/subtitlesettings/_subtitlesettings.scss diff --git a/src/scss/components/subtitlesettings/_subtitlesettingsresetbutton.scss b/src/scss/components/settings/subtitlesettings/_subtitlesettingsresetbutton.scss similarity index 84% rename from src/scss/components/subtitlesettings/_subtitlesettingsresetbutton.scss rename to src/scss/components/settings/subtitlesettings/_subtitlesettingsresetbutton.scss index 799f0b9ba..b660cd5c0 100644 --- a/src/scss/components/subtitlesettings/_subtitlesettingsresetbutton.scss +++ b/src/scss/components/settings/subtitlesettings/_subtitlesettingsresetbutton.scss @@ -1,4 +1,4 @@ -@import '../../variables'; +@import '../../../variables'; .#{$prefix}-ui-subtitlesettingsresetbutton { @extend %ui-button; diff --git a/src/ts/components/adclickoverlay.ts b/src/ts/components/ads/adclickoverlay.ts similarity index 90% rename from src/ts/components/adclickoverlay.ts rename to src/ts/components/ads/adclickoverlay.ts index 9f9b50ca3..596f40a80 100644 --- a/src/ts/components/adclickoverlay.ts +++ b/src/ts/components/ads/adclickoverlay.ts @@ -1,5 +1,5 @@ -import { ClickOverlay, ClickOverlayConfig } from './clickoverlay'; -import { UIInstanceManager } from '../uimanager'; +import { ClickOverlay, ClickOverlayConfig } from '../overlays/clickoverlay'; +import { UIInstanceManager } from '../../uimanager'; import { Ad, AdEvent, PlayerAPI } from 'bitmovin-player'; /** diff --git a/src/ts/components/admessagelabel.ts b/src/ts/components/ads/admessagelabel.ts similarity index 87% rename from src/ts/components/admessagelabel.ts rename to src/ts/components/ads/admessagelabel.ts index 63c0bd537..ccd13fa07 100644 --- a/src/ts/components/admessagelabel.ts +++ b/src/ts/components/ads/admessagelabel.ts @@ -1,8 +1,8 @@ -import {Label, LabelConfig} from './label'; -import {UIInstanceManager} from '../uimanager'; -import {StringUtils} from '../stringutils'; +import {Label, LabelConfig} from '../labels/label'; +import {UIInstanceManager} from '../../uimanager'; +import {StringUtils} from '../../utils/stringutils'; import { AdEvent, LinearAd, PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * A label that displays a message about a running ad, optionally with a countdown. diff --git a/src/ts/components/adskipbutton.ts b/src/ts/components/ads/adskipbutton.ts similarity index 94% rename from src/ts/components/adskipbutton.ts rename to src/ts/components/ads/adskipbutton.ts index e77fd23cd..ab483531e 100644 --- a/src/ts/components/adskipbutton.ts +++ b/src/ts/components/ads/adskipbutton.ts @@ -1,6 +1,6 @@ -import { ButtonConfig, Button } from './button'; -import { UIInstanceManager } from '../uimanager'; -import { StringUtils } from '../stringutils'; +import { ButtonConfig, Button } from '../buttons/button'; +import { UIInstanceManager } from '../../uimanager'; +import { StringUtils } from '../../utils/stringutils'; import { AdEvent, LinearAd, PlayerAPI } from 'bitmovin-player'; /** diff --git a/src/ts/components/adstatusoverlay.ts b/src/ts/components/ads/adstatusoverlay.ts similarity index 83% rename from src/ts/components/adstatusoverlay.ts rename to src/ts/components/ads/adstatusoverlay.ts index 85b1aa8e2..a8f46a6b3 100644 --- a/src/ts/components/adstatusoverlay.ts +++ b/src/ts/components/ads/adstatusoverlay.ts @@ -1,10 +1,10 @@ -import { Container, ContainerConfig } from './container'; +import { Container, ContainerConfig } from '../container'; import { AdSkipButton } from './adskipbutton'; -import { Spacer } from './spacer'; +import { Spacer } from '../spacer'; import { PlayerAPI } from 'bitmovin-player'; -import { UIInstanceManager } from '../uimanager'; -import { Component, ComponentConfig } from './component'; -import { ControlBar } from './controlbar'; +import { UIInstanceManager } from '../../uimanager'; +import { Component, ComponentConfig } from '../component'; +import { ControlBar } from '../controlbar'; export class AdStatusOverlay extends Container { private static readonly CLASS_CONTROLBAR_VISIBLE = 'controlbar-visible'; diff --git a/src/ts/components/airplaytogglebutton.ts b/src/ts/components/buttons/airplaytogglebutton.ts similarity index 94% rename from src/ts/components/airplaytogglebutton.ts rename to src/ts/components/buttons/airplaytogglebutton.ts index 4bdeb6335..346effa0f 100644 --- a/src/ts/components/airplaytogglebutton.ts +++ b/src/ts/components/buttons/airplaytogglebutton.ts @@ -1,7 +1,7 @@ import {ToggleButton, ToggleButtonConfig} from './togglebutton'; -import {UIInstanceManager} from '../uimanager'; +import {UIInstanceManager} from '../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * A button that toggles Apple AirPlay. diff --git a/src/ts/components/button.ts b/src/ts/components/buttons/button.ts similarity index 92% rename from src/ts/components/button.ts rename to src/ts/components/buttons/button.ts index 210039f98..957036abc 100644 --- a/src/ts/components/button.ts +++ b/src/ts/components/buttons/button.ts @@ -1,7 +1,7 @@ -import {ComponentConfig, Component} from './component'; -import {DOM} from '../dom'; -import {EventDispatcher, NoArgs, Event} from '../eventdispatcher'; -import { LocalizableText , i18n } from '../localization/i18n'; +import {ComponentConfig, Component} from '../component'; +import {DOM} from '../../dom'; +import {EventDispatcher, NoArgs, Event} from '../../eventdispatcher'; +import { LocalizableText , i18n } from '../../localization/i18n'; /** * Configuration interface for a {@link Button} component. diff --git a/src/ts/components/casttogglebutton.ts b/src/ts/components/buttons/casttogglebutton.ts similarity index 94% rename from src/ts/components/casttogglebutton.ts rename to src/ts/components/buttons/casttogglebutton.ts index c7f55b250..3cd01d7b3 100644 --- a/src/ts/components/casttogglebutton.ts +++ b/src/ts/components/buttons/casttogglebutton.ts @@ -1,7 +1,7 @@ import {ToggleButton, ToggleButtonConfig} from './togglebutton'; -import {UIInstanceManager} from '../uimanager'; +import {UIInstanceManager} from '../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * A button that toggles casting to a Cast receiver. diff --git a/src/ts/components/closebutton.ts b/src/ts/components/buttons/closebutton.ts similarity index 86% rename from src/ts/components/closebutton.ts rename to src/ts/components/buttons/closebutton.ts index 0daf3c230..6b68f613f 100644 --- a/src/ts/components/closebutton.ts +++ b/src/ts/components/buttons/closebutton.ts @@ -1,8 +1,8 @@ import {ButtonConfig, Button} from './button'; -import {UIInstanceManager} from '../uimanager'; -import {Component, ComponentConfig} from './component'; +import {UIInstanceManager} from '../../uimanager'; +import {Component, ComponentConfig} from '../component'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * Configuration interface for the {@link CloseButton}. diff --git a/src/ts/components/ecomodetogglebutton.ts b/src/ts/components/buttons/ecomodetogglebutton.ts similarity index 93% rename from src/ts/components/ecomodetogglebutton.ts rename to src/ts/components/buttons/ecomodetogglebutton.ts index b5cde476e..b13d874ff 100644 --- a/src/ts/components/ecomodetogglebutton.ts +++ b/src/ts/components/buttons/ecomodetogglebutton.ts @@ -1,7 +1,7 @@ import { ToggleButton, ToggleButtonConfig } from './togglebutton'; -import { UIInstanceManager } from '../uimanager'; +import { UIInstanceManager } from '../../uimanager'; import { DynamicAdaptationConfig, PlayerAPI, VideoQualityChangedEvent } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * @category Buttons diff --git a/src/ts/components/fullscreentogglebutton.ts b/src/ts/components/buttons/fullscreentogglebutton.ts similarity index 95% rename from src/ts/components/fullscreentogglebutton.ts rename to src/ts/components/buttons/fullscreentogglebutton.ts index 968344dc5..3b3705af4 100644 --- a/src/ts/components/fullscreentogglebutton.ts +++ b/src/ts/components/buttons/fullscreentogglebutton.ts @@ -1,7 +1,7 @@ import { ToggleButton, ToggleButtonConfig } from './togglebutton'; -import { UIInstanceManager } from '../uimanager'; +import { UIInstanceManager } from '../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * A button that toggles the player between windowed and fullscreen view. diff --git a/src/ts/components/hugeplaybacktogglebutton.ts b/src/ts/components/buttons/hugeplaybacktogglebutton.ts similarity index 98% rename from src/ts/components/hugeplaybacktogglebutton.ts rename to src/ts/components/buttons/hugeplaybacktogglebutton.ts index afd4ea308..34e0b0ae3 100644 --- a/src/ts/components/hugeplaybacktogglebutton.ts +++ b/src/ts/components/buttons/hugeplaybacktogglebutton.ts @@ -1,8 +1,8 @@ import {PlaybackToggleButton, PlaybackToggleButtonConfig} from './playbacktogglebutton'; -import {DOM} from '../dom'; -import {UIInstanceManager} from '../uimanager'; +import {DOM} from '../../dom'; +import {UIInstanceManager} from '../../uimanager'; import { PlayerAPI, PlayerEventBase, WarningEvent } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * A button that overlays the video and toggles between playback and pause. diff --git a/src/ts/components/hugereplaybutton.ts b/src/ts/components/buttons/hugereplaybutton.ts similarity index 90% rename from src/ts/components/hugereplaybutton.ts rename to src/ts/components/buttons/hugereplaybutton.ts index 658d0c873..172ed1e4d 100644 --- a/src/ts/components/hugereplaybutton.ts +++ b/src/ts/components/buttons/hugereplaybutton.ts @@ -1,8 +1,8 @@ import {ButtonConfig, Button} from './button'; -import {DOM} from '../dom'; -import {UIInstanceManager} from '../uimanager'; +import {DOM} from '../../dom'; +import {UIInstanceManager} from '../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * A button to play/replay a video. diff --git a/src/ts/components/pictureinpicturetogglebutton.ts b/src/ts/components/buttons/pictureinpicturetogglebutton.ts similarity index 95% rename from src/ts/components/pictureinpicturetogglebutton.ts rename to src/ts/components/buttons/pictureinpicturetogglebutton.ts index 9644eb9a0..2a2bc6db6 100644 --- a/src/ts/components/pictureinpicturetogglebutton.ts +++ b/src/ts/components/buttons/pictureinpicturetogglebutton.ts @@ -1,7 +1,7 @@ import {ToggleButton, ToggleButtonConfig} from './togglebutton'; -import {UIInstanceManager} from '../uimanager'; +import {UIInstanceManager} from '../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * A button that toggles Apple macOS picture-in-picture mode. diff --git a/src/ts/components/playbacktogglebutton.ts b/src/ts/components/buttons/playbacktogglebutton.ts similarity index 97% rename from src/ts/components/playbacktogglebutton.ts rename to src/ts/components/buttons/playbacktogglebutton.ts index 06837a1aa..8f13837e7 100644 --- a/src/ts/components/playbacktogglebutton.ts +++ b/src/ts/components/buttons/playbacktogglebutton.ts @@ -1,8 +1,8 @@ import {ToggleButton, ToggleButtonConfig} from './togglebutton'; -import {UIInstanceManager} from '../uimanager'; -import {PlayerUtils} from '../playerutils'; +import {UIInstanceManager} from '../../uimanager'; +import {PlayerUtils} from '../../utils/playerutils'; import { PlayerAPI, WarningEvent } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * @category Configs diff --git a/src/ts/components/quickseekbutton.ts b/src/ts/components/buttons/quickseekbutton.ts similarity index 96% rename from src/ts/components/quickseekbutton.ts rename to src/ts/components/buttons/quickseekbutton.ts index 841a7441f..7e00d4393 100644 --- a/src/ts/components/quickseekbutton.ts +++ b/src/ts/components/buttons/quickseekbutton.ts @@ -1,8 +1,8 @@ import { Button, ButtonConfig } from './button'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; import { PlayerAPI, SeekEvent, TimeShiftEvent } from 'bitmovin-player'; -import { UIInstanceManager } from '../uimanager'; -import { PlayerUtils } from '../playerutils'; +import { UIInstanceManager } from '../../uimanager'; +import { PlayerUtils } from '../../utils/playerutils'; /** * @category Configs diff --git a/src/ts/components/replaybutton.ts b/src/ts/components/buttons/replaybutton.ts similarity index 89% rename from src/ts/components/replaybutton.ts rename to src/ts/components/buttons/replaybutton.ts index 6278ed1f3..4b1a3aa0f 100644 --- a/src/ts/components/replaybutton.ts +++ b/src/ts/components/buttons/replaybutton.ts @@ -1,8 +1,8 @@ import { ButtonConfig, Button } from './button'; -import { UIInstanceManager } from '../uimanager'; +import { UIInstanceManager } from '../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; -import { PlayerUtils } from '../playerutils'; +import { i18n } from '../../localization/i18n'; +import { PlayerUtils } from '../../utils/playerutils'; import LiveStreamDetectorEventArgs = PlayerUtils.LiveStreamDetectorEventArgs; /** diff --git a/src/ts/components/smallcenteredplaybacktogglebutton.ts b/src/ts/components/buttons/smallcenteredplaybacktogglebutton.ts similarity index 97% rename from src/ts/components/smallcenteredplaybacktogglebutton.ts rename to src/ts/components/buttons/smallcenteredplaybacktogglebutton.ts index 9e39fb462..d3cd312ec 100644 --- a/src/ts/components/smallcenteredplaybacktogglebutton.ts +++ b/src/ts/components/buttons/smallcenteredplaybacktogglebutton.ts @@ -1,8 +1,8 @@ import {PlaybackToggleButton, PlaybackToggleButtonConfig} from './playbacktogglebutton'; -import {DOM} from '../dom'; -import {UIInstanceManager} from '../uimanager'; +import {DOM} from '../../dom'; +import {UIInstanceManager} from '../../uimanager'; import { PlayerAPI, PlayerEventBase, WarningEvent } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; export class SmallCenteredPlaybackToggleButton extends PlaybackToggleButton { diff --git a/src/ts/components/subtitletogglebutton.ts b/src/ts/components/buttons/subtitletogglebutton.ts similarity index 90% rename from src/ts/components/subtitletogglebutton.ts rename to src/ts/components/buttons/subtitletogglebutton.ts index 60405ee71..b2d46ec9d 100644 --- a/src/ts/components/subtitletogglebutton.ts +++ b/src/ts/components/buttons/subtitletogglebutton.ts @@ -1,12 +1,12 @@ import { ToggleButton, ToggleButtonConfig } from './togglebutton'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; import { PlayerAPI, SubtitleTrack } from 'bitmovin-player'; -import { UIInstanceManager } from '../uimanager'; -import { StorageUtils } from '../storageutils'; -import { SubtitleSelectBox } from './subtitleselectbox'; -import { prefixCss } from './dummycomponent'; -import { SubtitleSwitchHandler } from '../subtitleutils'; -import { DynamicSettingsPanelItem } from './dynamicsettingspanelitem'; +import { UIInstanceManager } from '../../uimanager'; +import { StorageUtils } from '../../utils/storageutils'; +import { SubtitleSelectBox } from '../settings/subtitleselectbox'; +import { prefixCss } from '../dummycomponent'; +import { SubtitleSwitchHandler } from '../../utils/subtitleutils'; +import { DynamicSettingsPanelItem } from '../settings/dynamicsettingspanelitem'; export interface StoredSubtitleLanguage { language: string; diff --git a/src/ts/components/togglebutton.ts b/src/ts/components/buttons/togglebutton.ts similarity index 96% rename from src/ts/components/togglebutton.ts rename to src/ts/components/buttons/togglebutton.ts index e7d4560fa..d2fc6e1e5 100644 --- a/src/ts/components/togglebutton.ts +++ b/src/ts/components/buttons/togglebutton.ts @@ -1,8 +1,8 @@ import {Button, ButtonConfig} from './button'; -import {NoArgs, EventDispatcher, Event} from '../eventdispatcher'; -import { UIInstanceManager } from '../uimanager'; +import {NoArgs, EventDispatcher, Event} from '../../eventdispatcher'; +import { UIInstanceManager } from '../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { LocalizableText } from '../localization/i18n'; +import { LocalizableText } from '../../localization/i18n'; /** * Configuration interface for a toggle button component. diff --git a/src/ts/components/volumecontrolbutton.ts b/src/ts/components/buttons/volumecontrolbutton.ts similarity index 95% rename from src/ts/components/volumecontrolbutton.ts rename to src/ts/components/buttons/volumecontrolbutton.ts index 3cce5d0bc..fa0c5e6ce 100644 --- a/src/ts/components/volumecontrolbutton.ts +++ b/src/ts/components/buttons/volumecontrolbutton.ts @@ -1,8 +1,8 @@ -import {Container, ContainerConfig} from './container'; -import {VolumeSlider} from './volumeslider'; +import {Container, ContainerConfig} from '../container'; +import {VolumeSlider} from '../seekbar/volumeslider'; import {VolumeToggleButton} from './volumetogglebutton'; -import {UIInstanceManager} from '../uimanager'; -import {Timeout} from '../timeout'; +import {UIInstanceManager} from '../../uimanager'; +import {Timeout} from '../../utils/timeout'; import { PlayerAPI } from 'bitmovin-player'; /** diff --git a/src/ts/components/volumetogglebutton.ts b/src/ts/components/buttons/volumetogglebutton.ts similarity index 92% rename from src/ts/components/volumetogglebutton.ts rename to src/ts/components/buttons/volumetogglebutton.ts index 583cb1db8..36a143070 100644 --- a/src/ts/components/volumetogglebutton.ts +++ b/src/ts/components/buttons/volumetogglebutton.ts @@ -1,7 +1,7 @@ import {ToggleButton, ToggleButtonConfig} from './togglebutton'; -import { UIInstanceManager } from '../uimanager'; +import { UIInstanceManager } from '../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * A button that toggles audio muting. diff --git a/src/ts/components/vrtogglebutton.ts b/src/ts/components/buttons/vrtogglebutton.ts similarity index 96% rename from src/ts/components/vrtogglebutton.ts rename to src/ts/components/buttons/vrtogglebutton.ts index 61856378e..5ed81b87e 100644 --- a/src/ts/components/vrtogglebutton.ts +++ b/src/ts/components/buttons/vrtogglebutton.ts @@ -1,7 +1,7 @@ import {ToggleButton, ToggleButtonConfig} from './togglebutton'; -import {UIInstanceManager} from '../uimanager'; +import {UIInstanceManager} from '../../uimanager'; import { PlayerAPI, PlayerEventBase, WarningEvent } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * A button that toggles the video view between normal/mono and VR/stereo. diff --git a/src/ts/components/castuicontainer.ts b/src/ts/components/castuicontainer.ts index 3cf2dec9c..09aee15bd 100644 --- a/src/ts/components/castuicontainer.ts +++ b/src/ts/components/castuicontainer.ts @@ -1,6 +1,6 @@ import {UIContainer, UIContainerConfig} from './uicontainer'; import {UIInstanceManager} from '../uimanager'; -import {Timeout} from '../timeout'; +import {Timeout} from '../utils/timeout'; import { PlayerAPI } from 'bitmovin-player'; /** diff --git a/src/ts/components/component.ts b/src/ts/components/component.ts index dc3e9fd46..c1edc646c 100644 --- a/src/ts/components/component.ts +++ b/src/ts/components/component.ts @@ -1,4 +1,4 @@ -import {Guid} from '../guid'; +import {Guid} from '../utils/guid'; import {DOM} from '../dom'; import {EventDispatcher, NoArgs, Event} from '../eventdispatcher'; import {UIInstanceManager} from '../uimanager'; diff --git a/src/ts/components/container.ts b/src/ts/components/container.ts index 2390a9147..cbe1f9133 100644 --- a/src/ts/components/container.ts +++ b/src/ts/components/container.ts @@ -1,6 +1,6 @@ import { ComponentConfig, Component, ViewModeChangedEventArgs, ViewMode } from './component'; import {DOM} from '../dom'; -import {ArrayUtils} from '../arrayutils'; +import {ArrayUtils} from '../utils/arrayutils'; import { i18n } from '../localization/i18n'; /** diff --git a/src/ts/components/controlbar.ts b/src/ts/components/controlbar.ts index 8de8388e1..2e47f68ab 100644 --- a/src/ts/components/controlbar.ts +++ b/src/ts/components/controlbar.ts @@ -1,12 +1,12 @@ import {ContainerConfig, Container} from './container'; import {UIInstanceManager} from '../uimanager'; -import {UIUtils} from '../uiutils'; +import {UIUtils} from '../utils/uiutils'; import {Spacer} from './spacer'; import { PlayerAPI } from 'bitmovin-player'; import { i18n } from '../localization/i18n'; -import { BrowserUtils } from '../browserutils'; +import { BrowserUtils } from '../utils/browserutils'; import {Component, ComponentConfig} from './component'; -import {SettingsPanel} from './settingspanel'; +import {SettingsPanel} from './settings/settingspanel'; /** * Configuration interface for the {@link ControlBar}. diff --git a/src/ts/components/ecomodecontainer.ts b/src/ts/components/ecomodecontainer.ts index 77bb7b4e5..7c4df5fc3 100644 --- a/src/ts/components/ecomodecontainer.ts +++ b/src/ts/components/ecomodecontainer.ts @@ -1,9 +1,9 @@ import { PlayerAPI, SegmentPlaybackEvent, VideoQuality } from 'bitmovin-player'; import { i18n } from '../localization/i18n'; import { Container, ContainerConfig } from './container'; -import { EcoModeToggleButton } from './ecomodetogglebutton'; -import { Label, LabelConfig } from './label'; -import { SettingsPanelItem, SettingsPanelItemConfig } from './settingspanelitem'; +import { EcoModeToggleButton } from './buttons/ecomodetogglebutton'; +import { Label, LabelConfig } from './labels/label'; +import { SettingsPanelItem, SettingsPanelItemConfig } from './settings/settingspanelitem'; /** * @category Containers diff --git a/src/ts/components/label.ts b/src/ts/components/labels/label.ts similarity index 93% rename from src/ts/components/label.ts rename to src/ts/components/labels/label.ts index 3cc8062b0..2b00bfa34 100644 --- a/src/ts/components/label.ts +++ b/src/ts/components/labels/label.ts @@ -1,7 +1,7 @@ -import {ComponentConfig, Component} from './component'; -import {DOM} from '../dom'; -import {EventDispatcher, Event, NoArgs} from '../eventdispatcher'; -import { LocalizableText, i18n } from '../localization/i18n'; +import {ComponentConfig, Component} from '../component'; +import {DOM} from '../../dom'; +import {EventDispatcher, Event, NoArgs} from '../../eventdispatcher'; +import { LocalizableText, i18n } from '../../localization/i18n'; /** * Configuration interface for a {@link Label} component. diff --git a/src/ts/components/metadatalabel.ts b/src/ts/components/labels/metadatalabel.ts similarity index 97% rename from src/ts/components/metadatalabel.ts rename to src/ts/components/labels/metadatalabel.ts index 8473152c5..325edacbc 100644 --- a/src/ts/components/metadatalabel.ts +++ b/src/ts/components/labels/metadatalabel.ts @@ -1,5 +1,5 @@ import {LabelConfig, Label} from './label'; -import {UIInstanceManager} from '../uimanager'; +import {UIInstanceManager} from '../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; /** diff --git a/src/ts/components/playbacktimelabel.ts b/src/ts/components/labels/playbacktimelabel.ts similarity index 97% rename from src/ts/components/playbacktimelabel.ts rename to src/ts/components/labels/playbacktimelabel.ts index a87619a4c..55db9f2f7 100644 --- a/src/ts/components/playbacktimelabel.ts +++ b/src/ts/components/labels/playbacktimelabel.ts @@ -1,10 +1,10 @@ import {LabelConfig, Label} from './label'; -import {UIInstanceManager} from '../uimanager'; +import {UIInstanceManager} from '../../uimanager'; import LiveStreamDetectorEventArgs = PlayerUtils.LiveStreamDetectorEventArgs; -import {PlayerUtils} from '../playerutils'; -import {StringUtils} from '../stringutils'; +import {PlayerUtils} from '../../utils/playerutils'; +import {StringUtils} from '../../utils/stringutils'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; export enum PlaybackTimeLabelMode { /** diff --git a/src/ts/components/audiotracklistbox.ts b/src/ts/components/lists/audiotracklistbox.ts similarity index 77% rename from src/ts/components/audiotracklistbox.ts rename to src/ts/components/lists/audiotracklistbox.ts index 5124fe8ac..1edf7c152 100644 --- a/src/ts/components/audiotracklistbox.ts +++ b/src/ts/components/lists/audiotracklistbox.ts @@ -1,6 +1,6 @@ import {ListBox} from './listbox'; -import {UIInstanceManager} from '../uimanager'; -import {AudioTrackSwitchHandler} from '../audiotrackutils'; +import {UIInstanceManager} from '../../uimanager'; +import {AudioTrackSwitchHandler} from '../../utils/audiotrackutils'; import { PlayerAPI } from 'bitmovin-player'; /** diff --git a/src/ts/components/itemselectionlist.ts b/src/ts/components/lists/itemselectionlist.ts similarity index 97% rename from src/ts/components/itemselectionlist.ts rename to src/ts/components/lists/itemselectionlist.ts index fbacff552..e1089c5e3 100644 --- a/src/ts/components/itemselectionlist.ts +++ b/src/ts/components/lists/itemselectionlist.ts @@ -1,6 +1,6 @@ import {ListSelector, ListSelectorConfig} from './listselector'; -import {DOM} from '../dom'; -import { i18n } from '../localization/i18n'; +import {DOM} from '../../dom'; +import { i18n } from '../../localization/i18n'; /** * @category Components diff --git a/src/ts/components/listbox.ts b/src/ts/components/lists/listbox.ts similarity index 95% rename from src/ts/components/listbox.ts rename to src/ts/components/lists/listbox.ts index c60248225..d623f39bf 100644 --- a/src/ts/components/listbox.ts +++ b/src/ts/components/lists/listbox.ts @@ -1,9 +1,9 @@ -import { ToggleButton, ToggleButtonConfig } from './togglebutton'; +import { ToggleButton, ToggleButtonConfig } from '../buttons/togglebutton'; import { ListItem, ListSelector, ListSelectorConfig } from './listselector'; -import {DOM} from '../dom'; +import {DOM} from '../../dom'; import { PlayerAPI } from 'bitmovin-player'; -import { UIInstanceManager } from '../uimanager'; -import { ArrayUtils } from '../arrayutils'; +import { UIInstanceManager } from '../../uimanager'; +import { ArrayUtils } from '../../utils/arrayutils'; /** * A element to select a single item out of a list of available items. diff --git a/src/ts/components/listselector.ts b/src/ts/components/lists/listselector.ts similarity index 97% rename from src/ts/components/listselector.ts rename to src/ts/components/lists/listselector.ts index d5620db4b..d66ae1edc 100644 --- a/src/ts/components/listselector.ts +++ b/src/ts/components/lists/listselector.ts @@ -1,7 +1,7 @@ -import {Component, ComponentConfig} from './component'; -import {EventDispatcher, Event} from '../eventdispatcher'; -import {ArrayUtils} from '../arrayutils'; -import { LocalizableText, i18n } from '../localization/i18n'; +import {Component, ComponentConfig} from '../component'; +import {EventDispatcher, Event} from '../../eventdispatcher'; +import {ArrayUtils} from '../../utils/arrayutils'; +import { LocalizableText, i18n } from '../../localization/i18n'; /** * A map of items (key/value -> label} for a {@link ListSelector} in a {@link ListSelectorConfig}. diff --git a/src/ts/components/subtitlelistbox.ts b/src/ts/components/lists/subtitlelistbox.ts similarity index 78% rename from src/ts/components/subtitlelistbox.ts rename to src/ts/components/lists/subtitlelistbox.ts index 1aab133a6..f026e2e49 100644 --- a/src/ts/components/subtitlelistbox.ts +++ b/src/ts/components/lists/subtitlelistbox.ts @@ -1,6 +1,6 @@ import {ListBox} from './listbox'; -import {UIInstanceManager} from '../uimanager'; -import {SubtitleSwitchHandler} from '../subtitleutils'; +import {UIInstanceManager} from '../../uimanager'; +import {SubtitleSwitchHandler} from '../../utils/subtitleutils'; import { PlayerAPI } from 'bitmovin-player'; /** diff --git a/src/ts/components/bufferingoverlay.ts b/src/ts/components/overlays/bufferingoverlay.ts similarity index 92% rename from src/ts/components/bufferingoverlay.ts rename to src/ts/components/overlays/bufferingoverlay.ts index 570141534..b0ab0a849 100644 --- a/src/ts/components/bufferingoverlay.ts +++ b/src/ts/components/overlays/bufferingoverlay.ts @@ -1,7 +1,7 @@ -import {ContainerConfig, Container} from './container'; -import {UIInstanceManager} from '../uimanager'; -import {Component, ComponentConfig} from './component'; -import {Timeout} from '../timeout'; +import {ContainerConfig, Container} from '../container'; +import {UIInstanceManager} from '../../uimanager'; +import {Component, ComponentConfig} from '../component'; +import {Timeout} from '../../utils/timeout'; import { PlayerAPI } from 'bitmovin-player'; /** diff --git a/src/ts/components/caststatusoverlay.ts b/src/ts/components/overlays/caststatusoverlay.ts similarity index 88% rename from src/ts/components/caststatusoverlay.ts rename to src/ts/components/overlays/caststatusoverlay.ts index a7ad23e57..1ec487de6 100644 --- a/src/ts/components/caststatusoverlay.ts +++ b/src/ts/components/overlays/caststatusoverlay.ts @@ -1,8 +1,8 @@ -import {ContainerConfig, Container} from './container'; -import {Label, LabelConfig} from './label'; -import {UIInstanceManager} from '../uimanager'; +import {ContainerConfig, Container} from '../container'; +import {Label, LabelConfig} from '../labels/label'; +import {UIInstanceManager} from '../../uimanager'; import { CastStartedEvent, CastWaitingForDeviceEvent, PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * Overlays the player and displays the status of a Cast session. diff --git a/src/ts/components/clickoverlay.ts b/src/ts/components/overlays/clickoverlay.ts similarity index 95% rename from src/ts/components/clickoverlay.ts rename to src/ts/components/overlays/clickoverlay.ts index 311713bd6..129fb9614 100644 --- a/src/ts/components/clickoverlay.ts +++ b/src/ts/components/overlays/clickoverlay.ts @@ -1,4 +1,4 @@ -import {Button, ButtonConfig} from './button'; +import {Button, ButtonConfig} from '../buttons/button'; /** * Configuration interface for a {@link ClickOverlay}. diff --git a/src/ts/components/errormessageoverlay.ts b/src/ts/components/overlays/errormessageoverlay.ts similarity index 95% rename from src/ts/components/errormessageoverlay.ts rename to src/ts/components/overlays/errormessageoverlay.ts index b09de8ecf..65af1b660 100644 --- a/src/ts/components/errormessageoverlay.ts +++ b/src/ts/components/overlays/errormessageoverlay.ts @@ -1,13 +1,13 @@ -import {ContainerConfig, Container} from './container'; -import {Label, LabelConfig} from './label'; -import {UIInstanceManager} from '../uimanager'; -import {TvNoiseCanvas} from './tvnoisecanvas'; -import { ErrorUtils } from '../errorutils'; +import {ContainerConfig, Container} from '../container'; +import {Label, LabelConfig} from '../labels/label'; +import {UIInstanceManager} from '../../uimanager'; +import {TvNoiseCanvas} from '../tvnoisecanvas'; +import { ErrorUtils } from '../../utils/errorutils'; import { ErrorEvent, PlayerAPI, PlayerEventBase } from 'bitmovin-player'; import { isMobileV3PlayerAPI, MobileV3PlayerAPI, MobileV3PlayerErrorEvent, MobileV3PlayerEvent, MobileV3SourceErrorEvent, -} from '../mobilev3playerapi'; +} from '../../utils/mobilev3playerapi'; export interface ErrorMessageTranslator { (error: ErrorEvent | MobileV3PlayerErrorEvent): string; diff --git a/src/ts/components/playbacktoggleoverlay.ts b/src/ts/components/overlays/playbacktoggleoverlay.ts similarity index 87% rename from src/ts/components/playbacktoggleoverlay.ts rename to src/ts/components/overlays/playbacktoggleoverlay.ts index d72ca9346..29129ab87 100644 --- a/src/ts/components/playbacktoggleoverlay.ts +++ b/src/ts/components/overlays/playbacktoggleoverlay.ts @@ -1,5 +1,5 @@ -import {Container, ContainerConfig} from './container'; -import {HugePlaybackToggleButton} from './hugeplaybacktogglebutton'; +import {Container, ContainerConfig} from '../container'; +import {HugePlaybackToggleButton} from '../buttons/hugeplaybacktogglebutton'; /** * @category Configs diff --git a/src/ts/components/recommendationoverlay.ts b/src/ts/components/overlays/recommendationoverlay.ts similarity index 91% rename from src/ts/components/recommendationoverlay.ts rename to src/ts/components/overlays/recommendationoverlay.ts index 86d2fdce5..a2fedb981 100644 --- a/src/ts/components/recommendationoverlay.ts +++ b/src/ts/components/overlays/recommendationoverlay.ts @@ -1,10 +1,10 @@ -import {ContainerConfig, Container} from './container'; -import {Component, ComponentConfig} from './component'; -import {DOM} from '../dom'; -import {UIInstanceManager} from '../uimanager'; -import {StringUtils} from '../stringutils'; -import {HugeReplayButton} from './hugereplaybutton'; -import { UIRecommendationConfig } from '../uiconfig'; +import {ContainerConfig, Container} from '../container'; +import {Component, ComponentConfig} from '../component'; +import {DOM} from '../../dom'; +import {UIInstanceManager} from '../../uimanager'; +import {StringUtils} from '../../utils/stringutils'; +import {HugeReplayButton} from '../buttons/hugereplaybutton'; +import { UIRecommendationConfig } from '../../uiconfig'; import { PlayerAPI } from 'bitmovin-player'; /** diff --git a/src/ts/components/subtitleoverlay.ts b/src/ts/components/overlays/subtitleoverlay.ts similarity index 98% rename from src/ts/components/subtitleoverlay.ts rename to src/ts/components/overlays/subtitleoverlay.ts index 9a7e3d122..9fc036cd1 100644 --- a/src/ts/components/subtitleoverlay.ts +++ b/src/ts/components/overlays/subtitleoverlay.ts @@ -1,13 +1,13 @@ -import { Container, ContainerConfig } from './container'; -import { UIInstanceManager } from '../uimanager'; -import { Label, LabelConfig } from './label'; -import { ComponentConfig, Component } from './component'; -import { ControlBar } from './controlbar'; -import { EventDispatcher } from '../eventdispatcher'; -import { DOM, Size } from '../dom'; +import { Container, ContainerConfig } from '../container'; +import { UIInstanceManager } from '../../uimanager'; +import { Label, LabelConfig } from '../labels/label'; +import { ComponentConfig, Component } from '../component'; +import { ControlBar } from '../controlbar'; +import { EventDispatcher } from '../../eventdispatcher'; +import { DOM, Size } from '../../dom'; import { PlayerAPI, SubtitleCueEvent } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; -import { VttUtils } from '../vttutils'; +import { i18n } from '../../localization/i18n'; +import { VttUtils } from '../../utils/vttutils'; import { VTTProperties } from 'bitmovin-player/types/subtitles/vtt/API'; interface SubtitleCropDetectionResult { diff --git a/src/ts/components/touchcontroloverlay.ts b/src/ts/components/overlays/touchcontroloverlay.ts similarity index 93% rename from src/ts/components/touchcontroloverlay.ts rename to src/ts/components/overlays/touchcontroloverlay.ts index e9167716c..98884b6ff 100644 --- a/src/ts/components/touchcontroloverlay.ts +++ b/src/ts/components/overlays/touchcontroloverlay.ts @@ -1,12 +1,12 @@ -import { Container, ContainerConfig } from './container'; -import { SmallCenteredPlaybackToggleButton } from './smallcenteredplaybacktogglebutton'; +import { Container, ContainerConfig } from '../container'; +import { SmallCenteredPlaybackToggleButton } from '../buttons/smallcenteredplaybacktogglebutton'; import { PlayerAPI } from 'bitmovin-player'; -import { UIInstanceManager } from '../uimanager'; -import { EventDispatcher, NoArgs, Event as EDEvent } from '../eventdispatcher'; -import { Timeout } from '../timeout'; -import { HTMLElementWithComponent } from '../dom'; -import { Label, LabelConfig } from './label'; -import { i18n } from '../localization/i18n'; +import { UIInstanceManager } from '../../uimanager'; +import { EventDispatcher, NoArgs, Event as EDEvent } from '../../eventdispatcher'; +import { Timeout } from '../../utils/timeout'; +import { HTMLElementWithComponent } from '../../dom'; +import { Label, LabelConfig } from '../labels/label'; +import { i18n } from '../../localization/i18n'; export interface TouchControlOverlayConfig extends ContainerConfig { /** diff --git a/src/ts/components/seekbar.ts b/src/ts/components/seekbar/seekbar.ts similarity index 98% rename from src/ts/components/seekbar.ts rename to src/ts/components/seekbar/seekbar.ts index 998441eb5..f743b18f5 100644 --- a/src/ts/components/seekbar.ts +++ b/src/ts/components/seekbar/seekbar.ts @@ -1,20 +1,20 @@ -import { ExtendedPlayerAPI, GroupPlaybackSuspension, GroupPlaybackSuspensionReason } from './../groupplaybackapi'; -import { Component, ComponentConfig } from './component'; -import { DOM } from '../dom'; -import { Event, EventDispatcher, NoArgs } from '../eventdispatcher'; +import { ExtendedPlayerAPI, GroupPlaybackSuspension, GroupPlaybackSuspensionReason } from '../../utils/groupplaybackapi'; +import { Component, ComponentConfig } from '../component'; +import { DOM } from '../../dom'; +import { Event, EventDispatcher, NoArgs } from '../../eventdispatcher'; import { SeekBarLabel } from './seekbarlabel'; -import { UIInstanceManager, SeekPreviewArgs } from '../uimanager'; -import { Timeout } from '../timeout'; -import { PlayerUtils } from '../playerutils'; +import { UIInstanceManager, SeekPreviewArgs } from '../../uimanager'; +import { Timeout } from '../../utils/timeout'; +import { PlayerUtils } from '../../utils/playerutils'; import TimeShiftAvailabilityChangedArgs = PlayerUtils.TimeShiftAvailabilityChangedArgs; import LiveStreamDetectorEventArgs = PlayerUtils.LiveStreamDetectorEventArgs; -import { TimelineMarker } from '../uiconfig'; +import { TimelineMarker } from '../../uiconfig'; import { PlayerAPI, PlayerEventBase } from 'bitmovin-player'; -import { StringUtils } from '../stringutils'; -import { SeekBarType, SeekBarController } from './seekbarcontroller'; -import { i18n } from '../localization/i18n'; -import { BrowserUtils } from '../browserutils'; -import { TimelineMarkersHandler } from './timelinemarkershandler'; +import { StringUtils } from '../../utils/stringutils'; +import { SeekBarType, SeekBarController } from '../../utils/seekbarcontroller'; +import { i18n } from '../../localization/i18n'; +import { BrowserUtils } from '../../utils/browserutils'; +import { TimelineMarkersHandler } from '../../utils/timelinemarkershandler'; import { getMinBufferLevel } from './seekbarbufferlevel'; /** diff --git a/src/ts/components/seekbarbufferlevel.ts b/src/ts/components/seekbar/seekbarbufferlevel.ts similarity index 100% rename from src/ts/components/seekbarbufferlevel.ts rename to src/ts/components/seekbar/seekbarbufferlevel.ts diff --git a/src/ts/components/seekbarlabel.ts b/src/ts/components/seekbar/seekbarlabel.ts similarity index 95% rename from src/ts/components/seekbarlabel.ts rename to src/ts/components/seekbar/seekbarlabel.ts index b0aea018b..042da230f 100644 --- a/src/ts/components/seekbarlabel.ts +++ b/src/ts/components/seekbar/seekbarlabel.ts @@ -1,13 +1,13 @@ -import {Container, ContainerConfig} from './container'; -import {Label, LabelConfig} from './label'; -import {Component, ComponentConfig} from './component'; -import { UIInstanceManager } from '../uimanager'; -import {StringUtils} from '../stringutils'; -import {ImageLoader} from '../imageloader'; -import {CssProperties} from '../dom'; +import {Container, ContainerConfig} from '../container'; +import {Label, LabelConfig} from '../labels/label'; +import {Component, ComponentConfig} from '../component'; +import { UIInstanceManager } from '../../uimanager'; +import {StringUtils} from '../../utils/stringutils'; +import {ImageLoader} from '../../utils/imageloader'; +import {CssProperties} from '../../dom'; import { PlayerAPI, Thumbnail } from 'bitmovin-player'; import { SeekBar, SeekPreviewEventArgs } from './seekbar'; -import { PlayerUtils } from '../playerutils'; +import { PlayerUtils } from '../../utils/playerutils'; /** * Configuration interface for a {@link SeekBarLabel}. diff --git a/src/ts/components/volumeslider.ts b/src/ts/components/seekbar/volumeslider.ts similarity index 96% rename from src/ts/components/volumeslider.ts rename to src/ts/components/seekbar/volumeslider.ts index 02f126753..acf8130ca 100644 --- a/src/ts/components/volumeslider.ts +++ b/src/ts/components/seekbar/volumeslider.ts @@ -1,8 +1,8 @@ import { SeekBar, SeekBarConfig, SeekPreviewEventArgs } from './seekbar'; -import { UIInstanceManager } from '../uimanager'; +import { UIInstanceManager } from '../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { VolumeTransition } from '../volumecontroller'; -import { i18n } from '../localization/i18n'; +import { VolumeTransition } from '../../utils/volumecontroller'; +import { i18n } from '../../localization/i18n'; /** * Configuration interface for the {@link VolumeSlider} component. diff --git a/src/ts/components/audioqualityselectbox.ts b/src/ts/components/settings/audioqualityselectbox.ts similarity index 93% rename from src/ts/components/audioqualityselectbox.ts rename to src/ts/components/settings/audioqualityselectbox.ts index 59d6b407c..573a6a445 100644 --- a/src/ts/components/audioqualityselectbox.ts +++ b/src/ts/components/settings/audioqualityselectbox.ts @@ -1,8 +1,8 @@ import {SelectBox} from './selectbox'; -import {ListSelectorConfig} from './listselector'; -import {UIInstanceManager} from '../uimanager'; +import {ListSelectorConfig} from '../lists/listselector'; +import {UIInstanceManager} from '../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * A select box providing a selection between 'auto' and the available audio qualities. diff --git a/src/ts/components/audiotrackselectbox.ts b/src/ts/components/settings/audiotrackselectbox.ts similarity index 77% rename from src/ts/components/audiotrackselectbox.ts rename to src/ts/components/settings/audiotrackselectbox.ts index 687b73319..c2519fdf7 100644 --- a/src/ts/components/audiotrackselectbox.ts +++ b/src/ts/components/settings/audiotrackselectbox.ts @@ -1,7 +1,7 @@ import {SelectBox} from './selectbox'; -import {ListSelectorConfig} from './listselector'; -import {UIInstanceManager} from '../uimanager'; -import {AudioTrackSwitchHandler} from '../audiotrackutils'; +import {ListSelectorConfig} from '../lists/listselector'; +import {UIInstanceManager} from '../../uimanager'; +import {AudioTrackSwitchHandler} from '../../utils/audiotrackutils'; import { PlayerAPI } from 'bitmovin-player'; /** diff --git a/src/ts/components/dynamicsettingspanelitem.ts b/src/ts/components/settings/dynamicsettingspanelitem.ts similarity index 95% rename from src/ts/components/dynamicsettingspanelitem.ts rename to src/ts/components/settings/dynamicsettingspanelitem.ts index 16515a5b5..e106d4e4a 100644 --- a/src/ts/components/dynamicsettingspanelitem.ts +++ b/src/ts/components/settings/dynamicsettingspanelitem.ts @@ -1,8 +1,8 @@ -import { Label, LabelConfig } from './label'; -import { UIInstanceManager } from '../uimanager'; +import { Label, LabelConfig } from '../labels/label'; +import { UIInstanceManager } from '../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n, LocalizableText } from '../localization/i18n'; -import { ListSelector, ListSelectorConfig } from './listselector'; +import { i18n, LocalizableText } from '../../localization/i18n'; +import { ListSelector, ListSelectorConfig } from '../lists/listselector'; import { SubtitleSelectBox } from './subtitleselectbox'; import { SettingsPanelItem, SettingsPanelItemConfig } from './settingspanelitem'; import { SettingsPanelSelectOption } from './settingspanelselectoption'; diff --git a/src/ts/components/playbackspeedselectbox.ts b/src/ts/components/settings/playbackspeedselectbox.ts similarity index 92% rename from src/ts/components/playbackspeedselectbox.ts rename to src/ts/components/settings/playbackspeedselectbox.ts index d4afada23..f7fab09ee 100644 --- a/src/ts/components/playbackspeedselectbox.ts +++ b/src/ts/components/settings/playbackspeedselectbox.ts @@ -1,8 +1,8 @@ import {SelectBox} from './selectbox'; -import {ListSelectorConfig} from './listselector'; -import {UIInstanceManager} from '../uimanager'; +import {ListSelectorConfig} from '../lists/listselector'; +import {UIInstanceManager} from '../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * A select box providing a selection of different playback speeds. diff --git a/src/ts/components/selectbox.ts b/src/ts/components/settings/selectbox.ts similarity index 94% rename from src/ts/components/selectbox.ts rename to src/ts/components/settings/selectbox.ts index 54780310b..88ac66bb2 100644 --- a/src/ts/components/selectbox.ts +++ b/src/ts/components/settings/selectbox.ts @@ -1,11 +1,11 @@ -import { ListSelector, ListSelectorConfig } from './listselector'; -import { DOM } from '../dom'; -import { i18n } from '../localization/i18n'; +import { ListSelector, ListSelectorConfig } from '../lists/listselector'; +import { DOM } from '../../dom'; +import { i18n } from '../../localization/i18n'; import { PlayerAPI } from 'bitmovin-player'; -import { UIInstanceManager } from '../uimanager'; -import { UIContainer } from './uicontainer'; -import { PlayerUtils } from '../playerutils'; -import { ViewMode } from './component'; +import { UIInstanceManager } from '../../uimanager'; +import { UIContainer } from '../uicontainer'; +import { PlayerUtils } from '../../utils/playerutils'; +import { ViewMode } from '../component'; const DocumentDropdownClosedEvents = [ 'mousemove', diff --git a/src/ts/components/settingspanel.ts b/src/ts/components/settings/settingspanel.ts similarity index 97% rename from src/ts/components/settingspanel.ts rename to src/ts/components/settings/settingspanel.ts index 804d57b33..1657af5a7 100644 --- a/src/ts/components/settingspanel.ts +++ b/src/ts/components/settings/settingspanel.ts @@ -1,12 +1,12 @@ -import { Container, ContainerConfig } from './container'; +import { Container, ContainerConfig } from '../container'; import { SelectBox } from './selectbox'; -import { UIInstanceManager } from '../uimanager'; -import { Timeout } from '../timeout'; -import { Event, EventDispatcher, NoArgs } from '../eventdispatcher'; +import { UIInstanceManager } from '../../uimanager'; +import { Timeout } from '../../utils/timeout'; +import { Event, EventDispatcher, NoArgs } from '../../eventdispatcher'; import { SettingsPanelPage, SettingsPanelPageConfig } from './settingspanelpage'; import { SettingsPanelItem, SettingsPanelItemConfig } from './settingspanelitem'; import { PlayerAPI } from 'bitmovin-player'; -import { Component, ComponentConfig } from './component'; +import { Component, ComponentConfig } from '../component'; /** * Configuration interface for a {@link SettingsPanel}. diff --git a/src/ts/components/settingspanelitem.ts b/src/ts/components/settings/settingspanelitem.ts similarity index 92% rename from src/ts/components/settingspanelitem.ts rename to src/ts/components/settings/settingspanelitem.ts index 50a8fddea..15864a094 100644 --- a/src/ts/components/settingspanelitem.ts +++ b/src/ts/components/settings/settingspanelitem.ts @@ -1,15 +1,15 @@ -import {Container, ContainerConfig} from './container'; -import {Component, ComponentConfig} from './component'; -import {Event, EventDispatcher, NoArgs} from '../eventdispatcher'; -import { Label, LabelConfig } from './label'; -import {UIInstanceManager} from '../uimanager'; +import {Container, ContainerConfig} from '../container'; +import {Component, ComponentConfig} from '../component'; +import {Event, EventDispatcher, NoArgs} from '../../eventdispatcher'; +import { Label, LabelConfig } from '../labels/label'; +import {UIInstanceManager} from '../../uimanager'; import {SelectBox} from './selectbox'; -import {ListBox} from './listbox'; +import {ListBox} from '../lists/listbox'; import {VideoQualitySelectBox} from './videoqualityselectbox'; import {AudioQualitySelectBox} from './audioqualityselectbox'; import {PlaybackSpeedSelectBox} from './playbackspeedselectbox'; import { PlayerAPI } from 'bitmovin-player'; -import { LocalizableText } from '../localization/i18n'; +import { LocalizableText } from '../../localization/i18n'; /** * Configuration interface for a {@link SettingsPanelItem} diff --git a/src/ts/components/settingspanelpage.ts b/src/ts/components/settings/settingspanelpage.ts similarity index 93% rename from src/ts/components/settingspanelpage.ts rename to src/ts/components/settings/settingspanelpage.ts index de6e09456..990add4e3 100644 --- a/src/ts/components/settingspanelpage.ts +++ b/src/ts/components/settings/settingspanelpage.ts @@ -1,9 +1,9 @@ -import {Container, ContainerConfig} from './container'; +import {Container, ContainerConfig} from '../container'; import { SettingsPanelItem, SettingsPanelItemConfig } from './settingspanelitem'; -import {UIInstanceManager} from '../uimanager'; -import {Event, EventDispatcher, NoArgs} from '../eventdispatcher'; +import {UIInstanceManager} from '../../uimanager'; +import {Event, EventDispatcher, NoArgs} from '../../eventdispatcher'; import { PlayerAPI } from 'bitmovin-player'; -import { BrowserUtils } from '../browserutils'; +import { BrowserUtils } from '../../utils/browserutils'; /** * Configuration interface for a {@link SettingsPanelPage} diff --git a/src/ts/components/settingspanelpagebackbutton.ts b/src/ts/components/settings/settingspanelpagebackbutton.ts similarity index 88% rename from src/ts/components/settingspanelpagebackbutton.ts rename to src/ts/components/settings/settingspanelpagebackbutton.ts index 43d16ba9e..f48055125 100644 --- a/src/ts/components/settingspanelpagebackbutton.ts +++ b/src/ts/components/settings/settingspanelpagebackbutton.ts @@ -1,7 +1,7 @@ -import {UIInstanceManager} from '../uimanager'; +import {UIInstanceManager} from '../../uimanager'; import {SettingsPanelPageNavigatorButton, SettingsPanelPageNavigatorConfig} from './settingspanelpagenavigatorbutton'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * @category Buttons diff --git a/src/ts/components/settingspanelpagenavigatorbutton.ts b/src/ts/components/settings/settingspanelpagenavigatorbutton.ts similarity index 94% rename from src/ts/components/settingspanelpagenavigatorbutton.ts rename to src/ts/components/settings/settingspanelpagenavigatorbutton.ts index a28239255..a75d4a016 100644 --- a/src/ts/components/settingspanelpagenavigatorbutton.ts +++ b/src/ts/components/settings/settingspanelpagenavigatorbutton.ts @@ -1,8 +1,8 @@ -import {Button, ButtonConfig} from './button'; +import {Button, ButtonConfig} from '../buttons/button'; import {SettingsPanel} from './settingspanel'; import {SettingsPanelPage} from './settingspanelpage'; import { PlayerAPI } from 'bitmovin-player'; -import { UIInstanceManager } from '../uimanager'; +import { UIInstanceManager } from '../../uimanager'; /** * Configuration interface for a {@link SettingsPanelPageNavigatorButton} diff --git a/src/ts/components/settingspanelpageopenbutton.ts b/src/ts/components/settings/settingspanelpageopenbutton.ts similarity index 90% rename from src/ts/components/settingspanelpageopenbutton.ts rename to src/ts/components/settings/settingspanelpageopenbutton.ts index edc7ed545..e9ce768c6 100644 --- a/src/ts/components/settingspanelpageopenbutton.ts +++ b/src/ts/components/settings/settingspanelpageopenbutton.ts @@ -1,7 +1,7 @@ -import {UIInstanceManager} from '../uimanager'; +import {UIInstanceManager} from '../../uimanager'; import {SettingsPanelPageNavigatorButton, SettingsPanelPageNavigatorConfig} from './settingspanelpagenavigatorbutton'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * @category Buttons diff --git a/src/ts/components/settingspanelselectoption.ts b/src/ts/components/settings/settingspanelselectoption.ts similarity index 94% rename from src/ts/components/settingspanelselectoption.ts rename to src/ts/components/settings/settingspanelselectoption.ts index bb1a55b5b..4315cc2d9 100644 --- a/src/ts/components/settingspanelselectoption.ts +++ b/src/ts/components/settings/settingspanelselectoption.ts @@ -1,7 +1,7 @@ import { SettingsPanelItem, SettingsPanelItemConfig } from './settingspanelitem'; import { PlayerAPI } from 'bitmovin-player'; -import { UIInstanceManager } from '../uimanager'; -import { ListSelector, ListSelectorConfig } from './listselector'; +import { UIInstanceManager } from '../../uimanager'; +import { ListSelector, ListSelectorConfig } from '../lists/listselector'; /** * Configuration interface for a {@link SettingsPanelSelectOption}. diff --git a/src/ts/components/settingstogglebutton.ts b/src/ts/components/settings/settingstogglebutton.ts similarity index 92% rename from src/ts/components/settingstogglebutton.ts rename to src/ts/components/settings/settingstogglebutton.ts index bfb188182..1992fcd6a 100644 --- a/src/ts/components/settingstogglebutton.ts +++ b/src/ts/components/settings/settingstogglebutton.ts @@ -1,10 +1,10 @@ -import {ToggleButton, ToggleButtonConfig} from './togglebutton'; +import {ToggleButton, ToggleButtonConfig} from '../buttons/togglebutton'; import {SettingsPanel} from './settingspanel'; -import {UIInstanceManager} from '../uimanager'; -import {Component, ComponentConfig} from './component'; -import {ArrayUtils} from '../arrayutils'; +import {UIInstanceManager} from '../../uimanager'; +import {Component, ComponentConfig} from '../component'; +import {ArrayUtils} from '../../utils/arrayutils'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * Configuration interface for the {@link SettingsToggleButton}. diff --git a/src/ts/components/subtitleselectbox.ts b/src/ts/components/settings/subtitleselectbox.ts similarity index 75% rename from src/ts/components/subtitleselectbox.ts rename to src/ts/components/settings/subtitleselectbox.ts index e2d20df87..12df1c039 100644 --- a/src/ts/components/subtitleselectbox.ts +++ b/src/ts/components/settings/subtitleselectbox.ts @@ -1,9 +1,9 @@ import {SelectBox} from './selectbox'; -import {ListSelectorConfig} from './listselector'; -import {UIInstanceManager} from '../uimanager'; -import {SubtitleSwitchHandler} from '../subtitleutils'; +import {ListSelectorConfig} from '../lists/listselector'; +import {UIInstanceManager} from '../../uimanager'; +import {SubtitleSwitchHandler} from '../../utils/subtitleutils'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * A select box providing a selection between available subtitle and caption tracks. diff --git a/src/ts/components/subtitlesettings/backgroundcolorselectbox.ts b/src/ts/components/settings/subtitlesettings/backgroundcolorselectbox.ts similarity index 96% rename from src/ts/components/subtitlesettings/backgroundcolorselectbox.ts rename to src/ts/components/settings/subtitlesettings/backgroundcolorselectbox.ts index 47cf64388..9478bbd09 100644 --- a/src/ts/components/subtitlesettings/backgroundcolorselectbox.ts +++ b/src/ts/components/settings/subtitlesettings/backgroundcolorselectbox.ts @@ -1,7 +1,7 @@ import { SubtitleSettingSelectBox, SubtitleSettingSelectBoxConfig } from './subtitlesettingselectbox'; -import {UIInstanceManager} from '../../uimanager'; +import {UIInstanceManager} from '../../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../../localization/i18n'; +import { i18n } from '../../../localization/i18n'; /** * A select box providing a selection of different background colors. diff --git a/src/ts/components/subtitlesettings/backgroundopacityselectbox.ts b/src/ts/components/settings/subtitlesettings/backgroundopacityselectbox.ts similarity index 94% rename from src/ts/components/subtitlesettings/backgroundopacityselectbox.ts rename to src/ts/components/settings/subtitlesettings/backgroundopacityselectbox.ts index 3d8970799..05b7f1bfe 100644 --- a/src/ts/components/subtitlesettings/backgroundopacityselectbox.ts +++ b/src/ts/components/settings/subtitlesettings/backgroundopacityselectbox.ts @@ -1,7 +1,7 @@ import { SubtitleSettingSelectBox, SubtitleSettingSelectBoxConfig } from './subtitlesettingselectbox'; -import {UIInstanceManager} from '../../uimanager'; +import {UIInstanceManager} from '../../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../../localization/i18n'; +import { i18n } from '../../../localization/i18n'; /** * A select box providing a selection of different background opacity. diff --git a/src/ts/components/subtitlesettings/characteredgeselectbox.ts b/src/ts/components/settings/subtitlesettings/characteredgeselectbox.ts similarity index 94% rename from src/ts/components/subtitlesettings/characteredgeselectbox.ts rename to src/ts/components/settings/subtitlesettings/characteredgeselectbox.ts index 139a53e96..d221261ae 100644 --- a/src/ts/components/subtitlesettings/characteredgeselectbox.ts +++ b/src/ts/components/settings/subtitlesettings/characteredgeselectbox.ts @@ -1,7 +1,7 @@ import { SubtitleSettingSelectBox, SubtitleSettingSelectBoxConfig } from './subtitlesettingselectbox'; -import {UIInstanceManager} from '../../uimanager'; +import {UIInstanceManager} from '../../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../../localization/i18n'; +import { i18n } from '../../../localization/i18n'; /** * A select box providing a selection of different character edge. diff --git a/src/ts/components/subtitlesettings/fontcolorselectbox.ts b/src/ts/components/settings/subtitlesettings/fontcolorselectbox.ts similarity index 95% rename from src/ts/components/subtitlesettings/fontcolorselectbox.ts rename to src/ts/components/settings/subtitlesettings/fontcolorselectbox.ts index 54c0423a0..544518f32 100644 --- a/src/ts/components/subtitlesettings/fontcolorselectbox.ts +++ b/src/ts/components/settings/subtitlesettings/fontcolorselectbox.ts @@ -1,7 +1,7 @@ import { SubtitleSettingSelectBox, SubtitleSettingSelectBoxConfig } from './subtitlesettingselectbox'; -import {UIInstanceManager} from '../../uimanager'; +import {UIInstanceManager} from '../../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../../localization/i18n'; +import { i18n } from '../../../localization/i18n'; /** * A select box providing a selection of different font colors. diff --git a/src/ts/components/subtitlesettings/fontfamilyselectbox.ts b/src/ts/components/settings/subtitlesettings/fontfamilyselectbox.ts similarity index 95% rename from src/ts/components/subtitlesettings/fontfamilyselectbox.ts rename to src/ts/components/settings/subtitlesettings/fontfamilyselectbox.ts index e389b9ed6..ce32a3622 100644 --- a/src/ts/components/subtitlesettings/fontfamilyselectbox.ts +++ b/src/ts/components/settings/subtitlesettings/fontfamilyselectbox.ts @@ -1,7 +1,7 @@ import { SubtitleSettingSelectBox, SubtitleSettingSelectBoxConfig } from './subtitlesettingselectbox'; -import {UIInstanceManager} from '../../uimanager'; +import {UIInstanceManager} from '../../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../../localization/i18n'; +import { i18n } from '../../../localization/i18n'; /** * A select box providing a selection of different font family. diff --git a/src/ts/components/subtitlesettings/fontopacityselectbox.ts b/src/ts/components/settings/subtitlesettings/fontopacityselectbox.ts similarity index 94% rename from src/ts/components/subtitlesettings/fontopacityselectbox.ts rename to src/ts/components/settings/subtitlesettings/fontopacityselectbox.ts index df3032586..8ad3683f8 100644 --- a/src/ts/components/subtitlesettings/fontopacityselectbox.ts +++ b/src/ts/components/settings/subtitlesettings/fontopacityselectbox.ts @@ -1,7 +1,7 @@ import { SubtitleSettingSelectBox, SubtitleSettingSelectBoxConfig } from './subtitlesettingselectbox'; -import {UIInstanceManager} from '../../uimanager'; +import {UIInstanceManager} from '../../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../../localization/i18n'; +import { i18n } from '../../../localization/i18n'; /** * A select box providing a selection of different font colors. diff --git a/src/ts/components/subtitlesettings/fontsizeselectbox.ts b/src/ts/components/settings/subtitlesettings/fontsizeselectbox.ts similarity index 94% rename from src/ts/components/subtitlesettings/fontsizeselectbox.ts rename to src/ts/components/settings/subtitlesettings/fontsizeselectbox.ts index dc98dd766..11233e601 100644 --- a/src/ts/components/subtitlesettings/fontsizeselectbox.ts +++ b/src/ts/components/settings/subtitlesettings/fontsizeselectbox.ts @@ -1,7 +1,7 @@ import { SubtitleSettingSelectBox, SubtitleSettingSelectBoxConfig } from './subtitlesettingselectbox'; -import {UIInstanceManager} from '../../uimanager'; +import {UIInstanceManager} from '../../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../../localization/i18n'; +import { i18n } from '../../../localization/i18n'; /** * A select box providing a selection of different font colors. diff --git a/src/ts/components/subtitlesettings/subtitlesettingselectbox.ts b/src/ts/components/settings/subtitlesettings/subtitlesettingselectbox.ts similarity index 84% rename from src/ts/components/subtitlesettings/subtitlesettingselectbox.ts rename to src/ts/components/settings/subtitlesettings/subtitlesettingselectbox.ts index 605849d10..dd504bf6d 100644 --- a/src/ts/components/subtitlesettings/subtitlesettingselectbox.ts +++ b/src/ts/components/settings/subtitlesettings/subtitlesettingselectbox.ts @@ -1,9 +1,9 @@ -import {SubtitleOverlay} from '../subtitleoverlay'; -import {ListSelectorConfig} from '../listselector'; +import {SubtitleOverlay} from '../../overlays/subtitleoverlay'; +import {ListSelectorConfig} from '../../lists/listselector'; import {SelectBox} from '../selectbox'; -import {SubtitleSettingsManager} from './subtitlesettingsmanager'; +import {SubtitleSettingsManager} from '../../../utils/subtitlesettingsmanager'; import { PlayerAPI } from 'bitmovin-player'; -import { UIInstanceManager } from '../../uimanager'; +import { UIInstanceManager } from '../../../uimanager'; /** * @category Configs diff --git a/src/ts/components/subtitlesettings/subtitlesettingslabel.ts b/src/ts/components/settings/subtitlesettings/subtitlesettingslabel.ts similarity index 82% rename from src/ts/components/subtitlesettings/subtitlesettingslabel.ts rename to src/ts/components/settings/subtitlesettings/subtitlesettingslabel.ts index 184c8c265..27adc86a1 100644 --- a/src/ts/components/subtitlesettings/subtitlesettingslabel.ts +++ b/src/ts/components/settings/subtitlesettings/subtitlesettingslabel.ts @@ -1,7 +1,7 @@ -import { Label, LabelConfig } from '../label'; -import {Container, ContainerConfig} from '../container'; +import { Label, LabelConfig } from '../../labels/label'; +import {Container, ContainerConfig} from '../../container'; import {SettingsPanelPageOpenButton} from '../settingspanelpageopenbutton'; -import { LocalizableText } from '../../localization/i18n'; +import { LocalizableText } from '../../../localization/i18n'; /** * @category Configs diff --git a/src/ts/components/subtitlesettings/subtitlesettingspanelpage.ts b/src/ts/components/settings/subtitlesettings/subtitlesettingspanelpage.ts similarity index 93% rename from src/ts/components/subtitlesettings/subtitlesettingspanelpage.ts rename to src/ts/components/settings/subtitlesettings/subtitlesettingspanelpage.ts index 235229ed1..88779cbd1 100644 --- a/src/ts/components/subtitlesettings/subtitlesettingspanelpage.ts +++ b/src/ts/components/settings/subtitlesettings/subtitlesettingspanelpage.ts @@ -1,7 +1,7 @@ import { SettingsPanelPage, SettingsPanelPageConfig } from '../settingspanelpage'; import {SettingsPanel} from '../settingspanel'; -import {SubtitleOverlay} from '../subtitleoverlay'; -import {Component, ComponentConfig} from '../component'; +import {SubtitleOverlay} from '../../overlays/subtitleoverlay'; +import {Component, ComponentConfig} from '../../component'; import {FontSizeSelectBox} from './fontsizeselectbox'; import {FontFamilySelectBox} from './fontfamilyselectbox'; import {FontColorSelectBox} from './fontcolorselectbox'; @@ -12,13 +12,13 @@ import {BackgroundOpacitySelectBox} from './backgroundopacityselectbox'; import {WindowColorSelectBox} from './windowcolorselectbox'; import {WindowOpacitySelectBox} from './windowopacityselectbox'; import {SubtitleSettingsResetButton} from './subtitlesettingsresetbutton'; -import {UIInstanceManager} from '../../uimanager'; +import {UIInstanceManager} from '../../../uimanager'; import {SettingsPanelPageBackButton} from '../settingspanelpagebackbutton'; import { SettingsPanelItem, SettingsPanelItemConfig } from '../settingspanelitem'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n, LocalizableText } from '../../localization/i18n'; +import { i18n, LocalizableText } from '../../../localization/i18n'; import { DynamicSettingsPanelItem } from '../dynamicsettingspanelitem'; -import { ListSelector, ListSelectorConfig } from '../listselector'; +import { ListSelector, ListSelectorConfig } from '../../lists/listselector'; /** * @category Configs diff --git a/src/ts/components/subtitlesettings/subtitlesettingsresetbutton.ts b/src/ts/components/settings/subtitlesettings/subtitlesettingsresetbutton.ts similarity index 75% rename from src/ts/components/subtitlesettings/subtitlesettingsresetbutton.ts rename to src/ts/components/settings/subtitlesettings/subtitlesettingsresetbutton.ts index 0012e6b5d..64439ef0b 100644 --- a/src/ts/components/subtitlesettings/subtitlesettingsresetbutton.ts +++ b/src/ts/components/settings/subtitlesettings/subtitlesettingsresetbutton.ts @@ -1,8 +1,8 @@ -import {UIInstanceManager} from '../../uimanager'; -import {SubtitleSettingsManager} from './subtitlesettingsmanager'; -import {Button, ButtonConfig} from '../button'; +import {UIInstanceManager} from '../../../uimanager'; +import {SubtitleSettingsManager} from '../../../utils/subtitlesettingsmanager'; +import {Button, ButtonConfig} from '../../buttons/button'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../../localization/i18n'; +import { i18n } from '../../../localization/i18n'; /** * A button that resets all subtitle settings to their defaults. diff --git a/src/ts/components/subtitlesettings/windowcolorselectbox.ts b/src/ts/components/settings/subtitlesettings/windowcolorselectbox.ts similarity index 95% rename from src/ts/components/subtitlesettings/windowcolorselectbox.ts rename to src/ts/components/settings/subtitlesettings/windowcolorselectbox.ts index 98bb849ee..660325b4b 100644 --- a/src/ts/components/subtitlesettings/windowcolorselectbox.ts +++ b/src/ts/components/settings/subtitlesettings/windowcolorselectbox.ts @@ -1,7 +1,7 @@ import { SubtitleSettingSelectBox, SubtitleSettingSelectBoxConfig } from './subtitlesettingselectbox'; -import {UIInstanceManager} from '../../uimanager'; +import {UIInstanceManager} from '../../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../../localization/i18n'; +import { i18n } from '../../../localization/i18n'; /** * A select box providing a selection of different background colors. diff --git a/src/ts/components/subtitlesettings/windowopacityselectbox.ts b/src/ts/components/settings/subtitlesettings/windowopacityselectbox.ts similarity index 94% rename from src/ts/components/subtitlesettings/windowopacityselectbox.ts rename to src/ts/components/settings/subtitlesettings/windowopacityselectbox.ts index 3e4b72570..abe9b07a1 100644 --- a/src/ts/components/subtitlesettings/windowopacityselectbox.ts +++ b/src/ts/components/settings/subtitlesettings/windowopacityselectbox.ts @@ -1,7 +1,7 @@ import { SubtitleSettingSelectBox, SubtitleSettingSelectBoxConfig } from './subtitlesettingselectbox'; -import {UIInstanceManager} from '../../uimanager'; +import {UIInstanceManager} from '../../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../../localization/i18n'; +import { i18n } from '../../../localization/i18n'; /** * A select box providing a selection of different background opacity. diff --git a/src/ts/components/videoqualityselectbox.ts b/src/ts/components/settings/videoqualityselectbox.ts similarity index 94% rename from src/ts/components/videoqualityselectbox.ts rename to src/ts/components/settings/videoqualityselectbox.ts index 43c17daf6..379b2366e 100644 --- a/src/ts/components/videoqualityselectbox.ts +++ b/src/ts/components/settings/videoqualityselectbox.ts @@ -1,8 +1,8 @@ import {SelectBox} from './selectbox'; -import {ListSelectorConfig} from './listselector'; -import {UIInstanceManager} from '../uimanager'; +import {ListSelectorConfig} from '../lists/listselector'; +import {UIInstanceManager} from '../../uimanager'; import { PlayerAPI } from 'bitmovin-player'; -import { i18n } from '../localization/i18n'; +import { i18n } from '../../localization/i18n'; /** * A select box providing a selection between 'auto' and the available video qualities. diff --git a/src/ts/components/titlebar.ts b/src/ts/components/titlebar.ts index 1f2579d38..d63f5247f 100644 --- a/src/ts/components/titlebar.ts +++ b/src/ts/components/titlebar.ts @@ -1,6 +1,6 @@ import {Container, ContainerConfig} from './container'; import {UIInstanceManager} from '../uimanager'; -import {MetadataLabel, MetadataLabelContent} from './metadatalabel'; +import {MetadataLabel, MetadataLabelContent} from './labels/metadatalabel'; import { PlayerAPI } from 'bitmovin-player'; /** diff --git a/src/ts/components/uicontainer.ts b/src/ts/components/uicontainer.ts index bd7b7db37..01be2e0d8 100644 --- a/src/ts/components/uicontainer.ts +++ b/src/ts/components/uicontainer.ts @@ -1,13 +1,13 @@ import { Container, ContainerConfig } from './container'; import { UIInstanceManager } from '../uimanager'; import { DOM, HTMLElementWithComponent } from '../dom'; -import { Timeout } from '../timeout'; -import { PlayerUtils } from '../playerutils'; +import { Timeout } from '../utils/timeout'; +import { PlayerUtils } from '../utils/playerutils'; import { CancelEventArgs, Event as UiEvent, EventDispatcher } from '../eventdispatcher'; import { PlayerAPI, PlayerResizedEvent } from 'bitmovin-player'; import { i18n } from '../localization/i18n'; -import { Button, ButtonConfig } from './button'; -import { TouchControlOverlay, TouchControlOverlayConfig } from './touchcontroloverlay'; +import { Button, ButtonConfig } from './buttons/button'; +import { TouchControlOverlay, TouchControlOverlayConfig } from './overlays/touchcontroloverlay'; /** * Configuration interface for a {@link UIContainer}. diff --git a/src/ts/components/watermark.ts b/src/ts/components/watermark.ts index 75da7f92d..6d32d61f3 100644 --- a/src/ts/components/watermark.ts +++ b/src/ts/components/watermark.ts @@ -1,4 +1,4 @@ -import {ClickOverlay, ClickOverlayConfig} from './clickoverlay'; +import {ClickOverlay, ClickOverlayConfig} from './overlays/clickoverlay'; import { i18n } from '../localization/i18n'; /** diff --git a/src/ts/eventdispatcher.ts b/src/ts/eventdispatcher.ts index b9007956b..a9fae92e8 100644 --- a/src/ts/eventdispatcher.ts +++ b/src/ts/eventdispatcher.ts @@ -1,5 +1,5 @@ -import {ArrayUtils} from './arrayutils'; -import { Timeout } from './timeout'; +import {ArrayUtils} from './utils/arrayutils'; +import { Timeout } from './utils/timeout'; /** * Function interface for event listeners on the {@link EventDispatcher}. */ diff --git a/src/ts/main.ts b/src/ts/main.ts index 275142605..838900180 100644 --- a/src/ts/main.ts +++ b/src/ts/main.ts @@ -5,13 +5,13 @@ export * from './uiconfig'; // Factories export { UIFactory } from './uifactory'; // Utils -export { ArrayUtils } from './arrayutils'; -export { StringUtils } from './stringutils'; -export { PlayerUtils } from './playerutils'; -export { UIUtils } from './uiutils'; -export { BrowserUtils } from './browserutils'; -export { StorageUtils } from './storageutils'; -export { ErrorUtils } from './errorutils'; +export { ArrayUtils } from './utils/arrayutils'; +export { StringUtils } from './utils/stringutils'; +export { PlayerUtils } from './utils/playerutils'; +export { UIUtils } from './utils/uiutils'; +export { BrowserUtils } from './utils/browserutils'; +export { StorageUtils } from './utils/storageutils'; +export { ErrorUtils } from './utils/errorutils'; // Localization export { i18n, I18n, Vocabulary, Vocabularies, CustomVocabulary, LocalizableText, Localizer } from './localization/i18n'; // Spatial Navigation @@ -20,76 +20,76 @@ export { NavigationGroup } from './spatialnavigation/navigationgroup'; export { RootNavigationGroup } from './spatialnavigation/rootnavigationgroup'; export { ListNavigationGroup, ListOrientation } from './spatialnavigation/ListNavigationGroup'; // Components -export { Button, ButtonConfig } from './components/button'; +export { Button, ButtonConfig } from './components/buttons/button'; export { ControlBar, ControlBarConfig } from './components/controlbar'; -export { FullscreenToggleButton } from './components/fullscreentogglebutton'; -export { HugePlaybackToggleButton } from './components/hugeplaybacktogglebutton'; -export { PlaybackTimeLabel, PlaybackTimeLabelConfig, PlaybackTimeLabelMode } from './components/playbacktimelabel'; -export { PlaybackToggleButton, PlaybackToggleButtonConfig } from './components/playbacktogglebutton'; -export { SeekBar, SeekBarConfig, SeekPreviewEventArgs, SeekBarMarker } from './components/seekbar'; -export { SelectBox } from './components/selectbox'; -export { ItemSelectionList } from './components/itemselectionlist'; -export { SettingsPanel, SettingsPanelConfig } from './components/settingspanel'; -export { SettingsToggleButton, SettingsToggleButtonConfig } from './components/settingstogglebutton'; -export { ToggleButton, ToggleButtonConfig } from './components/togglebutton'; -export { VideoQualitySelectBox } from './components/videoqualityselectbox'; -export { VolumeToggleButton } from './components/volumetogglebutton'; -export { VRToggleButton } from './components/vrtogglebutton'; +export { FullscreenToggleButton } from './components/buttons/fullscreentogglebutton'; +export { HugePlaybackToggleButton } from './components/buttons/hugeplaybacktogglebutton'; +export { PlaybackTimeLabel, PlaybackTimeLabelConfig, PlaybackTimeLabelMode } from './components/labels/playbacktimelabel'; +export { PlaybackToggleButton, PlaybackToggleButtonConfig } from './components/buttons/playbacktogglebutton'; +export { SeekBar, SeekBarConfig, SeekPreviewEventArgs, SeekBarMarker } from './components/seekbar/seekbar'; +export { SelectBox } from './components/settings/selectbox'; +export { ItemSelectionList } from './components/lists/itemselectionlist'; +export { SettingsPanel, SettingsPanelConfig } from './components/settings/settingspanel'; +export { SettingsToggleButton, SettingsToggleButtonConfig } from './components/settings/settingstogglebutton'; +export { ToggleButton, ToggleButtonConfig } from './components/buttons/togglebutton'; +export { VideoQualitySelectBox } from './components/settings/videoqualityselectbox'; +export { VolumeToggleButton } from './components/buttons/volumetogglebutton'; +export { VRToggleButton } from './components/buttons/vrtogglebutton'; export { Watermark, WatermarkConfig } from './components/watermark'; export { UIContainer, UIContainerConfig } from './components/uicontainer'; export { Container, ContainerConfig } from './components/container'; -export { Label, LabelConfig } from './components/label'; -export { AudioQualitySelectBox } from './components/audioqualityselectbox'; -export { AudioTrackSelectBox } from './components/audiotrackselectbox'; -export { CastStatusOverlay } from './components/caststatusoverlay'; -export { CastToggleButton } from './components/casttogglebutton'; +export { Label, LabelConfig } from './components/labels/label'; +export { AudioQualitySelectBox } from './components/settings/audioqualityselectbox'; +export { AudioTrackSelectBox } from './components/settings/audiotrackselectbox'; +export { CastStatusOverlay } from './components/overlays/caststatusoverlay'; +export { CastToggleButton } from './components/buttons/casttogglebutton'; export { Component, ComponentConfig, ComponentHoverChangedEventArgs } from './components/component'; -export { ErrorMessageOverlay, ErrorMessageOverlayConfig, ErrorMessageTranslator, ErrorMessageMap } from './components/errormessageoverlay'; -export { RecommendationOverlay } from './components/recommendationoverlay'; -export { SeekBarLabel, SeekBarLabelConfig } from './components/seekbarlabel'; -export { SubtitleOverlay } from './components/subtitleoverlay'; -export { SubtitleSelectBox } from './components/subtitleselectbox'; +export { ErrorMessageOverlay, ErrorMessageOverlayConfig, ErrorMessageTranslator, ErrorMessageMap } from './components/overlays/errormessageoverlay'; +export { RecommendationOverlay } from './components/overlays/recommendationoverlay'; +export { SeekBarLabel, SeekBarLabelConfig } from './components/seekbar/seekbarlabel'; +export { SubtitleOverlay } from './components/overlays/subtitleoverlay'; +export { SubtitleSelectBox } from './components/settings/subtitleselectbox'; export { TitleBar, TitleBarConfig } from './components/titlebar'; -export { VolumeControlButton, VolumeControlButtonConfig } from './components/volumecontrolbutton'; -export { ClickOverlay, ClickOverlayConfig } from './components/clickoverlay'; -export { AdSkipButton, AdSkipButtonConfig } from './components/adskipbutton'; -export { AdMessageLabel } from './components/admessagelabel'; -export { AdClickOverlay } from './components/adclickoverlay'; -export { PlaybackSpeedSelectBox } from './components/playbackspeedselectbox'; -export { HugeReplayButton } from './components/hugereplaybutton'; -export { BufferingOverlay, BufferingOverlayConfig } from './components/bufferingoverlay'; +export { VolumeControlButton, VolumeControlButtonConfig } from './components/buttons/volumecontrolbutton'; +export { ClickOverlay, ClickOverlayConfig } from './components/overlays/clickoverlay'; +export { AdSkipButton, AdSkipButtonConfig } from './components/ads/adskipbutton'; +export { AdMessageLabel } from './components/ads/admessagelabel'; +export { AdClickOverlay } from './components/ads/adclickoverlay'; +export { PlaybackSpeedSelectBox } from './components/settings/playbackspeedselectbox'; +export { HugeReplayButton } from './components/buttons/hugereplaybutton'; +export { BufferingOverlay, BufferingOverlayConfig } from './components/overlays/bufferingoverlay'; export { CastUIContainer } from './components/castuicontainer'; -export { PlaybackToggleOverlay, PlaybackToggleOverlayConfig } from './components/playbacktoggleoverlay'; -export { CloseButton, CloseButtonConfig } from './components/closebutton'; -export { MetadataLabel, MetadataLabelContent, MetadataLabelConfig } from './components/metadatalabel'; -export { AirPlayToggleButton } from './components/airplaytogglebutton'; -export { VolumeSlider, VolumeSliderConfig } from './components/volumeslider'; -export { PictureInPictureToggleButton } from './components/pictureinpicturetogglebutton'; +export { PlaybackToggleOverlay, PlaybackToggleOverlayConfig } from './components/overlays/playbacktoggleoverlay'; +export { CloseButton, CloseButtonConfig } from './components/buttons/closebutton'; +export { MetadataLabel, MetadataLabelContent, MetadataLabelConfig } from './components/labels/metadatalabel'; +export { AirPlayToggleButton } from './components/buttons/airplaytogglebutton'; +export { VolumeSlider, VolumeSliderConfig } from './components/seekbar/volumeslider'; +export { PictureInPictureToggleButton } from './components/buttons/pictureinpicturetogglebutton'; export { Spacer } from './components/spacer'; -export { BackgroundColorSelectBox } from './components/subtitlesettings/backgroundcolorselectbox'; -export { BackgroundOpacitySelectBox } from './components/subtitlesettings/backgroundopacityselectbox'; -export { CharacterEdgeSelectBox } from './components/subtitlesettings/characteredgeselectbox'; -export { FontColorSelectBox } from './components/subtitlesettings/fontcolorselectbox'; -export { FontFamilySelectBox } from './components/subtitlesettings/fontfamilyselectbox'; -export { FontOpacitySelectBox } from './components/subtitlesettings/fontopacityselectbox'; -export { FontSizeSelectBox } from './components/subtitlesettings/fontsizeselectbox'; -export { SubtitleSettingSelectBox } from './components/subtitlesettings/subtitlesettingselectbox'; -export { SubtitleSettingsLabel } from './components/subtitlesettings/subtitlesettingslabel'; -export { WindowColorSelectBox } from './components/subtitlesettings/windowcolorselectbox'; -export { WindowOpacitySelectBox } from './components/subtitlesettings/windowopacityselectbox'; -export { SubtitleSettingsResetButton } from './components/subtitlesettings/subtitlesettingsresetbutton'; -export { ListBox } from './components/listbox'; -export { SubtitleListBox } from './components/subtitlelistbox'; -export { AudioTrackListBox } from './components/audiotracklistbox'; -export { SettingsPanelPage } from './components/settingspanelpage'; -export { SettingsPanelPageBackButton } from './components/settingspanelpagebackbutton'; -export { SettingsPanelPageOpenButton } from './components/settingspanelpageopenbutton'; -export { SubtitleSettingsPanelPage, SubtitleSettingsPanelPageConfig } from './components/subtitlesettings/subtitlesettingspanelpage'; -export { SettingsPanelItem } from './components/settingspanelitem'; -export { ReplayButton } from './components/replaybutton'; -export { QuickSeekButton, QuickSeekButtonConfig } from './components/quickseekbutton'; -export { ListSelector, ListSelectorConfig, ListItem, ListItemFilter, ListItemLabelTranslator } from './components/listselector'; -export { AdStatusOverlay } from './components/adstatusoverlay'; +export { BackgroundColorSelectBox } from './components/settings/subtitlesettings/backgroundcolorselectbox'; +export { BackgroundOpacitySelectBox } from './components/settings/subtitlesettings/backgroundopacityselectbox'; +export { CharacterEdgeSelectBox } from './components/settings/subtitlesettings/characteredgeselectbox'; +export { FontColorSelectBox } from './components/settings/subtitlesettings/fontcolorselectbox'; +export { FontFamilySelectBox } from './components/settings/subtitlesettings/fontfamilyselectbox'; +export { FontOpacitySelectBox } from './components/settings/subtitlesettings/fontopacityselectbox'; +export { FontSizeSelectBox } from './components/settings/subtitlesettings/fontsizeselectbox'; +export { SubtitleSettingSelectBox } from './components/settings/subtitlesettings/subtitlesettingselectbox'; +export { SubtitleSettingsLabel } from './components/settings/subtitlesettings/subtitlesettingslabel'; +export { WindowColorSelectBox } from './components/settings/subtitlesettings/windowcolorselectbox'; +export { WindowOpacitySelectBox } from './components/settings/subtitlesettings/windowopacityselectbox'; +export { SubtitleSettingsResetButton } from './components/settings/subtitlesettings/subtitlesettingsresetbutton'; +export { ListBox } from './components/lists/listbox'; +export { SubtitleListBox } from './components/lists/subtitlelistbox'; +export { AudioTrackListBox } from './components/lists/audiotracklistbox'; +export { SettingsPanelPage } from './components/settings/settingspanelpage'; +export { SettingsPanelPageBackButton } from './components/settings/settingspanelpagebackbutton'; +export { SettingsPanelPageOpenButton } from './components/settings/settingspanelpageopenbutton'; +export { SubtitleSettingsPanelPage, SubtitleSettingsPanelPageConfig } from './components/settings/subtitlesettings/subtitlesettingspanelpage'; +export { SettingsPanelItem } from './components/settings/settingspanelitem'; +export { ReplayButton } from './components/buttons/replaybutton'; +export { QuickSeekButton, QuickSeekButtonConfig } from './components/buttons/quickseekbutton'; +export { ListSelector, ListSelectorConfig, ListItem, ListItemFilter, ListItemLabelTranslator } from './components/lists/listselector'; +export { AdStatusOverlay } from './components/ads/adstatusoverlay'; // Object.assign polyfill for ES5/IE9 // https://developer.mozilla.org/de/docs/Web/JavaScript/Reference/Global_Objects/Object/assign diff --git a/src/ts/spatialnavigation/keymap.ts b/src/ts/spatialnavigation/keymap.ts index 706a55014..9bb33fbe8 100644 --- a/src/ts/spatialnavigation/keymap.ts +++ b/src/ts/spatialnavigation/keymap.ts @@ -1,5 +1,5 @@ import { Action, Direction, KeyMap } from './types'; -import { BrowserUtils } from '../browserutils'; +import { BrowserUtils } from '../utils/browserutils'; const TizenKeyMap = { isApplicable: () => BrowserUtils.isTizen, diff --git a/src/ts/spatialnavigation/typeguards.ts b/src/ts/spatialnavigation/typeguards.ts index cb9ac69ee..3393acbce 100644 --- a/src/ts/spatialnavigation/typeguards.ts +++ b/src/ts/spatialnavigation/typeguards.ts @@ -1,7 +1,7 @@ import { Component } from '../components/component'; -import { SettingsPanel } from '../components/settingspanel'; +import { SettingsPanel } from '../components/settings/settingspanel'; import { Container } from '../components/container'; -import { ListBox } from '../components/listbox'; +import { ListBox } from '../components/lists/listbox'; import { Action, Direction } from './types'; export function isSettingsPanel(component: Component): component is SettingsPanel { diff --git a/src/ts/uiconfig.ts b/src/ts/uiconfig.ts index 1dc9c9c88..1c5faf246 100644 --- a/src/ts/uiconfig.ts +++ b/src/ts/uiconfig.ts @@ -1,4 +1,4 @@ -import { ErrorMessageMap, ErrorMessageTranslator } from './components/errormessageoverlay'; +import { ErrorMessageMap, ErrorMessageTranslator } from './components/overlays/errormessageoverlay'; /** * @category Configs diff --git a/src/ts/uifactory.ts b/src/ts/uifactory.ts index 099e2a736..eb26e8b04 100644 --- a/src/ts/uifactory.ts +++ b/src/ts/uifactory.ts @@ -1,55 +1,55 @@ -import { SubtitleOverlay } from './components/subtitleoverlay'; -import { SettingsPanelPage } from './components/settingspanelpage'; -import { SettingsPanelItem } from './components/settingspanelitem'; -import { VideoQualitySelectBox } from './components/videoqualityselectbox'; -import { PlaybackSpeedSelectBox } from './components/playbackspeedselectbox'; -import { AudioTrackSelectBox } from './components/audiotrackselectbox'; -import { AudioQualitySelectBox } from './components/audioqualityselectbox'; -import { SettingsPanel } from './components/settingspanel'; -import { SubtitleSettingsPanelPage } from './components/subtitlesettings/subtitlesettingspanelpage'; -import { SettingsPanelPageOpenButton } from './components/settingspanelpageopenbutton'; -import { SubtitleSettingsLabel } from './components/subtitlesettings/subtitlesettingslabel'; -import { SubtitleSelectBox } from './components/subtitleselectbox'; +import { SubtitleOverlay } from './components/overlays/subtitleoverlay'; +import { SettingsPanelPage } from './components/settings/settingspanelpage'; +import { SettingsPanelItem } from './components/settings/settingspanelitem'; +import { VideoQualitySelectBox } from './components/settings/videoqualityselectbox'; +import { PlaybackSpeedSelectBox } from './components/settings/playbackspeedselectbox'; +import { AudioTrackSelectBox } from './components/settings/audiotrackselectbox'; +import { AudioQualitySelectBox } from './components/settings/audioqualityselectbox'; +import { SettingsPanel } from './components/settings/settingspanel'; +import { SubtitleSettingsPanelPage } from './components/settings/subtitlesettings/subtitlesettingspanelpage'; +import { SettingsPanelPageOpenButton } from './components/settings/settingspanelpageopenbutton'; +import { SubtitleSettingsLabel } from './components/settings/subtitlesettings/subtitlesettingslabel'; +import { SubtitleSelectBox } from './components/settings/subtitleselectbox'; import { ControlBar } from './components/controlbar'; import { Container, ContainerConfig } from './components/container'; -import { PlaybackTimeLabel, PlaybackTimeLabelMode } from './components/playbacktimelabel'; -import { SeekBar } from './components/seekbar'; -import { SeekBarLabel } from './components/seekbarlabel'; -import { PlaybackToggleButton } from './components/playbacktogglebutton'; -import { VolumeToggleButton } from './components/volumetogglebutton'; -import { VolumeSlider } from './components/volumeslider'; +import { PlaybackTimeLabel, PlaybackTimeLabelMode } from './components/labels/playbacktimelabel'; +import { SeekBar } from './components/seekbar/seekbar'; +import { SeekBarLabel } from './components/seekbar/seekbarlabel'; +import { PlaybackToggleButton } from './components/buttons/playbacktogglebutton'; +import { VolumeToggleButton } from './components/buttons/volumetogglebutton'; +import { VolumeSlider } from './components/seekbar/volumeslider'; import { Spacer } from './components/spacer'; -import { PictureInPictureToggleButton } from './components/pictureinpicturetogglebutton'; -import { AirPlayToggleButton } from './components/airplaytogglebutton'; -import { CastToggleButton } from './components/casttogglebutton'; -import { VRToggleButton } from './components/vrtogglebutton'; -import { SettingsToggleButton } from './components/settingstogglebutton'; -import { FullscreenToggleButton } from './components/fullscreentogglebutton'; +import { PictureInPictureToggleButton } from './components/buttons/pictureinpicturetogglebutton'; +import { AirPlayToggleButton } from './components/buttons/airplaytogglebutton'; +import { CastToggleButton } from './components/buttons/casttogglebutton'; +import { VRToggleButton } from './components/buttons/vrtogglebutton'; +import { SettingsToggleButton } from './components/settings/settingstogglebutton'; +import { FullscreenToggleButton } from './components/buttons/fullscreentogglebutton'; import { UIContainer } from './components/uicontainer'; -import { BufferingOverlay } from './components/bufferingoverlay'; -import { PlaybackToggleOverlay } from './components/playbacktoggleoverlay'; -import { CastStatusOverlay } from './components/caststatusoverlay'; +import { BufferingOverlay } from './components/overlays/bufferingoverlay'; +import { PlaybackToggleOverlay } from './components/overlays/playbacktoggleoverlay'; +import { CastStatusOverlay } from './components/overlays/caststatusoverlay'; import { TitleBar } from './components/titlebar'; -import { RecommendationOverlay } from './components/recommendationoverlay'; +import { RecommendationOverlay } from './components/overlays/recommendationoverlay'; import { Watermark } from './components/watermark'; -import { ErrorMessageOverlay } from './components/errormessageoverlay'; -import { AdClickOverlay } from './components/adclickoverlay'; -import { MetadataLabel, MetadataLabelContent } from './components/metadatalabel'; -import { PlayerUtils } from './playerutils'; +import { ErrorMessageOverlay } from './components/overlays/errormessageoverlay'; +import { AdClickOverlay } from './components/ads/adclickoverlay'; +import { MetadataLabel, MetadataLabelContent } from './components/labels/metadatalabel'; +import { PlayerUtils } from './utils/playerutils'; import { CastUIContainer } from './components/castuicontainer'; import { UIConditionContext, UIManager } from './uimanager'; import { UIConfig } from './uiconfig'; import { PlayerAPI } from 'bitmovin-player'; import { i18n } from './localization/i18n'; -import { SubtitleListBox } from './components/subtitlelistbox'; -import { AudioTrackListBox } from './components/audiotracklistbox'; +import { SubtitleListBox } from './components/lists/subtitlelistbox'; +import { AudioTrackListBox } from './components/lists/audiotracklistbox'; import { SpatialNavigation } from './spatialnavigation/spatialnavigation'; import { RootNavigationGroup } from './spatialnavigation/rootnavigationgroup'; import { ListNavigationGroup, ListOrientation } from './spatialnavigation/ListNavigationGroup'; import { EcoModeContainer } from './components/ecomodecontainer'; -import { DynamicSettingsPanelItem } from './components/dynamicsettingspanelitem'; -import { TouchControlOverlay } from './components/touchcontroloverlay'; -import { AdStatusOverlay } from './components/adstatusoverlay'; +import { DynamicSettingsPanelItem } from './components/settings/dynamicsettingspanelitem'; +import { TouchControlOverlay } from './components/overlays/touchcontroloverlay'; +import { AdStatusOverlay } from './components/ads/adstatusoverlay'; /** * Provides factory methods to create Bitmovin provided UIs. diff --git a/src/ts/uimanager.ts b/src/ts/uimanager.ts index f57a52768..3e0258466 100644 --- a/src/ts/uimanager.ts +++ b/src/ts/uimanager.ts @@ -2,20 +2,20 @@ import {UIContainer} from './components/uicontainer'; import {DOM} from './dom'; import { Component, ComponentConfig, ViewModeChangedEventArgs } from './components/component'; import {Container} from './components/container'; -import { SeekBar, SeekBarMarker } from './components/seekbar'; +import { SeekBar, SeekBarMarker } from './components/seekbar/seekbar'; import {NoArgs, EventDispatcher, CancelEventArgs} from './eventdispatcher'; -import {UIUtils} from './uiutils'; -import {ArrayUtils} from './arrayutils'; -import {BrowserUtils} from './browserutils'; +import {UIUtils} from './utils/uiutils'; +import {ArrayUtils} from './utils/arrayutils'; +import {BrowserUtils} from './utils/browserutils'; import { TimelineMarker, UIConfig } from './uiconfig'; import { PlayerAPI, PlayerEventCallback, PlayerEventBase, PlayerEvent, AdEvent, LinearAd } from 'bitmovin-player'; -import { VolumeController } from './volumecontroller'; +import { VolumeController } from './utils/volumecontroller'; import { i18n, CustomVocabulary, Vocabularies } from './localization/i18n'; -import { FocusVisibilityTracker } from './focusvisibilitytracker'; -import { isMobileV3PlayerAPI, MobileV3PlayerAPI, MobileV3PlayerEvent } from './mobilev3playerapi'; +import { FocusVisibilityTracker } from './utils/focusvisibilitytracker'; +import { isMobileV3PlayerAPI, MobileV3PlayerAPI, MobileV3PlayerEvent } from './utils/mobilev3playerapi'; import { SpatialNavigation } from './spatialnavigation/spatialnavigation'; -import { SubtitleSettingsManager } from './components/subtitlesettings/subtitlesettingsmanager'; -import { StorageUtils } from './storageutils'; +import { SubtitleSettingsManager } from './utils/subtitlesettingsmanager'; +import { StorageUtils } from './utils/storageutils'; /** * @category Configs diff --git a/src/ts/arrayutils.ts b/src/ts/utils/arrayutils.ts similarity index 100% rename from src/ts/arrayutils.ts rename to src/ts/utils/arrayutils.ts diff --git a/src/ts/audiotrackutils.ts b/src/ts/utils/audiotrackutils.ts similarity index 93% rename from src/ts/audiotrackutils.ts rename to src/ts/utils/audiotrackutils.ts index 93ad0a02e..241b573aa 100644 --- a/src/ts/audiotrackutils.ts +++ b/src/ts/utils/audiotrackutils.ts @@ -1,7 +1,7 @@ -import { ListItem, ListSelector, ListSelectorConfig } from './components/listselector'; -import { UIInstanceManager } from './uimanager'; +import { ListItem, ListSelector, ListSelectorConfig } from '../components/lists/listselector'; +import { UIInstanceManager } from '../uimanager'; import { AudioTrackEvent, PlayerAPI, AudioTrack } from 'bitmovin-player'; -import { i18n } from './localization/i18n'; +import { i18n } from '../localization/i18n'; /** * Helper class to handle all audio tracks related events diff --git a/src/ts/browserutils.ts b/src/ts/utils/browserutils.ts similarity index 100% rename from src/ts/browserutils.ts rename to src/ts/utils/browserutils.ts diff --git a/src/ts/errorutils.ts b/src/ts/utils/errorutils.ts similarity index 97% rename from src/ts/errorutils.ts rename to src/ts/utils/errorutils.ts index a8090a576..af9890133 100644 --- a/src/ts/errorutils.ts +++ b/src/ts/utils/errorutils.ts @@ -1,4 +1,4 @@ -import {ErrorMessageMap, ErrorMessageTranslator} from './components/errormessageoverlay'; +import {ErrorMessageMap, ErrorMessageTranslator} from '../components/overlays/errormessageoverlay'; import { ErrorEvent } from 'bitmovin-player'; import { MobileV3PlayerErrorEvent, MobileV3SourceErrorEvent } from './mobilev3playerapi'; diff --git a/src/ts/focusvisibilitytracker.ts b/src/ts/utils/focusvisibilitytracker.ts similarity index 100% rename from src/ts/focusvisibilitytracker.ts rename to src/ts/utils/focusvisibilitytracker.ts diff --git a/src/ts/groupplaybackapi.ts b/src/ts/utils/groupplaybackapi.ts similarity index 100% rename from src/ts/groupplaybackapi.ts rename to src/ts/utils/groupplaybackapi.ts diff --git a/src/ts/guid.ts b/src/ts/utils/guid.ts similarity index 100% rename from src/ts/guid.ts rename to src/ts/utils/guid.ts diff --git a/src/ts/imageloader.ts b/src/ts/utils/imageloader.ts similarity index 98% rename from src/ts/imageloader.ts rename to src/ts/utils/imageloader.ts index d4f7f50f8..125cd6538 100644 --- a/src/ts/imageloader.ts +++ b/src/ts/utils/imageloader.ts @@ -1,4 +1,4 @@ -import {DOM} from './dom'; +import {DOM} from '../dom'; export interface ImageLoadedCallback { (url: string, width: number, height: number): void; diff --git a/src/ts/mobilev3playerapi.ts b/src/ts/utils/mobilev3playerapi.ts similarity index 95% rename from src/ts/mobilev3playerapi.ts rename to src/ts/utils/mobilev3playerapi.ts index cb87ae7bb..3165bc942 100644 --- a/src/ts/mobilev3playerapi.ts +++ b/src/ts/utils/mobilev3playerapi.ts @@ -1,5 +1,5 @@ import { PlayerAPI, PlayerEvent, PlayerEventBase, PlayerEventCallback } from 'bitmovin-player'; -import { WrappedPlayer } from './uimanager'; +import { WrappedPlayer } from '../uimanager'; export enum MobileV3PlayerEvent { SourceError = 'sourceerror', diff --git a/src/ts/playerutils.ts b/src/ts/utils/playerutils.ts similarity index 98% rename from src/ts/playerutils.ts rename to src/ts/utils/playerutils.ts index 36c436301..e8bcd8c7a 100644 --- a/src/ts/playerutils.ts +++ b/src/ts/utils/playerutils.ts @@ -1,6 +1,6 @@ -import {Event, EventDispatcher, NoArgs} from './eventdispatcher'; +import {Event, EventDispatcher, NoArgs} from '../eventdispatcher'; import {BrowserUtils} from './browserutils'; -import { UIInstanceManager } from './uimanager'; +import { UIInstanceManager } from '../uimanager'; import { PlayerAPI, TimeRange } from 'bitmovin-player'; /** diff --git a/src/ts/components/seekbarcontroller.ts b/src/ts/utils/seekbarcontroller.ts similarity index 97% rename from src/ts/components/seekbarcontroller.ts rename to src/ts/utils/seekbarcontroller.ts index f8e87d5bf..cad5ffd1c 100644 --- a/src/ts/components/seekbarcontroller.ts +++ b/src/ts/utils/seekbarcontroller.ts @@ -1,7 +1,7 @@ -import { UIUtils } from '../uiutils'; +import { UIUtils } from './uiutils'; import { DOM } from '../dom'; import { PlayerAPI } from 'bitmovin-player'; -import { VolumeController } from '../volumecontroller'; +import { VolumeController } from './volumecontroller'; export enum SeekBarType { Vod, diff --git a/src/ts/storageutils.ts b/src/ts/utils/storageutils.ts similarity index 98% rename from src/ts/storageutils.ts rename to src/ts/utils/storageutils.ts index 34e06b2c0..ee24996db 100644 --- a/src/ts/storageutils.ts +++ b/src/ts/utils/storageutils.ts @@ -1,4 +1,4 @@ -import { UIConfig } from './uiconfig'; +import { UIConfig } from '../uiconfig'; /** * @category Utils diff --git a/src/ts/stringutils.ts b/src/ts/utils/stringutils.ts similarity index 99% rename from src/ts/stringutils.ts rename to src/ts/utils/stringutils.ts index f54c1326d..fba15a6fa 100644 --- a/src/ts/stringutils.ts +++ b/src/ts/utils/stringutils.ts @@ -1,5 +1,5 @@ import { Ad, LinearAd, PlayerAPI } from 'bitmovin-player'; -import { i18n } from './localization/i18n'; +import { i18n } from '../localization/i18n'; /** * @category Utils diff --git a/src/ts/components/subtitlesettings/subtitlesettingsmanager.ts b/src/ts/utils/subtitlesettingsmanager.ts similarity index 94% rename from src/ts/components/subtitlesettings/subtitlesettingsmanager.ts rename to src/ts/utils/subtitlesettingsmanager.ts index 98c2417af..fe4cbec4d 100644 --- a/src/ts/components/subtitlesettings/subtitlesettingsmanager.ts +++ b/src/ts/utils/subtitlesettingsmanager.ts @@ -1,7 +1,7 @@ -import { StorageUtils } from '../../storageutils'; -import { Component, ComponentConfig } from '../component'; -import { EventDispatcher, Event } from '../../eventdispatcher'; -import { prefixCss } from '../dummycomponent'; +import { StorageUtils } from './storageutils'; +import { Component, ComponentConfig } from '../components/component'; +import { EventDispatcher, Event } from '../eventdispatcher'; +import { prefixCss } from '../components/dummycomponent'; interface SubtitleSettings { fontColor?: string; diff --git a/src/ts/subtitleutils.ts b/src/ts/utils/subtitleutils.ts similarity index 93% rename from src/ts/subtitleutils.ts rename to src/ts/utils/subtitleutils.ts index e611ba20b..6e49ae43c 100644 --- a/src/ts/subtitleutils.ts +++ b/src/ts/utils/subtitleutils.ts @@ -1,10 +1,10 @@ -import { ListItem, ListSelector, ListSelectorConfig } from './components/listselector'; -import { UIInstanceManager } from './uimanager'; +import { ListItem, ListSelector, ListSelectorConfig } from '../components/lists/listselector'; +import { UIInstanceManager } from '../uimanager'; import { PlayerAPI, SubtitleEvent, SubtitleTrack } from 'bitmovin-player'; -import { i18n } from './localization/i18n'; +import { i18n } from '../localization/i18n'; import { StorageUtils } from './storageutils'; -import { prefixCss } from './components/dummycomponent'; -import { StoredSubtitleLanguage } from './components/subtitletogglebutton'; +import { prefixCss } from '../components/dummycomponent'; +import { StoredSubtitleLanguage } from '../components/buttons/subtitletogglebutton'; /** * Helper class to handle all subtitle related events diff --git a/src/ts/components/timelinemarkershandler.ts b/src/ts/utils/timelinemarkershandler.ts similarity index 97% rename from src/ts/components/timelinemarkershandler.ts rename to src/ts/utils/timelinemarkershandler.ts index 9129be107..8e2f6cd7c 100644 --- a/src/ts/components/timelinemarkershandler.ts +++ b/src/ts/utils/timelinemarkershandler.ts @@ -1,11 +1,11 @@ import { PlayerAPI } from 'bitmovin-player'; import { UIInstanceManager } from '../uimanager'; import { DOM } from '../dom'; -import { ComponentConfig } from './component'; +import { ComponentConfig } from '../components/component'; import { TimelineMarker } from '../uiconfig'; -import { SeekBarMarker } from './seekbar'; -import { PlayerUtils } from '../playerutils'; -import { Timeout } from '../timeout'; +import { SeekBarMarker } from '../components/seekbar/seekbar'; +import { PlayerUtils } from './playerutils'; +import { Timeout } from './timeout'; /** * @category Configs diff --git a/src/ts/timeout.ts b/src/ts/utils/timeout.ts similarity index 100% rename from src/ts/timeout.ts rename to src/ts/utils/timeout.ts diff --git a/src/ts/uiutils.ts b/src/ts/utils/uiutils.ts similarity index 89% rename from src/ts/uiutils.ts rename to src/ts/utils/uiutils.ts index 85d518c18..406874ff7 100644 --- a/src/ts/uiutils.ts +++ b/src/ts/utils/uiutils.ts @@ -1,5 +1,5 @@ -import {Component, ComponentConfig} from './components/component'; -import {Container} from './components/container'; +import {Component, ComponentConfig} from '../components/component'; +import {Container} from '../components/container'; /** * @category Utils diff --git a/src/ts/volumecontroller.ts b/src/ts/utils/volumecontroller.ts similarity index 98% rename from src/ts/volumecontroller.ts rename to src/ts/utils/volumecontroller.ts index 6caef455b..b423b3d76 100644 --- a/src/ts/volumecontroller.ts +++ b/src/ts/utils/volumecontroller.ts @@ -1,4 +1,4 @@ -import { Event, EventDispatcher } from './eventdispatcher'; +import { Event, EventDispatcher } from '../eventdispatcher'; import { PlayerAPI } from 'bitmovin-player'; export interface VolumeSettingChangedArgs { diff --git a/src/ts/vttutils.ts b/src/ts/utils/vttutils.ts similarity index 98% rename from src/ts/vttutils.ts rename to src/ts/utils/vttutils.ts index 21d85743b..62cbca35c 100644 --- a/src/ts/vttutils.ts +++ b/src/ts/utils/vttutils.ts @@ -1,6 +1,6 @@ -import { SubtitleRegionContainer, SubtitleLabel } from './components/subtitleoverlay'; +import { SubtitleRegionContainer, SubtitleLabel } from '../components/overlays/subtitleoverlay'; import { VTTProperties, VTTRegionProperties } from 'bitmovin-player/types/subtitles/vtt/API'; -import { DOM, Size } from './dom'; +import { DOM, Size } from '../dom'; // Our default height of a line const lineHeight = 28;