mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-21 13:55:58 +00:00
About 650 user-facing strings were written in Kotlin and Java, so no translation could reach them and the UI stayed half English in every language. They now live in values/strings.xml. - Dialogs, menus, status lines, toasts and errors shown to the user go through getString/stringResource. - Code that matched on English text now uses IDs: installer and loading stages, Decky stages, storage labels and the Back button's order labels. - Choice lists (upscalers, FPS limits, textures, themes, presets) carry @StringRes labels instead of English. - Robolectric tests read the app's resources (includeAndroidResources). - Six strings nothing used any more are dropped. Existing translations are untouched; the new strings show in English until they are translated.
This commit is contained in:
1 parent
1951d8bfde
commit
0b04678bdc
76 files changed
+2150
-919
No files matched your search
@@ -21,13 +21,14 @@ import java.io.File
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(sdk = [33])
|
||||
class GameFilesTest {
|
||||
private val app get() = RuntimeEnvironment.getApplication()
|
||||
@get:Rule val tmp = TemporaryFolder()
|
||||
private fun game(id: String = "8400", name: String = "Geometry Wars") =
|
||||
Library.SteamGame(8400, name, null, "internal", id.toULong().toLong())
|
||||
|
||||
@Test fun exportsPortableFilesAndAcceptsFileUriRawPathAndContentUri() {
|
||||
val folder = tmp.newFolder()
|
||||
val file = GameFiles.export(folder, game("18446744073709551615", "A/B: C"))
|
||||
val file = GameFiles.export(app, folder, game("18446744073709551615", "A/B: C"))
|
||||
assertEquals("A_B_ C.steam", file.name)
|
||||
assertEquals("18446744073709551615", file.readText())
|
||||
val context = RuntimeEnvironment.getApplication()
|
||||
@@ -61,21 +62,21 @@ class GameFilesTest {
|
||||
val art = tmp.newFile("cover.jpg").apply { writeBytes(byteArrayOf(1, 2, 3)) }
|
||||
val icon = tmp.newFile("icon.jpg").apply { writeBytes(byteArrayOf(4, 5, 6)) }
|
||||
val game = Library.SteamGame(8400, "Geometry Wars: Retro Evolved", art, "internal", icon = icon)
|
||||
GameFiles.export(folder, game)
|
||||
GameFiles.export(app, folder, game)
|
||||
val image = File(folder, "images/geometry-wars-retro-evolved-icon.jpg")
|
||||
assertArrayEquals(icon.readBytes(), image.readBytes())
|
||||
LibraryCache.save(RuntimeEnvironment.getApplication(), listOf(game))
|
||||
assertEquals(icon, LibraryCache.load(RuntimeEnvironment.getApplication()).single().icon)
|
||||
image.writeText("custom artwork")
|
||||
GameFiles.sync(folder, listOf(game))
|
||||
GameFiles.sync(app, folder, listOf(game))
|
||||
assertEquals("custom artwork", image.readText())
|
||||
GameFiles.sync(folder, emptyList())
|
||||
GameFiles.sync(app, folder, emptyList())
|
||||
assertEquals("custom artwork", image.readText())
|
||||
assertEquals("8400", File(folder, GameFiles.filename(game)).readText())
|
||||
assertEquals(1, folder.listFiles { f -> f.extension == GameFiles.EXTENSION }!!.size)
|
||||
icon.delete()
|
||||
val fallback = tmp.newFolder()
|
||||
GameFiles.export(fallback, game)
|
||||
GameFiles.export(app, fallback, game)
|
||||
assertArrayEquals(art.readBytes(), File(fallback, "images/${image.name}").readBytes())
|
||||
}
|
||||
|
||||
@@ -85,20 +86,20 @@ class GameFilesTest {
|
||||
val note = File(folder, "notes.txt").apply { writeText("Keep me") }
|
||||
val first = game()
|
||||
val second = game("620", "Portal 2")
|
||||
GameFiles.sync(folder, listOf(first, second))
|
||||
GameFiles.sync(app, folder, listOf(first, second))
|
||||
val firstFile = File(folder, GameFiles.filename(first))
|
||||
val secondFile = File(folder, GameFiles.filename(second))
|
||||
val modified = secondFile.apply { writeText("user edit") }
|
||||
val third = game("1", "New install")
|
||||
GameFiles.sync(folder, listOf(first, second, third))
|
||||
GameFiles.sync(app, folder, listOf(first, second, third))
|
||||
assertTrue(File(folder, GameFiles.filename(third)).isFile)
|
||||
assertEquals("user edit", modified.readText())
|
||||
val renamed = game(name = "Geometry Wars: Retro Evolved")
|
||||
GameFiles.sync(folder, listOf(renamed))
|
||||
GameFiles.sync(app, folder, listOf(renamed))
|
||||
assertFalse(firstFile.exists())
|
||||
assertTrue(File(folder, GameFiles.filename(renamed)).isFile)
|
||||
assertEquals("user edit", modified.readText())
|
||||
GameFiles.sync(folder, emptyList())
|
||||
GameFiles.sync(app, folder, emptyList())
|
||||
assertFalse(File(folder, GameFiles.filename(renamed)).exists())
|
||||
assertTrue(unrelated.isFile)
|
||||
assertEquals("Keep me", note.readText())
|
||||
@@ -108,16 +109,16 @@ class GameFilesTest {
|
||||
@Test fun failedExportDoesNotPruneOldInventoryAndNeverOverwritesCollisions() {
|
||||
val folder = tmp.newFolder()
|
||||
val first = game()
|
||||
GameFiles.sync(folder, listOf(first))
|
||||
GameFiles.sync(app, folder, listOf(first))
|
||||
val second = game("620", "Portal 2")
|
||||
val collision = File(folder, GameFiles.filename(second)).apply { writeText("personal file") }
|
||||
val fallback = File(folder, GameFiles.filename(second, disambiguate = true)).apply { writeText("another personal file") }
|
||||
assertThrows(IllegalArgumentException::class.java) { GameFiles.sync(folder, listOf(second)) }
|
||||
assertThrows(IllegalArgumentException::class.java) { GameFiles.sync(app, folder, listOf(second)) }
|
||||
assertEquals("personal file", collision.readText())
|
||||
assertTrue(File(folder, GameFiles.filename(first)).isFile)
|
||||
collision.delete()
|
||||
fallback.delete()
|
||||
GameFiles.sync(folder, listOf(second))
|
||||
GameFiles.sync(app, folder, listOf(second))
|
||||
assertFalse(File(folder, GameFiles.filename(first)).exists())
|
||||
assertTrue(collision.isFile)
|
||||
}
|
||||
@@ -126,7 +127,7 @@ class GameFilesTest {
|
||||
val folder = tmp.newFolder()
|
||||
val games = listOf(game(name = "../.."), game(name = "🎮".repeat(200)), game(name = "\u0000\n"))
|
||||
games.forEach { game ->
|
||||
val file = GameFiles.export(folder, game)
|
||||
val file = GameFiles.export(app, folder, game)
|
||||
assertEquals(folder.canonicalFile, file.canonicalFile.parentFile)
|
||||
assertTrue(file.name.toByteArray().size < 255)
|
||||
}
|
||||
@@ -137,7 +138,7 @@ class GameFilesTest {
|
||||
val outside = tmp.newFile()
|
||||
outside.writeText("8400")
|
||||
java.nio.file.Files.createSymbolicLink(File(folder, GameFiles.filename(game())).toPath(), outside.toPath())
|
||||
assertThrows(IllegalArgumentException::class.java) { GameFiles.export(folder, game()) }
|
||||
assertThrows(IllegalArgumentException::class.java) { GameFiles.export(app, folder, game()) }
|
||||
assertEquals("8400", outside.readText())
|
||||
}
|
||||
|
||||
@@ -145,32 +146,32 @@ class GameFilesTest {
|
||||
val folder = tmp.newFolder()
|
||||
val first = game(name = "Game")
|
||||
val renamed = game(name = "GAME")
|
||||
GameFiles.sync(folder, listOf(first))
|
||||
GameFiles.sync(folder, listOf(renamed))
|
||||
GameFiles.sync(app, folder, listOf(first))
|
||||
GameFiles.sync(app, folder, listOf(renamed))
|
||||
val file = File(folder, GameFiles.filename(renamed))
|
||||
assertTrue(file.isFile)
|
||||
assertEquals("8400", file.inputStream().use(GameFiles::read))
|
||||
assertEquals(1, folder.listFiles()!!.count { it.extension == GameFiles.EXTENSION })
|
||||
GameFiles.sync(folder, emptyList())
|
||||
GameFiles.sync(app, folder, emptyList())
|
||||
assertFalse(file.exists())
|
||||
}
|
||||
|
||||
@Test fun unrelatedInventoryIsPreserved() {
|
||||
val folder = tmp.newFolder()
|
||||
val inventory = File(folder, ".droiddeck-sync.json").apply { writeText("{}") }
|
||||
assertThrows(IllegalArgumentException::class.java) { GameFiles.sync(folder, listOf(game())) }
|
||||
assertThrows(IllegalArgumentException::class.java) { GameFiles.sync(app, folder, listOf(game())) }
|
||||
assertEquals("{}", inventory.readText())
|
||||
assertEquals(0, folder.listFiles()!!.count { it.extension == GameFiles.EXTENSION })
|
||||
}
|
||||
|
||||
@Test fun steamExportContainsOnlyIdForSteamAndAddedGames() {
|
||||
val folder = tmp.newFolder()
|
||||
val file = GameFiles.export(folder, game("620", "Portal 2"))
|
||||
val file = GameFiles.export(app, folder, game("620", "Portal 2"))
|
||||
assertEquals("Portal 2.steam", file.name)
|
||||
assertEquals("620", file.readText())
|
||||
assertEquals("620", GameFiles.readIntent(RuntimeEnvironment.getApplication(), Intent(Intent.ACTION_VIEW, Uri.fromFile(file))))
|
||||
val added = Library.SteamGame(1, "Added Game", null, Library.ADDED, -1L)
|
||||
val addedFile = GameFiles.export(folder, added)
|
||||
val addedFile = GameFiles.export(app, folder, added)
|
||||
assertEquals("Added Game.steam", addedFile.name)
|
||||
assertEquals("18446744073709551615", addedFile.readText())
|
||||
}
|
||||
@@ -181,14 +182,14 @@ class GameFilesTest {
|
||||
val second = game("8400", "A:B")
|
||||
val foreign = File(folder, "Existing.steam").apply { writeText("1") }
|
||||
val existing = game("1", "Existing")
|
||||
GameFiles.sync(folder, listOf(first, second, existing))
|
||||
GameFiles.sync(app, folder, listOf(first, second, existing))
|
||||
val owned = File(folder, "A_B (620).steam")
|
||||
assertEquals("620", owned.readText())
|
||||
assertEquals("8400", File(folder, "A_B (8400).steam").readText())
|
||||
owned.writeText("user edit")
|
||||
GameFiles.sync(folder, listOf(first, second, existing))
|
||||
GameFiles.sync(app, folder, listOf(first, second, existing))
|
||||
assertEquals("user edit", owned.readText())
|
||||
GameFiles.sync(folder, emptyList())
|
||||
GameFiles.sync(app, folder, emptyList())
|
||||
assertEquals("user edit", owned.readText())
|
||||
assertEquals("1", foreign.readText())
|
||||
assertFalse(File(folder, "A_B (8400).steam").exists())
|
||||
@@ -198,13 +199,13 @@ class GameFilesTest {
|
||||
val folder = tmp.newFolder()
|
||||
val collision = File(folder, "Geometry Wars.steam").apply { writeText("other file") }
|
||||
val existing = File(folder, "Geometry Wars (8400).steam").apply { writeText("8400") }
|
||||
GameFiles.sync(folder, listOf(game()))
|
||||
GameFiles.sync(folder, emptyList())
|
||||
GameFiles.sync(app, folder, listOf(game()))
|
||||
GameFiles.sync(app, folder, emptyList())
|
||||
assertEquals("other file", collision.readText())
|
||||
assertEquals("8400", existing.readText())
|
||||
existing.writeText("another file")
|
||||
assertThrows(IllegalArgumentException::class.java) {
|
||||
GameFiles.sync(folder, listOf(game()))
|
||||
GameFiles.sync(app, folder, listOf(game()))
|
||||
}
|
||||
assertEquals("another file", existing.readText())
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user