Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions src/routes/Discover/Discover.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ const { AddonDetailsModal, Button, DelayedRenderer, Image, MainNavBars, MetaItem
const useDiscover = require('./useDiscover');
const useSelectableInputs = require('./useSelectableInputs');
const useInstalledAddons = require('../Addons/useInstalledAddons');
const {default: EpgGuide} = require('./EpgGuide');
const { default: EpgGuide } = require('./EpgGuide');
const { default: EpgProgramModal } = require('./EpgGuide/EpgProgramModal/EpgProgramModal');
const styles = require('./styles');

const SCROLL_TO_BOTTOM_THRESHOLD = 400;
Expand All @@ -28,17 +29,17 @@ const Discover = ({ urlParams, queryParams }) => {
const metasContainerRef = React.useRef();
const metaPreviewRef = React.useRef();

const [selectedProgram, setSelectedProgram] = React.useState(null);
const [epgProgramModal, setEpgProgramModal] = React.useState(null);
const installedAddons = useInstalledAddons({ transportUrl: null, catalogId: null });
const selectedAddon = React.useMemo(() => {
const selected = discover.selectable.catalogs.find(({ selected }) => selected)?.addon ?? null;
const addon = installedAddons.catalog.find(({ manifest }) => manifest.id === selected?.manifest.id);
return addon;
}, [discover.selectable.catalogs, installedAddons]);
const isEpgLayout = React.useMemo(() => !!selectedAddon?.manifest?.behaviorHints?.epgEndpoint, [selectedAddon]);
const onProgramSelect = React.useCallback((program) => {
setSelectedProgram(program);
}, [setSelectedProgram]);
const onProgramSelect = React.useCallback((program, channel) => {
setEpgProgramModal({ program, channel });
}, []);

React.useEffect(() => {
if (!isEpgLayout && discover.catalog?.content.type === 'Loading' && metasContainerRef.current) {
Expand Down Expand Up @@ -110,7 +111,7 @@ const Discover = ({ urlParams, queryParams }) => {
closeInputsModal();
closeAddonModal();
setSelectedMetaItemIndex(0);
setSelectedProgram(null);
setEpgProgramModal(null);
}, [discover.selected]);

const renderEmptyState = () => (
Expand Down Expand Up @@ -180,17 +181,7 @@ const Discover = ({ urlParams, queryParams }) => {

const renderMetaPreview = () => {
if (isEpgLayout) {
if (selectedProgram === null) return null;
return (
<MetaPreview
className={styles['meta-preview-container']}
compact={true}
name={selectedProgram.title}
background={selectedProgram.thumbnail}
released={selectedProgram.start ? new Date(selectedProgram.start) : null}
description={selectedProgram.description}
/>
);
return null;
}

if (selectedMetaItem !== null) {
Expand Down Expand Up @@ -260,6 +251,16 @@ const Discover = ({ urlParams, queryParams }) => {
</div>
{renderMetaPreview()}
</div>
{
isEpgLayout && epgProgramModal !== null ?
<EpgProgramModal
program={epgProgramModal.program}
channel={epgProgramModal.channel}
onCloseRequest={() => setEpgProgramModal(null)}
/>
:
null
}
{
inputsModalOpen ?
<ModalDialog title={t('CATALOG_FILTERS')} className={styles['selectable-inputs-modal']} onCloseRequest={closeInputsModal}>
Expand Down
37 changes: 20 additions & 17 deletions src/routes/Discover/EpgGuide/EpgGuide.less
Original file line number Diff line number Diff line change
Expand Up @@ -88,34 +88,36 @@
}

.epg-day-weekday {
font-size: 1.1rem;
opacity: 0.65;
text-transform: uppercase;
letter-spacing: 0.04em;
font-size: 1rem;
font-weight: 500;
line-height: 100%;
color: var(--primary-foreground-color);
opacity: 0.5;
}

.epg-day-date {
font-size: 1.6rem;
font-weight: 600;
line-height: 1.2;
font-size: 1.5rem;
font-weight: 500;
color: var(--primary-foreground-color);
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}

.epg-header-row {
flex: none;
display: flex;
flex-direction: row;
border-bottom: 1px solid var(--overlay-color);
flex-shrink: 0;
margin-left: 1.5rem;
border-bottom: 2px solid var(--color-surface);
}

.epg-channel-column-header {
flex-shrink: 0;
display: flex;
align-items: center;
justify-content: center;
padding-bottom: 0.4rem;
border-right: 1px solid rgba(255, 255, 255, 0.07);
background-color: rgba(0, 0, 0, 0.25);
padding: 0 0.5rem;
margin: 0 4px 4px 0;
position: relative;
z-index: 20;
}
Expand Down Expand Up @@ -229,21 +231,22 @@
.epg-channel-column {
flex-shrink: 0;
overflow: hidden;
background-color: rgba(0, 0, 0, 0.25);
border-right: 1px solid rgba(255, 255, 255, 0.07);
// background-color: rgba(0, 0, 0, 0.25);
// border-right: 1px solid rgba(255, 255, 255, 0.07);
}

.epg-channel-column-inner {
will-change: transform;
}

.epg-channel-cell {
background: var(--overlay-color);
display: flex;
align-items: center;
justify-content: center;
padding: 0.5rem;
border-bottom: 1px solid rgba(255, 255, 255, 0.06);
box-sizing: border-box;
border-radius: 0.5rem;
margin: 0 4px 4px 0;
}

.epg-channel-logo {
Expand Down
4 changes: 2 additions & 2 deletions src/routes/Discover/EpgGuide/EpgGuide.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import { programStartMs, programEndMs } from './epgUtils';
import styles from './EpgGuide.less';

const BASE_PIXELS_PER_HOUR = 120; // minimum scale
const MAX_PIXELS_PER_HOUR = 720; // cap — at 720 a 10-min show is 120 px (~17 000 px total grid)
const MAX_PIXELS_PER_HOUR = 360; // cap — at 720 a 10-min show is 120 px (~17 000 px total grid)
const MIN_PROGRAM_WIDTH = 120; // px — wide enough to show a thumbnail + label
const CHANNEL_COLUMN_WIDTH = 130;
const ROW_HEIGHT = 68;
const ROW_HEIGHT = 56;
const HOUR_IN_MS = 60 * 60 * 1000;
const DAY_IN_MS = 24 * HOUR_IN_MS;
const MIN_PROGRAM_DURATION_MS = 10 * 60 * 1000; // ignore sub-10-min filler when choosing scale
Expand Down
65 changes: 34 additions & 31 deletions src/routes/Discover/EpgGuide/EpgGuideRow/EpgGuideRow.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@
@import (reference) '~stremio/common/screen-sizes.less';

.epg-row {
position: relative;
display: flex;
height: 68px;
height: 60px;
flex-shrink: 0;
border-bottom: 1px solid rgba(255, 255, 255, 0.06);
box-sizing: border-box;
}

.epg-program-list {
Expand All @@ -21,54 +18,60 @@

.epg-program-block {
position: absolute;
top: 4px;
bottom: 4px;
padding-right: 3px;
box-sizing: border-box;
padding-right: 4px;
width: 100%;

&:hover {
z-index: 10;
min-width: max-content;
}

&-inner {
display: flex;
align-items: center;
gap: 0.6rem;
width: 100%;
height: 100%;
padding: 0 0.8rem 0 0.6rem;
border-radius: 0.6rem;
background-color: rgba(255, 255, 255, 0.07);
cursor: pointer;
overflow: hidden;
height: 56px;
display: flex;
box-sizing: border-box;
border-radius: 0.5rem;
padding: 0 1rem 0 0.5rem;
cursor: pointer;
text-align: left;
align-items: center;
gap: 0.5rem;
color: var(--color-foreground);
background-color: #1E1C2E;
transition: background-color 0.12s;

&:hover {
background-color: rgba(255, 255, 255, 0.12);
background-color: #2B293F;
z-index: 10;
min-width: max-content;
min-height: 56px;
height: auto;
overflow: visible;
}
}

&-current {
.epg-program-block-inner {
background-color: rgba(94, 79, 162, 0.35);
border-left: 2.5px solid rgb(94, 79, 162);
background-color: #5e4fa2;

&:hover {
background-color: rgba(94, 79, 162, 0.5);
background-color: var(--primary-accent-color);
}
}
}
}

.epg-program-thumb {
flex: none;
width: 3rem;
height: 3rem;
border-radius: 0.4rem;
width: 2.5rem;
min-width: 2.5rem;
height: 2.5rem;
border-radius: 0.375rem;
background-size: cover;
background-position: center;
background-color: var(--overlay-color);
background-color: var(--color-surface);
flex-shrink: 0;
overflow: hidden;
}

.epg-program-content {
Expand All @@ -77,25 +80,25 @@
display: flex;
flex-direction: column;
justify-content: center;
gap: 0.15rem;
gap: 0.125rem;
}

.epg-program-title {
font-size: 1.2rem;
font-weight: 500;
font-size: 13px;
font-weight: 400;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: var(--primary-foreground-color);
}

.epg-program-time {
font-size: 1.05rem;
font-size: 13px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: var(--primary-foreground-color);
opacity: 0.45;
opacity: 0.3;
}

.epg-now-line {
Expand Down
Loading