From 173e58467e5ed6256079176babf04594febc6488 Mon Sep 17 00:00:00 2001 From: Ivelin Megdanov Date: Tue, 11 Feb 2025 16:21:11 +0200 Subject: [PATCH 1/6] Fix user panel appearing behind server warning --- .../NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js | 10 +++++++++- .../NavBar/HorizontalNavBar/NavMenu/styles.less | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/components/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js b/src/components/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js index 832492acb..59946165a 100644 --- a/src/components/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js +++ b/src/components/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js @@ -12,15 +12,23 @@ const useProfile = require('stremio/common/useProfile'); const usePWA = require('stremio/common/usePWA'); const useTorrent = require('stremio/common/useTorrent'); const { withCoreSuspender } = require('stremio/common/CoreSuspender'); +const useStreamingServer = require('stremio/common/useStreamingServer'); const styles = require('./styles'); const NavMenuContent = ({ onClick }) => { const { t } = useTranslation(); const { core } = useServices(); const profile = useProfile(); + const streamingServer = useStreamingServer(); const { createTorrentFromMagnet } = useTorrent(); const [fullscreen, requestFullscreen, exitFullscreen] = useFullscreen(); const [isIOSPWA, isAndroidPWA] = usePWA(); + const streamingServerWarningDismissed = React.useMemo(() => { + return streamingServer.settings !== null && streamingServer.settings.type === 'Ready' || ( + !isNaN(profile.settings.streamingServerWarningDismissed.getTime()) && + profile.settings.streamingServerWarningDismissed.getTime() > Date.now() + ); + }, [profile.settings, streamingServer.settings]); const logoutButtonOnClick = React.useCallback(() => { core.transport.dispatch({ action: 'Ctx', @@ -38,7 +46,7 @@ const NavMenuContent = ({ onClick }) => { } }, []); return ( -
+
Date: Wed, 12 Feb 2025 11:25:16 +0200 Subject: [PATCH 2/6] Fixed max height calculation on mobile --- src/components/NavBar/HorizontalNavBar/NavMenu/styles.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less b/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less index 0babfbba7..cda63637e 100644 --- a/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less +++ b/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less @@ -113,5 +113,9 @@ @media only screen and (max-width: @minimum) { .nav-menu-container { max-height: calc(100vh - var(--horizontal-nav-bar-size) - var(--vertical-nav-bar-size) - 1rem); + + &.with-warning { + max-height: calc(100vh - var(--horizontal-nav-bar-size) - var(--vertical-nav-bar-size) - 8.5rem); + } } } \ No newline at end of file From 2b924741601ab6b9b3718827839608f5afd43420 Mon Sep 17 00:00:00 2001 From: Ivelin Megdanov Date: Wed, 12 Feb 2025 12:22:25 +0200 Subject: [PATCH 3/6] Using viewport height instead of 100vh --- .../NavBar/HorizontalNavBar/NavMenu/styles.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less b/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less index cda63637e..e3a37f0a2 100644 --- a/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less +++ b/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less @@ -14,13 +14,13 @@ } .nav-menu-container { width: 22rem; - max-height: calc(100vh - var(--horizontal-nav-bar-size) - 1rem); + max-height: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size) - 1rem); overflow-y: auto; border-radius: var(--border-radius); background-color: var(--modal-background-color); &.with-warning { - max-height: calc(100vh - var(--horizontal-nav-bar-size) - 6rem); + max-height: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size) - 6rem); } .user-info-container { @@ -112,10 +112,10 @@ @media only screen and (max-width: @minimum) { .nav-menu-container { - max-height: calc(100vh - var(--horizontal-nav-bar-size) - var(--vertical-nav-bar-size) - 1rem); + max-height: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size) - var(--vertical-nav-bar-size) - 1rem); &.with-warning { - max-height: calc(100vh - var(--horizontal-nav-bar-size) - var(--vertical-nav-bar-size) - 8.5rem); + max-height: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size) - var(--vertical-nav-bar-size) - 8.5rem); } } } \ No newline at end of file From 804cf461615819056b058a0ce55ff1792c096001 Mon Sep 17 00:00:00 2001 From: Ivelin Megdanov Date: Wed, 12 Feb 2025 12:42:06 +0200 Subject: [PATCH 4/6] add LESS variables for height calculations --- .../NavBar/HorizontalNavBar/NavMenu/styles.less | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less b/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less index e3a37f0a2..3f758af8f 100644 --- a/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less +++ b/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less @@ -1,5 +1,8 @@ // Copyright (C) 2017-2023 Smart code 203358507 +@viewport-minus-navbar: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size) - var(--vertical-nav-bar-size)); +@viewport-minus-horizontal-navbar: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size)); + @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; @@ -14,13 +17,13 @@ } .nav-menu-container { width: 22rem; - max-height: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size) - 1rem); + max-height: calc(@viewport-minus-horizontal-navbar - 1rem); overflow-y: auto; border-radius: var(--border-radius); background-color: var(--modal-background-color); &.with-warning { - max-height: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size) - 6rem); + max-height: calc(@viewport-minus-horizontal-navbar - 6rem); } .user-info-container { @@ -112,10 +115,10 @@ @media only screen and (max-width: @minimum) { .nav-menu-container { - max-height: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size) - var(--vertical-nav-bar-size) - 1rem); + max-height: calc(@viewport-minus-navbar - 1rem); &.with-warning { - max-height: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size) - var(--vertical-nav-bar-size) - 8.5rem); + max-height: calc(@viewport-minus-navbar - 8.5rem); } } } \ No newline at end of file From 7fbd723db43de800a777121fbe7029464b8de0f4 Mon Sep 17 00:00:00 2001 From: Ivelin Megdanov Date: Wed, 12 Feb 2025 12:50:08 +0200 Subject: [PATCH 5/6] Renamed LESS variables --- .../NavBar/HorizontalNavBar/NavMenu/styles.less | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less b/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less index 3f758af8f..9a579aea1 100644 --- a/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less +++ b/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less @@ -1,7 +1,7 @@ // Copyright (C) 2017-2023 Smart code 203358507 -@viewport-minus-navbar: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size) - var(--vertical-nav-bar-size)); -@viewport-minus-horizontal-navbar: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size)); +@mobile-height: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size) - var(--vertical-nav-bar-size)); +@height: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size)); @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; @@ -17,13 +17,13 @@ } .nav-menu-container { width: 22rem; - max-height: calc(@viewport-minus-horizontal-navbar - 1rem); + max-height: calc(@height - 1rem); overflow-y: auto; border-radius: var(--border-radius); background-color: var(--modal-background-color); &.with-warning { - max-height: calc(@viewport-minus-horizontal-navbar - 6rem); + max-height: calc(@height - 6rem); } .user-info-container { @@ -115,10 +115,10 @@ @media only screen and (max-width: @minimum) { .nav-menu-container { - max-height: calc(@viewport-minus-navbar - 1rem); + max-height: calc(@mobile-height - 1rem); &.with-warning { - max-height: calc(@viewport-minus-navbar - 8.5rem); + max-height: calc(@mobile-height - 8.5rem); } } } \ No newline at end of file From a51fccbe16471db780b5d5fd9b7fc2edc3f5bb7a Mon Sep 17 00:00:00 2001 From: Ivelin Megdanov Date: Wed, 12 Feb 2025 12:58:41 +0200 Subject: [PATCH 6/6] Moved LESS variables after the imports --- src/components/NavBar/HorizontalNavBar/NavMenu/styles.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less b/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less index 9a579aea1..31b997d38 100644 --- a/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less +++ b/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less @@ -1,8 +1,5 @@ // Copyright (C) 2017-2023 Smart code 203358507 -@mobile-height: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size) - var(--vertical-nav-bar-size)); -@height: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size)); - @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; @@ -10,6 +7,9 @@ popup-menu-container: menu-container; } +@mobile-height: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size) - var(--vertical-nav-bar-size)); +@height: calc(var(--small-viewport-height) - var(--horizontal-nav-bar-size)); + .nav-menu-popup-label { .popup-menu-container { margin-top: 1rem;