mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 12:56:06 +00:00
fix(input): restore the neutral look of the bottom-screen controls (#2221)
This commit is contained in:
1 parent
d5f3d1a0d5
commit
6026d72435
38 files changed
+74
-10
No files matched your search
@@ -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 ->
|
||||
|
||||
@@ -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<InputSurfaceElement> = emptyList(),
|
||||
|
||||
@@ -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<Int>): List<InputSurfaceElement> {
|
||||
@@ -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<String, InputAction> = (commandActions() + if (layout.id == InputLibraries.TRACKPAD) mapOf(
|
||||
|
||||
@@ -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<Pair<Int?, Int>>(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()
|
||||
@@ -1885,6 +1885,7 @@
|
||||
<string name="ctrl_tint_amber">كهرماني</string>
|
||||
<string name="ctrl_tint_red">أحمر</string>
|
||||
<string name="ctrl_tint_pink">وردي</string>
|
||||
<string name="ctrl_tint_gray">رمادي</string>
|
||||
<string name="ctrl_button_a">الزر A</string>
|
||||
<string name="ctrl_button_b">الزر B</string>
|
||||
<string name="ctrl_button_x">الزر X</string>
|
||||
|
||||
@@ -1877,6 +1877,7 @@
|
||||
<string name="ctrl_tint_amber">Ámbar</string>
|
||||
<string name="ctrl_tint_red">Rojo</string>
|
||||
<string name="ctrl_tint_pink">Rosa</string>
|
||||
<string name="ctrl_tint_gray">Gris</string>
|
||||
<string name="ctrl_button_a">Botón A</string>
|
||||
<string name="ctrl_button_b">Botón B</string>
|
||||
<string name="ctrl_button_x">Botón X</string>
|
||||
|
||||
@@ -1789,6 +1789,7 @@
|
||||
<string name="ctrl_tint_amber">Кехлибарено</string>
|
||||
<string name="ctrl_tint_red">Червено</string>
|
||||
<string name="ctrl_tint_pink">Розово</string>
|
||||
<string name="ctrl_tint_gray">Сиво</string>
|
||||
<string name="ctrl_button_a">Бутон A</string>
|
||||
<string name="ctrl_button_b">Бутон B</string>
|
||||
<string name="ctrl_button_x">Бутон X</string>
|
||||
|
||||
@@ -1837,6 +1837,7 @@
|
||||
<string name="ctrl_tint_amber">Ambrová</string>
|
||||
<string name="ctrl_tint_red">Červená</string>
|
||||
<string name="ctrl_tint_pink">Růžová</string>
|
||||
<string name="ctrl_tint_gray">Šedá</string>
|
||||
<string name="ctrl_button_a">Tlačítko A</string>
|
||||
<string name="ctrl_button_b">Tlačítko B</string>
|
||||
<string name="ctrl_button_x">Tlačítko X</string>
|
||||
|
||||
@@ -1789,6 +1789,7 @@
|
||||
<string name="ctrl_tint_amber">Ravgul</string>
|
||||
<string name="ctrl_tint_red">Rød</string>
|
||||
<string name="ctrl_tint_pink">Pink</string>
|
||||
<string name="ctrl_tint_gray">Grå</string>
|
||||
<string name="ctrl_button_a">A-knap</string>
|
||||
<string name="ctrl_button_b">B-knap</string>
|
||||
<string name="ctrl_button_x">X-knap</string>
|
||||
|
||||
@@ -1781,6 +1781,7 @@
|
||||
<string name="ctrl_tint_amber">Bernstein</string>
|
||||
<string name="ctrl_tint_red">Rot</string>
|
||||
<string name="ctrl_tint_pink">Pink</string>
|
||||
<string name="ctrl_tint_gray">Grau</string>
|
||||
<string name="ctrl_button_a">A-Taste</string>
|
||||
<string name="ctrl_button_b">B-Taste</string>
|
||||
<string name="ctrl_button_x">X-Taste</string>
|
||||
|
||||
@@ -1789,6 +1789,7 @@
|
||||
<string name="ctrl_tint_amber">Κεχριμπαρί</string>
|
||||
<string name="ctrl_tint_red">Κόκκινο</string>
|
||||
<string name="ctrl_tint_pink">Ροζ</string>
|
||||
<string name="ctrl_tint_gray">Γκρι</string>
|
||||
<string name="ctrl_button_a">Κουμπί A</string>
|
||||
<string name="ctrl_button_b">Κουμπί B</string>
|
||||
<string name="ctrl_button_x">Κουμπί X</string>
|
||||
|
||||
@@ -1813,6 +1813,7 @@
|
||||
<string name="ctrl_tint_amber">Ámbar</string>
|
||||
<string name="ctrl_tint_red">Rojo</string>
|
||||
<string name="ctrl_tint_pink">Rosa</string>
|
||||
<string name="ctrl_tint_gray">Gris</string>
|
||||
<string name="ctrl_button_a">Botón A</string>
|
||||
<string name="ctrl_button_b">Botón B</string>
|
||||
<string name="ctrl_button_x">Botón X</string>
|
||||
|
||||
@@ -1789,6 +1789,7 @@
|
||||
<string name="ctrl_tint_amber">Meripihka</string>
|
||||
<string name="ctrl_tint_red">Punainen</string>
|
||||
<string name="ctrl_tint_pink">Pinkki</string>
|
||||
<string name="ctrl_tint_gray">Harmaa</string>
|
||||
<string name="ctrl_button_a">A-painike</string>
|
||||
<string name="ctrl_button_b">B-painike</string>
|
||||
<string name="ctrl_button_x">X-painike</string>
|
||||
|
||||
@@ -1813,6 +1813,7 @@
|
||||
<string name="ctrl_tint_amber">Ambre</string>
|
||||
<string name="ctrl_tint_red">Rouge</string>
|
||||
<string name="ctrl_tint_pink">Rose</string>
|
||||
<string name="ctrl_tint_gray">Gris</string>
|
||||
<string name="ctrl_button_a">Bouton A</string>
|
||||
<string name="ctrl_button_b">Bouton B</string>
|
||||
<string name="ctrl_button_x">Bouton X</string>
|
||||
|
||||
@@ -1789,6 +1789,7 @@
|
||||
<string name="ctrl_tint_amber">एम्बर</string>
|
||||
<string name="ctrl_tint_red">लाल</string>
|
||||
<string name="ctrl_tint_pink">गुलाबी</string>
|
||||
<string name="ctrl_tint_gray">धूसर</string>
|
||||
<string name="ctrl_button_a">A बटन</string>
|
||||
<string name="ctrl_button_b">B बटन</string>
|
||||
<string name="ctrl_button_x">X बटन</string>
|
||||
|
||||
@@ -1789,6 +1789,7 @@
|
||||
<string name="ctrl_tint_amber">Borostyán</string>
|
||||
<string name="ctrl_tint_red">Piros</string>
|
||||
<string name="ctrl_tint_pink">Rózsaszín</string>
|
||||
<string name="ctrl_tint_gray">Szürke</string>
|
||||
<string name="ctrl_button_a">A gomb</string>
|
||||
<string name="ctrl_button_b">B gomb</string>
|
||||
<string name="ctrl_button_x">X gomb</string>
|
||||
|
||||
@@ -1765,6 +1765,7 @@
|
||||
<string name="ctrl_tint_amber">Ambar</string>
|
||||
<string name="ctrl_tint_red">Merah</string>
|
||||
<string name="ctrl_tint_pink">Merah muda</string>
|
||||
<string name="ctrl_tint_gray">Abu-abu</string>
|
||||
<string name="ctrl_button_a">Tombol A</string>
|
||||
<string name="ctrl_button_b">Tombol B</string>
|
||||
<string name="ctrl_button_x">Tombol X</string>
|
||||
|
||||
@@ -1805,6 +1805,7 @@
|
||||
<string name="ctrl_tint_amber">Ambra</string>
|
||||
<string name="ctrl_tint_red">Rosso</string>
|
||||
<string name="ctrl_tint_pink">Rosa</string>
|
||||
<string name="ctrl_tint_gray">Grigio</string>
|
||||
<string name="ctrl_button_a">Pulsante A</string>
|
||||
<string name="ctrl_button_b">Pulsante B</string>
|
||||
<string name="ctrl_button_x">Pulsante X</string>
|
||||
|
||||
@@ -1765,6 +1765,7 @@
|
||||
<string name="ctrl_tint_amber">アンバー</string>
|
||||
<string name="ctrl_tint_red">レッド</string>
|
||||
<string name="ctrl_tint_pink">ピンク</string>
|
||||
<string name="ctrl_tint_gray">グレー</string>
|
||||
<string name="ctrl_button_a">Aボタン</string>
|
||||
<string name="ctrl_button_b">Bボタン</string>
|
||||
<string name="ctrl_button_x">Xボタン</string>
|
||||
|
||||
@@ -1765,6 +1765,7 @@
|
||||
<string name="ctrl_tint_amber">호박색</string>
|
||||
<string name="ctrl_tint_red">빨간색</string>
|
||||
<string name="ctrl_tint_pink">분홍색</string>
|
||||
<string name="ctrl_tint_gray">회색</string>
|
||||
<string name="ctrl_button_a">A 버튼</string>
|
||||
<string name="ctrl_button_b">B 버튼</string>
|
||||
<string name="ctrl_button_x">X 버튼</string>
|
||||
|
||||
@@ -1765,6 +1765,7 @@
|
||||
<string name="ctrl_tint_amber">Ambar</string>
|
||||
<string name="ctrl_tint_red">Merah</string>
|
||||
<string name="ctrl_tint_pink">Merah jambu</string>
|
||||
<string name="ctrl_tint_gray">Kelabu</string>
|
||||
<string name="ctrl_button_a">Butang A</string>
|
||||
<string name="ctrl_button_b">Butang B</string>
|
||||
<string name="ctrl_button_x">Butang X</string>
|
||||
|
||||
@@ -1789,6 +1789,7 @@
|
||||
<string name="ctrl_tint_amber">Amber</string>
|
||||
<string name="ctrl_tint_red">Rød</string>
|
||||
<string name="ctrl_tint_pink">Rosa</string>
|
||||
<string name="ctrl_tint_gray">Grå</string>
|
||||
<string name="ctrl_button_a">A-knapp</string>
|
||||
<string name="ctrl_button_b">B-knapp</string>
|
||||
<string name="ctrl_button_x">X-knapp</string>
|
||||
|
||||
@@ -1789,6 +1789,7 @@
|
||||
<string name="ctrl_tint_amber">Amber</string>
|
||||
<string name="ctrl_tint_red">Rood</string>
|
||||
<string name="ctrl_tint_pink">Roze</string>
|
||||
<string name="ctrl_tint_gray">Grijs</string>
|
||||
<string name="ctrl_button_a">A-knop</string>
|
||||
<string name="ctrl_button_b">B-knop</string>
|
||||
<string name="ctrl_button_x">X-knop</string>
|
||||
|
||||
@@ -1837,6 +1837,7 @@
|
||||
<string name="ctrl_tint_amber">Bursztynowy</string>
|
||||
<string name="ctrl_tint_red">Czerwony</string>
|
||||
<string name="ctrl_tint_pink">Różowy</string>
|
||||
<string name="ctrl_tint_gray">Szary</string>
|
||||
<string name="ctrl_button_a">Przycisk A</string>
|
||||
<string name="ctrl_button_b">Przycisk B</string>
|
||||
<string name="ctrl_button_x">Przycisk X</string>
|
||||
|
||||
@@ -1805,6 +1805,7 @@
|
||||
<string name="ctrl_tint_amber">Âmbar</string>
|
||||
<string name="ctrl_tint_red">Vermelho</string>
|
||||
<string name="ctrl_tint_pink">Rosa</string>
|
||||
<string name="ctrl_tint_gray">Cinzento</string>
|
||||
<string name="ctrl_button_a">Botão A</string>
|
||||
<string name="ctrl_button_b">Botão B</string>
|
||||
<string name="ctrl_button_x">Botão X</string>
|
||||
|
||||
@@ -1805,6 +1805,7 @@
|
||||
<string name="ctrl_tint_amber">Âmbar</string>
|
||||
<string name="ctrl_tint_red">Vermelho</string>
|
||||
<string name="ctrl_tint_pink">Rosa</string>
|
||||
<string name="ctrl_tint_gray">Cinza</string>
|
||||
<string name="ctrl_button_a">Botão A</string>
|
||||
<string name="ctrl_button_b">Botão B</string>
|
||||
<string name="ctrl_button_x">Botão X</string>
|
||||
|
||||
@@ -1813,6 +1813,7 @@
|
||||
<string name="ctrl_tint_amber">Chihlimbariu</string>
|
||||
<string name="ctrl_tint_red">Roșu</string>
|
||||
<string name="ctrl_tint_pink">Roz</string>
|
||||
<string name="ctrl_tint_gray">Gri</string>
|
||||
<string name="ctrl_button_a">Butonul A</string>
|
||||
<string name="ctrl_button_b">Butonul B</string>
|
||||
<string name="ctrl_button_x">Butonul X</string>
|
||||
|
||||
@@ -1883,6 +1883,7 @@
|
||||
<string name="ctrl_tint_amber">Янтарный</string>
|
||||
<string name="ctrl_tint_red">Красный</string>
|
||||
<string name="ctrl_tint_pink">Розовый</string>
|
||||
<string name="ctrl_tint_gray">Серый</string>
|
||||
<string name="ctrl_button_a">Кнопка A</string>
|
||||
<string name="ctrl_button_b">Кнопка B</string>
|
||||
<string name="ctrl_button_x">Кнопка X</string>
|
||||
|
||||
@@ -1789,6 +1789,7 @@
|
||||
<string name="ctrl_tint_amber">Bärnsten</string>
|
||||
<string name="ctrl_tint_red">Röd</string>
|
||||
<string name="ctrl_tint_pink">Rosa</string>
|
||||
<string name="ctrl_tint_gray">Grå</string>
|
||||
<string name="ctrl_button_a">A-knappen</string>
|
||||
<string name="ctrl_button_b">B-knappen</string>
|
||||
<string name="ctrl_button_x">X-knappen</string>
|
||||
|
||||
@@ -1765,6 +1765,7 @@
|
||||
<string name="ctrl_tint_amber">อำพัน</string>
|
||||
<string name="ctrl_tint_red">แดง</string>
|
||||
<string name="ctrl_tint_pink">ชมพู</string>
|
||||
<string name="ctrl_tint_gray">เทา</string>
|
||||
<string name="ctrl_button_a">ปุ่ม A</string>
|
||||
<string name="ctrl_button_b">ปุ่ม B</string>
|
||||
<string name="ctrl_button_x">ปุ่ม X</string>
|
||||
|
||||
@@ -1781,6 +1781,7 @@
|
||||
<string name="ctrl_tint_amber">Kehribar</string>
|
||||
<string name="ctrl_tint_red">Kırmızı</string>
|
||||
<string name="ctrl_tint_pink">Pembe</string>
|
||||
<string name="ctrl_tint_gray">Gri</string>
|
||||
<string name="ctrl_button_a">A düğmesi</string>
|
||||
<string name="ctrl_button_b">B düğmesi</string>
|
||||
<string name="ctrl_button_x">X düğmesi</string>
|
||||
|
||||
@@ -1837,6 +1837,7 @@
|
||||
<string name="ctrl_tint_amber">Бурштиновий</string>
|
||||
<string name="ctrl_tint_red">Червоний</string>
|
||||
<string name="ctrl_tint_pink">Рожевий</string>
|
||||
<string name="ctrl_tint_gray">Сірий</string>
|
||||
<string name="ctrl_button_a">Кнопка A</string>
|
||||
<string name="ctrl_button_b">Кнопка B</string>
|
||||
<string name="ctrl_button_x">Кнопка X</string>
|
||||
|
||||
@@ -1765,6 +1765,7 @@
|
||||
<string name="ctrl_tint_amber">Hổ phách</string>
|
||||
<string name="ctrl_tint_red">Đỏ</string>
|
||||
<string name="ctrl_tint_pink">Hồng</string>
|
||||
<string name="ctrl_tint_gray">Xám</string>
|
||||
<string name="ctrl_button_a">Nút A</string>
|
||||
<string name="ctrl_button_b">Nút B</string>
|
||||
<string name="ctrl_button_x">Nút X</string>
|
||||
|
||||
@@ -1843,6 +1843,7 @@
|
||||
<string name="ctrl_tint_amber">琥珀</string>
|
||||
<string name="ctrl_tint_red">红色</string>
|
||||
<string name="ctrl_tint_pink">粉色</string>
|
||||
<string name="ctrl_tint_gray">灰色</string>
|
||||
<string name="ctrl_button_a">A 键</string>
|
||||
<string name="ctrl_button_b">B 键</string>
|
||||
<string name="ctrl_button_x">X 键</string>
|
||||
|
||||
@@ -1765,6 +1765,7 @@
|
||||
<string name="ctrl_tint_amber">琥珀色</string>
|
||||
<string name="ctrl_tint_red">紅色</string>
|
||||
<string name="ctrl_tint_pink">粉紅色</string>
|
||||
<string name="ctrl_tint_gray">灰色</string>
|
||||
<string name="ctrl_button_a">A 鍵</string>
|
||||
<string name="ctrl_button_b">B 鍵</string>
|
||||
<string name="ctrl_button_x">X 鍵</string>
|
||||
|
||||
@@ -1765,6 +1765,7 @@
|
||||
<string name="ctrl_tint_amber">琥珀</string>
|
||||
<string name="ctrl_tint_red">紅色</string>
|
||||
<string name="ctrl_tint_pink">粉紅</string>
|
||||
<string name="ctrl_tint_gray">灰色</string>
|
||||
<string name="ctrl_button_a">A 按鈕</string>
|
||||
<string name="ctrl_button_b">B 按鈕</string>
|
||||
<string name="ctrl_button_x">X 按鈕</string>
|
||||
|
||||
@@ -1948,6 +1948,7 @@
|
||||
<string name="ctrl_tint_amber">Amber</string>
|
||||
<string name="ctrl_tint_red">Red</string>
|
||||
<string name="ctrl_tint_pink">Pink</string>
|
||||
<string name="ctrl_tint_gray">Gray</string>
|
||||
<string name="ctrl_button_a">A button</string>
|
||||
<string name="ctrl_button_b">B button</string>
|
||||
<string name="ctrl_button_x">X button</string>
|
||||
|
||||
@@ -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))
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user