diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt index 28e36f1806..3445375794 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt @@ -9,7 +9,7 @@ import org.json.JSONObject import java.util.UUID object InputLibraries { - private const val VERSION = 8 + private const val VERSION = 9 private const val KEY = "library" private const val RECOVERY = "library-recovery." const val OVERLAY = "builtin.overlay" @@ -27,6 +27,7 @@ object InputLibraries { var library = decoded ?: scopeLayouts(upgradeStockLayouts(upgradeOverlay(context, migrate(context)))) val version = raw?.let { JSONObject(it).getInt("version") } ?: 0 if (version < 5) library = scopeLayouts(upgradeStockLayouts(upgradeOverlay(context, library))) + if (version < 9) library = neutralStockLayouts(library) if (version < 6 || !p.contains(LegacyScreenKeyMigration.BACKUP)) { val legacy = LegacyScreenKeyMigration.snapshot(context) if (legacy != null) { @@ -148,6 +149,11 @@ object InputLibraries { return result.validate() } + private fun neutralStockLayouts(library: InputLibrary): InputLibrary = library.copy(layouts = library.layouts.map { layout -> + if ((layout.id == DECK || layout.id == TRACKPAD) && layout.style.tint == ControllerPrefs.STEAM_BLUE) layout.copy(style = layout.style.copy(tint = null)) + else layout + }) + private fun upgradeStockLayouts(library: InputLibrary): InputLibrary { val stock = InputStockLayouts.layouts() val replacements = library.layouts.filter { it.template == InputLayoutTemplate.DECK || it.template == InputLayoutTemplate.TRACKPAD } @@ -208,7 +214,7 @@ object InputLibraries { .put("width", e.width.toDouble()).put("height", e.height.toDouble()).put("floating", e.floating).put("hideWhenIdle", e.hideWhenIdle).put("mouseGestures", e.mouseGestures).put("toggle", e.toggle).put("icon", e.icon).put("image", e.image) .put("elementOpacity", e.opacity.toDouble()).put("buttonShape", e.buttonShape.name).put("showLabel", e.showLabel)) layouts.put(JSONObject().put("id", layout.id).put("name", layout.name).put("template", layout.template.name).put("elements", elements) - .put("tint", layout.style.tint).put("opacity", layout.style.opacity).put("screen", layout.screen.name)) + .put("tint", layout.style.tint ?: JSONObject.NULL).put("opacity", layout.style.opacity).put("screen", layout.screen.name)) } val bindings = JSONArray() for (b in library.bindings) { @@ -249,7 +255,7 @@ object InputLibraries { e.optDouble("elementOpacity", 1.0).toFloat(), InputButtonShape.valueOf(e.optString("buttonShape", InputButtonShape.ROUNDED.name)), e.optBoolean("showLabel", true)) } SavedInputLayout(layout.getString("id"), layout.getString("name"), elements, InputLayoutTemplate.valueOf(layout.getString("template")), - InputSurfaceStyle(layout.optInt("tint", ControllerPrefs.STEAM_BLUE), layout.optInt("opacity", 100)), + InputSurfaceStyle(if (!layout.has("tint")) ControllerPrefs.STEAM_BLUE else if (layout.isNull("tint")) null else layout.getInt("tint"), layout.optInt("opacity", 100)), InputLayoutScreen.valueOf(layout.optString("screen", InputLayoutScreen.BOTH.name))) } val bindings = doc.getJSONArray("bindings").objects(512).map { b -> diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt index 217e42216a..ea11d22a0d 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt @@ -9,7 +9,7 @@ enum class InputLayoutScreen { MAIN, SECONDARY, BOTH; if (role == InputRole.PRIMARY) this == MAIN else this == SECONDARY) } -data class InputSurfaceStyle(val tint: Int = ControllerPrefs.STEAM_BLUE, val opacity: Int = 100) +data class InputSurfaceStyle(val tint: Int? = ControllerPrefs.STEAM_BLUE, val opacity: Int = 100) data class SavedInputLayout( val id: String, val name: String, val elements: List = emptyList(), diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputStockLayouts.kt b/app/src/main/java/com/droiddeck/launcher/input/InputStockLayouts.kt index 3ca108c533..abf9388643 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputStockLayouts.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputStockLayouts.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.input internal object InputStockLayouts { + private val NEUTRAL = InputSurfaceStyle(tint = null) const val DECK = "preset.deck" const val TRACKPAD = "preset.trackpad" private fun commands(indices: List): List { @@ -20,9 +21,9 @@ internal object InputStockLayouts { private fun pads() = listOf(InputSurfaceElement(InputControl.LEFT_PAD, .02f, .14f, .47f, .62f), InputSurfaceElement(InputControl.RIGHT_PAD, .51f, .14f, .47f, .62f)) fun layouts() = listOf( - SavedInputLayout(InputLibraries.DECK, "Deck grips + trackpads", commands(listOf(2, 3, 0)) + pads() + grips(), screen = InputLayoutScreen.SECONDARY), + SavedInputLayout(InputLibraries.DECK, "Deck grips + trackpads", commands(listOf(2, 3, 0)) + pads() + grips(), style = NEUTRAL, screen = InputLayoutScreen.SECONDARY), SavedInputLayout(InputLibraries.TRACKPAD, "Trackpad + keyboard", commands(listOf(0, 1)) + - InputSurfaceElement(InputControl.RIGHT_PAD, .02f, .14f, .96f, .84f, mouseGestures = true), screen = InputLayoutScreen.SECONDARY), + InputSurfaceElement(InputControl.RIGHT_PAD, .02f, .14f, .96f, .84f, mouseGestures = true), style = NEUTRAL, screen = InputLayoutScreen.SECONDARY), ) fun actions(layout: SavedInputLayout): Map = (commandActions() + if (layout.id == InputLibraries.TRACKPAD) mapOf( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputLayoutWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputLayoutWidgets.kt index c4c2047d0a..18806c12f2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputLayoutWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputLayoutWidgets.kt @@ -65,18 +65,19 @@ internal class InputLayoutPreviewView(context: Context) : View(context) { } @Composable -internal fun InputColorRow(host: MenuHost, value: Int, onPick: (Int) -> Unit) { +internal fun InputColorRow(host: MenuHost, value: Int?, onPick: (Int?) -> Unit) { val open = host.open == "layout-color" + val tints = listOf>(null to R.string.ctrl_tint_gray) + ControllerPrefs.tints SettingsRow(stringResource(R.string.ctrl_color), null, highlighted = open) { Box { - ValueChip(ControllerPrefs.tints.firstOrNull { it.first == value }?.second?.let { stringResource(it) } + ValueChip(tints.firstOrNull { it.first == value }?.second?.let { stringResource(it) } ?: stringResource(R.string.ctrl_custom), open, modifier = Modifier.testTag("setting-layout-color")) { host.open = if (open) null else "layout-color" } AnchoredMenu(open, onDismiss = { if (host.open == "layout-color") host.open = null }, title = stringResource(R.string.ctrl_color)) { firstItemFocus -> - ControllerPrefs.tints.forEachIndexed { index, (color, name) -> + tints.forEachIndexed { index, (color, name) -> MenuItem(stringResource(name), checked = value == color, leading = { - Box(Modifier.size(14.dp).background(Color(color), CircleShape).border(1.dp, Color.White.copy(alpha = .35f), CircleShape)) + Box(Modifier.size(14.dp).background(Color(color ?: GRAY_SWATCH), CircleShape).border(1.dp, Color.White.copy(alpha = .35f), CircleShape)) }, focusRequester = if (index == 0) firstItemFocus else null) { onPick(color) host.open = null @@ -86,3 +87,5 @@ internal fun InputColorRow(host: MenuHost, value: Int, onPick: (Int) -> Unit) { } } } + +private const val GRAY_SWATCH = 0xFF26292E.toInt() diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e547dae0cd..e30264a8c9 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1885,6 +1885,7 @@ كهرماني أحمر وردي + رمادي الزر A الزر B الزر X 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 810abb2618..136e794fea 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -1877,6 +1877,7 @@ Ámbar Rojo Rosa + Gris Botón A Botón B Botón X diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 09fe1c1604..8da4aaf70e 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1789,6 +1789,7 @@ Кехлибарено Червено Розово + Сиво Бутон A Бутон B Бутон X diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 3474768ff3..ddeaa7c70f 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1837,6 +1837,7 @@ Ambrová Červená Růžová + Šedá Tlačítko A Tlačítko B Tlačítko X diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 489005d1e6..7ec22ce50f 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1789,6 +1789,7 @@ Ravgul Rød Pink + Grå A-knap B-knap X-knap diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 68e733f1bf..e0fbbf939b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1781,6 +1781,7 @@ Bernstein Rot Pink + Grau A-Taste B-Taste X-Taste diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 0040421cd3..016bd6e154 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1789,6 +1789,7 @@ Κεχριμπαρί Κόκκινο Ροζ + Γκρι Κουμπί A Κουμπί B Κουμπί X diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c4e9748793..e71e23af37 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1813,6 +1813,7 @@ Ámbar Rojo Rosa + Gris Botón A Botón B Botón X diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index f18ba8b909..2c1004c4ee 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1789,6 +1789,7 @@ Meripihka Punainen Pinkki + Harmaa A-painike B-painike X-painike diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e8b4dcb518..aba9e23d53 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1813,6 +1813,7 @@ Ambre Rouge Rose + Gris Bouton A Bouton B Bouton X diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 1098f96d21..e25ff3d649 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1789,6 +1789,7 @@ एम्बर लाल गुलाबी + धूसर A बटन B बटन X बटन diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index e2e5b6b40e..f432f7fe7d 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1789,6 +1789,7 @@ Borostyán Piros Rózsaszín + Szürke A gomb B gomb X gomb diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 6279d3c6a2..4c09386e44 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1765,6 +1765,7 @@ Ambar Merah Merah muda + Abu-abu Tombol A Tombol B Tombol X diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 0f0de6a0a0..8d67e96c22 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1805,6 +1805,7 @@ Ambra Rosso Rosa + Grigio Pulsante A Pulsante B Pulsante X diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 9d8c675759..275af4f8d5 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1765,6 +1765,7 @@ アンバー レッド ピンク + グレー Aボタン Bボタン Xボタン diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index baf68c37b9..0718a4038c 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1765,6 +1765,7 @@ 호박색 빨간색 분홍색 + 회색 A 버튼 B 버튼 X 버튼 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index fef1314c88..9a9e5f3dbc 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1765,6 +1765,7 @@ Ambar Merah Merah jambu + Kelabu Butang A Butang B Butang X diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 14f1ce3c84..0609a04547 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1789,6 +1789,7 @@ Amber Rød Rosa + Grå A-knapp B-knapp X-knapp diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 279a434e7b..9e2c6c8740 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1789,6 +1789,7 @@ Amber Rood Roze + Grijs A-knop B-knop X-knop diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f7e6920f62..64e5969cd2 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1837,6 +1837,7 @@ Bursztynowy Czerwony Różowy + Szary Przycisk A Przycisk B Przycisk X diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index b3e112cd19..c7cc165c6f 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1805,6 +1805,7 @@ Âmbar Vermelho Rosa + Cinzento Botão A Botão B Botão X diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 26660803f5..ce848258e6 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1805,6 +1805,7 @@ Âmbar Vermelho Rosa + Cinza Botão A Botão B Botão X diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index c19ea386d5..2d8aba6a8b 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1813,6 +1813,7 @@ Chihlimbariu Roșu Roz + Gri Butonul A Butonul B Butonul X diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c3192a88d0..a9639bacdb 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1883,6 +1883,7 @@ Янтарный Красный Розовый + Серый Кнопка A Кнопка B Кнопка X diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 85564ecfb0..7def460385 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1789,6 +1789,7 @@ Bärnsten Röd Rosa + Grå A-knappen B-knappen X-knappen diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 86ba4d427e..fed46567d0 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1765,6 +1765,7 @@ อำพัน แดง ชมพู + เทา ปุ่ม A ปุ่ม B ปุ่ม X diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 80d9523b75..5b90116e59 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1781,6 +1781,7 @@ Kehribar Kırmızı Pembe + Gri A düğmesi B düğmesi X düğmesi diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 19812c988f..106ea6fb71 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1837,6 +1837,7 @@ Бурштиновий Червоний Рожевий + Сірий Кнопка A Кнопка B Кнопка X diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 6450ad295d..70ec3a7cea 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1765,6 +1765,7 @@ Hổ phách Đỏ Hồng + Xám Nút A Nút B Nút X diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3c0bff104f..5fc4e023bb 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1843,6 +1843,7 @@ 琥珀 红色 粉色 + 灰色 A 键 B 键 X 键 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 04ca81b85c..3259145f3c 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1765,6 +1765,7 @@ 琥珀色 紅色 粉紅色 + 灰色 A 鍵 B 鍵 X 鍵 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 67fbf05d1e..748e99c7fd 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1765,6 +1765,7 @@ 琥珀 紅色 粉紅 + 灰色 A 按鈕 B 按鈕 X 按鈕 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 32382c40d4..d2f7d89528 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1948,6 +1948,7 @@ Amber Red Pink + Gray A button B button X button diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt index b96515a009..3e60587367 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.input import android.content.Context +import org.json.JSONObject import org.junit.Assert.* import org.junit.Before import org.junit.Test @@ -391,4 +392,24 @@ class InputLibraryTest { assertEquals(changed, InputLibraries.decode(InputLibraries.encode(changed))) } + + @Test fun bottomScreenLayoutsKeepTheNeutralLookAndPickedColorsSurvive() { + val fresh = InputLibraries.read(context) + assertNull(fresh.layouts.single { it.id == InputLibraries.DECK }.style.tint) + assertNull(fresh.layouts.single { it.id == InputLibraries.TRACKPAD }.style.tint) + assertEquals(ControllerPrefs.STEAM_BLUE, fresh.layouts.single { it.id == InputLibraries.OVERLAY }.style.tint) + val red = ControllerPrefs.tints.last().first + val blue = fresh.layouts.map { it.copy(style = it.style.copy(tint = if (it.id == InputLibraries.TRACKPAD) red else ControllerPrefs.STEAM_BLUE)) } + val mine = SavedInputLayout("mine", "Mine", listOf(InputSurfaceElement(InputControl.B, .1f, .1f, .1f, .1f))) + val old = JSONObject(InputLibraries.encode(blue.fold(fresh) { library, layout -> library.withLayout(layout) }.withLayout(mine))).put("version", 8) + prefs.edit().putString("library", old.toString()).commit() + val upgraded = InputLibraries.read(context) + assertNull(upgraded.layouts.single { it.id == InputLibraries.DECK }.style.tint) + assertEquals(red, upgraded.layouts.single { it.id == InputLibraries.TRACKPAD }.style.tint) + assertEquals(ControllerPrefs.STEAM_BLUE, upgraded.layouts.single { it.id == InputLibraries.OVERLAY }.style.tint) + assertEquals(ControllerPrefs.STEAM_BLUE, upgraded.layouts.single { it.id == "mine" }.style.tint) + InputLibraries.update(context) { it.withLayout(it.layouts.single { l -> l.id == "mine" }.let { l -> l.copy(style = l.style.copy(tint = null)) }) } + assertNull(InputLibraries.read(context).layouts.single { it.id == "mine" }.style.tint) + assertEquals(InputLibraries.read(context), InputLibraries.read(context)) + } }