@oxymoron.13/tizentube-s95b 0.3.0 → 0.3.2

package/mods/features/pictureInPicture.js

@@ -1,6 +1,7 @@
 // Picture in Picture Mode for TizenTube
 
 import resolveCommand from "../resolveCommand.js";
+import { s95bMiniLayout, s95bMiniEntered } from './s95bMiniPlayer.js';
 
 window.isPipPlaying = false;
 let PlayerService = null;
@@ -51,14 +52,10 @@ function enablePip() {
 
                     function onPipEnter() {
                         videoElement.style.removeProperty('inset');
-                        const pipWidth = window.innerWidth / 3.5;
-                        const pipHeight = window.innerHeight / 3.5;
-                        videoElement.style.width = `${pipWidth}px`;
-                        videoElement.style.height = `${pipHeight}px`;
-                        videoElement.style.top = '68vh';
-                        videoElement.style.left = '68vw';
+                        s95bMiniLayout(videoElement);
 
                         window.isPipPlaying = true;
+                        s95bMiniEntered(videoElement);
                         videoElement.removeEventListener('play', onPipEnter);
                     }
 

package/mods/features/s95bI18n.js

@@ -10,6 +10,19 @@ export const STRINGS = Object.freeze({
     statVideo: 'Video', statFrames: 'Verlorene Bilder', statCodec: 'Codec-Wunsch',
     statUnavailable: 'nicht verfügbar', statWait: 'wartet auf Video',
     languageDE: 'Deutsch', languageEN: 'English',
+    exit: 'Beenden',
+    exitHintTizen: 'Beendet die App (TizenTube und TizenBrew, wie die Zurück-Taste in TizenBrew). TizenBrews Hintergrunddienst wird dabei nicht gestoppt.',
+    exitHintSignal: 'Die Tizen-Funktion zum Beenden ist hier nicht verfügbar; es wird YouTubes Beenden-Signal versucht (am TV ungeprüft). Sonst die Home-Taste der Fernbedienung benutzen.',
+    exitCancel: 'Abbrechen', exitNow: 'Ja, App beenden',
+    exitFailed: 'Beenden nicht möglich. Bitte die Home-Taste der Fernbedienung benutzen.',
+    mini: 'Mini-Player',
+    miniHint: 'TizenTubes Mini-Player (Eintrag „MiniPlayer“ im Video-Menü). Änderungen gelten beim nächsten Start des Mini-Players. Ein neu gestartetes Video öffnet im Vollbild und ersetzt den Mini-Player.',
+    miniOn: 'Mini-Player anbieten',
+    miniOnHint: 'Eintrag im Video-Menü und Schaltfläche in der Player-Leiste (die Leiste ändert sich eventuell erst nach einem Neustart von YouTube).',
+    miniPos: 'Position', posBR: 'Unten rechts', posBL: 'Unten links', posTR: 'Oben rechts', posTL: 'Oben links',
+    miniSize: 'Größe', sizeSmall: 'Klein', sizeMedium: 'Mittel (wie bisher)', sizeLarge: 'Groß',
+    miniBrowse: 'Beim Stöbern', browsePlay: 'Weiterlaufen', browsePause: 'Pausieren',
+    miniBrowseHint: 'Pausieren: Das Video hält im kleinen Fenster an (der Anfang ist kurz hörbar) und läuft im Vollbild an derselben Stelle weiter.',
   }),
   en: Object.freeze({
     title: 'S95B · Performance', language: 'Language', codec: 'Video codec', quality: 'Default quality (all videos)',
@@ -21,6 +34,19 @@ export const STRINGS = Object.freeze({
     statVideo: 'Video', statFrames: 'Dropped frames', statCodec: 'Codec preference',
     statUnavailable: 'not available', statWait: 'waiting for video',
     languageDE: 'Deutsch', languageEN: 'English',
+    exit: 'Exit',
+    exitHintTizen: 'Closes the app (TizenTube and TizenBrew, like the Back key in TizenBrew). TizenBrew’s background service is not stopped.',
+    exitHintSignal: 'The Tizen exit function is not available here; YouTube’s exit signal is tried instead (untested on the TV). Otherwise use the remote’s Home key.',
+    exitCancel: 'Cancel', exitNow: 'Yes, exit the app',
+    exitFailed: 'Could not exit. Please use the remote’s Home key.',
+    mini: 'Mini player',
+    miniHint: 'TizenTube’s mini player (“MiniPlayer” row in the video menu). Changes apply the next time the mini player starts. A newly started video opens full screen and replaces the mini player.',
+    miniOn: 'Offer mini player',
+    miniOnHint: 'Row in the video menu and button in the player bar (the bar may only change after restarting YouTube).',
+    miniPos: 'Position', posBR: 'Bottom right', posBL: 'Bottom left', posTR: 'Top right', posTL: 'Top left',
+    miniSize: 'Size', sizeSmall: 'Small', sizeMedium: 'Medium (as before)', sizeLarge: 'Large',
+    miniBrowse: 'While browsing', browsePlay: 'Keep playing', browsePause: 'Pause',
+    miniBrowseHint: 'Pause: the video stops in the small window (its start is briefly audible) and continues full screen from the same position.',
   })
 });
 export function translate(lang, key) {

package/mods/features/s95bMenu.js

@@ -5,11 +5,16 @@
  */
 import { configRead, configWrite, configChangeEmitter } from '../config.js';
 import { optionShow } from '../ui/settings.js';
+import { showToast } from '../ui/ytUI.js';
+import resolveCommand from '../resolveCommand.js';
+import { S95B_VERSION_TAG } from './s95bVersion.js';
 import { translate } from './s95bI18n.js';
 import { codecMenu, qualityMenu, codecLabel, currentCodec } from './s95bOptions.js';
+import { MINI_POSITIONS, MINI_SIZES, MINI_BROWSE } from './s95bMiniPlayer.js';
 
 const STATE_KEY = 's95b-perf-edition-v1';
 const EDITED = ['enablePreviews', 'enableDeArrow', 'enableDeArrowThumbnails'];
+const VERSION = String(S95B_VERSION_TAG).split(':')[1] || '?';
 const defaultState = { lang: 'de', light: false, previous: null };
 let state = { ...defaultState };
 
@@ -80,6 +85,49 @@ function statsLine() {
     '  |  ' + t('statCodec') + ': ' + codecLabel(t, currentCodec());
 }
 
+const MINI_DEFAULTS = { s95bMiniPos: 'br', s95bMiniSize: 'medium', s95bMiniBrowse: 'play' };
+const MINI_VALUES = { s95bMiniPos: MINI_POSITIONS, s95bMiniSize: MINI_SIZES, s95bMiniBrowse: MINI_BROWSE };
+const MINI_LABELS = { br: 'posBR', bl: 'posBL', tr: 'posTR', tl: 'posTL', small: 'sizeSmall', medium: 'sizeMedium',
+  large: 'sizeLarge', play: 'browsePlay', pause: 'browsePause' };
+
+function miniChoice(title, key, hint) {
+  return { name: t(title), value: null, menuId: 's95b-' + key,
+    menuHeader: { title: t(title), subtitle: hint ? t(hint) : t('miniHint') },
+    options: MINI_VALUES[key].map(value => ({ name: t(MINI_LABELS[value]), key, value })) };
+}
+function miniMenu() {
+  return { name: t('mini'), icon: 'CLEAR_COOKIES', value: null, menuId: 's95b-mini',
+    menuHeader: { title: t('mini'), subtitle: t('miniHint') },
+    options: [
+      // TizenTube's own switch; the fork extends it to the "MiniPlayer" row in the video menu.
+      { name: t('miniOn'), subtitle: t('miniOnHint'), value: 'enableMPButton' },
+      miniChoice('miniPos', 's95bMiniPos'),
+      miniChoice('miniSize', 's95bMiniSize'),
+      miniChoice('miniBrowse', 's95bMiniBrowse', 'miniBrowseHint')
+    ] };
+}
+
+// Exit: the same call TizenBrew's own Back key uses; YouTube's exit signal is the fallback.
+function canExitViaTizen() {
+  try { return !!(window.tizen && window.tizen.application && typeof window.tizen.application.getCurrentApplication === 'function'); }
+  catch (_) { return false; }
+}
+function exitMenu() {
+  return { name: t('exit'), value: null, menuId: 's95b-exit',
+    menuHeader: { title: t('exit'), subtitle: canExitViaTizen() ? t('exitHintTizen') : t('exitHintSignal') },
+    options: [
+      { name: t('exitCancel'), key: 's95bExit', value: 'no' },
+      { name: t('exitNow'), key: 's95bExit', value: 'now' }
+    ] };
+}
+function exitApp() {
+  if (canExitViaTizen()) {
+    try { window.tizen.application.getCurrentApplication().exit(); return; } catch (_) { /* try the signal */ }
+  }
+  try { resolveCommand({ signalAction: { signal: 'EXIT_APP' } }); }
+  catch (e) { showToast('TizenTube', t('exitFailed')); }
+}
+
 function buildOptions() {
   return [
     { name: t('language'), value: null, menuId: 's95b-language',
@@ -90,7 +138,9 @@ function buildOptions() {
       ] },
     codecMenu(t),
     qualityMenu(t),
-    { name: t('light'), subtitle: t('lightHint'), value: 's95bLowOverhead' }
+    miniMenu(),
+    { name: t('light'), subtitle: t('lightHint'), value: 's95bLowOverhead' },
+    exitMenu()
   ];
 }
 
@@ -98,7 +148,7 @@ function openMenu() {
   try {
     optionShow({
       menuId: 's95b-menu',
-      menuHeader: { title: t('title'), subtitle: statsLine() },
+      menuHeader: { title: t('title') + ' v' + VERSION, subtitle: statsLine() },
       selectedIndex: 0,
       options: buildOptions()
     }, false);
@@ -119,13 +169,21 @@ function onConfigChange(event) {
   const detail = event && event.detail;
   if (!detail) return;
   if (detail.key === 's95bLowOverhead') turnLight(detail.value === true);
-  else if (detail.key === 's95bLanguage') { state.lang = detail.value === 'en' ? 'en' : 'de'; save(); }
+  else if (detail.key === 's95bExit') {
+    if (detail.value !== 'now') return;
+    configWrite('s95bExit', 'no'); // never leave "now" stored
+    exitApp();
+  } else if (detail.key === 's95bLanguage') { state.lang = detail.value === 'en' ? 'en' : 'de'; save(); }
 }
 
 function init() {
   // Menu entries read their current value from the TizenTube config, so mirror our stored state into it first.
   if (configRead('s95bLowOverhead') !== state.light) configWrite('s95bLowOverhead', state.light);
   if (configRead('s95bLanguage') !== state.lang) configWrite('s95bLanguage', state.lang);
+  if (configRead('s95bExit') !== 'no') configWrite('s95bExit', 'no');
+  Object.keys(MINI_DEFAULTS).forEach(key => {
+    if (MINI_VALUES[key].indexOf(configRead(key)) < 0) configWrite(key, MINI_DEFAULTS[key]);
+  });
   configChangeEmitter.addEventListener('configChange', onConfigChange);
   // Capture phase on window: only the yellow key is consumed.
   window.addEventListener('keydown', onKeys, true);

package/mods/features/s95bMiniPlayer.js

@@ -0,0 +1,36 @@
+/* S95B Performance Edition – GPL-3.0-only
+ * Settings for TizenTube's own mini player (features/pictureInPicture.js): position, size and
+ * whether the video keeps playing while browsing. Called from the two patched lines in pictureInPicture.js.
+ * Defaults reproduce upstream exactly: 1/3.5 of the screen at 68vh / 68vw (bottom right), keeps playing.
+ */
+import { configRead } from '../config.js';
+
+export const MINI_POSITIONS = ['br', 'bl', 'tr', 'tl'];
+export const MINI_SIZES = ['small', 'medium', 'large'];
+export const MINI_BROWSE = ['play', 'pause'];
+const DIVISOR = { small: 4.5, medium: 3.5, large: 2.5 };
+// Upstream's gap between the mini player and the right/bottom screen edge, in vw/vh (100 - 68 - 100/3.5).
+const GAP = 100 - 68 - 100 / 3.5;
+const round = value => Math.round(value * 100) / 100;
+
+export function s95bMiniLayout(videoElement) {
+  const position = MINI_POSITIONS.indexOf(configRead('s95bMiniPos')) >= 0 ? configRead('s95bMiniPos') : 'br';
+  const divisor = DIVISOR[configRead('s95bMiniSize')] || DIVISOR.medium;
+  const far = round(100 - 100 / divisor - GAP);
+  const near = round(GAP);
+  videoElement.style.width = `${window.innerWidth / divisor}px`;
+  videoElement.style.height = `${window.innerHeight / divisor}px`;
+  videoElement.style.top = (position[0] === 'b' ? far : near) + 'vh';
+  videoElement.style.left = (position[1] === 'r' ? far : near) + 'vw';
+}
+
+// "Pause while browsing": pause once the reloaded video has really started, so YouTube's own play() call
+// is not interrupted. Going back to full screen starts the video again from this position (upstream behavior).
+export function s95bMiniEntered(videoElement) {
+  if (configRead('s95bMiniBrowse') !== 'pause') return;
+  const pauseOnce = () => {
+    videoElement.removeEventListener('playing', pauseOnce);
+    if (window.isPipPlaying) videoElement.pause();
+  };
+  videoElement.addEventListener('playing', pauseOnce);
+}

package/mods/features/s95bVersion.js

@@ -0,0 +1,2 @@
+// Generated by create-fork.mjs from the kit's VERSION file. Do not edit.
+export const S95B_VERSION_TAG = 's95b-version:0.3.2';

package/mods/resolveCommand.js

@@ -97,7 +97,7 @@ export function patchResolveCommand() {
                         }
                     }
 
-                    cmd.openPopupAction.popup.overlaySectionRenderer.overlay.overlayTwoPanelRenderer.actionPanel.overlayPanelRenderer.content.overlayPanelItemListRenderer.items.splice(2, 0,
+                    if (configRead('enableMPButton')) cmd.openPopupAction.popup.overlaySectionRenderer.overlay.overlayTwoPanelRenderer.actionPanel.overlayPanelRenderer.content.overlayPanelItemListRenderer.items.splice(2, 0,
                         buttonItem(
                             { title: t('player.miniPlayer') },
                             { icon: 'CLEAR_COOKIES' }, [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oxymoron.13/tizentube-s95b",
-  "appName": "TizenTube S95B Performance (Fork)",
-  "version": "0.3.0",
+  "appName": "TizenTube S95B 0.3.2 (Fork)",
+  "version": "0.3.2",
   "description": "Unofficial fork of TizenTube (@foxreis/tizentube) for TizenBrew: reversible performance profile, German/English settings, smaller bundle.",
   "packageType": "mods",
   "websiteURL": "https://youtube.com/tv?additionalDataUrl=http%3A%2F%2Flocalhost%3A8085%2Fdial%2Fapps%2FYouTube",