package.json

@@ -1,7 +1,7 @@
 {
   "name": "has",
   "private": true,
-  "version": "0.0.19",
+  "version": "0.0.18",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "has"
-version = "0.0.19"
+version = "0.0.18"
 description = "has"
 authors = ["autli"]
 edition = "2024"

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "has",
-  "version": "0.0.19",
+  "version": "0.0.18",
   "identifier": "com.has.tauri-app",
   "build": {
     "beforeDevCommand": "npm run dev",

src/App.tsx

@@ -27,6 +27,8 @@ const isTauri = () => {
 // Helper for Smart TV / Android TV detection
 const detectTvEnvironment = (): boolean => {
   if (typeof window === "undefined") return false;
+  const saved = localStorage.getItem("has_tv_mode");
+  if (saved !== null) return saved === "true";
   const ua = (navigator.userAgent || "").toLowerCase();
   const isTvUa =
     ua.includes("android tv") ||
@@ -53,17 +55,6 @@ const detectTvEnvironment = (): boolean => {
   const isAndroid = ua.includes("android");
   const noTouch = !("ontouchstart" in window) && navigator.maxTouchPoints === 0;
   if (isAndroid && noTouch) return true;
-
-  // On pure desktop (macOS / Windows / Desktop Linux), default to desktop PC mode
-  const isDesktop =
-    (ua.includes("windows nt") || ua.includes("macintosh") || (ua.includes("linux") && !ua.includes("android"))) &&
-    !isTvUa;
-  if (isDesktop) {
-    return localStorage.getItem("has_tv_mode_manual") === "true";
-  }
-
-  const saved = localStorage.getItem("has_tv_mode");
-  if (saved !== null) return saved === "true";
   return false;
 };
 
@@ -153,6 +144,21 @@ export default function App() {
     checkDatabase();
   }, [isTvEnvironment]);
 
+  // Activate TV mode immediately upon any remote control key press
+  useEffect(() => {
+    const handleRemoteKey = (e: KeyboardEvent) => {
+      const isRemoteKey =
+        [19, 20, 21, 22, 23, 4, 82, 85, 179].includes(e.keyCode) ||
+        ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight"].includes(e.key);
+      if (isRemoteKey && !isTvEnvironment) {
+        setIsTvEnvironment(true);
+        localStorage.setItem("has_tv_mode", "true");
+      }
+    };
+    window.addEventListener("keydown", handleRemoteKey);
+    return () => window.removeEventListener("keydown", handleRemoteKey);
+  }, [isTvEnvironment]);
+
   // Countdown timer for OTP re-send in resetStage 2
   useEffect(() => {
     if (resetStage !== 2) return;
@@ -519,7 +525,6 @@ export default function App() {
           dbInfo={dbInfo}
           dbStatus={dbStatus}
           onLogout={handleLogout}
-          isTvEnvironment={isTvEnvironment}
         />
       </>
     );
@@ -537,7 +542,6 @@ export default function App() {
           onSwitchToDesktop={() => {
             setIsTvEnvironment(false);
             localStorage.setItem("has_tv_mode", "false");
-            localStorage.setItem("has_tv_mode_manual", "false");
           }}
         />
       </>
@@ -808,7 +812,6 @@ export default function App() {
                 onClick={() => {
                   setIsTvEnvironment(true);
                   localStorage.setItem("has_tv_mode", "true");
-                  localStorage.setItem("has_tv_mode_manual", "true");
                 }}
                 title="Перейти в режим Android TV (выбор профилей)"
                 style={{

src/components/UpdaterBanner.tsx

@@ -22,6 +22,8 @@ interface UpdaterBannerProps {
 // Helper for Smart TV / Android TV detection
 const detectTvEnvironment = (): boolean => {
   if (typeof window === "undefined") return false;
+  const saved = localStorage.getItem("has_tv_mode");
+  if (saved !== null) return saved === "true";
   const ua = (navigator.userAgent || "").toLowerCase();
   const isTvUa =
     ua.includes("android tv") ||
@@ -48,17 +50,6 @@ const detectTvEnvironment = (): boolean => {
   const isAndroid = ua.includes("android");
   const noTouch = !("ontouchstart" in window) && navigator.maxTouchPoints === 0;
   if (isAndroid && noTouch) return true;
-
-  // On pure desktop (macOS / Windows / Desktop Linux), default to desktop PC mode
-  const isDesktop =
-    (ua.includes("windows nt") || ua.includes("macintosh") || (ua.includes("linux") && !ua.includes("android"))) &&
-    !isTvUa;
-  if (isDesktop) {
-    return localStorage.getItem("has_tv_mode_manual") === "true";
-  }
-
-  const saved = localStorage.getItem("has_tv_mode");
-  if (saved !== null) return saved === "true";
   return false;
 };
 
@@ -97,7 +88,7 @@ const isNewerSemver = (remote: string, current: string): boolean => {
 
 export function UpdaterBanner({ isTvEnvironment }: UpdaterBannerProps = {}) {
   const [isTv, setIsTv] = useState<boolean>(() => isTvEnvironment ?? detectTvEnvironment());
-  const [currentAppVersion, setCurrentAppVersion] = useState<string>("0.0.19");
+  const [currentAppVersion, setCurrentAppVersion] = useState<string>("0.0.18");
   const [updateAvailable, setUpdateAvailable] = useState(false);
   const [updateInfo, setUpdateInfo] = useState<UpdateInfo | null>(null);
   const [downloading, setDownloading] = useState(false);

src/pages/cinema/Cinema.tsx

@@ -493,6 +493,8 @@ const formatMediaImg = (path: string | undefined, size: "w500" | "original" = "w
 // Detect Android TV / Smart TV user agent or previous user preference
 const detectTvEnvironment = (): boolean => {
   if (typeof window === "undefined") return false;
+  const saved = localStorage.getItem("has_tv_mode");
+  if (saved !== null) return saved === "true";
   const ua = (navigator.userAgent || "").toLowerCase();
   const isTvUa =
     ua.includes("android tv") ||
@@ -519,17 +521,6 @@ const detectTvEnvironment = (): boolean => {
   const isAndroid = ua.includes("android");
   const noTouch = !("ontouchstart" in window) && navigator.maxTouchPoints === 0;
   if (isAndroid && noTouch) return true;
-
-  // On pure desktop (macOS / Windows / Desktop Linux), default to desktop PC mode
-  const isDesktop =
-    (ua.includes("windows nt") || ua.includes("macintosh") || (ua.includes("linux") && !ua.includes("android"))) &&
-    !isTvUa;
-  if (isDesktop) {
-    return localStorage.getItem("has_tv_mode_manual") === "true";
-  }
-
-  const saved = localStorage.getItem("has_tv_mode");
-  if (saved !== null) return saved === "true";
   return false;
 };
 
@@ -549,10 +540,10 @@ export default function Cinema({
   const lastFocusedCardRef = useRef<HTMLElement | null>(null);
 
   useEffect(() => {
-    if (isTvEnvironment !== isTvMode) {
-      setIsTvMode(isTvEnvironment);
+    if (isTvEnvironment && !isTvMode) {
+      setIsTvMode(true);
     }
-  }, [isTvEnvironment]);
+  }, [isTvEnvironment, isTvMode]);
   const [tvToast, setTvToast] = useState<{ text: string; icon?: string } | null>(null);
   const tvToastTimerRef = useRef<any>(null);
 
@@ -572,7 +563,6 @@ export default function Cinema({
     setIsTvMode((prev) => {
       const next = !prev;
       localStorage.setItem("has_tv_mode", String(next));
-      localStorage.setItem("has_tv_mode_manual", String(next));
       showTvToast(next ? "ТВ-Режим включен (10-Foot UI)" : "ПК-Режим включен", "📺", 2500);
       playTvBeep(next ? 750 : 400, 0.05);
       return next;
@@ -2260,18 +2250,40 @@ export default function Cinema({
   // D-Pad Spatial Navigation & TV Remote Key Handler
   const handleRemoteKeyDown = useCallback(
     (e: KeyboardEvent) => {
+      // Auto-activate TV mode immediately on ANY remote control button press
+      const isRemoteKey =
+        [19, 20, 21, 22, 23, 4, 82, 85, 179].includes(e.keyCode) ||
+        ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight"].includes(e.key);
+      if (isRemoteKey && !isTvMode) {
+        setIsTvMode(true);
+        localStorage.setItem("has_tv_mode", "true");
+      }
+
       const isInput =
         document.activeElement instanceof HTMLInputElement ||
         document.activeElement instanceof HTMLTextAreaElement;
 
-      // Remote Menu key (ONLY in TV Mode, and NEVER for the 'R' key on PC keyboard!)
-      const isMenuKey =
-        !isInput &&
-        (e.key === "Menu" ||
-          e.key === "ContextMenu" ||
-          (isTvMode && e.keyCode === 82 && e.key !== "r" && e.key !== "R" && e.code !== "KeyR"));
+      // Android TV / Remote key mappings
+      const isBack =
+        e.key === "Escape" ||
+        e.key === "GoBack" ||
+        e.key === "BrowserBack" ||
+        e.keyCode === 4 ||
+        e.keyCode === 27;
+      const isOk =
+        e.key === "Enter" ||
+        e.key === "Select" ||
+        e.key === "Accept" ||
+        e.keyCode === 13 ||
+        e.keyCode === 23 ||
+        e.keyCode === 66;
+      const isPlayPause =
+        e.key === "MediaPlayPause" || e.keyCode === 85 || e.keyCode === 179;
+      const isFastForward = e.key === "MediaFastForward" || e.keyCode === 90;
+      const isRewind = e.key === "MediaRewind" || e.keyCode === 89;
 
-      if (isTvMode && isMenuKey) {
+      // Remote Menu key (Android TV remote Menu button / ContextMenu)
+      if (e.key === "Menu" || e.keyCode === 82 || e.key === "ContextMenu") {
         e.preventDefault();
         setIsTvNavOpen((prev) => {
           const next = !prev;
@@ -2298,29 +2310,6 @@ export default function Cinema({
         return;
       }
 
-      // Android TV / Remote key mappings
-      const isBack =
-        e.key === "Escape" ||
-        e.key === "GoBack" ||
-        e.key === "BrowserBack" ||
-        (isTvMode && e.keyCode === 4) ||
-        e.keyCode === 27;
-      const isOk =
-        e.key === "Enter" ||
-        e.key === "Select" ||
-        e.key === "Accept" ||
-        e.keyCode === 13 ||
-        (isTvMode && (e.keyCode === 23 || (e.keyCode === 66 && e.code !== "KeyB")));
-      const isPlayPause =
-        e.key === "MediaPlayPause" ||
-        (isTvMode && (e.keyCode === 85 || e.keyCode === 179) && e.code !== "KeyU");
-      const isFastForward =
-        e.key === "MediaFastForward" ||
-        (isTvMode && e.keyCode === 90 && e.code !== "KeyZ");
-      const isRewind =
-        e.key === "MediaRewind" ||
-        (isTvMode && e.keyCode === 89 && e.code !== "KeyY");
-
       // 1. In-player remote control
       if (playingEpisode !== null) {
         resetHudTimer();

src/pages/dashboard/Dashboard.tsx

@@ -55,7 +55,6 @@ interface DashboardProps {
   dbInfo: SafeDbInfo | null;
   dbStatus: DbStatus | null;
   onLogout: () => void;
-  isTvEnvironment?: boolean;
 }
 
 type NavTab = "cinema" | "home" | "users" | "settings" | "profile" | "help";
@@ -63,6 +62,8 @@ type NavTab = "cinema" | "home" | "users" | "settings" | "profile" | "help";
 // Helper for Smart TV / Android TV detection
 const detectTvEnvironment = (): boolean => {
   if (typeof window === "undefined") return false;
+  const saved = localStorage.getItem("has_tv_mode");
+  if (saved !== null) return saved === "true";
   const ua = (navigator.userAgent || "").toLowerCase();
   const isTvUa =
     ua.includes("android tv") ||
@@ -89,17 +90,6 @@ const detectTvEnvironment = (): boolean => {
   const isAndroid = ua.includes("android");
   const noTouch = !("ontouchstart" in window) && navigator.maxTouchPoints === 0;
   if (isAndroid && noTouch) return true;
-
-  // On pure desktop (macOS / Windows / Desktop Linux), default to desktop PC mode
-  const isDesktop =
-    (ua.includes("windows nt") || ua.includes("macintosh") || (ua.includes("linux") && !ua.includes("android"))) &&
-    !isTvUa;
-  if (isDesktop) {
-    return localStorage.getItem("has_tv_mode_manual") === "true";
-  }
-
-  const saved = localStorage.getItem("has_tv_mode");
-  if (saved !== null) return saved === "true";
   return false;
 };
 
@@ -108,23 +98,13 @@ export default function Dashboard({
   dbInfo,
   dbStatus,
   onLogout,
-  isTvEnvironment: propIsTv,
 }: DashboardProps) {
   const [currentUser, setCurrentUser] = useState<UserDto>(user);
   useEffect(() => {
     setCurrentUser(user);
   }, [user]);
 
-  const [isTvEnvironment, setIsTvEnvironment] = useState<boolean>(() => {
-    return propIsTv !== undefined ? propIsTv : detectTvEnvironment();
-  });
-
-  useEffect(() => {
-    if (propIsTv !== undefined && propIsTv !== isTvEnvironment) {
-      setIsTvEnvironment(propIsTv);
-    }
-  }, [propIsTv, isTvEnvironment]);
-
+  const [isTvEnvironment, setIsTvEnvironment] = useState<boolean>(detectTvEnvironment);
   const [activeTab, setActiveTab] = useState<NavTab>("cinema");
   const [serverUsers, setServerUsers] = useState<ServerUserDto[]>([]);
   const [loadingUsers, setLoadingUsers] = useState(false);
@@ -133,6 +113,21 @@ export default function Dashboard({
   });
   const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
 
+  // Dynamic D-Pad Remote Control Key Listener (Auto-detects TV when user presses remote buttons)
+  useEffect(() => {
+    const handleRemoteDpadKey = (e: KeyboardEvent) => {
+      const isRemoteKey =
+        [19, 20, 21, 22, 23, 4, 82, 85, 179].includes(e.keyCode) ||
+        ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight"].includes(e.key);
+      if (isRemoteKey && !isTvEnvironment) {
+        setIsTvEnvironment(true);
+        localStorage.setItem("has_tv_mode", "true");
+      }
+    };
+    window.addEventListener("keydown", handleRemoteDpadKey);
+    return () => window.removeEventListener("keydown", handleRemoteDpadKey);
+  }, [isTvEnvironment]);
+
   const handleNavClick = (tab: NavTab) => {
     setActiveTab(tab);
     setMobileMenuOpen(false);