nuvio-tizen 1.8.4 → 1.8.11

package/config.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets"
-        id="http://nuvio.tizen/NuvioTizen" version="1.0.0" viewmodes="maximized">
+        id="http://nuvio.tizen/NuvioTizen" version="1.8.11" viewmodes="maximized">
     <tizen:application id="Nuvio00001.Nuvio" package="Nuvio00001" required_version="2.4"/>
     <content src="index.html"/>
     <feature name="http://tizen.org/feature/screen.size.all"/>

package/css/style.css

@@ -36,6 +36,8 @@ html, body {
 .brand .dot { color: #e6e9ef; }
 .header .spacer { flex: 1; }
 .header .gear { font-size: 30px; opacity: 0.7; }
+.header .hchip { font-size: 24px; opacity: 0.9; padding: 10px 24px; border-radius: 30px; background: #1a1f2b; border: 4px solid transparent; }
+.header .hchip.focusable.focused { background: #818cf8; color: #0e1117; border-color: #fff; opacity: 1; }
 
 /* --- Rows --- */
 .rows { position: absolute; top: 110px; left: 0; right: 0; bottom: 0; overflow: hidden; }
@@ -104,13 +106,22 @@ html, body {
 .ep-row { display: flex; align-items: flex-start; padding: 12px 16px; }
 .ep-thumb { width: 120px; height: 68px; flex: 0 0 120px; margin-right: 18px; border-radius: 6px; background-color: #0e1117; background-size: cover; background-position: center; }
 .ep-body { flex: 1; min-width: 0; }
-.ep-line { font-size: 22px; }
-.ep-rating { color: #ffd257; font-size: 19px; }
+.ep-line { display: flex; align-items: flex-start; font-size: 22px; }
+.ep-title { flex: 1 1 auto; min-width: 0; }
+.ep-rating { flex: 0 0 auto; margin-left: 14px; color: #ffd257; font-size: 19px; white-space: nowrap; }
+.ep-rating:empty { margin-left: 0; }
 .ep-ov { display: block; font-size: 17px; color: #9aa2b1; margin-top: 6px; max-height: 44px; overflow: hidden; }
 .list-scroll { position: absolute; top: 0; left: 0; right: 0; bottom: 0; overflow: hidden; }
 
 /* Settings */
-.settings-wrap { position: absolute; top: 120px; left: 60px; right: 60px; }
+.settings-wrap { position: absolute; top: 120px; left: 60px; right: 60px; bottom: 40px; overflow: hidden; }
+.back-row { color: #c7cbd4; }
+/* Home Feeds ordering */
+.feed-row { display: flex; align-items: center; margin-bottom: 8px; }
+.feed-btn { width: 60px; text-align: center; padding: 14px 0; margin-right: 8px; background: #161b26; border-radius: 8px; font-size: 22px; border: 4px solid transparent; }
+.feed-name { flex: 1; padding: 14px 18px; background: #161b26; border-radius: 8px; font-size: 22px; border: 4px solid transparent; white-space: normal; }
+.feed-off .feed-name { opacity: 0.5; }
+.feed-btn.focusable.focused, .feed-name.focusable.focused { background: #818cf8; color: #0e1117; border-color: #fff; }
 .settings-wrap h2 { font-size: 30px; margin-bottom: 20px; }
 .addon-item { padding: 16px 20px; margin-bottom: 10px; background: #161b26; border-radius: 8px; font-size: 20px; border: 4px solid transparent; word-break: break-all; white-space: normal; }
 .addon-item .a-name { font-weight: bold; }
@@ -180,6 +191,14 @@ html, body {
 .modal-msg { font-size: 30px; line-height: 1.4; color: #e6e9ef; margin-bottom: 36px; }
 .modal-row { display: flex; justify-content: center; }
 .modal-btn { min-width: 200px; text-align: center; }
+/* list picker (single choice) */
+.pick-box { width: 720px; text-align: left; }
+.pick-box .modal-msg { text-align: left; margin-bottom: 20px; }
+.pick-list { max-height: 620px; overflow: hidden; }
+.pick-item { padding: 14px 20px; margin-bottom: 8px; border-radius: 8px; background: #0e1117; border: 4px solid transparent; font-size: 24px; }
+.pick-item.sel { background: #2a3346; }
+.pick-item.focusable.focused { background: #818cf8; color: #0e1117; border-color: #fff; }
+
 .pill.danger { background: #3a2130; }
 .pill.danger.focusable.focused { background: #ef4444; color: #fff; }
 .reset-item .a-name { color: #f0a5a5; }

package/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=1920, height=1080, user-scalable=no">
     <title>Nuvio</title>
-    <link rel="stylesheet" href="css/style.css?v=1.8.4">
+    <link rel="stylesheet" href="css/style.css?v=1.8.11">
 </head>
 <body>
     <!-- CSS-applied sentinel (kept off-screen); app.js waits for its width before rendering -->
@@ -47,13 +47,13 @@
 
     <!-- Load order matters: polyfills -> util -> data -> input -> player -> views -> app -->
     <!-- ?v= busts the TV webview cache on every release (keep in sync with package.json) -->
-    <script src="js/polyfills.js?v=1.8.4"></script>
-    <script src="js/util.js?v=1.8.4"></script>
-    <script src="js/stremio.js?v=1.8.4"></script>
-    <script src="js/keys.js?v=1.8.4"></script>
-    <script src="js/focus.js?v=1.8.4"></script>
-    <script src="js/player.js?v=1.8.4"></script>
-    <script src="js/views.js?v=1.8.4"></script>
-    <script src="js/app.js?v=1.8.4"></script>
+    <script src="js/polyfills.js?v=1.8.11"></script>
+    <script src="js/util.js?v=1.8.11"></script>
+    <script src="js/stremio.js?v=1.8.11"></script>
+    <script src="js/keys.js?v=1.8.11"></script>
+    <script src="js/focus.js?v=1.8.11"></script>
+    <script src="js/player.js?v=1.8.11"></script>
+    <script src="js/views.js?v=1.8.11"></script>
+    <script src="js/app.js?v=1.8.11"></script>
 </body>
 </html>

package/js/focus.js

@@ -20,6 +20,16 @@ var Focus = (function () {
 
     function setFocus(node) {
         if (!node) { return; }
+        // Moving to a non-input control must blur any text field that still holds
+        // DOM keyboard focus — otherwise the remote's OK/Enter is delivered to the
+        // input (e.g. re-running a search) instead of the visually-focused element.
+        try {
+            var ae = document.activeElement;
+            if (ae && ae !== node && (ae.tagName === 'INPUT' || ae.tagName === 'TEXTAREA') &&
+                node.tagName !== 'INPUT' && node.tagName !== 'TEXTAREA') {
+                ae.blur();
+            }
+        } catch (e) {}
         if (_current && _current !== node && _current.classList) { _current.classList.remove('focused'); }
         _current = node;
         if (node.classList) { node.classList.add('focused'); }
@@ -56,8 +66,10 @@ var Focus = (function () {
 
         var r = _current.getBoundingClientRect();
         var cx = r.left + r.width / 2, cy = r.top + r.height / 2;
-        var best = null, bestScore = Infinity;
 
+        // Collect candidates in the pressed direction with their primary (distance
+        // along the axis of travel) and cross (offset on the other axis).
+        var cands = [];
         for (var i = 0; i < list.length; i++) {
             var node = list[i];
             if (node === _current) { continue; }
@@ -69,8 +81,42 @@ var Focus = (function () {
             else if (dir === 'RIGHT') { if (dx < 1) { continue; } primary = dx; cross = Math.abs(dy); }
             else if (dir === 'UP') { if (dy > -1) { continue; } primary = -dy; cross = Math.abs(dx); }
             else { if (dy < 1) { continue; } primary = dy; cross = Math.abs(dx); }
-            var score = primary + cross * 2.2;
-            if (score < bestScore) { bestScore = score; best = node; }
+            cands.push({ node: node, primary: primary, cross: cross });
+        }
+        if (!cands.length) { return; }
+
+        // Two-phase, direction-aware:
+        //  - Vertical (UP/DOWN): first restrict to the NEAREST row (min primary =
+        //    vertical distance), then pick the horizontally closest (min cross).
+        //  - Horizontal (LEFT/RIGHT): first restrict to the SAME row (min cross =
+        //    vertical offset), then pick the horizontally closest (min primary).
+        // This stops vertical moves skipping a short row, and stops horizontal moves
+        // jumping into another row (e.g. Settings -> LEFT should land on Search).
+        var vertical = (dir === 'UP' || dir === 'DOWN');
+        var best = null, bestSel = Infinity, bestTie = Infinity;
+
+        if (vertical) {
+            // nearest row first (min primary band), then closest horizontally
+            var BAND = 120, minP = Infinity;
+            for (var j = 0; j < cands.length; j++) { if (cands[j].primary < minP) { minP = cands[j].primary; } }
+            for (var k = 0; k < cands.length; k++) {
+                var c = cands[k];
+                if (c.primary > minP + BAND) { continue; }
+                if (c.cross < bestSel || (c.cross === bestSel && c.primary < bestTie)) {
+                    best = c.node; bestSel = c.cross; bestTie = c.primary;
+                }
+            }
+        } else {
+            // same row only (absolute vertical tolerance), then nearest horizontally.
+            // No jump to another row/header at a row end — just don't move.
+            var ROW_TOL = 140;
+            for (var m = 0; m < cands.length; m++) {
+                var d = cands[m];
+                if (d.cross > ROW_TOL) { continue; }
+                if (d.primary < bestSel || (d.primary === bestSel && d.cross < bestTie)) {
+                    best = d.node; bestSel = d.primary; bestTie = d.cross;
+                }
+            }
         }
         if (best) { setFocus(best); }
     }

package/js/stremio.js

@@ -178,6 +178,69 @@ var Stremio = (function () {
             .then(function (res) { return (res && res.metas) ? res.metas : []; });
     }
 
+    // ---- Home feed ordering / visibility ----
+    var FEEDS_KEY = 'nuvio.feeds';
+    function catalogKey(cat) {
+        var aid = (cat.addon.manifest && cat.addon.manifest.id) || cat.addon.url;
+        return cat.type + '|' + cat.id + '|' + aid;
+    }
+    function getFeedCfg() {
+        var f = U.store.get(FEEDS_KEY, {}) || {};
+        return { order: f.order || [], hidden: f.hidden || [] };
+    }
+    function setFeedCfg(cfg) { U.store.set(FEEDS_KEY, cfg); }
+
+    function sortCatalogsByPref(cats) {
+        var order = getFeedCfg().order;
+        var pos = {};
+        order.forEach(function (k, i) { pos[k] = i; });
+        var withIdx = cats.map(function (c, i) { return { c: c, i: i, k: catalogKey(c) }; });
+        withIdx.sort(function (a, b) {
+            var pa = (pos[a.k] !== undefined) ? pos[a.k] : (100000 + a.i);
+            var pb = (pos[b.k] !== undefined) ? pos[b.k] : (100000 + b.i);
+            return pa - pb;
+        });
+        return withIdx.map(function (x) { return x.c; });
+    }
+
+    // All catalogs in the user's order (for the ordering settings page).
+    function listCatalogsOrdered() {
+        return listCatalogs().then(function (cats) { return sortCatalogsByPref(cats); });
+    }
+
+    // Ordered + visible catalogs (for the home page).
+    function catalogsForHome() {
+        return listCatalogs().then(function (cats) {
+            var hidden = {};
+            getFeedCfg().hidden.forEach(function (k) { hidden[k] = 1; });
+            return sortCatalogsByPref(cats).filter(function (c) { return !hidden[catalogKey(c)]; });
+        });
+    }
+
+    function moveFeed(key, dir) {
+        return listCatalogs().then(function (cats) {
+            var ordered = sortCatalogsByPref(cats).map(catalogKey);
+            var i = ordered.indexOf(key);
+            if (i < 0) { return; }
+            var j = i + dir;
+            if (j < 0 || j >= ordered.length) { return; }
+            var t = ordered[i]; ordered[i] = ordered[j]; ordered[j] = t;
+            var cfg = getFeedCfg(); cfg.order = ordered; setFeedCfg(cfg);
+        });
+    }
+
+    function toggleFeed(key) {
+        var cfg = getFeedCfg();
+        var h = {};
+        cfg.hidden.forEach(function (k) { h[k] = 1; });
+        if (h[key]) { delete h[key]; } else { h[key] = 1; }
+        cfg.hidden = Object.keys(h);
+        setFeedCfg(cfg);
+    }
+    function isFeedHidden(key) {
+        return getFeedCfg().hidden.indexOf(key) !== -1;
+    }
+
     // ---- Meta ----
     function getMeta(type, id) {
         return loadAddons().then(function (addons) {
@@ -450,6 +513,8 @@ var Stremio = (function () {
         tmdbFindTvId: tmdbFindTvId, tmdbSeasonEpisodes: tmdbSeasonEpisodes, tmdbImg: tmdbImg,
         omdbSeasonRatings: omdbSeasonRatings,
         loadAddons: loadAddons, listCatalogs: listCatalogs, getCatalog: getCatalog,
+        catalogsForHome: catalogsForHome, listCatalogsOrdered: listCatalogsOrdered,
+        catalogKey: catalogKey, moveFeed: moveFeed, toggleFeed: toggleFeed, isFeedHidden: isFeedHidden,
         getMeta: getMeta, getStreams: getStreams, getSubtitles: getSubtitles,
         getSearchCatalogs: getSearchCatalogs, search: search,
         isPlayable: isPlayable, streamLabel: streamLabel, streamName: streamName,

package/js/views.js

@@ -42,6 +42,31 @@ var Views = (function () {
         _modalScope = null; _modalPrevFocus = null;
     }
 
+    // A scrollable single-choice list overlay (D-pad). options = [[value,label],...]
+    function pickList(title, options, current, onPick) {
+        var existing = document.querySelector('.modal-overlay');
+        if (existing) { existing.parentNode.removeChild(existing); }
+        var overlay = U.el('div', 'modal-overlay');
+        var box = U.el('div', 'modal-box pick-box');
+        box.appendChild(U.el('div', 'modal-msg', title));
+        var listEl = U.el('div', 'pick-list');
+        var pref = null;
+        options.forEach(function (opt) {
+            var it = U.el('div', 'pick-item focusable' + (opt[0] === current ? ' sel' : ''), opt[1]);
+            it.__onselect = function () { closeModal(); onPick(opt[0]); };
+            if (opt[0] === current) { pref = it; }
+            listEl.appendChild(it);
+        });
+        box.appendChild(listEl);
+        overlay.appendChild(box);
+        document.body.appendChild(overlay);
+
+        _modalPrevFocus = Focus.current();
+        _modalScope = _current();
+        _modalOpen = true;
+        Focus.setScope(overlay, pref);
+    }
+
     function _current() {
         var names = ['home', 'detail', 'search', 'settings', 'addaddon'];
         for (var i = 0; i < names.length; i++) {
@@ -59,14 +84,14 @@ var Views = (function () {
         h.appendChild(brand);
         h.appendChild(U.el('div', 'spacer'));
         if (withSearch) {
-            var srch = U.el('div', 'gear focusable', '🔍');
-            srch.style.marginRight = '24px';
+            var srch = U.el('div', 'gear hchip focusable', 'Search  🔍');
+            srch.style.marginRight = '20px';
             srch.__onselect = function () { App.openSearch(); };
             srch.__navDOWN = focusFirstRowItem;
             h.appendChild(srch);
         }
         if (withGear) {
-            var g = U.el('div', 'gear focusable', '⚙');
+            var g = U.el('div', 'gear hchip focusable', 'Settings  ⚙');
             g.__onselect = function () { App.openSettings(); };
             g.__navDOWN = focusFirstRowItem;
             h.appendChild(g);
@@ -163,8 +188,8 @@ var Views = (function () {
         }
 
         U.spinner(true);
-        Stremio.listCatalogs().then(function (cats) {
-            var pick = cats.slice(0, 10);
+        Stremio.catalogsForHome().then(function (cats) {
+            var pick = cats.slice(0, 15);
             var rowNodes = pick.map(function (cat) { var ph = buildRow(cat.name, []); rows.appendChild(ph); return ph; });
             focusHome(s);
             U.spinner(false);
@@ -282,6 +307,7 @@ var Views = (function () {
         }
         Focus.setScope(s, _d._epFocus);
         _d.target = null; // consume: don't re-jump after the user navigates
+        _d._focusSeason = null;
     }
 
     function movieActions() {
@@ -310,7 +336,9 @@ var Views = (function () {
         var bar = U.el('div', 'season-bar');
         ss.forEach(function (sn) {
             var p = U.el('div', 'pill focusable' + (sn === _d.season ? ' season-sel' : ''), 'Season ' + sn);
-            p.__onselect = function () { _d.season = sn; drawDetail(); };
+            p.__onselect = function () { _d.season = sn; _d._focusSeason = sn; drawDetail(); };
+            // keep focus on the season pill the user just picked
+            if (_d._focusSeason === sn) { _d._epFocus = p; }
             bar.appendChild(p);
         });
         panel.appendChild(bar);
@@ -332,8 +360,9 @@ var Views = (function () {
 
             var body = U.el('div', 'ep-body');
             var line = U.el('div', 'ep-line');
-            line.appendChild(document.createTextNode((watched ? '✓ ' : '') + 'E' + (v.episode || '?') + '  ' + (v.title || v.name || '')));
+            var title = U.el('span', 'ep-title', (watched ? '✓ ' : '') + 'E' + (v.episode || '?') + '  ' + (v.title || v.name || ''));
             var rating = U.el('span', 'ep-rating', '');
+            line.appendChild(title);
             line.appendChild(rating);
             body.appendChild(line);
             var ov = U.el('span', 'ep-ov', v.overview || '');
@@ -366,7 +395,7 @@ var Views = (function () {
                 if (!map || _d.season !== seasonAtFetch) { return; }
                 epRefs.forEach(function (r) {
                     var rt = map[r.num];
-                    if (rt) { r.rating.textContent = '  ★ ' + rt + ' IMDb'; }
+                    if (rt) { r.rating.textContent = '★ ' + rt + ' IMDb'; }
                 });
             });
         }
@@ -379,8 +408,9 @@ var Views = (function () {
                         var ep = map[r.num];
                         if (!ep) { return; }
                         if (ep.still && !r.thumb.style.backgroundImage) { r.thumb.style.backgroundImage = 'url("' + ep.still + '")'; }
-                        // TMDB rating only when OMDb isn't the configured source.
-                        if (ep.rating && !integ.omdb) { r.rating.textContent = '  ★ ' + (Math.round(ep.rating * 10) / 10); }
+                        // Fill the rating only if OMDb didn't provide one for this episode
+                        // (OMDb's dataset is missing IMDb ratings for some episodes).
+                        if (ep.rating && !r.rating.textContent) { r.rating.textContent = '★ ' + (Math.round(ep.rating * 10) / 10) + ' TMDb'; }
                         if (ep.overview && !r.ov.textContent) { r.ov.textContent = ep.overview; }
                     });
                 });
@@ -555,6 +585,10 @@ var Views = (function () {
         var go = U.el('div', 'pill focusable search-go', 'Search');
         go.__onselect = function () { runSearch(input.value); };
         bar.appendChild(go);
+
+        var back = U.el('div', 'pill focusable search-go', '← Back');
+        back.__onselect = function () { App.back(); };
+        bar.appendChild(back);
         wrap.appendChild(bar);
 
         var results = U.el('div', 'search-results');
@@ -681,6 +715,23 @@ var Views = (function () {
         return row;
     }
 
+    // Like subCycleRow but OK opens a scrollable list picker.
+    function subPickRow(caption, list, key) {
+        var row = U.el('div', 'addon-item focusable cfg-row');
+        var name = U.el('div', 'a-name');
+        function render() { name.textContent = caption + ':  ' + labelFor(list, Player.getSubCfg()[key]); }
+        render();
+        row.appendChild(name);
+        row.appendChild(U.el('div', 'a-url', 'Press OK to choose'));
+        row.__onselect = function () {
+            pickList(caption, list, Player.getSubCfg()[key], function (v) {
+                var cfg = Player.getSubCfg(); cfg[key] = v; Player.setSubCfg(cfg);
+                render();
+            });
+        };
+        return row;
+    }
+
     // ================= SETTINGS (sectioned) =================
     var _settingsSection = 'menu';
 
@@ -701,6 +752,7 @@ var Views = (function () {
         if (_settingsSection === 'addons') { settingsAddons(wrap); }
         else if (_settingsSection === 'integrations') { settingsIntegrations(wrap); }
         else if (_settingsSection === 'subtitles') { settingsSubtitles(wrap); }
+        else if (_settingsSection === 'feeds') { settingsFeeds(wrap); }
         else if (_settingsSection === 'display') { settingsDisplay(wrap); }
         else { settingsMenu(wrap); }
     }
@@ -713,13 +765,20 @@ var Views = (function () {
         return r;
     }
 
+    function backRow() {
+        var r = U.el('div', 'addon-item focusable back-row', '←  Back');
+        r.__onselect = function () { App.back(); };
+        return r;
+    }
+
     function settingsMenu(wrap) {
         wrap.appendChild(U.el('h2', null, 'Settings'));
         wrap.appendChild(sectionRow('Addons', 'Catalog, stream & subtitle addons', 'addons'));
-        wrap.appendChild(sectionRow('Integrations', 'API keys (TMDB, MDBList)', 'integrations'));
+        wrap.appendChild(sectionRow('Integrations', 'API keys (OMDb, TMDB, MDBList)', 'integrations'));
         wrap.appendChild(sectionRow('Subtitle Options', 'Default language, size, style', 'subtitles'));
+        wrap.appendChild(sectionRow('Home Feeds', 'Order & show/hide the home rows', 'feeds'));
         wrap.appendChild(sectionRow('Display', 'Poster orientation', 'display'));
-        wrap.appendChild(U.el('div', 'hint', 'Press RETURN to go back.'));
+        wrap.appendChild(backRow());
         Focus.setScope(scr('settings'));
     }
 
@@ -772,7 +831,8 @@ var Views = (function () {
             wrap.appendChild(addRow);
 
             wrap.appendChild(U.el('div', 'hint',
-                'Nuvio hosts no content — add Stremio addon manifest URLs for catalogs, streams and subtitles. RETURN goes back.'));
+                'Nuvio hosts no content — add Stremio addon manifest URLs for catalogs, streams and subtitles.'));
+            wrap.appendChild(backRow());
             Focus.setScope(scr('settings'));
         });
     }
@@ -800,16 +860,17 @@ var Views = (function () {
         wrap.appendChild(keyRow('OMDb API key', 'omdb', 'OMDb API key', Stremio.omdbValidate));
         wrap.appendChild(keyRow('TMDB API key (v3)', 'tmdb', 'TMDB v3 API key', Stremio.tmdbValidate));
         wrap.appendChild(keyRow('MDBList API key', 'mdblist', 'MDBList API key', Stremio.mdblistValidate));
-        wrap.appendChild(U.el('div', 'hint', 'Keys are stored on this TV only. OMDb gives real IMDb per-episode ratings (used first when set); TMDB adds episode images & ratings. RETURN goes back.'));
+        wrap.appendChild(U.el('div', 'hint', 'Keys are stored on this TV only. OMDb gives real IMDb per-episode ratings (used first when set); TMDB adds episode images & ratings.'));
+        wrap.appendChild(backRow());
         Focus.setScope(scr('settings'));
     }
 
     function settingsSubtitles(wrap) {
         wrap.appendChild(U.el('h2', null, 'Subtitle Options'));
-        wrap.appendChild(subCycleRow('Default language', SUB_LANGS, 'lang'));
+        wrap.appendChild(subPickRow('Default language', SUB_LANGS, 'lang'));
         wrap.appendChild(subCycleRow('Size', SUB_SIZES, 'size'));
         wrap.appendChild(subCycleRow('Style', SUB_STYLES, 'style'));
-        wrap.appendChild(U.el('div', 'hint', 'RETURN goes back.'));
+        wrap.appendChild(backRow());
         Focus.setScope(scr('settings'));
     }
 
@@ -828,10 +889,56 @@ var Views = (function () {
             render();
         };
         wrap.appendChild(row);
-        wrap.appendChild(U.el('div', 'hint', 'Landscape uses wide artwork when available (falls back to the poster). RETURN goes back.'));
+        wrap.appendChild(U.el('div', 'hint', 'Landscape uses wide artwork when available (falls back to the poster).'));
+        wrap.appendChild(backRow());
         Focus.setScope(scr('settings'));
     }
 
+    // ----- Home Feeds ordering -----
+    var _feedFocus = null;
+    function refeed(key, ctl) { _feedFocus = { key: key, ctl: ctl }; markHomeDirty(); clearCatalogCache(); renderSettings(); }
+
+    function settingsFeeds(wrap) {
+        wrap.appendChild(U.el('h2', null, 'Home Feeds'));
+        wrap.appendChild(U.el('div', 'hint', '▲/▼ reorder a feed · OK on the name shows/hides it.'));
+        Stremio.listCatalogsOrdered().then(function (cats) {
+            cats.forEach(function (cat) {
+                var key = Stremio.catalogKey(cat);
+                var hidden = Stremio.isFeedHidden(key);
+                var frow = U.el('div', 'feed-row' + (hidden ? ' feed-off' : ''));
+
+                var up = U.el('div', 'feed-btn focusable', '▲');
+                up.setAttribute('data-fk', key); up.setAttribute('data-ctl', 'up');
+                up.__onselect = function () { Stremio.moveFeed(key, -1).then(function () { refeed(key, 'up'); }); };
+
+                var down = U.el('div', 'feed-btn focusable', '▼');
+                down.setAttribute('data-fk', key); down.setAttribute('data-ctl', 'down');
+                down.__onselect = function () { Stremio.moveFeed(key, 1).then(function () { refeed(key, 'down'); }); };
+
+                var name = U.el('div', 'feed-name focusable', cat.name + (hidden ? '   (hidden)' : ''));
+                name.setAttribute('data-fk', key); name.setAttribute('data-ctl', 'name');
+                name.__onselect = function () { Stremio.toggleFeed(key); refeed(key, 'name'); };
+
+                frow.appendChild(up);
+                frow.appendChild(down);
+                frow.appendChild(name);
+                wrap.appendChild(frow);
+            });
+            wrap.appendChild(backRow());
+
+            // restore focus to the control that triggered the last change
+            var pref = null;
+            if (_feedFocus) {
+                var nodes = wrap.querySelectorAll('.feed-btn, .feed-name');
+                for (var i = 0; i < nodes.length; i++) {
+                    if (nodes[i].getAttribute('data-fk') === _feedFocus.key && nodes[i].getAttribute('data-ctl') === _feedFocus.ctl) { pref = nodes[i]; break; }
+                }
+                _feedFocus = null;
+            }
+            Focus.setScope(scr('settings'), pref);
+        });
+    }
+
     return {
         renderHome: renderHome, renderDetail: renderDetail, renderSettings: renderSettings,
         settingsRoot: settingsRoot, backInSettings: backInSettings,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuvio-tizen",
-  "version": "1.8.4",
+  "version": "1.8.11",
   "description": "Nuvio-style Stremio-addon streaming client for Tizen 3.0+ Samsung TVs (TizenBrew app module).",
   "packageType": "app",
   "appName": "Nuvio",