diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchBindings.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchBindings.kt
index 697b768aa..9b60e263e 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchBindings.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchBindings.kt
@@ -211,7 +211,7 @@ object SteamTouchBindings {
fun libraryDir(context: Context) = File(SteamTouchConfig.steamRoot(context), "tenfoot/resource/images/library/controller/binding_icons")
fun gameIconsDir(context: Context, appId: Int): File? = try {
- val manifest = File(SteamTouchConfig.steamRoot(context), "steamapps/appmanifest_$appId.acf")
+ val manifest = File(SteamTouchConfig.steamRoot(context), "steamapps/appmanifest_${SteamTouchConfig.steamId(appId)}.acf")
val installDir = KeyValues.parse(manifest.readText()).let { it.child("AppState") ?: it }.string("installdir")
installDir?.let { File(SteamTouchConfig.steamRoot(context), "steamapps/common/$it/TouchMenuIcons") }?.takeIf { it.isDirectory }
} catch (_: Exception) {
diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchConfig.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchConfig.kt
index f1479588c..1387dce25 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchConfig.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchConfig.kt
@@ -126,7 +126,11 @@ object SteamTouchConfig {
}
}
- private val DEFAULT_SET = setOf(DPAD, A, B, X, Y, SELECT, START)
+ private val DEFAULT_SET = setOf(
+ JOYSTICK_LEFT, JOYSTICK_LEFT_BUTTON, JOYSTICK_RIGHT, JOYSTICK_RIGHT_BUTTON,
+ DPAD, A, B, X, Y, SELECT, START,
+ BUMPER_LEFT, BUMPER_RIGHT, TRIGGER_LEFT, TRIGGER_RIGHT,
+ )
private val ALWAYS = setOf(STEAM, THUMB, KEYBOARD)
fun steamId(appId: Int): String = Integer.toUnsignedString(appId)
diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt
index 1046e3b34..1c6921a89 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt
@@ -301,9 +301,8 @@ class SteamTouchControls(
}
}
SteamTouchConfig.STEAM -> {
- if (pressed) canvas.drawCircle(x, y, r, fill)
- canvas.drawCircle(x, y, r, stroke)
- drawMark(canvas, x, y, r * 0.5f, if (pressed) Color.argb(alpha, 23, 26, 33) else ink, alpha)
+ if (isSelected) canvas.drawCircle(x, y, r, stroke)
+ drawMark(canvas, x, y, r * 0.5f, if (pressed) accent else ink, alpha)
}
SteamTouchConfig.SELECT, SteamTouchConfig.START -> {
val binding = visuals[e.type]?.firstOrNull()?.binding
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index e541ee263..439c5c7e8 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2434,7 +2434,7 @@
تم
تعذّر حفظ تخطيط اللمس
تم حفظ تخطيط اللمس في Steam
- التطبيق %1$d
+ التطبيق %1$s
التسمية (اختياري)
لم يتم العثور على أيقونات Steam
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 937197e55..3ee1279f5 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -2342,7 +2342,7 @@
Готово
Сензорното разположение не можа да се запази
Сензорното разположение е запазено в Steam
- Приложение %1$d
+ Приложение %1$s
Етикет (незадължително)
Иконите на Steam не бяха намерени
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 7a475f7d6..299ace9eb 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -2388,7 +2388,7 @@
Hotovo
Dotykové rozložení se nepodařilo uložit
Dotykové rozložení uloženo ve Steamu
- Aplikace %1$d
+ Aplikace %1$s
Popisek (nepovinné)
Ikony Steamu nebyly nalezeny
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index fa2aa94cb..2a0f5c69c 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -2342,7 +2342,7 @@
Udført
Berøringslayoutet kunne ikke gemmes
Berøringslayout gemt i Steam
- App %1$d
+ App %1$s
Etiket (valgfrit)
Steams ikoner blev ikke fundet
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5ab9b43f6..5080c14fb 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2328,7 +2328,7 @@
Fertig
Das Touch-Layout konnte nicht gespeichert werden
Touch-Layout in Steam gespeichert
- App %1$d
+ App %1$s
Bezeichnung (optional)
Steams Symbole wurden nicht gefunden
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index da62fa3f8..95c6e4d18 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -2342,7 +2342,7 @@
Τέλος
Δεν ήταν δυνατή η αποθήκευση της διάταξης αφής
Η διάταξη αφής αποθηκεύτηκε στο Steam
- Εφαρμογή %1$d
+ Εφαρμογή %1$s
Ετικέτα (προαιρετικό)
Τα εικονίδια του Steam δεν βρέθηκαν
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 8aa6c13b6..b5da3bef9 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2359,7 +2359,7 @@
Hecho
No se pudo guardar la disposición táctil
Disposición táctil guardada en Steam
- App %1$d
+ App %1$s
Etiqueta (opcional)
No se encontraron los iconos de Steam
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 1a13b271a..6b08f3383 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -2342,7 +2342,7 @@
Valmis
Kosketusasettelua ei voitu tallentaa
Kosketusasettelu tallennettu Steamiin
- Sovellus %1$d
+ Sovellus %1$s
Nimike (valinnainen)
Steamin kuvakkeita ei löytynyt
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b98fbc905..335128639 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -2359,7 +2359,7 @@
Terminé
Impossible d\'enregistrer la disposition tactile
Disposition tactile enregistrée sur Steam
- Appli %1$d
+ Appli %1$s
Libellé (facultatif)
Les icônes de Steam n\'ont pas été trouvées
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 1bb268afe..0b9dfa1fa 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -2342,7 +2342,7 @@
हो गया
टच लेआउट सेव नहीं हो सका
टच लेआउट Steam में सेव हो गया
- ऐप %1$d
+ ऐप %1$s
लेबल (वैकल्पिक)
Steam के आइकॉन नहीं मिले
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 62cad81fe..304ca0fe5 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -2342,7 +2342,7 @@
Kész
Az érintőelrendezést nem sikerült elmenteni
Az érintőelrendezés elmentve a Steambe
- %1$d. alkalmazás
+ %1$s. alkalmazás
Felirat (nem kötelező)
A Steam ikonjai nem találhatók
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 385748c1a..3bdeed199 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -2319,7 +2319,7 @@
Selesai
Tata letak sentuh tidak dapat disimpan
Tata letak sentuh disimpan ke Steam
- App %1$d
+ App %1$s
Label (opsional)
Ikon Steam tidak ditemukan
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ef4bbacbd..23b604740 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -2351,7 +2351,7 @@
Fine
Impossibile salvare il layout touch
Layout touch salvato su Steam
- App %1$d
+ App %1$s
Etichetta (opzionale)
Le icone di Steam non sono state trovate
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 2d8bae0d2..012061834 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -2319,7 +2319,7 @@
完了
タッチレイアウトを保存できませんでした
タッチレイアウトをSteamに保存しました
- アプリ%1$d
+ アプリ%1$s
ラベル(任意)
Steamのアイコンが見つかりませんでした
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index c091198e3..9ae2a74be 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -2319,7 +2319,7 @@
완료
터치 레이아웃을 저장할 수 없습니다
터치 레이아웃이 Steam에 저장되었습니다
- 앱 %1$d
+ 앱 %1$s
라벨(선택 사항)
Steam 아이콘을 찾을 수 없습니다
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index 88d04d09f..468812272 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -2319,7 +2319,7 @@
Selesai
Susun atur sentuh tidak dapat disimpan
Susun atur sentuh disimpan ke Steam
- Apl %1$d
+ Apl %1$s
Label (pilihan)
Ikon Steam tidak dijumpai
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index ad9c5aca9..c62d7970a 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -2342,7 +2342,7 @@
Fullført
Kunne ikke lagre berøringsoppsettet
Berøringsoppsett lagret til Steam
- App %1$d
+ App %1$s
Etikett (valgfritt)
Steams ikoner ble ikke funnet
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 8f895a218..c84dfc016 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2342,7 +2342,7 @@
Klaar
De aanraakindeling kon niet worden opgeslagen
Aanraakindeling opgeslagen in Steam
- App %1$d
+ App %1$s
Label (optioneel)
Steams pictogrammen zijn niet gevonden
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 30df0484a..aa84a1402 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2388,7 +2388,7 @@
Gotowe
Nie udało się zapisać układu dotykowego
Układ dotykowy zapisany w Steam
- Aplikacja %1$d
+ Aplikacja %1$s
Etykieta (opcjonalnie)
Nie znaleziono ikon Steam
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 3282330fb..0aad541cf 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -2351,7 +2351,7 @@
Concluído
Não foi possível guardar o esquema tátil
Esquema tátil guardado na Steam
- Aplicação %1$d
+ Aplicação %1$s
Etiqueta (opcional)
Os ícones da Steam não foram encontrados
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index f07547c63..4c78fb90c 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -2351,7 +2351,7 @@
Concluído
Não foi possível salvar o layout de toque
Layout de toque salvo na Steam
- App %1$d
+ App %1$s
Rótulo (opcional)
Os ícones da Steam não foram encontrados
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index c49d40cd5..0dc1ba409 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -2365,7 +2365,7 @@
Terminat
Aranjamentul tactil nu a putut fi salvat
Aranjamentul tactil a fost salvat în Steam
- Aplicația %1$d
+ Aplicația %1$s
Etichetă (opțional)
Pictogramele Steam nu au fost găsite
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 431a4c1cb..5024f43a9 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2382,7 +2382,7 @@
Готово
Не удалось сохранить сенсорную раскладку
Сенсорная раскладка сохранена в Steam
- Приложение %1$d
+ Приложение %1$s
Подпись (необязательно)
Значки Steam не найдены
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 3c6a3dc74..e947e6804 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -2342,7 +2342,7 @@
Klar
Det gick inte att spara pekskärmslayouten
Pekskärmslayout sparad till Steam
- App %1$d
+ App %1$s
Etikett (valfritt)
Steams ikoner hittades inte
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index b41944d87..e20aab526 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -2319,7 +2319,7 @@
เสร็จสิ้น
ไม่สามารถบันทึกเค้าโครงสัมผัสได้
บันทึกเค้าโครงสัมผัสลง Steam แล้ว
- แอป %1$d
+ แอป %1$s
ป้ายชื่อ (ไม่บังคับ)
ไม่พบไอคอนของ Steam
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index cbb788002..c7d42b41d 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -2328,7 +2328,7 @@
Bitti
Dokunmatik düzen kaydedilemedi
Dokunmatik düzen Steam\'e kaydedildi
- Uygulama %1$d
+ Uygulama %1$s
Etiket (isteğe bağlı)
Steam\'in simgeleri bulunamadı
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index cfa3f1010..718d3d2a0 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2388,7 +2388,7 @@
Готово
Не вдалося зберегти сенсорну розкладку
Сенсорну розкладку збережено в Steam
- Застосунок %1$d
+ Застосунок %1$s
Підпис (необов\'язково)
Значки Steam не знайдено
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 4bbcc48ef..9c149b54f 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -2319,7 +2319,7 @@
Xong
Không thể lưu bố cục chạm
Đã lưu bố cục chạm vào Steam
- Ứng dụng %1$d
+ Ứng dụng %1$s
Nhãn (không bắt buộc)
Không tìm thấy biểu tượng của Steam
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8a94df188..349464a78 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2319,7 +2319,7 @@
完成
无法保存触控布局
触控布局已保存到 Steam
- 应用 %1$d
+ 应用 %1$s
标签(可选)
未找到 Steam 的图标
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index eb827090b..1985569a4 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -2319,7 +2319,7 @@
完成
無法儲存觸控佈局
觸控佈局已儲存至 Steam
- 應用程式 %1$d
+ 應用程式 %1$s
標籤(選用)
找不到 Steam 的圖示
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 9a81c3ab2..2dbfac297 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -2319,7 +2319,7 @@
完成
無法儲存觸控版面配置
觸控版面配置已儲存至 Steam
- 應用程式 %1$d
+ 應用程式 %1$s
標籤(選用)
找不到 Steam 的圖示
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6e02992c7..aa7a888e7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2421,7 +2421,7 @@
Done
Could not save the touch layout
Touch layout saved to Steam
- App %1$d
+ App %1$s
Label (optional)
Steam\'s icons were not found