diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e5b17b50e3..b537705617 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,6 +9,14 @@ + + + + + + + + diff --git a/app/src/main/cpp/gpuclock/kgsl_busy.c b/app/src/main/cpp/gpuclock/kgsl_busy.c index a611147935..ec652c8d1b 100644 --- a/app/src/main/cpp/gpuclock/kgsl_busy.c +++ b/app/src/main/cpp/gpuclock/kgsl_busy.c @@ -1,5 +1,6 @@ // Whole-GPU busy share without root on Adreno (KGSL) devices whose kgsl sysfs is blocked for apps: a thread -// samples the memstore ringbuffer timestamps (kgsl_busy.h) once a millisecond while running. +// samples the memstore timestamps (kgsl_busy.h) once a millisecond while running. Ringbuffer entries are used where +// the kernel writes them; on hardware-scheduled kernels, which leave them at 0, the contexts' own entries are used. #include #include #include @@ -15,13 +16,21 @@ #include "kgsl_busy.h" #define SAMPLE_NS 1000000L +// Context mode: how many samples between scans of the context entries. +#define SCAN_EVERY 200 + +enum { MODE_RINGBUFFER = 1, MODE_CONTEXTS = 2 }; struct reader { int fd; void *map; size_t bytes; int first; + int mode; uint32_t last[KGSL_BUSY_SLOTS]; + uint32_t *seen, *ctx_last; + int live[KGSL_BUSY_MAX_LIVE]; + int live_count; pthread_mutex_t lock; pthread_t thread; int thread_on; @@ -32,9 +41,18 @@ struct reader { static void *sample_loop(void *arg) { struct reader *r = arg; const struct timespec gap = {0, SAMPLE_NS}; + int until_scan = 0; while (atomic_load(&r->run)) { - int moved = 0; - int busy = kgsl_busy_sample(r->map, r->first, r->last, &moved); + int moved = 0, busy; + if (r->mode == MODE_CONTEXTS) { + if (until_scan-- <= 0) { + r->live_count = kgsl_busy_scan_contexts(r->map, r->first, r->seen, r->live, KGSL_BUSY_MAX_LIVE); + until_scan = SCAN_EVERY; + } + busy = kgsl_busy_sample_contexts(r->map, r->live, r->live_count, r->ctx_last, &moved); + } else { + busy = kgsl_busy_sample(r->map, r->first, r->last, &moved); + } if (busy) atomic_fetch_add(&r->busy, 1); if (moved) atomic_fetch_add(&r->moves, 1); atomic_fetch_add(&r->samples, 1); @@ -62,6 +80,8 @@ static void reader_close(struct reader *r) { reader_run(r, 0); if (r->map && r->map != MAP_FAILED) munmap(r->map, r->bytes); if (r->fd >= 0) close(r->fd); + free(r->seen); + free(r->ctx_last); pthread_mutex_destroy(&r->lock); free(r); } @@ -85,7 +105,16 @@ static int reader_open(struct reader **out) { int moved = 0, started = 0; kgsl_busy_sample(r->map, r->first, r->last, &moved); for (int i = 0; i < KGSL_BUSY_SLOTS; i++) started |= r->last[i] != 0; - if (!started) { reader_close(r); return -ENODATA; } + if (started) { + r->mode = MODE_RINGBUFFER; + } else { + r->seen = calloc((size_t)r->first, sizeof(uint32_t)); + r->ctx_last = calloc((size_t)r->first, sizeof(uint32_t)); + if (!r->seen || !r->ctx_last) { reader_close(r); return -ENOMEM; } + r->live_count = kgsl_busy_scan_contexts(r->map, r->first, r->seen, r->live, KGSL_BUSY_MAX_LIVE); + kgsl_busy_sample_contexts(r->map, r->live, r->live_count, r->ctx_last, &moved); + r->mode = MODE_CONTEXTS; + } *out = r; return 0; } @@ -103,6 +132,10 @@ JNIEXPORT jlong JNICALL Java_com_droiddeck_launcher_session_KgslBusy_nativeOpen( return e ? 0 : (jlong)(intptr_t)r; } +JNIEXPORT jint JNICALL Java_com_droiddeck_launcher_session_KgslBusy_nativeMode(JNIEnv *env, jclass cls, jlong handle) { + return handle ? ((struct reader *)(intptr_t)handle)->mode : 0; +} + JNIEXPORT void JNICALL Java_com_droiddeck_launcher_session_KgslBusy_nativeRun(JNIEnv *env, jclass cls, jlong handle, jboolean on) { if (handle) reader_run((struct reader *)(intptr_t)handle, on ? 1 : 0); } diff --git a/app/src/main/cpp/gpuclock/kgsl_busy.h b/app/src/main/cpp/gpuclock/kgsl_busy.h index 2179cf533f..0ca7bfb067 100644 --- a/app/src/main/cpp/gpuclock/kgsl_busy.h +++ b/app/src/main/cpp/gpuclock/kgsl_busy.h @@ -34,4 +34,44 @@ static inline int kgsl_busy_sample(const volatile uint32_t *memstore, int first, return busy; } +// Hardware-scheduled kernels (every gen8 GPU and some gen7 ones: .gpudev = *_hwsched_gpudev in adreno-gpulist.h) +// leave the ringbuffer entries at 0. The GMU firmware writes each context's own entry instead +// (gen8_hwsched_hfi.c send_context_pointers). Context ids run from 1 below the ringbuffer entries, lowest free first, +// and kgsl zeroes an entry when its context is created or destroyed. +#define KGSL_BUSY_MAX_LIVE 64 + +// Collects the contexts to sample: every entry below first with a non-zero start stamp (kgsl zeroes an entry when its +// context is created or destroyed). Entries whose start stamp changed since the previous scan (seen[]) or that are +// busy now come first, so the max_live cap only drops idle ones. Returns how many ids went into live[]. +static inline int kgsl_busy_scan_contexts(const volatile uint32_t *memstore, int first, uint32_t *seen, int *live, int max_live) { + int n = 0, idle = 0; + int idle_ids[KGSL_BUSY_MAX_LIVE]; + for (int id = 1; id < first; id++) { + const volatile uint32_t *entry = memstore + (size_t)id * KGSL_BUSY_ENTRY_WORDS; + uint32_t sop = entry[KGSL_BUSY_SOP], eop = entry[KGSL_BUSY_EOP]; + int changed = sop != seen[id]; + seen[id] = sop; + if ((changed || sop != eop) && n < max_live) live[n++] = id; + else if (sop != 0 && idle < KGSL_BUSY_MAX_LIVE) idle_ids[idle++] = id; + } + for (int i = 0; i < idle && n < max_live; i++) live[n++] = idle_ids[i]; + return n; +} + +// 1 when a live context has a submission between its start and end timestamps. *moved is set when a start +// timestamp differs from last[] (indexed by context id), which then holds the new ones. +static inline int kgsl_busy_sample_contexts(const volatile uint32_t *memstore, const int *live, int count, uint32_t *last, int *moved) { + int busy = 0; + for (int i = 0; i < count; i++) { + const volatile uint32_t *entry = memstore + (size_t)live[i] * KGSL_BUSY_ENTRY_WORDS; + uint32_t sop = entry[KGSL_BUSY_SOP], eop = entry[KGSL_BUSY_EOP]; + if (sop != eop) busy = 1; + if (sop != last[live[i]]) { + *moved = 1; + last[live[i]] = sop; + } + } + return busy; +} + #endif diff --git a/app/src/main/cpp/gpuclock/kgsl_clock.c b/app/src/main/cpp/gpuclock/kgsl_clock.c index b021208b4d..e70a1d537c 100644 --- a/app/src/main/cpp/gpuclock/kgsl_clock.c +++ b/app/src/main/cpp/gpuclock/kgsl_clock.c @@ -16,21 +16,18 @@ #include #include "../adrenotools/src/hook/kgsl.h" +#include "kgsl_layout.h" #define CP_TYPE7_PKT 0x70000000u #define CP_NOP 0x10u #define CP_REG_TO_MEM 0x3eu -#define CP_ALWAYS_ON_COUNTER 0x980u -#define RBBM_ALWAYS_COUNT 0u -// gen7 CP protection marks registers 0x000-0x4ff readable by command buffers (adreno-gpulist.h); a counter -// kgsl places anywhere else is not read. -#define READABLE_LAST 0x4ffu #define XO_HZ 19200000.0 #define NOP_DWORDS 0x3fffu #define NOP_BLOCKS 4 struct sampler { int fd; + const struct kgsl_layout *layout; unsigned context; unsigned counter_reg; struct kgsl_gpumem_alloc_id ib, out; @@ -60,7 +57,7 @@ static void sampler_close(struct sampler *s) { if (s->out.id) { struct kgsl_gpumem_free_id f = {.id = s->out.id}; ioctl(s->fd, IOCTL_KGSL_GPUMEM_FREE_ID, &f); } if (s->context) { struct kgsl_drawctxt_destroy d = {.drawctxt_id = s->context}; ioctl(s->fd, IOCTL_KGSL_DRAWCTXT_DESTROY, &d); } if (s->counter_reg) { - struct kgsl_perfcounter_put p = {.groupid = KGSL_PERFCOUNTER_GROUP_RBBM, .countable = RBBM_ALWAYS_COUNT}; + struct kgsl_perfcounter_put p = {.groupid = KGSL_PERFCOUNTER_GROUP_RBBM, .countable = s->layout->cycles}; ioctl(s->fd, IOCTL_KGSL_PERFCOUNTER_PUT, &p); } close(s->fd); @@ -69,7 +66,7 @@ static void sampler_close(struct sampler *s) { } static void emit_reads(struct sampler *s, size_t *n, unsigned pass) { - const unsigned regs[2] = {CP_ALWAYS_ON_COUNTER, s->counter_reg}; + const unsigned regs[2] = {s->layout->always_on, s->counter_reg}; for (unsigned k = 0; k < 2; k++) { uint64_t dst = s->out.gpuaddr + (uint64_t)(pass * 2 + k) * sizeof(uint64_t); s->ib_map[(*n)++] = pkt7(CP_REG_TO_MEM, 3); @@ -85,10 +82,16 @@ static int sampler_open(struct sampler **out) { if (!s) return -ENOMEM; s->fd = open("/dev/kgsl-3d0", O_RDWR | O_CLOEXEC); if (s->fd < 0) { int e = -errno; s->fd = -1; sampler_close(s); return e; } - struct kgsl_perfcounter_get get = {.groupid = KGSL_PERFCOUNTER_GROUP_RBBM, .countable = RBBM_ALWAYS_COUNT}; + struct kgsl_devinfo info; + memset(&info, 0, sizeof(info)); + struct kgsl_device_getproperty prop = {.type = KGSL_PROP_DEVICE_INFO, .value = &info, .sizebytes = sizeof(info)}; + if (ioctl(s->fd, IOCTL_KGSL_DEVICE_GETPROPERTY, &prop)) { int e = -errno; sampler_close(s); return e; } + s->layout = kgsl_layout_for(info.chip_id); + if (!s->layout) { sampler_close(s); return -ENOTSUP; } + struct kgsl_perfcounter_get get = {.groupid = KGSL_PERFCOUNTER_GROUP_RBBM, .countable = s->layout->cycles}; if (ioctl(s->fd, IOCTL_KGSL_PERFCOUNTER_GET, &get)) { int e = -errno; sampler_close(s); return e; } s->counter_reg = get.offset; - if (!get.offset || get.offset > READABLE_LAST) { sampler_close(s); return -ERANGE; } + if (!get.offset || get.offset > s->layout->readable_last) { sampler_close(s); return -ERANGE; } struct kgsl_drawctxt_create ctx = {.flags = KGSL_CONTEXT_NO_GMEM_ALLOC | KGSL_CONTEXT_PREAMBLE}; if (ioctl(s->fd, IOCTL_KGSL_DRAWCTXT_CREATE, &ctx)) { int e = -errno; sampler_close(s); return e; } s->context = ctx.drawctxt_id; diff --git a/app/src/main/cpp/gpuclock/kgsl_layout.h b/app/src/main/cpp/gpuclock/kgsl_layout.h new file mode 100644 index 0000000000..f486ddfdb2 --- /dev/null +++ b/app/src/main/cpp/gpuclock/kgsl_layout.h @@ -0,0 +1,27 @@ +#ifndef DROIDDECK_KGSL_LAYOUT_H +#define DROIDDECK_KGSL_LAYOUT_H +#include + +// Register layout per GPU generation. A counter kgsl places outside the range the kernel's CP protection lets +// command buffers read (adreno-gpulist.h *_protected_regs) is not read. +struct kgsl_layout { + unsigned always_on; // CP_ALWAYS_ON_COUNTER + unsigned cycles; // RBBM countable that counts GPU cycles + unsigned readable_last; // last register of the readable range starting at 0 +}; +// A6xx/A7xx: CP_ALWAYS_ON_COUNTER 0x980, RBBM countable 0 = ALWAYS_COUNT, 0x000-0x4ff readable (gen7 list). +static const struct kgsl_layout KGSL_LAYOUT_A7XX = {0x980u, 0u, 0x4ffu}; +// A8xx: CP_ALWAYS_ON_COUNTER 0x8e7 (gen8_reg.h), RBBM countable 1 = US_ALWAYS_COUNT (0 is NEVER_COUNT, Mesa +// a8xx_perfcntrs.xml), 0x000-0x3a3 readable (gen8_0_0_protected_regs). +static const struct kgsl_layout KGSL_LAYOUT_A8XX = {0x8e7u, 1u, 0x3a3u}; + +// The KGSL chip id's top byte: 0x44 on every A8xx (Adreno 810/829/830/840, Mesa freedreno_devices.py), +// 0x43 or the generation number on A6xx/A7xx. Later generations are not known, so nothing is read there. +static inline const struct kgsl_layout *kgsl_layout_for(unsigned chip_id) { + unsigned core = chip_id >> 24; + if (core == 0x44u) return &KGSL_LAYOUT_A8XX; + if (core > 0x44u) return NULL; + return &KGSL_LAYOUT_A7XX; +} + +#endif diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 01657d289c..0d099cbf0b 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -55,6 +55,7 @@ class App : Application() { com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.epic.EpicBackend) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.amazon.AmazonBackend) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.itch.ItchBackend) + com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.gamejolt.GameJoltBackend) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.xbox.XboxBackend) com.droiddeck.launcher.sync.Syncthing.init(this) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.battlenet.BattleNetBackend) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index c1688d7e05..03a1ad669d 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -465,7 +465,7 @@ class FrontEndActivity : ComponentActivity() { private var fexPreset by mutableStateOf("") private var forceSsbs by mutableStateOf(false) private var steamClientArch by mutableStateOf("arm64") - private var runSteamAtStartup by mutableStateOf(false) + private var startupSession by mutableStateOf(SessionPrefs.STARTUP_OFF) private var bootMovie by mutableStateOf(com.droiddeck.launcher.session.BootMovie.DROIDDECK_30) private var bootMovieSound by mutableStateOf(true) private var bootMovieCustomName by mutableStateOf(null) @@ -500,19 +500,39 @@ class FrontEndActivity : ComponentActivity() { if (r.resultCode == RESULT_OK) InAppFilePicker.pickedPath(r.data)?.let { path -> setGameStorage(path, GameStorage.labelFor(this, path)) } } private var steamLibraries by mutableStateOf>(emptyList()) + private var foundSteamLibraries by mutableStateOf>(emptyList()) + private var allFilesAccessMissing by mutableStateOf(false) + private var steamLibraryScan = 0 private val pickSteamLibrary = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> val path = if (r.resultCode == RESULT_OK) InAppFilePicker.pickedPath(r.data) else null - if (path != null) Thread({ + if (path != null) addSteamLibrary(path) + } + + private fun addSteamLibrary(path: String) { + Thread({ val result = SteamLibraries.add(this, path) ui.post { steamLibraries = SteamLibraries.list(this) + refreshFoundSteamLibraries() refresh() - if (result is SteamLibraries.AddResult.Refused) { - android.widget.Toast.makeText(this, getString(R.string.main_storage_not_usable, result.reason), android.widget.Toast.LENGTH_LONG).show() + when { + result is SteamLibraries.AddResult.Refused -> + android.widget.Toast.makeText(this, getString(R.string.main_storage_not_usable, result.reason), android.widget.Toast.LENGTH_LONG).show() + result is SteamLibraries.AddResult.Added && result.entry.path != path -> + android.widget.Toast.makeText(this, getString(R.string.libraries_used_inner, result.entry.label), android.widget.Toast.LENGTH_LONG).show() } } }, "steam-library-add").start() } + + private fun refreshFoundSteamLibraries() { + allFilesAccessMissing = com.droiddeck.launcher.files.AllFilesAccess.missing() + val scan = ++steamLibraryScan + Thread({ + val found = SteamLibraries.found(this) + ui.post { if (scan == steamLibraryScan) foundSteamLibraries = found } + }, "steam-library-scan").start() + } private var romsDir by mutableStateOf(null) private var steamGames by mutableStateOf>(emptyList()) private var steamGamesX64 by mutableStateOf(false) @@ -553,7 +573,7 @@ class FrontEndActivity : ComponentActivity() { private var dualDisplayId by mutableStateOf(-1) private var dualScreenDevice by mutableStateOf(false) private var dualScreenMode by mutableStateOf(com.droiddeck.launcher.input.DualScreen.MODE_AUTO) - private var dualScreenLauncher by mutableStateOf(true) + private var dualScreenSessions by mutableStateOf(com.droiddeck.launcher.input.DualScreen.MODE_AUTO) private var dualScreenControls by mutableStateOf(true) private var launcherStarted = false private lateinit var displayManager: DisplayManager @@ -562,6 +582,7 @@ class FrontEndActivity : ComponentActivity() { override fun onDisplayRemoved(displayId: Int) = refreshSecondScreenDisplays() override fun onDisplayChanged(displayId: Int) = refreshSecondScreenDisplays() } + private val bottomScreenListener: () -> Unit = { refreshSecondScreenDisplays() } private val secondScreenTouchListener = object : android.hardware.input.InputManager.InputDeviceListener { override fun onInputDeviceAdded(deviceId: Int) = refreshSecondScreenDisplays() override fun onInputDeviceRemoved(deviceId: Int) = refreshSecondScreenDisplays() @@ -1087,7 +1108,7 @@ class FrontEndActivity : ComponentActivity() { dualScreen = dualDisplayId >= 0 && com.droiddeck.launcher.ui.DualScreenPanel.available, dualScreenDevice = dualScreenDevice, dualScreenMode = dualScreenMode, - dualScreenLauncher = dualScreenLauncher, + dualScreenSessions = dualScreenSessions, dualScreenControls = dualScreenControls, packages = packageRows, packageCatalogLoading = catalogLoading, @@ -1330,8 +1351,8 @@ class FrontEndActivity : ComponentActivity() { SessionPrefs.setDualScreenMode(this, mode) refreshSecondScreenDisplays() }, - onDualScreenLauncher = { on -> - SessionPrefs.setDualScreenLauncher(this, on) + onDualScreenSessions = { mode -> + SessionPrefs.setDualScreenSessionMode(this, mode) refreshSecondScreenDisplays() }, onDualScreenControls = { on -> @@ -1536,7 +1557,7 @@ class FrontEndActivity : ComponentActivity() { } } - if (savedInstanceState == null) ui.post { startSteamAtStartupIfEnabled() } + if (savedInstanceState == null) ui.post { startSteamAtStartupIfEnabled(cold = true) } else { restoreCompatLaunch(savedInstanceState) pendingSwitch = savedIntent(savedInstanceState, KEY_PENDING_SWITCH) @@ -1579,9 +1600,14 @@ class FrontEndActivity : ComponentActivity() { startSteamAtStartupIfEnabled() } - private fun startSteamAtStartupIfEnabled() { - if (intent.action != Intent.ACTION_MAIN) return - if (SessionPrefs.runSteamAtStartup(this) && !isFinishing && !isDestroyed) startSteamSession() + private fun startSteamAtStartupIfEnabled(cold: Boolean = false) { + if (intent.action != Intent.ACTION_MAIN && !(cold && intent.action == null)) return + if (isFinishing || isDestroyed) return + when (SessionPrefs.startupSession(this)) { + SessionPrefs.STARTUP_STEAM -> startSteamSession() + SessionPrefs.STARTUP_DESKTOP -> startSession(Intent(this, SessionActivity::class.java) + .putExtra(SessionService.EXTRA_MODE, SessionService.MODE_DESKTOP)) + } } private fun playSteam() { @@ -1689,6 +1715,7 @@ class FrontEndActivity : ComponentActivity() { override fun onResume() { super.onResume() + if (settingsMode == SessionService.MODE_STEAM) refreshFoundSteamLibraries() compatLaunchVisible = true com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) com.droiddeck.launcher.ui.DualScreenPanel.ownerPaused(taskId, false) @@ -1747,6 +1774,7 @@ class FrontEndActivity : ComponentActivity() { addDataScheme("file") }) displayManager.registerDisplayListener(secondScreenDisplayListener, ui) + com.droiddeck.launcher.input.DualScreen.watchTaken(bottomScreenListener) getSystemService(android.hardware.input.InputManager::class.java)?.registerInputDeviceListener(secondScreenTouchListener, ui) launcherStarted = true refreshSecondScreenDisplays() @@ -1791,6 +1819,7 @@ class FrontEndActivity : ComponentActivity() { com.droiddeck.launcher.stores.StoresState.libraryListener = null com.droiddeck.launcher.stores.battlenet.BattleNetClient.opener = null displayManager.unregisterDisplayListener(secondScreenDisplayListener) + com.droiddeck.launcher.input.DualScreen.unwatchTaken(bottomScreenListener) getSystemService(android.hardware.input.InputManager::class.java)?.unregisterInputDeviceListener(secondScreenTouchListener) launcherStarted = false com.droiddeck.launcher.ui.DualScreenPanel.hide(taskId) @@ -1829,10 +1858,10 @@ class FrontEndActivity : ComponentActivity() { dualScreenMode = SessionPrefs.dualScreenMode(this) secondScreenDisplays = SecondScreenDisplays.available(displayManager, ownDisplayId) dualScreenDevice = com.droiddeck.launcher.input.DualScreen.anyDisplay(displayManager, ownDisplayId) != null - dualScreenLauncher = SessionPrefs.dualScreenLauncher(this) + dualScreenSessions = SessionPrefs.dualScreenSessionMode(this) dualScreenControls = SessionPrefs.dualScreenSessionControls(this) val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, ownDisplayId) - dualDisplayId = if (dualScreenLauncher) target?.displayId ?: -1 else -1 + dualDisplayId = target?.displayId ?: -1 syncDualPanel() } @@ -2147,6 +2176,8 @@ class FrontEndActivity : ComponentActivity() { gameStorage = if (mode == SessionService.MODE_STEAM) gameStorage else null, storageOptions = storageOptions, steamLibraries = steamLibraries, + foundSteamLibraries = foundSteamLibraries, + allFilesAccessMissing = allFilesAccessMissing, storageDiagnostics = mode == SessionService.MODE_STEAM && storageDiagnostics, fexPreset = if (mode == SessionService.MODE_STEAM) fexPreset else null, forceSsbs = forceSsbs, @@ -2157,7 +2188,7 @@ class FrontEndActivity : ComponentActivity() { steamRepairQueued = steamRepairQueued, mangoapp = mangoapp, steamController = if (mode == SessionService.MODE_STEAM) steamController else null, - runSteamAtStartup = mode == SessionService.MODE_STEAM && runSteamAtStartup, + startupSession = startupSession, bootMovie = if (mode == SessionService.MODE_STEAM) bootMovie else null, bootMovieSound = bootMovieSound, bootMovieCustomName = bootMovieCustomName, @@ -2214,6 +2245,8 @@ class FrontEndActivity : ComponentActivity() { onAddSteamLibrary = { pickSteamLibrary.launch(InAppFilePicker.buildDirIntent(this, getString(R.string.libraries_pick), null)) }, + onAddFoundSteamLibrary = { path -> addSteamLibrary(path) }, + onAllowAllFilesAccess = { com.droiddeck.launcher.files.AllFilesAccess.open(this) }, onRenameSteamLibrary = { id, label -> SteamLibraries.rename(this, id, label) steamLibraries = SteamLibraries.list(this) @@ -2223,6 +2256,7 @@ class FrontEndActivity : ComponentActivity() { SteamLibraries.remove(this, id) steamLibraries = SteamLibraries.list(this) refresh() + refreshFoundSteamLibraries() }, onStorageDiagnostics = { on -> SessionPrefs.setStorageDiagnosticsEnabled(this, on) @@ -2247,9 +2281,9 @@ class FrontEndActivity : ComponentActivity() { onReturnAfterGame = { on -> SessionPrefs.setReturnAfterGame(this, on); returnAfterGame = on }, onShaderPrecache = { on -> SessionPrefs.setShaderPrecache(this, on); shaderPrecache = on }, onSteamController = { id -> SessionPrefs.setSteamController(this, id); steamController = id }, - onRunSteamAtStartup = { on -> - SessionPrefs.setRunSteamAtStartup(this, on) - runSteamAtStartup = on + onStartupSession = { id -> + SessionPrefs.setStartupSession(this, id) + startupSession = id }, onBootMovie = { id -> com.droiddeck.launcher.session.BootMovie.select(this, id); loadBootMovie() }, onBootMovieSound = { on -> SessionPrefs.setBootMovieSound(this, on); bootMovieSound = on }, @@ -2440,7 +2474,7 @@ class FrontEndActivity : ComponentActivity() { returnAfterGame = SessionPrefs.returnAfterGame(this) loadShaderPrecache(mode) steamController = SessionPrefs.steamController(this) - runSteamAtStartup = SessionPrefs.runSteamAtStartup(this) + startupSession = SessionPrefs.startupSession(this) loadBootMovie() hdrOn = SessionPrefs.hdr(this, mode) upscaler = SessionPrefs.upscaler(this) @@ -2459,6 +2493,7 @@ class FrontEndActivity : ComponentActivity() { refreshWifiDiscovery() gameStorage = SessionPrefs.gameStorage(this) steamLibraries = SteamLibraries.list(this) + if (mode == SessionService.MODE_STEAM) refreshFoundSteamLibraries() storageDiagnostics = SessionPrefs.storageDiagnosticsEnabled(this) settingsMode = mode Thread({ @@ -2489,6 +2524,7 @@ class FrontEndActivity : ComponentActivity() { SessionPrefs.setGameStorage(this, path, label) gameStorage = path checkUsbLink() + if (settingsMode == SessionService.MODE_STEAM) refreshFoundSteamLibraries() } private fun checkUsbLink() { diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 1aa82d33cf..fb344c1943 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -37,6 +37,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.runtime.withFrameNanos import androidx.compose.ui.Modifier +import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.unit.dp @@ -294,9 +295,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun alignCursorToGuest(): Boolean { if (pointerLocked || !CompositorHost.isStarted) return false if (!WaylandCompositor.nativeCursorInputPos(cursorPosBuf)) return false - if (surfaceView.width <= 0 || surfaceView.height <= 0) return false - val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * surfaceView.width - val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * surfaceView.height + if (outputView().width <= 0 || outputView().height <= 0) return false + val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * outputView().width + val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * outputView().height if (kotlin.math.abs(x - cursorPos.x) < 0.75f && kotlin.math.abs(y - cursorPos.y) < 0.75f) return false cursorPos = androidx.compose.ui.geometry.Offset(x, y) return true @@ -421,6 +422,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var glassesSettings by mutableStateOf(Glasses.settings.value) private var glassesScreen: GlassesScreen? = null private var glassesOutputActive by mutableStateOf(false) + private var bottomGame: com.droiddeck.launcher.ui.BottomGameScreen? = null + private var bottomOutputActive by mutableStateOf(false) + private val topDesktopKeys = mutableSetOf>() + private var bottomRecoveries = 0 + private var gameOnBottom by mutableStateOf(SessionState.gameOnBottom) + private var bottomSwapAvailable by mutableStateOf(false) private var pausedFrame by mutableStateOf(null) private var pausedFrameWanted = false private var pauseAnimated by mutableStateOf(false) @@ -475,6 +482,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var sessionActivityDisplayId = Display.DEFAULT_DISPLAY private lateinit var displayManager: DisplayManager private var secondScreenPresentation: SecondScreenPresentation? = null + private val bottomScreenListener: () -> Unit = { + if (secondScreenPresentation?.display?.displayId?.let(com.droiddeck.launcher.input.DualScreen::taken) == true) closeSecondScreen(reset = false) + updateBottomGame() + refreshSecondScreenDisplays() + } + private val displayListener = object : DisplayManager.DisplayListener { override fun onDisplayAdded(displayId: Int) { notifyActivityDisplayStateChanged(displayId) @@ -489,6 +502,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onDisplayChanged(displayId: Int) { notifyActivityDisplayStateChanged(displayId) followPanelRefresh(displayId) + updateBottomGame() refreshSecondScreenDisplays() } } @@ -520,7 +534,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun followPanelRefresh(displayId: Int) { if (!CompositorHost.isStarted) return - val output = glassesScreen?.display + val output = bottomGame?.takeIf { bottomOutputActive }?.display ?: glassesScreen?.display ?: (if (Build.VERSION.SDK_INT >= 30) display else windowManager.defaultDisplay) ?: return if (output.displayId != displayId) return applyOutputPacing() @@ -580,6 +594,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionEvents.begin(this, mode, SessionPaths.label(mode, intent.getStringExtra(SessionService.EXTRA_PROGRAM))) SessionState.secondScreenAutoOpened = false SessionState.secondScreenProvisional = false + SessionState.gameOnBottom = false + gameOnBottom = false } if (!SessionState.running && SessionState.phase in setOf(SessionPhase.IDLE, SessionPhase.FAILED)) { SessionState.program = intent.getStringExtra(SessionService.EXTRA_PROGRAM) @@ -839,9 +855,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { androidx.compose.runtime.DisposableEffect(Unit) { onDispose { com.droiddeck.launcher.glasses.GlassesMenuMirror.setSessionMenuVisible(this@SessionActivity, false) } } - androidx.compose.runtime.LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, pipUi) { updatePointerCapture() } + androidx.compose.runtime.LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, pipUi, bottomOutputActive) { updatePointerCapture() } + androidx.compose.runtime.LaunchedEffect(bottomOutputActive) { hud.setHidden(pipUi || bottomOutputActive) } androidx.compose.runtime.LaunchedEffect(pipUi) { - hud.setHidden(pipUi) + hud.setHidden(pipUi || bottomOutputActive) applyOutputPacing() if (pipUi != frameGenPip) { frameGenPip = pipUi @@ -877,10 +894,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } else { com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize()) { - CursorOverlay({ cursorPos }, cursorVisible && !uiPointer, + CursorOverlay({ cursorPos }, cursorVisible && !uiPointer && !bottomOutputActive, resources.displayMetrics.density, cursorImage, cursorHotX, cursorHotY, cursorImageScale) if (memoryHud.text.isNotEmpty()) HudText(memoryHud.text, hudColor, hudOpacity) + if (bottomOutputActive && !loading.visible) SwappedTopPanel() val phonePanel = glassesOutputActive && !loading.visible && !drawerOpen && !pcKeyboardOpen if (phonePanel) GlassesPhonePanel(glasses, steamVrStatus == SteamVr.Status.RUNNING, headTracking) if (trackingRecovery != null && !drawerOpen && !pcKeyboardOpen && !loading.visible) { @@ -1187,6 +1205,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { touchAuto = getString(if (usingTouchpad()) R.string.session_touch_auto_touchpad else R.string.session_touch_auto_direct), fexPreset = fexPreset, secondScreenMode = secondScreenMode, + gameOnBottom = bottomOutputActive, + gameSwapAvailable = bottomSwapAvailable, + onGameOnBottom = { on -> drawerOpen = false; putGameOnBottom(on) }, dashboardAvailable = bottomPages().isNotEmpty(), desktopAvailable = com.droiddeck.launcher.session.BottomDesktop.available(), secondScreenDisplays = secondScreenDisplays, @@ -2068,7 +2089,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val live = windowOutputSize(holder.surfaceFrame.width(), holder.surfaceFrame.height()) val size = live ?: if (SessionState.running) previous else glassesOutputSize() ?: outputSize() SessionState.outputSize = size - if (!SessionState.running) SessionState.refreshHz = refreshHz() + if (!SessionState.running) SessionState.refreshHz = refreshHz(holder) val panel = panelBounds() SessionState.upscaleRatio = maxOf(panel.width(), panel.height()).toFloat() / maxOf(size.first, size.second).coerceAtLeast(1) Thread({ @@ -2118,7 +2139,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { CompositorHost.startOrAttach( this, holder.surface, runtimeDir.path, driverId?.let { turnip.driverPath(it) }, driverId?.let { turnip.libraryName(it) }, - applicationInfo.nativeLibraryDir, size.first, size.second, refreshHz(), outputFpsLimit(), + applicationInfo.nativeLibraryDir, size.first, size.second, refreshHz(holder), outputFpsLimit(), ) onOutputAttached(holder) if (SessionState.running && size != previous) { @@ -2160,6 +2181,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun windowOutputSize(width: Int, height: Int): Pair? { if (isInPictureInPictureMode || width <= 0 || height <= 0) return null + if (bottomGame != null) return when { + SessionState.followScreen -> + com.droiddeck.launcher.session.SessionDisplay.followSize(width, height, false, SessionState.followScale) + resolutionChoice() == com.droiddeck.launcher.session.SessionDisplay.MATCH_SCREEN -> + (width and 1.inv()) to (height and 1.inv()) + else -> null + } return if (SessionState.followScreen) com.droiddeck.launcher.session.SessionDisplay.followSize(width, height, controlsBelowWanted(), SessionState.followScale) else if (glassesScreen == null) outputSize() else null @@ -2206,12 +2234,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun surfaceDestroyed(holder: SurfaceHolder) { if (holder !== outputHolder()) return - cancelTouchGestures() + cancelOutputTouches() surfaceW = 0 surfaceH = 0 glassesOutputActive = false + bottomOutputActive = false if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(false) CompositorHost.detach(holder.surface) + bottomGame?.takeIf { it.holder === holder }?.let { screen -> uiHandler.post { recoverBottomOutput(screen) } } } private fun cancelTouchGestures() { @@ -2234,19 +2264,24 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun displayMode(): String = SessionPrefs.displayMode(this, intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM, intent.getStringExtra(SessionService.EXTRA_PROGRAM)) - private fun outputSize(): Pair { + private fun outputSize(): Pair = + com.droiddeck.launcher.session.SessionDisplay.resolveChoice(com.droiddeck.launcher.session.SessionDisplay.panelSize(this), + resolutionChoice(), SessionPrefs.portrait(this) && !controlsBelowWanted()) + + private fun resolutionChoice(): String { val mode = displayMode() - val panel = com.droiddeck.launcher.session.SessionDisplay.panelSize(this) val program = intent.getStringExtra(SessionService.EXTRA_PROGRAM) - val choice = if (intent.getStringExtra(SessionService.EXTRA_MODE) == SessionService.MODE_RUN && + return if (intent.getStringExtra(SessionService.EXTRA_MODE) == SessionService.MODE_RUN && Library.drawsAtPanel(program) && !SessionPrefs.resolutionChosen(this, mode)) com.droiddeck.launcher.session.SessionDisplay.MATCH_SCREEN - else SessionPrefs.resolutionChoice(this, mode, panel) - return com.droiddeck.launcher.session.SessionDisplay.resolveChoice(panel, choice, - SessionPrefs.portrait(this) && !controlsBelowWanted()) + else SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this)) } - private fun refreshHz(): Float { + private fun refreshHz(): Float = refreshHz(null) + + private fun refreshHz(holder: SurfaceHolder?): Float { + bottomGame?.takeIf { if (holder != null) holder === it.holder else bottomOutputActive } + ?.hz?.takeIf { it > 1f }?.let { return minOf(it, PerfMode.peakRefreshCap(this)) } glassesScreen?.hz?.takeIf { it > 1f }?.let { return it } val display = if (Build.VERSION.SDK_INT >= 30) display else windowManager.defaultDisplay val wanted = window.attributes.preferredDisplayModeId @@ -2595,6 +2630,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return true } if ((pcKeyboardOpen || achievementsOpen) && fromController) return super.dispatchKeyEvent(event) + if (!fromController && event.keyCode != KeyEvent.KEYCODE_BACK && sendToTopDesktop(event)) return true if (joyConVr?.onKeyEvent(event) == true) return true if (fromController && event.keyCode != KeyEvent.KEYCODE_BACK && padMouseMode() && padMouse.onKey(event)) return true if (event.keyCode != KeyEvent.KEYCODE_BACK && padBridge?.onKeyEvent(event) == true) return true @@ -2606,6 +2642,24 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return super.dispatchKeyEvent(event) } + private fun sendToTopDesktop(event: KeyEvent): Boolean { + val key = event.deviceId to event.keyCode + val owned = if (event.action == KeyEvent.ACTION_UP) topDesktopKeys.remove(key) else topDesktopFocused() + if (!owned || !super.dispatchKeyEvent(event)) return false + if (event.action == KeyEvent.ACTION_DOWN) topDesktopKeys += key + return true + } + + private fun topDesktopFocused(): Boolean { + if (!bottomOutputActive) return false + var view: View? = currentFocus + while (view != null) { + if (view is com.droiddeck.launcher.ui.BottomDesktopPanel) return true + view = view.parent as? View + } + return false + } + override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean { if (pipUi) return true notePress(event) @@ -2745,16 +2799,15 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun focusDrawer(): Boolean = dockedMenu()?.focusMenu() ?: sessionOverlay.requestFocus() private fun dockDrawer(): Boolean { - if (pipUi || !started || glassesScreen != null || !::displayManager.isInitialized) return false - if (!SessionPrefs.dualScreenLauncher(this)) return false - val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return false + if (pipUi || !started || glassesScreen != null || bottomGame != null || !::displayManager.isInitialized) return false + val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return false if (secondScreenDisplays.none { it.id == target.displayId }) return false val shown = secondScreenPresentation?.display?.displayId return shown == null || shown == target.displayId } private fun openDockedMenu(): Boolean { - val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return false + val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return false return try { val presentation = secondScreenPresentation ?: secondScreenPresentation(target).also { selectedSecondScreenDisplay = target.displayId @@ -2861,7 +2914,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val rect = drawnRect() ?: return val cx = x.coerceIn(rect.left, rect.right) val cy = y.coerceIn(rect.top, rect.bottom) - WaylandCompositor.nativeSendPointer(1, InputSpace.x(cx, surfaceView.width), InputSpace.y(cy, surfaceView.height)) + WaylandCompositor.nativeSendPointer(1, InputSpace.x(cx, outputView().width), InputSpace.y(cy, outputView().height)) cursorVisible = false } override fun onButton(button: Int, pressed: Boolean) { @@ -2889,7 +2942,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { scrollRestY = 0f val rect = drawnRect() ?: return val x = rect.left + rect.width() * PAD_SCROLL_POINTER_X - WaylandCompositor.nativeSendPointer(1, InputSpace.x(x, surfaceView.width), InputSpace.y(rect.centerY(), surfaceView.height)) + WaylandCompositor.nativeSendPointer(1, InputSpace.x(x, outputView().width), InputSpace.y(rect.centerY(), outputView().height)) cursorVisible = false } override fun onScroll(dx: Float, dy: Float) = scrollListener.onScroll(dx, dy) @@ -2937,10 +2990,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun placeTouchpadAtGuest(rect: android.graphics.RectF) { - if (pointerLocked || !CompositorHost.isStarted || surfaceView.width <= 0 || surfaceView.height <= 0) return + if (pointerLocked || !CompositorHost.isStarted || outputView().width <= 0 || outputView().height <= 0) return if (!WaylandCompositor.nativeCursorInputPos(cursorPosBuf)) return - val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * surfaceView.width - val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * surfaceView.height + val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * outputView().width + val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * outputView().height if (rect.contains(x, y)) touchpad.place(x, y) } @@ -2956,7 +3009,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val rect = drawnRect() ?: return val cx = x.coerceIn(rect.left, rect.right) val cy = y.coerceIn(rect.top, rect.bottom) - WaylandCompositor.nativeSendPointer(1, InputSpace.x(cx, surfaceView.width), InputSpace.y(cy, surfaceView.height)) + WaylandCompositor.nativeSendPointer(1, InputSpace.x(cx, outputView().width), InputSpace.y(cy, outputView().height)) showCursor(cx, cy) } @@ -3021,6 +3074,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { .filter { glassesScreen == null || it.id != glasses.displayId } val oldIds = secondScreenDisplays.map { it.id }.toSet() secondScreenDisplays = candidates + bottomSwapAvailable = bottomGame != null || bottomGameDisplay() != null val newIds = candidates.map { it.id }.toSet() if (secondScreenMode != SecondScreenMode.NONE && oldIds.isNotEmpty() && selectedSecondScreenDisplay !in newIds) { closeSecondScreen(reset = true) @@ -3039,7 +3093,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun openDualScreenControls() { if (SessionState.secondScreenAutoOpened || secondScreenMode != SecondScreenMode.NONE || pipUi) return if (!SessionPrefs.dualScreenSessionControls(this)) return - val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return + val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return if (secondScreenDisplays.none { it.id == target.displayId }) return SessionState.secondScreenAutoOpened = true selectedSecondScreenDisplay = target.displayId @@ -3087,6 +3141,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { closeSecondScreen(reset = false) return } + if (com.droiddeck.launcher.input.DualScreen.taken(target.displayId) || bottomGame?.display?.displayId == target.displayId) { + if (secondScreenPresentation != null) closeSecondScreen(reset = false) + secondScreenMode = mode + SessionState.secondScreenMode = mode + return + } var presentation = secondScreenPresentation if (presentation?.display?.displayId != target.displayId) { dropDockedDrawer() @@ -3123,6 +3183,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { menu = { DroidDeckTheme { SessionMenu(docked = true) } }, + onSwap = if (com.droiddeck.launcher.input.DualScreen.builtIn(target)) ({ putGameOnBottom(true) }) else null, dashboard = if (bottomPages().isEmpty()) null else ({ DroidDeckTheme { BottomDashboard( @@ -3131,6 +3192,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onPage = { com.droiddeck.launcher.ui.SessionBottomTab.pick(SessionState.sessionId, it) }, onClose = { selectSecondScreenMode(SecondScreenMode.NONE) }, onMenu = if (dockDrawer()) ({ drawerOpen = true }) else null, + onSwap = if (bottomSwapAvailable && com.droiddeck.launcher.input.DualScreen.builtIn(target)) ({ putGameOnBottom(true) }) else null, strip = { pageId -> com.droiddeck.launcher.ui.SessionBottomStrip(pageId) { if (::hud.isInitialized) hud.liveFps else null } }, @@ -3147,7 +3209,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { )) private fun openSettingsBelow(intent: android.content.Intent, done: () -> Boolean) { - val presentation = secondScreenPresentation ?: return + val presentation = secondScreenPresentation + if (presentation == null) { + if (!bottomOutputActive) return + listOf(intent, android.content.Intent(android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)).any { + runCatching { startActivity(android.content.Intent(it)) } + .onFailure { e -> Log.w(TAG, "could not open ${it.action}", e) } + .isSuccess + } + return + } val options = android.app.ActivityOptions.makeBasic().setLaunchDisplayId(presentation.display.displayId) val opened = listOf(intent, android.content.Intent(android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)).any { runCatching { startActivity(android.content.Intent(it).addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK), options.toBundle()) } @@ -3178,7 +3249,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun captureScreenshot(onDone: (Boolean) -> Unit) { - val source = if (glassesOutputActive) glassesScreen?.surfaceView else if (::surfaceView.isInitialized) surfaceView else null + val source = if (glassesOutputActive) glassesScreen?.surfaceView else if (bottomOutputActive) bottomGame?.surfaceView + else if (::surfaceView.isInitialized) surfaceView else null val width = source?.width ?: 0 val height = source?.height ?: 0 if (source == null || width <= 0 || height <= 0 || source.holder.surface?.isValid != true) { @@ -3242,7 +3314,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun controlsBelowWanted(): Boolean { - if (!::sessionRoot.isInitialized || glassesScreen != null || cardboard.enabled) return false + if (!::sessionRoot.isInitialized || glassesScreen != null || bottomGame != null || cardboard.enabled) return false return SessionPrefs.controlsBelowWanted(this, SessionState.mode, sessionRoot.width, sessionRoot.height, pipUi || isInPictureInPictureMode) } @@ -3288,14 +3360,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val rect = drawnRect() ?: return val px = rect.left + nx * rect.width() val py = rect.top + ny * rect.height() - WaylandCompositor.nativeSendPointer(1, InputSpace.x(px, surfaceView.width), InputSpace.y(py, surfaceView.height)) + WaylandCompositor.nativeSendPointer(1, InputSpace.x(px, outputView().width), InputSpace.y(py, outputView().height)) showCursor(px, py) } private fun openBottomKeyboard() { if (!started) return if (secondScreenPresentation?.showsKeyboard != true && dockDrawer()) { - val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return + val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return if (drawerOpen) drawerOpen = false typingReturnMode = secondScreenMode selectedSecondScreenDisplay = target.displayId @@ -3453,8 +3525,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun drawnRect(): android.graphics.RectF? { - val width = surfaceView.width.takeIf { it > 0 } ?: return null - val height = surfaceView.height.takeIf { it > 0 } ?: return null + val width = outputView().width.takeIf { it > 0 } ?: return null + val height = outputView().height.takeIf { it > 0 } ?: return null topPictureMapped = CompositorHost.isStarted && WaylandCompositor.nativeGamePictureRect(gamePictureBounds) if (topPictureMapped) return android.graphics.RectF( gamePictureBounds[0], gamePictureBounds[1], gamePictureBounds[2], gamePictureBounds[3]) @@ -3550,7 +3622,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val cx = x.coerceIn(rect.left, rect.right) val cy = y.coerceIn(rect.top, rect.bottom) WaylandCompositor.nativeSendTouch(action, pointerId, - InputSpace.x(cx, surfaceView.width), InputSpace.y(cy, surfaceView.height)) + InputSpace.x(cx, outputView().width), InputSpace.y(cy, outputView().height)) showCursor(cx, cy) } @@ -3614,7 +3686,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun updatePointerCapture() { if (!::surfaceView.isInitialized) return val view = window.decorView - val want = pointerLocked && resumed && hasWindowFocus() && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !pipUi && mouseAttached() + val want = pointerLocked && resumed && hasWindowFocus() && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !pipUi && !bottomOutputActive && mouseAttached() if (want == view.hasPointerCapture()) return if (want) view.requestPointerCapture() else view.releasePointerCapture() } @@ -3622,7 +3694,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var platformPointerShown: Boolean? = null private fun appUiOwnsPointer(): Boolean = - drawerOpen || pcKeyboardOpen || achievementsOpen || pipUi || glassesOutputActive + drawerOpen || pcKeyboardOpen || achievementsOpen || pipUi || glassesOutputActive || bottomOutputActive private fun applyPlatformPointer(shown: Boolean) { if (!::sessionRoot.isInitialized || !::surfaceView.isInitialized) return @@ -3845,7 +3917,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun capturePausedFrame(manual: Boolean = false) { - if (!SessionState.running || pipUi || isInPictureInPictureMode || glassesOutputActive) return + if (!SessionState.running || pipUi || isInPictureInPictureMode || glassesOutputActive || bottomOutputActive) return if (SessionState.suspended && pausedFrame != null) return if ((suspendPolicy == SessionPrefs.SUSPEND_NEVER && !manual && !SessionState.manualPause) || !::surfaceView.isInitialized) return if (surfaceView.holder.surface?.isValid != true) return @@ -3960,6 +4032,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (!inPip && surfaceW > 0) resizeOutputForWindow(surfaceW, surfaceH) applyUnfoldedControls() updateGlassesScreen() + updateBottomGame() } override fun startActivityForResult(intent: Intent, requestCode: Int, options: Bundle?) { @@ -3977,6 +4050,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (::hud.isInitialized) hud.setBackgrounded(false) refreshActivityDisplayId() displayManager.registerDisplayListener(displayListener, Handler(Looper.getMainLooper())) + com.droiddeck.launcher.input.DualScreen.watchTaken(bottomScreenListener) for (name in arrayOf("peak_refresh_rate", "min_refresh_rate")) { contentResolver.registerContentObserver(android.provider.Settings.System.getUriFor(name), false, refreshSettingObserver) } @@ -3988,6 +4062,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionService.setActivityVisible(this, true, sessionActivityDisplayId) Glasses.rescan() updateGlassesScreen() + updateBottomGame() updateHandCamera() } @@ -3997,10 +4072,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (::hud.isInitialized) hud.setBackgrounded(true) updateHandCamera() displayManager.unregisterDisplayListener(displayListener) + com.droiddeck.launcher.input.DualScreen.unwatchTaken(bottomScreenListener) contentResolver.unregisterContentObserver(refreshSettingObserver) closeSecondScreen(reset = false) startedScreens = (startedScreens - 1).coerceAtLeast(0) updateGlassesScreen() + updateBottomGame() if (startedScreens == 0) SessionService.setActivityVisible(this, false, sessionActivityDisplayId) super.onStop() } @@ -4310,15 +4387,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { glassesScreen?.trackingRecovery?.update(trackingRecovery, glasses.sbs) } - private fun outputHolder(): SurfaceHolder = glassesScreen?.holder ?: surfaceView.holder + private fun outputHolder(): SurfaceHolder = glassesScreen?.holder ?: bottomGame?.holder ?: surfaceView.holder + + private fun outputView(): SurfaceView = bottomGame?.takeIf { bottomOutputActive }?.surfaceView ?: surfaceView private fun onOutputAttached(holder: SurfaceHolder) { if (holder !== outputHolder()) return glassesOutputActive = glassesScreen?.holder === holder - if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(glassesOutputActive) - surfaceView.visibility = if (glassesOutputActive) View.INVISIBLE else View.VISIBLE + bottomOutputActive = bottomGame?.holder === holder + if (bottomOutputActive) bottomRecoveries = 0 + if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(glassesOutputActive || bottomOutputActive) + surfaceView.visibility = if (glassesOutputActive || bottomOutputActive) View.INVISIBLE else View.VISIBLE Log.i(TAG, "compositor output attached: " + - if (glassesOutputActive) "glasses display ${glassesScreen?.display?.displayId}" else "phone") + if (glassesOutputActive) "glasses display ${glassesScreen?.display?.displayId}" + else if (bottomOutputActive) "bottom screen display ${bottomGame?.display?.displayId}" else "phone") if (pausedFrameWanted) uiHandler.postDelayed({ if (pausedFrameWanted && pausedFrame == null && resumed) capturePausedFrame() }, PAUSED_FRAME_REDRAW_MS) @@ -4336,6 +4418,140 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (surfaceView.holder.surface?.isValid == true) surfaceCreated(surfaceView.holder) } + private fun bottomGameDisplay(): Display? { + if (!::displayManager.isInitialized) return null + return com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) + ?.takeIf { it.isValid && com.droiddeck.launcher.input.DualScreen.builtIn(it) } + } + + private fun putGameOnBottom(on: Boolean) { + if (on && bottomGame == null && bottomGameDisplay() == null) { + android.widget.Toast.makeText(this, R.string.swap_screens_unavailable, android.widget.Toast.LENGTH_SHORT).show() + return + } + SessionState.gameOnBottom = on + gameOnBottom = on + Log.i(TAG, "game screen: " + if (on) "bottom" else "top") + updateBottomGame() + } + + private fun updateBottomGame() { + if (!::surfaceView.isInitialized) return + val target = bottomGameDisplay() + val want = com.droiddeck.launcher.ui.GameScreenSwap.wanted( + requested = gameOnBottom, + activityStarted = started && !runtimeRemovalBlocked, + sessionEnded = ended, + inPip = pipUi || isInPictureInPictureMode, + glassesOutput = glassesScreen != null, + bottomScreenFree = target != null, + ) + val shown = if (want) target else null + val current = bottomGame + if (current != null && current.display.displayId == shown?.displayId) return + if (current != null || shown != null) cancelOutputTouches() + if (current != null) { + restoreTopOutput(current) + runCatching { current.dismiss() } + } + if (shown != null) { + closeSecondScreen(reset = false) + val screen = com.droiddeck.launcher.ui.BottomGameScreen(this, shown, this, ::onBottomGameTouch) + bottomGame = screen + surfaceW = 0 + surfaceH = 0 + screen.setOnDismissListener { + if (bottomGame === screen) { + restoreTopOutput(screen) + refreshSecondScreenDisplays() + } + } + try { + screen.show() + } catch (e: Exception) { + restoreTopOutput(screen) + runCatching { screen.dismiss() } + Log.w(TAG, "could not show the game on ${shown.name}", e) + } + if (bottomGame === screen) Log.i(TAG, "requested game output on the bottom screen (display ${shown.displayId})") + } + refreshSecondScreenDisplays() + } + + private fun cancelOutputTouches() { + cancelTouchGestures() + if (::directTouchHold.isInitialized) directTouchHold.cancel() + if (::twoFingerGestures.isInitialized) twoFingerGestures.cancel() + if (CompositorHost.isStarted && deliversTouches(routedTouchMode)) WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + } + + private fun recoverBottomOutput(screen: com.droiddeck.launcher.ui.BottomGameScreen) { + if (bottomGame !== screen || bottomOutputActive || !started || screen.holder.surface?.isValid == true) return + Log.i(TAG, "bottom screen surface gone - game back on the top screen") + restoreTopOutput(screen) + runCatching { screen.dismiss() } + refreshSecondScreenDisplays() + if (++bottomRecoveries <= BOTTOM_RECOVERY_TRIES) uiHandler.postDelayed({ updateBottomGame() }, BOTTOM_RECOVERY_MS) + } + + private fun restoreTopOutput(screen: com.droiddeck.launcher.ui.BottomGameScreen) { + if (bottomGame !== screen) return + bottomGame = null + bottomOutputActive = false + surfaceW = 0 + surfaceH = 0 + CompositorHost.detach(screen.holder.surface) + if (glassesScreen != null) return + surfaceView.visibility = View.VISIBLE + applyOutputPacing() + if (surfaceView.holder.surface?.isValid == true) surfaceCreated(surfaceView.holder) + } + + private fun onBottomGameTouch(event: MotionEvent): Boolean { + if (pipUi) return true + if (!event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) return false + notePress(event) + if (event.actionMasked == MotionEvent.ACTION_DOWN) { + drawerControllerActive = false + gestureTouchStreamGate.reset() + } + if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.SURFACE, event)) return false + return onTouchEvent(event) + } + + @androidx.compose.runtime.Composable + private fun SwappedTopPanel() { + val pages = bottomPages() + val swapBack = { putGameOnBottom(false) } + androidx.compose.foundation.layout.Box( + Modifier.fillMaxSize().background(androidx.compose.material3.MaterialTheme.colorScheme.background) + .pointerInput(Unit) { awaitPointerEventScope { while (true) awaitPointerEvent() } }, + ) { + if (secondScreenMode == SecondScreenMode.DESKTOP && com.droiddeck.launcher.session.BottomDesktop.available()) { + androidx.compose.ui.viewinterop.AndroidView( + factory = { context -> + com.droiddeck.launcher.ui.BottomDesktopPanel(context, null, { drawerOpen = true }, + (({ tapSteamButton() }) to ({ tapQam() })).takeIf { SessionState.mode == SessionService.MODE_STEAM }, swapBack, + fullResolution = true) + }, + modifier = Modifier.fillMaxSize(), + ) + } else if (pages.isNotEmpty()) BottomDashboard( + pages, com.droiddeck.launcher.ui.SessionBottomTab.picked(SessionState.sessionId), + gameStarts = gameStarts, + onPage = { com.droiddeck.launcher.ui.SessionBottomTab.pick(SessionState.sessionId, it) }, + onClose = null, + onMenu = { drawerOpen = true }, + onSwap = swapBack, + strip = { pageId -> + com.droiddeck.launcher.ui.SessionBottomStrip(pageId) { if (::hud.isInitialized) hud.liveFps else null } + }, + ) else androidx.compose.material3.Button(onClick = swapBack, modifier = Modifier.align(androidx.compose.ui.Alignment.Center)) { + androidx.compose.material3.Text(getString(R.string.swap_screens)) + } + } + } + private fun glassesOutputSize(): Pair? { if (glassesScreen == null || glasses.width <= 0 || glasses.height <= 0) return null val panel = (if (glasses.sbs) glasses.width / 2 else glasses.width) to glasses.height @@ -4393,6 +4609,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { runCatching { current.dismiss() } } if (target != null) { + bottomGame?.let { restoreTopOutput(it); runCatching { it.dismiss() } } val screen = GlassesScreen(this, target, Glasses.outputHz(), this, Glasses.outputResolution()) glassesScreen = screen applyOutputPacing() @@ -4418,6 +4635,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { applyOutputPacing() refreshSecondScreenDisplays() applyCardboard(cardboard) + if (target == null) updateBottomGame() } private fun onGlassesSteamVr(now: SteamVr.Status) { @@ -4529,6 +4747,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { closeSecondScreen(reset = false) glassesScope.cancel() glassesScreen?.let { screen -> glassesScreen = null; runCatching { screen.dismiss() } } + bottomGame?.let { screen -> bottomGame = null; runCatching { screen.dismiss() } } headTracker?.stop() if (::hud.isInitialized) hud.stop() if (::memoryHud.isInitialized) memoryHud.stop() @@ -4614,6 +4833,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private const val PAUSED_FRAME_REDRAW_MS = 150L private const val SETTINGS_WATCH_MS = 1_000L private const val SETTINGS_WATCH_CHECKS = 600 + private const val BOTTOM_RECOVERY_MS = 1_000L + private const val BOTTOM_RECOVERY_TRIES = 3 private const val TAG = "SessionActivity" private var startedScreens = 0 @Volatile private var activeInstallWorker: Any? = null diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt index 47dba39454..d1e8a977d8 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt @@ -199,11 +199,15 @@ class DroidDeckHudHost(context: Context) { metrics.snapshot() Thread.sleep(500) val mango = metrics.snapshot() + fun shown(value: Any?, unit: String) = if (value == null) "none" else "$value$unit" + val readers = com.droiddeck.launcher.session.GpuStatsComponent.readerStatus() file.writeText(metrics.also { it.setMangoReadings(null) }.buildDiagnosticsReport(context) + "\n== As the HUD shows them (MangoHud's sources) ==\n" + - "CPU ${mango.cpuPercent}% ${mango.cpuTempC}°C, GPU ${mango.gpuPercent}% ${mango.gpuClockMhz}MHz ${mango.gpuTempC}°C, " + + "CPU ${shown(mango.cpuPercent, "%")} ${shown(mango.cpuTempC, "°C")}, GPU ${shown(mango.gpuPercent, "%")} " + + "${shown(mango.gpuClockMhz, "MHz")} ${shown(mango.gpuTempC, "°C")}, " + "RAM ${mango.ramUsedText()}/${mango.ramTotalText()}, VRAM ${mango.vramText()}, battery ${mango.battery.percent}% " + "${mango.battery.watts}W charging=${mango.battery.charging}\n" + "GPU feeds: ${com.droiddeck.launcher.session.GpuStatsComponent.sources.ifEmpty { "none (no session, or kgsl absent)" }}\n" + + (if (readers.isNotEmpty()) "GPU readers without root: $readers\n" else "") + "CPU temperature zones: ${LinuxRuntime.cpuTempZones().joinToString { it.name }}\n" + "Frames: ${if (feed.engine.isNotEmpty() || feed.pid > 0) "gamescope (pid ${feed.pid}, ${feed.engine})" else "compositor"}, " + "fps ${feed.stats.fps}\n") diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt index 1ab46aa87b..e78249a1c1 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt @@ -125,6 +125,7 @@ class DroidDeckHudView(context: Context) : View(context) { private var accent = 0xFF1A9FFF.toInt() private var surfaceRgb = 0x121417 private var headerMark: RectF? = null + private var headerWordmark: RectF? = null private var chipRect: RectF? = null var dock = DroidDeckHudDock.NONE @@ -167,12 +168,9 @@ class DroidDeckHudView(context: Context) : View(context) { color = colGraph } private val headerPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL } - private val wordmarkPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { - typeface = Typeface.create(Typeface.SANS_SERIF, Typeface.BOLD) - } - private class Glyph(val x: Float, val baseline: Float, val text: String, val color: Int, val sizePx: Float, val sans: Boolean = false, val glow: Boolean = false) { - fun moved(dx: Float, dy: Float) = Glyph(x + dx, baseline + dy, text, color, sizePx, sans, glow) + private class Glyph(val x: Float, val baseline: Float, val text: String, val color: Int, val sizePx: Float, val glow: Boolean = false) { + fun moved(dx: Float, dy: Float) = Glyph(x + dx, baseline + dy, text, color, sizePx, glow) } private class Span(val text: String, val color: Int, val sizePx: Float, val glow: Boolean = false) private class HudRow(val label: Span, val vals: List, val inline: Boolean = false) @@ -523,7 +521,7 @@ class DroidDeckHudView(context: Context) : View(context) { private fun rebuild() { glyphs.clear(); tileRects.clear(); graphRect = null - headerMark = null; chipRect = null; dPanel = null; dDividerTop = -1f; tabRect = null; stripRect = null + headerMark = null; headerWordmark = null; chipRect = null; dPanel = null; dDividerTop = -1f; tabRect = null; stripRect = null val s = snap if (s == null) { contentW = 0f; contentH = 0f; return } if (dock != DroidDeckHudDock.NONE) { buildDockTab(); return } @@ -576,24 +574,18 @@ class DroidDeckHudView(context: Context) : View(context) { private fun footerClock(): Boolean = showClockTime && size == DroidDeckHudSize.PILL - private fun measureSans(text: String, sizePx: Float): Float { wordmarkPaint.textSize = sizePx; return wordmarkPaint.measureText(text) } - private fun panelInset() = sp(8f) private fun panelLeft() = sp(13f) private fun contentLeft() = panelLeft() + sp(16f) private fun addPanelHeader(left: Float, inner: Float): Pair { - val wordPx = sp(10f); val clockPx = sp(9.5f); val gapH = sp(7f) - wordmarkPaint.textSize = wordPx - val markH = wordmarkPaint.fontMetrics.let { it.descent - it.ascent } * 0.95f + val clockPx = sp(9.5f); val gapH = sp(7f) + val wordH = sp(12f) val markTop = inner + gapH - val markLeft = left - DroidDeckMark.inkLeftFor(markH) - headerMark = RectF(markLeft, markTop, markLeft + DroidDeckMark.widthFor(markH), markTop + markH) - val midY = markTop + markH / 2f - var x = markLeft + DroidDeckMark.inkRightFor(markH) + sp(6f) - wordmarkPaint.getTextBounds("DroidDeck", 0, 9, inkRect) - glyphs.add(Glyph(x, midY - inkRect.exactCenterY(), "DroidDeck", blend(colValue), wordPx, sans = true)) - x += measureSans("DroidDeck", wordPx) + val wordW = WordmarkArt.widthFor(wordH) + headerWordmark = RectF(left, markTop, left + wordW, markTop + wordH) + val midY = markTop + wordH / 2f + var x = left + wordW if (showClockTime) { measurePaint.textSize = clockPx measurePaint.getTextBounds("0", 0, 1, inkRect) @@ -605,7 +597,7 @@ class DroidDeckHudView(context: Context) : View(context) { glyphs.add(Glyph(x, base, t, blend(colDim), clockPx)) x += measure(t, clockPx) } - dDividerTop = markTop + markH + gapH + dDividerTop = markTop + wordH + gapH return Pair(dDividerTop + max(1f, density), x) } @@ -647,7 +639,7 @@ class DroidDeckHudView(context: Context) : View(context) { } var right = panel.right for (g in glyphs) { - val paint = if (g.sans) wordmarkPaint else measurePaint + val paint = measurePaint paint.textSize = g.sizePx paint.getTextBounds(g.text, 0, g.text.length, inkRect) if (inkRect.isEmpty) continue @@ -1323,7 +1315,7 @@ class DroidDeckHudView(context: Context) : View(context) { stripRect?.let { drawStrip(canvas, it) } for (g in glyphs) { - val paint = if (g.sans) wordmarkPaint else drawPaint + val paint = drawPaint paint.textSize = g.sizePx paint.color = g.color if (g.glow) paint.setShadowLayer(sp(6f), 0f, 0f, withAlpha(colGraph, 217)) @@ -1331,6 +1323,7 @@ class DroidDeckHudView(context: Context) : View(context) { if (g.glow) paint.clearShadowLayer() } headerMark?.let { DroidDeckMark.draw(canvas, it.left, it.top, it.height(), blend(colValue), accent) } + headerWordmark?.let { WordmarkArt.draw(canvas, it.left, it.top, it.height(), blend(colValue), accent) } graphRect?.let { drawGraph(canvas, it) } @@ -1420,10 +1413,6 @@ class DroidDeckHudView(context: Context) : View(context) { headerPaint.color = withAlpha(accent, 90) c.drawRect(panel.left, dDividerTop, roundEdgeX(panel, dDividerTop, stroke), dividerBottom, headerPaint) } - val halfRound = dRadius >= panel.height() / 2f - 0.5f - val wmH = if (halfRound) panel.height() * 0.92f else min(panel.height(), panel.width()) * 0.55f - DroidDeckMark.draw(c, panel.right - DroidDeckMark.widthFor(wmH) - (if (halfRound) panel.height() * 0.02f else sp(10f)), - panel.centerY() - wmH / 2f, wmH, Color.argb(20, 255, 255, 255), withAlpha(accent, 20)) c.restore() if (stroke > 0f) { val h = stroke / 2f @@ -1487,10 +1476,10 @@ class DroidDeckHudView(context: Context) : View(context) { internal val isDragging: Boolean get() = lockController.isDragging() || tabDragging private companion object { - const val TAB_NUM_SP = 10f - const val TAB_LABEL_SP = 6f - const val TAB_PAD_X_SP = 5f - const val TAB_PAD_Y_SP = 4f + const val TAB_NUM_SP = 15f + const val TAB_LABEL_SP = 7.25f + const val TAB_PAD_X_SP = 7f + const val TAB_PAD_Y_SP = 5.5f const val REFRESH_MS = 500L private const val HUE_IDLE_MS = 500L const val MIN_SCALE = 0.5f diff --git a/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java b/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java index 759e013512..51a4e42608 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java +++ b/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java @@ -870,6 +870,9 @@ public class HudMetrics { private long[] lastCoreTotal = null; private long[] lastCoreIdle = null; + private static final int PER_CORE_STAT = 1, PER_CORE_ESTIMATE = 2; + /** Sources of the last per-core reading: PER_CORE_STAT and/or PER_CORE_ESTIMATE (clock speed); 0 when no core was read. */ + private volatile int perCoreSources = 0; public int[] readPerCorePercent() { int cores = Runtime.getRuntime().availableProcessors(); @@ -909,13 +912,20 @@ public class HudMetrics { } } } catch (Exception ignored) {} + int sources = 0; for (int i = 0; i < out.length; i++) { - if (out[i] >= 0) continue; + if (out[i] >= 0) { + sources |= PER_CORE_STAT; + continue; + } Long cur = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/scaling_cur_freq"); Long max = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/cpuinfo_max_freq"); - if (cur != null && max != null && max > 0L) + if (cur != null && max != null && max > 0L) { out[i] = clampPercent((int) ((Math.max(0L, Math.min(cur, max)) * 100L) / max)); + sources |= PER_CORE_ESTIMATE; + } } + perCoreSources = sources; return out; } @@ -1008,10 +1018,13 @@ public class HudMetrics { int v = s.perCorePercent[i]; cores.append('c').append(i).append('=').append(v < 0 ? "?" : (v + "%")); } - if (s.perCorePercent.length > 0) - metricHit(sb, "Per-core %", cores.toString(), "/proc/stat (per-cpu lines)"); + int coreSources = perCoreSources; + if (s.perCorePercent.length > 0 && coreSources != 0) + metricHit(sb, "Per-core %", cores.toString(), coreSources == PER_CORE_STAT ? "/proc/stat (per-cpu lines)" + : coreSources == PER_CORE_ESTIMATE ? "scaling_cur_freq / cpuinfo_max_freq (clock estimate)" + : "/proc/stat (per-cpu lines); scaling_cur_freq / cpuinfo_max_freq (clock estimate) for the other cores"); else - metricMiss(sb, "Per-core %", "/proc/stat"); + metricMiss(sb, "Per-core %", "/proc/stat", "/sys/devices/system/cpu/cpu*/cpufreq/scaling_cur_freq"); StringBuilder coreClk = new StringBuilder(); for (int i = 0; i < s.perCoreClockMhz.length; i++) { diff --git a/app/src/main/java/com/droiddeck/launcher/hud/WordmarkArt.kt b/app/src/main/java/com/droiddeck/launcher/hud/WordmarkArt.kt new file mode 100644 index 0000000000..d19c7d6e51 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/WordmarkArt.kt @@ -0,0 +1,54 @@ +package com.droiddeck.launcher.hud + +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.Path +import androidx.compose.ui.graphics.asAndroidPath +import androidx.compose.ui.graphics.vector.PathParser + +internal object WordmarkArt { + const val BOX_X = 239.135f + const val BOX_Y = 120.02f + const val BOX_W = 1040.7f - 239.135f + const val BOX_H = 243.2f - 120.02f + const val MARK_SCALE = 0.527445f + + const val LEFT_HALF = "M-31.98 0H56.055V40.489A71.81 71.81 0 0 0 56.055 183.231V223.72H-31.98Z" + const val RIGHT_HALF = "M71.885 0.28A111.86 111.86 0 0 1 71.885 223.44V183.234A71.81 71.81 0 0 0 71.885 40.486Z" + const val LETTERS = + "M361.45 241.36V160.13H387.02V241.36ZM387.02 196.73 376.32 188.38Q379.5 174.17 387.02 166.31Q394.54 158.46 407.91 158.46Q413.76 158.46 418.19 160.21Q422.62 161.97 425.96 165.65L410.75 184.87Q409.08 183.03 406.57 182.03Q404.07 181.02 400.89 181.02Q394.54 181.02 390.78 184.95Q387.02 188.88 387.02 196.73" + + "ZM467.91 243.2Q455.38 243.2 445.27 237.6Q435.15 232 429.3 222.31Q423.45 212.61 423.45 200.58Q423.45 188.54 429.3 179.02Q435.15 169.49 445.18 163.89Q455.21 158.29 467.91 158.29Q480.62 158.29 490.64 163.81Q500.67 169.32 506.52 178.93Q512.37 188.54 512.37 200.58Q512.37 212.61 506.52 222.31Q500.67 232 490.64 237.6Q480.62 243.2 467.91 243.2" + + "ZM467.91 219.97Q473.43 219.97 477.61 217.54Q481.79 215.12 484.04 210.69Q486.3 206.26 486.3 200.58Q486.3 194.9 483.96 190.63Q481.62 186.37 477.52 183.95Q473.43 181.52 467.91 181.52Q462.56 181.52 458.39 183.95Q454.21 186.37 451.87 190.72Q449.53 195.06 449.53 200.75Q449.53 206.26 451.87 210.69Q454.21 215.12 458.39 217.54Q462.56 219.97 467.91 219.97" + + "ZM523.4 241.36V160.13H548.98V241.36ZM536.27 148.93Q530.26 148.93 526.33 144.84Q522.4 140.74 522.4 134.89Q522.4 128.88 526.33 124.86Q530.26 120.85 536.27 120.85Q542.29 120.85 546.13 124.86Q549.98 128.88 549.98 134.89Q549.98 140.74 546.13 144.84Q542.29 148.93 536.27 148.93ZM599.95 243.03Q588.42 243.03 579.48 237.52Q570.54 232 565.44 222.47Q560.34 212.95 560.34 200.75Q560.34 188.54 565.44 179.02Q570.54 169.49 579.48 163.97Q588.42 158.46 599.95 158.46Q608.31 158.46 615.08 161.63Q621.85 164.81 626.28 170.41Q630.71 176.01 631.21 183.2V217.46Q630.71 224.65 626.36 230.41Q622.02 236.18 615.16 239.61Q608.31 243.03 599.95 243.03" + + "ZM604.47 219.97Q609.98 219.97 613.99 217.54Q618 215.12 620.34 210.77Q622.68 206.43 622.68 200.75Q622.68 195.06 620.43 190.8Q618.17 186.54 614.08 184.03Q609.98 181.52 604.63 181.52Q599.28 181.52 595.19 184.03Q591.09 186.54 588.67 190.88Q586.25 195.23 586.25 200.75Q586.25 206.26 588.59 210.61Q590.93 214.95 595.11 217.46Q599.28 219.97 604.47 219.97" + + "ZM646.75 241.36H621.68V219.46L625.53 199.74L621.18 180.02V120.02H646.75ZM683.19 241.36V218.29H712.44Q723.13 218.29 731.16 214.03Q739.18 209.77 743.53 201.58Q747.87 193.39 747.87 182.19Q747.87 170.99 743.44 162.97Q739.01 154.95 731.07 150.6Q723.13 146.26 712.44 146.26H682.35V123.36H712.77Q726.14 123.36 737.42 127.62Q748.71 131.88 757.15 139.82Q765.59 147.76 770.18 158.54Q774.78 169.32 774.78 182.36Q774.78 195.23 770.18 206.09Q765.59 216.96 757.23 224.81Q748.87 232.67 737.59 237.01Q726.31 241.36 713.11 241.36" + + "ZM665.47 241.36V123.36H691.71V241.36ZM827.6 243.2Q814.39 243.2 804.11 237.77Q793.83 232.33 787.98 222.64Q782.13 212.95 782.13 200.75Q782.13 188.54 787.9 178.93Q793.67 169.32 803.53 163.81Q813.39 158.29 825.76 158.29Q837.79 158.29 846.98 163.47Q856.18 168.65 861.44 177.85Q866.71 187.04 866.71 198.91Q866.71 201.08 866.46 203.5Q866.21 205.93 865.54 209.1L795.51 209.27V191.72L854.67 191.55L843.64 198.91Q843.47 191.89 841.47 187.29Q839.46 182.69 835.54 180.27Q831.61 177.85 825.92 177.85Q819.91 177.85 815.48 180.61Q811.05 183.36 808.63 188.38Q806.2 193.39 806.2 200.58Q806.2 207.77 808.79 212.86Q811.38 217.96 816.15 220.72Q820.91 223.48 827.43 223.48Q833.45 223.48 838.29 221.39Q843.14 219.3 846.82 215.12L860.86 229.16Q854.84 236.18 846.32 239.69Q837.79 243.2 827.6 243.2" + + "ZM916.68 243.2Q904.15 243.2 893.95 237.68Q883.75 232.17 877.9 222.47Q872.05 212.78 872.05 200.75Q872.05 188.54 877.99 178.93Q883.92 169.32 894.12 163.81Q904.31 158.29 917.02 158.29Q926.54 158.29 934.48 161.55Q942.42 164.81 948.6 171.33L932.22 187.71Q929.38 184.53 925.62 183.03Q921.86 181.52 917.02 181.52Q911.5 181.52 907.24 183.95Q902.98 186.37 900.55 190.63Q898.13 194.9 898.13 200.58Q898.13 206.26 900.55 210.61Q902.98 214.95 907.32 217.46Q911.67 219.97 917.02 219.97Q922.03 219.97 925.96 218.21Q929.88 216.46 932.73 213.28L948.94 229.66Q942.59 236.35 934.56 239.77Q926.54 243.2 916.68 243.2" + + "ZM1010.61 241.36 982.2 199.24 1010.45 160.13H1039.03L1004.93 204.09L1005.77 193.56L1040.7 241.36ZM958.63 241.36V120.02H984.21V241.36Z" + + private fun parse(d: String): Path = PathParser().parsePathString(d).toPath().asAndroidPath() + private val letters by lazy { parse(LETTERS) } + private val leftHalf by lazy { parse(LEFT_HALF) } + private val rightHalf by lazy { parse(RIGHT_HALF) } + private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL } + + fun widthFor(height: Float): Float = height * BOX_W / BOX_H + + fun draw(canvas: Canvas, left: Float, top: Float, height: Float, inkColor: Int, ballColor: Int) { + val k = height / BOX_H + canvas.save() + canvas.translate(left, top) + canvas.scale(k, k) + canvas.translate(-BOX_X, -BOX_Y) + paint.color = inkColor + canvas.drawPath(letters, paint) + canvas.translate(239.135f, 123.36f) + canvas.scale(MARK_SCALE, MARK_SCALE) + canvas.translate(31.98f, 0f) + canvas.drawPath(leftHalf, paint) + canvas.drawPath(rightHalf, paint) + paint.color = ballColor + canvas.drawCircle(63.98f, 111.86f, 55.98f, paint) + canvas.restore() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt b/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt new file mode 100644 index 0000000000..ae44dc0e6c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt @@ -0,0 +1,149 @@ +package com.droiddeck.launcher.input + +import android.accessibilityservice.AccessibilityService +import android.accessibilityservice.AccessibilityServiceInfo +import android.content.Intent +import android.content.pm.PackageManager +import android.graphics.Rect +import android.hardware.display.DisplayManager +import android.os.Build +import android.os.Handler +import android.os.HandlerThread +import android.util.Log +import android.view.Display +import android.view.accessibility.AccessibilityEvent +import android.view.accessibility.AccessibilityWindowInfo +import android.view.inputmethod.InputMethodManager +import java.util.concurrent.ConcurrentHashMap + +object BottomScreenGuests { + enum class Top { HOME, GUEST, NONE } + + internal const val MIN_COVER = 0.5f + + internal fun classify(pkg: String?, homes: Set): Top = when (pkg) { + null -> Top.NONE + in homes -> Top.HOME + else -> Top.GUEST + } + + internal fun holder(topPkg: String?, arrival: String?, homes: Set): String? = when { + topPkg != null -> topPkg.takeIf { classify(it, homes) == Top.GUEST } + arrival != null -> arrival.takeIf { classify(it, homes) == Top.GUEST } + else -> null + } + + internal fun ignorable(type: Int): Boolean = type == AccessibilityWindowInfo.TYPE_INPUT_METHOD || + type == AccessibilityWindowInfo.TYPE_ACCESSIBILITY_OVERLAY || + type == AccessibilityWindowInfo.TYPE_SPLIT_SCREEN_DIVIDER || + type == AccessibilityWindowInfo.TYPE_MAGNIFICATION_OVERLAY + + fun supported(model: String = Build.MODEL, sdk: Int = Build.VERSION.SDK_INT): Boolean = + sdk >= 33 && DualScreen.yieldsBottom(model) +} + +class BottomScreenWatch(private val service: AccessibilityService) { + private class Arrival(val pkg: String) + + private val thread = HandlerThread("bottom-screen").apply { start() } + private val handler = Handler(thread.looper) + private val own = service.packageName + private val arrivals = ConcurrentHashMap() + private var homes: Set = emptySet() + private var keyboards: Set = emptySet() + private var holders: Map = emptyMap() + private val check = Runnable { evaluate() } + + fun start() { + current = this + service.serviceInfo = service.serviceInfo?.apply { + eventTypes = eventTypes or AccessibilityEvent.TYPE_WINDOWS_CHANGED or AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED + flags = flags or AccessibilityServiceInfo.FLAG_RETRIEVE_INTERACTIVE_WINDOWS + } + handler.post { + homes = homePackages() + keyboards = keyboardPackages() + evaluate() + } + } + + fun onEvent(event: AccessibilityEvent) { + when (event.eventType) { + AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED -> { + val pkg = event.packageName?.toString() ?: return + if (event.displayId == Display.DEFAULT_DISPLAY || pkg == own || pkg == SYSTEM_UI) return + arrivals[event.displayId] = Arrival(pkg) + } + AccessibilityEvent.TYPE_WINDOWS_CHANGED -> Unit + else -> return + } + handler.removeCallbacks(check) + handler.postDelayed(check, 150) + } + + fun stop() { + handler.removeCallbacksAndMessages(null) + handler.post { + if (current === this) { + current = null + DualScreen.setTaken(emptySet()) + } + } + thread.quitSafely() + } + + private fun evaluate() { + val seen = HashMap(arrivals) + val all = runCatching { service.windowsOnAllDisplays }.getOrNull() ?: return + val displays = service.getSystemService(DisplayManager::class.java) ?: return + val taken = mutableMapOf() + for (i in 0 until all.size()) { + val id = all.keyAt(i) + if (id == Display.DEFAULT_DISPLAY) continue + val display = displays.getDisplay(id)?.takeIf(DualScreen::builtIn) ?: continue + val windows = all.valueAt(i) + val topPkg = windows.asSequence() + .filter { !BottomScreenGuests.ignorable(it.type) && cover(it, display) >= BottomScreenGuests.MIN_COVER } + .sortedByDescending { it.layer } + .firstNotNullOfOrNull { packageOf(it)?.takeUnless { pkg -> pkg == own } } + val arrival = seen[id] + if (topPkg != null && arrival != null) arrivals.remove(id, arrival) + BottomScreenGuests.holder(topPkg, arrival?.pkg?.takeUnless { it in keyboards }, homes)?.let { taken[id] = it } + } + if (current !== this) return + if (taken != holders) Log.i(TAG, "bottom screen holders: $taken") + holders = taken + DualScreen.setTaken(taken.keys) + } + + private fun cover(window: AccessibilityWindowInfo, display: Display): Float { + val bounds = Rect().also(window::getBoundsInScreen) + val area = display.mode.physicalWidth.toFloat() * display.mode.physicalHeight + return if (area <= 0f) 0f else bounds.width().toFloat() * bounds.height() / area + } + + private fun packageOf(window: AccessibilityWindowInfo): String? = + runCatching { window.getRoot(0)?.packageName?.toString() }.getOrNull() + + private fun homePackages(): Set { + val pm = service.packageManager + return listOf(Intent.CATEGORY_HOME, Intent.CATEGORY_SECONDARY_HOME).flatMap { category -> + runCatching { + pm.queryIntentActivities(Intent(Intent.ACTION_MAIN).addCategory(category), PackageManager.MATCH_ALL) + .filter { it.priority >= 0 } + .mapNotNull { it.activityInfo?.packageName } + }.getOrDefault(emptyList()) + }.toSet() + } + + private fun keyboardPackages(): Set = + runCatching { + service.getSystemService(InputMethodManager::class.java)?.inputMethodList.orEmpty().map { it.packageName }.toSet() + }.getOrDefault(emptySet()) + + private companion object { + @Volatile var current: BottomScreenWatch? = null + const val TAG = "BottomScreen" + const val SYSTEM_UI = "com.android.systemui" + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt b/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt index e8d7fd71e2..cfd37c95c5 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt @@ -18,6 +18,23 @@ object DualScreen { private const val TYPE_INTERNAL = 1 private val knownModels = setOf("retroid pocket duo", "ayn thor") private val touchedDisplays = mutableSetOf() + private val takenListeners = java.util.concurrent.CopyOnWriteArraySet<() -> Unit>() + @Volatile private var takenDisplays: Set = emptySet() + private val main by lazy { android.os.Handler(android.os.Looper.getMainLooper()) } + + fun yieldsBottom(model: String): Boolean = model.trim().lowercase().let { m -> knownModels.any(m::startsWith) } + + fun taken(displayId: Int): Boolean = displayId in takenDisplays + + fun setTaken(ids: Set) { + if (ids == takenDisplays) return + takenDisplays = ids + main.post { takenListeners.forEach { it() } } + } + + fun watchTaken(listener: () -> Unit) { takenListeners += listener } + + fun unwatchTaken(listener: () -> Unit) { takenListeners -= listener } fun builtInDisplay(displayManager: DisplayManager, primaryDisplayId: Int): Display? { val primary = displayManager.getDisplay(primaryDisplayId) @@ -61,20 +78,25 @@ object DualScreen { (x.max - x.min + 1f).roundToInt() to (y.max - y.min + 1f).roundToInt() } - fun display(context: Context, displayManager: DisplayManager, primaryDisplayId: Int): Display? = - when (SessionPrefs.dualScreenMode(context)) { + fun sessionDisplay(context: Context, displayManager: DisplayManager, primaryDisplayId: Int): Display? = + display(context, displayManager, primaryDisplayId, SessionPrefs.dualScreenSessionMode(context)) + + fun display(context: Context, displayManager: DisplayManager, primaryDisplayId: Int, mode: String = SessionPrefs.dualScreenMode(context)): Display? = + when (mode) { MODE_OFF -> null MODE_ON -> internalDisplay(displayManager, primaryDisplayId) ?: anyDisplay(displayManager, primaryDisplayId) else -> builtInDisplay(displayManager, primaryDisplayId) - } + }?.takeUnless { taken(it.displayId) } fun anyDisplay(displayManager: DisplayManager, primaryDisplayId: Int): Display? = displayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION).firstOrNull { it.isValid && it.displayId != primaryDisplayId && (it.flags and Display.FLAG_PRESENTATION) != 0 } + fun builtIn(display: Display): Boolean = isBuiltIn(displayType(display), Build.MODEL) + internal fun isBuiltIn(type: Int?, model: String): Boolean = - if (type != null) type == TYPE_INTERNAL else model.trim().lowercase() in knownModels + if (type != null) type == TYPE_INTERNAL else yieldsBottom(model) private fun displayType(display: Display): Int? = runCatching { Display::class.java.getMethod("getType").invoke(display) as Int }.getOrNull() diff --git a/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt b/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt index 61dfe32c4e..f9d9d34f4d 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt @@ -46,12 +46,20 @@ object HomeButtonShortcuts { } class HomeButtonService : AccessibilityService(), InputManager.InputDeviceListener { + private var bottomScreen: BottomScreenWatch? = null + override fun onServiceConnected() { getSystemService(InputManager::class.java).registerInputDeviceListener(this, Handler(Looper.getMainLooper())) + if (bottomScreen == null && BottomScreenGuests.supported()) bottomScreen = BottomScreenWatch(this).also { it.start() } + } + + private fun stopBottomScreen() { + bottomScreen?.stop() + bottomScreen = null } override fun onKeyEvent(event: KeyEvent) = HomeButtonShortcuts.onKeyEvent(this, event) - override fun onAccessibilityEvent(event: AccessibilityEvent?) {} + override fun onAccessibilityEvent(event: AccessibilityEvent?) { event?.let { bottomScreen?.onEvent(it) } } override fun onInterrupt() { HomeButtonShortcuts.release() } override fun onInputDeviceAdded(deviceId: Int) {} override fun onInputDeviceChanged(deviceId: Int) {} @@ -59,12 +67,14 @@ class HomeButtonService : AccessibilityService(), InputManager.InputDeviceListen override fun onUnbind(intent: Intent?): Boolean { HomeButtonShortcuts.release() + stopBottomScreen() com.droiddeck.launcher.core.SteamIntegration.syncShortcutsListing(this) return super.onUnbind(intent) } override fun onDestroy() { HomeButtonShortcuts.release() + stopBottomScreen() getSystemService(InputManager::class.java).unregisterInputDeviceListener(this) super.onDestroy() } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt index e3a64e9628..72e77145c9 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt @@ -17,13 +17,14 @@ object BattleNet { const val PROGRAM = "/usr/local/bin/droiddeck-battlenet" - class Title(val uid: String, val name: String, val code: String, val steam: Int? = null, val shop: String? = null, val product: String? = null) + class Title(val uid: String, val name: String, val code: String, val steam: Int? = null, val shop: String? = null, val product: String? = null, val flavor: String? = null) internal val TITLES = listOf( - Title("wow", "World of Warcraft", "WoW", shop = "world-of-warcraft-midnight", product = "wow"), - Title("wow_classic", "World of Warcraft Classic", "WoWC", shop = "world-of-warcraft-burning-crusade-classic-anniversary-edition-upgrades", product = "wow_classic"), - Title("wow_classic_era", "World of Warcraft Classic", "WoWC", product = "wow_classic_era"), - Title("wow_classic_anniversary", "World of Warcraft Classic", "WoWC", product = "wow_anniversary"), + Title("wow", "World of Warcraft", "WoW", shop = "world-of-warcraft-midnight", product = "wow", flavor = "_retail_"), + Title("wow_classic", "World of Warcraft Classic", "WoWC", shop = "world-of-warcraft-burning-crusade-classic-anniversary-edition-upgrades", product = "wow_classic", flavor = "_classic_"), + Title("wow_classic_era", "World of Warcraft Classic", "WoWC", product = "wow_classic_era", flavor = "_classic_era_"), + Title("wow_classic_anniversary", "World of Warcraft Classic", "WoWC", product = "wow_anniversary", flavor = "_anniversary_"), + Title("wow_forever", "World of Warcraft: Forever", "WoWF", shop = "world-of-warcraft-forever", product = "wowf", flavor = "_forever_"), Title("diablo3", "Diablo III", "D3", shop = "diablo-iii", product = "d3"), Title("d3cn", "Diablo III", "D3CN", shop = "diablo-iii"), Title("s2", "StarCraft II", "S2", shop = "starcraft-ii", product = "s2"), @@ -58,7 +59,7 @@ object BattleNet { Title("aqua", "Avowed", "AQUA", 2457220, shop = "avowed", product = "aqua"), ) - val STORE: List get() = TITLES.distinctBy { it.code }.filter { it.uid != "d3cn" && it.code != "WoWC" } + val STORE: List<Title> get() = TITLES.distinctBy { it.code }.filter { it.uid != "d3cn" && it.code != "WoWC" && it.code != "WoWF" } fun notInstalled(title: Title, installedIds: Collection<String?>) = installedIds.mapNotNull { id -> id?.let(::title)?.code }.none { it == title.code } @@ -159,24 +160,56 @@ object BattleNet { return if (base.isNotEmpty() && id.substringAfterLast('_') in LOCALES) TITLES.firstOrNull { it.uid == base } else null } + internal fun titleForProduct(product: String): Title? { + val code = product.trim() + if (code.isEmpty()) return null + return TITLES.firstOrNull { it.product.equals(code, ignoreCase = true) } ?: TITLES.firstOrNull { it.code.equals(code, ignoreCase = true) } + } + fun games(context: Context): List<Game> { val pfx = File(prefix(context), "pfx") + val agent = runCatching { productDbInstalls(File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").readBytes()) }.getOrNull() val entries = installs( runCatching { File(pfx, "system.reg").useLines { uninstallEntries(it) } }.getOrDefault(emptyList()), - runCatching { productDbEntries(File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").readBytes()) }.getOrNull(), + agent?.map { it.uid to it.path }, ) - val found = LinkedHashMap<String, Game>() + val products = agent.orEmpty().filter { it.product.isNotEmpty() }.associate { it.uid.lowercase() to it.product } + val listed = LinkedHashMap<String, Triple<Title, String, File>>() for ((uid, path) in entries) { - val title = title(uid) + val title = title(uid) ?: products[uid.lowercase()]?.let(::titleForProduct) if (title == null) { if (uid.lowercase() !in NOT_GAMES) Log.i(TAG, "not listed: $uid (no launch code known)") continue } - if (title.code in found) continue + if (title.code in listed) continue val folder = hostFolder(context, path)?.takeIf { it.isDirectory } ?: continue - found[title.code] = Game(title.uid, title.name, title.code, folder, uid) + listed[title.code] = Triple(title, uid, folder) } - return found.values.toList() + val saved = listed.mapValues { (code, _) -> com.droiddeck.launcher.session.SessionPrefs.battleNetFolder(context, code) } + val folders = ownFolders(listed.mapValues { it.value.first to it.value.third }, saved) + return listed.map { (code, found) -> + val folder = folders.getValue(code) + if (saved[code] != folder.path) com.droiddeck.launcher.session.SessionPrefs.setBattleNetFolder(context, code, folder.path) + Game(found.first.uid, found.first.name, code, folder, found.second) + } + } + + internal fun ownFolders(games: Map<String, Pair<Title, File>>, saved: Map<String, String?>): Map<String, File> { + val out = HashMap<String, File>() + val taken = HashSet<File>() + fun options(title: Title, folder: File) = listOfNotNull(folder, title.flavor?.let { File(folder, it) }?.takeIf { it.isDirectory }) + for ((code, game) in games) { + val keep = saved[code]?.let(::File)?.takeIf { it in options(game.first, game.second) && it !in taken } ?: continue + out[code] = keep + taken.add(keep) + } + for ((code, game) in games) { + if (code in out) continue + val pick = options(game.first, game.second).firstOrNull { it !in taken } ?: game.second + out[code] = pick + taken.add(pick) + } + return games.keys.associateWith { out.getValue(it) } } internal fun installs(registry: List<Pair<String, String>>, agent: List<Pair<String, String>>?): List<Pair<String, String>> { @@ -250,17 +283,22 @@ object BattleNet { return out.toString() } - internal fun productDbEntries(bytes: ByteArray): List<Pair<String, String>>? { + internal class AgentInstall(val uid: String, val path: String, val product: String) + + internal fun productDbEntries(bytes: ByteArray): List<Pair<String, String>>? = productDbInstalls(bytes)?.map { it.uid to it.path } + + internal fun productDbInstalls(bytes: ByteArray): List<AgentInstall>? { val installs = runCatching { fields(bytes, 0, bytes.size) }.getOrNull()?.filter { it.first == 1 }?.takeIf { it.isNotEmpty() } ?: return null return installs.map { (_, start, end) -> runCatching { val install = fields(bytes, start, end) val uid = install.firstOrNull { it.first == 1 }?.let { String(bytes, it.second, it.third - it.second) } + val product = install.firstOrNull { it.first == 2 }?.let { String(bytes, it.second, it.third - it.second) }.orEmpty() val path = install.firstOrNull { it.first == 3 }?.let { s -> fields(bytes, s.second, s.third).firstOrNull { it.first == 1 } } ?.let { String(bytes, it.second, it.third - it.second) } val installed = install.firstOrNull { it.first == 4 }?.let { s -> fields(bytes, s.second, s.third).firstOrNull { it.first == 1 } } ?.let { s -> varints(bytes, s.second, s.third)[1] } - if (uid.isNullOrEmpty() || path.isNullOrEmpty() || installed == 0L) null else uid to path + if (uid.isNullOrEmpty() || path.isNullOrEmpty() || installed == 0L) null else AgentInstall(uid, path, product) }.getOrElse { return null } }.filterNotNull() } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopLanguage.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopLanguage.kt new file mode 100644 index 0000000000..c1bb3a192d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopLanguage.kt @@ -0,0 +1,69 @@ +package com.droiddeck.launcher.runtime + +import android.content.Context +import android.util.Log +import com.droiddeck.launcher.core.Downloader +import com.droiddeck.launcher.core.FileUtils +import com.droiddeck.launcher.core.Hashes +import com.droiddeck.launcher.session.DesktopLocale +import java.io.File +import java.util.Locale + +object DesktopLanguage { + private const val TAG = "DesktopLanguage" + private const val INDEX = "desktop-kde.i18n.txt" + private const val ABSENT = "absent" + + class Pack(val locale: String, val sha256: String, val size: Long) + + internal fun parseIndex(text: String): Map<String, Pack> = text.lineSequence().mapNotNull { line -> + val parts = line.trim().split(' ') + if (parts.size != 3 || !parts[0].matches(Regex("[A-Za-z_]+")) || !parts[1].matches(Regex("[0-9a-fA-F]{64}"))) return@mapNotNull null + Pack(parts[0], parts[1], parts[2].toLongOrNull() ?: return@mapNotNull null) + }.associateBy { it.locale } + + /** KDE ships region packs (pt_BR, zh_TW) beside bare-language ones (pt, es). */ + internal fun candidates(locale: Locale): List<String> { + val region = DesktopLocale.lang(locale).removeSuffix(".UTF-8") + if (region == DesktopLocale.DEFAULT.removeSuffix(".UTF-8") || region.startsWith("en")) return emptyList() + return listOfNotNull(region, "zh_TW".takeIf { region == "zh_HK" }, region.substringBefore('_')).distinct() + } + + internal fun baseUrl(desktopUrl: String) = desktopUrl.substringBeforeLast('/') + "/" + + private fun marker(root: File, tag: String, name: String) = File(root, ".droiddeck-i18n-$tag-$name") + + /** Installs the desktop's translations for [locale]; false when a download failed and is worth retrying. */ + @Synchronized + fun ensure(context: Context, locale: Locale): Boolean { + val root = LinuxRuntime.rootDir(context) + if (!DesktopCatalog.desktopInstalled(root)) return true + val entry = DesktopCatalog.desktopEntry(context) + val pending = candidates(locale).filterNot { marker(root, entry.version, it).isFile } + if (pending.isEmpty()) return true + val base = baseUrl(entry.url) + val index = parseIndex(Downloader.downloadString(base + INDEX) ?: return false) + var complete = true + for (name in pending) { + val pack = index[name] + if (pack == null) { + FileUtils.writeString(marker(root, entry.version, name), ABSENT) + continue + } + val download = File(context.cacheDir, "i18n-$name-${pack.sha256.take(12)}.download") + try { + val ok = Downloader.downloadFile( + base + "desktop-kde-i18n-$name.tar.zst", download, true, pack.sha256, java.util.function.Consumer<Float> { }, + ) && pack.sha256.equals(Hashes.sha256(download), ignoreCase = true) && + LinuxRuntimeInstaller.extract(context, download, root, null) + if (ok) FileUtils.writeString(marker(root, entry.version, name), pack.sha256) else complete = false + } catch (e: Exception) { + Log.w(TAG, "language pack $name: $e") + complete = false + } finally { + download.delete() + } + } + return complete + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt b/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt index 923ee29996..36b9c3dfdc 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt @@ -61,7 +61,9 @@ object BottomDesktop { /** The proot to freeze with the session when it pauses. */ val suspendPid: Int get() = guestPid private var guestGeneration = 0 - private var outputSize = 0 to 0 + var outputSize = 0 to 0 + private set + private var attachedSurface: Surface? = null private var cursorShown = false /** The session generation whose launch the running compositor and guest belong to; -1 when none. */ private var owner = -1 @@ -97,16 +99,8 @@ object BottomDesktop { fun available(): Boolean = launch?.installed == true && SessionState.running && SessionState.mode != SessionService.MODE_DESKTOP - /** - * The desktop renders below the panel's resolution: about 720 pixels on the short side keeps - * Plasma's text big enough to touch and its software rendering cheap. A running desktop keeps its size. - */ - fun outputSizeFor(width: Int, height: Int): Pair<Int, Int> { - if ((state == State.STARTING || state == State.RUNNING) && outputSize.first > 0) return outputSize - if (width <= 0 || height <= 0) return 0 to 0 - val scale = maxOf(1f, Math.round(minOf(width, height) / TARGET_SHORT_SIDE * 2f) / 2f) - return ((width / scale).toInt() and 1.inv()) to ((height / scale).toInt() and 1.inv()) - } + fun outputSizeFor(width: Int, height: Int, fullResolution: Boolean = false): Pair<Int, Int> = + desktopOutputSize(width, height, fullResolution, TARGET_SHORT_SIDE) fun addListener(listener: () -> Unit) { listeners.add(listener) } @@ -148,6 +142,7 @@ object BottomDesktop { appContext = context.applicationContext owner = current.generation outputSize = width to height + attachedSurface = surface val dir = File(current.sessionDir, "bottom-desktop").apply { mkdirs() } val msg = Message.obtain(null, Comp.MSG_ATTACH).apply { arg1 = owner @@ -169,7 +164,19 @@ object BottomDesktop { } } - fun detach() { + fun resize(surface: Surface, width: Int, height: Int) { + if (surface !== attachedSurface || width <= 0 || height <= 0 || outputSize == (width to height)) return + outputSize = width to height + pendingAttach?.data?.apply { + putInt(Comp.KEY_WIDTH, width) + putInt(Comp.KEY_HEIGHT, height) + } + service?.let { send(it, Message.obtain(null, Comp.MSG_RESIZE, width, height)) } + } + + fun detach(surface: Surface? = null) { + if (surface != null && attachedSurface != null && surface !== attachedSurface) return + attachedSurface = null pendingAttach = null service?.let { send(it, Message.obtain(null, Comp.MSG_DETACH)) } } @@ -351,3 +358,9 @@ object BottomDesktop { }, "bottom-desktop-start").start() } } + +internal fun desktopOutputSize(width: Int, height: Int, fullResolution: Boolean, targetShortSide: Float): Pair<Int, Int> { + if (width <= 0 || height <= 0) return 0 to 0 + val scale = if (fullResolution) 1f else maxOf(1f, Math.round(minOf(width, height) / targetShortSide * 2f) / 2f) + return ((width / scale).toInt() and 1.inv()) to ((height / scale).toInt() and 1.inv()) +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/DesktopLocale.kt b/app/src/main/java/com/droiddeck/launcher/session/DesktopLocale.kt new file mode 100644 index 0000000000..68ada01296 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/DesktopLocale.kt @@ -0,0 +1,64 @@ +package com.droiddeck.launcher.session + +import java.util.Locale + +object DesktopLocale { + const val DEFAULT = "C.UTF-8" + + private val regions = mapOf( + "en" to "US", "id" to "ID", "ms" to "MY", "cs" to "CZ", "da" to "DK", "de" to "DE", + "es" to "ES", "fr" to "FR", "it" to "IT", "hu" to "HU", "nl" to "NL", "nb" to "NO", + "pl" to "PL", "pt" to "PT", "ro" to "RO", "fi" to "FI", "sv" to "SE", "vi" to "VN", + "tr" to "TR", "el" to "GR", "bg" to "BG", "ru" to "RU", "uk" to "UA", "ar" to "EG", + "hi" to "IN", "th" to "TH", "ja" to "JP", "ko" to "KR", "zh" to "CN", + ) + + private val systemRegions = mapOf( + "en" to setOf("US", "GB", "AU", "CA", "IN", "NZ", "IE", "ZA", "SG"), + "fr" to setOf("FR", "CA", "BE", "CH", "LU"), + "de" to setOf("DE", "AT", "CH", "LU"), + "it" to setOf("IT", "CH"), + "nl" to setOf("NL", "BE"), + "pt" to setOf("PT", "BR"), + "sv" to setOf("SE", "FI"), + "ar" to setOf("EG", "SA", "AE", "MA", "DZ", "TN", "JO", "KW", "IQ"), + ) + + private val traditionalRegions = setOf("TW", "HK", "MO") + + fun lang(locale: Locale): String { + val language = when (locale.language) { + "in" -> "id" + "no", "nn" -> "nb" + else -> locale.language + } + val region = when { + language == "es" && SteamLanguage.forLocale(locale) == "latam" -> + locale.country.takeIf { it.length == 2 && it != "US" } ?: "MX" + language == "zh" -> chineseRegion(locale) + locale.country in systemRegions[language].orEmpty() -> locale.country + else -> regions[language] ?: return DEFAULT + } + return "${language}_$region.UTF-8" + } + + private fun chineseRegion(locale: Locale): String = when { + locale.script == "Hans" -> "CN" + locale.script == "Hant" -> if (locale.country == "HK") "HK" else "TW" + locale.country == "HK" -> "HK" + locale.country in traditionalRegions -> "TW" + else -> "CN" + } + + fun language(locale: Locale): String? { + val lang = lang(locale) + if (lang == DEFAULT) return null + val full = lang.removeSuffix(".UTF-8") + val short = full.substringBefore('_') + return when { + short == "en" -> full + full == "zh_HK" -> "zh_HK:zh_TW:zh" + else -> "$full:$short" + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/GpuStatsComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/GpuStatsComponent.kt index 8d2a3801d5..a5ddcb95d7 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GpuStatsComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GpuStatsComponent.kt @@ -31,6 +31,8 @@ class GpuStatsComponent(val dir: File, private val root: File) : SessionPart() { fun prepare(): Boolean { sources = "" + KgslBusy.status = "not tried" + KgslClock.status = "not tried" if (!File(KGSL).exists()) return false val unreadable = MANGOHUD_FILES.any { File(KGSL, it).let { f -> f.exists() && !f.canRead() } } // Where SELinux hides the kgsl nodes completely (exists() is false too), the layer and cycle-counter feeds stand in. @@ -96,6 +98,7 @@ class GpuStatsComponent(val dir: File, private val root: File) : SessionPart() { if (load.failed) { memstore?.close() memstore = null + KgslBusy.status += ", but the stamps never moved" Log.i(TAG, "hud: kgsl memstore timestamps never moved; GPU load from Vulkan timing") } else if (load.working) { Log.i(TAG, "hud: GPU load from the kgsl memstore (all GPU work)") @@ -114,7 +117,9 @@ class GpuStatsComponent(val dir: File, private val root: File) : SessionPart() { } private fun memstoreSource(): String = when { - memstoreLoad?.working == true -> "kgsl memstore ringbuffer timestamps (all GPU work)" + memstoreLoad?.working == true -> + if (memstore?.mode == KgslBusy.MODE_CONTEXTS) "kgsl memstore per-context timestamps (all GPU work)" + else "kgsl memstore ringbuffer timestamps (all GPU work)" memstoreLoad?.failed == true -> LAYER_SOURCE else -> "kgsl memstore once its timestamps move; until then $LAYER_SOURCE" } @@ -339,6 +344,12 @@ class GpuStatsComponent(val dir: File, private val root: File) : SessionPart() { /** Where the running session's GPU feeds come from, for the HUD diagnostics export. */ @Volatile var sources = "" + + /** Why the no-root GPU readers work or not, for the HUD diagnostics export; empty where they were not needed. */ + fun readerStatus(): String = + if (KgslBusy.status == "not tried" && KgslClock.status == "not tried") "" + else "kgsl memstore ${KgslBusy.status}; GPU cycle counter ${KgslClock.status}" + private const val STALE_MS = 30_000L fun guestLoadDir(root: File) = File(root, GUEST_LOAD_DIR.removePrefix("/")) diff --git a/app/src/main/java/com/droiddeck/launcher/session/KgslBusy.kt b/app/src/main/java/com/droiddeck/launcher/session/KgslBusy.kt index dad62121a9..d3962dd765 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/KgslBusy.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/KgslBusy.kt @@ -10,6 +10,7 @@ object KgslBusy { private const val TAG = "SessionService" @JvmStatic private external fun nativeOpen(error: IntArray): Long + @JvmStatic private external fun nativeMode(handle: Long): Int @JvmStatic private external fun nativeRun(handle: Long, on: Boolean) @JvmStatic private external fun nativeRead(handle: Long, out: LongArray): Boolean @JvmStatic private external fun nativeClose(handle: Long) @@ -24,7 +25,10 @@ object KgslBusy { if (handle != 0L) nativeRun(handle, on) } - /** Running totals: busy samples, samples, samples in which a ringbuffer started new work. */ + /** Which memstore entries are watched: [MODE_RINGBUFFER] or [MODE_CONTEXTS] (hardware-scheduled kernels). */ + val mode: Int = if (handle != 0L) runCatching { nativeMode(handle) }.getOrDefault(0) else 0 + + /** Running totals: busy samples, samples, samples in which a ringbuffer or context started new work. */ @Synchronized fun counts(): LongArray? { if (handle == 0L) return null val out = LongArray(3) @@ -37,14 +41,27 @@ object KgslBusy { } } + const val MODE_RINGBUFFER = 1 + const val MODE_CONTEXTS = 2 + + /** What the last [open] found, for the HUD diagnostics export. */ + @Volatile var status = "not tried" + fun open(): Reader? { - if (!loaded) return null + if (!loaded) { + status = "gpuclock library did not load" + return null + } val error = IntArray(1) val handle = runCatching { nativeOpen(error) }.getOrDefault(0L) if (handle == 0L) { + status = "open failed: ${KgslErrors.describe(error[0])}" Log.i(TAG, "hud: no GPU load from the kgsl memstore (open error ${error[0]})") return null } - return Reader(handle) + val reader = Reader(handle) + status = if (reader.mode == MODE_CONTEXTS) "per-context stamps (hardware-scheduled kernel)" else "ringbuffer stamps" + Log.i(TAG, "hud: kgsl memstore reader uses $status") + return reader } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/KgslClock.kt b/app/src/main/java/com/droiddeck/launcher/session/KgslClock.kt index 11c7367efb..a8089cb328 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/KgslClock.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/KgslClock.kt @@ -20,7 +20,10 @@ object KgslClock { class Sampler internal constructor(private var handle: Long) : AutoCloseable { /** MHz, or null when this sample was refused or failed its checks. */ - @Synchronized fun mhz(): Int? = if (handle == 0L) null else nativeSample(handle).takeIf { it > 0 } + @Synchronized fun mhz(): Int? = sample().takeIf { it > 0 } + + /** MHz, or a negative native code: -errno from kgsl or [RANGE_CHECK_FAILED]. */ + @Synchronized fun sample(): Int = if (handle == 0L) CLOSED else nativeSample(handle) @Synchronized override fun close() { if (handle != 0L) nativeClose(handle) @@ -28,22 +31,41 @@ object KgslClock { } } - /** A sampler that already produced one good reading, or null (the reason goes to the log). */ + /** -EBADF, what the native side also returns for a closed handle. */ + private const val CLOSED = -9 + + /** The native sample code for a reading that failed its range checks (kgsl_clock.c sampler_mhz). */ + const val RANGE_CHECK_FAILED = -1000 + + /** What the last [open] found, for the HUD diagnostics export. */ + @Volatile var status = "not tried" + + /** A sampler that already produced one good reading, or null (the reason goes to the log and [status]). */ fun open(): Sampler? { - if (!loaded) return null + if (!loaded) { + status = "gpuclock library did not load" + return null + } val error = IntArray(1) val handle = runCatching { nativeOpen(error) }.getOrDefault(0L) if (handle == 0L) { + status = "open failed: ${KgslErrors.describe(error[0])}" Log.i(TAG, "hud: no GPU clock from the cycle counter (open error ${error[0]})") return null } val sampler = Sampler(handle) - val first = (0 until 3).firstNotNullOfOrNull { sampler.mhz() } + var code = 0 + val first = (0 until 3).firstNotNullOfOrNull { + code = sampler.sample() + code.takeIf { it > 0 } + } if (first == null) { - Log.i(TAG, "hud: GPU cycle counter gave no usable reading") + status = "no usable reading: ${KgslErrors.describe(code)}" + Log.i(TAG, "hud: GPU cycle counter gave no usable reading ($code)") sampler.close() return null } + status = "working ($first MHz at start)" Log.i(TAG, "hud: GPU clock from the cycle counter ($first MHz now)") return sampler } diff --git a/app/src/main/java/com/droiddeck/launcher/session/KgslErrors.kt b/app/src/main/java/com/droiddeck/launcher/session/KgslErrors.kt new file mode 100644 index 0000000000..819b627664 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/KgslErrors.kt @@ -0,0 +1,11 @@ +package com.droiddeck.launcher.session + +/** Readable text for the negative errno codes the gpuclock library returns. */ +internal object KgslErrors { + fun describe(code: Int): String { + if (code == 0) return "no error code" + if (code == KgslClock.RANGE_CHECK_FAILED) return "sample out of range" + val name = runCatching { android.system.OsConstants.errnoName(-code) }.getOrNull() + return if (name != null) "$name ($code)" else "error $code" + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 3fe3390c4d..fd54f5c399 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -86,12 +86,26 @@ object SessionPrefs { prefs(context).edit().putBoolean("animations", on).apply() } - fun dualScreenMode(context: Context): String = - prefs(context).getString("dualScreenMode", null)?.takeIf { it in com.droiddeck.launcher.input.DualScreen.modes } - ?: com.droiddeck.launcher.input.DualScreen.MODE_AUTO + private fun savedDualScreenMode(context: Context, key: String): String? = + prefs(context).getString(key, null)?.takeIf { it in com.droiddeck.launcher.input.DualScreen.modes } + + private fun legacyDualScreenMode(context: Context): String = + if (!prefs(context).getBoolean("dualScreenLauncher", true)) com.droiddeck.launcher.input.DualScreen.MODE_OFF + else savedDualScreenMode(context, "dualScreenMode") ?: com.droiddeck.launcher.input.DualScreen.MODE_AUTO + + fun dualScreenMode(context: Context): String = legacyDualScreenMode(context) fun setDualScreenMode(context: Context, mode: String) { - prefs(context).edit().putString("dualScreenMode", mode).apply() + val sessions = dualScreenSessionMode(context) + prefs(context).edit().remove("dualScreenLauncher").putString("dualScreenMode", mode).putString("dualScreenSessionMode", sessions).apply() + } + + fun dualScreenSessionMode(context: Context): String = + savedDualScreenMode(context, "dualScreenSessionMode") ?: legacyDualScreenMode(context) + + fun setDualScreenSessionMode(context: Context, mode: String) { + val launcher = dualScreenMode(context) + prefs(context).edit().remove("dualScreenLauncher").putString("dualScreenMode", launcher).putString("dualScreenSessionMode", mode).apply() } fun secondScreenPanel(context: Context): String? = prefs(context).getString("secondScreenPanel", null) @@ -162,12 +176,6 @@ object SessionPrefs { prefs(context).edit().putStringSet("telemetryOff", keys.toSet()).apply() } - fun dualScreenLauncher(context: Context): Boolean = prefs(context).getBoolean("dualScreenLauncher", true) - - fun setDualScreenLauncher(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("dualScreenLauncher", on).apply() - } - fun dualScreenSessionControls(context: Context): Boolean = prefs(context).getBoolean("dualScreenSessionControls", true) fun setDualScreenSessionControls(context: Context, on: Boolean) { @@ -856,6 +864,9 @@ object SessionPrefs { fun battleNetNoSteamSet(context: Context): Boolean = prefs(context).getBoolean("battleNetNoSteamSet", false) fun setBattleNetNoSteamSet(context: Context) { prefs(context).edit().putBoolean("battleNetNoSteamSet", true).apply() } + fun battleNetFolder(context: Context, code: String): String? = prefs(context).getString("battleNetFolder:$code", null) + fun setBattleNetFolder(context: Context, code: String, path: String) { prefs(context).edit().putString("battleNetFolder:$code", path).apply() } + fun clearCachedApps(context: Context): Boolean = prefs(context).getBoolean("clearCachedApps", false) fun setClearCachedApps(context: Context, on: Boolean) { prefs(context).edit().putBoolean("clearCachedApps", on).apply() } @@ -975,10 +986,17 @@ object SessionPrefs { prefs(context).edit().apply { if (name == null) remove("bootMovieCustomName") else putString("bootMovieCustomName", name) }.apply() } - fun runSteamAtStartup(context: Context): Boolean = prefs(context).getBoolean("runSteamAtStartup", false) + const val STARTUP_OFF = "" + const val STARTUP_STEAM = "steam" + const val STARTUP_DESKTOP = "desktop" - fun setRunSteamAtStartup(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("runSteamAtStartup", on).apply() + fun startupSession(context: Context): String { + val p = prefs(context) + return p.getString("startupSession", null) ?: if (p.getBoolean("runSteamAtStartup", false)) STARTUP_STEAM else STARTUP_OFF + } + + fun setStartupSession(context: Context, id: String) { + prefs(context).edit().putString("startupSession", id).remove("runSteamAtStartup").apply() } fun addedGamesDirs(context: Context): List<String> { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index e58d59e082..49b9ab8a83 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -70,6 +70,7 @@ class SessionService : Service() { private val mainHandler = Handler(Looper.getMainLooper()) private var suspendController: SessionSuspendController? = null private val steamDownloadMonitor = SteamDownloadMonitor() + private val downloadMonitorExecutor = java.util.concurrent.Executors.newSingleThreadExecutor { Thread(it, "steam-download-monitor").apply { isDaemon = true } } private var downloadMonitorTask: Runnable? = null private var downloadActive = false private var clientInstallActive = false @@ -346,7 +347,7 @@ class SessionService : Service() { screenOn = readScreenOn() manualPauseRequested = false suspendDownloadNow = false - steamDownloadMonitor.reset() + runOnDownloadMonitor { steamDownloadMonitor.reset() } downloadActive = false clientInstallActive = false steamSleepToken = null @@ -649,6 +650,10 @@ class SessionService : Service() { } if (SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP) OfflineMode.apply(this, root) + if (SessionState.mode == MODE_DESKTOP) { + runCatching { com.droiddeck.launcher.runtime.DesktopLanguage.ensure(this, com.droiddeck.launcher.core.AppLanguage.effective(this)) } + .onFailure { Log.w(TAG, "desktop language pack: $it") } + } val networkLink = LinuxNetworkLinkComponent(this, root) networkLink.attach(this) @@ -778,7 +783,13 @@ class SessionService : Service() { guest.add("USER=root") guest.add("PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games") guest.add("TERM=xterm-256color") - guest.add("LANG=C.UTF-8") + if (SessionState.mode == MODE_DESKTOP) { + val appLocale = com.droiddeck.launcher.core.AppLanguage.effective(this) + guest.add("LANG=" + DesktopLocale.lang(appLocale)) + DesktopLocale.language(appLocale)?.let { guest.add("LANGUAGE=$it") } + } else { + guest.add("LANG=C.UTF-8") + } guest.add("BL_STEAM_LANGUAGE=" + SteamLanguage.forLocale( com.droiddeck.launcher.core.AppLanguage.effective(this), com.droiddeck.launcher.core.AppLanguage.system(this).country, @@ -1991,6 +2002,9 @@ class SessionService : Service() { (getSystemService(Context.DISPLAY_SERVICE) as? DisplayManager)?.unregisterDisplayListener(displayListener) displayListenerRegistered = false } + downloadMonitorTask?.let(mainHandler::removeCallbacks) + downloadMonitorTask = null + downloadMonitorExecutor.shutdown() super.onDestroy() } @@ -2114,12 +2128,20 @@ class SessionService : Service() { SessionState.running && SessionState.mode == MODE_STEAM && suspendPolicy != SessionPrefs.SUSPEND_NEVER && (steamDownloadsInBackground || !SessionState.firstFrameSeen) + private fun runOnDownloadMonitor(task: () -> Unit) { + try { + downloadMonitorExecutor.execute(task) + } catch (e: java.util.concurrent.RejectedExecutionException) { + Log.d(TAG, "download monitor already shut down") + } + } + private fun updateDownloadMonitoring() { if (!downloadWatchWanted()) { val wasActive = downloadActive downloadMonitorTask?.let(mainHandler::removeCallbacks) downloadMonitorTask = null - steamDownloadMonitor.reset() + runOnDownloadMonitor { steamDownloadMonitor.reset() } downloadActive = false if (clientInstallActive) SessionEvents.record("steam.client_download", mapOf("active" to false)) clientInstallActive = false @@ -2141,18 +2163,30 @@ class SessionService : Service() { val wasInstalling = clientInstallActive clientInstallActive = !SessionState.firstFrameSeen && (clientInstallActive || SteamDownloadMonitor.clientInstallPending(root)) - downloadActive = clientInstallActive || steamDownloadsInBackground && steamDownloadMonitor.poll( - root, - receivedBytes = TrafficStats.getUidRxBytes(android.os.Process.myUid()), - client = SessionState.steamClientArch, - mounts = steamLibraryMounts, - ) - if (wasInstalling != clientInstallActive) { - SessionEvents.record("steam.client_download", mapOf("active" to clientInstallActive)) + val receivedBytes = TrafficStats.getUidRxBytes(android.os.Process.myUid()) + val client = SessionState.steamClientArch + val mounts = steamLibraryMounts + val self = this + val finish = { monitored: Boolean -> + if (downloadMonitorTask === self) { + downloadActive = clientInstallActive || monitored + if (wasInstalling != clientInstallActive) { + SessionEvents.record("steam.client_download", mapOf("active" to clientInstallActive)) + } + if (wasActive != downloadActive) refreshNotification() + updateSuspendPolicy() + mainHandler.postDelayed(self, DOWNLOAD_POLL_MS) + } + } + if (clientInstallActive || !steamDownloadsInBackground) { + finish(false) + return + } + runOnDownloadMonitor { + val monitored = runCatching { steamDownloadMonitor.poll(root, receivedBytes = receivedBytes, client = client, mounts = mounts) } + .getOrDefault(false) + mainHandler.post { finish(monitored) } } - if (wasActive != downloadActive) refreshNotification() - updateSuspendPolicy() - mainHandler.postDelayed(this, DOWNLOAD_POLL_MS) } } downloadMonitorTask = poll diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt index 8e63d05c67..2e66d2b80f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt @@ -93,6 +93,7 @@ object SessionState { @Volatile var secondScreenDisplay = -1 @Volatile var secondScreenAutoOpened = false @Volatile var secondScreenProvisional = false + @Volatile var gameOnBottom = false @Volatile var steamLibraryMounts: Map<String, java.io.File> = emptyMap() diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index b3a2223049..07d330e10e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -11,8 +11,8 @@ object SettingsReset { private const val TAG = "SettingsReset" internal val SESSION_KEYS = setOf( - "orientation", "launcherFullscreen", "animations", "theme", "runSteamAtStartup", "addedGamesArt", - "dualScreenMode", "dualScreenLauncher", "dualScreenSessionControls", + "orientation", "launcherFullscreen", "animations", "theme", "runSteamAtStartup", "startupSession", "addedGamesArt", + "dualScreenMode", "dualScreenSessionMode", "dualScreenLauncher", "dualScreenSessionControls", "gameStoresEnabled", "gameStoresSpeedTier", "gameStoresParallel", "storesOpenTab", "storesShowMature", "storesInstallLanguage", "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController", diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt index 2d1ea267fc..06f63c32bc 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.session import android.content.Context import android.os.storage.StorageManager import com.droiddeck.launcher.R +import com.droiddeck.launcher.files.StorageRoots import com.droiddeck.launcher.frontend.AddedGames import java.io.File import org.json.JSONArray @@ -49,15 +50,12 @@ object SteamLibraries { class Refused(val reason: String) : AddResult() } - fun add(context: Context, path: String, label: String = defaultLabel(context, File(path))): AddResult { + fun add(context: Context, picked: String, label: String? = null): AddResult { val entries = list(context) if (entries.size >= MAX) return AddResult.Refused(context.getString(R.string.libraries_full, MAX)) + val path = innerLibrary(File(picked))?.path ?: picked val host = canonical(File(path)) - val taken = entries.map { canonical(it.host) } + listOfNotNull( - GameStorage.effective(context)?.let { canonical(File(it.path)) }, - canonical(SessionPrefs.steamRoot(context, "arm64")), - ) - if (taken.any { overlaps(it, host) }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) + if (taken(context, entries).any { overlaps(it, host) }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) // Adding a Games folder itself is fine; a child of one would make it overlap and hide the rest of that folder. if (AddedGames.roots(context).any { host.startsWith(canonical(it.host) + "/") }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) GameStorage.prepare(context, path)?.let { return AddResult.Refused(it) } @@ -67,13 +65,70 @@ object SteamLibraries { if (current.any { overlaps(canonical(it.host), host) }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) // A removed library's mount stays registered with Steam until its next session, so ids are never reused. val next = maxOf(SessionPrefs.steamLibraryNextId(context), (current.maxOfOrNull { it.id.toInt() } ?: 0) + 1) - val entry = Entry(next.toString(), path, clean(label).ifEmpty { File(path).name }) + val entry = Entry(next.toString(), path, clean(label ?: defaultLabel(context, File(path))).ifEmpty { File(path).name }) save(context, current + entry) SessionPrefs.setSteamLibraryNextId(context, next + 1) return AddResult.Added(entry) } } + private fun taken(context: Context, entries: List<Entry>): List<String> = entries.map { canonical(it.host) } + listOfNotNull( + GameStorage.effective(context)?.let { canonical(File(it.path)) }, + canonical(SessionPrefs.steamRoot(context, "arm64")), + ) + + class Found(val path: String, val shown: String, val label: String, val games: Int) + + /** Reads storage; call off the main thread. */ + fun found(context: Context): List<Found> { + val entries = list(context) + val taken = taken(context, entries) + AddedGames.roots(context).map { canonical(it.host) } + val hits = ArrayList<Pair<File, Int>>() + for (root in StorageRoots.list(context)) { + if (!root.readable) continue + for (dir in candidates(rawView(root.dir), SCAN_DEPTH)) { + val games = gameCount(dir) + if (games > 0 && File(dir, "steamapps").canWrite() && taken.none { overlaps(it, canonical(dir)) }) hits += dir to games + } + } + val picked = ArrayList<Pair<File, Int>>() + for (hit in hits.sortedByDescending { it.second }) { + if (picked.none { overlaps(canonical(it.first), canonical(hit.first)) }) picked += hit + } + return picked.map { (dir, games) -> + val shown = File(storagePath(dir.path)) + Found(dir.path, shown.path, defaultLabel(context, shown), games) + } + } + + /** The FUSE view under /storage hides files other apps wrote unless DroidDeck has all files access; the raw card mount does not. */ + private fun rawView(dir: File): File { + if (!dir.path.startsWith("/storage/") || dir.path.startsWith("/storage/emulated")) return dir + val raw = File("/mnt/media_rw/" + dir.path.removePrefix("/storage/")) + return if (raw.canRead() && raw.list() != null) raw else dir + } + + internal fun innerLibrary(picked: File): File? { + if (gameCount(picked) > 0) return null + return candidates(picked, 1).filter { it != picked && gameCount(it) > 0 }.singleOrNull() + } + + internal fun candidates(root: File, depth: Int): List<File> { + val out = arrayListOf(root) + var level = listOf(root) + repeat(depth) { + level = level.flatMap { dir -> + dir.listFiles { f -> f.isDirectory && !f.name.startsWith(".") && f.name != "steamapps" && !(dir == root && f.name == "Android") } + .orEmpty().sortedBy { it.name } + }.take(SCAN_LIMIT - out.size) + out += level + } + return out + } + + internal fun gameCount(library: File): Int = + File(library, "steamapps").list()?.count { it.startsWith("appmanifest_") && it.endsWith(".acf") } ?: 0 + fun rename(context: Context, id: String, label: String) { val name = clean(label).takeIf { it.isNotEmpty() } ?: return synchronized(lock) { save(context, list(context).map { if (it.id == id) Entry(it.id, it.path, name) else it }) } @@ -84,17 +139,27 @@ object SteamLibraries { synchronized(lock) { save(context, list(context).filterNot { it.id == id }) } } - fun defaultLabel(context: Context, folder: File): String { + fun defaultLabel(context: Context, picked: File): String { + val folder = File(storagePath(picked.path)) val volume = try { context.getSystemService(StorageManager::class.java)?.getStorageVolume(folder)?.getDescription(context) } catch (e: Exception) { null } - val name = folder.name.ifEmpty { context.getString(R.string.gstore_folder) } + val parent = folder.parentFile + val named = if (folder.name.equals("Steam", true) && parent != null && !volumeRoot(parent)) parent else folder + val name = named.name.ifEmpty { context.getString(R.string.gstore_folder) } return clean(if (volume.isNullOrBlank()) name else context.getString(R.string.gstore_folder_on_volume, name, volume)) } + private fun volumeRoot(dir: File): Boolean = dir.parent in setOf("/storage", "/mnt/media_rw", "/storage/emulated") || dir.parent == null + internal fun overlaps(a: String, b: String): Boolean = a == b || a.startsWith("$b/") || b.startsWith("$a/") - private fun canonical(file: File): String = runCatching { file.canonicalPath }.getOrDefault(file.absolutePath) + private fun storagePath(path: String): String = if (path.startsWith("/mnt/media_rw/")) "/storage/" + path.removePrefix("/mnt/media_rw/") else path + + private fun canonical(file: File): String = storagePath(runCatching { file.canonicalPath }.getOrDefault(file.absolutePath)) + + private const val SCAN_DEPTH = 2 + private const val SCAN_LIMIT = 4000 } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt index ace3304159..2af7a9bff4 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt @@ -87,7 +87,7 @@ object CloudSaves { val item = sidecar.extra["catalogItemId"].orEmpty() if (ns.isEmpty() || item.isEmpty()) "" else EpicApiClient.getCustomAttribute(token, ns, item, "CloudSaveFolder") } - Store.AMAZON, Store.ITCH, Store.XBOX, Store.BATTLENET -> "" + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET -> "" } ?: return null p.edit() .putString("cloud_template_$id", fetched.ifEmpty { TEMPLATE_NONE }) @@ -148,7 +148,7 @@ object CloudSaves { val dir = when (store) { Store.GOG -> CloudSavePaths.gog(template, pfx, folder) Store.EPIC -> CloudSavePaths.epic(template, pfx, folder, EpicCredentialStore.load(context)?.accountId.orEmpty(), id) - Store.AMAZON, Store.ITCH, Store.XBOX, Store.BATTLENET -> null + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET -> null } return dir to (if (dir == null) "unresolved" else "ok") } @@ -173,7 +173,7 @@ object CloudSaves { val account = EpicCredentialStore.load(context)?.accountId.orEmpty() if (token == null || account.isEmpty()) null else EpicCloud(account, id, token) } - Store.AMAZON, Store.ITCH, Store.XBOX, Store.BATTLENET -> null + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET -> null } private fun gogScopedToken(context: Context, id: String, clientId: String): String? { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt index 79ca0f8492..4e53c5ea08 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt @@ -12,11 +12,13 @@ internal object LoginFlows { Store.GOG -> GogFlow(state, browserUserAgent) Store.EPIC -> epicFlow() Store.AMAZON -> amazonFlow() + Store.GAMEJOLT -> gameJoltFlow(browserUserAgent) Store.ITCH, Store.XBOX, Store.BATTLENET -> null } @Volatile var epicFlow: () -> StoreLoginActivity.Flow? = { null } @Volatile var amazonFlow: () -> StoreLoginActivity.Flow? = { null } + @Volatile var gameJoltFlow: (String) -> StoreLoginActivity.Flow? = { null } private class GogFlow(private val state: String, override val userAgent: String) : StoreLoginActivity.Flow { override val startUrl: String get() = GogAuth.authUrl(state) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt index 54476b6e19..b7d0fbce1c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt @@ -5,9 +5,12 @@ enum class Store(val id: String, val label: String, val shortLabel: String) { EPIC("epic", "Epic Games", "Epic"), AMAZON("amazon", "Amazon Games", "Amazon"), XBOX("xbox", "Xbox", "Xbox"), - ITCH("itch", "itch.io", "itch"), + ITCH("itch", "Itch.io", "Itch.io"), + GAMEJOLT("gamejolt", "Game Jolt", "Game Jolt"), BATTLENET("battlenet", "Battle.net", "Battle.net"); + val folder: String get() = if (this == ITCH) "itch" else shortLabel + companion object { fun byId(id: String?): Store? = entries.firstOrNull { it.id == id } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreArchiveUnpacker.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreArchiveUnpacker.kt new file mode 100644 index 0000000000..ef355cc038 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreArchiveUnpacker.kt @@ -0,0 +1,231 @@ +package com.droiddeck.launcher.stores + +import android.content.Context +import com.droiddeck.launcher.runtime.GuestCommand +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.itch.ItchArchives +import org.apache.commons.compress.MemoryLimitException +import org.apache.commons.compress.archivers.sevenz.SevenZFile +import org.apache.commons.compress.archivers.tar.TarArchiveInputStream +import org.apache.commons.compress.archivers.zip.ZipFile +import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream +import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream +import org.apache.commons.compress.compressors.xz.XZCompressorInputStream +import java.io.BufferedInputStream +import java.io.File +import java.io.FileInputStream +import java.io.FileOutputStream +import java.nio.file.Files +import java.util.concurrent.atomic.AtomicBoolean + +internal class StoreArchiveUnpacker( + private val app: Context, + private val cancelled: AtomicBoolean, + private val label: String, + private val unsupported: Int, + private val extractFailed: Int, + private val logName: String, +) { + var work: File = File("") + + fun unpack(archive: File, filename: String, handle: DownloadQueue.JobHandle) { + when (val kind = ItchArchives.kind(archive, filename)) { + "zip" -> unzip(archive, handle) + "7z" -> try { + sevenZip(archive, handle) + } catch (e: MemoryLimitException) { + handle.log("$label: ${archive.name} needs more memory than the app has, unpacking it in the runtime") + unrar(archive, handle, kind) + } + "rar" -> unrar(archive, handle, kind) + "exe" -> copy(archive, File(work, filename.ifBlank { "game.exe" })) + "tar" -> untar(archive, null, handle) + "gz", "bz2", "xz" -> untar(archive, kind, handle) ?: single(archive, kind, handle) + else -> copy(archive, File(work, filename.ifBlank { "game" })) + } + } + + private fun target(name: String): File? { + val file = File(work, name.replace('\\', '/')) + val root = work.canonicalPath + val path = file.canonicalPath + return if (path == root || path.startsWith(root + File.separator)) file else null + } + + private fun unrar(archive: File, handle: DownloadQueue.JobHandle, kind: String) { + if (!LinuxRuntime.isInstalled(app)) throw IllegalStateException(app.getString(unsupported, kind)) + val binds = if (listOf(app.filesDir, app.cacheDir).any { work.absolutePath.startsWith(it.absolutePath + "/") }) null + else listOf(work.absolutePath) + fun bsdtar(args: List<String>, onLine: (String) -> Unit) = + GuestCommand.run(app, listOf("/usr/bin/bsdtar") + args, logName = logName, extraBinds = binds, fastPath = true, cancelled = cancelled) { line -> + if (!line.startsWith("proot ")) onLine(line) + } + var entries = 0L + bsdtar(listOf("-tf", archive.absolutePath)) { entries++ } + var done = 0L + val tail = ArrayDeque<String>() + val code = bsdtar(listOf("-xvf", archive.absolutePath, "-C", work.absolutePath)) { line -> + if (line.startsWith("x ")) handle.stageProgress(++done, entries) else { + if (tail.size == 5) tail.removeFirst() + tail.addLast(line) + } + } + if (cancelled.get()) return + if (code != 0) { + handle.log("$label: bsdtar exited $code: ${tail.joinToString(" | ")}") + throw IllegalStateException(app.getString(extractFailed, code)) + } + } + + private fun sevenZip(archive: File, handle: DownloadQueue.JobHandle) { + val total = archive.length() + var written = 0L + val buffer = ByteArray(64 * 1024) + val limitKb = (Runtime.getRuntime().maxMemory() / 4 / 1024).coerceIn(32L * 1024, Int.MAX_VALUE.toLong()).toInt() + Files.newByteChannel(archive.toPath()).use { channel -> + SevenZFile.builder().setSeekableByteChannel(channel).setMaxMemoryLimitKb(limitKb).get().use { seven -> + while (true) { + if (cancelled.get()) return + val entry = seven.nextEntry ?: break + val file = target(entry.name) + if (file == null) { + handle.log("$label: skipped an entry outside the game folder") + continue + } + if (entry.isDirectory) { + file.mkdirs() + continue + } + file.parentFile?.mkdirs() + FileOutputStream(file).use { out -> + while (true) { + if (cancelled.get()) return + val read = seven.read(buffer, 0, buffer.size) + if (read < 0) break + out.write(buffer, 0, read) + written += read + handle.stageProgress(written, total) + } + } + } + } + } + } + + private fun untar(archive: File, codec: String?, handle: DownloadQueue.JobHandle): Unit? { + val total = archive.length() + var written = 0L + var entries = 0 + val buffer = ByteArray(64 * 1024) + val opened = runCatching { + FileInputStream(archive).use { raw -> + val stream = when (codec) { + "gz" -> GzipCompressorInputStream(BufferedInputStream(raw)) + "bz2" -> BZip2CompressorInputStream(BufferedInputStream(raw)) + "xz" -> XZCompressorInputStream(BufferedInputStream(raw)) + else -> BufferedInputStream(raw) + } + stream.use { input -> + TarArchiveInputStream(input).use { tar -> + while (true) { + if (cancelled.get()) return null + val entry = tar.nextEntry ?: break + entries++ + val file = target(entry.name) + if (file == null) { + handle.log("$label: skipped an entry outside the game folder") + continue + } + if (entry.isDirectory) { + file.mkdirs() + continue + } + file.parentFile?.mkdirs() + FileOutputStream(file).use { out -> + while (true) { + if (cancelled.get()) return null + val read = tar.read(buffer, 0, buffer.size) + if (read < 0) break + out.write(buffer, 0, read) + written += read + handle.stageProgress(written, total) + } + } + } + } + } + } + true + } + if (opened.isSuccess && entries > 0) return Unit + if (opened.isFailure && codec == null) throw opened.exceptionOrNull() ?: IllegalStateException("tar") + return null + } + + private fun single(archive: File, codec: String, handle: DownloadQueue.JobHandle) { + val name = archive.name.substringBeforeLast('.') + val file = target(name.ifBlank { "game" }) ?: throw IllegalStateException("archive") + file.parentFile?.mkdirs() + val total = archive.length() + var written = 0L + val buffer = ByteArray(64 * 1024) + FileInputStream(archive).use { raw -> + val stream = when (codec) { + "bz2" -> BZip2CompressorInputStream(BufferedInputStream(raw)) + "xz" -> XZCompressorInputStream(BufferedInputStream(raw)) + else -> GzipCompressorInputStream(BufferedInputStream(raw)) + } + stream.use { input -> + FileOutputStream(file).use { out -> + while (true) { + if (cancelled.get()) return + val read = input.read(buffer) + if (read < 0) break + out.write(buffer, 0, read) + written += read + handle.stageProgress(written, total) + } + } + } + } + } + + private fun copy(source: File, target: File) { + target.parentFile?.mkdirs() + FileInputStream(source).use { input -> FileOutputStream(target).use { out -> input.copyTo(out, 128 * 1024) } } + } + + private fun unzip(archive: File, handle: DownloadQueue.JobHandle) { + val total = archive.length() + var written = 0L + val buffer = ByteArray(64 * 1024) + ZipFile.builder().setFile(archive).get().use { zip -> + for (entry in zip.entries) { + if (cancelled.get()) return + val target = target(entry.name) + if (target == null) { + handle.log("$label: skipped an entry outside the game folder") + continue + } + if (entry.isDirectory) { + target.mkdirs() + continue + } + target.parentFile?.mkdirs() + zip.getInputStream(entry).use { input -> + FileOutputStream(target).use { out -> + while (true) { + if (cancelled.get()) return + val read = input.read(buffer) + if (read < 0) break + out.write(buffer, 0, read) + written += read + handle.stageProgress(written, total) + } + } + } + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt index c26bcd17d6..2ba84041f8 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt @@ -218,7 +218,7 @@ object StoreInstallRoot { fun isRemovable(context: Context, folder: File): Boolean = !folder.absolutePath.startsWith(internalRoot(context).absolutePath + "/") - fun storeDir(root: File, store: Store): File = File(root, store.shortLabel) + fun storeDir(root: File, store: Store): File = File(root, store.folder) fun gameFolders(context: Context): List<File> = roots(context).flatMap { root -> Store.entries.flatMap { store -> @@ -246,7 +246,7 @@ object StoreInstallRoot { val sidecar = StoreGameSidecar.read(folder) when { sidecar == null -> Unfinished(store, null, folder) - store == Store.GOG && sidecar.state == StoreGameSidecar.STATE_UPDATING -> null + sidecar.state == StoreGameSidecar.STATE_UPDATING -> null !sidecar.isInstalled -> Unfinished(store, sidecar.id, folder) else -> null } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt index 91d96f6ec5..228d97cd78 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt @@ -273,6 +273,10 @@ class StoreLoginActivity : ComponentActivity() { if (url != null && view != null && flow?.isRedirect(url) == true && flow?.readsPage != true) complete(view, url) } + override fun doUpdateVisitedHistory(view: WebView?, url: String?, isReload: Boolean) { + if (!isPopup && store == Store.GAMEJOLT && url != null && view != null && flow?.isRedirect(url) == true && flow?.readsPage != true) complete(view, url) + } + override fun onPageFinished(view: WebView?, url: String?) { if (url != null && view != null && flow?.readsPage == true && flow?.isRedirect(url) == true) complete(view, url) } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt index 290676c9ed..545c981e50 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt @@ -54,7 +54,7 @@ object StoreSizes { when (item.store) { Store.EPIC -> EpicPrefs.get(app).edit().putLong("size_${item.id}", it).apply() Store.AMAZON -> AmazonPrefs.get(app).edit().putLong("size_${item.id}", it).apply() - Store.ITCH -> {} + Store.ITCH, Store.GAMEJOLT -> {} Store.GOG, Store.XBOX, Store.BATTLENET -> {} } } @@ -113,5 +113,6 @@ object StoreSizes { } Store.GOG, Store.XBOX, Store.BATTLENET -> 0L Store.ITCH -> com.droiddeck.launcher.stores.itch.ItchLibrary.size(context, item) + Store.GAMEJOLT -> com.droiddeck.launcher.stores.gamejolt.GameJoltBuilds.size(context, item) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt index cf774f47bd..f28c402e8e 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -81,7 +81,7 @@ object StoresState { runCatching { com.droiddeck.launcher.stores.battlenet.BattleNetClient.syncAccount(app) } val found = Store.entries.mapNotNull { store -> StoreAccounts.displayName(app, store)?.let { store to it } } val onDisk = StoreInstallRoot.gameFolders(app).mapNotNull { folder -> - StoreGameSidecar.read(folder)?.takeIf { it.isInstalled || it.store == Store.GOG && it.state == StoreGameSidecar.STATE_UPDATING }?.let { InstalledStoreGame(it, folder) } + StoreGameSidecar.read(folder)?.takeIf { it.isInstalled || it.state == StoreGameSidecar.STATE_UPDATING }?.let { InstalledStoreGame(it, folder) } } + runCatching { com.droiddeck.launcher.stores.battlenet.BattleNetBackend.installedGames(app) }.getOrDefault(emptyList()) val partial = StoreInstallRoot.unfinished(app) val version = if (StoresNative.available) StoresNative.version ?: "" else "" @@ -131,7 +131,11 @@ object StoresState { fun detailItem(store: Store, id: String): CatalogItem? = detailCatalogItem( store, id, library[store].orEmpty(), - found[store].orEmpty() + if (store == Store.ITCH) com.droiddeck.launcher.stores.itch.ItchBrowseState.items + com.droiddeck.launcher.stores.itch.ItchCollections.items() else emptyList(), + found[store].orEmpty() + when (store) { + Store.ITCH -> com.droiddeck.launcher.stores.itch.ItchBrowseState.items + com.droiddeck.launcher.stores.itch.ItchCollections.items() + Store.GAMEJOLT -> com.droiddeck.launcher.stores.gamejolt.GameJoltBrowseState.items + com.droiddeck.launcher.stores.gamejolt.GameJoltCollections.items() + else -> emptyList() + }, shelves[store], ) @@ -191,6 +195,10 @@ object StoresState { backend?.signOut(app) if (store == Store.GOG) com.droiddeck.launcher.stores.gog.GogComet.replaceAccount { StoreAccounts.clear(app, store) } else if (store != Store.XBOX || backend == null) StoreAccounts.clear(app, store) + if (store == Store.GAMEJOLT) { + com.droiddeck.launcher.stores.gamejolt.GameJoltCollections.clear() + com.droiddeck.launcher.stores.gamejolt.GameJoltUpdates.clear(app) + } if (store == Store.ITCH) { com.droiddeck.launcher.stores.itch.ItchCollections.clear() com.droiddeck.launcher.stores.itch.ItchUpdates.clear(app) @@ -218,10 +226,12 @@ object StoresState { var pendingInstall by mutableStateOf<CatalogItem?>(null) var itchPicking by mutableStateOf<CatalogItem?>(null) + var gameJoltPicking by mutableStateOf<CatalogItem?>(null) fun requestInstall(context: Context, item: CatalogItem) { askForNotifications(context) if (item.store == Store.ITCH && item.extra["uploadId"].isNullOrEmpty()) { itchPicking = item; return } + if (item.store == Store.GAMEJOLT && item.extra["buildId"].isNullOrEmpty()) { gameJoltPicking = item; return } if (isUnfinished(item)) { install(context, item); return } val targets = StoreInstallRoot.targets(context) val preferred = StoreInstallRoot.defaultTarget(context) @@ -285,6 +295,7 @@ object StoresState { installed = installed.filterNot { it.folder.absolutePath == game.folder.absolutePath } uninstalling.remove(key) if (game.sidecar.store == Store.ITCH) com.droiddeck.launcher.stores.itch.ItchUpdates.applied(app, key) + if (game.sidecar.store == Store.GAMEJOLT) com.droiddeck.launcher.stores.gamejolt.GameJoltUpdates.applied(app, key) } }) main.post(onDone) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltApi.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltApi.kt new file mode 100644 index 0000000000..fce0696a15 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltApi.kt @@ -0,0 +1,72 @@ +package com.droiddeck.launcher.stores.gamejolt + +import com.droiddeck.launcher.stores.StoreNet +import org.json.JSONObject +import java.net.HttpURLConnection +import java.net.URL +import java.net.URLEncoder + +internal class GameJoltAnswer(val code: Int, val json: JSONObject?) { + val ok: Boolean get() = code in 200..299 + val payload: JSONObject? get() = json?.optJSONObject("payload") + val user: JSONObject? get() = json?.optJSONObject("user") +} + +internal object GameJoltApi { + const val SITE = "https://gamejolt.com" + const val LOGIN = "$SITE/login" + + private const val BASE = "$SITE/site-api" + private const val MAX_BYTES = 6_000_000 + + fun get(path: String, cookies: String = ""): GameJoltAnswer = send("GET", path, cookies, null) + + fun post(path: String, cookies: String = "", body: String = ""): GameJoltAnswer = send("POST", path, cookies, body) + + fun overview(gameId: String, cookies: String): GameJoltAnswer = get("/web/discover/games/overview/$gameId", cookies) + + fun search(query: String, page: Int, cookies: String): GameJoltAnswer = + get("/web/search/games?q=${URLEncoder.encode(query, "UTF-8")}&page=$page", cookies) + + fun browse(queryString: String, cookies: String): GameJoltAnswer = get("/web/discover/games?$queryString", cookies) + + fun pageUrl(slug: String, id: String): String = "$SITE/games/$slug/$id" + + private fun readBounded(input: java.io.InputStream): String { + val out = java.io.ByteArrayOutputStream() + val buffer = ByteArray(16 * 1024) + while (out.size() < MAX_BYTES) { + val read = input.read(buffer, 0, minOf(buffer.size, MAX_BYTES - out.size())) + if (read < 0) break + out.write(buffer, 0, read) + } + return out.toString(Charsets.UTF_8.name()) + } + + private fun send(method: String, path: String, cookies: String, body: String?): GameJoltAnswer { + var conn: HttpURLConnection? = null + return try { + conn = (URL(BASE + path).openConnection() as HttpURLConnection).apply { + connectTimeout = 25_000 + readTimeout = 25_000 + requestMethod = method + setRequestProperty("User-Agent", StoreNet.BROWSER_UA) + setRequestProperty("Accept", "application/json") + if (cookies.isNotBlank()) setRequestProperty("Cookie", cookies) + if (body != null) { + doOutput = true + setRequestProperty("Content-Type", "application/x-www-form-urlencoded") + } + } + if (body != null) conn.outputStream.use { it.write(body.toByteArray()) } + val code = conn.responseCode + val stream = if (code in 200..399) conn.inputStream else conn.errorStream + val text = stream?.use { readBounded(it) }.orEmpty() + GameJoltAnswer(code, runCatching { JSONObject(text) }.getOrNull()) + } catch (e: Exception) { + GameJoltAnswer(0, null) + } finally { + runCatching { conn?.disconnect() } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltAuth.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltAuth.kt new file mode 100644 index 0000000000..1cc9f05758 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltAuth.kt @@ -0,0 +1,24 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreAccounts +import org.json.JSONObject + +internal object GameJoltAuth { + fun cookies(context: Context): String = StoreAccounts.read(context.applicationContext, Store.GAMEJOLT)?.optString("access_token").orEmpty() + + fun save(context: Context, cookies: String, user: JSONObject) { + val name = user.optString("display_name").ifBlank { user.optString("username") } + StoreAccounts.write( + context.applicationContext, Store.GAMEJOLT, + JSONObject().put("access_token", cookies).put("user_id", user.optLong("id").toString()).put("username", user.optString("username")).put("display_name", name), + ) + } + + fun username(context: Context): String = StoreAccounts.read(context.applicationContext, Store.GAMEJOLT)?.optString("username").orEmpty() + + fun userId(context: Context): String = StoreAccounts.read(context.applicationContext, Store.GAMEJOLT)?.optString("user_id").orEmpty() + + fun clear(context: Context) = StoreAccounts.clear(context.applicationContext, Store.GAMEJOLT) +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBackend.kt new file mode 100644 index 0000000000..09444f42a8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBackend.kt @@ -0,0 +1,86 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import android.content.Intent +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.LoginFlows +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreBackend +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.StoreLoginActivity +import com.droiddeck.launcher.stores.StoreShelves +import com.droiddeck.launcher.stores.StoreSizes +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.download.DownloadEntry +import com.droiddeck.launcher.stores.download.DownloadQueue +import java.io.File + +object GameJoltBackend : StoreBackend { + override val store: Store = Store.GAMEJOLT + + init { + LoginFlows.gameJoltFlow = { agent -> GameJoltLogin(agent) } + } + + override fun signIn(context: Context) { + context.startActivity( + Intent(context, StoreLoginActivity::class.java) + .putExtra(StoreLoginActivity.EXTRA_STORE, store.id) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), + ) + } + + override fun signOut(context: Context) { + val app = context.applicationContext + GameJoltPrefs.get(app).edit().clear().apply() + GameJoltAuth.clear(app) + GameJoltLibrary.reset() + StoresState.post { + StoresState.library.remove(store) + StoresState.shelves.remove(store) + StoresState.found.remove(store) + StoresState.problems.remove(store) + StoresState.status.remove(store) + } + } + + override fun syncLibrary(context: Context, force: Boolean) { + val app = context.applicationContext + if (force) GameJoltLibrary.reset() + Thread({ GameJoltLibrary.sync(app, force) }, "gamejolt-sync").start() + } + + override fun loadShelves(context: Context, force: Boolean) { + StoresState.post { StoresState.shelves[store] = StoreShelves() } + } + + override fun search(context: Context, query: String): List<CatalogItem> { + val cookies = GameJoltAuth.cookies(context) + val items = ArrayList<CatalogItem>() + for (page in 1..2) { + val answer = GameJoltApi.search(query, page, cookies) + val found = if (answer.ok) GameJoltCatalog.items(answer.payload?.optJSONArray("games")) else emptyList() + if (found.isEmpty()) break + items.addAll(found) + } + StoresState.logLine("Game Jolt search: \"$query\" returned ${items.size} games") + return items.distinctBy { it.id } + } + + override fun install(context: Context, item: CatalogItem, root: File) { + val app = context.applicationContext + if (!item.isFree && !item.owned) { + StoresState.logLine("Game Jolt: \"${item.title}\" is a paid game, opening its page instead") + return + } + val folder = StoreInstallRoot.folderFor(app, Store.GAMEJOLT, item.id, item.title, root) + val entry = DownloadEntry( + Store.GAMEJOLT, item.id, item.title, cover = item.imageUrl, bytesTotal = StoreSizes.size(item), + location = StoreInstallRoot.labelFor(app, folder), + ) + DownloadQueue.enqueue(app, entry) { GameJoltInstaller(app, item, folder) } + } + + override fun uninstall(context: Context, game: InstalledStoreGame) {} +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowse.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowse.kt new file mode 100644 index 0000000000..4aa8df90da --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowse.kt @@ -0,0 +1,163 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.stores.StoresState +import java.net.URLEncoder + +internal data class GameJoltQuery( + val section: String = GameJoltBrowse.SECTION_FEATURED, + val price: String = GameJoltBrowse.PRICE_ANY, + val os: Set<String> = emptySet(), + val browser: Set<String> = emptySet(), + val maturity: Set<String> = emptySet(), + val status: Set<String> = emptySet(), + val partners: Boolean = false, + val tags: List<String> = emptyList(), +) + +internal object GameJoltBrowse { + const val SECTION_FEATURED = "featured" + const val SECTION_HOT = "hot" + const val SECTION_BEST = "best" + const val SECTION_NEW = "new" + val sections = listOf(SECTION_FEATURED, SECTION_HOT, SECTION_BEST, SECTION_NEW) + + const val PRICE_ANY = "any" + const val PRICE_FREE = "free" + const val PRICE_SALE = "sale" + const val PRICE_PAID = "paid" + const val PRICE_UNDER_5 = "5-less" + const val PRICE_UNDER_15 = "15-less" + const val PRICE_UNDER_30 = "30-less" + val prices = listOf(PRICE_ANY, PRICE_FREE, PRICE_SALE, PRICE_PAID, PRICE_UNDER_5, PRICE_UNDER_15, PRICE_UNDER_30) + + val systems = listOf("windows", "mac", "linux", "other") + val browsers = listOf("html", "flash", "unity") + val maturities = listOf("everyone", "teen", "adult") + val statuses = listOf("complete", "wip") + + fun tagSlug(tag: String): String = tag.trim().lowercase().replace(Regex("[^a-z0-9]+"), "-").trim('-') + + fun queryString(query: GameJoltQuery, page: Int): String { + val parts = ArrayList<String>() + parts.add("section=${query.section.takeIf { it in sections } ?: SECTION_FEATURED}") + query.tags.forEach { parts.add("tag=" + enc(tagSlug(it))) } + if (query.price != PRICE_ANY && query.price in prices) parts.add("f_price=${query.price}") + systems.filter { it in query.os }.forEach { parts.add("f_os%5B%5D=$it") } + browsers.filter { it in query.browser }.forEach { parts.add("f_browser%5B%5D=$it") } + maturities.filter { it in query.maturity }.forEach { parts.add("f_maturity%5B%5D=$it") } + statuses.filter { it in query.status }.forEach { parts.add("f_status%5B%5D=$it") } + if (query.partners) parts.add("f_partners%5B%5D=partners") + if (page > 1) parts.add("page=$page") + return parts.joinToString("&") + } + + private fun enc(value: String): String = URLEncoder.encode(value, "UTF-8") + + class Page(val items: List<CatalogItem>, val code: Int, val rawIds: List<String>) + + fun effective(query: GameJoltQuery, showMature: Boolean): GameJoltQuery { + val playable = query.copy(status = query.status.filterTo(HashSet()) { it in statuses }.ifEmpty { statuses.toSet() }) + if (showMature) return playable + val allowed = playable.maturity - "adult" + return playable.copy(maturity = allowed.ifEmpty { setOf("everyone", "teen") }) + } + + fun page(context: Context, query: GameJoltQuery, page: Int, showMature: Boolean): Page { + val cookies = GameJoltAuth.cookies(context) + val asked = effective(query, showMature) + val answer = fetch(queryString(asked, page), cookies) + val all = if (answer.ok) GameJoltCatalog.items(answer.payload?.optJSONArray("games")) else emptyList() + return Page(all, answer.code, all.map { it.id }) + } + + private fun fetch(qs: String, cookies: String): GameJoltAnswer { + val answer = GameJoltApi.browse(qs, cookies) + val games = if (answer.ok) answer.payload?.optJSONArray("games") else null + StoresState.logLine("Game Jolt browse: ?$qs answered ${answer.code} with ${games?.length() ?: 0} games") + return answer + } +} + +internal object GameJoltBrowseState { + var query by mutableStateOf(GameJoltQuery()) + private set + var items by mutableStateOf<List<CatalogItem>>(emptyList()) + private set + var loading by mutableStateOf(false) + private set + var ended by mutableStateOf(false) + private set + var failed by mutableStateOf(false) + private set + + private var next = 1 + private var generation = 0 + private var loadedMature: Boolean? = null + private val seenRaw = HashSet<String>() + + fun sync(context: Context, showMature: Boolean) { + if (!showMature && "adult" in query.maturity) { + reset() + query = query.copy(maturity = query.maturity - "adult") + more(context) + return + } + val before = loadedMature ?: return + if (before != showMature) more(context) + } + + private fun reset() { + generation++ + items = emptyList() + ended = false + failed = false + loading = false + next = 1 + seenRaw.clear() + } + + fun choose(context: Context, wanted: GameJoltQuery) { + if (wanted == query) return + reset() + query = wanted + more(context) + } + + fun more(context: Context, retry: Boolean = false) { + val app = context.applicationContext + val mature = SessionPrefs.storesShowMature(app) + if (loadedMature != null && loadedMature != mature) reset() + if (loading || ended || (failed && !retry)) return + loading = true + failed = false + val mine = generation + val asked = query + val page = next + loadedMature = mature + Thread({ + val answer = runCatching { GameJoltBrowse.page(app, asked, page, mature) }.getOrNull() + StoresState.post { + if (mine != generation) return@post + loading = false + if (answer == null || answer.code !in 200..299) { + failed = true + return@post + } + if (answer.rawIds.filter { seenRaw.add(it) }.isEmpty()) { + ended = true + return@post + } + next = page + 1 + val known = items.mapTo(HashSet()) { it.id } + val fresh = answer.items.filter { known.add(it.id) } + if (fresh.isEmpty()) more(app) else items = items + fresh + } + }, "gamejolt-browse").start() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuilds.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuilds.kt new file mode 100644 index 0000000000..a014e7d6ec --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuilds.kt @@ -0,0 +1,85 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import com.droiddeck.launcher.stores.CatalogItem +import org.json.JSONArray +import org.json.JSONObject + +internal class GameJoltBuild( + val id: String, + val packageId: String, + val packageTitle: String, + val version: String, + val filename: String, + val size: Long, + val stamp: String, + val platforms: Set<String>, + val folder: String, + val executable: String, +) { + val installable: Boolean get() = "windows" in platforms +} + +internal object GameJoltBuilds { + fun parse(payload: JSONObject?): List<GameJoltBuild> { + if (payload == null) return emptyList() + val packages = objects(payload.optJSONArray("packages")).associate { it.optLong("id") to it.optString("title") } + val releases = objects(payload.optJSONArray("releases")).associateBy { it.optLong("id") } + val launch = objects(payload.optJSONArray("launchOptions")) + val builds = objects(payload.optJSONArray("builds")).filter { it.optJSONObject("primary_file") != null } + val newest = builds.groupBy { it.optLong("game_package_id") }.mapValues { (_, list) -> + list.maxOfOrNull { releaseRank(releases[it.optLong("game_release_id")], it.optLong("game_release_id")) } + } + return builds + .filter { newest[it.optLong("game_package_id")] == releaseRank(releases[it.optLong("game_release_id")], it.optLong("game_release_id")) } + .map { build -> + val file = build.optJSONObject("primary_file") + val release = releases[build.optLong("game_release_id")] + val id = build.optLong("id") + GameJoltBuild( + id = id.toString(), + packageId = build.optLong("game_package_id").toString(), + packageTitle = packages[build.optLong("game_package_id")].orEmpty(), + version = release?.optString("version_number").orEmpty(), + filename = file?.optString("filename").orEmpty().substringAfterLast('/').substringAfterLast('\\'), + size = file?.optLong("filesize") ?: 0L, + stamp = release?.optLong("published_on")?.takeIf { it > 0L }?.toString().orEmpty(), + platforms = platforms(build), + folder = build.optString("folder"), + executable = launch.firstOrNull { it.optLong("game_build_id") == id && it.optString("os").startsWith("windows") }?.optString("executable_path").orEmpty(), + ) + } + .sortedWith(compareByDescending<GameJoltBuild> { it.installable }.thenByDescending { it.stamp.toLongOrNull() ?: 0L }.thenByDescending { it.id.toLongOrNull() ?: 0L }) + } + + fun platforms(build: JSONObject): Set<String> { + val found = LinkedHashSet<String>() + if (build.optBoolean("os_windows") || build.optBoolean("os_windows_64")) found.add("windows") + if (build.optBoolean("os_linux") || build.optBoolean("os_linux_64")) found.add("linux") + if (build.optBoolean("os_mac") || build.optBoolean("os_mac_64")) found.add("osx") + if (build.optBoolean("os_other")) found.add("other") + return if (found.isEmpty()) setOf("web") else found + } + + fun load(context: Context, gameId: String): List<GameJoltBuild>? { + val answer = GameJoltApi.overview(gameId, GameJoltAuth.cookies(context)) + if (!answer.ok) return null + return parse(answer.payload) + } + + fun byId(builds: List<GameJoltBuild>, id: String): GameJoltBuild? = builds.firstOrNull { it.id == id } + + fun preferred(builds: List<GameJoltBuild>): GameJoltBuild? = builds.firstOrNull { it.installable } + + fun size(context: Context, item: CatalogItem): Long { + val gameId = item.extra["gameId"].orEmpty().ifEmpty { item.id } + val builds = load(context, gameId) ?: return 0L + val chosen = item.extra["buildId"]?.let { byId(builds, it) } ?: preferred(builds) + return chosen?.size ?: 0L + } + + private fun releaseRank(release: JSONObject?, id: Long): Long = (release?.optLong("published_on") ?: 0L) * 1_000_000L + id + + private fun objects(array: JSONArray?): List<JSONObject> = + if (array == null) emptyList() else (0 until array.length()).mapNotNull { array.optJSONObject(it) } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCatalog.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCatalog.kt new file mode 100644 index 0000000000..5303d65b47 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCatalog.kt @@ -0,0 +1,76 @@ +package com.droiddeck.launcher.stores.gamejolt + +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.cleanStoreText +import org.json.JSONArray +import org.json.JSONObject +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale +import java.util.TimeZone +import java.util.concurrent.atomic.AtomicBoolean + +internal object GameJoltCatalog { + private const val PAID = "paid" + private val sellableLogged = AtomicBoolean(false) + + fun items(games: JSONArray?, owned: Boolean = false): List<CatalogItem> { + if (games == null) return emptyList() + return (0 until games.length()).mapNotNull { games.optJSONObject(it)?.let { game -> item(game, owned) } }.distinctBy { it.id } + } + + fun item(game: JSONObject, owned: Boolean = false): CatalogItem? { + val id = game.optLong("id") + if (id <= 0L) return null + val slug = game.optString("slug") + val sellable = game.optJSONObject("sellable") + val paid = sellable?.optString("type") == PAID + if (paid) noteSellable(sellable) + val developer = game.optJSONObject("developer") + val author = developer?.optString("display_name").orEmpty().ifBlank { developer?.optString("username").orEmpty() } + val thumbnail = game.optJSONObject("thumbnail_media_item")?.optString("img_url").orEmpty().ifBlank { game.optString("img_thumbnail") } + val header = game.optJSONObject("header_media_item")?.optString("img_url").orEmpty().ifBlank { game.optString("img_thumbnail") } + val price = if (paid) GameJoltPricing.of(sellable) else null + val compatibility = game.optJSONObject("compatibility") + val tags = buildList { + if (compatibility?.optBoolean("os_windows") == true) add("Windows") + if (compatibility?.optBoolean("os_linux") == true) add("Linux") + if (compatibility?.optBoolean("os_mac") == true) add("macOS") + }.joinToString(", ") + return CatalogItem( + store = Store.GAMEJOLT, + id = id.toString(), + title = game.optString("title").ifBlank { "Game Jolt game $id" }, + imageUrl = header.ifBlank { null }, + tallImageUrl = thumbnail.ifBlank { null }, + tags = tags, + isFree = !paid, + hasPrice = paid, + finalPrice = price?.final.orEmpty(), + originalPrice = price?.original.orEmpty(), + discountPercent = price?.discount ?: 0, + owned = owned, + storeUrl = GameJoltApi.pageUrl(slug.ifBlank { "game" }, id.toString()), + developer = author, + publisher = author, + releaseDate = date(game.optLong("published_on")), + description = cleanStoreText(game.optString("description")), + mature = game.optBoolean("has_adult_content"), + extra = mapOf("gameId" to id.toString(), "slug" to slug), + ) + } + + private fun noteSellable(sellable: JSONObject?) { + if (sellable == null || !sellableLogged.compareAndSet(false, true)) return + val pricing = sellable.optJSONArray("pricings")?.optJSONObject(0) + StoresState.logLine("Game Jolt: a paid game carries sellable keys [${sellable.keys().asSequence().joinToString(",")}] and pricing keys [${pricing?.keys()?.asSequence()?.joinToString(",").orEmpty()}]") + } + + private fun date(stamp: Long): String { + if (stamp <= 0L) return "" + val millis = if (stamp > 100_000_000_000L) stamp else stamp * 1000L + return SimpleDateFormat("yyyy-MM-dd", Locale.US).apply { timeZone = TimeZone.getTimeZone("UTC") }.format(Date(millis)) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollections.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollections.kt new file mode 100644 index 0000000000..887a071acb --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollections.kt @@ -0,0 +1,120 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateMapOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.StoresState +import org.json.JSONArray +import org.json.JSONObject +import java.net.URLEncoder +import java.util.concurrent.ConcurrentHashMap + +internal class GameJoltCollection(val id: String, val title: String) + +internal object GameJoltCollections { + const val FOLLOWED = "followed" + private const val PLAYLIST = "playlist:" + + var list by mutableStateOf<List<GameJoltCollection>>(emptyList()) + private set + var selected by mutableStateOf<String?>(null) + private set + private val games = mutableStateMapOf<String, List<CatalogItem>>() + private val loading = ConcurrentHashMap.newKeySet<String>() + @Volatile private var generation = 0 + + fun items(): List<CatalogItem> = games.values.flatten() + + fun gamesOf(id: String): List<CatalogItem>? = games[id] + + fun chosen(): GameJoltCollection? = list.firstOrNull { it.id == selected } + + fun clear() { + generation++ + StoresState.post { + list = emptyList() + selected = null + games.clear() + } + } + + fun load(context: Context) { + val app = context.applicationContext + val started = generation + val guard = "$started:" + if (!loading.add(guard)) return + Thread({ + try { + val cookies = GameJoltAuth.cookies(app) + if (cookies.isBlank()) return@Thread + val playlists = playlists(cookies) ?: return@Thread + val parsed = listOf(GameJoltCollection(FOLLOWED, app.getString(R.string.stores_gamejolt_followed))) + parse(playlists) + if (started != generation) return@Thread + StoresState.post { + if (started != generation) return@post + list = parsed + if (selected != null && parsed.none { it.id == selected }) selected = null + } + StoresState.logLine("Game Jolt: ${parsed.size} collections") + selected?.let { fetchGames(app, it, started) } + } finally { + loading.remove(guard) + } + }, "gamejolt-collections").start() + } + + fun select(context: Context, id: String?) { + selected = id + if (id == null) return + val app = context.applicationContext + val started = generation + Thread({ fetchGames(app, id, started) }, "gamejolt-collection-games").start() + } + + private fun playlists(cookies: String): JSONArray? { + val library = GameJoltApi.get("/web/library", cookies) + if (!library.ok) return null + library.payload?.optJSONArray("playlists")?.let { return it } + val nested = library.payload?.optJSONArray("collections") + if (nested != null) { + val out = JSONArray() + for (i in 0 until nested.length()) nested.optJSONObject(i)?.optJSONObject("playlist")?.let { out.put(it) } + if (out.length() > 0) return out + } + return GameJoltApi.get("/web/library/playlists", cookies).takeIf { it.ok }?.payload?.optJSONArray("playlists") ?: JSONArray() + } + + internal fun parse(playlists: JSONArray): List<GameJoltCollection> = (0 until playlists.length()).mapNotNull { i -> + val playlist = playlists.optJSONObject(i) ?: return@mapNotNull null + val id = playlist.optLong("id").takeIf { it > 0L } ?: return@mapNotNull null + val title = playlist.optString("name").ifBlank { return@mapNotNull null } + GameJoltCollection("$PLAYLIST$id", title) + } + + internal fun path(id: String, username: String): String? = when { + id == FOLLOWED -> "/web/library/games/followed/@${URLEncoder.encode(username, "UTF-8")}" + id.startsWith(PLAYLIST) -> id.removePrefix(PLAYLIST).toLongOrNull()?.let { "/web/library/games/playlist/$it" } + else -> null + } + + private fun fetchGames(app: Context, id: String, started: Int) { + val guard = "$started:$id" + if (!loading.add(guard)) return + try { + val path = path(id, GameJoltAuth.username(app)) ?: return + val found = GameJoltLibrary.games(app, path, false) + if (found == null) { + StoresState.logLine("Game Jolt: collection $id failed") + return + } + StoresState.post { if (started == generation) games[id] = found } + StoresState.logLine("Game Jolt: collection $id has ${found.size} games") + } finally { + loading.remove(guard) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltInstaller.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltInstaller.kt new file mode 100644 index 0000000000..c6653bf9be --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltInstaller.kt @@ -0,0 +1,239 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreArchiveUnpacker +import com.droiddeck.launcher.stores.StoreExe +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.StoreInstalls +import com.droiddeck.launcher.stores.StoreNet +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.download.DownloadStage +import com.droiddeck.launcher.stores.itch.ItchArchives +import com.droiddeck.launcher.stores.itch.ItchStaging +import java.io.File +import java.io.FileOutputStream +import java.net.HttpURLConnection +import java.net.URL +import java.util.concurrent.atomic.AtomicBoolean + +internal class GameJoltInstaller( + private val app: Context, + private val item: CatalogItem, + private val folder: File, +) : DownloadQueue.DownloadJob { + private val cancelled = AtomicBoolean(false) + private var work: File = folder + private var updating = false + private var previous: StoreGameSidecar? = null + private val commit = Any() + private val unpacker = StoreArchiveUnpacker(app, cancelled, "Game Jolt", R.string.stores_gamejolt_archive, R.string.stores_gamejolt_extract_failed, "gamejolt-unrar") + + override fun run(handle: DownloadQueue.JobHandle): String? { + val cookies = GameJoltAuth.cookies(app) + if (cookies.isBlank()) throw IllegalStateException(app.getString(R.string.stores_sync_sign_in)) + if (!item.isFree && !item.owned) throw IllegalStateException(app.getString(R.string.stores_gamejolt_not_owned)) + val gameId = item.extra["gameId"].orEmpty().ifEmpty { item.id } + val before = StoreGameSidecar.read(folder) + previous = before + updating = before != null && (before.isInstalled || before.state == StoreGameSidecar.STATE_UPDATING) + val resuming = before?.let { it.state == StoreGameSidecar.STATE_INSTALLING && it.id == item.id } == true + StoreInstalls.begin(folder, Store.GAMEJOLT, item.id, item.title, item.imageUrl, item.imageUrl) + handle.stage(DownloadStage.MANIFEST) + val builds = GameJoltBuilds.load(app, gameId) ?: throw IllegalStateException(app.getString(R.string.stores_gamejolt_no_game)) + val chosen = item.extra["buildId"].orEmpty() + val build = (if (chosen.isBlank()) GameJoltBuilds.preferred(builds) else GameJoltBuilds.byId(builds, chosen))?.takeIf { it.installable } + ?: throw IllegalStateException(app.getString(R.string.stores_gamejolt_no_build)) + handle.log("Game Jolt: installing build ${build.id} (${build.filename}, ${build.size} bytes, platforms ${build.platforms.joinToString(",")}, launch ${build.executable.ifBlank { "none" }})") + val scratch = StoreInstallRoot.scratchDir(app, Store.GAMEJOLT, item.id) + scratch.mkdirs() + val filename = build.filename.trim().takeUnless { it.isBlank() || it == "." || it == ".." } ?: "download.bin" + val archive = File(scratch, filename) + val exe = try { + handle.stage(DownloadStage.DOWNLOAD) + download(build, archive, handle) + if (cancelled.get()) return null + handle.stage(DownloadStage.INSTALL) + install(build, archive, filename, handle, resuming) + } catch (t: Throwable) { + if (!cancelled.get()) dropCaches(scratch) + throw t + } + if (exe == null) { + if (cancelled.get()) return null + dropCaches(scratch) + throw IllegalStateException(app.getString(R.string.stores_gamejolt_no_exe)) + } + archive.delete() + StoreInstalls.deleteTree(scratch) + val sidecar = StoreGameSidecar( + store = Store.GAMEJOLT, + id = item.id, + title = item.title, + exe = exe, + args = previous?.args.orEmpty(), + env = previous?.env.orEmpty(), + installVersion = build.stamp, + installedAt = System.currentTimeMillis(), + cover = item.imageUrl, + hero = item.imageUrl, + extra = mapOf("gameId" to gameId, "buildId" to build.id, "packageId" to build.packageId) + (if (item.isFree) emptyMap() else mapOf("paid" to "1")), + cloud = false, + ) + StoreInstalls.complete(app, folder, sidecar) { done, steps -> handle.stageProgress(done.toLong(), steps.toLong()) } + GameJoltUpdates.applied(app, item.key) + return folder.path + } + + override fun cancel(deleteFiles: Boolean) { + cancelled.set(true) + if (deleteFiles) dropCaches(StoreInstallRoot.scratchDir(app, Store.GAMEJOLT, item.id)) + } + + private fun dropCaches(scratch: File) { + if (!updating) { + StoreInstalls.discard(app, folder, listOf(scratch)) + return + } + synchronized(commit) { + StoreInstalls.deleteTree(scratch) + ItchStaging.delete(File(folder, ItchStaging.DIR)) + } + } + + private fun download(build: GameJoltBuild, target: File, handle: DownloadQueue.JobHandle) { + val origin = File(target.path + ".from") + val stamp = "${build.id} ${build.stamp} ${build.size}" + if (!target.isFile || runCatching { origin.readText() }.getOrNull() != stamp) { + target.delete() + origin.writeText(stamp) + } + val expected = build.size + if (expected > 0 && target.length() == expected) { + handle.progress(expected, expected) + return + } + for (attempt in 0..1) { + val have = target.length() + val url = downloadLink(build) + var conn: HttpURLConnection? = null + try { + conn = (URL(url).openConnection() as HttpURLConnection).apply { + connectTimeout = 30_000 + readTimeout = 60_000 + instanceFollowRedirects = true + setRequestProperty("User-Agent", StoreNet.BROWSER_UA) + setRequestProperty("Accept", "*/*") + if (have > 0) setRequestProperty("Range", "bytes=$have-") + } + val code = conn.responseCode + if (code == 416 && attempt == 0) { + target.delete() + continue + } + if (code !in 200..299) throw IllegalStateException(app.getString(R.string.stores_gamejolt_download_failed, code)) + val append = code == 206 && have > 0 + if (have > 0) handle.log(if (append) "Game Jolt: resuming at $have bytes" else "Game Jolt: server ignored the resume, starting over") + var done = if (append) have else 0L + val total = conn.contentLengthLong.takeIf { it > 0 }?.let { if (append) it + have else it } ?: expected + handle.progress(done, total) + val buffer = ByteArray(128 * 1024) + conn.inputStream.use { input -> + FileOutputStream(target, append).use { out -> + while (true) { + if (cancelled.get()) return + val read = input.read(buffer) + if (read < 0) break + out.write(buffer, 0, read) + done += read + handle.progress(done, total) + } + } + } + if (total > 0 && done < total) throw IllegalStateException(app.getString(R.string.stores_gamejolt_download_failed, code)) + return + } finally { + runCatching { conn?.disconnect() } + } + } + } + + private fun downloadLink(build: GameJoltBuild): String { + val answer = GameJoltApi.post("/web/discover/games/builds/get-download-url/${build.id}", GameJoltAuth.cookies(app)) + val url = answer.payload?.optString("url").orEmpty() + if (url.startsWith("https://")) return url + throw IllegalStateException( + when { + answer.code == 0 -> app.getString(R.string.stores_gamejolt_download_unreachable) + answer.ok -> app.getString(R.string.stores_gamejolt_download_no_link) + else -> app.getString(R.string.stores_gamejolt_download_failed, answer.code) + }, + ) + } + + private fun clearPartialInstall() { + folder.listFiles()?.forEach { + if (it.name == StoreGameSidecar.FILE_NAME) return@forEach + if (it.isDirectory) StoreInstalls.deleteTree(it) else it.delete() + } + } + + private fun install(build: GameJoltBuild, archive: File, filename: String, handle: DownloadQueue.JobHandle, resuming: Boolean): String? { + work = if (updating) File(folder, ItchStaging.DIR) else folder + if (updating) ItchStaging.delete(work) + work.mkdirs() + unpacker.work = work + if (resuming) clearPartialInstall() + val exe = try { + val kind = ItchArchives.kind(archive, filename) + if (kind == "exe") archive.copyTo(File(work, filename), overwrite = true) else unpacker.unpack(archive, filename, handle) + var picked = pick(build, filename) + var passes = 0 + while (picked.isBlank() && passes < 2 && !cancelled.get()) { + val inner = ItchArchives.inner(work) ?: break + handle.log("Game Jolt: no exe yet, unpacking ${inner.name}") + unpacker.unpack(inner, inner.name, handle) + if (cancelled.get()) break + inner.delete() + picked = pick(build, inner.name.substringBeforeLast('.').takeIf { it.endsWith(".exe", ignoreCase = true) }) + passes++ + } + picked + } catch (t: Throwable) { + if (updating) ItchStaging.delete(work) + throw t + } + if (exe.isBlank()) { + handle.log("Game Jolt: no exe found in ${folder.name}") + if (updating) ItchStaging.delete(work) + return null + } + if (updating) synchronized(commit) { + if (cancelled.get()) { + ItchStaging.delete(work) + return null + } + try { + StoreInstalls.markUpdating(folder) + } catch (t: Throwable) { + ItchStaging.delete(work) + throw t + } + ItchStaging.merge(work, folder) + ItchStaging.delete(work) + } + return exe + } + + private fun pick(build: GameJoltBuild, hint: String?): String { + if (build.executable.isNotBlank()) { + val declared = File(work, build.executable.trimStart('/')) + val inside = runCatching { declared.canonicalPath.startsWith(work.canonicalPath + File.separator) }.getOrDefault(false) + if (inside && declared.isFile) return declared.relativeTo(work).path + } + return StoreExe.pick(work, hint?.ifBlank { null } ?: build.filename.substringBeforeLast('.').ifBlank { null }, item.title) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLibrary.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLibrary.kt new file mode 100644 index 0000000000..e5f69d4f19 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLibrary.kt @@ -0,0 +1,74 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.mergeItems +import java.net.URLEncoder +import java.util.concurrent.atomic.AtomicBoolean + +internal object GameJoltLibrary { + private const val MAX_PAGES = 20 + private const val THROTTLE_MS = 10 * 60 * 1000L + + private val running = AtomicBoolean(false) + @Volatile private var syncedAt = 0L + + fun sync(context: Context, force: Boolean) { + val app = context.applicationContext + if (!running.compareAndSet(false, true)) return + try { + val cookies = GameJoltAuth.cookies(app) + val name = GameJoltAuth.username(app) + if (cookies.isBlank() || name.isBlank()) { + StoresState.post { + StoresState.status.remove(Store.GAMEJOLT) + StoresState.problems[Store.GAMEJOLT] = app.getString(R.string.stores_sync_sign_in) + } + return + } + val have = StoresState.library[Store.GAMEJOLT].orEmpty() + if (!force && have.isNotEmpty() && System.currentTimeMillis() - syncedAt < THROTTLE_MS) return + if (have.isEmpty()) StoresState.post { StoresState.status[Store.GAMEJOLT] = app.getString(R.string.stores_sync_game_list) } + val items = games(app, "/web/library/games/owned/@${URLEncoder.encode(name, "UTF-8")}", true) + if (items == null) { + StoresState.post { + StoresState.status.remove(Store.GAMEJOLT) + StoresState.problems[Store.GAMEJOLT] = app.getString(R.string.stores_sync_failed) + } + return + } + syncedAt = System.currentTimeMillis() + StoresState.post { + StoresState.status.remove(Store.GAMEJOLT) + StoresState.problems.remove(Store.GAMEJOLT) + StoresState.library[Store.GAMEJOLT] = mergeItems(StoresState.library[Store.GAMEJOLT], items) + } + StoresState.logLine("Game Jolt: ${items.size} owned games") + } finally { + running.set(false) + } + } + + fun reset() { + syncedAt = 0L + } + + fun games(context: Context, path: String, owned: Boolean): List<CatalogItem>? { + val cookies = GameJoltAuth.cookies(context) + val out = ArrayList<CatalogItem>() + val seen = HashSet<String>() + for (page in 1..MAX_PAGES) { + val answer = GameJoltApi.get(if (page == 1) path else "$path?page=$page", cookies) + if (!answer.ok) return if (page == 1) null else out + val batch = GameJoltCatalog.items(answer.payload?.optJSONArray("games"), owned).filter { seen.add(it.id) } + if (batch.isEmpty()) break + out.addAll(batch) + val total = answer.payload?.optInt("totalGamesCount") ?: 0 + if (total in 1..out.size) break + } + return out + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLogin.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLogin.kt new file mode 100644 index 0000000000..e8a547ed2b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLogin.kt @@ -0,0 +1,55 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.net.Uri +import android.util.Log +import android.webkit.CookieManager +import android.webkit.WebView +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.StoreLoginActivity +import com.droiddeck.launcher.stores.WebCookies + +internal class GameJoltLogin(override val userAgent: String) : StoreLoginActivity.Flow { + override val startUrl: String get() = GameJoltApi.LOGIN + + override fun isRedirect(url: String): Boolean { + val uri = Uri.parse(url) + if (uri.host != HOST && uri.host != "www.$HOST") return false + val path = uri.path.orEmpty() + return AUTH_PATHS.none { path == it || path.startsWith("$it/") } + } + + override fun forgetSignIn(done: () -> Unit) { + runCatching { WebCookies.expire(listOf(GameJoltApi.SITE), HOST, listOf("/")) { done() } } + .onFailure { + Log.w(TAG, "could not clear the previous web sign-in: ${it.javaClass.simpleName}") + done() + } + } + + override fun finish(activity: StoreLoginActivity, view: WebView, url: String): String? { + val manager = CookieManager.getInstance() + manager.flush() + val cookies = manager.getCookie(GameJoltApi.SITE).orEmpty() + if (cookies.isBlank()) { + Log.w(TAG, "no cookies after the sign-in redirect") + return activity.getString(R.string.stores_login_error_verification) + } + val answer = GameJoltApi.get("/web/search/games?q=a", cookies) + val user = answer.user + Log.d(TAG, "verify: code=${answer.code} cookies=${cookies.split(';').joinToString(",") { it.substringBefore('=').trim() }} userKeys=${user?.keys()?.asSequence()?.joinToString(",").orEmpty()}") + if (user == null || user.optLong("id") <= 0L) return activity.getString(R.string.stores_login_error_verification) + return try { + GameJoltAuth.save(activity, cookies, user) + null + } catch (e: Exception) { + Log.w(TAG, "saving the sign-in failed: ${e.javaClass.simpleName}") + activity.getString(R.string.stores_login_error_generic) + } + } + + companion object { + private const val TAG = "GameJoltLogin" + private const val HOST = "gamejolt.com" + private val AUTH_PATHS = listOf("/login", "/join", "/auth", "/forgot", "/terms", "/privacy", "/help", "/legal", "/site-api", "/x", "/oauth") + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPrefs.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPrefs.kt new file mode 100644 index 0000000000..3790e3ea6a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPrefs.kt @@ -0,0 +1,11 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import android.content.SharedPreferences + +object GameJoltPrefs { + const val FILE = "stores.gamejolt" + + @JvmStatic + fun get(context: Context): SharedPreferences = context.applicationContext.getSharedPreferences(FILE, Context.MODE_PRIVATE) +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricing.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricing.kt new file mode 100644 index 0000000000..2986f0f7c4 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricing.kt @@ -0,0 +1,28 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.json.JSONObject +import java.util.Locale + +internal object GameJoltPricing { + class Price(val final: String, val original: String, val discount: Int) + + fun of(sellable: JSONObject?): Price? { + val list = sellable?.optJSONArray("pricings") ?: return null + val entries = (0 until list.length()).mapNotNull { list.optJSONObject(it) }.filter { it.optLong("amount") > 0L } + val sale = entries.firstOrNull { it.optBoolean("promotional") } + val regular = entries.firstOrNull { !it.optBoolean("promotional") } + val now = sale ?: regular ?: return null + val was = if (sale != null && regular != null && regular.optLong("amount") > sale.optLong("amount")) regular else null + val percent = if (was == null) 0 else { + val before = was.optLong("amount") + (((before - now.optLong("amount")) * 100 + before / 2) / before).toInt() + } + return Price(format(now), was?.let(::format).orEmpty(), percent) + } + + private fun format(pricing: JSONObject): String { + val amount = String.format(Locale.US, "%.2f", pricing.optLong("amount") / 100.0) + val currency = pricing.optString("currency_code").takeIf { it.isNotBlank() && it != "null" && !it.equals("USD", ignoreCase = true) } + return if (currency == null) "$$amount" else "$amount $currency" + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdates.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdates.kt new file mode 100644 index 0000000000..9b8b6a3642 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdates.kt @@ -0,0 +1,188 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import android.widget.Toast +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateMapOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoresState +import org.json.JSONObject +import java.util.concurrent.atomic.AtomicBoolean + +internal class GameJoltUpdate(val buildId: String, val stamp: String, val filename: String, val replaced: Boolean) + +internal object GameJoltUpdates { + private const val KEY_AT = "updates_checked_at" + private const val KEY_FOUND = "updates_found" + private const val THROTTLE_MS = 6 * 60 * 60 * 1000L + private const val GAP_MS = 1_000L + + val available = mutableStateMapOf<String, GameJoltUpdate>() + var checkingKey by mutableStateOf<String?>(null) + private set + + private val running = AtomicBoolean(false) + private val restored = AtomicBoolean(false) + @Volatile private var generation = 0 + + internal fun evaluate(builds: List<GameJoltBuild>?, buildId: String, packageId: String, version: String): GameJoltUpdate? { + if (builds == null || buildId.isBlank()) return null + val installable = builds.filter { it.installable } + val samePackage = installable.filter { it.packageId == packageId } + if (samePackage.isNotEmpty()) { + if (samePackage.any { it.id == buildId }) return null + val same = samePackage.firstOrNull { newer(it, buildId, version) } ?: return null + return GameJoltUpdate(same.id, same.stamp, same.filename, false) + } + val next = installable.firstOrNull() ?: return null + return if (next.id == buildId) null else GameJoltUpdate(next.id, next.stamp, next.filename, true) + } + + private fun newer(build: GameJoltBuild, buildId: String, version: String): Boolean { + val stamp = build.stamp.toLongOrNull() ?: 0L + val have = version.toLongOrNull() ?: 0L + if (stamp != have) return stamp > have + return (build.id.toLongOrNull() ?: 0L) > (buildId.toLongOrNull() ?: 0L) + } + + internal fun encode(found: Map<String, GameJoltUpdate>): String = JSONObject().also { out -> + for ((key, u) in found) out.put(key, JSONObject().put("buildId", u.buildId).put("stamp", u.stamp).put("filename", u.filename).put("replaced", u.replaced)) + }.toString() + + internal fun decode(raw: String?): Map<String, GameJoltUpdate> { + val json = runCatching { JSONObject(raw.orEmpty()) }.getOrNull() ?: return emptyMap() + val out = LinkedHashMap<String, GameJoltUpdate>() + for (key in json.keys()) { + val u = json.optJSONObject(key) ?: continue + val id = u.optString("buildId") + if (id.isBlank()) continue + out[key] = GameJoltUpdate(id, u.optString("stamp"), u.optString("filename"), u.optBoolean("replaced")) + } + return out + } + + private fun restore(app: Context) { + if (!restored.compareAndSet(false, true)) return + val started = generation + val saved = decode(GameJoltPrefs.get(app).getString(KEY_FOUND, null)) + StoresState.post { + if (started != generation) return@post + for ((k, v) in saved) if (k !in available) available[k] = v + } + } + + private fun save(app: Context) { + GameJoltPrefs.get(app).edit().putString(KEY_FOUND, encode(available.toMap())).apply() + } + + private fun snapshot(game: InstalledStoreGame): Triple<String, String, String> = + Triple(game.sidecar.installVersion, game.sidecar.extra["buildId"].orEmpty(), game.sidecar.extra["packageId"].orEmpty()) + + fun check(context: Context) { + val app = context.applicationContext + if (!running.compareAndSet(false, true)) return + val started = generation + Thread({ + try { + restore(app) + val prefs = GameJoltPrefs.get(app) + if (System.currentTimeMillis() - prefs.getLong(KEY_AT, 0L) < THROTTLE_MS) return@Thread + if (GameJoltAuth.cookies(app).isBlank()) return@Thread + val games = StoresState.installed.toList().filter { it.sidecar.store == Store.GAMEJOLT && it.sidecar.isInstalled } + val found = LinkedHashMap<String, GameJoltUpdate>() + val answered = HashSet<String>() + val seen = HashMap<String, Triple<String, String, String>>() + var failed = false + games.forEachIndexed { i, game -> + if (i > 0) Thread.sleep(GAP_MS) + val extra = game.sidecar.extra + seen[game.key] = snapshot(game) + val builds = GameJoltBuilds.load(app, extra["gameId"].orEmpty().ifEmpty { game.sidecar.id }) + if (builds == null) failed = true + else { + answered += game.key + evaluate(builds, extra["buildId"].orEmpty(), extra["packageId"].orEmpty(), game.sidecar.installVersion)?.let { found[game.key] = it } + } + } + if (started != generation) return@Thread + StoresState.post { + if (started != generation) return@post + for (k in answered) { + val now = StoresState.installed.firstOrNull { it.key == k } ?: continue + if (seen[k] != snapshot(now)) continue + val u = found[k] + if (u != null) available[k] = u else available.remove(k) + } + save(app) + } + if (!failed && started == generation) prefs.edit().putLong(KEY_AT, System.currentTimeMillis()).apply() + StoresState.logLine("Game Jolt: checked ${games.size} installed games, ${found.size} with updates") + } finally { + running.set(false) + } + }, "gamejolt-updates").start() + } + + fun checkGame(context: Context, game: InstalledStoreGame) { + val app = context.applicationContext + if (checkingKey != null) return + checkingKey = game.key + val started = generation + val before = snapshot(game) + Thread({ + try { + val extra = game.sidecar.extra + val builds = GameJoltBuilds.load(app, extra["gameId"].orEmpty().ifEmpty { game.sidecar.id }) + val found = evaluate(builds, before.second, before.third, before.first) + StoresState.post { + if (started != generation) return@post + val now = StoresState.installed.firstOrNull { it.key == game.key } + if (builds != null && now != null && snapshot(now) == before) { + if (found != null) available[game.key] = found else available.remove(game.key) + save(app) + } + val text = when { + builds == null -> app.getString(R.string.stores_sync_failed) + found != null -> app.getString(R.string.stores_itch_updates_found, 1) + else -> app.getString(R.string.upd_current_status) + } + Toast.makeText(app, text, Toast.LENGTH_SHORT).show() + } + StoresState.logLine("Game Jolt: checked ${game.sidecar.title}, ${if (found != null) "update available" else "up to date"}") + } finally { + StoresState.post { checkingKey = null } + } + }, "gamejolt-update-check").start() + } + + fun start(context: Context, game: InstalledStoreGame, update: GameJoltUpdate) { + val app = context.applicationContext + if (StoresState.uninstalling.containsKey(game.key)) return + val root = game.folder.parentFile?.parentFile ?: return + val item = CatalogItem( + Store.GAMEJOLT, game.sidecar.id, game.sidecar.title, game.sidecar.hero, tallImageUrl = game.sidecar.cover, + isFree = game.sidecar.extra["paid"] != "1", owned = true, extra = game.sidecar.extra + ("buildId" to update.buildId), + ) + StoresState.install(app, item, root) + } + + fun applied(context: Context, key: String) { + val app = context.applicationContext + StoresState.post { + available.remove(key) + save(app) + } + } + + fun clear(context: Context) { + val app = context.applicationContext + generation++ + GameJoltPrefs.get(app).edit().remove(KEY_AT).remove(KEY_FOUND).apply() + StoresState.post { available.clear() } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt index 3896091e3d..79b2725f1c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt @@ -2,10 +2,9 @@ package com.droiddeck.launcher.stores.itch import android.content.Context import com.droiddeck.launcher.R -import com.droiddeck.launcher.runtime.GuestCommand -import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.stores.CatalogItem import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreArchiveUnpacker import com.droiddeck.launcher.stores.StoreExe import com.droiddeck.launcher.stores.StoreGameSidecar import com.droiddeck.launcher.stores.StoreInstallRoot @@ -13,20 +12,10 @@ import com.droiddeck.launcher.stores.StoreInstalls import com.droiddeck.launcher.stores.StoreNet import com.droiddeck.launcher.stores.download.DownloadQueue import com.droiddeck.launcher.stores.download.DownloadStage -import org.apache.commons.compress.MemoryLimitException -import org.apache.commons.compress.archivers.sevenz.SevenZFile -import org.apache.commons.compress.archivers.tar.TarArchiveInputStream -import org.apache.commons.compress.archivers.zip.ZipFile -import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream -import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream -import org.apache.commons.compress.compressors.xz.XZCompressorInputStream -import java.io.BufferedInputStream import java.io.File -import java.io.FileInputStream import java.io.FileOutputStream import java.net.HttpURLConnection import java.net.URL -import java.nio.file.Files import java.util.concurrent.atomic.AtomicBoolean internal class ItchInstaller( @@ -39,6 +28,7 @@ internal class ItchInstaller( private var updating = false private var previous: StoreGameSidecar? = null private val commit = Any() + private val unpacker = StoreArchiveUnpacker(app, cancelled, "itch.io", R.string.stores_itch_archive, R.string.stores_itch_extract_failed, "itch-unrar") override fun run(handle: DownloadQueue.JobHandle): String? { val key = ItchAuth.key(app) @@ -225,16 +215,17 @@ internal class ItchInstaller( work = if (updating) File(folder, ItchStaging.DIR) else folder if (updating && !patched) ItchStaging.delete(work) work.mkdirs() + unpacker.work = work if (resuming) clearPartialInstall() val exe = try { - if (!patched) unpack(archive, filename, handle) + if (!patched) unpacker.unpack(archive, filename, handle) val hint = filename.substringBeforeLast('.') var picked = StoreExe.pick(work, hint.ifBlank { null }, item.title) var passes = 0 while (picked.isBlank() && passes < 2 && !cancelled.get()) { val inner = ItchArchives.inner(work) ?: break handle.log("itch.io: no exe yet, unpacking ${inner.name}") - unpack(inner, inner.name, handle) + unpacker.unpack(inner, inner.name, handle) if (cancelled.get()) break inner.delete() picked = StoreExe.pick(work, inner.name.substringBeforeLast('.').takeIf { it.endsWith(".exe", ignoreCase = true) }, item.title) @@ -267,205 +258,5 @@ internal class ItchInstaller( return exe } - private fun unpack(archive: File, filename: String, handle: DownloadQueue.JobHandle) { - when (val kind = ItchArchives.kind(archive, filename)) { - "zip" -> unzip(archive, handle) - "7z" -> try { - sevenZip(archive, handle) - } catch (e: MemoryLimitException) { - handle.log("itch.io: ${archive.name} needs more memory than the app has, unpacking it in the runtime") - unrar(archive, handle, kind) - } - "rar" -> unrar(archive, handle, kind) - "exe" -> copy(archive, File(work, filename.ifBlank { "game.exe" })) - "tar" -> untar(archive, null, handle) - "gz", "bz2", "xz" -> untar(archive, kind, handle) ?: single(archive, kind, handle) - else -> copy(archive, File(work, filename.ifBlank { "game" })) - } - } - - private fun target(name: String): File? { - val file = File(work, name.replace('\\', '/')) - val root = work.canonicalPath - val path = file.canonicalPath - return if (path == root || path.startsWith(root + File.separator)) file else null - } - - private fun unrar(archive: File, handle: DownloadQueue.JobHandle, kind: String) { - if (!LinuxRuntime.isInstalled(app)) throw IllegalStateException(app.getString(R.string.stores_itch_archive, kind)) - val binds = if (listOf(app.filesDir, app.cacheDir).any { work.absolutePath.startsWith(it.absolutePath + "/") }) null - else listOf(work.absolutePath) - fun bsdtar(args: List<String>, onLine: (String) -> Unit) = - GuestCommand.run(app, listOf("/usr/bin/bsdtar") + args, logName = "itch-unrar", extraBinds = binds, fastPath = true, cancelled = cancelled) { line -> - if (!line.startsWith("proot ")) onLine(line) - } - var entries = 0L - bsdtar(listOf("-tf", archive.absolutePath)) { entries++ } - var done = 0L - val tail = ArrayDeque<String>() - val code = bsdtar(listOf("-xvf", archive.absolutePath, "-C", work.absolutePath)) { line -> - if (line.startsWith("x ")) handle.stageProgress(++done, entries) else { - if (tail.size == 5) tail.removeFirst() - tail.addLast(line) - } - } - if (cancelled.get()) return - if (code != 0) { - handle.log("itch.io: bsdtar exited $code: ${tail.joinToString(" | ")}") - throw IllegalStateException(app.getString(R.string.stores_itch_extract_failed, code)) - } - } - - private fun sevenZip(archive: File, handle: DownloadQueue.JobHandle) { - val total = archive.length() - var written = 0L - val buffer = ByteArray(64 * 1024) - val limitKb = (Runtime.getRuntime().maxMemory() / 4 / 1024).coerceIn(32L * 1024, Int.MAX_VALUE.toLong()).toInt() - Files.newByteChannel(archive.toPath()).use { channel -> - SevenZFile.builder().setSeekableByteChannel(channel).setMaxMemoryLimitKb(limitKb).get().use { seven -> - while (true) { - if (cancelled.get()) return - val entry = seven.nextEntry ?: break - val file = target(entry.name) - if (file == null) { - handle.log("itch.io: skipped an entry outside the game folder") - continue - } - if (entry.isDirectory) { - file.mkdirs() - continue - } - file.parentFile?.mkdirs() - FileOutputStream(file).use { out -> - while (true) { - if (cancelled.get()) return - val read = seven.read(buffer, 0, buffer.size) - if (read < 0) break - out.write(buffer, 0, read) - written += read - handle.stageProgress(written, total) - } - } - } - } - } - } - - private fun untar(archive: File, codec: String?, handle: DownloadQueue.JobHandle): Unit? { - val total = archive.length() - var written = 0L - var entries = 0 - val buffer = ByteArray(64 * 1024) - val opened = runCatching { - FileInputStream(archive).use { raw -> - val stream = when (codec) { - "gz" -> GzipCompressorInputStream(BufferedInputStream(raw)) - "bz2" -> BZip2CompressorInputStream(BufferedInputStream(raw)) - "xz" -> XZCompressorInputStream(BufferedInputStream(raw)) - else -> BufferedInputStream(raw) - } - stream.use { input -> - TarArchiveInputStream(input).use { tar -> - while (true) { - if (cancelled.get()) return null - val entry = tar.nextEntry ?: break - entries++ - val file = target(entry.name) - if (file == null) { - handle.log("itch.io: skipped an entry outside the game folder") - continue - } - if (entry.isDirectory) { - file.mkdirs() - continue - } - file.parentFile?.mkdirs() - FileOutputStream(file).use { out -> - while (true) { - if (cancelled.get()) return null - val read = tar.read(buffer, 0, buffer.size) - if (read < 0) break - out.write(buffer, 0, read) - written += read - handle.stageProgress(written, total) - } - } - } - } - } - } - true - } - if (opened.isSuccess && entries > 0) return Unit - if (opened.isFailure && codec == null) throw opened.exceptionOrNull() ?: IllegalStateException("tar") - return null - } - - private fun single(archive: File, codec: String, handle: DownloadQueue.JobHandle) { - val name = archive.name.substringBeforeLast('.') - val file = target(name.ifBlank { "game" }) ?: throw IllegalStateException("archive") - file.parentFile?.mkdirs() - val total = archive.length() - var written = 0L - val buffer = ByteArray(64 * 1024) - FileInputStream(archive).use { raw -> - val stream = when (codec) { - "bz2" -> BZip2CompressorInputStream(BufferedInputStream(raw)) - "xz" -> XZCompressorInputStream(BufferedInputStream(raw)) - else -> GzipCompressorInputStream(BufferedInputStream(raw)) - } - stream.use { input -> - FileOutputStream(file).use { out -> - while (true) { - if (cancelled.get()) return - val read = input.read(buffer) - if (read < 0) break - out.write(buffer, 0, read) - written += read - handle.stageProgress(written, total) - } - } - } - } - } - - private fun copy(source: File, target: File) { - target.parentFile?.mkdirs() - FileInputStream(source).use { input -> FileOutputStream(target).use { out -> input.copyTo(out, 128 * 1024) } } - } - - private fun unzip(archive: File, handle: DownloadQueue.JobHandle) { - val total = archive.length() - var written = 0L - val buffer = ByteArray(64 * 1024) - ZipFile.builder().setFile(archive).get().use { zip -> - for (entry in zip.entries) { - if (cancelled.get()) return - val target = target(entry.name) - if (target == null) { - handle.log("itch.io: skipped an entry outside the game folder") - continue - } - if (entry.isDirectory) { - target.mkdirs() - continue - } - target.parentFile?.mkdirs() - zip.getInputStream(entry).use { input -> - FileOutputStream(target).use { out -> - while (true) { - if (cancelled.get()) return - val read = input.read(buffer) - if (read < 0) break - out.write(buffer, 0, read) - written += read - handle.stageProgress(written, total) - } - } - } - } - } - } - private companion object } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt index d5991b5c09..f6be827cf5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt @@ -20,6 +20,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Close import androidx.compose.material.icons.outlined.Menu +import androidx.compose.material.icons.outlined.SwapVert import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -84,10 +85,11 @@ fun BottomDashboard( pages: List<BottomPage>, remembered: String?, onPage: (String) -> Unit, - onClose: () -> Unit, + onClose: (() -> Unit)?, onMenu: (() -> Unit)?, gameStarts: Int = 0, strip: (@Composable (String?) -> Unit)? = null, + onSwap: (() -> Unit)? = null, ) { val colors = MaterialTheme.colorScheme var current by remember { mutableStateOf(pickBottomPage(remembered, pages.map { it.id })) } @@ -100,7 +102,7 @@ fun BottomDashboard( val labels = bottomTabsWithLabels(maxWidth.value, pages.size) Column(Modifier.fillMaxSize().padding(horizontal = 12.dp, vertical = 10.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) { Row(Modifier.fillMaxWidth().height(48.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { - BarButton(Icons.Outlined.Close, stringResource(R.string.deck_close), "bottom-close", onClose) + if (onClose != null) BarButton(Icons.Outlined.Close, stringResource(R.string.deck_close), "bottom-close", onClose) Row(Modifier.weight(1f).horizontalScroll(rememberScrollState()), horizontalArrangement = Arrangement.spacedBy(6.dp)) { pages.forEach { p -> PageTab(p, p.id == page?.id, labels) { @@ -109,6 +111,7 @@ fun BottomDashboard( } } } + if (onSwap != null) BarButton(Icons.Outlined.SwapVert, stringResource(R.string.swap_screens), "bottom-swap", onSwap) if (onMenu != null) BarButton(Icons.Outlined.Menu, stringResource(R.string.touch_droiddeck_menu), "bottom-menu", onMenu) } strip?.invoke(page?.id) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt index d6b80ac813..0b838b8f1a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt @@ -4,6 +4,7 @@ import android.annotation.SuppressLint import android.content.Context import android.content.res.Configuration import android.graphics.Color +import android.os.Build import android.os.SystemClock import android.graphics.Typeface import android.view.Gravity @@ -13,6 +14,7 @@ import android.view.SurfaceHolder import android.view.SurfaceView import android.view.View import android.view.ViewConfiguration +import android.view.WindowInsets import android.graphics.RectF import androidx.compose.runtime.mutableStateOf import androidx.compose.ui.platform.ComposeView @@ -33,9 +35,11 @@ import com.droiddeck.launcher.session.BottomDesktop @SuppressLint("ViewConstructor") class BottomDesktopPanel( context: Context, - onClose: () -> Unit, + onClose: (() -> Unit)?, onMenu: (() -> Unit)?, steamButtons: Pair<() -> Unit, () -> Unit>?, + onSwap: (() -> Unit)? = null, + private val fullResolution: Boolean = false, ) : LinearLayout(context), SurfaceHolder.Callback { private lateinit var surfaceView: SurfaceView private val area = FrameLayout(context).apply { clipChildren = true } @@ -66,7 +70,7 @@ class BottomDesktopPanel( setBackgroundColor(Color.BLACK) isFocusable = true isFocusableInTouchMode = true - addView(bar(onClose, onMenu, steamButtons), LayoutParams(-1, -2)) + addView(bar(onClose, onMenu, steamButtons, onSwap), LayoutParams(-1, -2)) area.addView(keyboardHost) addSurface() area.addView(status, FrameLayout.LayoutParams(-1, -1)) @@ -83,7 +87,7 @@ class BottomDesktopPanel( area.addView(surfaceView, 1, FrameLayout.LayoutParams(fullWidth.takeIf { it > 0 } ?: -1, fullHeight.takeIf { it > 0 } ?: -1)) } - private fun bar(onClose: () -> Unit, onMenu: (() -> Unit)?, steamButtons: Pair<() -> Unit, () -> Unit>?): View { + private fun bar(onClose: (() -> Unit)?, onMenu: (() -> Unit)?, steamButtons: Pair<() -> Unit, () -> Unit>?, onSwap: (() -> Unit)?): View { val bar = LinearLayout(context).apply { orientation = HORIZONTAL gravity = Gravity.CENTER_VERTICAL @@ -91,7 +95,7 @@ class BottomDesktopPanel( setBackgroundColor(Color.BLACK) } fun gap() = View(context).apply { layoutParams = LayoutParams(dp(6), 1) } - bar.addView(DeckControlsPanel.roundButton(context, "×", context.getString(R.string.deck_close), onClose)) + onClose?.let { bar.addView(DeckControlsPanel.roundButton(context, "×", context.getString(R.string.deck_close), it)) } title = TextView(context).apply { textSize = 14f typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD) @@ -106,6 +110,10 @@ class BottomDesktopPanel( bar.addView(gap()) bar.addView(DeckControlsPanel.iconButton(context, R.drawable.ic_bottom_keyboard, context.getString(R.string.second_show_keyboard)) { keyboardHost.toggle() }) + onSwap?.let { + bar.addView(gap()) + bar.addView(DeckControlsPanel.iconButton(context, R.drawable.ic_bottom_swap, context.getString(R.string.swap_screens), it)) + } onMenu?.let { bar.addView(gap()) bar.addView(DeckControlsPanel.menuButton(context, it)) @@ -187,7 +195,9 @@ class BottomDesktopPanel( addSurface() return } - if (attached) attach(surfaceView.holder) + if (!attached) return + attached = false + syncSurface(surfaceView.holder) } private fun showState() { @@ -208,13 +218,28 @@ class BottomDesktopPanel( if (w != fullWidth || h > fullHeight || !keyboardHost.shown) { fullWidth = w fullHeight = h - surfaceView.layoutParams = FrameLayout.LayoutParams(w, h) + val (desktopW, desktopH) = BottomDesktop.outputSizeFor(w, h, fullResolution) + val (fitW, fitH) = if (w - desktopW in 0..1 && h - desktopH in 0..1) desktopW to desktopH + else fitDesktop(w, h, desktopW, desktopH) + surfaceView.layoutParams = if (fitW == w && fitH == h) FrameLayout.LayoutParams(w, h) + else FrameLayout.LayoutParams(fitW, fitH, Gravity.CENTER_HORIZONTAL).apply { topMargin = (h - fitH) / 2 } + surfaceView.post { syncSurface(surfaceView.holder) } } pan() } + private fun imeOverlap(): Int { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) return 0 + if (area.height < fullHeight) return 0 + val ime = rootWindowInsets?.getInsets(WindowInsets.Type.ime())?.bottom ?: return 0 + if (ime <= 0) return 0 + val at = IntArray(2) + area.getLocationInWindow(at) + return (at[1] + area.height - (rootView.height - ime)).coerceIn(0, area.height) + } + private fun pan() { - val visible = area.height + val visible = area.height - imeOverlap() val hidden = (fullHeight - visible).coerceAtLeast(0) val anchor = if (directTouch) lastTouchY else trackpad.y surfaceView.translationY = if (hidden == 0 || !keyboardHost.shown) 0f @@ -223,24 +248,27 @@ class BottomDesktopPanel( override fun surfaceCreated(holder: SurfaceHolder) = Unit - override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) { - if (!attached) attach(holder) - } + override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) = syncSurface(holder) override fun surfaceDestroyed(holder: SurfaceHolder) { if (holder !== surfaceView.holder) return attached = false surfaceUsed = false - BottomDesktop.detach() + BottomDesktop.detach(holder.surface) } - private fun attach(holder: SurfaceHolder) { - val frame = holder.surfaceFrame - val (width, height) = BottomDesktop.outputSizeFor(fullWidth.takeIf { it > 0 } ?: frame.width(), - fullHeight.takeIf { it > 0 } ?: frame.height()) + private fun syncSurface(holder: SurfaceHolder) { + if (holder !== surfaceView.holder || fullWidth <= 0 || fullHeight <= 0 || !holder.surface.isValid) return + val (width, height) = BottomDesktop.outputSizeFor(fullWidth, fullHeight, fullResolution) if (width <= 0 || height <= 0) return + val frame = holder.surfaceFrame if (frame.width() != width || frame.height() != height) { - holder.setFixedSize(width, height) + val params = surfaceView.layoutParams + if (params.width == width && params.height == height) holder.setSizeFromLayout() else holder.setFixedSize(width, height) + return + } + if (attached) { + BottomDesktop.resize(holder.surface, width, height) return } attached = true @@ -299,7 +327,7 @@ class BottomDesktopPanel( override fun onWheel(steps: Int) = BottomDesktop.sendScene(SCENE_WHEEL, steps) override fun onScroll(dx: Float, dy: Float) { - val (outW, outH) = BottomDesktop.outputSizeFor(surfaceView.width, surfaceView.height) + val (outW, outH) = BottomDesktop.outputSize scrollRestX += dx * outW / surfaceView.width.coerceAtLeast(1) * AXIS_UNITS_PER_PIXEL scrollRestY += dy * outH / surfaceView.height.coerceAtLeast(1) * AXIS_UNITS_PER_PIXEL val h = scrollRestX.toInt() @@ -343,3 +371,11 @@ class BottomDesktopPanel( const val TEXT_FIELD_TAP_MS = 1_000L } } + +internal fun fitDesktop(areaW: Int, areaH: Int, desktopW: Int, desktopH: Int): Pair<Int, Int> { + if (areaW <= 0 || areaH <= 0 || desktopW <= 0 || desktopH <= 0) return areaW to areaH + val widthLimited = areaW.toLong() * desktopH <= areaH.toLong() * desktopW + val w = if (widthLimited) areaW else (desktopW.toLong() * areaH / desktopH).toInt() + val h = if (widthLimited) (desktopH.toLong() * areaW / desktopW).toInt() else areaH + return if (areaW - w <= 4 && areaH - h <= 4) areaW to areaH else w to h +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomGameScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomGameScreen.kt new file mode 100644 index 0000000000..ba5b5af126 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomGameScreen.kt @@ -0,0 +1,66 @@ +package com.droiddeck.launcher.ui + +import android.app.Activity +import android.app.Presentation +import android.graphics.Color +import android.os.Bundle +import android.view.Display +import android.view.KeyEvent +import android.view.MotionEvent +import android.view.SurfaceHolder +import android.view.SurfaceView +import android.view.View +import android.view.ViewGroup +import android.view.WindowManager +import android.widget.FrameLayout + +class BottomGameScreen( + private val activity: Activity, + display: Display, + private val callback: SurfaceHolder.Callback, + private val onTouch: (MotionEvent) -> Boolean, +) : Presentation(activity, display) { + val surfaceView = SurfaceView(getContext()) + val holder: SurfaceHolder get() = surfaceView.holder + + val hz: Float get() = display.mode.refreshRate + + init { + setCancelable(false) + setCanceledOnTouchOutside(false) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + val root = FrameLayout(context).apply { setBackgroundColor(Color.BLACK) } + root.addView(surfaceView, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) + setContentView(root) + window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) + @Suppress("DEPRECATION") + window?.decorView?.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY + or View.SYSTEM_UI_FLAG_FULLSCREEN + or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + or View.SYSTEM_UI_FLAG_LAYOUT_STABLE + or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) + surfaceView.setOnTouchListener { _, event -> onTouch(event) } + surfaceView.holder.addCallback(callback) + } + + override fun dispatchKeyEvent(event: KeyEvent): Boolean = + activity.dispatchKeyEvent(event) || super.dispatchKeyEvent(event) + + override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean = + activity.dispatchGenericMotionEvent(event) || super.dispatchGenericMotionEvent(event) +} + +object GameScreenSwap { + fun wanted( + requested: Boolean, + activityStarted: Boolean, + sessionEnded: Boolean, + inPip: Boolean, + glassesOutput: Boolean, + bottomScreenFree: Boolean, + ): Boolean = requested && activityStarted && !sessionEnded && !inPip && !glassesOutput && bottomScreenFree +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt index 58f1bd76dd..3df2090bc4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt @@ -27,7 +27,7 @@ import kotlinx.coroutines.isActive import kotlinx.coroutines.withContext import java.io.File -private const val STRIP_FRAME_MS = 100L +private const val STRIP_FRAME_MS = 33L private const val STRIP_METRICS_MS = 500L private const val STRIP_TEMP_PLAIN = 0xFFF2F5F9.toInt() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt index 41c690f90a..4aee7fc22f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt @@ -96,7 +96,7 @@ private const val ELITE_MS = 1_000L private const val ELITE_SEARCH_MS = 10_000L private const val OUTPUT_SCAN_MS = 3_000L private const val PERF_N = 60 -private const val FRAME_MS = 100L +private const val FRAME_MS = 33L private const val MINUTE_NS = 60_000_000_000L private const val TEMP_PLAIN = 0xFFF2F5F9.toInt() @@ -132,7 +132,7 @@ fun BottomTelemetryPage(fps: () -> Float?, runningGame: () -> String? = { null } var unknown by remember { mutableStateOf<List<UnknownTraffic>>(emptyList()) } var strip by remember { mutableStateOf(StatsStrip.from(SessionPrefs.statsStrip(context))) } var dash by remember { mutableStateOf(StatsDash.from(SessionPrefs.statsDash(context))) } - var speedUnit by remember { mutableStateOf(SpeedUnit.from(SessionPrefs.statsSpeedUnit(context))) } + val speedUnit = SpeedUnit.from(SessionPrefs.statsSpeedUnit(context)) val shownUnit = speedUnit.resolve(Resources.getSystem().configuration.locales[0].country) val fpsHistory = remember { History(PERF_N) } val cpuHistory = remember { History(PERF_N) } @@ -374,10 +374,6 @@ fun BottomTelemetryPage(fps: () -> Float?, runningGame: () -> String? = { null } )) } } - if (race == null && thunder.isEmpty() && elite == null && running == null) { - Text(stringResource(R.string.bottom_telemetry_help), - fontSize = 14.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(horizontal = 4.dp)) - } if (outputs.isNotEmpty() || menuGames.isNotEmpty()) TelemetryCard(stringResource(R.string.bottom_telemetry_send_title)) { if (outputs.isNotEmpty()) SwitchRow(stringResource(R.string.bottom_telemetry_send_auto), stringResource(R.string.bottom_telemetry_send_auto_hint), auto, true) { want -> scope.launch { @@ -420,12 +416,6 @@ fun BottomTelemetryPage(fps: () -> Float?, runningGame: () -> String? = { null } Text(stringResource(R.string.bottom_telemetry_port_busy, busyPorts.sorted().joinToString()), fontSize = 13.sp, color = colors.error, modifier = Modifier.padding(horizontal = 4.dp)) } - ChoiceRow(stringResource(R.string.stats_speed_units), - if (speedUnit == SpeedUnit.AUTO) stringResource(R.string.stats_speed_units_auto, shownUnit.label) else speedUnit.label) { - speedUnit = speedUnit.next() - SessionPrefs.setStatsSpeedUnit(context, speedUnit.id) - } - Text(stringResource(R.string.stats_tap_hint), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(horizontal = 4.dp)) } } } @@ -465,19 +455,8 @@ private fun httpGet(url: String): String { } } - internal fun steamClientLabel(arch: String): Int = if (arch == "x86_64") R.string.stats_steam_client_x86 else R.string.stats_steam_client_arm -@Composable -private fun ChoiceRow(title: String, value: String, onClick: () -> Unit) { - val colors = MaterialTheme.colorScheme - Row(Modifier.fillMaxWidth().clickable(role = Role.Button, onClick = onClick).padding(horizontal = 4.dp, vertical = 6.dp), - verticalAlignment = Alignment.CenterVertically) { - Text(title, fontSize = 15.sp, color = colors.onBackground, modifier = Modifier.weight(1f)) - Text(value, fontSize = 15.sp, fontWeight = FontWeight.Bold, color = LocalPalette.current.primary) - } -} - @Composable private fun SwitchRow(title: String, hint: String?, checked: Boolean, enabled: Boolean, onChange: (Boolean) -> Unit) { val colors = MaterialTheme.colorScheme diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt index 505bf44937..95768fb659 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt @@ -110,13 +110,13 @@ private fun BottomStripSettings(host: MenuHost, track: (String) -> Modifier) { var hudOn by remember { mutableStateOf(SessionPrefs.bottomHud(context)) } var onTabs by remember { mutableStateOf(SessionPrefs.bottomStripOnTabs(context)) } var shown by remember { mutableStateOf(SessionPrefs.bottomStripMetrics(context)) } - SettingsGroup(stringResource(R.string.bottom_hud_group), detail = stringResource(R.string.bottom_hud_group_detail)) { - ToggleRow(host, "bottom-hud", stringResource(R.string.bottom_hud_group), stringResource(R.string.bottom_hud_hint), hudOn, + SettingsGroup(stringResource(R.string.bottom_hud_group)) { + ToggleRow(host, "bottom-hud", stringResource(R.string.bottom_hud_group), null, hudOn, chipModifier = track("bottom-hud")) { on -> hudOn = on SessionPrefs.setBottomHud(context, on) } - ToggleRow(host, "bottom-strip-tabs", stringResource(R.string.bottom_strip_tabs), stringResource(R.string.bottom_strip_tabs_hint), onTabs, + ToggleRow(host, "bottom-strip-tabs", stringResource(R.string.bottom_strip_tabs), null, onTabs, enabled = hudOn, chipModifier = track("bottom-strip-tabs")) { on -> onTabs = on SessionPrefs.setBottomStripOnTabs(context, on) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index c557181e15..9bf266b834 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -133,7 +133,7 @@ class FrontEndState( val dualScreen: Boolean = false, val dualScreenDevice: Boolean = false, val dualScreenMode: String = com.droiddeck.launcher.input.DualScreen.MODE_AUTO, - val dualScreenLauncher: Boolean = true, + val dualScreenSessions: String = com.droiddeck.launcher.input.DualScreen.MODE_AUTO, val dualScreenControls: Boolean = true, val packages: List<PackageRow>? = null, val packageCatalogLoading: Boolean = false, @@ -245,7 +245,7 @@ class FrontEndActions( val onLauncherFullscreen: (Boolean) -> Unit = {}, val onAnimationsEnabled: (Boolean) -> Unit = {}, val onDualScreenMode: (String) -> Unit = {}, - val onDualScreenLauncher: (Boolean) -> Unit = {}, + val onDualScreenSessions: (String) -> Unit = {}, val onDualScreenControls: (Boolean) -> Unit = {}, val onDownloadSource: (String) -> Unit = {}, val onDownloadMirror: (String) -> Unit = {}, @@ -708,6 +708,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com StoreTheme(com.droiddeck.launcher.stores.Store.XBOX) { XboxStoreDialogs() } com.droiddeck.launcher.stores.StoresState.pendingInstall?.let { item -> StoreTheme(item.store) { InstallWhere(item) } } com.droiddeck.launcher.stores.StoresState.itchPicking?.let { item -> StoreTheme(item.store) { ItchBuildPicker(item) { com.droiddeck.launcher.stores.StoresState.itchPicking = null } } } + com.droiddeck.launcher.stores.StoresState.gameJoltPicking?.let { item -> StoreTheme(item.store) { GameJoltBuildPicker(item) { com.droiddeck.launcher.stores.StoresState.gameJoltPicking = null } } } StepsLayer(screenAt) appToChooseDisplay?.let { app -> diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 230321f516..f7969fe6c4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -467,21 +467,23 @@ internal fun SetupPanel( s.launcherFullscreen, ) { a.onLauncherFullscreen(it) } if (s.dualScreenDevice) { - ChoiceRow( - host, "dual-screen", stringResource(R.string.setup_dual_screen), stringResource(R.string.setup_dual_screen_hint), - listOf( - com.droiddeck.launcher.input.DualScreen.MODE_AUTO to stringResource(R.string.setup_dual_screen_auto), - com.droiddeck.launcher.input.DualScreen.MODE_ON to stringResource(R.string.setup_dual_screen_on), - com.droiddeck.launcher.input.DualScreen.MODE_OFF to stringResource(R.string.setup_dual_screen_off), - ), - s.dualScreenMode, onPick = a.onDualScreenMode, + val dualModes = listOf( + com.droiddeck.launcher.input.DualScreen.MODE_AUTO to stringResource(R.string.setup_dual_screen_auto), + com.droiddeck.launcher.input.DualScreen.MODE_ON to stringResource(R.string.setup_dual_screen_on), + com.droiddeck.launcher.input.DualScreen.MODE_OFF to stringResource(R.string.setup_dual_screen_off), ) - } - if (s.dualScreenDevice && s.dualScreenMode != com.droiddeck.launcher.input.DualScreen.MODE_OFF) { - ToggleRow(host, "dual-screen-menu", stringResource(R.string.setup_dual_screen_menu), - stringResource(R.string.setup_dual_screen_menu_hint), s.dualScreenLauncher) { a.onDualScreenLauncher(it) } - ToggleRow(host, "dual-screen-controls", stringResource(R.string.setup_dual_screen_controls), - stringResource(R.string.setup_dual_screen_controls_hint), s.dualScreenControls) { a.onDualScreenControls(it) } + ChoiceRow( + host, "dual-screen", stringResource(R.string.setup_dual_screen_launcher), stringResource(R.string.setup_dual_screen_launcher_hint), + dualModes, s.dualScreenMode, onPick = a.onDualScreenMode, + ) + ChoiceRow( + host, "dual-screen-sessions", stringResource(R.string.setup_dual_screen_sessions), stringResource(R.string.setup_dual_screen_sessions_hint), + dualModes, s.dualScreenSessions, onPick = a.onDualScreenSessions, + ) + if (s.dualScreenSessions != com.droiddeck.launcher.input.DualScreen.MODE_OFF) { + ToggleRow(host, "dual-screen-controls", stringResource(R.string.setup_dual_screen_controls), + stringResource(R.string.setup_dual_screen_controls_hint), s.dualScreenControls) { a.onDualScreenControls(it) } + } } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index f2f7d5ee93..f7efc043ff 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -98,6 +98,7 @@ import com.droiddeck.launcher.stores.StoreInstallRoot import com.droiddeck.launcher.stores.StoreLanguage import com.droiddeck.launcher.stores.StoreSizes import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.gamejolt.GameJoltApi import com.droiddeck.launcher.stores.battlenet.BattleNetInstall import com.droiddeck.launcher.stores.download.DownloadQueue import com.droiddeck.launcher.stores.download.DownloadState @@ -139,7 +140,7 @@ internal enum class GameTab { ABOUT, ACHIEVEMENTS, LAUNCH, SAVES, INSTALL } @Composable internal fun GameDetail( - key: String, s: FrontEndState, a: FrontEndActions, lead: FocusRequester, backLabel: String, hopRail: String?, onBack: () -> Unit, + key: String, s: FrontEndState, a: FrontEndActions, lead: FocusRequester, backLabel: String, hopRail: String?, onBack: () -> Unit, inStore: Boolean = false, ) { val narrow = LocalNarrowPane.current val stacked = narrow || LocalConfiguration.current.screenWidthDp < 700 @@ -218,6 +219,7 @@ internal fun GameDetail( if (!s.shortcutPicker) CompositionLocalProvider(LocalPillButtons provides true) { Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { if (installed != null && installed.sidecar.store == Store.ITCH) ItchCheckButton(installed) + if (installed != null && installed.sidecar.store == Store.GAMEJOLT) GameJoltCheckButton(installed) RemoveButton(title, game, installed, a) } } @@ -232,7 +234,7 @@ internal fun GameDetail( color = MaterialTheme.colorScheme.error, maxLines = 3, overflow = TextOverflow.Ellipsis, ) Spacer(Modifier.height(2.dp)) - GameCapsule(scores) { GameActions(store, id, game, item, installed, s, a, Modifier.focusRequester(lead), compactMenu = stacked) } + GameCapsule(scores) { GameActions(store, id, game, item, installed, s, a, Modifier.focusRequester(lead), compactMenu = stacked, inStore = inStore) } } } if (StoresMotion.heroLands) header() else Rise(1) { header() } @@ -382,7 +384,7 @@ private fun GameTitle(title: String, logo: Any?, titleSize: TextUnit) { @Composable internal fun GameActions( store: Store?, id: String?, game: Library.SteamGame?, item: CatalogItem?, installed: InstalledStoreGame?, - s: FrontEndState, a: FrontEndActions, leadOn: Modifier, compactMenu: Boolean = false, + s: FrontEndState, a: FrontEndActions, leadOn: Modifier, compactMenu: Boolean = false, inStore: Boolean = false, ) { val ctx = LocalContext.current val storeKey = if (store != null && id != null) "${store.id}:$id" else null @@ -409,10 +411,16 @@ internal fun GameActions( if (compactMenu) GameMoreMenu(game, a) else { FileButtons(game, a) GameShortcutMenu(game, a) - EditArtButton(game) } } if (store == Store.ITCH && installed != null) ItchUpdateButton(installed, download == null && StoresState.uninstalling[installed.key] == null) + if (store == Store.GAMEJOLT && installed != null) GameJoltUpdateButton(installed, download == null && StoresState.uninstalling[installed.key] == null) + if (store == Store.GAMEJOLT && installed != null) GameJoltVersionButton(installed, download == null && StoresState.uninstalling[installed.key] == null) + if (inStore && store == Store.GAMEJOLT && installed != null) { + SecondaryButton(stringResource(R.string.stores_view_on, Store.GAMEJOLT.shortLabel)) { + openUrl(ctx, item?.storeUrl.orEmpty().ifBlank { GameJoltApi.pageUrl("game", installed.sidecar.id) }) + } + } if (store == Store.GOG && installed != null) GogMaintenanceActions(installed) if (store == Store.XBOX && id != null) XboxInstalledStream(id, game?.name ?: item?.title.orEmpty(), item) if (store == Store.XBOX && installed != null && id != null) { @@ -435,6 +443,7 @@ internal fun GameActions( } SecondaryButton(stringResource(R.string.bnet_open)) { a.onBattleNet() } } + if (game != null && !compactMenu) EditArtButton(game) } download != null -> { ActionChip(downloadLabel(download), ok = false) @@ -482,7 +491,7 @@ internal fun GameActions( } if (!item.accessible) SecondaryButton(buyLabel(item)) { openStoreUrl(ctx, item) } } - item != null && item.store == Store.ITCH && item.isFree -> { + item != null && (item.store == Store.ITCH || item.store == Store.GAMEJOLT) && item.isFree -> { InstallButton(stringResource(R.string.stores_install), leadOn) { StoresState.requestInstall(ctx, item) } SecondaryButton(stringResource(R.string.stores_view_on, item.store.shortLabel)) { openStoreUrl(ctx, item) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBrowseBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBrowseBar.kt new file mode 100644 index 0000000000..96057ea1d7 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBrowseBar.kt @@ -0,0 +1,157 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.gamejolt.GameJoltBrowse +import com.droiddeck.launcher.stores.gamejolt.GameJoltBrowseState +import com.droiddeck.launcher.stores.gamejolt.GameJoltQuery + +@Composable +internal fun GameJoltBrowseBar(showMature: Boolean) { + val ctx = LocalContext.current + val query = GameJoltBrowseState.query + var picking by remember { mutableStateOf(false) } + LaunchedEffect(Unit) { if (GameJoltBrowseState.items.isEmpty()) GameJoltBrowseState.more(ctx) } + fun toggle(set: Set<String>, value: String): Set<String> = if (value in set) set - value else set + value + Column(Modifier.fillMaxWidth().padding(top = 6.dp, bottom = 8.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + ChipRow { + BrowseDropdown(sectionLabel(query.section)) { first, close -> + GameJoltBrowse.sections.forEachIndexed { index, section -> + MenuItem(sectionLabel(section), query.section == section, focusRequester = if (index == 0) first else null) { + GameJoltBrowseState.choose(ctx, query.copy(section = section)) + close() + } + } + } + BrowseDropdown(priceLabel(query.price)) { first, close -> + GameJoltBrowse.prices.forEachIndexed { index, price -> + MenuItem(priceLabel(price), query.price == price, focusRequester = if (index == 0) first else null) { + GameJoltBrowseState.choose(ctx, query.copy(price = price)) + close() + } + } + } + val anyPlatform = stringResource(R.string.stores_itch_platform_any) + BrowseDropdown(browseSummary(GameJoltBrowse.systems.filter { it in query.os }.map { systemLabel(it) }, anyPlatform)) { first, _ -> + MenuItem(anyPlatform, query.os.isEmpty(), focusRequester = first) { GameJoltBrowseState.choose(ctx, query.copy(os = emptySet())) } + for (os in GameJoltBrowse.systems) MenuItem(systemLabel(os), os in query.os) { GameJoltBrowseState.choose(ctx, query.copy(os = toggle(query.os, os))) } + } + BrowseDropdown(browseSummary(GameJoltBrowse.browsers.filter { it in query.browser }.map { browserLabel(it) }, stringResource(R.string.stores_gamejolt_filter_browser))) { first, _ -> + GameJoltBrowse.browsers.forEachIndexed { index, browser -> + MenuItem(browserLabel(browser), browser in query.browser, focusRequester = if (index == 0) first else null) { GameJoltBrowseState.choose(ctx, query.copy(browser = toggle(query.browser, browser))) } + } + } + val maturities = GameJoltBrowse.maturities.filter { showMature || it != "adult" } + BrowseDropdown(browseSummary(maturities.filter { it in query.maturity }.map { maturityLabel(it) }, stringResource(R.string.stores_gamejolt_filter_maturity))) { first, _ -> + maturities.forEachIndexed { index, maturity -> + MenuItem(maturityLabel(maturity), maturity in query.maturity, focusRequester = if (index == 0) first else null) { GameJoltBrowseState.choose(ctx, query.copy(maturity = toggle(query.maturity, maturity))) } + } + } + BrowseDropdown(browseSummary(GameJoltBrowse.statuses.filter { it in query.status }.map { statusLabel(it) }, stringResource(R.string.stores_gamejolt_filter_status))) { first, _ -> + GameJoltBrowse.statuses.forEachIndexed { index, status -> + MenuItem(statusLabel(status), status in query.status, focusRequester = if (index == 0) first else null) { GameJoltBrowseState.choose(ctx, query.copy(status = toggle(query.status, status))) } + } + } + val partners = stringResource(R.string.stores_gamejolt_partners) + BrowseDropdown(if (query.partners) partners else stringResource(R.string.stores_gamejolt_filter_partners)) { first, _ -> + MenuItem(partners, query.partners, focusRequester = first) { GameJoltBrowseState.choose(ctx, query.copy(partners = !query.partners)) } + } + } + ChipRow { + for (tag in query.tags) BrowseChip("$tag ✕", true) { GameJoltBrowseState.choose(ctx, query.copy(tags = query.tags - tag)) } + BrowseChip(stringResource(R.string.stores_itch_tag_add), false) { picking = true } + } + } + if (picking) TextEntryDialog( + stringResource(R.string.stores_itch_tag_title), "", number = false, confirm = stringResource(R.string.common_ok), + onSubmit = { value -> GameJoltBrowse.tagSlug(value).takeIf { it.isNotEmpty() }?.let { GameJoltBrowseState.choose(ctx, query.copy(tags = (query.tags + it).distinct())) } }, + onDismiss = { picking = false }, id = "gamejolt-tag", + ) +} + +@Composable +internal fun GameJoltLoadMore() { + val ctx = LocalContext.current + val count = GameJoltBrowseState.items.size + LaunchedEffect(Unit) { GameJoltBrowseState.more(ctx) } + if (GameJoltBrowseState.loading) LinearProgressIndicator(Modifier.fillMaxWidth().padding(vertical = 12.dp)) + else if (GameJoltBrowseState.failed) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { + BrowseChip(stringResource(R.string.stores_dl_retry), false) { GameJoltBrowseState.more(ctx, retry = true) } + } + else if (!GameJoltBrowseState.ended && count > 0) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { + BrowseChip(stringResource(R.string.stores_itch_load_more), false) { GameJoltBrowseState.more(ctx) } + } +} + +@Composable +private fun sectionLabel(section: String): String = stringResource( + when (section) { + GameJoltBrowse.SECTION_HOT -> R.string.stores_gamejolt_section_hot + GameJoltBrowse.SECTION_BEST -> R.string.stores_gamejolt_section_best + GameJoltBrowse.SECTION_NEW -> R.string.stores_gamejolt_section_new + else -> R.string.stores_gamejolt_section_featured + }, +) + +@Composable +private fun priceLabel(price: String): String = stringResource( + when (price) { + GameJoltBrowse.PRICE_FREE -> R.string.stores_itch_price_free + GameJoltBrowse.PRICE_SALE -> R.string.stores_itch_price_sale + GameJoltBrowse.PRICE_PAID -> R.string.stores_itch_price_paid + GameJoltBrowse.PRICE_UNDER_5 -> R.string.stores_itch_price_under_5 + GameJoltBrowse.PRICE_UNDER_15 -> R.string.stores_itch_price_under_15 + GameJoltBrowse.PRICE_UNDER_30 -> R.string.stores_gamejolt_price_under_30 + else -> R.string.stores_itch_price_any + }, +) + +@Composable +private fun systemLabel(os: String): String = stringResource( + when (os) { + "windows" -> R.string.stores_itch_platform_windows + "mac" -> R.string.stores_itch_platform_macos + "linux" -> R.string.stores_itch_platform_linux + else -> R.string.stores_gamejolt_os_other + }, +) + +@Composable +private fun browserLabel(browser: String): String = when (browser) { + "html" -> "HTML" + "flash" -> "Flash" + else -> "Unity" +} + +@Composable +private fun maturityLabel(maturity: String): String = stringResource( + when (maturity) { + "everyone" -> R.string.stores_gamejolt_maturity_everyone + "teen" -> R.string.stores_gamejolt_maturity_teen + else -> R.string.stores_gamejolt_maturity_adult + }, +) + +@Composable +private fun statusLabel(status: String): String = stringResource( + when (status) { + "complete" -> R.string.stores_gamejolt_status_complete + else -> R.string.stores_gamejolt_status_early + }, +) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBuildPicker.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBuildPicker.kt new file mode 100644 index 0000000000..7e5f06600a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBuildPicker.kt @@ -0,0 +1,129 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.key +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.formatBytes +import com.droiddeck.launcher.stores.gamejolt.GameJoltApi +import com.droiddeck.launcher.stores.gamejolt.GameJoltBuild +import com.droiddeck.launcher.stores.gamejolt.GameJoltBuilds +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +private const val CHOOSE = "choose" + +@Composable +internal fun GameJoltVersionButton(installed: InstalledStoreGame, enabled: Boolean) { + SecondaryButton(stringResource(R.string.stores_itch_pick_title), enabled = enabled) { + val sidecar = installed.sidecar + val paid = sidecar.extra["paid"] == "1" + StoresState.gameJoltPicking = CatalogItem( + store = Store.GAMEJOLT, id = sidecar.id, title = sidecar.title, imageUrl = sidecar.cover, isFree = !paid, + storeUrl = GameJoltApi.pageUrl("game", sidecar.id), + extra = mapOf("gameId" to (sidecar.extra["gameId"] ?: sidecar.id), CHOOSE to "1"), + ) + } +} + +@Composable +internal fun GameJoltBuildPicker(requested: CatalogItem, onDismiss: () -> Unit) { + val item = requested.copy(owned = requested.owned || StoresState.library[Store.GAMEJOLT].orEmpty().any { it.id == requested.id && it.owned }) + val ctx = LocalContext.current + val app = ctx.applicationContext + val colors = MaterialTheme.colorScheme + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + var loaded by remember(requested) { mutableStateOf<List<GameJoltBuild>?>(null) } + var failed by remember(requested) { mutableStateOf(false) } + + val install: (GameJoltBuild) -> Unit = install@{ build -> + if (!shown.targetState) return@install + val tagged = item.copy( + extra = item.extra + mapOf("buildId" to build.id), + sizeBytes = build.size.takeIf { it > 0 } ?: item.sizeBytes, + ) + close() + StoresState.requestInstall(ctx, tagged) + } + + LaunchedEffect(requested) { + val gameId = item.extra["gameId"].orEmpty().ifEmpty { item.id } + val result = withContext(Dispatchers.IO) { GameJoltBuilds.load(app, gameId) } + if (result == null) { failed = true; return@LaunchedEffect } + loaded = result + if ((item.isFree || item.owned) && item.extra[CHOOSE] != "1" && shown.targetState) result.singleOrNull()?.takeIf { it.installable }?.let { install(it) } + } + + AppDialog(shown, close, "gameJoltBuilds", wide = false, maxWidth = 460.dp) { + DialogTitleRow(stringResource(R.string.stores_itch_pick_title), close) + Text(item.title, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + val list = loaded + when { + failed -> Text(stringResource(R.string.stores_gamejolt_pick_failed), fontSize = 13.sp, color = colors.onSurfaceVariant) + list == null -> LinearProgressIndicator(Modifier.fillMaxWidth().padding(vertical = 8.dp)) + list.isEmpty() -> Text(stringResource(R.string.stores_itch_pick_none), fontSize = 13.sp, color = colors.onSurfaceVariant) + else -> Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) { + for (build in list) key(build.id) { BuildRow(item, build) { install(build) } } + } + } + } +} + +@Composable +private fun BuildRow(item: CatalogItem, build: GameJoltBuild, onInstall: () -> Unit) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val linux = "linux" in build.platforms && !build.installable + val canInstall = build.installable && (item.isFree || item.owned) + val names = build.platforms.map { platformName(it) } + val detail = listOfNotNull( + names.joinToString(", "), + build.size.takeIf { it > 0 }?.let { formatBytes(it) }, + build.version.takeIf { it.isNotBlank() }, + ).joinToString(" · ") + ListRow(enabled = !linux, onClick = { if (canInstall) onInstall() else openStoreUrl(ctx, item) }) { + Column(Modifier.weight(1f)) { + Text(build.filename.ifBlank { build.packageTitle.ifBlank { item.title } }, fontSize = 13.sp, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text(detail, fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + val label = when { + canInstall -> stringResource(R.string.stores_install) + linux -> stringResource(R.string.stores_itch_build_linux_soon) + else -> stringResource(R.string.stores_gamejolt_build_open) + } + Text(label, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1) + } +} + +@Composable +private fun platformName(platform: String): String = stringResource( + when (platform) { + "windows" -> R.string.stores_itch_build_windows + "linux" -> R.string.stores_itch_build_linux + "osx" -> R.string.stores_itch_build_macos + "other" -> R.string.stores_gamejolt_os_other + else -> R.string.stores_itch_build_web + }, +) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameJoltUpdateButton.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltUpdateButton.kt new file mode 100644 index 0000000000..c351495142 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltUpdateButton.kt @@ -0,0 +1,61 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.gamejolt.GameJoltUpdate +import com.droiddeck.launcher.stores.gamejolt.GameJoltUpdates + +@Composable +internal fun GameJoltCheckButton(installed: InstalledStoreGame) { + val ctx = LocalContext.current + IconAction(Icons.Filled.Refresh, stringResource(R.string.store_check_updates), "game:check-updates", enabled = GameJoltUpdates.checkingKey == null, frosted = true) { + GameJoltUpdates.checkGame(ctx, installed) + } +} + +@Composable +internal fun GameJoltUpdateButton(installed: InstalledStoreGame, enabled: Boolean) { + val ctx = LocalContext.current + val update = GameJoltUpdates.available[installed.key] ?: return + var asking by remember { mutableStateOf(false) } + SecondaryButton(stringResource(R.string.common_update), enabled = enabled) { + if (update.replaced) asking = true else GameJoltUpdates.start(ctx, installed, update) + } + if (asking) GameJoltReplacedDialog(installed, update) { asking = false } +} + +@Composable +private fun GameJoltReplacedDialog(installed: InstalledStoreGame, update: GameJoltUpdate, onDismiss: () -> Unit) { + val ctx = LocalContext.current + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + AppDialog(shown, close, "gameJoltUpdate", wide = false, maxWidth = 460.dp) { + DialogTitleRow(installed.sidecar.title, close) + Text( + stringResource(R.string.stores_itch_update_replaced, update.filename.ifBlank { update.buildId }), + fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + PrimaryButton(stringResource(R.string.common_update)) { + close() + GameJoltUpdates.start(ctx, installed, update) + } + SecondaryButton(stringResource(R.string.common_cancel)) { close() } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt index 276d131fee..fe65d598f4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt @@ -8,6 +8,7 @@ import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -19,6 +20,7 @@ import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -27,6 +29,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role @@ -44,16 +47,29 @@ internal fun ItchBrowseBar() { var picking by remember { mutableStateOf(false) } Column(Modifier.fillMaxWidth().padding(top = 6.dp, bottom = 8.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { ChipRow { - for (sort in ItchBrowse.sorts) BrowseChip(sortLabel(sort), query.sort == sort) { ItchBrowseState.choose(ctx, query.copy(sort = sort)) } - } - ChipRow { - for (price in ItchBrowse.prices) BrowseChip(priceLabel(price), query.price == price) { ItchBrowseState.choose(ctx, query.copy(price = price)) } - } - ChipRow { - BrowseChip(stringResource(R.string.stores_itch_platform_any), query.platforms.isEmpty()) { ItchBrowseState.choose(ctx, query.copy(platforms = emptySet())) } - for (platform in ItchBrowse.platformNames) { - val on = platform in query.platforms - BrowseChip(platformLabel(platform), on) { ItchBrowseState.choose(ctx, query.copy(platforms = if (on) query.platforms - platform else query.platforms + platform)) } + BrowseDropdown(sortLabel(query.sort)) { first, close -> + ItchBrowse.sorts.forEachIndexed { index, sort -> + MenuItem(sortLabel(sort), query.sort == sort, focusRequester = if (index == 0) first else null) { + ItchBrowseState.choose(ctx, query.copy(sort = sort)) + close() + } + } + } + BrowseDropdown(priceLabel(query.price)) { first, close -> + ItchBrowse.prices.forEachIndexed { index, price -> + MenuItem(priceLabel(price), query.price == price, focusRequester = if (index == 0) first else null) { + ItchBrowseState.choose(ctx, query.copy(price = price)) + close() + } + } + } + val anyPlatform = stringResource(R.string.stores_itch_platform_any) + BrowseDropdown(browseSummary(ItchBrowse.platformNames.filter { it in query.platforms }.map { platformLabel(it) }, anyPlatform)) { first, _ -> + MenuItem(anyPlatform, query.platforms.isEmpty(), focusRequester = first) { ItchBrowseState.choose(ctx, query.copy(platforms = emptySet())) } + for (platform in ItchBrowse.platformNames) { + val on = platform in query.platforms + MenuItem(platformLabel(platform), on) { ItchBrowseState.choose(ctx, query.copy(platforms = if (on) query.platforms - platform else query.platforms + platform)) } + } } } ChipRow { @@ -83,7 +99,7 @@ internal fun ItchLoadMore() { } @Composable -private fun ChipRow(content: @Composable () -> Unit) { +internal fun ChipRow(content: @Composable () -> Unit) { Row( horizontalArrangement = Arrangement.spacedBy(6.dp), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).selectableGroup(), @@ -91,7 +107,22 @@ private fun ChipRow(content: @Composable () -> Unit) { } @Composable -private fun BrowseChip(label: String, selected: Boolean, onClick: () -> Unit) { +internal fun BrowseDropdown(text: String, content: @Composable ColumnScope.(FocusRequester, () -> Unit) -> Unit) { + var expanded by remember { mutableStateOf(false) } + Box { + CompositionLocalProvider(LocalChipMinWidth provides 0.dp) { ValueChip(text, expanded) { expanded = !expanded } } + AnchoredMenu(expanded, onDismiss = { expanded = false }, compact = true, minWidth = 160.dp) { first -> content(first) { expanded = false } } + } +} + +internal fun browseSummary(labels: List<String>, empty: String): String = when (labels.size) { + 0 -> empty + 1, 2 -> labels.joinToString(", ") + else -> "${labels.first()} +${labels.size - 1}" +} + +@Composable +internal fun BrowseChip(label: String, selected: Boolean, onClick: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val shape = RoundedCornerShape(8.dp) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index 482aeb5a63..6550a2fd06 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -102,7 +102,8 @@ import com.droiddeck.launcher.stores.download.DownloadEntry import com.droiddeck.launcher.stores.download.DownloadStage import com.droiddeck.launcher.stores.download.DownloadState import com.droiddeck.launcher.stores.formatBytes -import com.droiddeck.launcher.stores.itch.ItchCollection +import com.droiddeck.launcher.stores.gamejolt.GameJoltCollections +import com.droiddeck.launcher.stores.gamejolt.GameJoltUpdates import com.droiddeck.launcher.stores.itch.ItchCollections import com.droiddeck.launcher.stores.itch.ItchUpdates import com.droiddeck.launcher.stores.gog.GogMaintenance @@ -142,20 +143,20 @@ internal fun libraryEntries( return out.distinctBy { it.key } } -internal fun collectionEntries(all: List<LibraryEntry>, items: List<CatalogItem>): List<LibraryEntry> { +internal fun collectionEntries(all: List<LibraryEntry>, items: List<CatalogItem>, store: Store = Store.ITCH): List<LibraryEntry> { val keys = items.map { it.key }.toSet() - val itch = all.filter { it.source == Store.ITCH.id } - val have = itch.mapNotNull { it.storeKey }.toSet() - return itch.filter { it.storeKey in keys } + - items.filter { it.key !in have }.map { LibraryEntry(GameRef.key(it), Store.ITCH.id, it.title, null, it, false) } + val own = all.filter { it.source == store.id } + val have = own.mapNotNull { it.storeKey }.toSet() + return own.filter { it.storeKey in keys } + + items.filter { it.key !in have }.map { LibraryEntry(GameRef.key(it), store.id, it.title, null, it, false) } } internal fun installedFirst(entries: List<LibraryEntry>): List<LibraryEntry> = entries.partition { it.installed }.let { (on, off) -> on + off } internal const val LIBRARY_ALL = "all" -internal fun librarySources(entries: List<LibraryEntry>, order: List<String>): List<String> = +internal fun librarySources(entries: List<LibraryEntry>, order: List<String>, always: Set<String> = emptySet()): List<String> = (listOf(Library.SOURCE_STEAM) + arrangeStoreTabs(order, emptySet()).map { it.store.id } + Library.ADDED) - .filter { source -> entries.any { it.source == source } } + .filter { source -> source in always || entries.any { it.source == source } } internal object LibraryDisplay { val scales = listOf(0.75f, 0.875f, 1f, 1.2f, 1.45f) @@ -225,7 +226,11 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, var showUninstalled by remember(LibraryView.ownedRequest) { mutableStateOf(SessionPrefs.libraryShowUninstalled(ctx)) } var collectionShows by remember { mutableStateOf<Pair<String, Boolean>?>(null) } val setShowUninstalled = { show: Boolean -> - val picked = ItchCollections.selected.takeIf { LibraryView.source == Store.ITCH.id } + val picked = when (LibraryView.source) { + Store.ITCH.id -> ItchCollections.selected + Store.GAMEJOLT.id -> GameJoltCollections.selected + else -> null + } if (picked != null) collectionShows = picked to show else { showUninstalled = show @@ -233,21 +238,32 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, } } val itchSignedIn = owned.containsKey(Store.ITCH) - val listed = librarySources(all, SessionPrefs.storesTabOrder(ctx)) - val sources = if (itchSignedIn && Store.ITCH.id !in listed) listed + Store.ITCH.id else listed + val gameJoltSignedIn = owned.containsKey(Store.GAMEJOLT) + val sources = librarySources(all, SessionPrefs.storesTabOrder(ctx), listOfNotNull(Store.ITCH.id.takeIf { itchSignedIn }, Store.GAMEJOLT.id.takeIf { gameJoltSignedIn }).toSet()) val source = LibraryView.source.takeIf { it == LIBRARY_ALL || it in sources } ?: LIBRARY_ALL val q = LibraryView.query.trim().lowercase() val xboxFilter = if (source == Store.XBOX.id) XboxLibraryFilter.current else XboxLibraryFilter.ALL - LaunchedEffect(source, itchSignedIn) { if (source == Store.ITCH.id && itchSignedIn) { - ItchCollections.load(ctx) - ItchUpdates.check(ctx) - } } - val collection = if (source == Store.ITCH.id) ItchCollections.chosen() else null - val pool = if (collection == null) all else collectionEntries(all, ItchCollections.gamesOf(collection.id).orEmpty()) + LaunchedEffect(source, itchSignedIn, gameJoltSignedIn) { + if (source == Store.ITCH.id && itchSignedIn) { + ItchCollections.load(ctx) + ItchUpdates.check(ctx) + } + if (source == Store.GAMEJOLT.id && gameJoltSignedIn) { + GameJoltCollections.load(ctx) + GameJoltUpdates.check(ctx) + } + } + val collectionId = when (source) { + Store.ITCH.id -> ItchCollections.chosen()?.id + Store.GAMEJOLT.id -> GameJoltCollections.chosen()?.id + else -> null + } + val collectionItems = collectionId?.let { if (source == Store.GAMEJOLT.id) GameJoltCollections.gamesOf(it) else ItchCollections.gamesOf(it) } + val pool = if (collectionId == null) all else collectionEntries(all, collectionItems.orEmpty(), Store.byId(source) ?: Store.ITCH) val matching = pool.filter { (source == LIBRARY_ALL || it.source == source) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it) } - val listUninstalled = if (collection == null) showUninstalled else collectionShows?.takeIf { it.first == collection.id }?.second ?: true + val listUninstalled = if (collectionId == null) showUninstalled else collectionShows?.takeIf { it.first == collectionId }?.second ?: true val candidates = if (listUninstalled) matching else matching.filter { it.installed } val hiddenUninstalled = if (listUninstalled) 0 else matching.count { !it.installed } val sort = s.storesSort @@ -332,7 +348,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, kotlinx.coroutines.delay(Motion.ms(240).toLong()) focusWithinFrames({ ff.last?.startsWith("card:") == true }) { if (ff.firstTileAttached > 0) ff.firstTile else FocusRequester.Default } } - if (all.isEmpty() && open == null && !itchSignedIn) { + if (all.isEmpty() && open == null && !itchSignedIn && !gameJoltSignedIn) { LibraryEmpty(s, a, modifier) return } @@ -453,7 +469,7 @@ private fun LibraryGrid( contentPadding = PaddingValues(top = 4.dp, bottom = 16.dp), ) { item(key = "header", span = { GridItemSpan(maxLineSpan) }) { - Rise(0) { LibraryHeader(s, a, total, searchCleared, source == Store.XBOX.id, showUninstalled, onShowUninstalled, collections = source == Store.ITCH.id) } + Rise(0) { LibraryHeader(s, a, total, searchCleared, source == Store.XBOX.id, showUninstalled, onShowUninstalled, collections = Store.byId(source)?.takeIf { it == Store.ITCH || it == Store.GAMEJOLT }) } } item(key = "filters", span = { GridItemSpan(maxLineSpan) }) { Rise(1) { LibraryFilters(sources, source, onSource) } @@ -514,7 +530,7 @@ private fun LazyGridScope.libraryGrid(entries: List<LibraryEntry>, empty: Int, t @Composable private fun LibraryHeader( s: FrontEndState, a: FrontEndActions, total: Int, searchCleared: Boolean, xbox: Boolean, - showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, collections: Boolean, + showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, collections: Store?, ) { val colors = MaterialTheme.colorScheme val narrow = LocalNarrowPane.current @@ -532,7 +548,7 @@ private fun LibraryHeader( ) { DisplayButton() if (showUninstalled != null || xbox) LibraryFilterButton(showUninstalled, onShowUninstalled, xbox) - if (collections) CollectionsButton() + if (collections != null) CollectionsButton(collections) SortButton(s, a) ViewButton(s, a) GameFileFolderActions(s, a) @@ -725,7 +741,7 @@ internal fun LibraryMarker(e: LibraryEntry, download: DownloadEntry?, showDownlo } } -private fun libraryUpdateAvailable(e: LibraryEntry): Boolean = e.storeKey?.let { it in ItchUpdates.available } == true || +private fun libraryUpdateAvailable(e: LibraryEntry): Boolean = e.storeKey?.let { it in ItchUpdates.available || it in GameJoltUpdates.available } == true || e.source == Store.GOG.id && (e.item?.id ?: e.game?.storeId)?.let { GogMaintenance.checks[it]?.state } == GogMaintenance.State.AVAILABLE @Composable @@ -863,16 +879,21 @@ private fun LibraryFilterButton(showUninstalled: Boolean?, onShowUninstalled: (B } @Composable -private fun CollectionsButton() { +private fun CollectionsButton(store: Store) { val pal = LocalPalette.current val ctx = LocalContext.current val title = stringResource(R.string.itch_collections) val all = stringResource(R.string.stores_tab_all) var at by remember { mutableStateOf<Rect?>(null) } + val gameJolt = store == Store.GAMEJOLT + val chosenTitle = if (gameJolt) GameJoltCollections.chosen()?.title else ItchCollections.chosen()?.title + val selectedId = if (gameJolt) GameJoltCollections.selected else ItchCollections.selected Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { - HeaderIconButton(title + " · " + (ItchCollections.chosen()?.title ?: all), CollectionsIcon, "itch-collections") { + HeaderIconButton(title + " · " + (chosenTitle ?: all), CollectionsIcon, "${store.id}-collections") { val from = at ?: return@HeaderIconButton - val choices = listOf<ItchCollection?>(null) + ItchCollections.list + val choices = listOf<Pair<String, String>?>(null) + if (gameJolt) GameJoltCollections.list.map { c -> + c.id to (c.title + (GameJoltCollections.gamesOf(c.id)?.let { " (" + it.size + ")" }.orEmpty())) + } else ItchCollections.list.map { c -> c.id to (c.title + " (" + c.count + ")") } Steps.ask(StepAsk( anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = choices.size, handle = { Icon(CollectionsIcon, null, tint = pal.signal, modifier = Modifier.size(18.dp)) }, @@ -880,12 +901,12 @@ private fun CollectionsButton() { StepTitle(title) StepList { choices.forEachIndexed { i, c -> - val picked = c?.id == ItchCollections.selected + val picked = c?.first == selectedId StepChoice( - c?.let { it.title + " (" + it.count + ")" } ?: all, selected = picked, enabled = open, + c?.second ?: all, selected = picked, enabled = open, modifier = Modifier.fillMaxWidth().stepItem(i).then(if (picked) Modifier.focusRequester(first) else Modifier), ) { - ItchCollections.select(ctx, c?.id) + if (gameJolt) GameJoltCollections.select(ctx, c?.first) else ItchCollections.select(ctx, c?.first) Steps.fold() } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt b/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt index c428b8b97d..3b89f47d2e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt @@ -460,7 +460,7 @@ internal fun LiftHero( scrim { sink.value } if (shown || open) Box( Modifier.fillMaxSize() - .graphicsLayer { alpha = sink.value }.background(Color.Black.copy(alpha = 0.42f)) + .overhang().graphicsLayer { alpha = sink.value }.background(Color.Black.copy(alpha = 0.42f)) .focusProperties { canFocus = false } .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null, enabled = open && !launching) { close() }, ) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index 63508ba42e..dfaf8b6f71 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -75,6 +75,8 @@ class ModeSettings( val gameStorage: String? = null, val storageOptions: List<com.droiddeck.launcher.session.GameStorage.Option> = emptyList(), val steamLibraries: List<com.droiddeck.launcher.session.SteamLibraries.Entry> = emptyList(), + val foundSteamLibraries: List<com.droiddeck.launcher.session.SteamLibraries.Found> = emptyList(), + val allFilesAccessMissing: Boolean = false, val storageDiagnostics: Boolean = false, val fexPreset: String? = null, val forceSsbs: Boolean = false, @@ -89,7 +91,7 @@ class ModeSettings( val steamController: String? = null, val unfoldedControls: Boolean? = null, val unfoldedControlsWithController: Boolean = false, - val runSteamAtStartup: Boolean = false, + val startupSession: String = SessionPrefs.STARTUP_OFF, val bootMovie: String? = null, val bootMovieSound: Boolean = true, val bootMovieCustomName: String? = null, @@ -126,6 +128,8 @@ class ModeSettingsActions( val onPickGameStorageFolder: () -> Unit = {}, val onStorageDiagnostics: (Boolean) -> Unit = {}, val onAddSteamLibrary: () -> Unit = {}, + val onAddFoundSteamLibrary: (path: String) -> Unit = {}, + val onAllowAllFilesAccess: () -> Unit = {}, val onRenameSteamLibrary: (id: String, label: String) -> Unit = { _, _ -> }, val onRemoveSteamLibrary: (id: String) -> Unit = {}, val onFexPreset: (String) -> Unit = {}, @@ -141,7 +145,7 @@ class ModeSettingsActions( val onSteamController: (String) -> Unit = {}, val onUnfoldedControls: (Boolean) -> Unit = {}, val onUnfoldedControlsWithController: (Boolean) -> Unit = {}, - val onRunSteamAtStartup: (Boolean) -> Unit = {}, + val onStartupSession: (String) -> Unit = {}, val onBootMovie: (String) -> Unit = {}, val onBootMovieSound: (Boolean) -> Unit = {}, val onImportBootMovie: () -> Unit = {}, @@ -355,11 +359,15 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: ToggleRow(host, "pip-auto", stringResource(R.string.pip_auto), null, s.pipAutoEnter, onChange = a.onPipAutoEnter) } - if (steam) SettingsGroup(stringResource(R.string.mode_startup)) { - ToggleRow( - host, "steam-startup", stringResource(R.string.mode_steam_startup), - stringResource(R.string.mode_steam_startup_hint), - s.runSteamAtStartup, onChange = a.onRunSteamAtStartup, + SettingsGroup(stringResource(R.string.mode_startup)) { + ChoiceRow( + host, "startup-session", stringResource(R.string.mode_startup_session), + stringResource(R.string.mode_startup_session_hint), + listOf( + SessionPrefs.STARTUP_OFF to stringResource(R.string.common_never), + SessionPrefs.STARTUP_STEAM to stringResource(R.string.rail_steam), + SessionPrefs.STARTUP_DESKTOP to stringResource(R.string.rail_desktop), + ), s.startupSession, onPick = a.onStartupSession, ) } extras.performance() @@ -417,6 +425,19 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: } } } + if (s.steamLibraries.size < com.droiddeck.launcher.session.SteamLibraries.MAX) for (found in s.foundSteamLibraries) { + SettingsRow( + found.label, + stringResource(R.string.libraries_found_hint, pluralStringResource(R.plurals.mode_added_count, found.games, found.games), found.shown), + ) { + SecondaryButton(stringResource(R.string.libraries_add_found), compact = true) { a.onAddFoundSteamLibrary(found.path) } + } + } + if (s.allFilesAccessMissing && s.steamLibraries.size < com.droiddeck.launcher.session.SteamLibraries.MAX) { + SettingsRow(stringResource(R.string.libraries_access_title), stringResource(R.string.libraries_access_hint)) { + SecondaryButton(stringResource(R.string.libraries_access_allow), compact = true, onClick = a.onAllowAllFilesAccess) + } + } SettingsRow( stringResource(R.string.libraries_add), if (s.steamLibraries.size < com.droiddeck.launcher.session.SteamLibraries.MAX) stringResource(R.string.libraries_hint) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt index df4182e0de..26251ddada 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt @@ -58,6 +58,7 @@ class SecondScreenPresentation( private val onMenu: (() -> Unit)? = null, private val menu: (@androidx.compose.runtime.Composable () -> Unit)? = null, private val dashboard: (@androidx.compose.runtime.Composable () -> Unit)? = null, + private val onSwap: (() -> Unit)? = null, ) : Presentation(sessionActivity, display) { private val frame = FrameLayout(context) private var menuView: androidx.compose.ui.platform.ComposeView? = null @@ -246,7 +247,7 @@ class SecondScreenPresentation( SecondScreenMode.DESKTOP -> { ownComposeViews() root.addView(BottomDesktopPanel(context, onClose, onMenu, - (onSteamMenu to onQam).takeIf { SessionState.mode == SessionService.MODE_STEAM }), weightParams()) + (onSteamMenu to onQam).takeIf { SessionState.mode == SessionService.MODE_STEAM }, onSwap), weightParams()) } SecondScreenMode.NONE -> Unit } 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 81c084d6e9..4ecf45256f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -29,6 +29,7 @@ import androidx.compose.animation.core.FastOutSlowInEasing import androidx.compose.foundation.layout.offset import androidx.compose.material.icons.Icons import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.widthIn import androidx.compose.material.icons.outlined.Close import androidx.compose.material.icons.outlined.Terminal import androidx.compose.material.icons.outlined.Dashboard @@ -244,6 +245,9 @@ class DrawerActions( val textureAnisotropy: Int? = 0, val textureLodBias: String? = TextureFiltering.LOD_BIAS_OFF, val secondScreenMode: SecondScreenMode, + val gameOnBottom: Boolean = false, + val gameSwapAvailable: Boolean = false, + val onGameOnBottom: (Boolean) -> Unit = {}, val dashboardAvailable: Boolean = false, val desktopAvailable: Boolean = false, val secondScreenDisplays: List<SecondScreenDisplay>, @@ -475,8 +479,6 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont SteamActionPill( stringResource(R.string.common_close), Icons.Outlined.Close, focus.track(page, "close"), ) { host.open = null; a.onClose() } - Spacer(Modifier.width(4.dp)) - BottomScreenModes(a, focus.track(page, "bottom-modes")) { host.open = null } } Spacer(Modifier.weight(1f)) SteamActionPill( @@ -876,69 +878,15 @@ private fun StopSessionButton(modifier: Modifier = Modifier, onClick: () -> Unit val fill by animateColorAsState(if (hot) colors.error.copy(alpha = 0.18f) else Color.Transparent, Motion.tw(220), label = "dangerFill") val shape = RoundedCornerShape(20.dp) val stopDescription = stringResource(R.string.stop_session) - val stopLabel = stringResource(R.string.drawer_stop) - var iconOnly by remember(stopLabel, androidx.compose.ui.platform.LocalConfiguration.current.screenWidthDp) { mutableStateOf(false) } Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), - modifier = modifier.heightIn(min = 44.dp).semantics { contentDescription = stopDescription }.testTag("drawer-stop") + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center, + modifier = modifier.heightIn(min = 44.dp).widthIn(min = 44.dp).semantics { contentDescription = stopDescription }.testTag("drawer-stop") .clip(shape).background(fill).glideBorder(hot, shape, colors.error.copy(alpha = 0.9f), colors.error.copy(alpha = 0.55f)) .hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current, onClick = onClick) .controllerConfirm(onClick = onClick) - .padding(start = 12.dp, end = 14.dp), + .padding(horizontal = 12.dp), ) { Icon(Icons.Outlined.PowerSettingsNew, contentDescription = null, tint = colors.error, modifier = Modifier.size(18.dp)) - if (!iconOnly) Text( - stopLabel, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.error, - maxLines = 1, softWrap = false, onTextLayout = { if (it.hasVisualOverflow) iconOnly = true }, - ) - } -} - -@Composable -private fun BottomScreenModes(a: DrawerActions, modifier: Modifier, onPick: () -> Unit) { - val pal = LocalPalette.current - val colors = MaterialTheme.colorScheme - val modes = buildList { - if (com.droiddeck.launcher.session.SessionState.deckPad) add(SecondScreenMode.DECK_CONTROLS to Icons.Outlined.SportsEsports) - add(SecondScreenMode.KEYBOARD_TRACKPAD to Icons.Outlined.Keyboard) - add(SecondScreenMode.TERMINAL to Icons.Outlined.Terminal) - if (a.dashboardAvailable) add(SecondScreenMode.DASHBOARD to Icons.Outlined.Dashboard) - if (a.desktopAvailable) add(SecondScreenMode.DESKTOP to Icons.Outlined.DesktopWindows) - } - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(4.dp), - modifier = modifier.focusGroup().clip(RoundedCornerShape(26.dp)).border(1.dp, pal.line, RoundedCornerShape(26.dp)).padding(4.dp), - ) { - modes.forEach { (mode, icon) -> - val selected = a.secondScreenMode == mode - val source = remember { MutableInteractionSource() } - val hot = source.collectIsFocusedAsState().value || source.collectIsHoveredAsState().value - val shape = RoundedCornerShape(20.dp) - val pick = { onPick(); a.onSecondScreenMode(mode) } - val label = stringResource(mode.label) - Box( - contentAlignment = Alignment.Center, - modifier = Modifier.size(width = 52.dp, height = 40.dp).semantics { contentDescription = label } - .clip(shape) - .background(when { - selected -> pal.signal - hot -> pal.signal.copy(alpha = 0.14f) - else -> Color.Transparent - }) - .glideBorder(hot, shape, pal.signal) - .hoverable(source) - .selectable(selected, interactionSource = source, indication = LocalIndication.current, role = Role.Tab, onClick = pick) - .controllerConfirm(onClick = pick), - ) { - Icon(icon, contentDescription = null, modifier = Modifier.size(22.dp), - tint = when { - selected -> colors.background - hot -> pal.signal - else -> colors.onBackground - }) - } - } } } @@ -1231,6 +1179,11 @@ private fun SecondScreenGroup(host: MenuHost, a: DrawerActions, track: (String) a.secondScreenDisplays.map { it.id to it.label }, a.selectedSecondScreenDisplay, chipModifier = track("second-screen-display"), onPick = a.onSecondScreenDisplay) } + if (a.gameSwapAvailable || a.gameOnBottom) SettingsGroup(stringResource(R.string.swap_game_screen_group)) { + ChoiceRow(host, "game-screen", stringResource(R.string.swap_game_screen), null, + listOf(false to stringResource(R.string.swap_game_screen_top), true to stringResource(R.string.swap_game_screen_bottom)), + a.gameOnBottom, chipModifier = track("game-screen"), onPick = a.onGameOnBottom) + } } @Composable diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt index b389992cf6..df74bb5850 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -26,6 +26,7 @@ import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.size import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.clearAndSetSemantics import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.stateDescription import androidx.compose.foundation.shape.CircleShape @@ -371,11 +372,12 @@ fun MenuItem( .background(if (hot && enabled) Color.White.copy(alpha = 0.07f) else Color.Transparent) .glideBorder(hot && enabled, RoundedCornerShape(8.dp), pal.signal) .alpha(if (enabled) 1f else 0.4f) + .semantics { selected = checked } .hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current, enabled = enabled, onClick = onClick) .controllerConfirm(enabled = enabled, onClick = onClick) .padding(horizontal = 10.dp, vertical = 9.dp), ) { - Text("✓", fontSize = 12.sp, color = pal.signal, modifier = Modifier.width(18.dp).alpha(if (checked) 1f else 0f)) + Text("✓", fontSize = 12.sp, color = pal.signal, modifier = Modifier.width(18.dp).alpha(if (checked) 1f else 0f).clearAndSetSemantics {}) if (leading != null) { leading() Spacer(Modifier.width(8.dp)) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt b/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt index 8caa4e6dec..b14dd39dc3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt @@ -61,11 +61,11 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import com.droiddeck.launcher.R -import com.droiddeck.launcher.hud.DroidDeckMark import com.droiddeck.launcher.hud.FrameStats import com.droiddeck.launcher.hud.HudMetrics import com.droiddeck.launcher.session.StatsHud import java.io.File +import kotlin.math.ceil import kotlin.math.max import kotlin.math.min import kotlin.math.roundToInt @@ -164,10 +164,6 @@ private fun HudPanel(clock: String, right: String?, dim: Boolean, accent: Color, val divider = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = argb(if (dim) 38 else 90, a) } val blur = BlurMaskFilter(4.dp.toPx(), BlurMaskFilter.Blur.NORMAL) val line = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE; strokeWidth = stroke; color = argb(if (dim) 90 else 255, a) } - val markH = min(h, w) * 0.55f - val markX = w - DroidDeckMark.widthFor(markH) - 16.dp.toPx() - val markBody = android.graphics.Color.argb(if (dim) 9 else 20, 255, 255, 255) - val markOrb = argb(if (dim) 9 else 20, a) onDrawBehind { drawIntoCanvas { canvas -> val c = canvas.nativeCanvas @@ -176,7 +172,6 @@ private fun HudPanel(clock: String, right: String?, dim: Boolean, accent: Color, c.clipPath(body) c.drawRect(0f, 0f, w, headerPx + 1f, band) c.drawRect(0f, headerPx, w, headerPx + max(1f, density), divider) - DroidDeckMark.draw(c, markX, (h - markH) / 2f, markH, markBody, markOrb) c.restore() for (pass in 0..2) { line.maskFilter = if (pass < 2) blur else null @@ -189,8 +184,7 @@ private fun HudPanel(clock: String, right: String?, dim: Boolean, accent: Color, .padding(start = 24.dp, end = 34.dp, bottom = 14.dp), ) { Row(Modifier.fillMaxWidth().height(HEADER), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { - DroidDeckLogo(16.dp, body = headerInk, orb = if (dim) accent.copy(alpha = 0.5f) else accent) - Text("DroidDeck", fontSize = 14.sp, fontWeight = FontWeight.Bold, color = headerInk, maxLines = 1) + Wordmark(14.dp, ink = headerInk, ball = if (dim) accent.copy(alpha = 0.5f) else accent) if (clock.isNotEmpty()) { Text("·", fontSize = 13.sp, fontFamily = Mono, color = HudInk.sep) Text(clock, fontSize = 13.sp, fontFamily = Mono, fontWeight = FontWeight.Bold, color = HudInk.dim, maxLines = 1) @@ -271,13 +265,18 @@ private fun lowsText(d: HudData, size: TextUnit, accent: Color, deep: Boolean = } } +private val GRAPH_MIN_GAP = 3.dp + @Composable private fun Graph(values: List<Float>, lo: Float, hi: Float, color: Color, modifier: Modifier) { Canvas(modifier) { if (values.size < 2 || hi <= lo) return@Canvas + val stride = ceil(GRAPH_MIN_GAP.toPx() * (values.size - 1) / size.width).toInt().coerceAtLeast(1) + val points = if (stride == 1) values else values.chunked(stride) { it.average().toFloat() } + if (points.size < 2) return@Canvas val path = Path() - values.forEachIndexed { i, v -> - val x = i / (values.size - 1f) * size.width + points.forEachIndexed { i, v -> + val x = i / (points.size - 1f) * size.width val y = size.height - ((v - lo) / (hi - lo)).coerceIn(0f, 1f) * size.height if (i == 0) path.moveTo(x, y) else path.lineTo(x, y) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt index 1d2480688f..fc900a4f56 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt @@ -111,8 +111,7 @@ private fun LogoBadge(size: Dp) { private fun LogoHeader(clock: String, game: String?) { val colors = MaterialTheme.colorScheme Row(Modifier.fillMaxWidth().padding(horizontal = 2.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { - DroidDeckLogo(16.dp) - Text("DroidDeck", fontSize = 13.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) + Wordmark(14.dp, ink = colors.onBackground) Text(game.orEmpty(), fontSize = 13.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, textAlign = TextAlign.Center, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) if (clock.isNotEmpty()) Text(clock, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt index 671bcabe1a..b24c0f2cf1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt @@ -38,6 +38,8 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.geometry.Rect import androidx.compose.ui.layout.boundsInParent +import androidx.compose.ui.layout.layout +import androidx.compose.ui.unit.Constraints import androidx.compose.ui.layout.onPlaced import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -166,11 +168,17 @@ internal fun SteamHome(s: FrontEndState, a: FrontEndActions, modifier: Modifier) ) } +internal fun Modifier.overhang(by: androidx.compose.ui.unit.Dp = 4.dp): Modifier = layout { measurable, constraints -> + val e = by.roundToPx() + val placeable = measurable.measure(Constraints.fixed(constraints.maxWidth + e * 2, constraints.maxHeight + e * 2)) + layout(constraints.maxWidth, constraints.maxHeight) { placeable.place(-e, -e) } +} + @Composable internal fun WallFade() { val colors = MaterialTheme.colorScheme Box( - Modifier.fillMaxSize().background( + Modifier.fillMaxSize().overhang().background( Brush.horizontalGradient( 0f to colors.background.copy(alpha = 0.97f), 0.34f to colors.background.copy(alpha = 0.86f), @@ -179,7 +187,7 @@ internal fun WallFade() { ), ), ) - Box(Modifier.fillMaxSize().background(Brush.verticalGradient(0.55f to Color.Transparent, 1f to colors.background.copy(alpha = 0.9f)))) + Box(Modifier.fillMaxSize().overhang().background(Brush.verticalGradient(0.55f to Color.Transparent, 1f to colors.background.copy(alpha = 0.9f)))) } @Composable diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt index 40bfd22c4c..1d2aef9d6e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt @@ -31,6 +31,7 @@ internal fun sourceColours(source: String): SourceColours = when (source) { Store.AMAZON.id -> SourceColours(Color(0xFF3A2A0A), Color(0xFFFFC266), Color(0xFFFF9900)) Store.XBOX.id -> SourceColours(Color(0xFF17381B), Color(0xFFC6EDC2), Color(0xFF70C850)) Store.ITCH.id -> SourceColours(Color(0xFF3A1A1E), Color(0xFFFFB3B3), Color(0xFFFF5C5C)) + Store.GAMEJOLT.id -> SourceColours(Color(0xFF232E00), Color(0xFFE3FF66), Color(0xFFCCFF00)) Store.BATTLENET.id -> SourceColours(Color(0xFF0A2440), Color(0xFF9DD1FF), Color(0xFF148EFF)) Library.SOURCE_STEAM -> SourceColours(Color(0xFF16293D), Color(0xFF7CC4FF), Color(0xFF1A9FFF)) FLATHUB -> SourceColours(Color(0xFF0B2E2B), Color(0xFF9FE3DD), FlathubTeal) @@ -45,6 +46,7 @@ internal fun sourceLabel(source: String): String = when (source) { Store.AMAZON.id -> Store.AMAZON.label Store.XBOX.id -> Store.XBOX.label Store.ITCH.id -> Store.ITCH.label + Store.GAMEJOLT.id -> Store.GAMEJOLT.label Store.BATTLENET.id -> Store.BATTLENET.label else -> stringResource(R.string.source_added) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 35c21173eb..f9e2ed798f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -130,6 +130,7 @@ import coil.compose.AsyncImage import com.droiddeck.launcher.R import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.gamejolt.GameJoltBrowseState import com.droiddeck.launcher.stores.itch.ItchBrowseState import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreTab @@ -389,7 +390,7 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier } } }, - ) { key -> GameDetail(key, s, a, heroFocus, backLabel, hopRail = null, onBack = { closeGame() }) } + ) { key -> GameDetail(key, s, a, heroFocus, backLabel, hopRail = null, onBack = { closeGame() }, inStore = true) } } FlightLayer(hostAt) StoresMotion.step?.let { ask -> @@ -827,8 +828,10 @@ private fun Storefront( fun shown(i: CatalogItem) = s.storesShowMature || !i.mature || i.accessible fun shelf(l: List<CatalogItem>?) = l?.filter(::shown) LaunchedEffect(store, q) { StoresState.search(ctx, store, q) } - val browsing = store == Store.ITCH && q.isEmpty() && ItchBrowseState.active - val browseItems = if (browsing) ItchBrowseState.items else emptyList() + val gameJolt = store == Store.GAMEJOLT + LaunchedEffect(gameJolt, s.storesShowMature) { if (gameJolt) GameJoltBrowseState.sync(ctx, s.storesShowMature) } + val browsing = q.isEmpty() && ((store == Store.ITCH && ItchBrowseState.active) || gameJolt) + val browseItems = if (!browsing) emptyList() else if (gameJolt) GameJoltBrowseState.items else ItchBrowseState.items val catalog = store == Store.BATTLENET && q.isEmpty() val visible = remember(found, library, shelves, q, s.storesShowMature, browsing, browseItems, catalog) { if (catalog) shelf(shelves?.trending) ?: emptyList() @@ -840,8 +843,10 @@ private fun Storefront( .filter { (it.title.lowercase().contains(q) || it.key in foundKeys) && shown(it) } } val nothing = stringResource(when { - browsing && ItchBrowseState.loading -> R.string.stores_shelves_loading - browsing && ItchBrowseState.failed -> R.string.stores_itch_browse_failed + browsing && gameJolt && GameJoltBrowseState.loading -> R.string.stores_shelves_loading + browsing && gameJolt && GameJoltBrowseState.failed -> R.string.stores_gamejolt_browse_failed + browsing && !gameJolt && ItchBrowseState.loading -> R.string.stores_shelves_loading + browsing && !gameJolt && ItchBrowseState.failed -> R.string.stores_itch_browse_failed catalog && shelves == null -> R.string.stores_shelves_loading else -> R.string.stores_nothing_matches }) @@ -857,7 +862,8 @@ private fun Storefront( val bareTab = if (searching) visible.isEmpty() else shelves == null || shelves.isEmpty val barLine = StoresState.status[store]?.takeIf { bareTab && syncCount(it) != null } val itchBar = store == Store.ITCH && q.isEmpty() - val headerItems = 2 + (if (barLine != null) 1 else 0) + (if (StoresState.problems[store] != null) 1 else 0) + (if (itchBar) 1 else 0) + (if (catalog) 1 else 0) + val gameJoltBar = gameJolt && q.isEmpty() + val headerItems = 2 + (if (barLine != null) 1 else 0) + (if (StoresState.problems[store] != null) 1 else 0) + (if (itchBar || gameJoltBar) 1 else 0) + (if (catalog) 1 else 0) val card: @Composable (CatalogItem) -> Unit = { item -> val first = if (searching) item.key == visible.firstOrNull()?.key else !firstPlaced firstPlaced = true @@ -906,12 +912,14 @@ private fun Storefront( barLine?.let { line -> item(key = "sync", span = { GridItemSpan(maxLineSpan) }) { Rise(3) { SyncBar(line) } } } StoresState.problems[store]?.let { line -> item(key = "problem", span = { GridItemSpan(maxLineSpan) }) { Rise(3) { Box(Modifier.padding(bottom = 8.dp)) { Note(line) } } } } if (itchBar) item(key = "itch-browse-bar", span = { GridItemSpan(maxLineSpan) }) { ItchBrowseBar() } + if (gameJoltBar) item(key = "gamejolt-browse-bar", span = { GridItemSpan(maxLineSpan) }) { GameJoltBrowseBar(s.storesShowMature) } if (catalog) item(key = "catalog-label", span = { GridItemSpan(maxLineSpan) }) { Box(Modifier.padding(top = 10.dp)) { SectionLabel(stringResource(R.string.bnet_store)) } } if (searching) { storeGrid(visible, nothing, card) - if (browsing) item(key = "itch-more", span = { GridItemSpan(maxLineSpan) }) { ItchLoadMore() } + if (browsing && gameJolt) item(key = "gamejolt-more", span = { GridItemSpan(maxLineSpan) }) { GameJoltLoadMore() } + else if (browsing) item(key = "itch-more", span = { GridItemSpan(maxLineSpan) }) { ItchLoadMore() } } else item(key = "shelves", span = { GridItemSpan(maxLineSpan) }) { Column { Shelf(stringResource(R.string.stores_shelf_new), shelf(shelves?.whatsNew), card) @@ -1147,6 +1155,7 @@ internal fun storePalette(base: Palette, store: Store?): Palette { Store.AMAZON -> Color(0xFFFF9900) to Color(0xFFE07800) Store.XBOX -> Color(0xFF70C850) to Color(0xFF107C10) Store.ITCH -> Color(0xFFFF5C5C) to Color(0xFFD93B3B) + Store.GAMEJOLT -> Color(0xFFCCFF00) to Color(0xFFA3CC00) Store.BATTLENET -> Color(0xFF148EFF) to Color(0xFF0B6BD3) null -> return base } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/Wordmark.kt b/app/src/main/java/com/droiddeck/launcher/ui/Wordmark.kt index c0aefad254..887caa3c37 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Wordmark.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Wordmark.kt @@ -8,6 +8,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.drawscope.scale import androidx.compose.ui.graphics.drawscope.translate import androidx.compose.ui.graphics.vector.PathParser @@ -16,22 +17,21 @@ import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.Dp import com.droiddeck.launcher.R +import com.droiddeck.launcher.hud.WordmarkArt @Composable -internal fun Wordmark(height: Dp, modifier: Modifier = Modifier) { - val ink = MaterialTheme.colorScheme.onBackground - val ball = LocalPalette.current.signal +internal fun Wordmark(height: Dp, modifier: Modifier = Modifier, ink: Color = MaterialTheme.colorScheme.onBackground, ball: Color = LocalPalette.current.signal) { val name = stringResource(R.string.app_name) - val letters = remember { PathParser().parsePathString(LETTERS).toPath() } - val leftHalf = remember { PathParser().parsePathString(LEFT_HALF).toPath() } - val rightHalf = remember { PathParser().parsePathString(RIGHT_HALF).toPath() } - Canvas(modifier.height(height).width(height * (BOX_W / BOX_H)).semantics { contentDescription = name }) { - val k = size.height / BOX_H + val letters = remember { PathParser().parsePathString(WordmarkArt.LETTERS).toPath() } + val leftHalf = remember { PathParser().parsePathString(WordmarkArt.LEFT_HALF).toPath() } + val rightHalf = remember { PathParser().parsePathString(WordmarkArt.RIGHT_HALF).toPath() } + Canvas(modifier.height(height).width(height * (WordmarkArt.BOX_W / WordmarkArt.BOX_H)).semantics { contentDescription = name }) { + val k = size.height / WordmarkArt.BOX_H scale(k, k, Offset.Zero) { - translate(-BOX_X, -BOX_Y) { + translate(-WordmarkArt.BOX_X, -WordmarkArt.BOX_Y) { drawPath(letters, ink) translate(239.135f, 123.36f) { - scale(MARK_SCALE, MARK_SCALE, Offset.Zero) { + scale(WordmarkArt.MARK_SCALE, WordmarkArt.MARK_SCALE, Offset.Zero) { translate(31.98f, 0f) { drawPath(leftHalf, ink) drawPath(rightHalf, ink) @@ -43,22 +43,3 @@ internal fun Wordmark(height: Dp, modifier: Modifier = Modifier) { } } } - -private const val BOX_X = 239.135f -private const val BOX_Y = 120.02f -private const val BOX_W = 1040.7f - 239.135f -private const val BOX_H = 243.2f - 120.02f -private const val MARK_SCALE = 0.527445f - -private const val LEFT_HALF = "M-31.98 0H56.055V40.489A71.81 71.81 0 0 0 56.055 183.231V223.72H-31.98Z" -private const val RIGHT_HALF = "M71.885 0.28A111.86 111.86 0 0 1 71.885 223.44V183.234A71.81 71.81 0 0 0 71.885 40.486Z" -private const val LETTERS = - "M361.45 241.36V160.13H387.02V241.36ZM387.02 196.73 376.32 188.38Q379.5 174.17 387.02 166.31Q394.54 158.46 407.91 158.46Q413.76 158.46 418.19 160.21Q422.62 161.97 425.96 165.65L410.75 184.87Q409.08 183.03 406.57 182.03Q404.07 181.02 400.89 181.02Q394.54 181.02 390.78 184.95Q387.02 188.88 387.02 196.73" + - "ZM467.91 243.2Q455.38 243.2 445.27 237.6Q435.15 232 429.3 222.31Q423.45 212.61 423.45 200.58Q423.45 188.54 429.3 179.02Q435.15 169.49 445.18 163.89Q455.21 158.29 467.91 158.29Q480.62 158.29 490.64 163.81Q500.67 169.32 506.52 178.93Q512.37 188.54 512.37 200.58Q512.37 212.61 506.52 222.31Q500.67 232 490.64 237.6Q480.62 243.2 467.91 243.2" + - "ZM467.91 219.97Q473.43 219.97 477.61 217.54Q481.79 215.12 484.04 210.69Q486.3 206.26 486.3 200.58Q486.3 194.9 483.96 190.63Q481.62 186.37 477.52 183.95Q473.43 181.52 467.91 181.52Q462.56 181.52 458.39 183.95Q454.21 186.37 451.87 190.72Q449.53 195.06 449.53 200.75Q449.53 206.26 451.87 210.69Q454.21 215.12 458.39 217.54Q462.56 219.97 467.91 219.97" + - "ZM523.4 241.36V160.13H548.98V241.36ZM536.27 148.93Q530.26 148.93 526.33 144.84Q522.4 140.74 522.4 134.89Q522.4 128.88 526.33 124.86Q530.26 120.85 536.27 120.85Q542.29 120.85 546.13 124.86Q549.98 128.88 549.98 134.89Q549.98 140.74 546.13 144.84Q542.29 148.93 536.27 148.93ZM599.95 243.03Q588.42 243.03 579.48 237.52Q570.54 232 565.44 222.47Q560.34 212.95 560.34 200.75Q560.34 188.54 565.44 179.02Q570.54 169.49 579.48 163.97Q588.42 158.46 599.95 158.46Q608.31 158.46 615.08 161.63Q621.85 164.81 626.28 170.41Q630.71 176.01 631.21 183.2V217.46Q630.71 224.65 626.36 230.41Q622.02 236.18 615.16 239.61Q608.31 243.03 599.95 243.03" + - "ZM604.47 219.97Q609.98 219.97 613.99 217.54Q618 215.12 620.34 210.77Q622.68 206.43 622.68 200.75Q622.68 195.06 620.43 190.8Q618.17 186.54 614.08 184.03Q609.98 181.52 604.63 181.52Q599.28 181.52 595.19 184.03Q591.09 186.54 588.67 190.88Q586.25 195.23 586.25 200.75Q586.25 206.26 588.59 210.61Q590.93 214.95 595.11 217.46Q599.28 219.97 604.47 219.97" + - "ZM646.75 241.36H621.68V219.46L625.53 199.74L621.18 180.02V120.02H646.75ZM683.19 241.36V218.29H712.44Q723.13 218.29 731.16 214.03Q739.18 209.77 743.53 201.58Q747.87 193.39 747.87 182.19Q747.87 170.99 743.44 162.97Q739.01 154.95 731.07 150.6Q723.13 146.26 712.44 146.26H682.35V123.36H712.77Q726.14 123.36 737.42 127.62Q748.71 131.88 757.15 139.82Q765.59 147.76 770.18 158.54Q774.78 169.32 774.78 182.36Q774.78 195.23 770.18 206.09Q765.59 216.96 757.23 224.81Q748.87 232.67 737.59 237.01Q726.31 241.36 713.11 241.36" + - "ZM665.47 241.36V123.36H691.71V241.36ZM827.6 243.2Q814.39 243.2 804.11 237.77Q793.83 232.33 787.98 222.64Q782.13 212.95 782.13 200.75Q782.13 188.54 787.9 178.93Q793.67 169.32 803.53 163.81Q813.39 158.29 825.76 158.29Q837.79 158.29 846.98 163.47Q856.18 168.65 861.44 177.85Q866.71 187.04 866.71 198.91Q866.71 201.08 866.46 203.5Q866.21 205.93 865.54 209.1L795.51 209.27V191.72L854.67 191.55L843.64 198.91Q843.47 191.89 841.47 187.29Q839.46 182.69 835.54 180.27Q831.61 177.85 825.92 177.85Q819.91 177.85 815.48 180.61Q811.05 183.36 808.63 188.38Q806.2 193.39 806.2 200.58Q806.2 207.77 808.79 212.86Q811.38 217.96 816.15 220.72Q820.91 223.48 827.43 223.48Q833.45 223.48 838.29 221.39Q843.14 219.3 846.82 215.12L860.86 229.16Q854.84 236.18 846.32 239.69Q837.79 243.2 827.6 243.2" + - "ZM916.68 243.2Q904.15 243.2 893.95 237.68Q883.75 232.17 877.9 222.47Q872.05 212.78 872.05 200.75Q872.05 188.54 877.99 178.93Q883.92 169.32 894.12 163.81Q904.31 158.29 917.02 158.29Q926.54 158.29 934.48 161.55Q942.42 164.81 948.6 171.33L932.22 187.71Q929.38 184.53 925.62 183.03Q921.86 181.52 917.02 181.52Q911.5 181.52 907.24 183.95Q902.98 186.37 900.55 190.63Q898.13 194.9 898.13 200.58Q898.13 206.26 900.55 210.61Q902.98 214.95 907.32 217.46Q911.67 219.97 917.02 219.97Q922.03 219.97 925.96 218.21Q929.88 216.46 932.73 213.28L948.94 229.66Q942.59 236.35 934.56 239.77Q926.54 243.2 916.68 243.2" + - "ZM1010.61 241.36 982.2 199.24 1010.45 160.13H1039.03L1004.93 204.09L1005.77 193.56L1040.7 241.36ZM958.63 241.36V120.02H984.21V241.36Z" diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt b/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt index 59c182dd35..26faded94c 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt +++ b/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt @@ -20,12 +20,15 @@ class BottomDesktopCompositorService : Service() { private var client: Messenger? = null /** Echoed in every reply, so the session process can tell replies to an earlier attach apart. */ @Volatile private var attachTag = 0 + private var outputWidth = 0 + private var outputHeight = 0 private val handler = object : Handler(Looper.getMainLooper()) { override fun handleMessage(msg: Message) { when (msg.what) { MSG_ATTACH -> attach(msg) MSG_DETACH -> CompositorHost.detach(null) + MSG_RESIZE -> resize(msg.arg1, msg.arg2) MSG_TOUCH -> WaylandCompositor.nativeSendTouch(msg.arg1 and 0xff, msg.arg1 shr 8, msg.arg2 ushr 16, msg.arg2 and 0xffff) MSG_KEY -> WaylandCompositor.nativeSendKey(msg.arg1, msg.arg2) @@ -75,15 +78,26 @@ class BottomDesktopCompositorService : Service() { } val turnip = com.droiddeck.launcher.gpu.TurnipDriver(this) val driverId = if (CompositorHost.isStarted) null else turnip.install() + val resized = CompositorHost.isStarted && (width != outputWidth || height != outputHeight) val started = CompositorHost.startOrAttach( this, surface, runtimeDir.path, driverId?.let { turnip.driverPath(it) }, driverId?.let { turnip.libraryName(it) }, applicationInfo.nativeLibraryDir, width, height, data.getFloat(KEY_REFRESH, 60f), 0, ) + outputWidth = width + outputHeight = height + if (resized) WaylandCompositor.nativeResizeOutput(width, height) Log.i(TAG, (if (started) "compositor started" else "compositor attached") + " at ${width}x$height in ${runtimeDir.path}") reply(MSG_ATTACHED) } + private fun resize(width: Int, height: Int) { + if (width <= 0 || height <= 0 || !CompositorHost.isStarted || (width == outputWidth && height == outputHeight)) return + outputWidth = width + outputHeight = height + WaylandCompositor.nativeResizeOutput(width, height) + } + private fun reply(what: Int) { val target = client ?: return runCatching { target.send(Message.obtain(null, what, attachTag, 0)) } @@ -102,6 +116,7 @@ class BottomDesktopCompositorService : Service() { const val MSG_POINTER = 8 const val MSG_SCENE = 9 const val MSG_CURSOR = 10 + const val MSG_RESIZE = 11 const val MSG_ATTACHED = 101 const val MSG_FIRST_FRAME = 102 const val KEY_RUNTIME_DIR = "runtimeDir" diff --git a/app/src/main/res/drawable/ic_bottom_swap.xml b/app/src/main/res/drawable/ic_bottom_swap.xml new file mode 100644 index 0000000000..e8ef8120df --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_swap.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> + <path android:fillColor="#FFFFFFFF" + android:pathData="M16,17.01V10h-2v7.01h-3L15,21l4,-3.99h-3zM9,3L5,6.99h3V14h2V6.99h3L9,3z" /> +</vector> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 4b46f97bf9..96eb4259a0 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">تأخير التعليق في الخلفية أثناء قيام Steam بالتنزيل.</string> <string name="mode_suspend_note">«تلقائي» يوقف مؤقتًا في الخلفية ويستأنف عند الظهور. «يدوي» ينتظر الضغط على «استئناف». «أبدًا» يُبقيه قيد التشغيل.</string> <string name="mode_startup">بدء التشغيل</string> - <string name="mode_steam_startup">تشغيل Steam مع DroidDeck</string> - <string name="mode_steam_startup_hint">يفتح جلسة Steam عند تشغيل DroidDeck.</string> + <string name="mode_startup_session">الفتح عند التشغيل</string> + <string name="mode_startup_session_hint">يبدأ هذه الجلسة عند تشغيل DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">جارٍ البحث عن إصدارات…</string> <string name="mode_decky_ready">جاهز لتثبيت %1$s.</string> @@ -893,13 +893,9 @@ <string name="setup_fullscreen">ملء الشاشة</string> <string name="setup_fullscreen_on">يخفي شريطي الحالة والتنقّل في Android</string> <string name="setup_fullscreen_off">يعرض شريطي الحالة والتنقّل في Android</string> - <string name="setup_dual_screen">الشاشة المزدوجة</string> - <string name="setup_dual_screen_hint">يستخدم الوضع التلقائي الشاشة الثانية في الأجهزة المحمولة التي تحتوي على شاشة مدمجة. يستخدم وضع التشغيل أي شاشة ثانية. يُبقي وضع الإيقاف كل شيء على شاشة واحدة.</string> <string name="setup_dual_screen_auto">تلقائي</string> <string name="setup_dual_screen_on">تشغيل</string> <string name="setup_dual_screen_off">إيقاف</string> - <string name="setup_dual_screen_menu">قائمة الشاشة السفلية</string> - <string name="setup_dual_screen_menu_hint">ينقل الأقسام وقائمة اللعبة إلى الشاشة الثانية ويتم الكتابة هناك، لتبقى الشاشة العلوية بعرضها الكامل. يبدّل L2 وR2 بين الأقسام.</string> <string name="setup_dual_screen_controls">عناصر تحكم الشاشة السفلية في الألعاب</string> <string name="setup_dual_screen_controls_hint">يفتح لوحة اللمس ولوحة المفاتيح على الشاشة الثانية عند بدء الجلسة.</string> <string name="dual_typing_title">الكتابة على الشاشة العلوية</string> @@ -1890,8 +1886,6 @@ <string name="stats_trace">دواسة الوقود والمكابح، آخر 10 s</string> <string name="stats_speed_chart">السرعة، %1$s</string> <string name="stats_gear">الترس</string> - <string name="stats_speed_units">وحدات السرعة</string> - <string name="stats_speed_units_auto">تلقائي (%1$s)</string> <string name="stats_steam_client_arm">عميل Steam ARM</string> <string name="stats_steam_client_x86">عميل Steam x86</string> <string name="stats_throttle">دواسة الوقود</string> @@ -1909,7 +1903,6 @@ <string name="stats_fuel_t">الوقود، t</string> <string name="stats_fuel_main">الرئيسي %1$s t</string> <string name="stats_fuel_reserve">الاحتياطي %1$s t</string> - <string name="stats_tap_hint">انقر على الشريط العلوي أو لوحة العدادات لتغيير نمطها.</string> <string name="bottom_telemetry_send_title">إرسال بيانات لوحة العدادات</string> <string name="bottom_telemetry_send_auto">تلقائي</string> <string name="bottom_telemetry_send_auto_hint">يفعّلها لكل لعبة مدرجة هنا، بما في ذلك الألعاب التي يُعثر عليها لاحقًا. تبقى الألعاب التي توقفها متوقفة.</string> @@ -1948,7 +1941,6 @@ <string name="bottom_telemetry_balance">الرصيد</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">فعِّل إخراج البيانات في لعبة السباق (يُسمّى غالبًا القياس عن بُعد أو UDP) لرؤية لوحة عدادات حية هنا. تبقى البيانات على هذا الجهاز.</string> <string name="bottom_telemetry_unknown_format">يستقبل المنفذ %1$d بيانات (%2$d حزمة بحجم %3$d بايت)، لكن بتنسيق لا تستطيع هذه الصفحة قراءته بعد.</string> <string name="bottom_telemetry_port_busy">يستخدم برنامج آخر المنفذ %1$s بالفعل، لذا لا يمكن عرض تلك اللعبة هنا.</string> @@ -3775,4 +3767,33 @@ <string name="gog_repair_action">إصلاح الملفات</string> <string name="gog_refresh_action">تحديث التثبيت</string> <string name="gog_select_patch">اختيار</string> + <string name="stores_gamejolt_not_owned">ليس في مكتبة Game Jolt الخاصة بك</string> + <string name="stores_gamejolt_no_build">لا يوجد تنزيل لنظام Windows لهذه اللعبة</string> + <string name="stores_gamejolt_no_exe">لم يتم العثور على لعبة Windows في التنزيل</string> + <string name="stores_gamejolt_no_game">تعذر العثور على هذه اللعبة على Game Jolt</string> + <string name="stores_gamejolt_browse_failed">تعذّر تحميل الألعاب من Game Jolt</string> + <string name="stores_gamejolt_download_failed">استجاب Game Jolt بـ HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">تعذر تحميل التنزيلات من Game Jolt</string> + <string name="stores_gamejolt_build_open">فتح على Game Jolt</string> + <string name="stores_gamejolt_archive">أرشيفات %1$s غير مدعومة</string> + <string name="stores_gamejolt_extract_failed">تعذر استخراج التنزيل (رمز الخروج %1$d)</string> + <string name="stores_gamejolt_download_unreachable">تعذر الوصول إلى Game Jolt</string> + <string name="stores_gamejolt_download_no_link">لم يوفر Game Jolt رابط تنزيل</string> + <string name="stores_gamejolt_section_featured">مميزة</string> + <string name="stores_gamejolt_section_hot">رائجة</string> + <string name="stores_gamejolt_section_best">الأفضل</string> + <string name="stores_gamejolt_section_new">جديدة</string> + <string name="stores_gamejolt_price_under_30">30$ أو أقل</string> + <string name="stores_gamejolt_os_other">أخرى</string> + <string name="stores_gamejolt_maturity_everyone">لجميع الأعمار</string> + <string name="stores_gamejolt_maturity_teen">المراهقون</string> + <string name="stores_gamejolt_maturity_adult">للبالغين</string> + <string name="stores_gamejolt_status_complete">مكتملة</string> + <string name="stores_gamejolt_status_early">وصول مبكر</string> + <string name="stores_gamejolt_partners">ألعاب الشركاء</string> + <string name="stores_gamejolt_filter_browser">المتصفح</string> + <string name="stores_gamejolt_filter_maturity">التصنيف العمري</string> + <string name="stores_gamejolt_filter_status">الحالة</string> + <string name="stores_gamejolt_filter_partners">الشركاء</string> + <string name="stores_gamejolt_followed">الألعاب المتابَعة</string> </resources> diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 671337a5ba..0b0942c450 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Retrasa la suspensión en segundo plano mientras Steam esté descargando.</string> <string name="mode_suspend_note">Auto pausa en segundo plano y reanuda al mostrarse. Manual espera a Reanudar. Nunca sigue ejecutándose.</string> <string name="mode_startup">Inicio</string> - <string name="mode_steam_startup">Iniciar Steam con DroidDeck</string> - <string name="mode_steam_startup_hint">Abre la sesión de Steam al iniciar DroidDeck.</string> + <string name="mode_startup_session">Abrir al iniciar</string> + <string name="mode_startup_session_hint">Inicia esta sesión cuando se abre DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Buscando versiones…</string> <string name="mode_decky_ready">Listo para instalar %1$s.</string> @@ -911,13 +911,9 @@ <string name="setup_fullscreen">Pantalla completa</string> <string name="setup_fullscreen_on">Oculta las barras de estado y navegación de Android</string> <string name="setup_fullscreen_off">Muestra las barras de estado y navegación de Android</string> - <string name="setup_dual_screen">Pantalla dual</string> - <string name="setup_dual_screen_hint">Automático usa la segunda pantalla en consolas portátiles que la traen integrada. Activado usa cualquier segunda pantalla. Desactivado deja todo en una sola pantalla.</string> <string name="setup_dual_screen_auto">Automático</string> <string name="setup_dual_screen_on">Activado</string> <string name="setup_dual_screen_off">Desactivado</string> - <string name="setup_dual_screen_menu">Menú en la pantalla inferior</string> - <string name="setup_dual_screen_menu_hint">Mueve las secciones y el menú del juego a la segunda pantalla y escribe ahí, para que la pantalla superior conserve la vista completa. L2 y R2 cambian de sección.</string> <string name="setup_dual_screen_controls">Controles en la pantalla inferior en juegos</string> <string name="setup_dual_screen_controls_hint">Abre el trackpad y el teclado en la segunda pantalla cuando empieza una sesión.</string> <string name="dual_typing_title">Escribiendo en la pantalla superior</string> @@ -1888,8 +1884,6 @@ <string name="stats_trace">Acelerador y freno, últimos 10 s</string> <string name="stats_speed_chart">Velocidad, %1$s</string> <string name="stats_gear">Marcha</string> - <string name="stats_speed_units">Unidades de velocidad</string> - <string name="stats_speed_units_auto">Automático (%1$s)</string> <string name="stats_steam_client_arm">Cliente de Steam ARM</string> <string name="stats_steam_client_x86">Cliente de Steam x86</string> <string name="stats_throttle">Acelerador</string> @@ -1907,7 +1901,6 @@ <string name="stats_fuel_t">Combustible, t</string> <string name="stats_fuel_main">Principal %1$s t</string> <string name="stats_fuel_reserve">Reserva %1$s t</string> - <string name="stats_tap_hint">Toca la franja superior o el tablero para cambiar su estilo.</string> <string name="bottom_telemetry_send_title">Enviar datos al panel</string> <string name="bottom_telemetry_send_auto">Automático</string> <string name="bottom_telemetry_send_auto_hint">Lo activa en todos los juegos de esta lista, incluidos los que se encuentren más adelante. Los juegos que desactives seguirán desactivados.</string> @@ -1946,7 +1939,6 @@ <string name="bottom_telemetry_balance">Saldo</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Activa la salida de datos de un juego de carreras (a menudo llamada telemetría o UDP) para ver aquí un panel en vivo. Los datos no salen de este dispositivo.</string> <string name="bottom_telemetry_unknown_format">El puerto %1$d recibe datos (%2$d paquetes de %3$d bytes), pero en un formato que esta página aún no puede leer.</string> <string name="bottom_telemetry_port_busy">Otro programa ya usa el puerto %1$s, así que ese juego no se puede mostrar aquí.</string> <string name="rtinst_removing">Eliminando el runtime de Linux</string> @@ -3637,4 +3629,33 @@ <string name="gog_repair_action">Reparar archivos</string> <string name="gog_refresh_action">Renovar la instalación</string> <string name="gog_select_patch">Seleccionar</string> + <string name="stores_gamejolt_not_owned">No está en tu biblioteca de Game Jolt</string> + <string name="stores_gamejolt_no_build">Este juego no tiene descarga para Windows</string> + <string name="stores_gamejolt_no_exe">No se encontró un juego de Windows en la descarga</string> + <string name="stores_gamejolt_no_game">No se encontró este juego en Game Jolt</string> + <string name="stores_gamejolt_browse_failed">No se pudieron cargar los juegos de Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt respondió HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">No se pudieron cargar las descargas de Game Jolt</string> + <string name="stores_gamejolt_build_open">Abrir en Game Jolt</string> + <string name="stores_gamejolt_archive">Los archivos %1$s no son compatibles</string> + <string name="stores_gamejolt_extract_failed">No se pudo extraer la descarga (salida %1$d)</string> + <string name="stores_gamejolt_download_unreachable">No se pudo conectar con Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt no entregó un enlace de descarga</string> + <string name="stores_gamejolt_section_featured">Destacados</string> + <string name="stores_gamejolt_section_hot">Populares</string> + <string name="stores_gamejolt_section_best">Mejores</string> + <string name="stores_gamejolt_section_new">Nuevos</string> + <string name="stores_gamejolt_price_under_30">$30 o menos</string> + <string name="stores_gamejolt_os_other">Otros</string> + <string name="stores_gamejolt_maturity_everyone">Todas las edades</string> + <string name="stores_gamejolt_maturity_teen">Adolescentes</string> + <string name="stores_gamejolt_maturity_adult">Maduro</string> + <string name="stores_gamejolt_status_complete">Completo</string> + <string name="stores_gamejolt_status_early">Acceso anticipado</string> + <string name="stores_gamejolt_partners">Juegos de socios</string> + <string name="stores_gamejolt_filter_browser">Navegador</string> + <string name="stores_gamejolt_filter_maturity">Clasificación</string> + <string name="stores_gamejolt_filter_status">Estado</string> + <string name="stores_gamejolt_filter_partners">Socios</string> + <string name="stores_gamejolt_followed">Juegos seguidos</string> </resources> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index f0dc566814..9bfdc02cdf 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Отлага фоновото спиране, докато Steam активно изтегля.</string> <string name="mode_suspend_note">Автоматично поставя на пауза във фонов режим и продължава при показване. Ръчно изчаква „Продължи“. Никога продължава да работи.</string> <string name="mode_startup">Стартиране</string> - <string name="mode_steam_startup">Стартиране на Steam заедно с DroidDeck</string> - <string name="mode_steam_startup_hint">Отваря сесията на Steam при стартиране на DroidDeck.</string> + <string name="mode_startup_session">Отваряне при стартиране</string> + <string name="mode_startup_session_hint">Стартира тази сесия, когато DroidDeck се стартира.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Проверка за издания…</string> <string name="mode_decky_ready">Готово за инсталиране на %1$s.</string> @@ -881,13 +881,9 @@ <string name="setup_fullscreen">Цял екран</string> <string name="setup_fullscreen_on">Скрива лентите за състояние и навигация на Android</string> <string name="setup_fullscreen_off">Показва лентите за състояние и навигация на Android</string> - <string name="setup_dual_screen">Двоен екран</string> - <string name="setup_dual_screen_hint">Автоматично използва втория екран на преносими устройства с вграден такъв. Вкл. използва всеки втори дисплей. Изкл. държи всичко на един екран.</string> <string name="setup_dual_screen_auto">Автоматично</string> <string name="setup_dual_screen_on">Вкл.</string> <string name="setup_dual_screen_off">Изкл.</string> - <string name="setup_dual_screen_menu">Меню на долния екран</string> - <string name="setup_dual_screen_menu_hint">Премества секциите и менюто по време на игра на втория екран и въвеждането става там, така горният екран остава с пълен изглед. L2 и R2 сменят секциите.</string> <string name="setup_dual_screen_controls">Контроли на долния екран в игрите</string> <string name="setup_dual_screen_controls_hint">Отваря тракпада и клавиатурата на втория екран при стартиране на сесия.</string> <string name="dual_typing_title">Въвеждане за горния екран</string> @@ -1802,8 +1798,6 @@ <string name="stats_trace">Газ и спирачка, последните 10 s</string> <string name="stats_speed_chart">Скорост, %1$s</string> <string name="stats_gear">Предавка</string> - <string name="stats_speed_units">Единици за скорост</string> - <string name="stats_speed_units_auto">Автоматично (%1$s)</string> <string name="stats_steam_client_arm">Steam клиент ARM</string> <string name="stats_steam_client_x86">Steam клиент x86</string> <string name="stats_throttle">Газ</string> @@ -1821,7 +1815,6 @@ <string name="stats_fuel_t">Гориво, t</string> <string name="stats_fuel_main">Основно %1$s t</string> <string name="stats_fuel_reserve">Резерв %1$s t</string> - <string name="stats_tap_hint">Докоснете горната лента или таблото, за да смените стила му.</string> <string name="bottom_telemetry_send_title">Изпращане на данни за таблото</string> <string name="bottom_telemetry_send_auto">Автоматично</string> <string name="bottom_telemetry_send_auto_hint">Включва го за всяка игра от списъка тук, включително игри, открити по-късно. Игрите, които изключите, остават изключени.</string> @@ -1860,7 +1853,6 @@ <string name="bottom_telemetry_balance">Баланс</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Включете извеждането на данни в състезателна игра (често наричано телеметрия или UDP), за да виждате тук табло на живо. Данните остават на това устройство.</string> <string name="bottom_telemetry_unknown_format">Порт %1$d получава данни (%2$d пакета по %3$d байта), но във формат, който тази страница все още не може да чете.</string> <string name="bottom_telemetry_port_busy">Друга програма вече използва порт %1$s, затова тази игра не може да се показва тук.</string> @@ -3627,4 +3619,33 @@ <string name="gog_repair_action">Поправка на файловете</string> <string name="gog_refresh_action">Обновяване на инсталацията</string> <string name="gog_select_patch">Избор</string> + <string name="stores_gamejolt_not_owned">Не е в библиотеката ви в Game Jolt</string> + <string name="stores_gamejolt_no_build">Няма изтегляне за Windows за тази игра</string> + <string name="stores_gamejolt_no_exe">В изтеглянето не е намерена игра за Windows</string> + <string name="stores_gamejolt_no_game">Играта не беше намерена в Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Игрите от Game Jolt не можаха да се заредят</string> + <string name="stores_gamejolt_download_failed">Game Jolt отговори HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Изтеглянията от Game Jolt не можаха да се заредят</string> + <string name="stores_gamejolt_build_open">Отваряне в Game Jolt</string> + <string name="stores_gamejolt_archive">Архивите %1$s не се поддържат</string> + <string name="stores_gamejolt_extract_failed">Изтеглянето не можа да бъде разархивирано (код %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Jolt не може да бъде достигнат</string> + <string name="stores_gamejolt_download_no_link">Game Jolt не даде връзка за изтегляне</string> + <string name="stores_gamejolt_section_featured">Препоръчани</string> + <string name="stores_gamejolt_section_hot">Популярни</string> + <string name="stores_gamejolt_section_best">Най-добри</string> + <string name="stores_gamejolt_section_new">Нови</string> + <string name="stores_gamejolt_price_under_30">$30 или по-малко</string> + <string name="stores_gamejolt_os_other">Други</string> + <string name="stores_gamejolt_maturity_everyone">За всички възрасти</string> + <string name="stores_gamejolt_maturity_teen">Тийнейджъри</string> + <string name="stores_gamejolt_maturity_adult">За възрастни</string> + <string name="stores_gamejolt_status_complete">Завършени</string> + <string name="stores_gamejolt_status_early">Ранен достъп</string> + <string name="stores_gamejolt_partners">Игри на партньори</string> + <string name="stores_gamejolt_filter_browser">Браузър</string> + <string name="stores_gamejolt_filter_maturity">Зрялост</string> + <string name="stores_gamejolt_filter_status">Статус</string> + <string name="stores_gamejolt_filter_partners">Партньори</string> + <string name="stores_gamejolt_followed">Следвани игри</string> </resources> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 273096d583..78d2002fdd 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Oddálí pozastavení na pozadí, pokud Steam aktivně stahuje.</string> <string name="mode_suspend_note">Automaticky pozastaví na pozadí a obnoví při zobrazení. Manuálně čeká na Obnovit. Nikdy běh nezastavuje.</string> <string name="mode_startup">Spouštění</string> - <string name="mode_steam_startup">Spustit Steam s DroidDeck</string> - <string name="mode_steam_startup_hint">Otevře relaci Steamu při spuštění DroidDeck.</string> + <string name="mode_startup_session">Otevřít při spuštění</string> + <string name="mode_startup_session_hint">Spustí tuto relaci při spuštění DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Hledání vydání…</string> <string name="mode_decky_ready">Připraveno k instalaci %1$s.</string> @@ -887,13 +887,9 @@ <string name="setup_fullscreen">Celá obrazovka</string> <string name="setup_fullscreen_on">Skryje stavový a navigační panel Androidu</string> <string name="setup_fullscreen_off">Zobrazí stavový a navigační panel Androidu</string> - <string name="setup_dual_screen">Dvě obrazovky</string> - <string name="setup_dual_screen_hint">Automaticky používá druhou obrazovku na kapesních zařízeních, která ji mají vestavěnou. Zapnuto používá jakýkoli druhý displej. Vypnuto nechá vše na jedné obrazovce.</string> <string name="setup_dual_screen_auto">Automaticky</string> <string name="setup_dual_screen_on">Zapnuto</string> <string name="setup_dual_screen_off">Vypnuto</string> - <string name="setup_dual_screen_menu">Nabídka na spodní obrazovce</string> - <string name="setup_dual_screen_menu_hint">Přesune sekce a herní nabídku na druhou obrazovku a píše se tam, takže horní obrazovka zůstane celá volná. L2 a R2 přepínají sekce.</string> <string name="setup_dual_screen_controls">Ovládání na spodní obrazovce ve hrách</string> <string name="setup_dual_screen_controls_hint">Při spuštění relace otevře touchpad a klávesnici na druhé obrazovce.</string> <string name="dual_typing_title">Psaní pro horní obrazovku</string> @@ -1846,8 +1842,6 @@ <string name="stats_trace">Plyn a brzda, posledních 10 s</string> <string name="stats_speed_chart">Rychlost, %1$s</string> <string name="stats_gear">Rychlostní stupeň</string> - <string name="stats_speed_units">Jednotky rychlosti</string> - <string name="stats_speed_units_auto">Automaticky (%1$s)</string> <string name="stats_steam_client_arm">Klient Steam ARM</string> <string name="stats_steam_client_x86">Klient Steam x86</string> <string name="stats_throttle">Plyn</string> @@ -1865,7 +1859,6 @@ <string name="stats_fuel_t">Palivo, t</string> <string name="stats_fuel_main">Hlavní %1$s t</string> <string name="stats_fuel_reserve">Rezerva %1$s t</string> - <string name="stats_tap_hint">Klepnutím na horní pruh nebo palubní desku změníte jejich styl.</string> <string name="bottom_telemetry_send_title">Odesílat data pro palubní desku</string> <string name="bottom_telemetry_send_auto">Automaticky</string> <string name="bottom_telemetry_send_auto_hint">Zapne to pro každou zde uvedenou hru, včetně her nalezených později. Hry, které vypnete, zůstanou vypnuté.</string> @@ -1904,7 +1897,6 @@ <string name="bottom_telemetry_balance">Zůstatek</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Zapněte v závodní hře výstup dat (často nazývaný telemetrie nebo UDP) a uvidíte zde živou palubní desku. Data zůstávají v tomto zařízení.</string> <string name="bottom_telemetry_unknown_format">Port %1$d přijímá data (%2$d paketů po %3$d bajtech), ale ve formátu, který tato stránka zatím neumí přečíst.</string> <string name="bottom_telemetry_port_busy">Port %1$s již používá jiný program, takže se zde tato hra nemůže zobrazit.</string> @@ -3701,4 +3693,33 @@ <string name="gog_repair_action">Opravit soubory</string> <string name="gog_refresh_action">Obnovit instalaci</string> <string name="gog_select_patch">Vybrat</string> + <string name="stores_gamejolt_not_owned">Není ve vaší knihovně Game Jolt</string> + <string name="stores_gamejolt_no_build">Pro tuto hru není ke stažení verze pro Windows</string> + <string name="stores_gamejolt_no_exe">Ve stahování nebyla nalezena hra pro Windows</string> + <string name="stores_gamejolt_no_game">Tuto hru se na Game Jolt nepodařilo najít</string> + <string name="stores_gamejolt_browse_failed">Hry z Game Jolt se nepodařilo načíst</string> + <string name="stores_gamejolt_download_failed">Game Jolt odpovědělo HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Stahování z Game Jolt se nepodařilo načíst</string> + <string name="stores_gamejolt_build_open">Otevřít na Game Jolt</string> + <string name="stores_gamejolt_archive">Archivy %1$s nejsou podporovány</string> + <string name="stores_gamejolt_extract_failed">Stažený soubor nelze rozbalit (kód %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Jolt není dostupný</string> + <string name="stores_gamejolt_download_no_link">Game Jolt neposkytl odkaz ke stažení</string> + <string name="stores_gamejolt_section_featured">Doporučené</string> + <string name="stores_gamejolt_section_hot">Populární</string> + <string name="stores_gamejolt_section_best">Nejlepší</string> + <string name="stores_gamejolt_section_new">Nové</string> + <string name="stores_gamejolt_price_under_30">30 $ nebo méně</string> + <string name="stores_gamejolt_os_other">Jiné</string> + <string name="stores_gamejolt_maturity_everyone">Pro všechny věkové skupiny</string> + <string name="stores_gamejolt_maturity_teen">Teenageři</string> + <string name="stores_gamejolt_maturity_adult">Pro dospělé</string> + <string name="stores_gamejolt_status_complete">Dokončeno</string> + <string name="stores_gamejolt_status_early">Předběžný přístup</string> + <string name="stores_gamejolt_partners">Hry partnerů</string> + <string name="stores_gamejolt_filter_browser">Prohlížeč</string> + <string name="stores_gamejolt_filter_maturity">Věkové hodnocení</string> + <string name="stores_gamejolt_filter_status">Stav</string> + <string name="stores_gamejolt_filter_partners">Partneři</string> + <string name="stores_gamejolt_followed">Sledované hry</string> </resources> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index a0a441f168..818d624a2a 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Udskyder baggrundspause, mens Steam aktivt downloader.</string> <string name="mode_suspend_note">Auto sætter på pause i baggrunden og genoptager, når den vises. Manuel venter på Genoptag. Aldrig fortsætter med at køre.</string> <string name="mode_startup">Opstart</string> - <string name="mode_steam_startup">Start Steam med DroidDeck</string> - <string name="mode_steam_startup_hint">Åbner Steam-sessionen, når DroidDeck starter.</string> + <string name="mode_startup_session">Åbn ved start</string> + <string name="mode_startup_session_hint">Starter denne session, når DroidDeck startes.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Søger efter udgivelser…</string> <string name="mode_decky_ready">Klar til at installere %1$s.</string> @@ -881,13 +881,9 @@ <string name="setup_fullscreen">Fuldskærm</string> <string name="setup_fullscreen_on">Skjuler Androids status- og navigationsbjælker</string> <string name="setup_fullscreen_off">Viser Androids status- og navigationsbjælker</string> - <string name="setup_dual_screen">Dobbeltskærm</string> - <string name="setup_dual_screen_hint">Automatisk bruger den anden skærm på håndholdte enheder med en indbygget ekstra skærm. Til bruger enhver anden skærm. Fra holder alt på én skærm.</string> <string name="setup_dual_screen_auto">Automatisk</string> <string name="setup_dual_screen_on">Til</string> <string name="setup_dual_screen_off">Fra</string> - <string name="setup_dual_screen_menu">Menu på nederste skærm</string> - <string name="setup_dual_screen_menu_hint">Flytter sektionerne og menuen i spillet til den anden skærm og skriver der, så den øverste skærm beholder hele visningen. L2 og R2 skifter sektion.</string> <string name="setup_dual_screen_controls">Kontroller på nederste skærm i spil</string> <string name="setup_dual_screen_controls_hint">Åbner pegefeltet og tastaturet på den anden skærm, når en session starter.</string> <string name="dual_typing_title">Skriver til den øverste skærm</string> @@ -1802,8 +1798,6 @@ <string name="stats_trace">Speeder og bremse, seneste 10 s</string> <string name="stats_speed_chart">Hastighed, %1$s</string> <string name="stats_gear">Gear</string> - <string name="stats_speed_units">Hastighedsenheder</string> - <string name="stats_speed_units_auto">Auto (%1$s)</string> <string name="stats_steam_client_arm">Steam-klient ARM</string> <string name="stats_steam_client_x86">Steam-klient x86</string> <string name="stats_throttle">Speeder</string> @@ -1821,7 +1815,6 @@ <string name="stats_fuel_t">Brændstof, t</string> <string name="stats_fuel_main">Hoved %1$s t</string> <string name="stats_fuel_reserve">Reserve %1$s t</string> - <string name="stats_tap_hint">Tryk på den øverste bjælke eller instrumentbrættet for at skifte stil.</string> <string name="bottom_telemetry_send_title">Send instrumentbrætdata</string> <string name="bottom_telemetry_send_auto">Auto</string> <string name="bottom_telemetry_send_auto_hint">Slår det til for alle spil på listen her, også spil, der findes senere. Spil, du slår fra, forbliver slået fra.</string> @@ -1860,7 +1853,6 @@ <string name="bottom_telemetry_balance">Saldo</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Slå dataoutput til i et racerspil (ofte kaldet telemetri eller UDP) for at se et live-instrumentbræt her. Det forbliver på denne enhed.</string> <string name="bottom_telemetry_unknown_format">Port %1$d modtager data (%2$d pakker á %3$d bytes), men i et format, som denne side endnu ikke kan læse.</string> <string name="bottom_telemetry_port_busy">Et andet program bruger allerede port %1$s, så det spil kan ikke vises her.</string> @@ -3627,4 +3619,33 @@ <string name="gog_repair_action">Reparer filer</string> <string name="gog_refresh_action">Opdater installationen</string> <string name="gog_select_patch">Vælg</string> + <string name="stores_gamejolt_not_owned">Ikke i dit Game Jolt-bibliotek</string> + <string name="stores_gamejolt_no_build">Ingen Windows-download til dette spil</string> + <string name="stores_gamejolt_no_exe">Der blev ikke fundet et Windows-spil i downloaden</string> + <string name="stores_gamejolt_no_game">Kunne ikke finde dette spil på Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Kunne ikke hente spil fra Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt svarede HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Kunne ikke indlæse downloads fra Game Jolt</string> + <string name="stores_gamejolt_build_open">Åbn på Game Jolt</string> + <string name="stores_gamejolt_archive">%1$s-arkiver understøttes ikke</string> + <string name="stores_gamejolt_extract_failed">Downloaden kunne ikke udpakkes (kode %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Kunne ikke nå Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt gav ikke et downloadlink</string> + <string name="stores_gamejolt_section_featured">Fremhævede</string> + <string name="stores_gamejolt_section_hot">Populære</string> + <string name="stores_gamejolt_section_best">Bedste</string> + <string name="stores_gamejolt_section_new">Nye</string> + <string name="stores_gamejolt_price_under_30">$30 eller mindre</string> + <string name="stores_gamejolt_os_other">Andet</string> + <string name="stores_gamejolt_maturity_everyone">Alle aldre</string> + <string name="stores_gamejolt_maturity_teen">Teenagere</string> + <string name="stores_gamejolt_maturity_adult">Voksne</string> + <string name="stores_gamejolt_status_complete">Færdige</string> + <string name="stores_gamejolt_status_early">Early access</string> + <string name="stores_gamejolt_partners">Partnerspil</string> + <string name="stores_gamejolt_filter_browser">Browser</string> + <string name="stores_gamejolt_filter_maturity">Modenhed</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Partnere</string> + <string name="stores_gamejolt_followed">Fulgte spil</string> </resources> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a6c5d7c22e..d4d0656069 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Verzögert das Anhalten im Hintergrund, solange Steam aktiv herunterlädt.</string> <string name="mode_suspend_note">Auto pausiert im Hintergrund und setzt fort, sobald die App wieder sichtbar ist. Manuell wartet auf „Fortsetzen“. Nie lässt alles weiterlaufen.</string> <string name="mode_startup">Start</string> - <string name="mode_steam_startup">Steam mit DroidDeck starten</string> - <string name="mode_steam_startup_hint">Öffnet die Steam-Sitzung, wenn DroidDeck startet.</string> + <string name="mode_startup_session">Beim Start öffnen</string> + <string name="mode_startup_session_hint">Startet diese Sitzung, wenn DroidDeck startet.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Suche nach Releases…</string> <string name="mode_decky_ready">Bereit zur Installation von %1$s.</string> @@ -873,13 +873,9 @@ <string name="setup_fullscreen">Vollbild</string> <string name="setup_fullscreen_on">Blendet die Status- und Navigationsleiste von Android aus</string> <string name="setup_fullscreen_off">Zeigt die Status- und Navigationsleiste von Android an</string> - <string name="setup_dual_screen">Zwei Bildschirme</string> - <string name="setup_dual_screen_hint">Automatisch nutzt den zweiten Bildschirm auf Handhelds mit eingebautem Zweitbildschirm. Ein nutzt einen beliebigen zweiten Bildschirm. Aus lässt alles auf einem Bildschirm.</string> <string name="setup_dual_screen_auto">Automatisch</string> <string name="setup_dual_screen_on">Ein</string> <string name="setup_dual_screen_off">Aus</string> - <string name="setup_dual_screen_menu">Menü auf dem unteren Bildschirm</string> - <string name="setup_dual_screen_menu_hint">Verschiebt die Bereiche und das Menü im Spiel auf den zweiten Bildschirm und tippt dort, damit der obere Bildschirm die volle Ansicht behält. L2 und R2 wechseln den Bereich.</string> <string name="setup_dual_screen_controls">Steuerung auf dem unteren Bildschirm in Spielen</string> <string name="setup_dual_screen_controls_hint">Öffnet beim Start einer Sitzung Trackpad und Tastatur auf dem zweiten Bildschirm.</string> <string name="dual_typing_title">Eingabe für den oberen Bildschirm</string> @@ -1794,8 +1790,6 @@ <string name="stats_trace">Gas und Bremse, letzte 10 s</string> <string name="stats_speed_chart">Geschwindigkeit, %1$s</string> <string name="stats_gear">Gang</string> - <string name="stats_speed_units">Geschwindigkeitseinheit</string> - <string name="stats_speed_units_auto">Automatisch (%1$s)</string> <string name="stats_steam_client_arm">Steam-Client ARM</string> <string name="stats_steam_client_x86">Steam-Client x86</string> <string name="stats_throttle">Gas</string> @@ -1813,7 +1807,6 @@ <string name="stats_fuel_t">Treibstoff, t</string> <string name="stats_fuel_main">Haupttank %1$s t</string> <string name="stats_fuel_reserve">Reserve %1$s t</string> - <string name="stats_tap_hint">Tippe auf die obere Leiste oder die Instrumentenanzeige, um ihren Stil zu ändern.</string> <string name="bottom_telemetry_send_title">Dashboard-Daten senden</string> <string name="bottom_telemetry_send_auto">Automatisch</string> <string name="bottom_telemetry_send_auto_hint">Schaltet es für jedes hier aufgeführte Spiel ein, auch für später gefundene Spiele. Spiele, die du ausschaltest, bleiben aus.</string> @@ -1852,7 +1845,6 @@ <string name="bottom_telemetry_balance">Guthaben</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Aktiviere die Datenausgabe eines Rennspiels (oft Telemetrie oder UDP genannt), um hier ein Live-Cockpit zu sehen. Die Daten bleiben auf diesem Gerät.</string> <string name="bottom_telemetry_unknown_format">Port %1$d empfängt Daten (%2$d Pakete mit %3$d Bytes), aber in einem Format, das diese Seite noch nicht lesen kann.</string> <string name="bottom_telemetry_port_busy">Ein anderes Programm verwendet bereits Port %1$s, daher kann dieses Spiel hier nicht angezeigt werden.</string> @@ -3627,4 +3619,33 @@ <string name="gog_repair_action">Dateien reparieren</string> <string name="gog_refresh_action">Installation erneuern</string> <string name="gog_select_patch">Auswählen</string> + <string name="stores_gamejolt_not_owned">Nicht in deiner Game Jolt-Bibliothek</string> + <string name="stores_gamejolt_no_build">Kein Windows-Download für dieses Spiel</string> + <string name="stores_gamejolt_no_exe">Im Download wurde kein Windows-Spiel gefunden</string> + <string name="stores_gamejolt_no_game">Dieses Spiel wurde auf Game Jolt nicht gefunden</string> + <string name="stores_gamejolt_browse_failed">Spiele von Game Jolt konnten nicht geladen werden</string> + <string name="stores_gamejolt_download_failed">Game Jolt antwortete mit HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Die Downloads von Game Jolt konnten nicht geladen werden</string> + <string name="stores_gamejolt_build_open">Auf Game Jolt öffnen</string> + <string name="stores_gamejolt_archive">%1$s-Archive werden nicht unterstützt</string> + <string name="stores_gamejolt_extract_failed">Download konnte nicht entpackt werden (Code %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Jolt ist nicht erreichbar</string> + <string name="stores_gamejolt_download_no_link">Game Jolt hat keinen Download-Link geliefert</string> + <string name="stores_gamejolt_section_featured">Empfohlen</string> + <string name="stores_gamejolt_section_hot">Angesagt</string> + <string name="stores_gamejolt_section_best">Beste</string> + <string name="stores_gamejolt_section_new">Neu</string> + <string name="stores_gamejolt_price_under_30">30 $ oder weniger</string> + <string name="stores_gamejolt_os_other">Andere</string> + <string name="stores_gamejolt_maturity_everyone">Alle Altersgruppen</string> + <string name="stores_gamejolt_maturity_teen">Jugendliche</string> + <string name="stores_gamejolt_maturity_adult">Erwachsene</string> + <string name="stores_gamejolt_status_complete">Fertig</string> + <string name="stores_gamejolt_status_early">Early Access</string> + <string name="stores_gamejolt_partners">Partnerspiele</string> + <string name="stores_gamejolt_filter_browser">Browser</string> + <string name="stores_gamejolt_filter_maturity">Altersfreigabe</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Partner</string> + <string name="stores_gamejolt_followed">Gefolgte Spiele</string> </resources> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index b59ef694a9..f14066a2bc 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Καθυστερεί την αναστολή παρασκηνίου όσο το Steam κάνει ενεργά λήψη.</string> <string name="mode_suspend_note">Το Αυτόματο θέτει σε παύση στο παρασκήνιο και συνεχίζει όταν εμφανίζεται. Το Μη αυτόματο περιμένει το Συνέχιση. Το Ποτέ συνεχίζει να εκτελείται.</string> <string name="mode_startup">Εκκίνηση</string> - <string name="mode_steam_startup">Εκκίνηση του Steam με το DroidDeck</string> - <string name="mode_steam_startup_hint">Ανοίγει τη συνεδρία Steam όταν εκκινείται το DroidDeck.</string> + <string name="mode_startup_session">Άνοιγμα κατά την εκκίνηση</string> + <string name="mode_startup_session_hint">Ξεκινά αυτή τη συνεδρία όταν ανοίγει το DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Έλεγχος για εκδόσεις…</string> <string name="mode_decky_ready">Έτοιμο για εγκατάσταση %1$s.</string> @@ -881,13 +881,9 @@ <string name="setup_fullscreen">Πλήρης οθόνη</string> <string name="setup_fullscreen_on">Αποκρύπτει τις γραμμές κατάστασης και πλοήγησης του Android</string> <string name="setup_fullscreen_off">Εμφανίζει τις γραμμές κατάστασης και πλοήγησης του Android</string> - <string name="setup_dual_screen">Διπλή οθόνη</string> - <string name="setup_dual_screen_hint">Το Αυτόματο χρησιμοποιεί τη δεύτερη οθόνη σε φορητές συσκευές με ενσωματωμένη. Το Ενεργό χρησιμοποιεί οποιαδήποτε δεύτερη οθόνη. Το Ανενεργό κρατά τα πάντα σε μία οθόνη.</string> <string name="setup_dual_screen_auto">Αυτόματο</string> <string name="setup_dual_screen_on">Ενεργό</string> <string name="setup_dual_screen_off">Ανενεργό</string> - <string name="setup_dual_screen_menu">Μενού κάτω οθόνης</string> - <string name="setup_dual_screen_menu_hint">Μεταφέρει τις ενότητες και το μενού του παιχνιδιού στη δεύτερη οθόνη και η πληκτρολόγηση γίνεται εκεί, ώστε η πάνω οθόνη να κρατά την πλήρη προβολή. Τα L2 και R2 αλλάζουν ενότητα.</string> <string name="setup_dual_screen_controls">Χειριστήρια κάτω οθόνης στα παιχνίδια</string> <string name="setup_dual_screen_controls_hint">Ανοίγει την επιφάνεια αφής και το πληκτρολόγιο στη δεύτερη οθόνη όταν ξεκινά μια συνεδρία.</string> <string name="dual_typing_title">Πληκτρολόγηση για την πάνω οθόνη</string> @@ -1802,8 +1798,6 @@ <string name="stats_trace">Γκάζι και φρένο, τελευταία 10 s</string> <string name="stats_speed_chart">Ταχύτητα, %1$s</string> <string name="stats_gear">Σχέση</string> - <string name="stats_speed_units">Μονάδες ταχύτητας</string> - <string name="stats_speed_units_auto">Αυτόματα (%1$s)</string> <string name="stats_steam_client_arm">Πελάτης Steam ARM</string> <string name="stats_steam_client_x86">Πελάτης Steam x86</string> <string name="stats_throttle">Γκάζι</string> @@ -1821,7 +1815,6 @@ <string name="stats_fuel_t">Καύσιμο, t</string> <string name="stats_fuel_main">Κύριο %1$s t</string> <string name="stats_fuel_reserve">Εφεδρικό %1$s t</string> - <string name="stats_tap_hint">Πατήστε τη λωρίδα στο πάνω μέρος ή τον πίνακα οργάνων για να αλλάξετε το στυλ του.</string> <string name="bottom_telemetry_send_title">Αποστολή δεδομένων πίνακα</string> <string name="bottom_telemetry_send_auto">Αυτόματα</string> <string name="bottom_telemetry_send_auto_hint">Το ενεργοποιεί για κάθε παιχνίδι της λίστας, μαζί και όσα βρεθούν αργότερα. Τα παιχνίδια που απενεργοποιείτε παραμένουν ανενεργά.</string> @@ -1860,7 +1853,6 @@ <string name="bottom_telemetry_balance">Υπόλοιπο</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Ενεργοποιήστε την έξοδο δεδομένων ενός αγωνιστικού παιχνιδιού (συχνά λέγεται τηλεμετρία ή UDP) για να δείτε εδώ ζωντανό πίνακα οργάνων. Τα δεδομένα μένουν σε αυτή τη συσκευή.</string> <string name="bottom_telemetry_unknown_format">Η θύρα %1$d λαμβάνει δεδομένα (%2$d πακέτα των %3$d byte), αλλά σε μορφή που αυτή η σελίδα δεν μπορεί ακόμα να διαβάσει.</string> <string name="bottom_telemetry_port_busy">Ένα άλλο πρόγραμμα χρησιμοποιεί ήδη τη θύρα %1$s, οπότε αυτό το παιχνίδι δεν μπορεί να εμφανιστεί εδώ.</string> @@ -3627,4 +3619,33 @@ <string name="gog_repair_action">Επιδιόρθωση αρχείων</string> <string name="gog_refresh_action">Ανανέωση εγκατάστασης</string> <string name="gog_select_patch">Επιλογή</string> + <string name="stores_gamejolt_not_owned">Δεν είναι στη βιβλιοθήκη σας στο Game Jolt</string> + <string name="stores_gamejolt_no_build">Δεν υπάρχει λήψη για Windows για αυτό το παιχνίδι</string> + <string name="stores_gamejolt_no_exe">Δεν βρέθηκε παιχνίδι Windows στη λήψη</string> + <string name="stores_gamejolt_no_game">Δεν βρέθηκε αυτό το παιχνίδι στο Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Δεν ήταν δυνατή η φόρτωση παιχνιδιών από το Game Jolt</string> + <string name="stores_gamejolt_download_failed">Το Game Jolt απάντησε HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Δεν ήταν δυνατή η φόρτωση των λήψεων από το Game Jolt</string> + <string name="stores_gamejolt_build_open">Άνοιγμα στο Game Jolt</string> + <string name="stores_gamejolt_archive">Τα αρχεία %1$s δεν υποστηρίζονται</string> + <string name="stores_gamejolt_extract_failed">Δεν ήταν δυνατή η αποσυμπίεση της λήψης (κωδικός %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Δεν ήταν δυνατή η σύνδεση με το Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Το Game Jolt δεν έδωσε σύνδεσμο λήψης</string> + <string name="stores_gamejolt_section_featured">Προτεινόμενα</string> + <string name="stores_gamejolt_section_hot">Δημοφιλή</string> + <string name="stores_gamejolt_section_best">Καλύτερα</string> + <string name="stores_gamejolt_section_new">Νέα</string> + <string name="stores_gamejolt_price_under_30">30$ ή λιγότερο</string> + <string name="stores_gamejolt_os_other">Άλλα</string> + <string name="stores_gamejolt_maturity_everyone">Όλες οι ηλικίες</string> + <string name="stores_gamejolt_maturity_teen">Έφηβοι</string> + <string name="stores_gamejolt_maturity_adult">Ενήλικες</string> + <string name="stores_gamejolt_status_complete">Ολοκληρωμένα</string> + <string name="stores_gamejolt_status_early">Πρώιμη πρόσβαση</string> + <string name="stores_gamejolt_partners">Παιχνίδια συνεργατών</string> + <string name="stores_gamejolt_filter_browser">Πρόγραμμα περιήγησης</string> + <string name="stores_gamejolt_filter_maturity">Ωριμότητα</string> + <string name="stores_gamejolt_filter_status">Κατάσταση</string> + <string name="stores_gamejolt_filter_partners">Συνεργάτες</string> + <string name="stores_gamejolt_followed">Παιχνίδια που ακολουθείτε</string> </resources> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 5db289b93b..b40c7023c6 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Retrasa la suspensión en segundo plano mientras Steam esté descargando.</string> <string name="mode_suspend_note">Auto pausa en segundo plano y reanuda al mostrarse. Manual espera a Reanudar. Nunca sigue ejecutándose.</string> <string name="mode_startup">Inicio</string> - <string name="mode_steam_startup">Iniciar Steam con DroidDeck</string> - <string name="mode_steam_startup_hint">Abre la sesión de Steam al iniciar DroidDeck.</string> + <string name="mode_startup_session">Abrir al iniciar</string> + <string name="mode_startup_session_hint">Inicia esta sesión cuando se abre DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Buscando versiones…</string> <string name="mode_decky_ready">Listo para instalar %1$s.</string> @@ -884,13 +884,9 @@ <string name="setup_fullscreen">Pantalla completa</string> <string name="setup_fullscreen_on">Oculta las barras de estado y navegación de Android</string> <string name="setup_fullscreen_off">Muestra las barras de estado y navegación de Android</string> - <string name="setup_dual_screen">Pantalla doble</string> - <string name="setup_dual_screen_hint">Automático usa la segunda pantalla en consolas portátiles que la llevan integrada. Activado usa cualquier segunda pantalla. Desactivado lo mantiene todo en una pantalla.</string> <string name="setup_dual_screen_auto">Automático</string> <string name="setup_dual_screen_on">Activado</string> <string name="setup_dual_screen_off">Desactivado</string> - <string name="setup_dual_screen_menu">Menú en la pantalla inferior</string> - <string name="setup_dual_screen_menu_hint">Mueve las secciones y el menú del juego a la segunda pantalla y se escribe allí, para que la pantalla superior mantenga la vista completa. L2 y R2 cambian de sección.</string> <string name="setup_dual_screen_controls">Controles en la pantalla inferior en juegos</string> <string name="setup_dual_screen_controls_hint">Abre el trackpad y el teclado en la segunda pantalla al iniciar una sesión.</string> <string name="dual_typing_title">Escribiendo en la pantalla superior</string> @@ -1824,8 +1820,6 @@ <string name="stats_trace">Acelerador y freno, últimos 10 s</string> <string name="stats_speed_chart">Velocidad, %1$s</string> <string name="stats_gear">Marcha</string> - <string name="stats_speed_units">Unidades de velocidad</string> - <string name="stats_speed_units_auto">Automático (%1$s)</string> <string name="stats_steam_client_arm">Cliente de Steam ARM</string> <string name="stats_steam_client_x86">Cliente de Steam x86</string> <string name="stats_throttle">Acelerador</string> @@ -1843,7 +1837,6 @@ <string name="stats_fuel_t">Combustible, t</string> <string name="stats_fuel_main">Principal %1$s t</string> <string name="stats_fuel_reserve">Reserva %1$s t</string> - <string name="stats_tap_hint">Toca la franja superior o el cuadro de instrumentos para cambiar su estilo.</string> <string name="bottom_telemetry_send_title">Enviar datos al panel</string> <string name="bottom_telemetry_send_auto">Automático</string> <string name="bottom_telemetry_send_auto_hint">Lo activa en todos los juegos de esta lista, incluidos los que se encuentren más adelante. Los juegos que desactives seguirán desactivados.</string> @@ -1882,7 +1875,6 @@ <string name="bottom_telemetry_balance">Saldo</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Activa la salida de datos de un juego de carreras (a menudo llamada telemetría o UDP) para ver aquí un panel en directo. Los datos no salen de este dispositivo.</string> <string name="bottom_telemetry_unknown_format">El puerto %1$d recibe datos (%2$d paquetes de %3$d bytes), pero en un formato que esta página aún no puede leer.</string> <string name="bottom_telemetry_port_busy">Otro programa ya usa el puerto %1$s, así que ese juego no se puede mostrar aquí.</string> @@ -3664,4 +3656,33 @@ <string name="gog_repair_action">Reparar archivos</string> <string name="gog_refresh_action">Renovar la instalación</string> <string name="gog_select_patch">Seleccionar</string> + <string name="stores_gamejolt_not_owned">No está en tu biblioteca de Game Jolt</string> + <string name="stores_gamejolt_no_build">No hay descarga para Windows de este juego</string> + <string name="stores_gamejolt_no_exe">No se ha encontrado un juego de Windows en la descarga</string> + <string name="stores_gamejolt_no_game">No se ha encontrado este juego en Game Jolt</string> + <string name="stores_gamejolt_browse_failed">No se pudieron cargar los juegos de Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt respondió HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">No se pudieron cargar las descargas de Game Jolt</string> + <string name="stores_gamejolt_build_open">Abrir en Game Jolt</string> + <string name="stores_gamejolt_archive">Los archivos %1$s no son compatibles</string> + <string name="stores_gamejolt_extract_failed">No se ha podido extraer la descarga (código %1$d)</string> + <string name="stores_gamejolt_download_unreachable">No se pudo conectar con Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt no proporcionó un enlace de descarga</string> + <string name="stores_gamejolt_section_featured">Destacados</string> + <string name="stores_gamejolt_section_hot">Populares</string> + <string name="stores_gamejolt_section_best">Mejores</string> + <string name="stores_gamejolt_section_new">Nuevos</string> + <string name="stores_gamejolt_price_under_30">30 $ o menos</string> + <string name="stores_gamejolt_os_other">Otros</string> + <string name="stores_gamejolt_maturity_everyone">Todas las edades</string> + <string name="stores_gamejolt_maturity_teen">Adolescentes</string> + <string name="stores_gamejolt_maturity_adult">Adultos</string> + <string name="stores_gamejolt_status_complete">Completo</string> + <string name="stores_gamejolt_status_early">Acceso anticipado</string> + <string name="stores_gamejolt_partners">Juegos de socios</string> + <string name="stores_gamejolt_filter_browser">Navegador</string> + <string name="stores_gamejolt_filter_maturity">Clasificación</string> + <string name="stores_gamejolt_filter_status">Estado</string> + <string name="stores_gamejolt_filter_partners">Socios</string> + <string name="stores_gamejolt_followed">Juegos seguidos</string> </resources> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index ed8ad9a778..e68570467a 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Viivästytä taustakeskeytystä, kun Steam lataa aktiivisesti.</string> <string name="mode_suspend_note">Automaattinen keskeyttää taustalla ja jatkaa, kun sovellus tulee näkyviin. Manuaalinen odottaa Jatka-painiketta. Ei koskaan pitää sovelluksen aina käynnissä.</string> <string name="mode_startup">Käynnistys</string> - <string name="mode_steam_startup">Käynnistä Steam DroidDeckin kanssa</string> - <string name="mode_steam_startup_hint">Avaa Steam-istunnon, kun DroidDeck käynnistyy.</string> + <string name="mode_startup_session">Avaa käynnistyksessä</string> + <string name="mode_startup_session_hint">Käynnistää tämän istunnon, kun DroidDeck avataan.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Tarkistetaan julkaisuja…</string> <string name="mode_decky_ready">Valmiina asentamaan %1$s.</string> @@ -881,13 +881,9 @@ <string name="setup_fullscreen">Koko näyttö</string> <string name="setup_fullscreen_on">Piilottaa Androidin tila- ja navigointipalkit</string> <string name="setup_fullscreen_off">Näyttää Androidin tila- ja navigointipalkit</string> - <string name="setup_dual_screen">Kaksi näyttöä</string> - <string name="setup_dual_screen_hint">Automaattinen käyttää toista näyttöä kämmenlaitteissa, joissa sellainen on sisäänrakennettuna. Päällä käyttää mitä tahansa toista näyttöä. Pois pitää kaiken yhdellä näytöllä.</string> <string name="setup_dual_screen_auto">Automaattinen</string> <string name="setup_dual_screen_on">Päällä</string> <string name="setup_dual_screen_off">Pois</string> - <string name="setup_dual_screen_menu">Alanäytön valikko</string> - <string name="setup_dual_screen_menu_hint">Siirtää osiot ja pelin aikaisen valikon toiselle näytölle ja kirjoitus tehdään siellä, joten yläruutu säilyttää koko näkymän. L2 ja R2 vaihtavat osiota.</string> <string name="setup_dual_screen_controls">Alanäytön ohjaimet peleissä</string> <string name="setup_dual_screen_controls_hint">Avaa kosketuslevyn ja näppäimistön toiselle näytölle, kun istunto alkaa.</string> <string name="dual_typing_title">Kirjoitus yläruudulle</string> @@ -1802,8 +1798,6 @@ <string name="stats_trace">Kaasu ja jarru, viimeiset 10 s</string> <string name="stats_speed_chart">Nopeus, %1$s</string> <string name="stats_gear">Vaihde</string> - <string name="stats_speed_units">Nopeuden yksiköt</string> - <string name="stats_speed_units_auto">Automaattinen (%1$s)</string> <string name="stats_steam_client_arm">Steam-asiakasohjelma ARM</string> <string name="stats_steam_client_x86">Steam-asiakasohjelma x86</string> <string name="stats_throttle">Kaasu</string> @@ -1821,7 +1815,6 @@ <string name="stats_fuel_t">Polttoaine, t</string> <string name="stats_fuel_main">Päätankki %1$s t</string> <string name="stats_fuel_reserve">Varatankki %1$s t</string> - <string name="stats_tap_hint">Napauta yläpalkkia tai kojelautaa vaihtaaksesi sen tyyliä.</string> <string name="bottom_telemetry_send_title">Lähetä kojelaudan tiedot</string> <string name="bottom_telemetry_send_auto">Automaattinen</string> <string name="bottom_telemetry_send_auto_hint">Kytkee sen päälle jokaiselle tässä luetellulle pelille, myös myöhemmin löytyville. Pois kytkemäsi pelit pysyvät pois päältä.</string> @@ -1860,7 +1853,6 @@ <string name="bottom_telemetry_balance">Saldo</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Kytke kilpa-ajopelin datan ulostulo päälle (usein nimeltään telemetria tai UDP), niin näet täällä reaaliaikaisen kojelaudan. Tiedot pysyvät tällä laitteella.</string> <string name="bottom_telemetry_unknown_format">Portti %1$d vastaanottaa dataa (%2$d pakettia, kukin %3$d tavua), mutta muodossa, jota tämä sivu ei vielä osaa lukea.</string> <string name="bottom_telemetry_port_busy">Toinen ohjelma käyttää jo porttia %1$s, joten peliä ei voida näyttää täällä.</string> @@ -3627,4 +3619,33 @@ <string name="gog_repair_action">Korjaa tiedostot</string> <string name="gog_refresh_action">Päivitä asennus</string> <string name="gog_select_patch">Valitse</string> + <string name="stores_gamejolt_not_owned">Ei Game Jolt-kirjastossasi</string> + <string name="stores_gamejolt_no_build">Ei Windows-latausta tälle pelille</string> + <string name="stores_gamejolt_no_exe">Latauksesta ei löytynyt Windows-peliä</string> + <string name="stores_gamejolt_no_game">Peliä ei löytynyt Game Joltista</string> + <string name="stores_gamejolt_browse_failed">Pelien lataaminen Game Joltista epäonnistui</string> + <string name="stores_gamejolt_download_failed">Game Jolt vastasi HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Latausten haku Game Joltista epäonnistui</string> + <string name="stores_gamejolt_build_open">Avaa Game Joltissa</string> + <string name="stores_gamejolt_archive">%1$s-arkistot eivät ole tuettuja</string> + <string name="stores_gamejolt_extract_failed">Latausta ei voitu purkaa (koodi %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Joltiin ei saatu yhteyttä</string> + <string name="stores_gamejolt_download_no_link">Game Jolt ei antanut latauslinkkiä</string> + <string name="stores_gamejolt_section_featured">Esittelyssä</string> + <string name="stores_gamejolt_section_hot">Kuumat</string> + <string name="stores_gamejolt_section_best">Parhaat</string> + <string name="stores_gamejolt_section_new">Uudet</string> + <string name="stores_gamejolt_price_under_30">30 $ tai alle</string> + <string name="stores_gamejolt_os_other">Muu</string> + <string name="stores_gamejolt_maturity_everyone">Kaikenikäisille</string> + <string name="stores_gamejolt_maturity_teen">Nuoret</string> + <string name="stores_gamejolt_maturity_adult">Aikuiset</string> + <string name="stores_gamejolt_status_complete">Valmis</string> + <string name="stores_gamejolt_status_early">Ennakkojulkaisu</string> + <string name="stores_gamejolt_partners">Kumppanien pelit</string> + <string name="stores_gamejolt_filter_browser">Selain</string> + <string name="stores_gamejolt_filter_maturity">Ikärajat</string> + <string name="stores_gamejolt_filter_status">Tila</string> + <string name="stores_gamejolt_filter_partners">Kumppanit</string> + <string name="stores_gamejolt_followed">Seuratut pelit</string> </resources> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 6a1c0914e1..c887419609 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Retarde la mise en pause en arrière-plan tant que Steam télécharge.</string> <string name="mode_suspend_note">Le mode automatique met en pause en arrière-plan et reprend à l\'affichage. Le mode manuel nécessite d\'appuyer sur « Reprendre ». Ne reste jamais en cours d\'exécution.</string> <string name="mode_startup">Démarrage</string> - <string name="mode_steam_startup">Lancer Steam à l\'ouverture de DroidDeck</string> - <string name="mode_steam_startup_hint">Ouvre une session Steam au démarrage de DroidDeck.</string> + <string name="mode_startup_session">Ouvrir au démarrage</string> + <string name="mode_startup_session_hint">Lance cette session au démarrage de DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Vérification des versions…</string> <string name="mode_decky_ready">Prêt à installer %1$s.</string> @@ -884,13 +884,9 @@ <string name="setup_fullscreen">Plein écran</string> <string name="setup_fullscreen_on">Masquer la barre d\'état et la barre de navigation Android</string> <string name="setup_fullscreen_off">Afficher la barre d\'état et la barre de navigation Android</string> - <string name="setup_dual_screen">Double écran</string> - <string name="setup_dual_screen_hint">Automatique utilise le second écran sur les consoles portables qui en ont un intégré. Activé utilise n\'importe quel second écran. Désactivé garde tout sur un seul écran.</string> <string name="setup_dual_screen_auto">Automatique</string> <string name="setup_dual_screen_on">Activé</string> <string name="setup_dual_screen_off">Désactivé</string> - <string name="setup_dual_screen_menu">Menu sur l\'écran du bas</string> - <string name="setup_dual_screen_menu_hint">Déplace les sections et le menu en jeu sur le second écran et la saisie s\'y fait, pour que l\'écran du haut garde toute la vue. L2 et R2 changent de section.</string> <string name="setup_dual_screen_controls">Commandes sur l\'écran du bas en jeu</string> <string name="setup_dual_screen_controls_hint">Ouvre le pavé tactile et le clavier sur le second écran au démarrage d\'une session.</string> <string name="dual_typing_title">Saisie pour l\'écran du haut</string> @@ -1824,8 +1820,6 @@ <string name="stats_trace">Accélérateur et frein, 10 dernières s</string> <string name="stats_speed_chart">Vitesse, %1$s</string> <string name="stats_gear">Rapport</string> - <string name="stats_speed_units">Unités de vitesse</string> - <string name="stats_speed_units_auto">Automatique (%1$s)</string> <string name="stats_steam_client_arm">Client Steam ARM</string> <string name="stats_steam_client_x86">Client Steam x86</string> <string name="stats_throttle">Accélérateur</string> @@ -1843,7 +1837,6 @@ <string name="stats_fuel_t">Carburant, t</string> <string name="stats_fuel_main">Principal %1$s t</string> <string name="stats_fuel_reserve">Réserve %1$s t</string> - <string name="stats_tap_hint">Appuyez sur la bande supérieure ou sur le tableau de bord pour changer son style.</string> <string name="bottom_telemetry_send_title">Envoyer les données du tableau de bord</string> <string name="bottom_telemetry_send_auto">Automatique</string> <string name="bottom_telemetry_send_auto_hint">L\'active pour chaque jeu listé ici, y compris les jeux trouvés plus tard. Les jeux que vous désactivez restent désactivés.</string> @@ -1882,7 +1875,6 @@ <string name="bottom_telemetry_balance">Solde</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Activez la sortie de données d\'un jeu de course (souvent appelée télémétrie ou UDP) pour voir ici un tableau de bord en direct. Les données restent sur cet appareil.</string> <string name="bottom_telemetry_unknown_format">Le port %1$d reçoit des données (%2$d paquets de %3$d octets), mais dans un format que cette page ne sait pas encore lire.</string> <string name="bottom_telemetry_port_busy">Un autre programme utilise déjà le port %1$s ; ce jeu ne peut donc pas s\'afficher ici.</string> @@ -3664,4 +3656,33 @@ <string name="gog_repair_action">Réparer les fichiers</string> <string name="gog_refresh_action">Actualiser l\'installation</string> <string name="gog_select_patch">Sélectionner</string> + <string name="stores_gamejolt_not_owned">Absent de votre bibliothèque Game Jolt</string> + <string name="stores_gamejolt_no_build">Pas de téléchargement Windows pour ce jeu</string> + <string name="stores_gamejolt_no_exe">Aucun jeu Windows trouvé dans le téléchargement</string> + <string name="stores_gamejolt_no_game">Ce jeu est introuvable sur Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Impossible de charger les jeux de Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt a répondu HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Impossible de charger les téléchargements depuis Game Jolt</string> + <string name="stores_gamejolt_build_open">Ouvrir sur Game Jolt</string> + <string name="stores_gamejolt_archive">Les archives %1$s ne sont pas prises en charge</string> + <string name="stores_gamejolt_extract_failed">Impossible d\'extraire le téléchargement (code %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Impossible de joindre Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt n\'a pas fourni de lien de téléchargement</string> + <string name="stores_gamejolt_section_featured">À la une</string> + <string name="stores_gamejolt_section_hot">Tendances</string> + <string name="stores_gamejolt_section_best">Meilleurs</string> + <string name="stores_gamejolt_section_new">Nouveaux</string> + <string name="stores_gamejolt_price_under_30">30 $ ou moins</string> + <string name="stores_gamejolt_os_other">Autre</string> + <string name="stores_gamejolt_maturity_everyone">Tous publics</string> + <string name="stores_gamejolt_maturity_teen">Adolescents</string> + <string name="stores_gamejolt_maturity_adult">Adultes</string> + <string name="stores_gamejolt_status_complete">Terminé</string> + <string name="stores_gamejolt_status_early">Accès anticipé</string> + <string name="stores_gamejolt_partners">Jeux partenaires</string> + <string name="stores_gamejolt_filter_browser">Navigateur</string> + <string name="stores_gamejolt_filter_maturity">Classification</string> + <string name="stores_gamejolt_filter_status">Statut</string> + <string name="stores_gamejolt_filter_partners">Partenaires</string> + <string name="stores_gamejolt_followed">Jeux suivis</string> </resources> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index cd884b5ea0..795c2c35d0 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Steam के सक्रिय रूप से डाउनलोड करते समय बैकग्राउंड सस्पेंशन को टालें।</string> <string name="mode_suspend_note">ऑटो बैकग्राउंड में रुकता है और दिखने पर फिर से शुरू होता है। मैनुअल फिर से शुरू करें का इंतज़ार करता है। कभी नहीं वाला चलता रहता है।</string> <string name="mode_startup">स्टार्टअप</string> - <string name="mode_steam_startup">DroidDeck के साथ Steam शुरू करें</string> - <string name="mode_steam_startup_hint">DroidDeck लॉन्च होने पर Steam सेशन खोलता है।</string> + <string name="mode_startup_session">लॉन्च पर खोलें</string> + <string name="mode_startup_session_hint">DroidDeck खुलने पर यह सेशन शुरू करता है।</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">रिलीज़ देखी जा रही हैं…</string> <string name="mode_decky_ready">%1$s इंस्टॉल करने के लिए तैयार।</string> @@ -881,13 +881,9 @@ <string name="setup_fullscreen">फ़ुलस्क्रीन</string> <string name="setup_fullscreen_on">Android स्टेटस और नेविगेशन बार छिपाता है</string> <string name="setup_fullscreen_off">Android स्टेटस और नेविगेशन बार दिखाता है</string> - <string name="setup_dual_screen">डुअल स्क्रीन</string> - <string name="setup_dual_screen_hint">ऑटोमैटिक, बिल्ट-इन दूसरी स्क्रीन वाले हैंडहेल्ड पर दूसरी स्क्रीन इस्तेमाल करता है। चालू किसी भी दूसरे डिस्प्ले का इस्तेमाल करता है। बंद सब कुछ एक स्क्रीन पर रखता है।</string> <string name="setup_dual_screen_auto">ऑटोमैटिक</string> <string name="setup_dual_screen_on">चालू</string> <string name="setup_dual_screen_off">बंद</string> - <string name="setup_dual_screen_menu">नीचे की स्क्रीन पर मेनू</string> - <string name="setup_dual_screen_menu_hint">सेक्शन और गेम के दौरान का मेनू दूसरी स्क्रीन पर ले जाता है और टाइपिंग वहीं होती है, ताकि ऊपर की स्क्रीन पूरा दृश्य दिखाए। L2 और R2 सेक्शन बदलते हैं।</string> <string name="setup_dual_screen_controls">गेम में नीचे की स्क्रीन के कंट्रोल</string> <string name="setup_dual_screen_controls_hint">सेशन शुरू होने पर दूसरी स्क्रीन पर ट्रैकपैड और कीबोर्ड खोलता है।</string> <string name="dual_typing_title">ऊपर की स्क्रीन के लिए टाइपिंग</string> @@ -1802,8 +1798,6 @@ <string name="stats_trace">थ्रॉटल और ब्रेक, पिछले 10 s</string> <string name="stats_speed_chart">स्पीड, %1$s</string> <string name="stats_gear">गियर</string> - <string name="stats_speed_units">स्पीड की इकाई</string> - <string name="stats_speed_units_auto">ऑटोमैटिक (%1$s)</string> <string name="stats_steam_client_arm">Steam क्लाइंट ARM</string> <string name="stats_steam_client_x86">Steam क्लाइंट x86</string> <string name="stats_throttle">थ्रॉटल</string> @@ -1821,7 +1815,6 @@ <string name="stats_fuel_t">फ़्यूल, t</string> <string name="stats_fuel_main">मुख्य %1$s t</string> <string name="stats_fuel_reserve">रिज़र्व %1$s t</string> - <string name="stats_tap_hint">स्टाइल बदलने के लिए ऊपर की पट्टी या डैश पर टैप करें।</string> <string name="bottom_telemetry_send_title">डैशबोर्ड डेटा भेजें</string> <string name="bottom_telemetry_send_auto">ऑटोमैटिक</string> <string name="bottom_telemetry_send_auto_hint">यहां दिए हर गेम के लिए इसे चालू करता है, बाद में मिलने वाले गेम भी शामिल हैं। जिन गेम को आप बंद करते हैं, वे बंद ही रहते हैं।</string> @@ -1860,7 +1853,6 @@ <string name="bottom_telemetry_balance">बैलेंस</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">यहां लाइव डैश देखने के लिए किसी रेसिंग गेम का डेटा आउटपुट (अक्सर टेलीमेट्री या UDP कहलाता है) चालू करें। यह इसी डिवाइस पर रहता है।</string> <string name="bottom_telemetry_unknown_format">पोर्ट %1$d पर डेटा आ रहा है (%3$d बाइट के %2$d पैकेट), लेकिन ऐसे फ़ॉर्मैट में जिसे यह पेज अभी पढ़ नहीं सकता।</string> <string name="bottom_telemetry_port_busy">पोर्ट %1$s को कोई दूसरा प्रोग्राम पहले से इस्तेमाल कर रहा है, इसलिए वह गेम यहां नहीं दिख सकता।</string> @@ -3627,4 +3619,33 @@ <string name="gog_repair_action">फ़ाइलें रिपेयर करें</string> <string name="gog_refresh_action">इंस्टॉलेशन रिफ़्रेश करें</string> <string name="gog_select_patch">चुनें</string> + <string name="stores_gamejolt_not_owned">आपकी Game Jolt लाइब्रेरी में नहीं</string> + <string name="stores_gamejolt_no_build">इस गेम के लिए Windows डाउनलोड नहीं है</string> + <string name="stores_gamejolt_no_exe">डाउनलोड में कोई Windows गेम नहीं मिला</string> + <string name="stores_gamejolt_no_game">यह गेम Game Jolt पर नहीं मिला</string> + <string name="stores_gamejolt_browse_failed">Game Jolt से गेम लोड नहीं हो सके</string> + <string name="stores_gamejolt_download_failed">Game Jolt ने HTTP %1$d लौटाया</string> + <string name="stores_gamejolt_pick_failed">Game Jolt से डाउनलोड लोड नहीं हो सके</string> + <string name="stores_gamejolt_build_open">Game Jolt पर खोलें</string> + <string name="stores_gamejolt_archive">%1$s आर्काइव समर्थित नहीं हैं</string> + <string name="stores_gamejolt_extract_failed">डाउनलोड एक्सट्रैक्ट नहीं हो सका (कोड %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Jolt तक नहीं पहुँचा जा सका</string> + <string name="stores_gamejolt_download_no_link">Game Jolt ने डाउनलोड लिंक नहीं दिया</string> + <string name="stores_gamejolt_section_featured">फ़ीचर्ड</string> + <string name="stores_gamejolt_section_hot">लोकप्रिय</string> + <string name="stores_gamejolt_section_best">सर्वश्रेष्ठ</string> + <string name="stores_gamejolt_section_new">नए</string> + <string name="stores_gamejolt_price_under_30">$30 या उससे कम</string> + <string name="stores_gamejolt_os_other">अन्य</string> + <string name="stores_gamejolt_maturity_everyone">सभी उम्र</string> + <string name="stores_gamejolt_maturity_teen">किशोर</string> + <string name="stores_gamejolt_maturity_adult">वयस्क</string> + <string name="stores_gamejolt_status_complete">पूर्ण</string> + <string name="stores_gamejolt_status_early">अर्ली एक्सेस</string> + <string name="stores_gamejolt_partners">पार्टनर गेम</string> + <string name="stores_gamejolt_filter_browser">ब्राउज़र</string> + <string name="stores_gamejolt_filter_maturity">आयु वर्ग</string> + <string name="stores_gamejolt_filter_status">स्थिति</string> + <string name="stores_gamejolt_filter_partners">पार्टनर</string> + <string name="stores_gamejolt_followed">फ़ॉलो किए गए गेम</string> </resources> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 1224ed1310..8a0a742f55 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Elhalasztja a háttérbeli felfüggesztést, amíg a Steam aktívan letölt.</string> <string name="mode_suspend_note">Az Automatikus szüneteltet a háttérben, és megjelenéskor folytatja. A Manuális megvárja a Folytatást. A Soha mindig futva tartja.</string> <string name="mode_startup">Indítás</string> - <string name="mode_steam_startup">Steam indítása a DroidDeckkel</string> - <string name="mode_steam_startup_hint">Megnyitja a Steam-munkamenetet a DroidDeck indulásakor.</string> + <string name="mode_startup_session">Megnyitás indításkor</string> + <string name="mode_startup_session_hint">A DroidDeck indulásakor elindítja ezt a munkamenetet.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Kiadások keresése…</string> <string name="mode_decky_ready">Készen áll a %1$s telepítésére.</string> @@ -881,13 +881,9 @@ <string name="setup_fullscreen">Teljes képernyő</string> <string name="setup_fullscreen_on">Elrejti az Android állapot- és navigációs sávokat</string> <string name="setup_fullscreen_off">Megjeleníti az Android állapot- és navigációs sávokat</string> - <string name="setup_dual_screen">Két képernyő</string> - <string name="setup_dual_screen_hint">Az Automatikus a beépített második képernyővel rendelkező kézikonzolokon használja a második képernyőt. A Be bármilyen második kijelzőt használ. A Ki mindent egy képernyőn tart.</string> <string name="setup_dual_screen_auto">Automatikus</string> <string name="setup_dual_screen_on">Be</string> <string name="setup_dual_screen_off">Ki</string> - <string name="setup_dual_screen_menu">Menü az alsó képernyőn</string> - <string name="setup_dual_screen_menu_hint">A szakaszokat és a játék közbeni menüt a második képernyőre helyezi, és ott történik a gépelés, így a felső képernyő teljes nézetet kap. Az L2 és R2 vált szakaszt.</string> <string name="setup_dual_screen_controls">Alsó képernyős vezérlők játékokban</string> <string name="setup_dual_screen_controls_hint">Munkamenet indításakor megnyitja az érintőpadot és a billentyűzetet a második képernyőn.</string> <string name="dual_typing_title">Gépelés a felső képernyőre</string> @@ -1802,8 +1798,6 @@ <string name="stats_trace">Gáz és fék, utolsó 10 s</string> <string name="stats_speed_chart">Sebesség, %1$s</string> <string name="stats_gear">Fokozat</string> - <string name="stats_speed_units">Sebesség mértékegysége</string> - <string name="stats_speed_units_auto">Automatikus (%1$s)</string> <string name="stats_steam_client_arm">Steam-kliens ARM</string> <string name="stats_steam_client_x86">Steam-kliens x86</string> <string name="stats_throttle">Gáz</string> @@ -1821,7 +1815,6 @@ <string name="stats_fuel_t">Üzemanyag, t</string> <string name="stats_fuel_main">Fő %1$s t</string> <string name="stats_fuel_reserve">Tartalék %1$s t</string> - <string name="stats_tap_hint">Koppintson a felső sávra vagy a műszerfalra a stílus módosításához.</string> <string name="bottom_telemetry_send_title">Műszerfal-adatok küldése</string> <string name="bottom_telemetry_send_auto">Automatikus</string> <string name="bottom_telemetry_send_auto_hint">Bekapcsolja az itt felsorolt összes játéknál, a később talált játékokat is beleértve. A kikapcsolt játékok kikapcsolva maradnak.</string> @@ -1860,7 +1853,6 @@ <string name="bottom_telemetry_balance">Egyenleg</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Kapcsolja be egy autóversenyes játék adatkimenetét (gyakran telemetria vagy UDP néven szerepel), hogy itt élő műszerfalat lásson. Az adatok ezen az eszközön maradnak.</string> <string name="bottom_telemetry_unknown_format">A(z) %1$d port adatokat fogad (%2$d csomag, egyenként %3$d bájt), de olyan formátumban, amelyet ez az oldal még nem tud olvasni.</string> <string name="bottom_telemetry_port_busy">A(z) %1$s portot már egy másik program használja, ezért az a játék itt nem jeleníthető meg.</string> @@ -3627,4 +3619,33 @@ <string name="gog_repair_action">Fájlok javítása</string> <string name="gog_refresh_action">Telepítés frissítése</string> <string name="gog_select_patch">Kiválasztás</string> + <string name="stores_gamejolt_not_owned">Nincs a Game Jolt-könyvtáradban</string> + <string name="stores_gamejolt_no_build">Ehhez a játékhoz nincs Windows-letöltés</string> + <string name="stores_gamejolt_no_exe">A letöltésben nem található Windows-játék</string> + <string name="stores_gamejolt_no_game">A játék nem található a Game Jolt-on</string> + <string name="stores_gamejolt_browse_failed">Nem sikerült betölteni a játékokat a Game Jolt-ról</string> + <string name="stores_gamejolt_download_failed">A Game Jolt HTTP %1$d választ adott</string> + <string name="stores_gamejolt_pick_failed">A letöltések betöltése a Game Jolt-ról nem sikerült</string> + <string name="stores_gamejolt_build_open">Megnyitás a Game Jolt-on</string> + <string name="stores_gamejolt_archive">A(z) %1$s archívumok nem támogatottak</string> + <string name="stores_gamejolt_extract_failed">A letöltés nem bontható ki (kód: %1$d)</string> + <string name="stores_gamejolt_download_unreachable">A Game Jolt nem érhető el</string> + <string name="stores_gamejolt_download_no_link">A Game Jolt nem adott letöltési hivatkozást</string> + <string name="stores_gamejolt_section_featured">Kiemelt</string> + <string name="stores_gamejolt_section_hot">Népszerű</string> + <string name="stores_gamejolt_section_best">Legjobb</string> + <string name="stores_gamejolt_section_new">Új</string> + <string name="stores_gamejolt_price_under_30">30 $ vagy kevesebb</string> + <string name="stores_gamejolt_os_other">Egyéb</string> + <string name="stores_gamejolt_maturity_everyone">Minden korosztály</string> + <string name="stores_gamejolt_maturity_teen">Tinédzserek</string> + <string name="stores_gamejolt_maturity_adult">Felnőtt</string> + <string name="stores_gamejolt_status_complete">Kész</string> + <string name="stores_gamejolt_status_early">Korai hozzáférés</string> + <string name="stores_gamejolt_partners">Partnerjátékok</string> + <string name="stores_gamejolt_filter_browser">Böngésző</string> + <string name="stores_gamejolt_filter_maturity">Korhatár</string> + <string name="stores_gamejolt_filter_status">Állapot</string> + <string name="stores_gamejolt_filter_partners">Partnerek</string> + <string name="stores_gamejolt_followed">Követett játékok</string> </resources> diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index c8e41d480e..31064ee629 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Menunda penjedaan latar belakang saat Steam sedang aktif mengunduh.</string> <string name="mode_suspend_note">Otomatis menjeda di latar belakang dan melanjutkan saat ditampilkan. Manual menunggu Lanjutkan. Tidak pernah terus berjalan.</string> <string name="mode_startup">Mulai</string> - <string name="mode_steam_startup">Mulai Steam bersama DroidDeck</string> - <string name="mode_steam_startup_hint">Membuka sesi Steam saat DroidDeck diluncurkan.</string> + <string name="mode_startup_session">Buka saat peluncuran</string> + <string name="mode_startup_session_hint">Memulai sesi ini saat DroidDeck diluncurkan.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Memeriksa rilis…</string> <string name="mode_decky_ready">Siap menginstal %1$s.</string> @@ -878,13 +878,9 @@ <string name="setup_fullscreen">Layar penuh</string> <string name="setup_fullscreen_on">Menyembunyikan bilah status dan navigasi Android</string> <string name="setup_fullscreen_off">Menampilkan bilah status dan navigasi Android</string> - <string name="setup_dual_screen">Layar ganda</string> - <string name="setup_dual_screen_hint">Otomatis memakai layar kedua pada perangkat genggam yang memiliki layar bawaan. Aktif memakai layar kedua apa pun. Nonaktif membuat semuanya tetap di satu layar.</string> <string name="setup_dual_screen_auto">Otomatis</string> <string name="setup_dual_screen_on">Aktif</string> <string name="setup_dual_screen_off">Nonaktif</string> - <string name="setup_dual_screen_menu">Menu layar bawah</string> - <string name="setup_dual_screen_menu_hint">Memindahkan bagian dan menu dalam game ke layar kedua dan mengetik di sana, agar layar atas tetap menampilkan tampilan penuh. L2 dan R2 berpindah bagian.</string> <string name="setup_dual_screen_controls">Kontrol layar bawah dalam game</string> <string name="setup_dual_screen_controls_hint">Membuka trackpad dan keyboard di layar kedua saat sesi dimulai.</string> <string name="dual_typing_title">Mengetik untuk layar atas</string> @@ -1780,8 +1776,6 @@ <string name="stats_trace">Gas dan rem, 10 s terakhir</string> <string name="stats_speed_chart">Kecepatan, %1$s</string> <string name="stats_gear">Gigi</string> - <string name="stats_speed_units">Satuan kecepatan</string> - <string name="stats_speed_units_auto">Otomatis (%1$s)</string> <string name="stats_steam_client_arm">Klien Steam ARM</string> <string name="stats_steam_client_x86">Klien Steam x86</string> <string name="stats_throttle">Gas</string> @@ -1799,7 +1793,6 @@ <string name="stats_fuel_t">Bahan bakar, t</string> <string name="stats_fuel_main">Utama %1$s t</string> <string name="stats_fuel_reserve">Cadangan %1$s t</string> - <string name="stats_tap_hint">Ketuk bilah atas atau dasbor untuk mengubah gayanya.</string> <string name="bottom_telemetry_send_title">Kirim data dasbor</string> <string name="bottom_telemetry_send_auto">Otomatis</string> <string name="bottom_telemetry_send_auto_hint">Mengaktifkannya untuk setiap gim yang tercantum di sini, termasuk gim yang ditemukan nanti. Gim yang Anda matikan tetap mati.</string> @@ -1838,7 +1831,6 @@ <string name="bottom_telemetry_balance">Saldo</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Aktifkan keluaran data gim balap (sering disebut telemetri atau UDP) untuk melihat dasbor langsung di sini. Data tetap berada di perangkat ini.</string> <string name="bottom_telemetry_unknown_format">Port %1$d menerima data (%2$d paket berukuran %3$d byte), tetapi dalam format yang belum dapat dibaca halaman ini.</string> <string name="bottom_telemetry_port_busy">Program lain sudah menggunakan port %1$s, jadi gim tersebut tidak dapat ditampilkan di sini.</string> @@ -3599,4 +3591,33 @@ <string name="gog_repair_action">Perbaiki file</string> <string name="gog_refresh_action">Segarkan instalasi</string> <string name="gog_select_patch">Pilih</string> + <string name="stores_gamejolt_not_owned">Tidak ada di pustaka Game Jolt Anda</string> + <string name="stores_gamejolt_no_build">Tidak ada unduhan Windows untuk game ini</string> + <string name="stores_gamejolt_no_exe">Tidak ada game Windows di unduhan</string> + <string name="stores_gamejolt_no_game">Game ini tidak ditemukan di Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Tidak dapat memuat game dari Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt menjawab HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Tidak dapat memuat unduhan dari Game Jolt</string> + <string name="stores_gamejolt_build_open">Buka di Game Jolt</string> + <string name="stores_gamejolt_archive">Arsip %1$s tidak didukung</string> + <string name="stores_gamejolt_extract_failed">Tidak dapat mengekstrak unduhan (kode %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Tidak dapat menghubungi Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt tidak memberikan tautan unduhan</string> + <string name="stores_gamejolt_section_featured">Unggulan</string> + <string name="stores_gamejolt_section_hot">Sedang tren</string> + <string name="stores_gamejolt_section_best">Terbaik</string> + <string name="stores_gamejolt_section_new">Baru</string> + <string name="stores_gamejolt_price_under_30">$30 atau kurang</string> + <string name="stores_gamejolt_os_other">Lainnya</string> + <string name="stores_gamejolt_maturity_everyone">Semua umur</string> + <string name="stores_gamejolt_maturity_teen">Remaja</string> + <string name="stores_gamejolt_maturity_adult">Dewasa</string> + <string name="stores_gamejolt_status_complete">Selesai</string> + <string name="stores_gamejolt_status_early">Akses awal</string> + <string name="stores_gamejolt_partners">Game mitra</string> + <string name="stores_gamejolt_filter_browser">Peramban</string> + <string name="stores_gamejolt_filter_maturity">Klasifikasi usia</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Mitra</string> + <string name="stores_gamejolt_followed">Game yang diikuti</string> </resources> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e5f0ed49a4..d65453a097 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Ritarda la sospensione in background mentre Steam sta scaricando.</string> <string name="mode_suspend_note">Auto mette in pausa in background e riprende quando l\'app torna visibile. Manuale attende Riprendi. Mai lascia tutto in esecuzione.</string> <string name="mode_startup">Avvio</string> - <string name="mode_steam_startup">Avvia Steam con DroidDeck</string> - <string name="mode_steam_startup_hint">Apre la sessione Steam all\'avvio di DroidDeck.</string> + <string name="mode_startup_session">Apri all\'avvio</string> + <string name="mode_startup_session_hint">Avvia questa sessione all\'avvio di DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Ricerca di release…</string> <string name="mode_decky_ready">Pronto per installare %1$s.</string> @@ -876,13 +876,9 @@ <string name="setup_fullscreen">Schermo intero</string> <string name="setup_fullscreen_on">Nasconde la barra di stato e la barra di navigazione di Android</string> <string name="setup_fullscreen_off">Mostra la barra di stato e la barra di navigazione di Android</string> - <string name="setup_dual_screen">Doppio schermo</string> - <string name="setup_dual_screen_hint">Automatico usa il secondo schermo sulle console portatili che ne hanno uno integrato. Attivo usa qualsiasi secondo schermo. Disattivo tiene tutto su un solo schermo.</string> <string name="setup_dual_screen_auto">Automatico</string> <string name="setup_dual_screen_on">Attivo</string> <string name="setup_dual_screen_off">Disattivo</string> - <string name="setup_dual_screen_menu">Menu sullo schermo inferiore</string> - <string name="setup_dual_screen_menu_hint">Sposta le sezioni e il menu di gioco sul secondo schermo e si digita lì, così lo schermo superiore mantiene la vista completa. L2 e R2 cambiano sezione.</string> <string name="setup_dual_screen_controls">Controlli sullo schermo inferiore nei giochi</string> <string name="setup_dual_screen_controls_hint">Apre il trackpad e la tastiera sul secondo schermo all\'avvio di una sessione.</string> <string name="dual_typing_title">Digitazione per lo schermo superiore</string> @@ -1816,8 +1812,6 @@ <string name="stats_trace">Acceleratore e freno, ultimi 10 s</string> <string name="stats_speed_chart">Velocità, %1$s</string> <string name="stats_gear">Marcia</string> - <string name="stats_speed_units">Unità di velocità</string> - <string name="stats_speed_units_auto">Automatico (%1$s)</string> <string name="stats_steam_client_arm">Client Steam ARM</string> <string name="stats_steam_client_x86">Client Steam x86</string> <string name="stats_throttle">Acceleratore</string> @@ -1835,7 +1829,6 @@ <string name="stats_fuel_t">Carburante, t</string> <string name="stats_fuel_main">Principale %1$s t</string> <string name="stats_fuel_reserve">Riserva %1$s t</string> - <string name="stats_tap_hint">Tocca la barra superiore o il cruscotto per cambiarne lo stile.</string> <string name="bottom_telemetry_send_title">Invia dati al cruscotto</string> <string name="bottom_telemetry_send_auto">Automatico</string> <string name="bottom_telemetry_send_auto_hint">Lo attiva per ogni gioco elencato qui, compresi i giochi trovati in seguito. I giochi che disattivi restano disattivati.</string> @@ -1874,7 +1867,6 @@ <string name="bottom_telemetry_balance">Saldo</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Attiva l\'output dati di un gioco di corse (spesso chiamato telemetria o UDP) per vedere qui un cruscotto in tempo reale. I dati restano su questo dispositivo.</string> <string name="bottom_telemetry_unknown_format">La porta %1$d riceve dati (%2$d pacchetti da %3$d byte), ma in un formato che questa pagina non sa ancora leggere.</string> <string name="bottom_telemetry_port_busy">Un altro programma usa già la porta %1$s, quindi quel gioco non può essere mostrato qui.</string> @@ -3664,4 +3656,33 @@ <string name="gog_repair_action">Ripara file</string> <string name="gog_refresh_action">Aggiorna installazione</string> <string name="gog_select_patch">Seleziona</string> + <string name="stores_gamejolt_not_owned">Non è nella tua libreria Game Jolt</string> + <string name="stores_gamejolt_no_build">Nessun download per Windows di questo gioco</string> + <string name="stores_gamejolt_no_exe">Nessun gioco Windows trovato nel download</string> + <string name="stores_gamejolt_no_game">Gioco non trovato su Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Impossibile caricare i giochi da Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt ha risposto HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Impossibile caricare i download da Game Jolt</string> + <string name="stores_gamejolt_build_open">Apri su Game Jolt</string> + <string name="stores_gamejolt_archive">Gli archivi %1$s non sono supportati</string> + <string name="stores_gamejolt_extract_failed">Impossibile estrarre il download (codice %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Impossibile raggiungere Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt non ha fornito un link di download</string> + <string name="stores_gamejolt_section_featured">In evidenza</string> + <string name="stores_gamejolt_section_hot">Di tendenza</string> + <string name="stores_gamejolt_section_best">Migliori</string> + <string name="stores_gamejolt_section_new">Nuovi</string> + <string name="stores_gamejolt_price_under_30">30 $ o meno</string> + <string name="stores_gamejolt_os_other">Altro</string> + <string name="stores_gamejolt_maturity_everyone">Per tutti</string> + <string name="stores_gamejolt_maturity_teen">Adolescenti</string> + <string name="stores_gamejolt_maturity_adult">Adulti</string> + <string name="stores_gamejolt_status_complete">Completo</string> + <string name="stores_gamejolt_status_early">Accesso anticipato</string> + <string name="stores_gamejolt_partners">Giochi dei partner</string> + <string name="stores_gamejolt_filter_browser">Browser</string> + <string name="stores_gamejolt_filter_maturity">Classificazione</string> + <string name="stores_gamejolt_filter_status">Stato</string> + <string name="stores_gamejolt_filter_partners">Partner</string> + <string name="stores_gamejolt_followed">Giochi seguiti</string> </resources> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 0cf7c75de7..b6de8491d0 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Steamがダウンロード中は、バックグラウンドでの一時停止を遅らせます。</string> <string name="mode_suspend_note">自動ではバックグラウンドで一時停止し、表示すると再開します。手動では「再開」をタップするまで待機します。「しない」では実行し続けます。</string> <string name="mode_startup">起動</string> - <string name="mode_steam_startup">DroidDeck起動時にSteamを起動</string> - <string name="mode_steam_startup_hint">DroidDeckの起動時にSteamセッションを開きます。</string> + <string name="mode_startup_session">起動時に開く</string> + <string name="mode_startup_session_hint">DroidDeck の起動時にこのセッションを開始します。</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">リリースを確認中…</string> <string name="mode_decky_ready">%1$sをインストールする準備ができました。</string> @@ -878,13 +878,9 @@ <string name="setup_fullscreen">全画面</string> <string name="setup_fullscreen_on">Androidのステータスバーとナビゲーションバーを非表示</string> <string name="setup_fullscreen_off">Androidのステータスバーとナビゲーションバーを表示</string> - <string name="setup_dual_screen">デュアル画面</string> - <string name="setup_dual_screen_hint">自動では、2画面目を内蔵した携帯機でその画面を使います。オンではどの2画面目でも使います。オフではすべてを1画面に表示します。</string> <string name="setup_dual_screen_auto">自動</string> <string name="setup_dual_screen_on">オン</string> <string name="setup_dual_screen_off">オフ</string> - <string name="setup_dual_screen_menu">下画面メニュー</string> - <string name="setup_dual_screen_menu_hint">セクションとゲーム中のメニューを2画面目に移し、入力もそこで行うため、上画面は全体表示のままになります。L2とR2でセクションを切り替えます。</string> <string name="setup_dual_screen_controls">ゲーム中の下画面コントロール</string> <string name="setup_dual_screen_controls_hint">セッション開始時に2画面目にトラックパッドとキーボードを開きます。</string> <string name="dual_typing_title">上画面に入力中</string> @@ -1780,8 +1776,6 @@ <string name="stats_trace">スロットルとブレーキ(直近10 s)</string> <string name="stats_speed_chart">速度(%1$s)</string> <string name="stats_gear">ギア</string> - <string name="stats_speed_units">速度の単位</string> - <string name="stats_speed_units_auto">自動(%1$s)</string> <string name="stats_steam_client_arm">Steamクライアント ARM</string> <string name="stats_steam_client_x86">Steamクライアント x86</string> <string name="stats_throttle">スロットル</string> @@ -1799,7 +1793,6 @@ <string name="stats_fuel_t">燃料(t)</string> <string name="stats_fuel_main">メイン %1$s t</string> <string name="stats_fuel_reserve">予備 %1$s t</string> - <string name="stats_tap_hint">上部のバーまたはダッシュをタップすると、表示スタイルを変更できます。</string> <string name="bottom_telemetry_send_title">ダッシュボード用データを送信</string> <string name="bottom_telemetry_send_auto">自動</string> <string name="bottom_telemetry_send_auto_hint">ここに表示されているすべてのゲーム(後から見つかったゲームを含む)でオンにします。オフにしたゲームはオフのままです。</string> @@ -1838,7 +1831,6 @@ <string name="bottom_telemetry_balance">残高</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">レースゲームのデータ出力(テレメトリーやUDPと呼ばれることが多い)をオンにすると、ここにライブダッシュが表示されます。データはこのデバイス内にとどまります。</string> <string name="bottom_telemetry_unknown_format">ポート%1$dでデータを受信していますが(%3$dバイトのパケット%2$d個)、このページではまだ読み取れない形式です。</string> <string name="bottom_telemetry_port_busy">別のプログラムがすでにポート%1$sを使用しているため、そのゲームはここに表示できません。</string> @@ -3599,4 +3591,33 @@ <string name="gog_repair_action">ファイルを修復</string> <string name="gog_refresh_action">インストールを更新</string> <string name="gog_select_patch">選択</string> + <string name="stores_gamejolt_not_owned">Game Jolt ライブラリにありません</string> + <string name="stores_gamejolt_no_build">このゲームには Windows 版のダウンロードがありません</string> + <string name="stores_gamejolt_no_exe">ダウンロードに Windows 版のゲームが見つかりません</string> + <string name="stores_gamejolt_no_game">Game Jolt でこのゲームが見つかりませんでした</string> + <string name="stores_gamejolt_browse_failed">Game Jolt のゲームを読み込めませんでした</string> + <string name="stores_gamejolt_download_failed">Game Jolt が HTTP %1$d を返しました</string> + <string name="stores_gamejolt_pick_failed">Game Jolt からダウンロードを読み込めませんでした</string> + <string name="stores_gamejolt_build_open">Game Jolt で開く</string> + <string name="stores_gamejolt_archive">%1$s 形式のアーカイブには対応していません</string> + <string name="stores_gamejolt_extract_failed">ダウンロードを展開できませんでした (終了コード %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Jolt に接続できませんでした</string> + <string name="stores_gamejolt_download_no_link">Game Jolt がダウンロードリンクを提供しませんでした</string> + <string name="stores_gamejolt_section_featured">注目</string> + <string name="stores_gamejolt_section_hot">人気急上昇</string> + <string name="stores_gamejolt_section_best">ベスト</string> + <string name="stores_gamejolt_section_new">新着</string> + <string name="stores_gamejolt_price_under_30">30ドル以下</string> + <string name="stores_gamejolt_os_other">その他</string> + <string name="stores_gamejolt_maturity_everyone">全年齢</string> + <string name="stores_gamejolt_maturity_teen">ティーン</string> + <string name="stores_gamejolt_maturity_adult">成人向け</string> + <string name="stores_gamejolt_status_complete">完成</string> + <string name="stores_gamejolt_status_early">アーリーアクセス</string> + <string name="stores_gamejolt_partners">パートナーのゲーム</string> + <string name="stores_gamejolt_filter_browser">ブラウザ</string> + <string name="stores_gamejolt_filter_maturity">対象年齢</string> + <string name="stores_gamejolt_filter_status">ステータス</string> + <string name="stores_gamejolt_filter_partners">パートナー</string> + <string name="stores_gamejolt_followed">フォロー中のゲーム</string> </resources> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 5bdf2659b7..5179b8a361 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Steam이 다운로드 중일 때는 백그라운드 일시 중지를 미룹니다.</string> <string name="mode_suspend_note">자동: 백그라운드에서 일시 중지되고 다시 표시되면 재개됩니다. 수동: \"재개\"를 탭할 때까지 기다립니다. 안 함: 계속 실행됩니다.</string> <string name="mode_startup">시작</string> - <string name="mode_steam_startup">DroidDeck을 열 때 Steam 시작</string> - <string name="mode_steam_startup_hint">DroidDeck이 시작될 때 Steam 세션을 엽니다.</string> + <string name="mode_startup_session">실행 시 열기</string> + <string name="mode_startup_session_hint">DroidDeck을 실행할 때 이 세션을 시작합니다.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">릴리스 확인 중…</string> <string name="mode_decky_ready">%1$s을(를) 설치할 준비가 되었습니다.</string> @@ -878,13 +878,9 @@ <string name="setup_fullscreen">전체 화면</string> <string name="setup_fullscreen_on">Android 상태 표시줄 및 탐색 표시줄 숨기기</string> <string name="setup_fullscreen_off">Android 상태 표시줄 및 탐색 표시줄 표시</string> - <string name="setup_dual_screen">듀얼 화면</string> - <string name="setup_dual_screen_hint">자동은 두 번째 화면이 내장된 휴대용 기기에서 그 화면을 사용합니다. 켜기는 모든 두 번째 디스플레이를 사용합니다. 끄기는 모든 것을 한 화면에 둡니다.</string> <string name="setup_dual_screen_auto">자동</string> <string name="setup_dual_screen_on">켜기</string> <string name="setup_dual_screen_off">끄기</string> - <string name="setup_dual_screen_menu">하단 화면 메뉴</string> - <string name="setup_dual_screen_menu_hint">섹션과 게임 중 메뉴를 두 번째 화면으로 옮기고 입력도 그곳에서 하므로 상단 화면은 전체 보기를 유지합니다. L2와 R2로 섹션을 전환합니다.</string> <string name="setup_dual_screen_controls">게임 중 하단 화면 컨트롤</string> <string name="setup_dual_screen_controls_hint">세션이 시작되면 두 번째 화면에 트랙패드와 키보드를 엽니다.</string> <string name="dual_typing_title">상단 화면에 입력 중</string> @@ -1780,8 +1776,6 @@ <string name="stats_trace">스로틀 및 브레이크, 최근 10 s</string> <string name="stats_speed_chart">속도, %1$s</string> <string name="stats_gear">기어</string> - <string name="stats_speed_units">속도 단위</string> - <string name="stats_speed_units_auto">자동(%1$s)</string> <string name="stats_steam_client_arm">Steam 클라이언트 ARM</string> <string name="stats_steam_client_x86">Steam 클라이언트 x86</string> <string name="stats_throttle">스로틀</string> @@ -1799,7 +1793,6 @@ <string name="stats_fuel_t">연료, t</string> <string name="stats_fuel_main">메인 %1$s t</string> <string name="stats_fuel_reserve">예비 %1$s t</string> - <string name="stats_tap_hint">상단 막대나 계기판을 탭하면 스타일이 바뀝니다.</string> <string name="bottom_telemetry_send_title">계기판 데이터 보내기</string> <string name="bottom_telemetry_send_auto">자동</string> <string name="bottom_telemetry_send_auto_hint">나중에 발견된 게임을 포함해 여기에 나열된 모든 게임에서 켭니다. 직접 끈 게임은 꺼진 상태로 유지됩니다.</string> @@ -1838,7 +1831,6 @@ <string name="bottom_telemetry_balance">잔액</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">레이싱 게임의 데이터 출력(흔히 텔레메트리 또는 UDP라고 함)을 켜면 여기에서 실시간 계기판을 볼 수 있습니다. 데이터는 이 기기에만 남습니다.</string> <string name="bottom_telemetry_unknown_format">포트 %1$d에서 데이터를 받고 있지만(%3$d바이트 패킷 %2$d개), 이 페이지가 아직 읽을 수 없는 형식입니다.</string> <string name="bottom_telemetry_port_busy">다른 프로그램이 이미 포트 %1$s을(를) 사용하고 있어 해당 게임을 여기에 표시할 수 없습니다.</string> @@ -3599,4 +3591,33 @@ <string name="gog_repair_action">파일 복구</string> <string name="gog_refresh_action">설치 새로 고침</string> <string name="gog_select_patch">선택</string> + <string name="stores_gamejolt_not_owned">Game Jolt 라이브러리에 없습니다</string> + <string name="stores_gamejolt_no_build">이 게임의 Windows 다운로드가 없습니다</string> + <string name="stores_gamejolt_no_exe">다운로드에서 Windows 게임을 찾을 수 없습니다</string> + <string name="stores_gamejolt_no_game">Game Jolt에서 이 게임을 찾을 수 없습니다</string> + <string name="stores_gamejolt_browse_failed">Game Jolt에서 게임을 불러오지 못했습니다</string> + <string name="stores_gamejolt_download_failed">Game Jolt가 HTTP %1$d을(를) 반환했습니다</string> + <string name="stores_gamejolt_pick_failed">Game Jolt에서 다운로드를 불러오지 못했습니다</string> + <string name="stores_gamejolt_build_open">Game Jolt에서 열기</string> + <string name="stores_gamejolt_archive">%1$s 압축 파일은 지원하지 않습니다</string> + <string name="stores_gamejolt_extract_failed">다운로드한 파일의 압축을 풀 수 없습니다(코드 %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Jolt에 연결할 수 없습니다</string> + <string name="stores_gamejolt_download_no_link">Game Jolt에서 다운로드 링크를 제공하지 않았습니다</string> + <string name="stores_gamejolt_section_featured">추천</string> + <string name="stores_gamejolt_section_hot">인기</string> + <string name="stores_gamejolt_section_best">베스트</string> + <string name="stores_gamejolt_section_new">신규</string> + <string name="stores_gamejolt_price_under_30">$30 이하</string> + <string name="stores_gamejolt_os_other">기타</string> + <string name="stores_gamejolt_maturity_everyone">전체 이용가</string> + <string name="stores_gamejolt_maturity_teen">청소년</string> + <string name="stores_gamejolt_maturity_adult">성인</string> + <string name="stores_gamejolt_status_complete">완성</string> + <string name="stores_gamejolt_status_early">앞서 해보기</string> + <string name="stores_gamejolt_partners">파트너 게임</string> + <string name="stores_gamejolt_filter_browser">브라우저</string> + <string name="stores_gamejolt_filter_maturity">연령 등급</string> + <string name="stores_gamejolt_filter_status">상태</string> + <string name="stores_gamejolt_filter_partners">파트너</string> + <string name="stores_gamejolt_followed">팔로우한 게임</string> </resources> diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 988031cfb8..8da0845006 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Lambatkan penjedaan latar belakang semasa Steam aktif memuat turun.</string> <string name="mode_suspend_note">Auto menjeda di latar belakang dan menyambung semula apabila dipaparkan. Manual menunggu Sambung. Jangan sekali-kali terus berjalan.</string> <string name="mode_startup">Permulaan</string> - <string name="mode_steam_startup">Mulakan Steam bersama DroidDeck</string> - <string name="mode_steam_startup_hint">Membuka sesi Steam apabila DroidDeck dilancarkan.</string> + <string name="mode_startup_session">Buka semasa pelancaran</string> + <string name="mode_startup_session_hint">Memulakan sesi ini apabila DroidDeck dilancarkan.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Menyemak keluaran…</string> <string name="mode_decky_ready">Sedia untuk memasang %1$s.</string> @@ -878,13 +878,9 @@ <string name="setup_fullscreen">Skrin penuh</string> <string name="setup_fullscreen_on">Menyembunyikan bar status dan navigasi Android</string> <string name="setup_fullscreen_off">Memaparkan bar status dan navigasi Android</string> - <string name="setup_dual_screen">Dwi skrin</string> - <string name="setup_dual_screen_hint">Automatik menggunakan skrin kedua pada peranti pegang tangan yang mempunyai skrin terbina dalam. Hidup menggunakan sebarang paparan kedua. Mati mengekalkan semuanya pada satu skrin.</string> <string name="setup_dual_screen_auto">Automatik</string> <string name="setup_dual_screen_on">Hidup</string> <string name="setup_dual_screen_off">Mati</string> - <string name="setup_dual_screen_menu">Menu skrin bawah</string> - <string name="setup_dual_screen_menu_hint">Memindahkan bahagian dan menu dalam permainan ke skrin kedua dan menaip di sana, supaya skrin atas kekal dengan paparan penuh. L2 dan R2 menukar bahagian.</string> <string name="setup_dual_screen_controls">Kawalan skrin bawah dalam permainan</string> <string name="setup_dual_screen_controls_hint">Membuka pad jejak dan papan kekunci pada skrin kedua apabila sesi bermula.</string> <string name="dual_typing_title">Menaip untuk skrin atas</string> @@ -1780,8 +1776,6 @@ <string name="stats_trace">Pendikit dan brek, 10 s terakhir</string> <string name="stats_speed_chart">Kelajuan, %1$s</string> <string name="stats_gear">Gear</string> - <string name="stats_speed_units">Unit kelajuan</string> - <string name="stats_speed_units_auto">Automatik (%1$s)</string> <string name="stats_steam_client_arm">Klien Steam ARM</string> <string name="stats_steam_client_x86">Klien Steam x86</string> <string name="stats_throttle">Pendikit</string> @@ -1799,7 +1793,6 @@ <string name="stats_fuel_t">Bahan api, t</string> <string name="stats_fuel_main">Utama %1$s t</string> <string name="stats_fuel_reserve">Simpanan %1$s t</string> - <string name="stats_tap_hint">Ketik jalur atas atau papan pemuka untuk menukar gayanya.</string> <string name="bottom_telemetry_send_title">Hantar data papan pemuka</string> <string name="bottom_telemetry_send_auto">Automatik</string> <string name="bottom_telemetry_send_auto_hint">Menghidupkannya untuk setiap permainan yang disenaraikan di sini, termasuk permainan yang ditemui kemudian. Permainan yang anda matikan kekal mati.</string> @@ -1838,7 +1831,6 @@ <string name="bottom_telemetry_balance">Baki</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Hidupkan output data permainan lumba (sering dipanggil telemetri atau UDP) untuk melihat papan pemuka langsung di sini. Data kekal pada peranti ini.</string> <string name="bottom_telemetry_unknown_format">Port %1$d menerima data (%2$d paket bersaiz %3$d bait), tetapi dalam format yang belum dapat dibaca oleh halaman ini.</string> <string name="bottom_telemetry_port_busy">Program lain sudah menggunakan port %1$s, jadi permainan itu tidak dapat dipaparkan di sini.</string> @@ -3599,4 +3591,33 @@ <string name="gog_repair_action">Baik pulih fail</string> <string name="gog_refresh_action">Segar semula pemasangan</string> <string name="gog_select_patch">Pilih</string> + <string name="stores_gamejolt_not_owned">Tiada dalam pustaka Game Jolt anda</string> + <string name="stores_gamejolt_no_build">Tiada muat turun Windows untuk permainan ini</string> + <string name="stores_gamejolt_no_exe">Tiada permainan Windows ditemui dalam muat turun</string> + <string name="stores_gamejolt_no_game">Permainan ini tidak ditemui di Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Tidak dapat memuatkan permainan daripada Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt menjawab HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Tidak dapat memuatkan muat turun daripada Game Jolt</string> + <string name="stores_gamejolt_build_open">Buka di Game Jolt</string> + <string name="stores_gamejolt_archive">Arkib %1$s tidak disokong</string> + <string name="stores_gamejolt_extract_failed">Tidak dapat mengekstrak muat turun (kod %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Tidak dapat menghubungi Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt tidak memberikan pautan muat turun</string> + <string name="stores_gamejolt_section_featured">Pilihan</string> + <string name="stores_gamejolt_section_hot">Hangat</string> + <string name="stores_gamejolt_section_best">Terbaik</string> + <string name="stores_gamejolt_section_new">Baharu</string> + <string name="stores_gamejolt_price_under_30">$30 atau kurang</string> + <string name="stores_gamejolt_os_other">Lain-lain</string> + <string name="stores_gamejolt_maturity_everyone">Semua peringkat umur</string> + <string name="stores_gamejolt_maturity_teen">Remaja</string> + <string name="stores_gamejolt_maturity_adult">Dewasa</string> + <string name="stores_gamejolt_status_complete">Siap</string> + <string name="stores_gamejolt_status_early">Akses awal</string> + <string name="stores_gamejolt_partners">Permainan rakan kongsi</string> + <string name="stores_gamejolt_filter_browser">Pelayar</string> + <string name="stores_gamejolt_filter_maturity">Kematangan</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Rakan kongsi</string> + <string name="stores_gamejolt_followed">Permainan diikuti</string> </resources> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index da78e7d854..62207f520d 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Utsetter bakgrunnspause mens Steam laster aktivt ned.</string> <string name="mode_suspend_note">Auto setter på pause i bakgrunnen og gjenopptar når den vises. Manuell venter på Gjenoppta. Aldri lar den fortsette å kjøre.</string> <string name="mode_startup">Oppstart</string> - <string name="mode_steam_startup">Start Steam med DroidDeck</string> - <string name="mode_steam_startup_hint">Åpner Steam-sesjonen når DroidDeck starter.</string> + <string name="mode_startup_session">Åpne ved oppstart</string> + <string name="mode_startup_session_hint">Starter denne økten når DroidDeck starter.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Ser etter utgivelser…</string> <string name="mode_decky_ready">Klar til å installere %1$s.</string> @@ -881,13 +881,9 @@ <string name="setup_fullscreen">Fullskjerm</string> <string name="setup_fullscreen_on">Skjuler Androids status- og navigasjonslinjer</string> <string name="setup_fullscreen_off">Viser Androids status- og navigasjonslinjer</string> - <string name="setup_dual_screen">Dobbel skjerm</string> - <string name="setup_dual_screen_hint">Automatisk bruker den andre skjermen på håndholdte enheter med innebygd skjerm. På bruker enhver annen skjerm. Av holder alt på én skjerm.</string> <string name="setup_dual_screen_auto">Automatisk</string> <string name="setup_dual_screen_on">På</string> <string name="setup_dual_screen_off">Av</string> - <string name="setup_dual_screen_menu">Meny på nederste skjerm</string> - <string name="setup_dual_screen_menu_hint">Flytter seksjonene og menyen i spillet til den andre skjermen og skriver der, så den øverste skjermen beholder hele visningen. L2 og R2 bytter seksjon.</string> <string name="setup_dual_screen_controls">Kontroller på nederste skjerm i spill</string> <string name="setup_dual_screen_controls_hint">Åpner styreflaten og tastaturet på den andre skjermen når en økt starter.</string> <string name="dual_typing_title">Skriver for den øverste skjermen</string> @@ -1802,8 +1798,6 @@ <string name="stats_trace">Gass og brems, siste 10 s</string> <string name="stats_speed_chart">Fart, %1$s</string> <string name="stats_gear">Gir</string> - <string name="stats_speed_units">Fartsenheter</string> - <string name="stats_speed_units_auto">Automatisk (%1$s)</string> <string name="stats_steam_client_arm">Steam-klient ARM</string> <string name="stats_steam_client_x86">Steam-klient x86</string> <string name="stats_throttle">Gass</string> @@ -1821,7 +1815,6 @@ <string name="stats_fuel_t">Drivstoff, t</string> <string name="stats_fuel_main">Hoved %1$s t</string> <string name="stats_fuel_reserve">Reserve %1$s t</string> - <string name="stats_tap_hint">Trykk på den øverste stripen eller dashbordet for å endre stilen.</string> <string name="bottom_telemetry_send_title">Send dashborddata</string> <string name="bottom_telemetry_send_auto">Automatisk</string> <string name="bottom_telemetry_send_auto_hint">Slår det på for alle spill som er oppført her, også spill som blir funnet senere. Spill du slår av, forblir av.</string> @@ -1860,7 +1853,6 @@ <string name="bottom_telemetry_balance">Saldo</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Slå på datautgangen i et racingspill (ofte kalt telemetri eller UDP) for å se et direkte dashbord her. Dataene blir på denne enheten.</string> <string name="bottom_telemetry_unknown_format">Port %1$d mottar data (%2$d pakker på %3$d byte), men i et format denne siden ikke kan lese ennå.</string> <string name="bottom_telemetry_port_busy">Et annet program bruker allerede port %1$s, så det spillet kan ikke vises her.</string> @@ -3627,4 +3619,33 @@ <string name="gog_repair_action">Reparer filer</string> <string name="gog_refresh_action">Oppdater installasjonen</string> <string name="gog_select_patch">Velg</string> + <string name="stores_gamejolt_not_owned">Ikke i Game Jolt-biblioteket ditt</string> + <string name="stores_gamejolt_no_build">Ingen Windows-nedlasting for dette spillet</string> + <string name="stores_gamejolt_no_exe">Fant ikke noe Windows-spill i nedlastingen</string> + <string name="stores_gamejolt_no_game">Fant ikke dette spillet på Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Kunne ikke laste spill fra Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt svarte HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Kunne ikke laste inn nedlastingene fra Game Jolt</string> + <string name="stores_gamejolt_build_open">Åpne på Game Jolt</string> + <string name="stores_gamejolt_archive">%1$s-arkiver støttes ikke</string> + <string name="stores_gamejolt_extract_failed">Kunne ikke pakke ut nedlastingen (kode %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Kunne ikke nå Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt ga ingen nedlastingslenke</string> + <string name="stores_gamejolt_section_featured">Fremhevet</string> + <string name="stores_gamejolt_section_hot">Populære</string> + <string name="stores_gamejolt_section_best">Beste</string> + <string name="stores_gamejolt_section_new">Nye</string> + <string name="stores_gamejolt_price_under_30">$30 eller mindre</string> + <string name="stores_gamejolt_os_other">Annet</string> + <string name="stores_gamejolt_maturity_everyone">Alle aldre</string> + <string name="stores_gamejolt_maturity_teen">Tenåringer</string> + <string name="stores_gamejolt_maturity_adult">Voksne</string> + <string name="stores_gamejolt_status_complete">Ferdig</string> + <string name="stores_gamejolt_status_early">Early access</string> + <string name="stores_gamejolt_partners">Partnerspill</string> + <string name="stores_gamejolt_filter_browser">Nettleser</string> + <string name="stores_gamejolt_filter_maturity">Aldersgrense</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Partnere</string> + <string name="stores_gamejolt_followed">Fulgte spill</string> </resources> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 21fb36981b..7fc8cd9229 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Stel onderbreken op de achtergrond uit zolang Steam actief downloadt.</string> <string name="mode_suspend_note">Automatisch pauzeert op de achtergrond en hervat zodra de app weer zichtbaar is. Handmatig wacht op Hervatten. Nooit laat alles doorlopen.</string> <string name="mode_startup">Opstarten</string> - <string name="mode_steam_startup">Steam starten met DroidDeck</string> - <string name="mode_steam_startup_hint">Opent de Steam-sessie als DroidDeck start.</string> + <string name="mode_startup_session">Openen bij start</string> + <string name="mode_startup_session_hint">Start deze sessie wanneer DroidDeck start.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Zoeken naar releases…</string> <string name="mode_decky_ready">Klaar om %1$s te installeren.</string> @@ -881,13 +881,9 @@ <string name="setup_fullscreen">Volledig scherm</string> <string name="setup_fullscreen_on">Verbergt de statusbalk en navigatiebalk van Android</string> <string name="setup_fullscreen_off">Toont de statusbalk en navigatiebalk van Android</string> - <string name="setup_dual_screen">Dubbel scherm</string> - <string name="setup_dual_screen_hint">Automatisch gebruikt het tweede scherm op handhelds met een ingebouwd scherm. Aan gebruikt elk tweede scherm. Uit houdt alles op één scherm.</string> <string name="setup_dual_screen_auto">Automatisch</string> <string name="setup_dual_screen_on">Aan</string> <string name="setup_dual_screen_off">Uit</string> - <string name="setup_dual_screen_menu">Menu op het onderste scherm</string> - <string name="setup_dual_screen_menu_hint">Verplaatst de onderdelen en het menu in het spel naar het tweede scherm en typt daar, zodat het bovenste scherm het volledige beeld houdt. L2 en R2 wisselen van onderdeel.</string> <string name="setup_dual_screen_controls">Bediening op het onderste scherm in games</string> <string name="setup_dual_screen_controls_hint">Opent het trackpad en toetsenbord op het tweede scherm wanneer een sessie start.</string> <string name="dual_typing_title">Typen voor het bovenste scherm</string> @@ -1802,8 +1798,6 @@ <string name="stats_trace">Gas en rem, laatste 10 s</string> <string name="stats_speed_chart">Snelheid, %1$s</string> <string name="stats_gear">Versnelling</string> - <string name="stats_speed_units">Snelheidseenheid</string> - <string name="stats_speed_units_auto">Automatisch (%1$s)</string> <string name="stats_steam_client_arm">Steam-client ARM</string> <string name="stats_steam_client_x86">Steam-client x86</string> <string name="stats_throttle">Gas</string> @@ -1821,7 +1815,6 @@ <string name="stats_fuel_t">Brandstof, t</string> <string name="stats_fuel_main">Hoofdtank %1$s t</string> <string name="stats_fuel_reserve">Reserve %1$s t</string> - <string name="stats_tap_hint">Tik op de bovenste balk of het dashboard om de stijl te wijzigen.</string> <string name="bottom_telemetry_send_title">Dashboardgegevens verzenden</string> <string name="bottom_telemetry_send_auto">Automatisch</string> <string name="bottom_telemetry_send_auto_hint">Zet het aan voor elke game in deze lijst, ook voor games die later worden gevonden. Games die je uitzet, blijven uit.</string> @@ -1860,7 +1853,6 @@ <string name="bottom_telemetry_balance">Saldo</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Zet de gegevensuitvoer van een racegame aan (vaak telemetrie of UDP genoemd) om hier een live dashboard te zien. De gegevens blijven op dit apparaat.</string> <string name="bottom_telemetry_unknown_format">Poort %1$d ontvangt gegevens (%2$d pakketten van %3$d bytes), maar in een formaat dat deze pagina nog niet kan lezen.</string> <string name="bottom_telemetry_port_busy">Een ander programma gebruikt poort %1$s al, dus die game kan hier niet worden getoond.</string> @@ -3627,4 +3619,33 @@ <string name="gog_repair_action">Bestanden repareren</string> <string name="gog_refresh_action">Installatie vernieuwen</string> <string name="gog_select_patch">Kiezen</string> + <string name="stores_gamejolt_not_owned">Niet in je Game Jolt-bibliotheek</string> + <string name="stores_gamejolt_no_build">Geen Windows-download voor dit spel</string> + <string name="stores_gamejolt_no_exe">Geen Windows-game gevonden in de download</string> + <string name="stores_gamejolt_no_game">Deze game is niet gevonden op Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Games van Game Jolt konden niet worden geladen</string> + <string name="stores_gamejolt_download_failed">Game Jolt antwoordde HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">De downloads van Game Jolt konden niet worden geladen</string> + <string name="stores_gamejolt_build_open">Openen op Game Jolt</string> + <string name="stores_gamejolt_archive">%1$s-archieven worden niet ondersteund</string> + <string name="stores_gamejolt_extract_failed">Download kan niet worden uitgepakt (code %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Jolt is niet bereikbaar</string> + <string name="stores_gamejolt_download_no_link">Game Jolt gaf geen downloadlink</string> + <string name="stores_gamejolt_section_featured">Uitgelicht</string> + <string name="stores_gamejolt_section_hot">Populair</string> + <string name="stores_gamejolt_section_best">Beste</string> + <string name="stores_gamejolt_section_new">Nieuw</string> + <string name="stores_gamejolt_price_under_30">$30 of minder</string> + <string name="stores_gamejolt_os_other">Overig</string> + <string name="stores_gamejolt_maturity_everyone">Alle leeftijden</string> + <string name="stores_gamejolt_maturity_teen">Tieners</string> + <string name="stores_gamejolt_maturity_adult">Volwassenen</string> + <string name="stores_gamejolt_status_complete">Voltooid</string> + <string name="stores_gamejolt_status_early">Early access</string> + <string name="stores_gamejolt_partners">Partnerspellen</string> + <string name="stores_gamejolt_filter_browser">Browser</string> + <string name="stores_gamejolt_filter_maturity">Leeftijdsklasse</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Partners</string> + <string name="stores_gamejolt_followed">Gevolgde games</string> </resources> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 7f4b1e343b..56f9e0d1f2 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Opóźnia wstrzymanie w tle, gdy Steam aktywnie pobiera.</string> <string name="mode_suspend_note">„Auto” wstrzymuje w tle i wznawia po powrocie. „Ręcznie” czeka na „Wznów”. „Nigdy” nie przerywa działania.</string> <string name="mode_startup">Uruchamianie</string> - <string name="mode_steam_startup">Uruchamiaj Steam z DroidDeck</string> - <string name="mode_steam_startup_hint">Otwiera sesję Steam przy uruchomieniu DroidDeck.</string> + <string name="mode_startup_session">Otwórz przy uruchomieniu</string> + <string name="mode_startup_session_hint">Uruchamia tę sesję po uruchomieniu DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Sprawdzanie wydań…</string> <string name="mode_decky_ready">Gotowe do instalacji: %1$s.</string> @@ -887,13 +887,9 @@ <string name="setup_fullscreen">Pełny ekran</string> <string name="setup_fullscreen_on">Ukrywa systemowe paski stanu i nawigacji</string> <string name="setup_fullscreen_off">Pokazuje systemowe paski stanu i nawigacji</string> - <string name="setup_dual_screen">Dwa ekrany</string> - <string name="setup_dual_screen_hint">Automatycznie używa drugiego ekranu w urządzeniach przenośnych, które mają go wbudowanego. Włączone używa dowolnego drugiego wyświetlacza. Wyłączone zostawia wszystko na jednym ekranie.</string> <string name="setup_dual_screen_auto">Automatycznie</string> <string name="setup_dual_screen_on">Włączone</string> <string name="setup_dual_screen_off">Wyłączone</string> - <string name="setup_dual_screen_menu">Menu na dolnym ekranie</string> - <string name="setup_dual_screen_menu_hint">Przenosi sekcje i menu w grze na drugi ekran i tam odbywa się pisanie, dzięki czemu górny ekran zachowuje pełny widok. L2 i R2 przełączają sekcje.</string> <string name="setup_dual_screen_controls">Sterowanie na dolnym ekranie w grach</string> <string name="setup_dual_screen_controls_hint">Otwiera gładzik i klawiaturę na drugim ekranie po rozpoczęciu sesji.</string> <string name="dual_typing_title">Pisanie dla górnego ekranu</string> @@ -1846,8 +1842,6 @@ <string name="stats_trace">Gaz i hamulec, ostatnie 10 s</string> <string name="stats_speed_chart">Prędkość, %1$s</string> <string name="stats_gear">Bieg</string> - <string name="stats_speed_units">Jednostki prędkości</string> - <string name="stats_speed_units_auto">Automatycznie (%1$s)</string> <string name="stats_steam_client_arm">Klient Steam ARM</string> <string name="stats_steam_client_x86">Klient Steam x86</string> <string name="stats_throttle">Gaz</string> @@ -1865,7 +1859,6 @@ <string name="stats_fuel_t">Paliwo, t</string> <string name="stats_fuel_main">Główne %1$s t</string> <string name="stats_fuel_reserve">Rezerwa %1$s t</string> - <string name="stats_tap_hint">Dotknij górnego paska lub zegarów, aby zmienić ich wygląd.</string> <string name="bottom_telemetry_send_title">Wysyłaj dane do panelu</string> <string name="bottom_telemetry_send_auto">Automatycznie</string> <string name="bottom_telemetry_send_auto_hint">Włącza wysyłanie dla każdej gry z tej listy, także dla gier znalezionych później. Gry, które wyłączysz, pozostaną wyłączone.</string> @@ -1904,7 +1897,6 @@ <string name="bottom_telemetry_balance">Saldo</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Włącz wyjście danych w grze wyścigowej (często nazywane telemetrią lub UDP), aby zobaczyć tu zegary na żywo. Dane nie opuszczają tego urządzenia.</string> <string name="bottom_telemetry_unknown_format">Port %1$d odbiera dane (%2$d pakietów po %3$d bajtów), ale w formacie, którego ta strona jeszcze nie odczytuje.</string> <string name="bottom_telemetry_port_busy">Port %1$s jest już używany przez inny program, więc tej gry nie da się tu pokazać.</string> @@ -3701,4 +3693,33 @@ <string name="gog_repair_action">Napraw pliki</string> <string name="gog_refresh_action">Odśwież instalację</string> <string name="gog_select_patch">Wybierz</string> + <string name="stores_gamejolt_not_owned">Nie ma go w Twojej bibliotece Game Jolt</string> + <string name="stores_gamejolt_no_build">Brak wersji na Windows dla tej gry</string> + <string name="stores_gamejolt_no_exe">W pobranych plikach nie znaleziono gry na Windows</string> + <string name="stores_gamejolt_no_game">Nie znaleziono tej gry w Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Nie udało się wczytać gier z Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt odpowiedziało HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Nie udało się wczytać plików z Game Jolt</string> + <string name="stores_gamejolt_build_open">Otwórz w Game Jolt</string> + <string name="stores_gamejolt_archive">Archiwa %1$s nie są obsługiwane</string> + <string name="stores_gamejolt_extract_failed">Nie można rozpakować pobranego pliku (kod %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Nie można połączyć się z Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt nie podał linku do pobrania</string> + <string name="stores_gamejolt_section_featured">Polecane</string> + <string name="stores_gamejolt_section_hot">Na czasie</string> + <string name="stores_gamejolt_section_best">Najlepsze</string> + <string name="stores_gamejolt_section_new">Nowe</string> + <string name="stores_gamejolt_price_under_30">30 $ lub mniej</string> + <string name="stores_gamejolt_os_other">Inne</string> + <string name="stores_gamejolt_maturity_everyone">Dla wszystkich</string> + <string name="stores_gamejolt_maturity_teen">Nastolatki</string> + <string name="stores_gamejolt_maturity_adult">Dla dorosłych</string> + <string name="stores_gamejolt_status_complete">Ukończone</string> + <string name="stores_gamejolt_status_early">Wczesny dostęp</string> + <string name="stores_gamejolt_partners">Gry partnerów</string> + <string name="stores_gamejolt_filter_browser">Przeglądarka</string> + <string name="stores_gamejolt_filter_maturity">Kategoria wiekowa</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Partnerzy</string> + <string name="stores_gamejolt_followed">Obserwowane gry</string> </resources> diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 43971b011a..ff09a5aad6 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Adia a suspensão em segundo plano enquanto o Steam está a transferir.</string> <string name="mode_suspend_note">Automático: pausa em segundo plano e retoma ao voltar a ser apresentada. Manual: aguarda por Retomar. Nunca: continua em execução.</string> <string name="mode_startup">Arranque</string> - <string name="mode_steam_startup">Iniciar o Steam com o DroidDeck</string> - <string name="mode_steam_startup_hint">Abre a sessão do Steam quando o DroidDeck é iniciado.</string> + <string name="mode_startup_session">Abrir ao iniciar</string> + <string name="mode_startup_session_hint">Inicia esta sessão quando o DroidDeck é aberto.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">A procurar versões…</string> <string name="mode_decky_ready">Pronto para instalar %1$s.</string> @@ -876,13 +876,9 @@ <string name="setup_fullscreen">Ecrã inteiro</string> <string name="setup_fullscreen_on">Oculta as barras de estado e de navegação do Android</string> <string name="setup_fullscreen_off">Mostra as barras de estado e de navegação do Android</string> - <string name="setup_dual_screen">Ecrã duplo</string> - <string name="setup_dual_screen_hint">Automático usa o segundo ecrã em consolas portáteis com ecrã secundário integrado. Ativado usa qualquer segundo ecrã. Desativado mantém tudo num só ecrã.</string> <string name="setup_dual_screen_auto">Automático</string> <string name="setup_dual_screen_on">Ativado</string> <string name="setup_dual_screen_off">Desativado</string> - <string name="setup_dual_screen_menu">Menu no ecrã inferior</string> - <string name="setup_dual_screen_menu_hint">Move as secções e o menu do jogo para o segundo ecrã e a escrita é feita lá, para que o ecrã superior mantenha a vista completa. L2 e R2 mudam de secção.</string> <string name="setup_dual_screen_controls">Controlos no ecrã inferior nos jogos</string> <string name="setup_dual_screen_controls_hint">Abre o trackpad e o teclado no segundo ecrã quando uma sessão começa.</string> <string name="dual_typing_title">A escrever para o ecrã superior</string> @@ -1816,8 +1812,6 @@ <string name="stats_trace">Acelerador e travão, últimos 10 s</string> <string name="stats_speed_chart">Velocidade, %1$s</string> <string name="stats_gear">Mudança</string> - <string name="stats_speed_units">Unidade de velocidade</string> - <string name="stats_speed_units_auto">Automático (%1$s)</string> <string name="stats_steam_client_arm">Cliente Steam ARM</string> <string name="stats_steam_client_x86">Cliente Steam x86</string> <string name="stats_throttle">Acelerador</string> @@ -1835,7 +1829,6 @@ <string name="stats_fuel_t">Combustível, t</string> <string name="stats_fuel_main">Principal %1$s t</string> <string name="stats_fuel_reserve">Reserva %1$s t</string> - <string name="stats_tap_hint">Toque na faixa superior ou no painel para alterar o estilo.</string> <string name="bottom_telemetry_send_title">Enviar dados para o painel</string> <string name="bottom_telemetry_send_auto">Automático</string> <string name="bottom_telemetry_send_auto_hint">Ativa para todos os jogos aqui listados, incluindo os encontrados mais tarde. Os jogos que desativar permanecem desativados.</string> @@ -1874,7 +1867,6 @@ <string name="bottom_telemetry_balance">Saldo</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Ative a saída de dados de um jogo de corridas (muitas vezes chamada telemetria ou UDP) para ver aqui um painel em direto. Os dados ficam neste dispositivo.</string> <string name="bottom_telemetry_unknown_format">A porta %1$d está a receber dados (%2$d pacotes de %3$d bytes), mas num formato que esta página ainda não consegue ler.</string> <string name="bottom_telemetry_port_busy">Outro programa já utiliza a porta %1$s, por isso esse jogo não pode aparecer aqui.</string> @@ -3664,4 +3656,33 @@ <string name="gog_repair_action">Reparar ficheiros</string> <string name="gog_refresh_action">Renovar instalação</string> <string name="gog_select_patch">Selecionar</string> + <string name="stores_gamejolt_not_owned">Não está na sua biblioteca do Game Jolt</string> + <string name="stores_gamejolt_no_build">Sem transferência para Windows deste jogo</string> + <string name="stores_gamejolt_no_exe">Não foi encontrado nenhum jogo para Windows na transferência</string> + <string name="stores_gamejolt_no_game">Não foi possível encontrar este jogo no Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Não foi possível carregar os jogos do Game Jolt</string> + <string name="stores_gamejolt_download_failed">O Game Jolt respondeu HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Não foi possível carregar as transferências do Game Jolt</string> + <string name="stores_gamejolt_build_open">Abrir no Game Jolt</string> + <string name="stores_gamejolt_archive">Ficheiros %1$s não são suportados</string> + <string name="stores_gamejolt_extract_failed">Não foi possível extrair a transferência (código %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Não foi possível aceder ao Game Jolt</string> + <string name="stores_gamejolt_download_no_link">O Game Jolt não forneceu uma ligação de transferência</string> + <string name="stores_gamejolt_section_featured">Em destaque</string> + <string name="stores_gamejolt_section_hot">Em alta</string> + <string name="stores_gamejolt_section_best">Melhores</string> + <string name="stores_gamejolt_section_new">Novos</string> + <string name="stores_gamejolt_price_under_30">30 $ ou menos</string> + <string name="stores_gamejolt_os_other">Outros</string> + <string name="stores_gamejolt_maturity_everyone">Todas as idades</string> + <string name="stores_gamejolt_maturity_teen">Adolescentes</string> + <string name="stores_gamejolt_maturity_adult">Adulto</string> + <string name="stores_gamejolt_status_complete">Completo</string> + <string name="stores_gamejolt_status_early">Acesso antecipado</string> + <string name="stores_gamejolt_partners">Jogos de parceiros</string> + <string name="stores_gamejolt_filter_browser">Navegador</string> + <string name="stores_gamejolt_filter_maturity">Classificação</string> + <string name="stores_gamejolt_filter_status">Estado</string> + <string name="stores_gamejolt_filter_partners">Parceiros</string> + <string name="stores_gamejolt_followed">Jogos seguidos</string> </resources> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 47cfdd17e2..a6f9e5cc9b 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Adia a suspensão em segundo plano enquanto a Steam estiver baixando.</string> <string name="mode_suspend_note">Automático pausa em segundo plano e retoma quando o app reaparece. Manual aguarda Retomar. Nunca continua em execução.</string> <string name="mode_startup">Inicialização</string> - <string name="mode_steam_startup">Iniciar a Steam com o DroidDeck</string> - <string name="mode_steam_startup_hint">Abre a sessão da Steam quando o DroidDeck é iniciado.</string> + <string name="mode_startup_session">Abrir ao iniciar</string> + <string name="mode_startup_session_hint">Inicia esta sessão quando o DroidDeck é aberto.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Procurando versões…</string> <string name="mode_decky_ready">Pronto para instalar %1$s.</string> @@ -876,13 +876,9 @@ <string name="setup_fullscreen">Tela cheia</string> <string name="setup_fullscreen_on">Oculta as barras de status e de navegação do Android</string> <string name="setup_fullscreen_off">Mostra as barras de status e de navegação do Android</string> - <string name="setup_dual_screen">Tela dupla</string> - <string name="setup_dual_screen_hint">Automático usa a segunda tela em portáteis que têm uma integrada. Ativado usa qualquer segunda tela. Desativado mantém tudo em uma tela.</string> <string name="setup_dual_screen_auto">Automático</string> <string name="setup_dual_screen_on">Ativado</string> <string name="setup_dual_screen_off">Desativado</string> - <string name="setup_dual_screen_menu">Menu na tela inferior</string> - <string name="setup_dual_screen_menu_hint">Move as seções e o menu do jogo para a segunda tela e a digitação acontece lá, para que a tela superior mantenha a visão completa. L2 e R2 trocam de seção.</string> <string name="setup_dual_screen_controls">Controles na tela inferior nos jogos</string> <string name="setup_dual_screen_controls_hint">Abre o trackpad e o teclado na segunda tela quando uma sessão começa.</string> <string name="dual_typing_title">Digitando para a tela superior</string> @@ -1816,8 +1812,6 @@ <string name="stats_trace">Acelerador e freio, últimos 10 s</string> <string name="stats_speed_chart">Velocidade, %1$s</string> <string name="stats_gear">Marcha</string> - <string name="stats_speed_units">Unidade de velocidade</string> - <string name="stats_speed_units_auto">Automático (%1$s)</string> <string name="stats_steam_client_arm">Cliente Steam ARM</string> <string name="stats_steam_client_x86">Cliente Steam x86</string> <string name="stats_throttle">Acelerador</string> @@ -1835,7 +1829,6 @@ <string name="stats_fuel_t">Combustível, t</string> <string name="stats_fuel_main">Principal %1$s t</string> <string name="stats_fuel_reserve">Reserva %1$s t</string> - <string name="stats_tap_hint">Toque na faixa superior ou no painel para mudar o estilo.</string> <string name="bottom_telemetry_send_title">Enviar dados para o painel</string> <string name="bottom_telemetry_send_auto">Automático</string> <string name="bottom_telemetry_send_auto_hint">Ativa para todos os jogos listados aqui, incluindo os encontrados depois. Os jogos que você desativar continuam desativados.</string> @@ -1874,7 +1867,6 @@ <string name="bottom_telemetry_balance">Saldo</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Ative a saída de dados de um jogo de corrida (muitas vezes chamada de telemetria ou UDP) para ver um painel ao vivo aqui. Os dados ficam neste dispositivo.</string> <string name="bottom_telemetry_unknown_format">A porta %1$d está recebendo dados (%2$d pacotes de %3$d bytes), mas em um formato que esta página ainda não consegue ler.</string> <string name="bottom_telemetry_port_busy">Outro programa já usa a porta %1$s, então esse jogo não pode aparecer aqui.</string> @@ -3664,4 +3656,33 @@ <string name="gog_repair_action">Reparar arquivos</string> <string name="gog_refresh_action">Renovar instalação</string> <string name="gog_select_patch">Selecionar</string> + <string name="stores_gamejolt_not_owned">Não está na sua biblioteca do Game Jolt</string> + <string name="stores_gamejolt_no_build">Sem download para Windows deste jogo</string> + <string name="stores_gamejolt_no_exe">Nenhum jogo para Windows encontrado no download</string> + <string name="stores_gamejolt_no_game">Não foi possível encontrar este jogo no Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Não foi possível carregar os jogos do Game Jolt</string> + <string name="stores_gamejolt_download_failed">O Game Jolt respondeu HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Não foi possível carregar os downloads do Game Jolt</string> + <string name="stores_gamejolt_build_open">Abrir no Game Jolt</string> + <string name="stores_gamejolt_archive">Arquivos %1$s não são suportados</string> + <string name="stores_gamejolt_extract_failed">Não foi possível extrair o download (código %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Não foi possível acessar o Game Jolt</string> + <string name="stores_gamejolt_download_no_link">O Game Jolt não forneceu um link de download</string> + <string name="stores_gamejolt_section_featured">Em destaque</string> + <string name="stores_gamejolt_section_hot">Em alta</string> + <string name="stores_gamejolt_section_best">Melhores</string> + <string name="stores_gamejolt_section_new">Novos</string> + <string name="stores_gamejolt_price_under_30">US$ 30 ou menos</string> + <string name="stores_gamejolt_os_other">Outros</string> + <string name="stores_gamejolt_maturity_everyone">Todas as idades</string> + <string name="stores_gamejolt_maturity_teen">Adolescentes</string> + <string name="stores_gamejolt_maturity_adult">Adulto</string> + <string name="stores_gamejolt_status_complete">Completo</string> + <string name="stores_gamejolt_status_early">Acesso antecipado</string> + <string name="stores_gamejolt_partners">Jogos de parceiros</string> + <string name="stores_gamejolt_filter_browser">Navegador</string> + <string name="stores_gamejolt_filter_maturity">Classificação</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Parceiros</string> + <string name="stores_gamejolt_followed">Jogos seguidos</string> </resources> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index d972f63c63..2eecc56e30 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Întârzie suspendarea în fundal cât timp Steam descarcă activ.</string> <string name="mode_suspend_note">Automat pune pe pauză în fundal și reia atunci când este afișată. Manual așteaptă Reluare. Niciodată continuă să ruleze.</string> <string name="mode_startup">Pornire</string> - <string name="mode_steam_startup">Pornește Steam odată cu DroidDeck</string> - <string name="mode_steam_startup_hint">Deschide sesiunea Steam la lansarea DroidDeck.</string> + <string name="mode_startup_session">Deschide la pornire</string> + <string name="mode_startup_session_hint">Pornește această sesiune când se lansează DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Se verifică versiunile…</string> <string name="mode_decky_ready">Pregătit pentru instalarea %1$s.</string> @@ -884,13 +884,9 @@ <string name="setup_fullscreen">Ecran complet</string> <string name="setup_fullscreen_on">Ascunde barele de stare și de navigare Android</string> <string name="setup_fullscreen_off">Arată barele de stare și de navigare Android</string> - <string name="setup_dual_screen">Ecran dublu</string> - <string name="setup_dual_screen_hint">Automat folosește al doilea ecran pe consolele portabile care au unul integrat. Pornit folosește orice al doilea afișaj. Oprit păstrează totul pe un singur ecran.</string> <string name="setup_dual_screen_auto">Automat</string> <string name="setup_dual_screen_on">Pornit</string> <string name="setup_dual_screen_off">Oprit</string> - <string name="setup_dual_screen_menu">Meniu pe ecranul de jos</string> - <string name="setup_dual_screen_menu_hint">Mută secțiunile și meniul din joc pe al doilea ecran și scrierea se face acolo, astfel încât ecranul de sus păstrează imaginea completă. L2 și R2 schimbă secțiunea.</string> <string name="setup_dual_screen_controls">Comenzi pe ecranul de jos în jocuri</string> <string name="setup_dual_screen_controls_hint">Deschide trackpadul și tastatura pe al doilea ecran când pornește o sesiune.</string> <string name="dual_typing_title">Scriere pentru ecranul de sus</string> @@ -1824,8 +1820,6 @@ <string name="stats_trace">Accelerație și frână, ultimele 10 s</string> <string name="stats_speed_chart">Viteză, %1$s</string> <string name="stats_gear">Treaptă</string> - <string name="stats_speed_units">Unități de viteză</string> - <string name="stats_speed_units_auto">Automat (%1$s)</string> <string name="stats_steam_client_arm">Client Steam ARM</string> <string name="stats_steam_client_x86">Client Steam x86</string> <string name="stats_throttle">Accelerație</string> @@ -1843,7 +1837,6 @@ <string name="stats_fuel_t">Combustibil, t</string> <string name="stats_fuel_main">Principal %1$s t</string> <string name="stats_fuel_reserve">Rezervă %1$s t</string> - <string name="stats_tap_hint">Atinge banda de sus sau bordul pentru a-i schimba stilul.</string> <string name="bottom_telemetry_send_title">Trimite date pentru tabloul de bord</string> <string name="bottom_telemetry_send_auto">Automat</string> <string name="bottom_telemetry_send_auto_hint">Activează trimiterea pentru fiecare joc din listă, inclusiv pentru jocurile găsite mai târziu. Jocurile pe care le dezactivezi rămân dezactivate.</string> @@ -1882,7 +1875,6 @@ <string name="bottom_telemetry_balance">Sold</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Activează ieșirea de date a unui joc de curse (numită adesea telemetrie sau UDP) pentru a vedea aici un bord în timp real. Datele rămân pe acest dispozitiv.</string> <string name="bottom_telemetry_unknown_format">Portul %1$d primește date (%2$d pachete de %3$d octeți), dar într-un format pe care această pagină nu îl poate citi încă.</string> <string name="bottom_telemetry_port_busy">Alt program folosește deja portul %1$s, așa că acel joc nu poate fi afișat aici.</string> @@ -3664,4 +3656,33 @@ <string name="gog_repair_action">Repară fișierele</string> <string name="gog_refresh_action">Reîmprospătează instalarea</string> <string name="gog_select_patch">Selectează</string> + <string name="stores_gamejolt_not_owned">Nu este în biblioteca ta Game Jolt</string> + <string name="stores_gamejolt_no_build">Nu există descărcare pentru Windows la acest joc</string> + <string name="stores_gamejolt_no_exe">Nu s-a găsit niciun joc Windows în descărcare</string> + <string name="stores_gamejolt_no_game">Jocul nu a fost găsit pe Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Nu s-au putut încărca jocurile de pe Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt a răspuns HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Descărcările de pe Game Jolt nu au putut fi încărcate</string> + <string name="stores_gamejolt_build_open">Deschide pe Game Jolt</string> + <string name="stores_gamejolt_archive">Arhivele %1$s nu sunt acceptate</string> + <string name="stores_gamejolt_extract_failed">Descărcarea nu a putut fi extrasă (cod %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Nu s-a putut contacta Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt nu a oferit un link de descărcare</string> + <string name="stores_gamejolt_section_featured">Recomandate</string> + <string name="stores_gamejolt_section_hot">În tendințe</string> + <string name="stores_gamejolt_section_best">Cele mai bune</string> + <string name="stores_gamejolt_section_new">Noi</string> + <string name="stores_gamejolt_price_under_30">30 $ sau mai puțin</string> + <string name="stores_gamejolt_os_other">Altele</string> + <string name="stores_gamejolt_maturity_everyone">Toate vârstele</string> + <string name="stores_gamejolt_maturity_teen">Adolescenți</string> + <string name="stores_gamejolt_maturity_adult">Adulți</string> + <string name="stores_gamejolt_status_complete">Finalizat</string> + <string name="stores_gamejolt_status_early">Acces anticipat</string> + <string name="stores_gamejolt_partners">Jocuri partenere</string> + <string name="stores_gamejolt_filter_browser">Browser</string> + <string name="stores_gamejolt_filter_maturity">Maturitate</string> + <string name="stores_gamejolt_filter_status">Stare</string> + <string name="stores_gamejolt_filter_partners">Parteneri</string> + <string name="stores_gamejolt_followed">Jocuri urmărite</string> </resources> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index ab175f12e9..2187225f6d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Откладывает приостановку в фоне, пока Steam что-то скачивает.</string> <string name="mode_suspend_note">Авто: пауза в фоне и возобновление при показе. Вручную: ждет нажатия «Продолжить». Никогда: сессия продолжает работать.</string> <string name="mode_startup">Запуск</string> - <string name="mode_steam_startup">Запускать Steam при открытии DroidDeck</string> - <string name="mode_steam_startup_hint">Открывает сессию Steam при запуске DroidDeck.</string> + <string name="mode_startup_session">Открывать при запуске</string> + <string name="mode_startup_session_hint">Запускает этот сеанс при запуске DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Проверка выпусков…</string> <string name="mode_decky_ready">Готово к установке %1$s.</string> @@ -887,13 +887,9 @@ <string name="setup_fullscreen">Полноэкранный режим</string> <string name="setup_fullscreen_on">Скрывает строку состояния и панель навигации Android</string> <string name="setup_fullscreen_off">Показывает строку состояния и панель навигации Android</string> - <string name="setup_dual_screen">Два экрана</string> - <string name="setup_dual_screen_hint">Автоматически — использует второй экран на портативных устройствах со встроенным вторым экраном. Вкл. — использует любой второй дисплей. Выкл. — всё остаётся на одном экране.</string> <string name="setup_dual_screen_auto">Автоматически</string> <string name="setup_dual_screen_on">Вкл.</string> <string name="setup_dual_screen_off">Выкл.</string> - <string name="setup_dual_screen_menu">Меню на нижнем экране</string> - <string name="setup_dual_screen_menu_hint">Переносит разделы и меню в игре на второй экран, и ввод выполняется там, поэтому верхний экран остаётся полностью свободным. L2 и R2 переключают разделы.</string> <string name="setup_dual_screen_controls">Управление на нижнем экране в играх</string> <string name="setup_dual_screen_controls_hint">Открывает тачпад и клавиатуру на втором экране при запуске сеанса.</string> <string name="dual_typing_title">Ввод для верхнего экрана</string> @@ -1846,8 +1842,6 @@ <string name="stats_trace">Газ и тормоз за последние 10 s</string> <string name="stats_speed_chart">Скорость, %1$s</string> <string name="stats_gear">Передача</string> - <string name="stats_speed_units">Единицы скорости</string> - <string name="stats_speed_units_auto">Автоматически (%1$s)</string> <string name="stats_steam_client_arm">Клиент Steam ARM</string> <string name="stats_steam_client_x86">Клиент Steam x86</string> <string name="stats_throttle">Газ</string> @@ -1865,7 +1859,6 @@ <string name="stats_fuel_t">Топливо, t</string> <string name="stats_fuel_main">Основное %1$s t</string> <string name="stats_fuel_reserve">Резерв %1$s t</string> - <string name="stats_tap_hint">Коснитесь верхней полосы или панели, чтобы сменить ее стиль.</string> <string name="bottom_telemetry_send_title">Передавать данные на дашборд</string> <string name="bottom_telemetry_send_auto">Автоматически</string> <string name="bottom_telemetry_send_auto_hint">Включает передачу для всех игр в этом списке, в том числе найденных позже. Игры, для которых вы ее выключили, остаются выключенными.</string> @@ -1904,7 +1897,6 @@ <string name="bottom_telemetry_balance">Баланс</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Включите вывод данных в гоночной игре (часто он называется телеметрией или UDP), чтобы видеть здесь приборную панель в реальном времени. Данные остаются на этом устройстве.</string> <string name="bottom_telemetry_unknown_format">Порт %1$d получает данные (пакетов: %2$d, размер: %3$d байт), но в формате, который эта страница пока не умеет читать.</string> <string name="bottom_telemetry_port_busy">Порт %1$s уже занят другой программой, поэтому эта игра не может отображаться здесь.</string> @@ -3701,4 +3693,33 @@ <string name="gog_repair_action">Восстановить файлы</string> <string name="gog_refresh_action">Обновить установку</string> <string name="gog_select_patch">Выбрать</string> + <string name="stores_gamejolt_not_owned">Нет в вашей библиотеке Game Jolt</string> + <string name="stores_gamejolt_no_build">Для этой игры нет загрузки для Windows</string> + <string name="stores_gamejolt_no_exe">В загрузке не найдена игра для Windows</string> + <string name="stores_gamejolt_no_game">Не удалось найти эту игру на Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Не удалось загрузить игры с Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt ответил HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Не удалось загрузить список файлов с Game Jolt</string> + <string name="stores_gamejolt_build_open">Открыть на Game Jolt</string> + <string name="stores_gamejolt_archive">Архивы %1$s не поддерживаются</string> + <string name="stores_gamejolt_extract_failed">Не удалось распаковать загрузку (код %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Не удалось связаться с Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt не предоставил ссылку для скачивания</string> + <string name="stores_gamejolt_section_featured">Рекомендуемые</string> + <string name="stores_gamejolt_section_hot">Популярные</string> + <string name="stores_gamejolt_section_best">Лучшие</string> + <string name="stores_gamejolt_section_new">Новые</string> + <string name="stores_gamejolt_price_under_30">30 $ или дешевле</string> + <string name="stores_gamejolt_os_other">Другое</string> + <string name="stores_gamejolt_maturity_everyone">Для всех возрастов</string> + <string name="stores_gamejolt_maturity_teen">Подростки</string> + <string name="stores_gamejolt_maturity_adult">Для взрослых</string> + <string name="stores_gamejolt_status_complete">Завершена</string> + <string name="stores_gamejolt_status_early">Ранний доступ</string> + <string name="stores_gamejolt_partners">Игры партнёров</string> + <string name="stores_gamejolt_filter_browser">Браузер</string> + <string name="stores_gamejolt_filter_maturity">Возрастной рейтинг</string> + <string name="stores_gamejolt_filter_status">Статус</string> + <string name="stores_gamejolt_filter_partners">Партнёры</string> + <string name="stores_gamejolt_followed">Отслеживаемые игры</string> </resources> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 1115912ba8..6ce5d82b87 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Skjut upp bakgrundspausning medan Steam aktivt laddar ned.</string> <string name="mode_suspend_note">Auto pausar i bakgrunden och återupptar när den visas. Manuell väntar på Återuppta. Aldrig fortsätter köra.</string> <string name="mode_startup">Uppstart</string> - <string name="mode_steam_startup">Starta Steam med DroidDeck</string> - <string name="mode_steam_startup_hint">Öppnar Steam-sessionen när DroidDeck startar.</string> + <string name="mode_startup_session">Öppna vid start</string> + <string name="mode_startup_session_hint">Startar den här sessionen när DroidDeck startar.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Söker efter utgåvor…</string> <string name="mode_decky_ready">Redo att installera %1$s.</string> @@ -881,13 +881,9 @@ <string name="setup_fullscreen">Helskärm</string> <string name="setup_fullscreen_on">Döljer Androids statusfält och navigeringsfält</string> <string name="setup_fullscreen_off">Visar Androids statusfält och navigeringsfält</string> - <string name="setup_dual_screen">Dubbelskärm</string> - <string name="setup_dual_screen_hint">Automatiskt använder den andra skärmen på handhållna enheter med en inbyggd andra skärm. På använder vilken andra skärm som helst. Av håller allt på en skärm.</string> <string name="setup_dual_screen_auto">Automatiskt</string> <string name="setup_dual_screen_on">På</string> <string name="setup_dual_screen_off">Av</string> - <string name="setup_dual_screen_menu">Meny på nedre skärmen</string> - <string name="setup_dual_screen_menu_hint">Flyttar avsnitten och menyn i spelet till den andra skärmen och skrivandet sker där, så att den övre skärmen behåller hela vyn. L2 och R2 byter avsnitt.</string> <string name="setup_dual_screen_controls">Kontroller på nedre skärmen i spel</string> <string name="setup_dual_screen_controls_hint">Öppnar styrplattan och tangentbordet på den andra skärmen när en session startar.</string> <string name="dual_typing_title">Skriver för den övre skärmen</string> @@ -1802,8 +1798,6 @@ <string name="stats_trace">Gas och broms, senaste 10 s</string> <string name="stats_speed_chart">Hastighet, %1$s</string> <string name="stats_gear">Växel</string> - <string name="stats_speed_units">Hastighetsenhet</string> - <string name="stats_speed_units_auto">Automatisk (%1$s)</string> <string name="stats_steam_client_arm">Steam-klient ARM</string> <string name="stats_steam_client_x86">Steam-klient x86</string> <string name="stats_throttle">Gas</string> @@ -1821,7 +1815,6 @@ <string name="stats_fuel_t">Bränsle, t</string> <string name="stats_fuel_main">Huvudtank %1$s t</string> <string name="stats_fuel_reserve">Reserv %1$s t</string> - <string name="stats_tap_hint">Tryck på den övre remsan eller instrumentpanelen för att byta stil.</string> <string name="bottom_telemetry_send_title">Skicka data till instrumentpanelen</string> <string name="bottom_telemetry_send_auto">Automatiskt</string> <string name="bottom_telemetry_send_auto_hint">Slår på det för alla spel i listan, även spel som hittas senare. Spel som du stänger av förblir avstängda.</string> @@ -1860,7 +1853,6 @@ <string name="bottom_telemetry_balance">Saldo</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Slå på datautmatning i ett racingspel (kallas ofta telemetri eller UDP) för att se en liveinstrumentpanel här. Datan stannar på den här enheten.</string> <string name="bottom_telemetry_unknown_format">Port %1$d tar emot data (%2$d paket på %3$d byte), men i ett format som den här sidan inte kan läsa än.</string> <string name="bottom_telemetry_port_busy">Ett annat program använder redan port %1$s, så det spelet kan inte visas här.</string> @@ -3627,4 +3619,33 @@ <string name="gog_repair_action">Reparera filer</string> <string name="gog_refresh_action">Uppdatera installationen</string> <string name="gog_select_patch">Välj</string> + <string name="stores_gamejolt_not_owned">Inte i ditt Game Jolt-bibliotek</string> + <string name="stores_gamejolt_no_build">Ingen Windows-nedladdning för det här spelet</string> + <string name="stores_gamejolt_no_exe">Inget Windows-spel hittades i nedladdningen</string> + <string name="stores_gamejolt_no_game">Spelet hittades inte på Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Det gick inte att läsa in spel från Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt svarade HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Det gick inte att läsa in nedladdningarna från Game Jolt</string> + <string name="stores_gamejolt_build_open">Öppna på Game Jolt</string> + <string name="stores_gamejolt_archive">%1$s-arkiv stöds inte</string> + <string name="stores_gamejolt_extract_failed">Det gick inte att packa upp nedladdningen (kod %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Det gick inte att nå Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt gav ingen nedladdningslänk</string> + <string name="stores_gamejolt_section_featured">Utvalda</string> + <string name="stores_gamejolt_section_hot">Populära</string> + <string name="stores_gamejolt_section_best">Bästa</string> + <string name="stores_gamejolt_section_new">Nya</string> + <string name="stores_gamejolt_price_under_30">$30 eller mindre</string> + <string name="stores_gamejolt_os_other">Övrigt</string> + <string name="stores_gamejolt_maturity_everyone">Alla åldrar</string> + <string name="stores_gamejolt_maturity_teen">Tonåringar</string> + <string name="stores_gamejolt_maturity_adult">Vuxna</string> + <string name="stores_gamejolt_status_complete">Färdigt</string> + <string name="stores_gamejolt_status_early">Tidig åtkomst</string> + <string name="stores_gamejolt_partners">Partnerspel</string> + <string name="stores_gamejolt_filter_browser">Webbläsare</string> + <string name="stores_gamejolt_filter_maturity">Åldersgräns</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Partner</string> + <string name="stores_gamejolt_followed">Följda spel</string> </resources> diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 760bece483..0c44a3bc29 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">เลื่อนการหยุดพื้นหลังชั่วคราวออกไปขณะ Steam กำลังดาวน์โหลดอยู่</string> <string name="mode_suspend_note">อัตโนมัติจะหยุดชั่วคราวเมื่ออยู่ในพื้นหลังและดำเนินการต่อเมื่อแสดงผล กำหนดเองรอการกดดำเนินการต่อ ไม่มีวันทำงานต่อเนื่องตลอด</string> <string name="mode_startup">การเริ่มทำงาน</string> - <string name="mode_steam_startup">เริ่ม Steam พร้อมกับ DroidDeck</string> - <string name="mode_steam_startup_hint">เปิดเซสชัน Steam เมื่อ DroidDeck เริ่มทำงาน</string> + <string name="mode_startup_session">เปิดเมื่อเริ่มต้น</string> + <string name="mode_startup_session_hint">เริ่มเซสชันนี้เมื่อเปิด DroidDeck</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">กำลังค้นหารุ่นที่เผยแพร่…</string> <string name="mode_decky_ready">พร้อมติดตั้ง %1$s</string> @@ -878,13 +878,9 @@ <string name="setup_fullscreen">เต็มจอ</string> <string name="setup_fullscreen_on">ซ่อนแถบสถานะและแถบนำทางของ Android</string> <string name="setup_fullscreen_off">แสดงแถบสถานะและแถบนำทางของ Android</string> - <string name="setup_dual_screen">หน้าจอคู่</string> - <string name="setup_dual_screen_hint">อัตโนมัติจะใช้หน้าจอที่สองบนเครื่องพกพาที่มีหน้าจอที่สองในตัว เปิดจะใช้หน้าจอที่สองใดก็ได้ ปิดจะแสดงทุกอย่างบนหน้าจอเดียว</string> <string name="setup_dual_screen_auto">อัตโนมัติ</string> <string name="setup_dual_screen_on">เปิด</string> <string name="setup_dual_screen_off">ปิด</string> - <string name="setup_dual_screen_menu">เมนูหน้าจอล่าง</string> - <string name="setup_dual_screen_menu_hint">ย้ายส่วนต่าง ๆ และเมนูระหว่างเล่นเกมไปที่หน้าจอที่สองและพิมพ์ที่นั่น เพื่อให้หน้าจอบนแสดงเต็มพื้นที่ L2 และ R2 ใช้สลับส่วน</string> <string name="setup_dual_screen_controls">ปุ่มควบคุมหน้าจอล่างในเกม</string> <string name="setup_dual_screen_controls_hint">เปิดแทร็กแพดและแป้นพิมพ์บนหน้าจอที่สองเมื่อเริ่มเซสชัน</string> <string name="dual_typing_title">กำลังพิมพ์ให้หน้าจอบน</string> @@ -1780,8 +1776,6 @@ <string name="stats_trace">คันเร่งและเบรก 10 s ล่าสุด</string> <string name="stats_speed_chart">ความเร็ว, %1$s</string> <string name="stats_gear">เกียร์</string> - <string name="stats_speed_units">หน่วยความเร็ว</string> - <string name="stats_speed_units_auto">อัตโนมัติ (%1$s)</string> <string name="stats_steam_client_arm">ไคลเอนต์ Steam ARM</string> <string name="stats_steam_client_x86">ไคลเอนต์ Steam x86</string> <string name="stats_throttle">คันเร่ง</string> @@ -1799,7 +1793,6 @@ <string name="stats_fuel_t">เชื้อเพลิง, t</string> <string name="stats_fuel_main">หลัก %1$s t</string> <string name="stats_fuel_reserve">สำรอง %1$s t</string> - <string name="stats_tap_hint">แตะแถบด้านบนหรือหน้าปัดเพื่อเปลี่ยนรูปแบบ</string> <string name="bottom_telemetry_send_title">ส่งข้อมูลแดชบอร์ด</string> <string name="bottom_telemetry_send_auto">อัตโนมัติ</string> <string name="bottom_telemetry_send_auto_hint">เปิดใช้สำหรับทุกเกมที่แสดงที่นี่ รวมถึงเกมที่พบในภายหลัง เกมที่คุณปิดไว้จะยังคงปิดอยู่</string> @@ -1838,7 +1831,6 @@ <string name="bottom_telemetry_balance">ยอดเงิน</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">เปิดการส่งออกข้อมูลของเกมแข่งรถ (มักเรียกว่าเทเลเมทรีหรือ UDP) เพื่อดูหน้าปัดแบบสดที่นี่ ข้อมูลจะอยู่บนอุปกรณ์นี้เท่านั้น</string> <string name="bottom_telemetry_unknown_format">พอร์ต %1$d ได้รับข้อมูล (%2$d แพ็กเก็ต ขนาด %3$d ไบต์) แต่อยู่ในรูปแบบที่หน้านี้ยังอ่านไม่ได้</string> <string name="bottom_telemetry_port_busy">มีโปรแกรมอื่นใช้พอร์ต %1$s อยู่แล้ว เกมนั้นจึงแสดงที่นี่ไม่ได้</string> @@ -3599,4 +3591,33 @@ <string name="gog_repair_action">ซ่อมแซมไฟล์</string> <string name="gog_refresh_action">รีเฟรชการติดตั้ง</string> <string name="gog_select_patch">เลือก</string> + <string name="stores_gamejolt_not_owned">ไม่มีในคลัง Game Jolt ของคุณ</string> + <string name="stores_gamejolt_no_build">เกมนี้ไม่มีการดาวน์โหลดสำหรับ Windows</string> + <string name="stores_gamejolt_no_exe">ไม่พบเกม Windows ในไฟล์ที่ดาวน์โหลด</string> + <string name="stores_gamejolt_no_game">ไม่พบเกมนี้บน Game Jolt</string> + <string name="stores_gamejolt_browse_failed">โหลดเกมจาก Game Jolt ไม่ได้</string> + <string name="stores_gamejolt_download_failed">Game Jolt ตอบกลับ HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">โหลดรายการดาวน์โหลดจาก Game Jolt ไม่ได้</string> + <string name="stores_gamejolt_build_open">เปิดบน Game Jolt</string> + <string name="stores_gamejolt_archive">ไม่รองรับไฟล์ %1$s</string> + <string name="stores_gamejolt_extract_failed">แตกไฟล์ที่ดาวน์โหลดไม่ได้ (รหัส %1$d)</string> + <string name="stores_gamejolt_download_unreachable">ไม่สามารถเชื่อมต่อ Game Jolt ได้</string> + <string name="stores_gamejolt_download_no_link">Game Jolt ไม่ได้ให้ลิงก์ดาวน์โหลด</string> + <string name="stores_gamejolt_section_featured">แนะนำ</string> + <string name="stores_gamejolt_section_hot">มาแรง</string> + <string name="stores_gamejolt_section_best">ยอดนิยมสูงสุด</string> + <string name="stores_gamejolt_section_new">ใหม่</string> + <string name="stores_gamejolt_price_under_30">$30 หรือต่ำกว่า</string> + <string name="stores_gamejolt_os_other">อื่น ๆ</string> + <string name="stores_gamejolt_maturity_everyone">ทุกวัย</string> + <string name="stores_gamejolt_maturity_teen">วัยรุ่น</string> + <string name="stores_gamejolt_maturity_adult">ผู้ใหญ่</string> + <string name="stores_gamejolt_status_complete">เสร็จสมบูรณ์</string> + <string name="stores_gamejolt_status_early">เข้าถึงก่อนใคร</string> + <string name="stores_gamejolt_partners">เกมของพาร์ตเนอร์</string> + <string name="stores_gamejolt_filter_browser">เบราว์เซอร์</string> + <string name="stores_gamejolt_filter_maturity">ระดับเนื้อหา</string> + <string name="stores_gamejolt_filter_status">สถานะ</string> + <string name="stores_gamejolt_filter_partners">พาร์ตเนอร์</string> + <string name="stores_gamejolt_followed">เกมที่ติดตาม</string> </resources> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 6a995967ce..16ca82a756 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Steam etkin olarak indirme yaparken arka planda askıya almayı erteler.</string> <string name="mode_suspend_note">Otomatik: arka planda duraklatır, gösterilince devam eder. Manuel: Devam et\'i bekler. Asla: çalışmaya devam eder.</string> <string name="mode_startup">Başlangıç</string> - <string name="mode_steam_startup">Steam\'i DroidDeck ile başlat</string> - <string name="mode_steam_startup_hint">DroidDeck açıldığında Steam oturumunu açar.</string> + <string name="mode_startup_session">Açılışta başlat</string> + <string name="mode_startup_session_hint">DroidDeck açıldığında bu oturumu başlatır.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Sürümler kontrol ediliyor…</string> <string name="mode_decky_ready">%1$s yüklenmeye hazır.</string> @@ -873,13 +873,9 @@ <string name="setup_fullscreen">Tam ekran</string> <string name="setup_fullscreen_on">Android durum ve gezinme çubuklarını gizler</string> <string name="setup_fullscreen_off">Android durum ve gezinme çubuklarını gösterir</string> - <string name="setup_dual_screen">Çift ekran</string> - <string name="setup_dual_screen_hint">Otomatik, dahili ikinci ekranı olan el konsollarında ikinci ekranı kullanır. Açık, herhangi bir ikinci ekranı kullanır. Kapalı, her şeyi tek ekranda tutar.</string> <string name="setup_dual_screen_auto">Otomatik</string> <string name="setup_dual_screen_on">Açık</string> <string name="setup_dual_screen_off">Kapalı</string> - <string name="setup_dual_screen_menu">Alt ekran menüsü</string> - <string name="setup_dual_screen_menu_hint">Bölümleri ve oyun içi menüyü ikinci ekrana taşır ve yazma orada yapılır, böylece üst ekran tam görünümü korur. L2 ve R2 bölümler arasında geçiş yapar.</string> <string name="setup_dual_screen_controls">Oyunlarda alt ekran kontrolleri</string> <string name="setup_dual_screen_controls_hint">Bir oturum başladığında ikinci ekranda dokunmatik yüzeyi ve klavyeyi açar.</string> <string name="dual_typing_title">Üst ekran için yazılıyor</string> @@ -1794,8 +1790,6 @@ <string name="stats_trace">Gaz ve fren, son 10 s</string> <string name="stats_speed_chart">Hız, %1$s</string> <string name="stats_gear">Vites</string> - <string name="stats_speed_units">Hız birimi</string> - <string name="stats_speed_units_auto">Otomatik (%1$s)</string> <string name="stats_steam_client_arm">Steam İstemcisi ARM</string> <string name="stats_steam_client_x86">Steam İstemcisi x86</string> <string name="stats_throttle">Gaz</string> @@ -1813,7 +1807,6 @@ <string name="stats_fuel_t">Yakıt, t</string> <string name="stats_fuel_main">Ana %1$s t</string> <string name="stats_fuel_reserve">Yedek %1$s t</string> - <string name="stats_tap_hint">Stilini değiştirmek için üst şeride veya göstergeye dokunun.</string> <string name="bottom_telemetry_send_title">Gösterge verilerini gönder</string> <string name="bottom_telemetry_send_auto">Otomatik</string> <string name="bottom_telemetry_send_auto_hint">Sonradan bulunanlar dahil, burada listelenen her oyun için açar. Kapattığınız oyunlar kapalı kalır.</string> @@ -1852,7 +1845,6 @@ <string name="bottom_telemetry_balance">Bakiye</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Burada canlı bir gösterge görmek için yarış oyununun veri çıkışını (genellikle telemetri veya UDP olarak geçer) açın. Veriler bu cihazda kalır.</string> <string name="bottom_telemetry_unknown_format">%1$d portu veri alıyor (%3$d baytlık %2$d paket), ancak bu sayfanın henüz okuyamadığı bir biçimde.</string> <string name="bottom_telemetry_port_busy">%1$s portunu zaten başka bir program kullanıyor, bu yüzden o oyun burada gösterilemez.</string> @@ -3627,4 +3619,33 @@ <string name="gog_repair_action">Dosyaları onar</string> <string name="gog_refresh_action">Kurulumu yenile</string> <string name="gog_select_patch">Seç</string> + <string name="stores_gamejolt_not_owned">Game Jolt kütüphanenizde yok</string> + <string name="stores_gamejolt_no_build">Bu oyunun Windows indirmesi yok</string> + <string name="stores_gamejolt_no_exe">İndirmede Windows oyunu bulunamadı</string> + <string name="stores_gamejolt_no_game">Bu oyun Game Jolt\'ta bulunamadı</string> + <string name="stores_gamejolt_browse_failed">Game Jolt oyunları yüklenemedi</string> + <string name="stores_gamejolt_download_failed">Game Jolt HTTP %1$d yanıtı verdi</string> + <string name="stores_gamejolt_pick_failed">İndirmeler Game Jolt\'tan yüklenemedi</string> + <string name="stores_gamejolt_build_open">Game Jolt\'ta aç</string> + <string name="stores_gamejolt_archive">%1$s arşivleri desteklenmiyor</string> + <string name="stores_gamejolt_extract_failed">İndirme ayıklanamadı (kod %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Jolt\'a ulaşılamadı</string> + <string name="stores_gamejolt_download_no_link">Game Jolt bir indirme bağlantısı vermedi</string> + <string name="stores_gamejolt_section_featured">Öne çıkanlar</string> + <string name="stores_gamejolt_section_hot">Popüler</string> + <string name="stores_gamejolt_section_best">En iyiler</string> + <string name="stores_gamejolt_section_new">Yeni</string> + <string name="stores_gamejolt_price_under_30">30 $ veya daha az</string> + <string name="stores_gamejolt_os_other">Diğer</string> + <string name="stores_gamejolt_maturity_everyone">Her yaş</string> + <string name="stores_gamejolt_maturity_teen">Gençler</string> + <string name="stores_gamejolt_maturity_adult">Yetişkin</string> + <string name="stores_gamejolt_status_complete">Tamamlandı</string> + <string name="stores_gamejolt_status_early">Erken erişim</string> + <string name="stores_gamejolt_partners">Ortak oyunlar</string> + <string name="stores_gamejolt_filter_browser">Tarayıcı</string> + <string name="stores_gamejolt_filter_maturity">Yaş sınırı</string> + <string name="stores_gamejolt_filter_status">Durum</string> + <string name="stores_gamejolt_filter_partners">Ortaklar</string> + <string name="stores_gamejolt_followed">Takip edilen oyunlar</string> </resources> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index e2199fe609..bd17807290 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Відкладає призупинення у фоні, поки Steam активно щось завантажує.</string> <string name="mode_suspend_note">«Авто» призупиняє сеанс у фоні й відновлює, коли додаток знову на екрані. «Вручну» чекає на «Відновити». «Ніколи» — сеанс працює далі.</string> <string name="mode_startup">Запуск</string> - <string name="mode_steam_startup">Запускати Steam разом із DroidDeck</string> - <string name="mode_steam_startup_hint">Відкриває сеанс Steam під час запуску DroidDeck.</string> + <string name="mode_startup_session">Відкривати під час запуску</string> + <string name="mode_startup_session_hint">Запускає цей сеанс під час запуску DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Пошук випусків…</string> <string name="mode_decky_ready">Можна встановити %1$s.</string> @@ -887,13 +887,9 @@ <string name="setup_fullscreen">Повний екран</string> <string name="setup_fullscreen_on">Приховує рядок стану та панель навігації Android</string> <string name="setup_fullscreen_off">Показує рядок стану та панель навігації Android</string> - <string name="setup_dual_screen">Два екрани</string> - <string name="setup_dual_screen_hint">Автоматично — використовує другий екран на портативних пристроях із вбудованим другим екраном. Увімк. — використовує будь-який другий дисплей. Вимк. — усе лишається на одному екрані.</string> <string name="setup_dual_screen_auto">Автоматично</string> <string name="setup_dual_screen_on">Увімк.</string> <string name="setup_dual_screen_off">Вимк.</string> - <string name="setup_dual_screen_menu">Меню на нижньому екрані</string> - <string name="setup_dual_screen_menu_hint">Переносить розділи та меню в грі на другий екран, і введення відбувається там, тож верхній екран лишається повністю вільним. L2 і R2 перемикають розділи.</string> <string name="setup_dual_screen_controls">Керування на нижньому екрані в іграх</string> <string name="setup_dual_screen_controls_hint">Відкриває тачпад і клавіатуру на другому екрані під час запуску сеансу.</string> <string name="dual_typing_title">Введення для верхнього екрана</string> @@ -1846,8 +1842,6 @@ <string name="stats_trace">Газ і гальмо, останні 10 s</string> <string name="stats_speed_chart">Швидкість, %1$s</string> <string name="stats_gear">Передача</string> - <string name="stats_speed_units">Одиниці швидкості</string> - <string name="stats_speed_units_auto">Автоматично (%1$s)</string> <string name="stats_steam_client_arm">Клієнт Steam ARM</string> <string name="stats_steam_client_x86">Клієнт Steam x86</string> <string name="stats_throttle">Газ</string> @@ -1865,7 +1859,6 @@ <string name="stats_fuel_t">Пальне, t</string> <string name="stats_fuel_main">Основне %1$s t</string> <string name="stats_fuel_reserve">Резерв %1$s t</string> - <string name="stats_tap_hint">Торкніться верхньої смуги або панелі, щоб змінити її стиль.</string> <string name="bottom_telemetry_send_title">Надсилати дані для панелі</string> <string name="bottom_telemetry_send_auto">Автоматично</string> <string name="bottom_telemetry_send_auto_hint">Вмикає це для кожної гри в цьому списку, зокрема для знайдених пізніше. Ігри, які ви вимкнете, лишаються вимкненими.</string> @@ -1904,7 +1897,6 @@ <string name="bottom_telemetry_balance">Баланс</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Увімкніть виведення даних у гоночній грі (часто це називається телеметрією або UDP), щоб бачити тут живу панель. Дані лишаються на цьому пристрої.</string> <string name="bottom_telemetry_unknown_format">Порт %1$d отримує дані (пакетів: %2$d, по %3$d байт), але у форматі, який ця сторінка ще не вміє читати.</string> <string name="bottom_telemetry_port_busy">Порт %1$s уже використовує інша програма, тому ця гра не може відображатися тут.</string> @@ -3701,4 +3693,33 @@ <string name="gog_repair_action">Відновити файли</string> <string name="gog_refresh_action">Оновити встановлення</string> <string name="gog_select_patch">Вибрати</string> + <string name="stores_gamejolt_not_owned">Немає у вашій бібліотеці Game Jolt</string> + <string name="stores_gamejolt_no_build">Для цієї гри немає завантаження для Windows</string> + <string name="stores_gamejolt_no_exe">У завантаженні не знайдено гри для Windows</string> + <string name="stores_gamejolt_no_game">Не вдалося знайти цю гру на Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Не вдалося завантажити ігри з Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt відповів HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Не вдалося завантажити список файлів з Game Jolt</string> + <string name="stores_gamejolt_build_open">Відкрити на Game Jolt</string> + <string name="stores_gamejolt_archive">Архіви %1$s не підтримуються</string> + <string name="stores_gamejolt_extract_failed">Не вдалося розпакувати завантаження (код %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Не вдалося зв\'язатися з Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt не надав посилання для завантаження</string> + <string name="stores_gamejolt_section_featured">Рекомендовані</string> + <string name="stores_gamejolt_section_hot">Популярні</string> + <string name="stores_gamejolt_section_best">Найкращі</string> + <string name="stores_gamejolt_section_new">Нові</string> + <string name="stores_gamejolt_price_under_30">30 $ або менше</string> + <string name="stores_gamejolt_os_other">Інше</string> + <string name="stores_gamejolt_maturity_everyone">Для всіх віків</string> + <string name="stores_gamejolt_maturity_teen">Підлітки</string> + <string name="stores_gamejolt_maturity_adult">Для дорослих</string> + <string name="stores_gamejolt_status_complete">Завершена</string> + <string name="stores_gamejolt_status_early">Рання версія</string> + <string name="stores_gamejolt_partners">Ігри партнерів</string> + <string name="stores_gamejolt_filter_browser">Браузер</string> + <string name="stores_gamejolt_filter_maturity">Вікова категорія</string> + <string name="stores_gamejolt_filter_status">Статус</string> + <string name="stores_gamejolt_filter_partners">Партнери</string> + <string name="stores_gamejolt_followed">Ігри, за якими ви стежите</string> </resources> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 5ef884eeb1..2c11cbbfd6 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Trì hoãn tạm dừng nền khi Steam đang tải xuống.</string> <string name="mode_suspend_note">Tự động tạm dừng ở nền và tiếp tục khi hiển thị lại. Thủ công chờ nhấn Tiếp tục. Không bao giờ giữ nó luôn chạy.</string> <string name="mode_startup">Khởi động</string> - <string name="mode_steam_startup">Khởi động Steam cùng DroidDeck</string> - <string name="mode_steam_startup_hint">Mở phiên Steam khi DroidDeck khởi chạy.</string> + <string name="mode_startup_session">Mở khi khởi chạy</string> + <string name="mode_startup_session_hint">Bắt đầu phiên này khi DroidDeck khởi chạy.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Đang kiểm tra bản phát hành…</string> <string name="mode_decky_ready">Sẵn sàng cài %1$s.</string> @@ -878,13 +878,9 @@ <string name="setup_fullscreen">Toàn màn hình</string> <string name="setup_fullscreen_on">Ẩn thanh trạng thái và thanh điều hướng của Android</string> <string name="setup_fullscreen_off">Hiện thanh trạng thái và thanh điều hướng của Android</string> - <string name="setup_dual_screen">Màn hình kép</string> - <string name="setup_dual_screen_hint">Tự động dùng màn hình thứ hai trên máy cầm tay có màn hình thứ hai tích hợp. Bật dùng bất kỳ màn hình thứ hai nào. Tắt giữ mọi thứ trên một màn hình.</string> <string name="setup_dual_screen_auto">Tự động</string> <string name="setup_dual_screen_on">Bật</string> <string name="setup_dual_screen_off">Tắt</string> - <string name="setup_dual_screen_menu">Menu ở màn hình dưới</string> - <string name="setup_dual_screen_menu_hint">Chuyển các mục và menu trong trò chơi sang màn hình thứ hai và nhập liệu ở đó, để màn hình trên giữ toàn bộ khung nhìn. L2 và R2 chuyển mục.</string> <string name="setup_dual_screen_controls">Điều khiển màn hình dưới khi chơi game</string> <string name="setup_dual_screen_controls_hint">Mở bàn di chuột và bàn phím trên màn hình thứ hai khi phiên bắt đầu.</string> <string name="dual_typing_title">Đang nhập cho màn hình trên</string> @@ -1780,8 +1776,6 @@ <string name="stats_trace">Ga và phanh, 10 s gần nhất</string> <string name="stats_speed_chart">Tốc độ, %1$s</string> <string name="stats_gear">Số</string> - <string name="stats_speed_units">Đơn vị tốc độ</string> - <string name="stats_speed_units_auto">Tự động (%1$s)</string> <string name="stats_steam_client_arm">Client Steam ARM</string> <string name="stats_steam_client_x86">Client Steam x86</string> <string name="stats_throttle">Ga</string> @@ -1799,7 +1793,6 @@ <string name="stats_fuel_t">Nhiên liệu, t</string> <string name="stats_fuel_main">Chính %1$s t</string> <string name="stats_fuel_reserve">Dự trữ %1$s t</string> - <string name="stats_tap_hint">Nhấn vào dải phía trên hoặc bảng đồng hồ để đổi kiểu hiển thị.</string> <string name="bottom_telemetry_send_title">Gửi dữ liệu bảng đồng hồ</string> <string name="bottom_telemetry_send_auto">Tự động</string> <string name="bottom_telemetry_send_auto_hint">Bật cho mọi game trong danh sách này, kể cả game được tìm thấy sau này. Game bạn đã tắt sẽ vẫn tắt.</string> @@ -1838,7 +1831,6 @@ <string name="bottom_telemetry_balance">Số dư</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Bật xuất dữ liệu của game đua xe (thường gọi là telemetry hoặc UDP) để xem bảng đồng hồ trực tiếp ở đây. Dữ liệu chỉ ở trên thiết bị này.</string> <string name="bottom_telemetry_unknown_format">Cổng %1$d đang nhận dữ liệu (%2$d gói, mỗi gói %3$d byte), nhưng ở định dạng mà trang này chưa đọc được.</string> <string name="bottom_telemetry_port_busy">Một chương trình khác đang dùng cổng %1$s, nên game đó không thể hiển thị ở đây.</string> @@ -3599,4 +3591,33 @@ <string name="gog_repair_action">Sửa tệp</string> <string name="gog_refresh_action">Làm mới bản cài</string> <string name="gog_select_patch">Chọn</string> + <string name="stores_gamejolt_not_owned">Không có trong thư viện Game Jolt của bạn</string> + <string name="stores_gamejolt_no_build">Không có bản tải Windows cho game này</string> + <string name="stores_gamejolt_no_exe">Không tìm thấy trò chơi Windows trong bản tải xuống</string> + <string name="stores_gamejolt_no_game">Không tìm thấy trò chơi này trên Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Không tải được game từ Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt trả về HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Không thể tải danh sách tải xuống từ Game Jolt</string> + <string name="stores_gamejolt_build_open">Mở trên Game Jolt</string> + <string name="stores_gamejolt_archive">Không hỗ trợ tệp %1$s</string> + <string name="stores_gamejolt_extract_failed">Không thể giải nén bản tải xuống (mã %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Không thể kết nối với Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt không cung cấp liên kết tải xuống</string> + <string name="stores_gamejolt_section_featured">Nổi bật</string> + <string name="stores_gamejolt_section_hot">Thịnh hành</string> + <string name="stores_gamejolt_section_best">Hay nhất</string> + <string name="stores_gamejolt_section_new">Mới</string> + <string name="stores_gamejolt_price_under_30">$30 trở xuống</string> + <string name="stores_gamejolt_os_other">Khác</string> + <string name="stores_gamejolt_maturity_everyone">Mọi lứa tuổi</string> + <string name="stores_gamejolt_maturity_teen">Thanh thiếu niên</string> + <string name="stores_gamejolt_maturity_adult">Người lớn</string> + <string name="stores_gamejolt_status_complete">Hoàn chỉnh</string> + <string name="stores_gamejolt_status_early">Truy cập sớm</string> + <string name="stores_gamejolt_partners">Game của đối tác</string> + <string name="stores_gamejolt_filter_browser">Trình duyệt</string> + <string name="stores_gamejolt_filter_maturity">Độ tuổi</string> + <string name="stores_gamejolt_filter_status">Trạng thái</string> + <string name="stores_gamejolt_filter_partners">Đối tác</string> + <string name="stores_gamejolt_followed">Game đang theo dõi</string> </resources> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 66e8216aba..15fb5b5851 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Steam 正在下载时推迟后台暂停。</string> <string name="mode_suspend_note">自动会在后台暂停并在显示时恢复。手动会等待点按恢复。“从不”则保持运行。</string> <string name="mode_startup">启动</string> - <string name="mode_steam_startup">随 DroidDeck 启动 Steam</string> - <string name="mode_steam_startup_hint">启动 DroidDeck 时打开 Steam 会话。</string> + <string name="mode_startup_session">启动时打开</string> + <string name="mode_startup_session_hint">DroidDeck 启动时开始此会话。</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">正在检查发布版本…</string> <string name="mode_decky_ready">已就绪,可安装 %1$s。</string> @@ -879,13 +879,9 @@ <string name="setup_fullscreen">全屏</string> <string name="setup_fullscreen_on">隐藏 Android 状态栏和导航栏</string> <string name="setup_fullscreen_off">显示 Android 状态栏和导航栏</string> - <string name="setup_dual_screen">双屏</string> - <string name="setup_dual_screen_hint">自动:在内置第二块屏幕的掌机上使用该屏幕。开启:使用任何第二块显示器。关闭:所有内容只显示在一块屏幕上。</string> <string name="setup_dual_screen_auto">自动</string> <string name="setup_dual_screen_on">开启</string> <string name="setup_dual_screen_off">关闭</string> - <string name="setup_dual_screen_menu">下屏菜单</string> - <string name="setup_dual_screen_menu_hint">将各个分区和游戏内菜单移到第二块屏幕并在那里输入,让上屏保持完整画面。L2 和 R2 切换分区。</string> <string name="setup_dual_screen_controls">游戏中的下屏控制</string> <string name="setup_dual_screen_controls_hint">会话开始时在第二块屏幕上打开触控板和键盘。</string> <string name="dual_typing_title">正在为上屏输入</string> @@ -1858,8 +1854,6 @@ <string name="stats_trace">油门和刹车,最近 10 s</string> <string name="stats_speed_chart">速度,%1$s</string> <string name="stats_gear">挡位</string> - <string name="stats_speed_units">速度单位</string> - <string name="stats_speed_units_auto">自动(%1$s)</string> <string name="stats_steam_client_arm">Steam 客户端 ARM</string> <string name="stats_steam_client_x86">Steam 客户端 x86</string> <string name="stats_throttle">油门</string> @@ -1877,7 +1871,6 @@ <string name="stats_fuel_t">燃料,t</string> <string name="stats_fuel_main">主油箱 %1$s t</string> <string name="stats_fuel_reserve">备用 %1$s t</string> - <string name="stats_tap_hint">点按顶部横条或仪表可更改其样式。</string> <string name="bottom_telemetry_send_title">发送仪表盘数据</string> <string name="bottom_telemetry_send_auto">自动</string> <string name="bottom_telemetry_send_auto_hint">为此处列出的所有游戏开启,包括之后发现的游戏。你手动关闭的游戏会保持关闭。</string> @@ -1916,7 +1909,6 @@ <string name="bottom_telemetry_balance">余额</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">开启赛车游戏的数据输出(通常称为遥测或 UDP),即可在此查看实时仪表。数据仅保留在此设备上。</string> <string name="bottom_telemetry_unknown_format">端口 %1$d 正在接收数据(%2$d 个 %3$d 字节的数据包),但其格式本页面暂时无法读取。</string> <string name="bottom_telemetry_port_busy">端口 %1$s 已被其他程序占用,因此该游戏无法在此显示。</string> @@ -3602,4 +3594,33 @@ <string name="gog_repair_action">修复文件</string> <string name="gog_refresh_action">刷新安装</string> <string name="gog_select_patch">选择</string> + <string name="stores_gamejolt_not_owned">不在你的 Game Jolt 库中</string> + <string name="stores_gamejolt_no_build">这个游戏没有 Windows 下载</string> + <string name="stores_gamejolt_no_exe">下载内容中未找到 Windows 游戏</string> + <string name="stores_gamejolt_no_game">在 Game Jolt 上找不到这款游戏</string> + <string name="stores_gamejolt_browse_failed">无法从 Game Jolt 加载游戏</string> + <string name="stores_gamejolt_download_failed">Game Jolt 返回 HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">无法从 Game Jolt 加载下载内容</string> + <string name="stores_gamejolt_build_open">在 Game Jolt 上打开</string> + <string name="stores_gamejolt_archive">不支持 %1$s 压缩包</string> + <string name="stores_gamejolt_extract_failed">无法解压下载内容(代码 %1$d)</string> + <string name="stores_gamejolt_download_unreachable">无法连接到 Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt 未提供下载链接</string> + <string name="stores_gamejolt_section_featured">精选</string> + <string name="stores_gamejolt_section_hot">热门</string> + <string name="stores_gamejolt_section_best">最佳</string> + <string name="stores_gamejolt_section_new">最新</string> + <string name="stores_gamejolt_price_under_30">30 美元以下</string> + <string name="stores_gamejolt_os_other">其他</string> + <string name="stores_gamejolt_maturity_everyone">全年龄</string> + <string name="stores_gamejolt_maturity_teen">青少年</string> + <string name="stores_gamejolt_maturity_adult">成人</string> + <string name="stores_gamejolt_status_complete">已完成</string> + <string name="stores_gamejolt_status_early">抢先体验</string> + <string name="stores_gamejolt_partners">合作伙伴游戏</string> + <string name="stores_gamejolt_filter_browser">浏览器</string> + <string name="stores_gamejolt_filter_maturity">内容分级</string> + <string name="stores_gamejolt_filter_status">状态</string> + <string name="stores_gamejolt_filter_partners">合作伙伴</string> + <string name="stores_gamejolt_followed">已关注的游戏</string> </resources> diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index e6e0a34621..56232a694d 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Steam 正在下載時,延遲在背景暫停。</string> <string name="mode_suspend_note">「自動」會在背景時暫停,並在重新顯示時繼續;「手動」會等你按「繼續」;「從不」會保持執行。</string> <string name="mode_startup">啟動</string> - <string name="mode_steam_startup">隨 DroidDeck 啟動 Steam</string> - <string name="mode_steam_startup_hint">DroidDeck 啟動時開啟 Steam 會話。</string> + <string name="mode_startup_session">啟動時開啟</string> + <string name="mode_startup_session_hint">DroidDeck 啟動時開始此工作階段。</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">正在檢查發佈版本…</string> <string name="mode_decky_ready">可安裝 %1$s。</string> @@ -878,13 +878,9 @@ <string name="setup_fullscreen">全螢幕</string> <string name="setup_fullscreen_on">隱藏 Android 狀態列和導覽列</string> <string name="setup_fullscreen_off">顯示 Android 狀態列和導覽列</string> - <string name="setup_dual_screen">雙屏</string> - <string name="setup_dual_screen_hint">自動:在內置第二塊螢幕的掌機上使用該螢幕。開啟:使用任何第二塊顯示器。關閉:所有內容只顯示在一塊螢幕上。</string> <string name="setup_dual_screen_auto">自動</string> <string name="setup_dual_screen_on">開啟</string> <string name="setup_dual_screen_off">關閉</string> - <string name="setup_dual_screen_menu">下屏選單</string> - <string name="setup_dual_screen_menu_hint">將各個分區和遊戲內選單移到第二塊螢幕並在那裡輸入,讓上屏保持完整畫面。L2 和 R2 切換分區。</string> <string name="setup_dual_screen_controls">遊戲中的下屏控制</string> <string name="setup_dual_screen_controls_hint">工作階段開始時在第二塊螢幕上開啟觸控板和鍵盤。</string> <string name="dual_typing_title">正在為上屏輸入</string> @@ -1780,8 +1776,6 @@ <string name="stats_trace">油門和剎車,最近 10 s</string> <string name="stats_speed_chart">速度,%1$s</string> <string name="stats_gear">檔位</string> - <string name="stats_speed_units">速度單位</string> - <string name="stats_speed_units_auto">自動(%1$s)</string> <string name="stats_steam_client_arm">Steam 用戶端 ARM</string> <string name="stats_steam_client_x86">Steam 用戶端 x86</string> <string name="stats_throttle">油門</string> @@ -1799,7 +1793,6 @@ <string name="stats_fuel_t">燃料,t</string> <string name="stats_fuel_main">主油箱 %1$s t</string> <string name="stats_fuel_reserve">備用 %1$s t</string> - <string name="stats_tap_hint">點按頂部橫條或儀表即可變更其樣式。</string> <string name="bottom_telemetry_send_title">傳送儀表板資料</string> <string name="bottom_telemetry_send_auto">自動</string> <string name="bottom_telemetry_send_auto_hint">為這裡列出的所有遊戲開啟,包括之後找到的遊戲。你關閉的遊戲會維持關閉。</string> @@ -1838,7 +1831,6 @@ <string name="bottom_telemetry_balance">餘額</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">開啟賽車遊戲的資料輸出(通常稱為遙測或 UDP),即可在此查看即時儀表。資料只會留在這部裝置上。</string> <string name="bottom_telemetry_unknown_format">連接埠 %1$d 正在接收資料(%2$d 個 %3$d 位元組的封包),但此頁面目前還無法讀取這種格式。</string> <string name="bottom_telemetry_port_busy">其他程式已在使用連接埠 %1$s,因此該遊戲無法在此顯示。</string> @@ -3599,4 +3591,33 @@ <string name="gog_repair_action">修復檔案</string> <string name="gog_refresh_action">重新整理安裝</string> <string name="gog_select_patch">選擇</string> + <string name="stores_gamejolt_not_owned">不在你的 Game Jolt 收藏庫中</string> + <string name="stores_gamejolt_no_build">這個遊戲沒有 Windows 下載</string> + <string name="stores_gamejolt_no_exe">下載內容中找不到 Windows 遊戲</string> + <string name="stores_gamejolt_no_game">在 Game Jolt 找不到這款遊戲</string> + <string name="stores_gamejolt_browse_failed">無法從 Game Jolt 載入遊戲</string> + <string name="stores_gamejolt_download_failed">Game Jolt 回應 HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">無法從 Game Jolt 載入下載內容</string> + <string name="stores_gamejolt_build_open">在 Game Jolt 開啟</string> + <string name="stores_gamejolt_archive">不支援 %1$s 壓縮檔</string> + <string name="stores_gamejolt_extract_failed">無法解壓下載內容(代碼 %1$d)</string> + <string name="stores_gamejolt_download_unreachable">無法連線至 Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt 沒有提供下載連結</string> + <string name="stores_gamejolt_section_featured">精選</string> + <string name="stores_gamejolt_section_hot">熱門</string> + <string name="stores_gamejolt_section_best">最佳</string> + <string name="stores_gamejolt_section_new">最新</string> + <string name="stores_gamejolt_price_under_30">30 美元或以下</string> + <string name="stores_gamejolt_os_other">其他</string> + <string name="stores_gamejolt_maturity_everyone">全年齡</string> + <string name="stores_gamejolt_maturity_teen">青少年</string> + <string name="stores_gamejolt_maturity_adult">成人</string> + <string name="stores_gamejolt_status_complete">已完成</string> + <string name="stores_gamejolt_status_early">搶先體驗</string> + <string name="stores_gamejolt_partners">合作夥伴遊戲</string> + <string name="stores_gamejolt_filter_browser">瀏覽器</string> + <string name="stores_gamejolt_filter_maturity">內容分級</string> + <string name="stores_gamejolt_filter_status">狀態</string> + <string name="stores_gamejolt_filter_partners">合作夥伴</string> + <string name="stores_gamejolt_followed">已追蹤的遊戲</string> </resources> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 5314631ea4..6d352e32e6 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -318,8 +318,8 @@ <string name="mode_background_downloads_hint">Steam 正在下載時,延後在背景暫停。</string> <string name="mode_suspend_note">「自動」會在背景時暫停,並在重新顯示時繼續。「手動」會等你點擊「繼續」。「從不」則會持續執行。</string> <string name="mode_startup">啟動</string> - <string name="mode_steam_startup">隨 DroidDeck 啟動 Steam</string> - <string name="mode_steam_startup_hint">DroidDeck 啟動時開啟 Steam 工作階段。</string> + <string name="mode_startup_session">啟動時開啟</string> + <string name="mode_startup_session_hint">DroidDeck 啟動時開始此工作階段。</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">正在檢查發行版本…</string> <string name="mode_decky_ready">已準備好安裝 %1$s。</string> @@ -878,13 +878,9 @@ <string name="setup_fullscreen">全螢幕</string> <string name="setup_fullscreen_on">隱藏 Android 狀態列和導覽列</string> <string name="setup_fullscreen_off">顯示 Android 狀態列和導覽列</string> - <string name="setup_dual_screen">雙螢幕</string> - <string name="setup_dual_screen_hint">自動:在內建第二個螢幕的掌機上使用該螢幕。開啟:使用任何第二個顯示器。關閉:所有內容只顯示在一個螢幕上。</string> <string name="setup_dual_screen_auto">自動</string> <string name="setup_dual_screen_on">開啟</string> <string name="setup_dual_screen_off">關閉</string> - <string name="setup_dual_screen_menu">下螢幕選單</string> - <string name="setup_dual_screen_menu_hint">將各個區塊和遊戲內選單移到第二個螢幕並在那裡輸入,讓上螢幕保持完整畫面。L2 和 R2 切換區塊。</string> <string name="setup_dual_screen_controls">遊戲中的下螢幕控制</string> <string name="setup_dual_screen_controls_hint">工作階段開始時在第二個螢幕上開啟觸控板和鍵盤。</string> <string name="dual_typing_title">正在為上螢幕輸入</string> @@ -1780,8 +1776,6 @@ <string name="stats_trace">油門和煞車,最近 10 s</string> <string name="stats_speed_chart">速度,%1$s</string> <string name="stats_gear">檔位</string> - <string name="stats_speed_units">速度單位</string> - <string name="stats_speed_units_auto">自動(%1$s)</string> <string name="stats_steam_client_arm">Steam 用戶端 ARM</string> <string name="stats_steam_client_x86">Steam 用戶端 x86</string> <string name="stats_throttle">油門</string> @@ -1799,7 +1793,6 @@ <string name="stats_fuel_t">燃料,t</string> <string name="stats_fuel_main">主油箱 %1$s t</string> <string name="stats_fuel_reserve">備用 %1$s t</string> - <string name="stats_tap_hint">點按頂部橫條或儀表即可變更其樣式。</string> <string name="bottom_telemetry_send_title">傳送儀表板資料</string> <string name="bottom_telemetry_send_auto">自動</string> <string name="bottom_telemetry_send_auto_hint">為這裡列出的所有遊戲開啟,包括之後找到的遊戲。你關閉的遊戲會維持關閉。</string> @@ -1838,7 +1831,6 @@ <string name="bottom_telemetry_balance">餘額</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">開啟賽車遊戲的資料輸出(通常稱為遙測或 UDP),即可在此查看即時儀表。資料只會留在這部裝置上。</string> <string name="bottom_telemetry_unknown_format">連接埠 %1$d 正在接收資料(%2$d 個 %3$d 位元組的封包),但此頁面目前還無法讀取這種格式。</string> <string name="bottom_telemetry_port_busy">其他程式已在使用連接埠 %1$s,因此該遊戲無法在此顯示。</string> @@ -3599,4 +3591,33 @@ <string name="gog_repair_action">修復檔案</string> <string name="gog_refresh_action">重新整理安裝</string> <string name="gog_select_patch">選取</string> + <string name="stores_gamejolt_not_owned">不在你的 Game Jolt 收藏庫中</string> + <string name="stores_gamejolt_no_build">這個遊戲沒有 Windows 下載</string> + <string name="stores_gamejolt_no_exe">下載內容中找不到 Windows 遊戲</string> + <string name="stores_gamejolt_no_game">在 Game Jolt 找不到這款遊戲</string> + <string name="stores_gamejolt_browse_failed">無法從 Game Jolt 載入遊戲</string> + <string name="stores_gamejolt_download_failed">Game Jolt 回應 HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">無法從 Game Jolt 載入下載內容</string> + <string name="stores_gamejolt_build_open">在 Game Jolt 開啟</string> + <string name="stores_gamejolt_archive">不支援 %1$s 壓縮檔</string> + <string name="stores_gamejolt_extract_failed">無法解壓縮下載內容(代碼 %1$d)</string> + <string name="stores_gamejolt_download_unreachable">無法連線至 Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt 未提供下載連結</string> + <string name="stores_gamejolt_section_featured">精選</string> + <string name="stores_gamejolt_section_hot">熱門</string> + <string name="stores_gamejolt_section_best">最佳</string> + <string name="stores_gamejolt_section_new">最新</string> + <string name="stores_gamejolt_price_under_30">30 美元或以下</string> + <string name="stores_gamejolt_os_other">其他</string> + <string name="stores_gamejolt_maturity_everyone">全年齡</string> + <string name="stores_gamejolt_maturity_teen">青少年</string> + <string name="stores_gamejolt_maturity_adult">成人</string> + <string name="stores_gamejolt_status_complete">已完成</string> + <string name="stores_gamejolt_status_early">搶先體驗</string> + <string name="stores_gamejolt_partners">合作夥伴遊戲</string> + <string name="stores_gamejolt_filter_browser">瀏覽器</string> + <string name="stores_gamejolt_filter_maturity">內容分級</string> + <string name="stores_gamejolt_filter_status">狀態</string> + <string name="stores_gamejolt_filter_partners">合作夥伴</string> + <string name="stores_gamejolt_followed">已追蹤的遊戲</string> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5635c01723..00b2c3a799 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -342,8 +342,8 @@ <string name="mode_background_downloads_hint">Delay background suspension while Steam is actively downloading.</string> <string name="mode_suspend_note">Auto pauses in the background and resumes when shown. Manual waits for Resume. Never keeps running.</string> <string name="mode_startup">Startup</string> - <string name="mode_steam_startup">Start Steam with DroidDeck</string> - <string name="mode_steam_startup_hint">Opens the Steam session when DroidDeck launches.</string> + <string name="mode_startup_session">Open at launch</string> + <string name="mode_startup_session_hint">Starts this session when DroidDeck launches.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Checking for releases…</string> <string name="mode_decky_ready">Ready to install %1$s.</string> @@ -464,6 +464,12 @@ <string name="libraries_overlap">That folder is already a library or inside one</string> <string name="libraries_missing">%1$s · not available</string> <string name="libraries_applies_next">Applies from the next Steam session</string> + <string name="libraries_found_hint">Found on this device · %1$s · %2$s</string> + <string name="libraries_add_found">Add</string> + <string name="libraries_access_title">Find libraries on internal storage</string> + <string name="libraries_access_hint">Allow all files access so DroidDeck can see Steam libraries other apps keep on internal storage</string> + <string name="libraries_access_allow">Allow</string> + <string name="libraries_used_inner">Added %1$s, the Steam library inside the folder you chose</string> <string name="mode_storage_note">Games that stream assets from SD or shared storage may stutter.</string> <string name="mode_storage_diagnostics">Storage diagnostics</string> <string name="mode_storage_diagnostics_hint">Record allocation results and sampled storage timings in Share logs. May slow installs while enabled. Applies next session.</string> @@ -943,13 +949,13 @@ <string name="setup_fullscreen">Fullscreen</string> <string name="setup_fullscreen_on">Hides the Android status and navigation bars</string> <string name="setup_fullscreen_off">Shows the Android status and navigation bars</string> - <string name="setup_dual_screen">Dual screen</string> - <string name="setup_dual_screen_hint">Automatic uses the second screen on handhelds with a built-in one. On uses any second display. Off keeps the launcher and games on one screen; you can still pick a second screen from the session menu.</string> + <string name="setup_dual_screen_launcher">Dual screen launcher</string> + <string name="setup_dual_screen_launcher_hint">Automatic puts the launcher sections (Steam, Library, Stores and the rest) on the second screen of handhelds with a built-in one. On uses any second display. Off keeps the launcher on one screen.</string> + <string name="setup_dual_screen_sessions">Dual screen sessions</string> + <string name="setup_dual_screen_sessions_hint">Automatic docks the in-game menu on the built-in second screen instead of a pop-over. On uses any second display. Off keeps the menu on the game screen; you can still pick a second screen from it.</string> <string name="setup_dual_screen_auto">Automatic</string> <string name="setup_dual_screen_on">On</string> <string name="setup_dual_screen_off">Off</string> - <string name="setup_dual_screen_menu">Bottom screen menu</string> - <string name="setup_dual_screen_menu_hint">Moves the sections and the in-game menu to the second screen and types there, so the top screen keeps the full view. L2 and R2 switch sections.</string> <string name="setup_dual_screen_controls">Bottom screen controls in games</string> <string name="setup_dual_screen_controls_hint">Opens the trackpad and keyboard on the second screen when a session starts.</string> <string name="dual_typing_title">Typing on the top screen</string> @@ -1904,6 +1910,12 @@ <string name="bottom_desktop_failed">The desktop couldn\'t start. Its logs are in this session\'s bottom-desktop folder.</string> <string name="bottom_desktop_off">The desktop is closed.</string> <string name="bottom_dashboard_empty">Nothing to show here yet.</string> + <string name="swap_screens">Swap screens</string> + <string name="swap_screens_unavailable">The bottom screen is not free right now</string> + <string name="swap_game_screen_group">Game screen</string> + <string name="swap_game_screen">Show the game on</string> + <string name="swap_game_screen_top">Top screen</string> + <string name="swap_game_screen_bottom">Bottom screen</string> <string name="bottom_page_downloads">Downloads</string> <string name="bottom_downloads_none">No downloads running.</string> <string name="bottom_downloads_steam">Steam</string> @@ -1928,8 +1940,6 @@ <string name="stats_trace">Throttle and brake, last 10 s</string> <string name="stats_speed_chart">Speed, %1$s</string> <string name="stats_gear">Gear</string> - <string name="stats_speed_units">Speed units</string> - <string name="stats_speed_units_auto">Automatic (%1$s)</string> <string name="stats_steam_client_arm">Steam Client ARM</string> <string name="stats_steam_client_x86">Steam Client x86</string> <string name="stats_throttle">Throttle</string> @@ -1947,7 +1957,6 @@ <string name="stats_fuel_t">Fuel, t</string> <string name="stats_fuel_main">Main %1$s t</string> <string name="stats_fuel_reserve">Reserve %1$s t</string> - <string name="stats_tap_hint">Tap the HUD, the top strip or the dash to change its style.</string> <string name="stats_hud_frametime">Frame time</string> <string name="stats_hud_last_seconds">last %1$d s</string> <string name="stats_hud_avg_frame">avg frame</string> @@ -1986,10 +1995,7 @@ <string name="bottom_chat_volume">Volume %1$d%%</string> <string name="bottom_page_telemetry">In-game stats</string> <string name="bottom_hud_group">Bottom screen HUD</string> - <string name="bottom_hud_group_detail">Works with the top HUD off and does not change it. The number switches below are for the Line strip: under the tabs, and the Line style above a game\'s dashboard.</string> - <string name="bottom_hud_hint">The big HUD, the Line strip and the strip under the tabs. A game\'s dashboard stays.</string> <string name="bottom_strip_tabs">Strip on every tab</string> - <string name="bottom_strip_tabs_hint">Shows the line under the tabs while you use the bottom screen.</string> <string name="bottom_strip_lows" formatted="false">1% and 0.1% lows</string> <string name="bottom_strip_cpu_temp">CPU temperature</string> <string name="bottom_telemetry_fps">FPS</string> @@ -2007,7 +2013,6 @@ <string name="bottom_telemetry_balance">Balance</string> <string name="bottom_telemetry_war_thunder">War Thunder</string> <string name="bottom_telemetry_elite">Elite Dangerous</string> - <string name="bottom_telemetry_help">Turn on a game\'s data output (often called telemetry or UDP) to see a live dash here. It stays on this device.</string> <string name="bottom_telemetry_unknown_format">Port %1$d receives data (%2$d packets of %3$d bytes), but in a format this page cannot read yet.</string> <string name="bottom_telemetry_port_busy">Another program already uses port %1$s, so that game cannot show here.</string> @@ -3706,4 +3711,33 @@ <string name="steam_import_names_more">%1$s and %2$d more</string> <string name="steam_import_now">Restart now</string> <string name="steam_import_later">Later</string> + <string name="stores_gamejolt_not_owned">Not in your Game Jolt library</string> + <string name="stores_gamejolt_no_build">No Windows download for this game</string> + <string name="stores_gamejolt_no_exe">No Windows game found in the download</string> + <string name="stores_gamejolt_no_game">Could not find this game on Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Could not load games from Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt answered HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Could not load the downloads from Game Jolt</string> + <string name="stores_gamejolt_build_open">Open on Game Jolt</string> + <string name="stores_gamejolt_download_unreachable">Could not reach Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt did not give a download link</string> + <string name="stores_gamejolt_archive">%1$s archives are not supported</string> + <string name="stores_gamejolt_extract_failed">Could not extract the download (exit %1$d)</string> + <string name="stores_gamejolt_section_featured">Featured</string> + <string name="stores_gamejolt_section_hot">Hot</string> + <string name="stores_gamejolt_section_best">Best</string> + <string name="stores_gamejolt_section_new">New</string> + <string name="stores_gamejolt_price_under_30">$30 or less</string> + <string name="stores_gamejolt_os_other">Other</string> + <string name="stores_gamejolt_maturity_everyone">All ages</string> + <string name="stores_gamejolt_maturity_teen">Teen</string> + <string name="stores_gamejolt_maturity_adult">Mature</string> + <string name="stores_gamejolt_status_complete">Complete</string> + <string name="stores_gamejolt_status_early">Early access</string> + <string name="stores_gamejolt_partners">Partner games</string> + <string name="stores_gamejolt_filter_browser">Browser</string> + <string name="stores_gamejolt_filter_maturity">Maturity</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Partners</string> + <string name="stores_gamejolt_followed">Followed games</string> </resources> diff --git a/app/src/main/res/xml/home_button_service.xml b/app/src/main/res/xml/home_button_service.xml index 3b094dcd54..0c67e9effd 100644 --- a/app/src/main/res/xml/home_button_service.xml +++ b/app/src/main/res/xml/home_button_service.xml @@ -3,5 +3,5 @@ android:accessibilityFeedbackType="feedbackGeneric" android:accessibilityFlags="flagRequestFilterKeyEvents" android:canRequestFilterKeyEvents="true" - android:canRetrieveWindowContent="false" + android:canRetrieveWindowContent="true" android:description="@string/integration_shortcuts_service_description" /> diff --git a/app/src/test/java/com/droiddeck/launcher/input/BottomScreenGuestsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/BottomScreenGuestsTest.kt new file mode 100644 index 0000000000..d9c959dae9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/BottomScreenGuestsTest.kt @@ -0,0 +1,76 @@ +package com.droiddeck.launcher.input + +import android.os.Looper +import android.view.accessibility.AccessibilityWindowInfo +import com.droiddeck.launcher.input.BottomScreenGuests.Top +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(manifest = Config.NONE) +class BottomScreenGuestsTest { + private val homes = setOf("com.android.launcher3", "com.retroidpocket.gamelauncher") + + @After fun clear() = DualScreen.setTaken(emptySet()) + + @Test fun onlyTheRetroidPocketDuoAndAynThorWatchTheirBottomScreen() { + assertTrue(BottomScreenGuests.supported("Retroid Pocket Duo", 36)) + assertTrue(BottomScreenGuests.supported(" retroid pocket duo ", 33)) + assertFalse(BottomScreenGuests.supported("Retroid Pocket Duo", 32)) + assertTrue(BottomScreenGuests.supported("AYN Thor", 33)) + assertTrue(BottomScreenGuests.supported("AYN Thor Max", 34)) + assertFalse(BottomScreenGuests.supported("AYN Odin 2", 36)) + assertFalse(BottomScreenGuests.supported("Pixel 8", 36)) + } + + @Test fun anyWindowButTheHomeScreenHoldsTheScreen() { + assertEquals(Top.HOME, BottomScreenGuests.classify("com.android.launcher3", homes)) + assertEquals(Top.GUEST, BottomScreenGuests.classify("com.android.chrome", homes)) + assertEquals(Top.GUEST, BottomScreenGuests.classify("com.retroidpocket.dualscreen.assistant", homes)) + assertEquals(Top.NONE, BottomScreenGuests.classify(null, homes)) + } + + @Test fun theWindowListDecidesWhenItSeesPastDroidDeck() { + assertEquals("com.android.chrome", BottomScreenGuests.holder("com.android.chrome", null, homes)) + assertEquals(null, BottomScreenGuests.holder("com.android.launcher3", "com.android.chrome", homes)) + } + + @Test fun anAppOpenedUnderDroidDeckHoldsTheScreenUntilTheListSeesIt() { + assertEquals("com.google.android.youtube", BottomScreenGuests.holder(null, "com.google.android.youtube", homes)) + assertEquals(null, BottomScreenGuests.holder(null, "com.android.launcher3", homes)) + assertEquals(null, BottomScreenGuests.holder(null, null, homes)) + } + + @Test fun keyboardsAndOverlaysNeverTakeTheScreen() { + assertTrue(BottomScreenGuests.ignorable(AccessibilityWindowInfo.TYPE_INPUT_METHOD)) + assertTrue(BottomScreenGuests.ignorable(AccessibilityWindowInfo.TYPE_ACCESSIBILITY_OVERLAY)) + assertFalse(BottomScreenGuests.ignorable(AccessibilityWindowInfo.TYPE_APPLICATION)) + assertFalse(BottomScreenGuests.ignorable(AccessibilityWindowInfo.TYPE_SYSTEM)) + } + + @Test fun listenersHearWhenTheScreenIsTakenAndFreed() { + var calls = 0 + val listener: () -> Unit = { calls++ } + DualScreen.watchTaken(listener) + DualScreen.setTaken(setOf(2)) + shadowOf(Looper.getMainLooper()).idle() + assertTrue(DualScreen.taken(2)) + assertFalse(DualScreen.taken(0)) + DualScreen.setTaken(setOf(2)) + DualScreen.setTaken(emptySet()) + shadowOf(Looper.getMainLooper()).idle() + assertFalse(DualScreen.taken(2)) + assertEquals(2, calls) + DualScreen.unwatchTaken(listener) + DualScreen.setTaken(setOf(2)) + shadowOf(Looper.getMainLooper()).idle() + assertEquals(2, calls) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt b/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt index c5fd50d60c..e50fcbadf4 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt @@ -29,6 +29,7 @@ class DualScreenTest { @Test fun knownModelsCountWhenTheTypeIsHidden() { assertTrue(DualScreen.isBuiltIn(null, "Retroid Pocket Duo")) assertTrue(DualScreen.isBuiltIn(null, " AYN Thor ")) + assertTrue(DualScreen.isBuiltIn(null, "AYN Thor Max")) assertFalse(DualScreen.isBuiltIn(null, "Pixel 8")) } @@ -65,4 +66,19 @@ class DualScreenTest { SessionPrefs.setDualScreenMode(context, DualScreen.MODE_OFF) assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context)) } + + @Test fun launcherAndSessionsKeepSeparateModes() { + SessionPrefs.setDualScreenMode(context, DualScreen.MODE_OFF) + assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context)) + assertEquals(DualScreen.MODE_AUTO, SessionPrefs.dualScreenSessionMode(context)) + SessionPrefs.setDualScreenSessionMode(context, DualScreen.MODE_ON) + assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context)) + assertEquals(DualScreen.MODE_ON, SessionPrefs.dualScreenSessionMode(context)) + } + + @Test fun anOldDisabledMenuToggleTurnsBothOff() { + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().putBoolean("dualScreenLauncher", false).commit() + assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context)) + assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenSessionMode(context)) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt index a2c5e483bb..77800dc1e4 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt @@ -259,6 +259,78 @@ class BattleNetTest { BattleNet.hostFolder(context, "Z:/root/Games/Stores/Battle.net/Hearthstone/")) } + @Test fun wowForeverIsListedBesideRetailInTheSharedWorldOfWarcraftFolder() { + val pfx = File(BattleNet.prefix(context), "pfx").apply { mkdirs() } + val wow = File(pfx, "drive_c/Program Files (x86)/World of Warcraft").apply { mkdirs() } + File(wow, "_retail_").mkdirs() + File(wow, "_forever_").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").writeBytes(message( + field(1, message(field(1, "wow"), field(2, "wow"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))), + field(1, message(field(1, "wow_forever"), field(2, "wowf"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))), + )) + val games = BattleNet.games(context) + assertEquals(listOf("WoW", "WoWF"), games.map { it.code }) + assertEquals(listOf(wow, File(wow, "_forever_")), games.map { it.folder }) + assertEquals("World of Warcraft: Forever", games[1].name) + assertEquals(2, games.map { it.folder.canonicalPath }.distinct().size) + val shortcut = BattleNet.shortcut(context, games[1])!! + assertTrue(shortcut.launchOptions.endsWith("--exec=\"launch WoWF\"")) + } + + @Test fun anInstallWithAnUnknownUidIsListedByItsProductCode() { + val pfx = File(BattleNet.prefix(context), "pfx").apply { mkdirs() } + File(pfx, "drive_c/Games/World of Warcraft").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").writeBytes(message( + field(1, message(field(1, "wowf_live"), field(2, "wowf"), field(3, message(field(1, "C:/Games/World of Warcraft"))))), + field(1, message(field(1, "unknown_thing"), field(2, "nothing"), field(3, message(field(1, "C:/Games/World of Warcraft"))))), + )) + val games = BattleNet.games(context) + assertEquals(listOf("WoWF"), games.map { it.code }) + assertEquals("wowf_live", games[0].installUid) + assertEquals("wow_forever", games[0].uid) + assertEquals("WoWF", BattleNet.titleForProduct("WOWF")?.code) + assertEquals("WTCG", BattleNet.titleForProduct("wtcg")?.code) + assertNull(BattleNet.titleForProduct("")) + assertEquals(listOf(Triple("wowf_live", "C:/Games/World of Warcraft", "wowf")), + BattleNet.productDbInstalls(message(field(1, message(field(1, "wowf_live"), field(2, "wowf"), field(3, message(field(1, "C:/Games/World of Warcraft")))))))!! + .map { Triple(it.uid, it.path, it.product) }) + } + + @Test fun aGameKeepsTheFolderItWasListedWithWhenAnotherVersionComesOrGoes() { + val root = File(context.filesDir, "World of Warcraft").apply { mkdirs() } + val retailDir = File(root, "_retail_").apply { mkdirs() } + val foreverDir = File(root, "_forever_").apply { mkdirs() } + val wow = BattleNet.title("wow")!! + val forever = BattleNet.title("wow_forever")!! + val classic = BattleNet.title("wow_classic")!! + assertEquals(mapOf("WoWF" to root), BattleNet.ownFolders(mapOf("WoWF" to (forever to root)), mapOf("WoWF" to null))) + assertEquals(mapOf("WoW" to root, "WoWF" to foreverDir), + BattleNet.ownFolders(linkedMapOf("WoW" to (wow to root), "WoWF" to (forever to root)), mapOf("WoW" to null, "WoWF" to null))) + assertEquals(mapOf("WoWF" to foreverDir), BattleNet.ownFolders(mapOf("WoWF" to (forever to root)), mapOf("WoWF" to foreverDir.path))) + assertEquals(mapOf("WoW" to retailDir, "WoWC" to root), + BattleNet.ownFolders(linkedMapOf("WoW" to (wow to root), "WoWC" to (classic to root)), mapOf("WoW" to null, "WoWC" to root.path))) + assertEquals(mapOf("WoW" to root, "WoWC" to root), + BattleNet.ownFolders(linkedMapOf("WoW" to (wow to root), "WoWC" to (classic to root)), mapOf("WoW" to null, "WoWC" to null))) + assertEquals(mapOf("WoWF" to root), BattleNet.ownFolders(mapOf("WoWF" to (forever to root)), mapOf("WoWF" to "/elsewhere"))) + } + + @Test fun theListedFolderIsRememberedAcrossScans() { + val pfx = File(BattleNet.prefix(context), "pfx").apply { mkdirs() } + val wow = File(pfx, "drive_c/Program Files (x86)/World of Warcraft").apply { mkdirs() } + File(wow, "_forever_").mkdirs() + val db = File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").apply { parentFile!!.mkdirs() } + val retail = field(1, message(field(1, "wow"), field(2, "wow"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))) + val forever = field(1, message(field(1, "wow_forever"), field(2, "wowf"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))) + db.writeBytes(message(retail, forever)) + assertEquals(listOf(wow, File(wow, "_forever_")), BattleNet.games(context).map { it.folder }) + db.writeBytes(message(forever)) + assertEquals(listOf(File(wow, "_forever_")), BattleNet.games(context).map { it.folder }) + db.writeBytes(message(forever, retail)) + assertEquals(listOf(File(wow, "_forever_"), wow), BattleNet.games(context).map { it.folder }) + } + @Test fun aGamesShortcutHasBattleNetLaunchItInItsPrefix() { val folder = File(BattleNet.prefix(context), "pfx/drive_c/Program Files (x86)/Diablo IV").apply { mkdirs() } File(folder, "Diablo IV Launcher.exe").writeBytes(byteArrayOf(0x4d, 0x5a)) @@ -291,6 +363,7 @@ class BattleNetTest { assertEquals(codes.distinct(), codes) assertTrue("Fen" in codes && "OSI" in codes && "WTCG" in codes) assertFalse(BattleNet.STORE.any { it.uid == "d3cn" || it.uid == "fen" }) + assertFalse(BattleNet.STORE.any { it.code == "WoWC" || it.code == "WoWF" }) assertEquals("fenris", BattleNet.STORE.first { it.code == "Fen" }.uid) assertTrue(BattleNet.STORE.all { it.uid.matches(Regex("[a-z0-9_]{1,32}")) }) val installed = listOf("fenris", "diablo3_enus", null) diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopLanguageTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopLanguageTest.kt new file mode 100644 index 0000000000..909e6b4d95 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopLanguageTest.kt @@ -0,0 +1,32 @@ +package com.droiddeck.launcher.runtime + +import java.util.Locale +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class DesktopLanguageTest { + private val sha = "a".repeat(64) + + @Test fun indexListsPacksAndSkipsMalformedLines() { + val index = DesktopLanguage.parseIndex("pt_BR $sha 1200\ntr $sha 900\nbad line\nxx short 5\n") + assertEquals(setOf("pt_BR", "tr"), index.keys) + assertTrue(DesktopLanguage.parseIndex("../../x $sha 5\n").isEmpty()) + assertEquals(1200L, index.getValue("pt_BR").size) + } + + @Test fun regionPackThenBareLanguage() { + assertEquals(listOf("pt_BR", "pt"), DesktopLanguage.candidates(Locale.forLanguageTag("pt-BR"))) + assertEquals(listOf("tr_TR", "tr"), DesktopLanguage.candidates(Locale.forLanguageTag("tr"))) + assertEquals(listOf("zh_HK", "zh_TW", "zh"), DesktopLanguage.candidates(Locale.forLanguageTag("zh-HK"))) + } + + @Test fun englishAndUnknownNeedNoPack() { + assertTrue(DesktopLanguage.candidates(Locale.forLanguageTag("en")).isEmpty()) + assertTrue(DesktopLanguage.candidates(Locale.forLanguageTag("sw")).isEmpty()) + } + + @Test fun packsLiveBesideTheDesktopArchive() { + assertEquals("https://h/r/t/", DesktopLanguage.baseUrl("https://h/r/t/desktop-kde.tar.zst")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/BottomDesktopSizeTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BottomDesktopSizeTest.kt new file mode 100644 index 0000000000..bafa252400 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BottomDesktopSizeTest.kt @@ -0,0 +1,25 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Test + +class BottomDesktopSizeTest { + @Test fun theDuosBottomPanelKeepsItsPixels() { + assertEquals(1280 to 848, desktopOutputSize(1280, 848, false, 720f)) + } + + @Test fun aLargerPanelRendersBelowItsResolution() { + assertEquals(826 to 646, desktopOutputSize(1240, 970, false, 720f)) + assertEquals(1280 to 644, desktopOutputSize(1920, 968, false, 720f)) + } + + @Test fun theTopScreenAfterASwapGetsItsOwnPixelsAndTheWideShape() { + assertEquals(1920 to 968, desktopOutputSize(1920, 968, true, 720f)) + assertEquals(1920 to 968, desktopOutputSize(1920, 969, true, 720f)) + } + + @Test fun noPanelNoSize() { + assertEquals(0 to 0, desktopOutputSize(0, 848, true, 720f)) + assertEquals(0 to 0, desktopOutputSize(1280, 0, false, 720f)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/DesktopLocaleTest.kt b/app/src/test/java/com/droiddeck/launcher/session/DesktopLocaleTest.kt new file mode 100644 index 0000000000..91cff65994 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/DesktopLocaleTest.kt @@ -0,0 +1,51 @@ +package com.droiddeck.launcher.session + +import com.droiddeck.launcher.core.AppLanguage +import java.util.Locale +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class DesktopLocaleTest { + private fun lang(tag: String) = DesktopLocale.lang(Locale.forLanguageTag(tag)) + + @Test fun appLanguagesMapToGlibcLocales() { + assertEquals("en_US.UTF-8", lang("en")) + assertEquals("tr_TR.UTF-8", lang("tr")) + assertEquals("pt_BR.UTF-8", lang("pt-BR")) + assertEquals("pt_PT.UTF-8", lang("pt-PT")) + assertEquals("es_MX.UTF-8", lang("es-419")) + assertEquals("zh_CN.UTF-8", lang("zh-CN")) + assertEquals("zh_TW.UTF-8", lang("zh-TW")) + assertEquals("zh_HK.UTF-8", lang("zh-HK")) + } + + @Test fun chineseScriptBeatsRegion() { + assertEquals("zh_CN.UTF-8", lang("zh-Hans-HK")) + assertEquals("zh_TW.UTF-8", lang("zh-Hant-CN")) + assertEquals("zh_TW.UTF-8", lang("zh-MO")) + assertEquals("zh_HK:zh_TW:zh", DesktopLocale.language(Locale.forLanguageTag("zh-HK"))) + } + + @Test fun systemRegionsSurvive() { + assertEquals("en_GB.UTF-8", lang("en-GB")) + assertEquals("fr_CA.UTF-8", lang("fr-CA")) + assertEquals("de_DE.UTF-8", lang("de-XX")) + } + + @Test fun everyAppLanguageHasALocale() { + AppLanguage.supported.forEach { assertTrue(it, lang(it) != DesktopLocale.DEFAULT) } + } + + @Test fun unknownLanguagesFallBack() { + assertEquals(DesktopLocale.DEFAULT, lang("sw")) + } + + @Test fun languageListPrefersTheRegionThenTheLanguage() { + assertEquals("pt_BR:pt", DesktopLocale.language(Locale.forLanguageTag("pt-BR"))) + assertEquals("tr_TR:tr", DesktopLocale.language(Locale.forLanguageTag("tr"))) + assertEquals("en_US", DesktopLocale.language(Locale.forLanguageTag("en"))) + assertNull(DesktopLocale.language(Locale.forLanguageTag("sw"))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/GpuReaderStatusTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GpuReaderStatusTest.kt new file mode 100644 index 0000000000..c7e6867cca --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/GpuReaderStatusTest.kt @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.session + +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Test + +class GpuReaderStatusTest { + @After fun reset() { + KgslBusy.status = "not tried" + KgslClock.status = "not tried" + } + + @Test fun emptyWhereTheReadersWereNotNeeded() { + assertEquals("", GpuStatsComponent.readerStatus()) + } + + @Test fun namesBothReaders() { + KgslBusy.status = "per-context stamps (hardware-scheduled kernel)" + KgslClock.status = "working (680 MHz at start)" + assertEquals( + "kgsl memstore per-context stamps (hardware-scheduled kernel); GPU cycle counter working (680 MHz at start)", + GpuStatsComponent.readerStatus(), + ) + } + + @Test fun rangeCheckFailureIsNamed() { + assertEquals("sample out of range", KgslErrors.describe(KgslClock.RANGE_CHECK_FAILED)) + assertEquals("no error code", KgslErrors.describe(0)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt index 183618ab85..1fa5a5aaf7 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt @@ -65,6 +65,30 @@ class SteamLibrariesTest { assertTrue(SteamLibraries.add(app, nested.path) is SteamLibraries.AddResult.Refused) } + private fun library(dir: File): File = dir.apply { File(this, "steamapps").mkdirs(); File(this, "steamapps/appmanifest_220.acf").writeText("x") } + + @Test fun pickingTheFolderAboveALibraryAddsTheLibraryInside() { + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + val app2 = tmp.newFolder("OtherApp") + library(File(app2, "Steam")) + val entry = (SteamLibraries.add(app, app2.path) as SteamLibraries.AddResult.Added).entry + assertEquals(File(app2, "Steam").path, entry.path) + assertEquals("OtherApp", entry.label) + val empty = tmp.newFolder("Empty") + assertEquals(empty.path, (SteamLibraries.add(app, empty.path) as SteamLibraries.AddResult.Added).entry.path) + } + + @Test fun scanLooksTwoLevelsDownAndSkipsHiddenAndAppFolders() { + val volume = tmp.newFolder("volume") + val shallow = library(File(volume, "SteamLibrary")) + val deep = library(File(volume, "Some App/Steam")) + library(File(volume, "Android/data/x")) + library(File(volume, ".hidden/Steam")) + library(File(volume, "a/b/c")) + val withGames = SteamLibraries.candidates(volume, 2).filter { SteamLibraries.gameCount(it) > 0 } + assertEquals(setOf(shallow, deep), withGames.toSet()) + } + @Test fun unreadableOrInvalidEntriesAreDropped() { assertTrue(SteamLibraries.parse("{oops").isEmpty()) assertEquals(listOf("2"), SteamLibraries.parse("""[{"id":"../x","path":"/a"},{"id":"2","path":"/b","label":""}]""").map { it.id }) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt index 78508a525f..c368ca082b 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt @@ -201,6 +201,15 @@ class StoreInstallRootTest { assertTrue(StoreInstallRoot.unfinished(app).none { it.folder.absolutePath == half.absolutePath }) } + @Test fun aGameBeingUpdatedIsNotAnUnfinishedInstallForAnyStore() { + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + for (store in listOf(Store.EPIC, Store.ITCH, Store.XBOX, Store.AMAZON)) { + val folder = File(StoreInstallRoot.storeDir(StoreInstallRoot.internalRoot(app), store), StoreInstallRoot.folderName("Updating", "u1")).apply { mkdirs() } + StoreGameSidecar(store, "u1", "Updating", "Updating.exe", state = StoreGameSidecar.STATE_UPDATING).write(folder) + assertTrue(StoreInstallRoot.unfinished(app).none { it.folder.absolutePath == folder.absolutePath }) + } + } + @Test fun theScratchCacheIsPrivateAndNamedSafely() { val dir = StoreInstallRoot.scratchDir(app, Store.EPIC, "a/b:c") assertTrue(dir.absolutePath.startsWith(app.cacheDir.absolutePath)) @@ -289,4 +298,9 @@ class StoreInstallRootTest { assertFalse(StoreInstallRoot.insufficientSpace(1L, 1L)) assertFalse(StoreInstallRoot.insufficientSpace(0L, 0L)) } + + @Test fun itchKeepsTheFolderItsGamesWereInstalledInWhateverItsDisplayName() { + assertEquals("itch", StoreInstallRoot.storeDir(File("/games"), Store.ITCH).name) + assertEquals("Game Jolt", StoreInstallRoot.storeDir(File("/games"), Store.GAMEJOLT).name) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowseTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowseTest.kt new file mode 100644 index 0000000000..97b90c6da2 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowseTest.kt @@ -0,0 +1,36 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.junit.Assert.assertEquals +import org.junit.Test + +class GameJoltBrowseTest { + private fun qs(query: GameJoltQuery = GameJoltQuery(), page: Int = 1) = GameJoltBrowse.queryString(query, page) + + @Test fun theDefaultQueryAsksForTheFeaturedSectionByName() { + assertEquals("section=featured", qs()) + } + + @Test fun sectionsPriceAndPagesUseTheSiteNames() { + assertEquals("section=hot", qs(GameJoltQuery(section = GameJoltBrowse.SECTION_HOT))) + assertEquals("section=featured&f_price=5-less&page=3", qs(GameJoltQuery(price = GameJoltBrowse.PRICE_UNDER_5), 3)) + assertEquals("section=featured&f_price=free", qs(GameJoltQuery(price = GameJoltBrowse.PRICE_FREE))) + } + + @Test fun listFiltersKeepTheSiteOrderWhateverTheSelectionOrder() { + assertEquals("section=featured&f_os%5B%5D=windows&f_os%5B%5D=linux", qs(GameJoltQuery(os = setOf("linux", "windows")))) + assertEquals("section=featured&f_browser%5B%5D=html&f_maturity%5B%5D=everyone&f_status%5B%5D=complete&f_partners%5B%5D=partners", + qs(GameJoltQuery(browser = setOf("html"), maturity = setOf("everyone"), status = setOf("complete"), partners = true))) + } + + @Test fun devlogGamesAreNeverAskedFor() { + assertEquals(setOf("complete", "wip"), GameJoltBrowse.effective(GameJoltQuery(), true).status) + assertEquals(setOf("complete", "wip"), GameJoltBrowse.effective(GameJoltQuery(status = setOf("devlog")), true).status) + assertEquals(setOf("wip"), GameJoltBrowse.effective(GameJoltQuery(status = setOf("wip", "devlog")), false).status) + assertEquals("section=featured&f_status%5B%5D=complete&f_status%5B%5D=wip", qs(GameJoltBrowse.effective(GameJoltQuery(), true).copy(maturity = emptySet()))) + } + + @Test fun tagsAreSluggedAndRepeatable() { + assertEquals("co-op", GameJoltBrowse.tagSlug(" Co-Op ")) + assertEquals("section=featured&tag=action&tag=co-op", qs(GameJoltQuery(tags = listOf("Action", "co op")))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuildsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuildsTest.kt new file mode 100644 index 0000000000..7f20f12fd7 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuildsTest.kt @@ -0,0 +1,41 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class GameJoltBuildsTest { + private fun build(id: Int, pkg: Int, release: Int, name: String, vararg flags: String) = JSONObject() + .put("id", id).put("game_package_id", pkg).put("game_release_id", release) + .put("primary_file", JSONObject().put("filename", name).put("filesize", 100)) + .also { b -> flags.forEach { b.put(it, true) } } + + private fun payload(vararg builds: JSONObject) = JSONObject() + .put("packages", JSONArray().put(JSONObject().put("id", 1).put("title", "Main"))) + .put("releases", JSONArray().put(JSONObject().put("id", 10).put("published_on", 100).put("version_number", "1.0")).put(JSONObject().put("id", 11).put("published_on", 200).put("version_number", "1.1"))) + .put("builds", JSONArray(builds.toList())) + .put("launchOptions", JSONArray()) + + @Test fun onlyTheNewestReleaseOfAPackageIsKept() { + val list = GameJoltBuilds.parse(payload(build(1, 1, 10, "old.zip", "os_windows"), build(2, 1, 11, "new.zip", "os_windows"))) + assertEquals(listOf("2"), list.map { it.id }) + assertEquals("1.1", list.first().version) + } + + @Test fun windowsBuildsAreInstallableAndSortFirst() { + val list = GameJoltBuilds.parse(payload(build(1, 1, 11, "game-linux.zip", "os_linux"), build(2, 1, 11, "game-win.zip", "os_windows"))) + assertEquals(listOf("2", "1"), list.map { it.id }) + assertTrue(list[0].installable) + assertFalse(list[1].installable) + } + + @Test fun aBuildWithoutAnOsFlagIsWeb() { + assertEquals(setOf("web"), GameJoltBuilds.platforms(JSONObject())) + assertEquals(setOf("windows", "osx"), GameJoltBuilds.platforms(JSONObject().put("os_windows", true).put("os_mac", true))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollectionsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollectionsTest.kt new file mode 100644 index 0000000000..0e8e1d1ee4 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollectionsTest.kt @@ -0,0 +1,28 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class GameJoltCollectionsTest { + @Test fun playlistsBecomeCollectionsByIdAndName() { + val list = JSONArray() + .put(JSONObject().put("id", 7).put("name", "test list")) + .put(JSONObject().put("id", 0).put("name", "no id")) + .put(JSONObject().put("id", 9).put("name", "")) + val parsed = GameJoltCollections.parse(list) + assertEquals(listOf("playlist:7"), parsed.map { it.id }) + assertEquals(listOf("test list"), parsed.map { it.title }) + } + + @Test fun eachCollectionHasItsOwnGameListEndpoint() { + assertEquals("/web/library/games/followed/@some+one", GameJoltCollections.path(GameJoltCollections.FOLLOWED, "some one")) + assertEquals("/web/library/games/playlist/7", GameJoltCollections.path("playlist:7", "x")) + assertNull(GameJoltCollections.path("playlist:abc", "x")) + assertNull(GameJoltCollections.path("other", "x")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricingTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricingTest.kt new file mode 100644 index 0000000000..48c2f85024 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricingTest.kt @@ -0,0 +1,52 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class GameJoltPricingTest { + private fun pricing(amount: Long, promotional: Boolean = false, currency: Any = JSONObject.NULL) = + JSONObject().put("amount", amount).put("promotional", promotional).put("currency_code", currency) + + private fun sellable(vararg pricings: JSONObject) = JSONObject().put("type", "paid").put("pricings", JSONArray(pricings.toList())) + + @Test fun aRegularPriceIsShownInDollars() { + val price = GameJoltPricing.of(sellable(pricing(99)))!! + assertEquals("$0.99", price.final) + assertEquals("", price.original) + assertEquals(0, price.discount) + } + + @Test fun aPromotionalPriceBesideTheRegularOneIsASale() { + val price = GameJoltPricing.of(sellable(pricing(500), pricing(350, promotional = true)))!! + assertEquals("$3.50", price.final) + assertEquals("$5.00", price.original) + assertEquals(30, price.discount) + } + + @Test fun aPromotionalPriceAloneShowsNoDiscount() { + val price = GameJoltPricing.of(sellable(pricing(350, promotional = true)))!! + assertEquals("$3.50", price.final) + assertEquals("", price.original) + assertEquals(0, price.discount) + } + + @Test fun aPromotionalPriceNotBelowTheRegularOneIsNotASale() { + val price = GameJoltPricing.of(sellable(pricing(500), pricing(500, promotional = true)))!! + assertEquals("", price.original) + assertEquals(0, price.discount) + } + + @Test fun aGameWithoutPricingsHasNoPrice() { + assertNull(GameJoltPricing.of(sellable())) + assertNull(GameJoltPricing.of(null)) + } + + @Test fun anotherCurrencyIsNamed() { + assertEquals("1.50 EUR", GameJoltPricing.of(sellable(pricing(150, currency = "EUR")))!!.final) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdatesTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdatesTest.kt new file mode 100644 index 0000000000..109da6c362 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdatesTest.kt @@ -0,0 +1,63 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class GameJoltUpdatesTest { + private fun build(id: String, pkg: String, stamp: String, windows: Boolean = true, name: String = "game.zip") = + GameJoltBuild(id, pkg, "Main", "1.0", name, 100L, stamp, if (windows) setOf("windows") else setOf("linux"), "", "") + + @Test fun aNewerReleaseOfTheSamePackageIsAnUpdate() { + val update = GameJoltUpdates.evaluate(listOf(build("20", "1", "200", name = "new.zip")), "10", "1", "100")!! + assertEquals("20", update.buildId) + assertEquals("new.zip", update.filename) + assertFalse(update.replaced) + } + + @Test fun theInstalledBuildIsNotAnUpdate() { + assertNull(GameJoltUpdates.evaluate(listOf(build("10", "1", "100")), "10", "1", "100")) + } + + @Test fun anOlderBuildIsNotAnUpdate() { + assertNull(GameJoltUpdates.evaluate(listOf(build("5", "1", "50")), "10", "1", "100")) + } + + @Test fun theSameReleaseTimeWithAHigherBuildIdIsAnUpdate() { + assertEquals("11", GameJoltUpdates.evaluate(listOf(build("11", "1", "100")), "10", "1", "100")?.buildId) + } + + @Test fun otherPackagesDoNotCount() { + assertEquals("30", GameJoltUpdates.evaluate(listOf(build("40", "2", "900"), build("30", "1", "300")), "10", "1", "100")?.buildId) + } + + @Test fun aRemovedPackageFallsBackToTheNewPreferredBuildAndSaysSo() { + val update = GameJoltUpdates.evaluate(listOf(build("40", "2", "900")), "10", "1", "100")!! + assertEquals("40", update.buildId) + assertTrue(update.replaced) + } + + @Test fun nonWindowsBuildsAreNeverOffered() { + assertNull(GameJoltUpdates.evaluate(listOf(build("40", "1", "900", windows = false)), "10", "1", "100")) + } + + @Test fun nothingToCompareMeansNoUpdate() { + assertNull(GameJoltUpdates.evaluate(null, "10", "1", "100")) + assertNull(GameJoltUpdates.evaluate(listOf(build("40", "1", "900")), "", "1", "100")) + } + + @Test fun foundUpdatesSurviveEncodingAndDropEntriesWithoutABuild() { + val saved = GameJoltUpdates.encode(mapOf("gamejolt:1" to GameJoltUpdate("20", "200", "new.zip", true))) + val back = GameJoltUpdates.decode(saved).getValue("gamejolt:1") + assertEquals("20", back.buildId) + assertEquals("200", back.stamp) + assertEquals("new.zip", back.filename) + assertTrue(back.replaced) + assertEquals(emptyMap<String, GameJoltUpdate>(), GameJoltUpdates.decode("""{"gamejolt:1":{"stamp":"1"}}""")) + assertEquals(emptyMap<String, GameJoltUpdate>(), GameJoltUpdates.decode("not json")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BottomDesktopFitTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BottomDesktopFitTest.kt new file mode 100644 index 0000000000..42922163a8 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/BottomDesktopFitTest.kt @@ -0,0 +1,21 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Test + +class BottomDesktopFitTest { + @Test fun aDesktopOfThePanelsShapeFillsThePanel() { + assertEquals(1280 to 870, fitDesktop(1280, 870, 1280, 870)) + assertEquals(1280 to 870, fitDesktop(1280, 870, 1278, 868)) + } + + @Test fun aDesktopOfAnotherShapeIsFittedNotStretched() { + val (w, h) = fitDesktop(1920, 1016, 1280, 870) + assertEquals(1016, h) + assertEquals(1494, w) + } + + @Test fun nothingToFitLeavesThePanelSize() { + assertEquals(1920 to 1016, fitDesktop(1920, 1016, 0, 0)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GameScreenSwapTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GameScreenSwapTest.kt new file mode 100644 index 0000000000..04ff32d59c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/GameScreenSwapTest.kt @@ -0,0 +1,35 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class GameScreenSwapTest { + private fun wanted( + requested: Boolean = true, + activityStarted: Boolean = true, + sessionEnded: Boolean = false, + inPip: Boolean = false, + glassesOutput: Boolean = false, + bottomScreenFree: Boolean = true, + ) = GameScreenSwap.wanted(requested, activityStarted, sessionEnded, inPip, glassesOutput, bottomScreenFree) + + @Test fun thePickedSwapPutsTheGameOnTheBottomScreen() { + assertTrue(wanted()) + } + + @Test fun withoutAPickTheGameStaysOnTop() { + assertFalse(wanted(requested = false)) + } + + @Test fun theGameComesBackToTheTopWhenTheSessionIsHiddenOrEnds() { + assertFalse(wanted(activityStarted = false)) + assertFalse(wanted(sessionEnded = true)) + assertFalse(wanted(inPip = true)) + } + + @Test fun glassesAndAHeldBottomScreenWin() { + assertFalse(wanted(glassesOutput = true)) + assertFalse(wanted(bottomScreenFree = false)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt index d703d09bec..7674ab242d 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt @@ -87,6 +87,11 @@ class LibraryEntriesTest { assertEquals(listOf("epic", "gog", "battlenet"), librarySources(entries, listOf("missing", "epic", "epic", "amazon"))) } + @Test fun aSignedInStoreWithNoGamesKeepsItsPlaceInTheStoreOrder() { + val entries = listOf("steam", "xbox").map { LibraryEntry(it, it, it, null, null, true) } + assertEquals(listOf("steam", "xbox", "itch", "gamejolt"), librarySources(entries, listOf("xbox", "itch", "gamejolt"), setOf("itch", "gamejolt"))) + } + @Test fun gameKeysNameEitherAnAppOrAStoreProduct() { GameRef.parse("app:440").let { assertEquals(440, it.appId); assertNull(it.store) } GameRef.parse("app:-12").let { assertEquals(-12, it.appId) } diff --git a/docs/development/gamejolt-store.md b/docs/development/gamejolt-store.md new file mode 100644 index 0000000000..ae8ca0f456 --- /dev/null +++ b/docs/development/gamejolt-store.md @@ -0,0 +1,66 @@ +# Game Jolt store + +The Game Jolt Store tab mirrors the itch.io one: browse, search, game page, build picker, installs, library, collections and updates. + +## Sign-in + +Game Jolt shows the normal sign-in card until an account is signed in. Signing in opens +`StoreLoginActivity` on `https://gamejolt.com/login` (`GameJoltLogin`). The flow is not a token redirect: +Game Jolt is a single-page site, so `StoreLoginActivity.Client.doUpdateVisitedHistory` also reports +navigations, and any gamejolt.com page outside the sign-in, sign-up and legal paths counts as signed in. +`finish` reads the WebView cookies, asks `/web/search/games?q=a` for the top-level `user`, and stores +the cookie header and the user through `GameJoltAuth` (encrypted, `StoreAccounts`). The log names the +cookies and the user keys, never their values. + +## Data + +`GameJoltApi` talks to `https://gamejolt.com/site-api/web/...` with the stored cookies. Games come back as +`{payload, user}`; `GameJoltCatalog` turns a game into a `CatalogItem` (paid only when `sellable.type` is +`paid`). + +Browse queries (`GameJoltBrowse.queryString`): `section=` is always sent first (featured, hot, best, new). +Game Jolt answers 404 to any browse request without it, even an empty one. The rest are `tag=`, `f_price=`, +and `f_os[]`, `f_browser[]`, `f_maturity[]`, `f_status[]`, `f_partners[]`, `page=`. Every page logs its query, +status and game count. The filters are drop-down menus (`BrowseDropdown`, shared with the itch bar). Devlog games have no playable +copy, so the status filter only offers complete and early access, and a browse always asks for those two. With mature +content off, `adult` is stripped from the query, including a stored one. + +## Prices + +`GameJoltPricing.of` reads `sellable.pricings[]` (amounts in cents). The promotional entry is the current price +and the regular entry the original, only when the original is higher; the percent uses integer math. USD (or no +currency) formats as `$12.34`, another currency as `12.34 EUR`. `CatalogItem` carries `finalPrice`, +`originalPrice` and `discountPercent`, so tiles and the game page show prices and sale badges. + +## Library and collections + +`GameJoltLibrary.sync` fetches `/web/library/games/owned/@<user>` (paged, at most every ten minutes, forced by +the refresh action) and merges the games into the store library as owned. `GameJoltCollections` lists the +read-only collections: followed games (`/web/library/games/followed/@<user>`) and the account's playlists +(`/web/library/games/playlist/<id>`). The Library page shows them through the same `CollectionsButton` as itch. +Ownership comes from `sellables[0].is_owned`; `packages[0].is_game_owner` is not reliable. Library chips list a store when it has games in +the list; a signed-in Itch.io or Game Jolt account keeps its chip, in store order, so its collections stay reachable. + +## Builds and installs + +`GameJoltBuilds.parse` reads the overview payload, keeps the newest release of each package and marks +Windows builds installable. The picker (`GameJoltBuildPicker`) installs Windows builds of free games and of paid games the account owns; +Linux builds say "Not supported yet" and everything else, including paid games not owned, opens the Game Jolt page. +`GameJoltInstaller` asks `builds/get-download-url/<id>` for a signed link on every attempt, resumes with +`Range`, unpacks through `StoreArchiveUnpacker` (shared with itch) and picks the launch option or an exe. +An update downloads again and merges through `ItchStaging`, like itch. + +## Updates + +`GameJoltUpdates` works like `ItchUpdates` (see `itch-updates.md`). The install record keeps the release +`published_on` as `installVersion` and `gameId`, `buildId` and `packageId` in `extra`. `evaluate` compares them +with the current builds: a newer release of the same package is an update; if the package is gone, the first +installable Windows build is offered as a replaced build. The automatic check runs when the Game Jolt Library +source opens, at most every six hours, one game per second. A Check for updates button on an installed game's page +checks that game only. Updates stage through `ItchStaging` and the safe folder. Uninstalling or finishing an +install clears the record. Install folders use `Store.folder`, so the Itch.io display name never moves them. + +## Controller + +The menus, chips and buttons are the shared components (`MenuItem`, `AnchoredMenu`, `ValueChip`, `BrowseChip`, +`IconAction`) that already take focus and confirm from a controller. The first menu entry takes initial focus. diff --git a/docs/development/stores.md b/docs/development/stores.md index 1209b7c478..e2995c863b 100644 --- a/docs/development/stores.md +++ b/docs/development/stores.md @@ -233,6 +233,17 @@ picker. Its launcher sets five FuelPump variables frozen at install time: `FUEL_ `AMAZON_GAMES_FUEL_DISPLAY_NAME` (the account name, `Player` without one). No Amazon Games SDK files are deployed into the prefix and `fuel.json` `PostInstall` steps are not run. +GOG's registry data reaches the prefix before Proton starts: a `goggame-<id>.script` install action +with `setRegistry` becomes a `.reg` import through the game's own Proton (`reg.exe import /reg:32`), +once per script revision - `.droiddeck-gog-registry` in the prefix holds the import's hash - and a +failed import is retried on the next launch. GOG completes some installs by running a support +installer from the game folder (the script's `Execute` action); under ARM64 FEX that 32-bit +self-extractor stops at "Path not found", so the values it installs are applied from +`GOG_INSTALL_REGISTRY` in `droiddeck-store-launch` instead: The Witcher: Enhanced Edition's +`HKLM\Software\CD Projekt Red\The Witcher` block and its text/voice languages (#694), without which +`witcher.exe` exits during startup. The language comes from the installed product's +`goggame-<id>.info`, and a script's own `setRegistry` entries always win over the built-in table. + A game's web links reach Android: `droiddeck-store-launch` sets the prefix's `HKCU\Software\Wine\WineBrowser` `Browsers` to `/usr/local/bin/droiddeck-open-url`, which is also `xdg-open` first on the game's PATH, and hands http(s) addresses to the app, which opens them in diff --git a/tools/linuxfs/desktop/droiddeck-desktop b/tools/linuxfs/desktop/droiddeck-desktop index f74d43fe68..799a3dee80 100644 --- a/tools/linuxfs/desktop/droiddeck-desktop +++ b/tools/linuxfs/desktop/droiddeck-desktop @@ -31,6 +31,13 @@ export BL_DESKTOP=1 ln -sf /usr/local/bin/droiddeck-steam-launch /usr/local/bin/steamdeck-steam 2>/dev/null ln -sf /usr/local/bin/droiddeck-steam-shim /usr/local/bin/steam 2>/dev/null python3 /usr/local/bin/droiddeck-desktop-games 2>&1 | sed 's/^/[games] /' +# startplasma applies this file over the session environment, and keeps what an earlier session wrote. +kwriteconfig6 --file plasma-localerc --group Formats --key LANG "${LANG:-C.UTF-8}" +if [ -n "${LANGUAGE:-}" ]; then + kwriteconfig6 --file plasma-localerc --group Translations --key LANGUAGE "$LANGUAGE" +else + kwriteconfig6 --file plasma-localerc --group Translations --key LANGUAGE --delete +fi cat > /usr/share/applications/droiddeck-steam-x64.desktop <<'ENTRY' [Desktop Entry] Type=Application diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index 0ac9d47e55..131c049062 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -357,6 +357,27 @@ GOG_ROOTS = {"HKEY_LOCAL_MACHINE": "HKEY_LOCAL_MACHINE", "HKLM": "HKEY_LOCAL_MAC "HKEY_CLASSES_ROOT": "HKEY_CLASSES_ROOT", "HKCR": "HKEY_CLASSES_ROOT"} WINE_USER = "C:\\users\\steamuser" +# GOG completes some installs by running a support installer from the game folder (the +# goggame-<id>.script "Execute" action). Under ARM64 FEX that 32-bit self-extractor stops at +# "Path not found", so the values it would write are applied here instead. Only products GOG +# ships no setRegistry action for are listed; a script's own entries always win. +# The Witcher: Enhanced Edition (#694) exits during startup unless the installer's +# HKLM\Software\CD Projekt Red\The Witcher keys exist - the same ones The Witcher's own +# setup writes (InstallFolder, RegionVersion, IsDjinniInstalled) plus its language. +GOG_INSTALL_REGISTRY = { + "1207658924": [ + ("HKLM", "Software\\CD Projekt Red\\The Witcher", "InstallFolder", "string", "{app}\\"), + ("HKLM", "Software\\CD Projekt Red\\The Witcher", "RegionVersion", "string", "US"), + ("HKLM", "Software\\CD Projekt Red\\The Witcher", "IsDjinniInstalled", "dword", 1), + ("HKLM", "Software\\CD Projekt Red\\The Witcher", "Language", "string", "{language}"), + ("HKCU", "Software\\CD Projekt RED\\Witcher\\Settings", "TextLanguage", "string", "{language}"), + ("HKCU", "Software\\CD Projekt RED\\Witcher\\Settings", "VoiceLanguage", "string", "{language}"), + ], +} +# The Witcher's text and voice language IDs, from its installer's registry data. +GOG_LANGUAGE_IDS = {"en": 3, "fr": 11, "de": 10, "es": 12, "it": 13, "ru": 14, "cs": 15, "hu": 16, + "zh": 21, "pl": 5} + def gog_paths(folder, product): app = windows_path(str(folder)) @@ -416,8 +437,94 @@ def gog_entry(arguments, paths): return None -def gog_registry(folder): - entries, skipped = [], 0 +def gog_installed_products(folder): + products = {} + for info in sorted(Path(folder).glob("goggame-*.info")): + product = info.name[len("goggame-"):-len(".info")] + if not product.isdigit(): + continue + try: + products[product] = json.loads(info.read_text(encoding="utf-8-sig")) + except (OSError, ValueError): + products[product] = {} + return products + + +def gog_language_id(info): + languages = info.get("languages") if isinstance(info, dict) else None + if isinstance(languages, str): + languages = [languages] + code = str(languages[0]).lower()[:2] if isinstance(languages, list) and languages else "" + return GOG_LANGUAGE_IDS.get(code, GOG_LANGUAGE_IDS["en"]) + + +GOG_VALUE_HIVES = {"hklm": "local_machine", "hkey_local_machine": "local_machine", + "hkcu": "current_user", "hkey_current_user": "current_user", + "hkcr": "classes_root", "hkey_classes_root": "classes_root"} + + +def gog_value_key(root, section, name, view32=True): + """A registry value's identity, keeping the root and the 32-bit view apart. + + The fallback import always targets the 32-bit view (`/reg:32`), which Wine keeps under + `Software\\Wow6432Node` for HKLM: a native HKLM value must not pass for the 32-bit one. + HKCU\\Software is shared by both views, so its values read the same either way. + """ + text = section.replace("\\\\", "\\").strip("\\").lower() + hive = GOG_VALUE_HIVES.get(root.lower(), root.lower()) + if text.startswith("software\\wow6432node\\"): + text = text[len("software\\wow6432node\\"):] + elif hive == "local_machine" and not view32 and text.startswith("software\\"): + text = "native\\" + text + elif text.startswith("software\\"): + text = text[len("software\\"):] + return "%s|%s|%s" % (hive, text, name.lower()) + + +def gog_registry_values(pfx): + """Values already in the prefix, so install defaults never overwrite a player's choice.""" + values = set() + for file, root in (("system.reg", "hklm"), ("user.reg", "hkcu")): + try: + lines = (pfx / file).read_text(encoding="utf-8", errors="ignore").splitlines() + except OSError: + continue + section = "" + for line in lines: + if line.startswith("["): + end = line.find("]") + section = line[1:end] if end > 0 else line[1:] + continue + match = re.match(r'^"([^"]+)"=', line) + if match and section: + values.add(gog_value_key(root, section, match.group(1), view32=False)) + return values + + +def gog_scripted_products(folder): + products = set() + for script in sorted(Path(folder).glob(GOG_SCRIPTS)): + try: + actions = json.loads(script.read_text(encoding="utf-8-sig")).get("actions") + except (OSError, ValueError, AttributeError): + continue + if isinstance(actions, list) and any( + isinstance(action, dict) and isinstance(action.get("install"), dict) + and action["install"].get("action") == "setRegistry" for action in actions): + products.add(script.name[len("goggame-"):-len(".script")]) + return products + + +def gog_expected_values(folder): + """The fallback values a launch must find, so the marker never hides one that was deleted.""" + scripted = gog_scripted_products(folder) + return [gog_value_key(root, subkey, name) for product in gog_installed_products(folder) + if product in GOG_INSTALL_REGISTRY and product not in scripted + for root, subkey, name, _kind, _value in GOG_INSTALL_REGISTRY[product]] + + +def gog_registry(folder, existing=()): + entries, skipped, scripted = [], 0, set() for script in sorted(Path(folder).glob(GOG_SCRIPTS)): product = script.name[len("goggame-"):-len(".script")] try: @@ -434,11 +541,28 @@ def gog_registry(folder): skipped += 1 else: entries.append(entry) + scripted.add(product) + for product, info in gog_installed_products(folder).items(): + if product in scripted or product not in GOG_INSTALL_REGISTRY: + continue + paths = dict(gog_paths(folder, product), language=str(gog_language_id(info))) + for root, subkey, name, kind, value in GOG_INSTALL_REGISTRY[product]: + if gog_value_key(root, subkey, name) in existing: + continue + entry = gog_entry({"root": root, "subkey": subkey, "valueName": name, + "valueType": kind, "valueData": value}, paths) + if entry is None: + skipped += 1 + else: + entries.append(entry) return entries, skipped def apply_gog_registry(folder, compat_data, proton, timeout=90, installation=None): - entries, skipped = gog_registry(folder) + pfx = Path(compat_data) / "pfx" if compat_data else None + existing = gog_registry_values(pfx) if pfx else set() + entries, skipped = gog_registry(folder, existing) + expected = gog_expected_values(folder) if installation: product = str(installation["id"]) if not product.isdigit(): @@ -465,10 +589,10 @@ def apply_gog_registry(folder, compat_data, proton, timeout=90, installation=Non return "no-proton" + note text = "Windows Registry Editor Version 5.00\r\n\r\n" + "".join(entry + "\r\n\r\n" for entry in entries) stamp = hashlib.sha256(text.encode("utf-8")).hexdigest() - pfx = Path(compat_data) / "pfx" marker = pfx / GOG_REGISTRY_MARK try: - if marker.is_file() and marker.read_text() == stamp and (pfx / "system.reg").is_file(): + if (marker.is_file() and marker.read_text() == stamp and (pfx / "system.reg").is_file() + and set(expected) <= existing): return "ready" + note Path(compat_data).mkdir(parents=True, exist_ok=True) with tempfile.TemporaryDirectory(prefix="droiddeck-gog-") as tmp: diff --git a/tools/tests/kgsl_busy_harness.c b/tools/tests/kgsl_busy_harness.c index 14e96bf64f..74255eb08e 100644 --- a/tools/tests/kgsl_busy_harness.c +++ b/tools/tests/kgsl_busy_harness.c @@ -3,6 +3,7 @@ #include <string.h> #include "kgsl_busy.h" +#include "kgsl_layout.h" #define ENTRIES 819 @@ -52,5 +53,61 @@ int main(void) { assert(moved == 0); puts("PASS: kgsl memstore busy"); + + // Hardware-scheduled kernels: ringbuffer entries stay 0, contexts carry the stamps. + memset(memstore, 0, sizeof(memstore)); + static uint32_t seen[ENTRIES], ctx_last[ENTRIES]; + int live[KGSL_BUSY_MAX_LIVE]; + stamp(3, 50, 50); + stamp(9, 21, 20); + stamp(first - 1, 4, 4); + int count = kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE); + assert(count == 3 && live[0] == 3 && live[1] == 9 && live[2] == first - 1); + moved = 0; + assert(kgsl_busy_sample_contexts(memstore, live, count, ctx_last, &moved) == 1); + assert(moved == 1 && ctx_last[9] == 21); + + // Busy or newly started contexts come first; idle ones that have run work stay in the list. + stamp(9, 21, 21); + stamp(5, 2, 1); + count = kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE); + assert(count == 4 && live[0] == 5 && live[1] == 3 && live[2] == 9 && live[3] == first - 1); + moved = 0; + assert(kgsl_busy_sample_contexts(memstore, live, count, ctx_last, &moved) == 1); + assert(moved == 1); + moved = 0; + assert(kgsl_busy_sample_contexts(memstore, live, count, ctx_last, &moved) == 1); + assert(moved == 0); + stamp(5, 2, 2); + assert(kgsl_busy_sample_contexts(memstore, live, count, ctx_last, &moved) == 0); + + // Entry 0 (global) and the ringbuffer entries are not contexts; the live list is capped. + memset(memstore, 0, sizeof(memstore)); + memset(seen, 0, sizeof(seen)); + stamp(0, 8, 7); + stamp(first, 8, 7); + assert(kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE) == 0); + for (int id = 1; id <= KGSL_BUSY_MAX_LIVE + 10; id++) stamp(id, 1, 1); + assert(kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE) == KGSL_BUSY_MAX_LIVE); + assert(kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE) == KGSL_BUSY_MAX_LIVE); + stamp(KGSL_BUSY_MAX_LIVE + 5, 2, 1); + assert(kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE) == KGSL_BUSY_MAX_LIVE); + assert(live[0] == KGSL_BUSY_MAX_LIVE + 5); + stamp(KGSL_BUSY_MAX_LIVE + 5, 0, 0); + count = kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE); + count = kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE); + for (int i = 0; i < count; i++) assert(live[i] != KGSL_BUSY_MAX_LIVE + 5); + puts("PASS: kgsl memstore contexts"); + + assert(kgsl_layout_for(0x44050001u) == &KGSL_LAYOUT_A8XX); // Adreno 830 + assert(kgsl_layout_for(0x44030a20u) == &KGSL_LAYOUT_A8XX); // Adreno 829 + assert(kgsl_layout_for(0x43020100u) == &KGSL_LAYOUT_A7XX); // Adreno 722 + assert(kgsl_layout_for(0x43050a01u) == &KGSL_LAYOUT_A7XX); // Adreno 740 + assert(kgsl_layout_for(0x07010000u) == &KGSL_LAYOUT_A7XX); // Adreno 710 + assert(kgsl_layout_for(0x06030001u) == &KGSL_LAYOUT_A7XX); // Adreno 630 + assert(kgsl_layout_for(0x45000000u) == NULL); + assert(KGSL_LAYOUT_A8XX.always_on == 0x8e7u && KGSL_LAYOUT_A8XX.cycles == 1u); + assert(KGSL_LAYOUT_A7XX.always_on == 0x980u && KGSL_LAYOUT_A7XX.cycles == 0u); + puts("PASS: kgsl counter layout"); return 0; } diff --git a/tools/tests/test_kgsl_busy.py b/tools/tests/test_kgsl_busy.py index 7655b98739..6b75f56b53 100644 --- a/tools/tests/test_kgsl_busy.py +++ b/tools/tests/test_kgsl_busy.py @@ -1,4 +1,4 @@ -"""Exercise the HUD's kgsl memstore busy sampling (app/src/main/cpp/gpuclock/kgsl_busy.h).""" +"""Exercise the HUD's kgsl memstore busy sampling and counter layout (app/src/main/cpp/gpuclock).""" import os from pathlib import Path import shutil @@ -27,6 +27,8 @@ class KgslBusyTest(unittest.TestCase): result = subprocess.run([str(self.binary)], capture_output=True, text=True) self.assertEqual(result.returncode, 0, result.stdout + result.stderr) self.assertIn('PASS: kgsl memstore busy', result.stdout) + self.assertIn('PASS: kgsl memstore contexts', result.stdout) + self.assertIn('PASS: kgsl counter layout', result.stdout) if __name__ == '__main__': diff --git a/tools/tests/test_store_launch.py b/tools/tests/test_store_launch.py index fcdcbb21ec..7ea5a1ae79 100644 --- a/tools/tests/test_store_launch.py +++ b/tools/tests/test_store_launch.py @@ -438,6 +438,120 @@ class GogRegistry(unittest.TestCase): ], entries) self.assertEqual(3, skipped) + def test_a_game_whose_support_installer_cannot_run_gets_the_install_registry(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'language': 'English', 'languages': ['en-US']})) + gog_script(folder, '1207658924', [ + {'install': {'action': 'Execute', 'arguments': {'executable': 'galaxy_the_witcher_enhanced_edition_2.1.0.15.exe'}}}, + ]) + entries, skipped = store.gog_registry(folder) + app = store.windows_path(str(folder)).replace('\\', '\\\\') + self.assertEqual([ + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"InstallFolder"="%s\\\\"' % app, + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"RegionVersion"="US"', + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"IsDjinniInstalled"=dword:00000001', + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"Language"="3"', + '[HKEY_CURRENT_USER\\Software\\CD Projekt RED\\Witcher\\Settings]\r\n"TextLanguage"="3"', + '[HKEY_CURRENT_USER\\Software\\CD Projekt RED\\Witcher\\Settings]\r\n"VoiceLanguage"="3"', + ], entries) + self.assertEqual(0, skipped) + + def test_a_players_language_choice_is_not_overwritten(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['en-US']})) + proton = Path(root) / 'proton' + proton.write_text('selected Proton') + data = Path(root) / 'compat' + (data / 'pfx').mkdir(parents=True) + (data / 'pfx/user.reg').write_text( + '[Software\\\\OtherApp] 1\n"InstallFolder"="C:\\\\Other"\n\n' + '[Software\\\\CD Projekt RED\\\\Witcher\\\\Settings] 1\n"TextLanguage"="5"\n') + imported = [] + def run(argv, **kwargs): + imported.append(Path(argv[4][2:].replace('\\', '/')).read_bytes()[2:].decode('utf-16-le')) + (data / 'pfx/system.reg').write_text('Wine registry') + return __import__('subprocess').CompletedProcess(argv, 0) + with patch.object(store.subprocess, 'run', side_effect=run): + store.apply_gog_registry(folder, str(data), str(proton)) + text = imported[0] + self.assertNotIn('"TextLanguage"', text) + self.assertIn('"VoiceLanguage"', text) + self.assertIn('"InstallFolder"', text) + + def test_malformed_language_metadata_falls_back_to_english(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': 3})) + entries, _ = store.gog_registry(folder) + self.assertIn('"Language"="3"', entries[3]) + + def test_a_native_hklm_value_does_not_replace_the_32_bit_fallback(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['en-US']})) + pfx = Path(root) / 'pfx' + pfx.mkdir() + (pfx / 'system.reg').write_text( + '[Software\\\\CD Projekt Red\\\\The Witcher] 1\n"InstallFolder"="C:\\\\Native"\n') + entries, _ = store.gog_registry(folder, store.gog_registry_values(pfx)) + self.assertTrue(any('"InstallFolder"' in entry for entry in entries)) + (pfx / 'system.reg').write_text( + '[Software\\\\Wow6432Node\\\\CD Projekt Red\\\\The Witcher] 1\n"InstallFolder"="C:\\\\32bit"\n') + entries, _ = store.gog_registry(folder, store.gog_registry_values(pfx)) + self.assertFalse(any('"InstallFolder"' in entry for entry in entries)) + + def test_a_deleted_fallback_value_is_imported_again(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['en-US']})) + proton = Path(root) / 'proton' + proton.write_text('selected Proton') + data = Path(root) / 'compat' + pfx = data / 'pfx' + pfx.mkdir(parents=True) + imported = [] + def run(argv, **kwargs): + imported.append(argv) + (pfx / 'system.reg').write_text( + '[Software\\\\Wow6432Node\\\\CD Projekt Red\\\\The Witcher] 1\n' + '"InstallFolder"="C:\\\\Game"\n"RegionVersion"="US"\n' + '"IsDjinniInstalled"=dword:00000001\n"Language"="3"\n') + (pfx / 'user.reg').write_text( + '[Software\\\\CD Projekt RED\\\\Witcher\\\\Settings] 1\n' + '"TextLanguage"="3"\n"VoiceLanguage"="3"\n') + return __import__('subprocess').CompletedProcess(argv, 0) + with patch.object(store.subprocess, 'run', side_effect=run): + self.assertEqual('written=6', store.apply_gog_registry(folder, str(data), str(proton))) + self.assertEqual('none', store.apply_gog_registry(folder, str(data), str(proton))) + (pfx / 'system.reg').write_text( + '[Software\\\\Wow6432Node\\\\CD Projekt Red\\\\The Witcher] 1\n' + '"RegionVersion"="US"\n"IsDjinniInstalled"=dword:00000001\n"Language"="3"\n') + self.assertEqual('written=1', store.apply_gog_registry(folder, str(data), str(proton))) + self.assertEqual(2, len(imported)) + + def test_the_install_language_selects_the_titles_language_id(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['pl-PL']})) + entries, _ = store.gog_registry(folder) + self.assertIn('"Language"="5"', entries[3]) + + def test_a_script_that_sets_registry_keeps_its_own_values(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['en-US']})) + gog_script(folder, '1207658924', [ + set_registry(root='HKLM', subkey='Software\\CD Projekt Red\\The Witcher', + valueName='InstallFolder', valueData='{app}\\', valueType='string'), + ]) + entries, _ = store.gog_registry(folder) + app = store.windows_path(str(folder)).replace('\\', '\\\\') + self.assertEqual([ + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"InstallFolder"="%s\\\\"' % app, + ], entries) + def test_a_game_without_a_script_starts_without_proton(self): with tempfile.TemporaryDirectory() as root: folder = game(root, store_id='gog')