diff --git a/app/src/main/java/com/lt2333/simplicitytools/activity/pages/t/SystemUIPageForT.kt b/app/src/main/java/com/lt2333/simplicitytools/activity/pages/t/SystemUIPageForT.kt index cdf11726..48d10428 100644 --- a/app/src/main/java/com/lt2333/simplicitytools/activity/pages/t/SystemUIPageForT.kt +++ b/app/src/main/java/com/lt2333/simplicitytools/activity/pages/t/SystemUIPageForT.kt @@ -51,10 +51,10 @@ import com.lt2333.simplicitytools.R } }) - val layoutCompatibilityModeBinding = GetDataBinding({ - MIUIActivity.safeSP.getInt( - "screen_hole_location", 0 - ) == 2 + val layoutCompatibilityBinding = GetDataBinding({ + MIUIActivity.safeSP.getBoolean( + "layout_compatibility_mode", false + ) }) { view, flags, data -> when (flags) { 1 -> (view as Switch).isEnabled = data as Boolean @@ -62,43 +62,23 @@ import com.lt2333.simplicitytools.R } } - val screenHoleLocation: HashMap = hashMapOf().also { - it[0] = getString(R.string.off) - it[1] = getString(R.string.center) - it[2] = getString(R.string.left_or_right) - } - TextSummaryWithSpinner(TextSummaryV( - textId = R.string.layout_compatibility_mode, tipsId = R.string.screen_hole_location - ), SpinnerV( - screenHoleLocation[MIUIActivity.safeSP.getInt( - "screen_hole_location", 0 - )].toString() - ) { - add(screenHoleLocation[0].toString()) { - MIUIActivity.safeSP.putAny("screen_hole_location", 0) - layoutCompatibilityModeBinding.binding.Send().send(false) - } - add(screenHoleLocation[1].toString()) { - MIUIActivity.safeSP.putAny("screen_hole_location", 1) - layoutCompatibilityModeBinding.binding.Send().send(false) - } - add(screenHoleLocation[2].toString()) { - MIUIActivity.safeSP.putAny("screen_hole_location", 2) - layoutCompatibilityModeBinding.binding.Send().send(true) - } - }) + TextSummaryWithSwitch( + TextSummaryV( + textId = R.string.layout_compatibility_mode, tipsId = R.string.layout_compatibility_mode_summary + ), SwitchV("layout_compatibility_mode", dataBindingSend = layoutCompatibilityBinding.bindingSend) + ) Text( - textId = R.string.left_margin, dataBindingRecv = layoutCompatibilityModeBinding.binding.getRecv(2) + textId = R.string.left_margin, dataBindingRecv = layoutCompatibilityBinding.binding.getRecv(2) ) SeekBarWithText( - "status_bar_left_margin", 0, 300, 0, dataBindingRecv = layoutCompatibilityModeBinding.binding.getRecv(2) + "status_bar_left_margin", 0, 300, 0, dataBindingRecv = layoutCompatibilityBinding.binding.getRecv(2) ) Text( - textId = R.string.right_margin, dataBindingRecv = layoutCompatibilityModeBinding.binding.getRecv(2) + textId = R.string.right_margin, dataBindingRecv = layoutCompatibilityBinding.binding.getRecv(2) ) SeekBarWithText( - "status_bar_right_margin", 0, 300, 0, dataBindingRecv = layoutCompatibilityModeBinding.binding.getRecv(2) + "status_bar_right_margin", 0, 300, 0, dataBindingRecv = layoutCompatibilityBinding.binding.getRecv(2) ) Line() TitleText(textId = R.string.status_bar_clock_format) diff --git a/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/StatusBarLayoutForT.kt b/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/StatusBarLayoutForT.kt index 4faa52f4..c4ea0bab 100644 --- a/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/StatusBarLayoutForT.kt +++ b/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/StatusBarLayoutForT.kt @@ -19,7 +19,8 @@ import com.lt2333.simplicitytools.utils.xposed.base.HookRegister object StatusBarLayoutForT : HookRegister() { private val getMode = XSPUtils.getInt("status_bar_layout_mode", 0) - private val getHoleLocation = XSPUtils.getInt("screen_hole_location", 0) + private val isCompatibilityMode = XSPUtils.getBoolean("layout_compatibility_mode", false) + private var statusBarLeft = 0 private var statusBarTop = 0 @@ -51,7 +52,7 @@ object StatusBarLayoutForT : HookRegister() { } //判断是否开启居中挖孔兼容模式 - if (getHoleLocation == 1) { + if (isCompatibilityMode) { findMethod("com.android.systemui.ScreenDecorations") { name == "boundsFromDirection" && parameterCount == 3 && isStatic }.hookBefore { @@ -163,7 +164,7 @@ object StatusBarLayoutForT : HookRegister() { statusBarBottom = statusBar!!.paddingBottom - if (getHoleLocation == 2) { + if (isCompatibilityMode) { val customLeftMargin = XSPUtils.getInt("status_bar_left_margin", 0) if (customLeftMargin != 0) { statusBarLeft = customLeftMargin @@ -378,7 +379,7 @@ object StatusBarLayoutForT : HookRegister() { statusBarBottom = statusBar!!.paddingBottom - if (getHoleLocation == 2) { + if (isCompatibilityMode) { val customLeftMargin = XSPUtils.getInt("status_bar_left_margin", 0) if (customLeftMargin != 0) { statusBarLeft = customLeftMargin @@ -395,7 +396,7 @@ object StatusBarLayoutForT : HookRegister() { findMethod("com.android.systemui.statusbar.phone.PhoneStatusBarView") { name == "updateLayoutForCutout" }.hookAfter { - if (getHoleLocation == 2) { + if (isCompatibilityMode) { val context = (it.thisObject as ViewGroup).context updateLayout(context) } diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 6b8a1b9d..2b12b57f 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -132,7 +132,6 @@ Režim kompatibility Levý okraj (0: Auto) Pravý okraj (0: Auto) - Umožnit zobrazení levého a pravého otvoru Odstranit makro-černou listinu Skrýt rozdělovač rychlosti sítě - Podpořte pouze použití VAB série, prosím neotevírejte jiné série.\n- Nemusí být potřeba interní testovací kvalifikace, aby bylo možné nainstalovat celý interní testovací balíček.\n- Ti, kdo mají interní testovací oprávnění, nebudou moci přijímat aktualizace interních testů a mohou být použity k blokování aktualizací systému.\n- Po aktualizaci křížových verzí je doporučeno vymazat data.\n- Neoficiální ROM použití není podporováno. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 007c8b11..20db47e5 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -136,7 +136,6 @@ Modo de compatibilidad Margen izquierdo (0: Auto) Margen derecho (0: Auto) - Hace que los agujeros izquierdo y derecho de la pantalla se puedan mostrar normalmente Remueve la lista negra de game macro Remover el divisor de la velocidad de red Actualizador diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index afebd3ed..3c8776dd 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -127,7 +127,6 @@ Mode Compatibilité Marge gauche (0: Auto) Marge droite (0: Auto) - L\'écran de trou peut s\'afficher normalement Supprimer la liste noire des macros du jeu Masquer le écart de vitesse du réseau Mise à jour diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 541d5875..f5eaebae 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -133,7 +133,6 @@ Kompatibilitási mód Bal margó (0: Automatikus) Jobb margó (0: Automatikus) - A bal és jobb oldali lyuk képernyő normálisan jeleníthető meg Játék makró feketelista eltávolítása Hálózati sebességosztó elrejtése Frissítés diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index dd7b3679..4ea20e43 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -126,7 +126,6 @@ Mode kompatibel Batas kiri (0: Otomatis) Batas kanan (0: Otomatis) - Buat layar lubang kiri dan kanan dapat ditampilkan secara normal Hapus pengecualian makro game Sembunyikan pembagi kecepatan jaringan Pembaruan diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 087ccb6f..28425256 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -136,7 +136,6 @@ 互換モード 左マージン(0:自動) 右マージン(0:自動) - 左右の穴の画面を正常に表示できるようにする ゲームのマクロブラックリストを削除 ネットワーク速度分割器を非表示 更新 diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 7bf83944..d78daa84 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -136,7 +136,6 @@ Tryb zgodności Lewy margines (0: autom.) Prawy margines (0: autom.) - Spraw, aby lewy i prawy otwór na aparat mógł być wyświetlany normalnie Usuń czarną listę gier, dla których wyłączono obsługę makr Ukryj rozdzielacz prędkości sieci Aktualizacje diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index abcbb280..de4d940b 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -134,7 +134,6 @@ Mod compatibilitate Marginea din stânga (0: Auto) Marginea din dreapta (0: auto) - Aliniere pictograme Elimină lista neagră a macrocomenzilor jocurilor Ascunde separatorul vitezei rețelei Actualizator diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index ac21dceb..a5c00f78 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -136,7 +136,6 @@ Режим совместимости Отступ слева (0: Авто) Отступ справа (0: Автоматически) - Выравнивание иконок Удалить черный список игровых макросов Скрыть разделитель скорости сети OTA diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index e7b8c523..47352652 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -136,7 +136,6 @@ Uyumluluk modu Sol kenar boşluğu (0: Otomatik) Sağ kenar boşluğu (0: Otomatik) - Sol ve sağ delik ekranının normal olarak görüntülenebilmesini sağlayın Oyun makrosu kara listesini kaldır Ağ hızı ayırıcısını gizle Güncelleyici diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index ca4fab2a..5f985f9c 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -136,7 +136,6 @@ Chế độ tương thích Lề trái (0: Tự động) Lề phải (0: Tự động) - Làm cho màn hình đục lỗ bên trái và bên phải có thể hiển thị bình thường Xóa danh sách đen macro trò chơi Ẩn bộ chia tốc độ mạng Trình cập nhật diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index bf4af2d0..bf481c9c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -136,7 +136,7 @@ 兼容模式 左边距 (0: 自动) 右边距 (0: 自动) - 使左右挖孔屏幕能正常显示 + 强制完整屏布局(支持所有异形屏) 去除游戏自动连招黑名单 隐藏网速分隔符 系统更新 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 19874e2b..66b4c827 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -136,7 +136,6 @@ 兼容模式 左邊距 (0: 自動) 右邊距 (0: 自動) - 使左右挖孔螢幕能正常顯示 去除遊戲自動連招黑名單 隱藏網速分隔符 系統更新 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 9d11d47b..ca101dea 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -136,7 +136,6 @@ 相容模式 左邊距 (0: 自動) 右邊距 (0: 自動) - 使左右挖孔螢幕能正常顯示 去除遊戲自動連招黑名單 隱藏網速分隔符 系統更新 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a46ac4e3..62bad9a6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -140,7 +140,7 @@ Compatibility mode Left margin (0: Auto) Right margin (0: Auto) - Make the left and right hole screen can be displayed normally + Force full screen layout (supports all special-shaped screens) Remove game macro blacklist Hide network speed splitter Updater