diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 72dae53b38..3614ffb3a2 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -522,7 +522,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } LaunchedEffect(cardboard.enabled, steamVrSwitchedPicture, drawerOpen, drawerPage) { - while (cardboard.enabled || steamVrSwitchedPicture || (drawerOpen && drawerPage == SessionDrawerPage.STEAMVR)) { + while (cardboard.enabled || steamVrSwitchedPicture || (drawerOpen && drawerPage == SessionDrawerPage.VR)) { val now = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { SteamVr.status(this@SessionActivity) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt index 576587f7bf..d2cf18ad86 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt @@ -5,8 +5,7 @@ internal enum class SessionDrawerPage(val firstControl: String) { SECOND_SCREEN("second-screen:none"), DISPLAY("hud"), EFFECTS("look"), - STEAMVR("steamvr"), - CARDBOARD("cardboard"), + VR("steamvr"), GAMES("anisotropy"), SESSION("suspend"), } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index c784d7a365..e33fdc6613 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -42,8 +42,6 @@ import androidx.compose.material.icons.outlined.PictureInPictureAlt import androidx.compose.material.icons.automirrored.outlined.ExitToApp import androidx.compose.material.icons.outlined.Settings import androidx.compose.material.icons.outlined.SportsEsports -import androidx.compose.material.icons.outlined.ViewInAr -import androidx.compose.material.icons.outlined.Vrpano import androidx.compose.material3.Icon import androidx.compose.material3.RadioButton import androidx.compose.material3.RadioButtonDefaults @@ -153,8 +151,7 @@ private val SessionDrawerPage.title: Int get() = when (this) { SessionDrawerPage.CONTROLLER -> R.string.drawer_page_controller SessionDrawerPage.SECOND_SCREEN -> R.string.drawer_second_screen SessionDrawerPage.DISPLAY -> R.string.drawer_page_display - SessionDrawerPage.STEAMVR -> R.string.steamvr_title - SessionDrawerPage.CARDBOARD -> R.string.cardboard_title + SessionDrawerPage.VR -> R.string.vr_title SessionDrawerPage.EFFECTS -> R.string.drawer_page_effects SessionDrawerPage.GAMES -> R.string.game_settings_title SessionDrawerPage.SESSION -> R.string.mode_session @@ -164,8 +161,7 @@ private val SessionDrawerPage.icon get() = when (this) { SessionDrawerPage.CONTROLLER -> Icons.Outlined.SportsEsports SessionDrawerPage.SECOND_SCREEN -> Icons.Outlined.ScreenShare SessionDrawerPage.DISPLAY -> Icons.Outlined.DesktopWindows - SessionDrawerPage.STEAMVR -> Icons.Outlined.ViewInAr - SessionDrawerPage.CARDBOARD -> Icons.Outlined.Vrpano + SessionDrawerPage.VR -> VrHeadsetIcon SessionDrawerPage.EFFECTS -> Icons.Outlined.AutoFixHigh SessionDrawerPage.GAMES -> Icons.Outlined.Layers SessionDrawerPage.SESSION -> Icons.Outlined.Settings @@ -464,8 +460,10 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont ScreenEffectsGroup(host, a, advancedEffectsExpanded, onAdvancedToggle = { advancedEffectsExpanded = !advancedEffectsExpanded }) { key -> focus.track(page, key) } } - SessionDrawerPage.STEAMVR -> SteamVrGroup(a) { key -> focus.track(page, key) } - SessionDrawerPage.CARDBOARD -> CardboardGroup(host, a) { key -> focus.track(page, key) } + SessionDrawerPage.VR -> { + SteamVrGroup(a) { key -> focus.track(page, key) } + CardboardGroup(host, a) { key -> focus.track(page, key) } + } SessionDrawerPage.CONTROLLER -> { SettingsGroup(stringResource(R.string.drawer_page_controller)) { a.padType?.let { type -> @@ -931,20 +929,18 @@ private fun SteamVrGroup(a: DrawerActions, track: (String) -> Modifier) { SettingsGroup(stringResource(R.string.steamvr_title)) { val vrLabel = stringResource(R.string.cardboard_steamvr) val enterLabel = stringResource(if (a.immersiveSteamVr) R.string.steamvr_enter else R.string.cardboard_steamvr_start) - val enterHint = stringResource(if (a.immersiveSteamVr) R.string.steamvr_quest_ready_hint else R.string.cardboard_steamvr_ready_hint) - @Composable fun button(label: String, hint: String?, text: String, action: String) { - SettingsRow(label, hint) { + @Composable fun button(label: String, text: String, action: String) { + SettingsRow(label, null) { SecondaryButton(text, modifier = track("steamvr"), onClick = { a.onSteamVr(action) }) } } when (a.steamVr) { - SteamVr.Status.NOT_INSTALLED -> button(vrLabel, stringResource(R.string.cardboard_steamvr_install_hint), - stringResource(R.string.cardboard_steamvr_install), "install") + SteamVr.Status.NOT_INSTALLED -> button(vrLabel, stringResource(R.string.cardboard_steamvr_install), "install") SteamVr.Status.INSTALLING -> SettingsRow(vrLabel, stringResource(R.string.cardboard_steamvr_installing)) {} - SteamVr.Status.READY -> button(vrLabel, enterHint, enterLabel, "start") + SteamVr.Status.READY -> button(vrLabel, enterLabel, "start") SteamVr.Status.RUNNING -> { - if (a.immersiveSteamVr) button(vrLabel, enterHint, enterLabel, "start") - SettingsRow(vrLabel, stringResource(R.string.cardboard_steamvr_running_hint)) { + if (a.immersiveSteamVr) button(vrLabel, enterLabel, "start") + SettingsRow(vrLabel, null) { SecondaryButton(stringResource(R.string.cardboard_steamvr_stop), modifier = track(if (a.immersiveSteamVr) "steamvr-stop" else "steamvr"), onClick = { a.onSteamVr("stop") }) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/VrHeadsetIcon.kt b/app/src/main/java/com/droiddeck/launcher/ui/VrHeadsetIcon.kt new file mode 100644 index 0000000000..4a2c7737c8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/VrHeadsetIcon.kt @@ -0,0 +1,17 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.StrokeJoin +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.unit.dp + +internal val VrHeadsetIcon: ImageVector = ImageVector.Builder("VrHeadset", 24.dp, 24.dp, 24f, 24f).apply { + for (d in listOf( + "M5,8H19A3,3 0 0 1 22,11V15A3,3 0 0 1 19,18H15.6L14.1,15.6A2.4,2.4 0 0 0 9.9,15.6L8.4,18H5A3,3 0 0 1 2,15V11A3,3 0 0 1 5,8Z", + "M7,8V6.5A1.5,1.5 0 0 1 8.5,5H15.5A1.5,1.5 0 0 1 17,6.5V8", + )) addPath(addPathNodes(d), stroke = SolidColor(Color.Black), strokeLineWidth = 1.8f, + strokeLineCap = StrokeCap.Round, strokeLineJoin = StrokeJoin.Round) +}.build() diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index be60ffe1b3..ceec3dd5b0 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2323,12 +2323,9 @@ إعادة التوسيط SteamVR (تجريبي) تثبيت - ينزّل SteamVR لمعمارية ARM64 من Valve ‏(571 ميغابايت). جارٍ تنزيل SteamVR وفك ضغطه… بدء - يشغّل SteamVR مع استخدام رأسك كنظارة؛ وتتحول الصورة إلى ثلاثي الأبعاد جنبًا إلى جنب. إيقاف - SteamVR قيد التشغيل. غير متوفر في هذه الجلسة. لم يستجب SteamVR؛ تحقّق من سجل الجلسة. تنزيل المكوّنات diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 101ec2c522..8870857f43 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2223,12 +2223,9 @@ Центриране SteamVR (експериментално) Инсталиране - Изтегля SteamVR за ARM64 на Valve (571 MB). Изтегляне и разархивиране на SteamVR… Стартиране - Стартира SteamVR с главата ви като шлем; картината превключва на 3D един до друг. Спиране - SteamVR работи. Не е налично в тази сесия. SteamVR не отговори; проверете лога на сесията. Изтегляне на компоненти diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 57936018e0..d59d764dde 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2273,12 +2273,9 @@ Vycentrovat SteamVR (experimentální) Instalovat - Stáhne SteamVR pro ARM64 od Valve (571 MB). Stahování a rozbalování SteamVR… Spustit - Spustí SteamVR s vaší hlavou jako headsetem; obraz se přepne na 3D vedle sebe. Zastavit - SteamVR běží. V této relaci není k dispozici. SteamVR neodpovídá; zkontrolujte protokol relace. Stáhnout komponenty diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 2a53259345..047f0a0550 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2223,12 +2223,9 @@ Centrer SteamVR (eksperimentel) Installer - Downloader Valves SteamVR til ARM64 (571 MB). Downloader og udpakker SteamVR… Start - Kører SteamVR med dit hoved som headset; billedet skifter til side-by-side-3D. Stop - SteamVR kører. Ikke tilgængelig i denne session. SteamVR svarede ikke; se sessionsloggen. Download komponenter diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 29e0e3f613..e03cf98641 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2223,12 +2223,9 @@ Zentrieren SteamVR (experimentell) Installieren - Lädt Valves SteamVR für ARM64 herunter (571 MB). SteamVR wird heruntergeladen und entpackt … Starten - Startet SteamVR mit deinem Kopf als Headset; das Bild wechselt zu Side-by-Side-3D. Beenden - SteamVR läuft. In dieser Sitzung nicht verfügbar. SteamVR hat nicht reagiert; Sitzungsprotokoll prüfen. Komponenten herunterladen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index a1e6096234..6749344c76 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2223,12 +2223,9 @@ Επανακεντράρισμα SteamVR (πειραματικό) Εγκατάσταση - Κατεβάζει το SteamVR ARM64 της Valve (571 MB). Λήψη και αποσυμπίεση του SteamVR… Έναρξη - Εκτελεί το SteamVR με το κεφάλι σας ως headset· η εικόνα αλλάζει σε 3D δίπλα-δίπλα. Διακοπή - Το SteamVR εκτελείται. Δεν είναι διαθέσιμο σε αυτή τη συνεδρία. Το SteamVR δεν αποκρίθηκε· ελέγξτε το αρχείο καταγραφής της συνεδρίας. Λήψη στοιχείων diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 804a9bf4b3..137421b90a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2264,12 +2264,9 @@ Recentrar SteamVR (experimental) Instalar - Descarga SteamVR para ARM64 de Valve (571 MB). Descargando y descomprimiendo SteamVR… Iniciar - Ejecuta SteamVR usando tu cabeza como visor; la imagen cambia a 3D lado a lado. Detener - SteamVR está en ejecución. No disponible en esta sesión. SteamVR no respondió; revisa el registro de la sesión. Descargar componentes diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 32ee2b5f9b..a6c04da635 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2223,12 +2223,9 @@ Keskitä SteamVR (kokeellinen) Asenna - Lataa Valven ARM64-version SteamVR:stä (571 Mt). Ladataan ja puretaan SteamVR:ää… Käynnistä - Ajaa SteamVR:ää niin, että pääsi toimii lasina; kuva vaihtuu rinnakkais-3D:ksi. Pysäytä - SteamVR on käynnissä. Ei käytettävissä tässä istunnossa. SteamVR ei vastannut; tarkista istunnon loki. Lataa komponentteja diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 3137763ab4..c230f5cb71 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2264,12 +2264,9 @@ Recentrer SteamVR (expérimental) Installer - Télécharge SteamVR ARM64 de Valve (571 Mo). Téléchargement et décompression de SteamVR… Démarrer - Lance SteamVR avec votre tête comme casque ; l\'image passe en 3D côte à côte. Arrêter - SteamVR est en cours d\'exécution. Indisponible dans cette session. SteamVR ne répond pas ; consultez le journal de session. Télécharger des composants diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 3002dc36e9..d8878849d0 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2223,12 +2223,9 @@ बीच में लाएं SteamVR (प्रायोगिक) इंस्टॉल करें - Valve का ARM64 SteamVR डाउनलोड करता है (571 MB)। SteamVR डाउनलोड और अनपैक हो रहा है… शुरू करें - आपके सिर को हेडसेट मानकर SteamVR चलाता है; तस्वीर साइड-बाय-साइड 3D में बदल जाती है। रोकें - SteamVR चल रहा है। इस सेशन में उपलब्ध नहीं है। SteamVR ने जवाब नहीं दिया; सेशन लॉग देखें। कंपोनेंट डाउनलोड करें diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 8cace73c49..873b8e252c 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2223,12 +2223,9 @@ Középre SteamVR (kísérleti) Telepítés - Letölti a Valve ARM64-es SteamVR-jét (571 MB). SteamVR letöltése és kicsomagolása… Indítás - A SteamVR-t a fejeddel mint headsettel futtatja; a kép egymás melletti 3D-re vált. Leállítás - A SteamVR fut. Ebben a munkamenetben nem érhető el. A SteamVR nem válaszolt; nézd meg a munkamenet naplóját. Összetevők letöltése diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 7469f69d66..7d03e8e149 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2198,12 +2198,9 @@ Posisikan ulang SteamVR (eksperimental) Pasang - Mengunduh SteamVR ARM64 dari Valve (571 MB). Mengunduh dan mengekstrak SteamVR… Mulai - Menjalankan SteamVR dengan kepala Anda sebagai headset; gambar beralih ke 3D berdampingan. Hentikan - SteamVR sedang berjalan. Tidak tersedia di sesi ini. SteamVR tidak merespons; periksa log sesi. Unduh komponen diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 50b8864018..9f5e8f94bf 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2248,12 +2248,9 @@ Ricentra SteamVR (sperimentale) Installa - Scarica SteamVR ARM64 di Valve (571 MB). Download ed estrazione di SteamVR… Avvia - Avvia SteamVR usando la tua testa come visore; l\'immagine passa al 3D affiancato. Arresta - SteamVR è in esecuzione. Non disponibile in questa sessione. SteamVR non ha risposto; controlla il log della sessione. Scarica componenti diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 65c7b9159b..f3ee1aa65c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2214,12 +2214,9 @@ リセット SteamVR(試験運用) インストール - ValveのARM64版SteamVRをダウンロードします(571 MB)。 SteamVRをダウンロードして展開しています… 開始 - 頭の動きをヘッドセットとしてSteamVRを実行します。映像はサイドバイサイド3Dに切り替わります。 停止 - SteamVRは実行中です。 このセッションでは利用できません。 SteamVRが応答しませんでした。セッションログを確認してください。 コンポーネントをダウンロード diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 2fd695d80e..1a7ae86e57 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2214,12 +2214,9 @@ 재설정 SteamVR (실험적) 설치 - Valve의 ARM64용 SteamVR을 다운로드합니다(571MB). SteamVR 다운로드 및 압축 해제 중… 시작 - 머리를 헤드셋으로 삼아 SteamVR을 실행하며, 화면이 사이드 바이 사이드 3D로 전환됩니다. 중지 - SteamVR이 실행 중입니다. 이 세션에서는 사용할 수 없습니다. SteamVR이 응답하지 않았습니다. 세션 로그를 확인하세요. 구성 요소 다운로드 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 189a7f4c01..0757a41b3b 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2198,12 +2198,9 @@ Pusatkan semula SteamVR (eksperimen) Pasang - Memuat turun SteamVR ARM64 daripada Valve (571 MB). Memuat turun dan menyahmampat SteamVR… Mula - Menjalankan SteamVR dengan kepala anda sebagai set kepala; gambar bertukar kepada 3D sebelah-menyebelah. Henti - SteamVR sedang berjalan. Tidak tersedia dalam sesi ini. SteamVR tidak memberi respons; semak log sesi. Muat turun komponen diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 9734f353f3..f9b3500643 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2223,12 +2223,9 @@ Sentrer SteamVR (eksperimentell) Installer - Laster ned Valves SteamVR for ARM64 (571 MB). Laster ned og pakker ut SteamVR … Start - Kjører SteamVR med hodet ditt som headset; bildet bytter til side-ved-side-3D. Stopp - SteamVR kjører. Ikke tilgjengelig i denne økten. SteamVR svarte ikke; sjekk sesjonsloggen. Last ned komponenter diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index fa645e3e82..e91b8ecb41 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2223,12 +2223,9 @@ Centreren SteamVR (experimenteel) Installeren - Downloadt Valves SteamVR voor ARM64 (571 MB). SteamVR downloaden en uitpakken… Starten - Draait SteamVR met je hoofd als headset; het beeld schakelt naar side-by-side 3D. Stoppen - SteamVR draait. Niet beschikbaar in deze sessie. SteamVR reageerde niet; controleer het sessielog. Componenten downloaden diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 544f29fd17..6401ad1d09 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2273,12 +2273,9 @@ Wyśrodkuj SteamVR (eksperymentalne) Zainstaluj - Pobiera SteamVR dla ARM64 od Valve (571 MB). Pobieranie i rozpakowywanie SteamVR… Uruchom - Uruchamia SteamVR, a twoja głowa działa jak gogle; obraz przełącza się na 3D obok siebie. Zatrzymaj - SteamVR działa. Niedostępne w tej sesji. SteamVR nie odpowiada; sprawdź dziennik sesji. Pobierz komponenty diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index e54193f192..4b42bd9ca5 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2248,12 +2248,9 @@ Recentrar SteamVR (experimental) Instalar - Transfere o SteamVR ARM64 da Valve (571 MB). A transferir e a descompactar o SteamVR… Iniciar - Executa o SteamVR com a tua cabeça como headset; a imagem muda para 3D lado a lado. Parar - O SteamVR está em execução. Indisponível nesta sessão. O SteamVR não respondeu; verifica o registo da sessão. Transferir componentes diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index a55e6edcb0..533d5011f9 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2248,12 +2248,9 @@ Recentralizar SteamVR (experimental) Instalar - Baixa o SteamVR ARM64 da Valve (571 MB). Baixando e descompactando o SteamVR… Iniciar - Executa o SteamVR usando sua cabeça como headset; a imagem muda para 3D lado a lado. Parar - O SteamVR está em execução. Indisponível nesta sessão. O SteamVR não respondeu; veja o registro da sessão. Baixar componentes diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 979f29df28..42bbeed0cf 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2248,12 +2248,9 @@ Recentrează SteamVR (experimental) Instalează - Descarcă SteamVR ARM64 de la Valve (571 MB). Se descarcă și se dezarhivează SteamVR… Pornește - Rulează SteamVR cu capul tău drept cască; imaginea trece la 3D alăturat. Oprește - SteamVR rulează. Indisponibil în această sesiune. SteamVR nu a răspuns; verifică jurnalul sesiunii. Descarcă componente diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 6462420ed4..9e5b3ded90 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2289,12 +2289,9 @@ Отцентрировать SteamVR (экспериментально) Установить - Скачивает SteamVR от Valve для ARM64 (571 МБ). Скачивание и распаковка SteamVR… Запустить - Запускает SteamVR, где гарнитурой служит ваша голова; изображение переключается на стереопару 3D. Остановить - SteamVR запущен. Недоступно в этой сессии. SteamVR не отвечает; проверьте журнал сессии. Скачать компоненты diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index aba8f2f815..38f97216fc 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2223,12 +2223,9 @@ Centrera SteamVR (experimentellt) Installera - Laddar ned Valves SteamVR för ARM64 (571 MB). Laddar ned och packar upp SteamVR… Starta - Kör SteamVR med ditt huvud som headset; bilden växlar till sida vid sida-3D. Stoppa - SteamVR körs. Inte tillgängligt i den här sessionen. SteamVR svarade inte; kontrollera sessionsloggen. Ladda ned komponenter diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 9ef86726c7..f7e675c3ad 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2198,12 +2198,9 @@ จัดกึ่งกลาง SteamVR (ทดลอง) ติดตั้ง - ดาวน์โหลด SteamVR สำหรับ ARM64 ของ Valve (571 MB) กำลังดาวน์โหลดและแตกไฟล์ SteamVR… เริ่ม - เรียกใช้ SteamVR โดยใช้ศีรษะของคุณเป็นชุดหูฟัง ภาพจะเปลี่ยนเป็น 3D แบบเคียงข้าง หยุด - SteamVR กำลังทำงาน ใช้ไม่ได้ในเซสชันนี้ SteamVR ไม่ตอบสนอง ตรวจสอบบันทึกเซสชัน ดาวน์โหลดคอมโพเนนต์ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index c9c62daafe..6aeb3ad20a 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2223,12 +2223,9 @@ Ortala SteamVR (deneysel) Yükle - Valve\'ın ARM64 SteamVR\'ını indirir (571 MB). SteamVR indiriliyor ve açılıyor… Başlat - SteamVR\'ı başınızı başlık olarak kullanarak çalıştırır; görüntü yan yana 3D\'ye geçer. Durdur - SteamVR çalışıyor. Bu oturumda kullanılamaz. SteamVR yanıt vermedi; oturum günlüğünü kontrol et. Bileşenleri indir diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index b4964c44ab..9155737aed 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2273,12 +2273,9 @@ Відцентрувати SteamVR (експериментально) Установити - Завантажує SteamVR від Valve для ARM64 (571 МБ). Завантаження й розпакування SteamVR… Запустити - Запускає SteamVR, де гарнітурою слугує ваша голова; зображення перемикається на стереопару 3D. Зупинити - SteamVR працює. Недоступно в цій сесії. SteamVR не відповідає; перевірте журнал сесії. Завантажити компоненти diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index c69b1a9c50..89201c6a54 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2198,12 +2198,9 @@ Căn giữa lại SteamVR (thử nghiệm) Cài đặt - Tải SteamVR ARM64 của Valve (571 MB). Đang tải và giải nén SteamVR… Bắt đầu - Chạy SteamVR với đầu bạn làm kính; hình ảnh chuyển sang 3D cạnh nhau. Dừng - SteamVR đang chạy. Không khả dụng trong phiên này. SteamVR không phản hồi; hãy xem nhật ký phiên. Tải thành phần diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ed11bfc6ea..ac3e93f3c2 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2214,12 +2214,9 @@ 重置 SteamVR(实验性) 安装 - 下载 Valve 的 ARM64 版 SteamVR(571 MB)。 正在下载并解压 SteamVR… 启动 - 以你的头部作为头显运行 SteamVR;画面会切换为左右并排 3D。 停止 - SteamVR 正在运行。 此会话中不可用。 SteamVR 未响应;请查看会话日志。 下载组件 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index d95af2386c..2ba6466da7 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2214,12 +2214,9 @@ 重設 SteamVR(實驗性) 安裝 - 下載 Valve 的 ARM64 版 SteamVR(571 MB)。 正在下載並解壓 SteamVR… 啟動 - 以你的頭部作為頭戴裝置執行 SteamVR;畫面會切換為左右並排 3D。 停止 - SteamVR 正在執行。 此工作階段中無法使用。 SteamVR 沒有回應;請查看工作階段日誌。 下載元件 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 336313bcb6..020f6833d4 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2214,12 +2214,9 @@ 重設 SteamVR(實驗性) 安裝 - 下載 Valve 的 ARM64 版 SteamVR(571 MB)。 正在下載並解壓縮 SteamVR… 啟動 - 以你的頭部作為頭戴裝置執行 SteamVR;畫面會切換為左右並排 3D。 停止 - SteamVR 正在執行。 這個工作階段無法使用。 SteamVR 沒有回應;請查看工作階段記錄。 下載元件 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2fc69330ed..64c1193de1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -595,18 +595,15 @@ This device has no rotation sensor. Recenter view Recenter + VR SteamVR Enter SteamVR - Enter immersive VR with headset tracking and Touch controllers. Checking SteamVR… SteamVR (experimental) Install - Downloads Valve\'s ARM64 SteamVR (571 MB). Downloading and unpacking SteamVR… Start - Runs SteamVR with your head as the headset; the picture switches to side-by-side 3D. Stop - SteamVR is running. Not available in this session. SteamVR did not respond; see the session log. Debanding diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt index bed0fceb28..c1d5ad10dd 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt @@ -20,9 +20,8 @@ class SessionDrawerPageTest { assertEquals(sessionDrawerPages(false), connected.filter { it != SessionDrawerPage.SECOND_SCREEN }) for (pages in listOf(connected, sessionDrawerPages(false))) { assertEquals(SessionDrawerPage.EFFECTS, pages.step(SessionDrawerPage.DISPLAY, 1)) - assertEquals(SessionDrawerPage.STEAMVR, pages.step(SessionDrawerPage.EFFECTS, 1)) - assertEquals(SessionDrawerPage.CARDBOARD, pages.step(SessionDrawerPage.STEAMVR, 1)) - assertEquals(SessionDrawerPage.GAMES, pages.step(SessionDrawerPage.CARDBOARD, 1)) + assertEquals(SessionDrawerPage.VR, pages.step(SessionDrawerPage.EFFECTS, 1)) + assertEquals(SessionDrawerPage.GAMES, pages.step(SessionDrawerPage.VR, 1)) assertEquals(SessionDrawerPage.SESSION, pages.step(SessionDrawerPage.GAMES, 1)) } } diff --git a/docs/agent-control.md b/docs/agent-control.md index 26e08a057b..a8ca67fe89 100644 --- a/docs/agent-control.md +++ b/docs/agent-control.md @@ -189,7 +189,7 @@ Automator show them: | `play-steam` | Play on the Steam and Games pages | | `setting-` | every toggle and choice row, by its key (`setting-logs`, `setting-agent-commands`, ...) | | `tab-` | a page's tab strip (Setup's Overview, Controller, Session, Launcher...), by position | -| `drawer-tab-controller`, `-second_screen`, `-display`, `-effects`, `-steamvr`, `-cardboard`, `-games`, `-session` | the session drawer's pages | +| `drawer-tab-controller`, `-second_screen`, `-display`, `-effects`, `-vr`, `-games`, `-session` | the session drawer's pages | | `drawer-stop`, `drawer-stop-confirm`, `drawer-stop-cancel` | stopping a session from the drawer | ## Scenarios