Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/src/main/java/com/papi/nova/GameMenu.kt
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,12 @@ class GameMenu @JvmOverloads constructor(
),
)
}))
options.add(MenuOption(getString(R.string.game_menu_send_keys_ctrl_1), Runnable {
sendKeys(shortArrayOf(KeyboardTranslator.VK_LCONTROL.toShort(), KeyboardTranslator.VK_1.toShort()))
}))
options.add(MenuOption(getString(R.string.game_menu_send_keys_ctrl_2), Runnable {
sendKeys(shortArrayOf(KeyboardTranslator.VK_LCONTROL.toShort(), KeyboardTranslator.VK_2.toShort()))
}))
}

val preferences = game.getSharedPreferences(PREF_NAME, Activity.MODE_PRIVATE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,8 @@ class KeyboardTranslator(private val prefConfig: PreferenceConfiguration) : Inpu
private const val KEY_PREFIX = 0x80

const val VK_0 = 48
const val VK_1 = 49
const val VK_2 = 50
const val VK_9 = 57
const val VK_A = 65
const val VK_Z = 90
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/papi/nova/ui/NovaQuickMenu.kt
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,8 @@ class NovaQuickMenu(private val game: Game) : Game.GameMenuCallbacks {
NovaQuickMenuActionId.QUICK_INSERT -> keys(KeyboardTranslator.VK_INSERT)
NovaQuickMenuActionId.QUICK_META -> keys(KeyboardTranslator.VK_LWIN)
NovaQuickMenuActionId.QUICK_CTRL_V -> keys(KeyboardTranslator.VK_LCONTROL, KeyboardTranslator.VK_V)
NovaQuickMenuActionId.QUICK_CTRL_1 -> keys(KeyboardTranslator.VK_LCONTROL, KeyboardTranslator.VK_1)
NovaQuickMenuActionId.QUICK_CTRL_2 -> keys(KeyboardTranslator.VK_LCONTROL, KeyboardTranslator.VK_2)
else -> return
}
dismiss()
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/papi/nova/ui/NovaQuickMenuContent.kt
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ data class NovaQuickMenuCallbacks(
NovaQuickMenuActionId.QUICK_F11,
NovaQuickMenuActionId.QUICK_INSERT,
NovaQuickMenuActionId.QUICK_META,
NovaQuickMenuActionId.QUICK_CTRL_V -> onQuickKey(action.id)
NovaQuickMenuActionId.QUICK_CTRL_V,
NovaQuickMenuActionId.QUICK_CTRL_1,
NovaQuickMenuActionId.QUICK_CTRL_2 -> onQuickKey(action.id)
NovaQuickMenuActionId.NOVA_HUD,
NovaQuickMenuActionId.PERF_STATS,
NovaQuickMenuActionId.DIAGNOSE_STREAM,
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/java/com/papi/nova/ui/NovaQuickMenuUiState.kt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ enum class NovaQuickMenuActionId {
QUICK_INSERT,
QUICK_META,
QUICK_CTRL_V,
QUICK_CTRL_1,
QUICK_CTRL_2,
NOVA_HUD,
PERF_STATS,
DIAGNOSE_STREAM,
Expand Down Expand Up @@ -892,6 +894,14 @@ data class NovaQuickMenuUiState(
NovaQuickMenuAction(
id = NovaQuickMenuActionId.QUICK_CTRL_V,
label = context.getString(R.string.game_menu_send_keys_ctrl_v)
),
NovaQuickMenuAction(
id = NovaQuickMenuActionId.QUICK_CTRL_1,
label = context.getString(R.string.game_menu_send_keys_ctrl_1)
),
NovaQuickMenuAction(
id = NovaQuickMenuActionId.QUICK_CTRL_2,
label = context.getString(R.string.game_menu_send_keys_ctrl_2)
)
)

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,8 @@
<string name="game_menu_send_keys_insert">Insert</string>
<string name="game_menu_send_keys_alt_f4">Alt + F4</string>
<string name="game_menu_send_keys_ctrl_v">Ctrl + V</string>
<string name="game_menu_send_keys_ctrl_1">Ctrl + 1</string>
<string name="game_menu_send_keys_ctrl_2">Ctrl + 2</string>
<string name="game_menu_send_keys_win">Win (Meta)</string>
<string name="game_menu_send_keys_win_d">Win + D</string>
<string name="game_menu_send_keys_alt_b">ALT + B</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ class NovaQuickMenuUiStateTest {
assertTrue(state.quickKeys.any { it.id == NovaQuickMenuActionId.QUICK_ESC && it.label == "ESC" })
assertTrue(state.quickKeys.any { it.id == NovaQuickMenuActionId.QUICK_CTRL_V && it.label == "Ctrl + V" })
assertTrue(state.quickKeys.any { it.id == NovaQuickMenuActionId.QUICK_INSERT && it.label == "Insert" })
assertTrue(state.quickKeys.any { it.id == NovaQuickMenuActionId.QUICK_CTRL_1 && it.label == "Ctrl + 1" })
assertTrue(state.quickKeys.any { it.id == NovaQuickMenuActionId.QUICK_CTRL_2 && it.label == "Ctrl + 2" })
assertTrue(state.overlayRows.any { it.id == NovaQuickMenuActionId.PERF_STATS && it.label == "Stats Overlay" })
assertTrue(state.advancedRows.any { it.id == NovaQuickMenuActionId.MANGOHUD && it.label == "MangoHud" })
assertTrue(state.sessionRows.any { it.id == NovaQuickMenuActionId.MORE_KEYS && it.label == "More Keys" })
Expand Down