wzray/tt9
1
0
Fork 0
Code Activity

swapped the default hotkeys for SHIFT and COMMAND PALETTE and disabled SHIFT when in phone and strict numeric fields

Browse source
This commit is contained in:
sspanak 2024-09-30 12:22:19 +03:00 • committed by Dimo Karaivanov
parent ec38a606df
commit 2f995f486e
5 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/io/github/sspanak/tt9/ime/CommandHandler.java
View file

@ -27,7 +27,7 @@ abstract public class CommandHandler extends TextEditingHandler {
@Override @Override
public boolean onHotkey(int keyCode, boolean repeat, boolean validateOnly) { public boolean onHotkey(int keyCode, boolean repeat, boolean validateOnly) {
return mainView.isCommandPaletteShown() && keyCode != settings.getKeyCommandPalette(); return mainView.isCommandPaletteShown() && Math.abs(keyCode) != Math.abs(settings.getKeyCommandPalette());
} }

4
app/src/main/java/io/github/sspanak/tt9/ime/HotkeyHandler.java
View file

@ -300,6 +300,10 @@ public abstract class HotkeyHandler extends CommandHandler {
public boolean onKeyNextTextCase(boolean validateOnly) { public boolean onKeyNextTextCase(boolean validateOnly) {
if (voiceInputOps.isListening() || inputType.isNumeric() || inputType.isPhoneNumber()) {
return false;
}
if (validateOnly) { if (validateOnly) {
return true; return true;
} }

4
app/src/main/java/io/github/sspanak/tt9/preferences/helpers/Hotkeys.java
View file

@ -67,7 +67,7 @@ public class Hotkeys {
defaultKeys.put(SectionKeymap.ITEM_BACKSPACE, 0); defaultKeys.put(SectionKeymap.ITEM_BACKSPACE, 0);
} }
defaultKeys.put(SectionKeymap.ITEM_COMMAND_PALETTE, KeyEvent.KEYCODE_STAR); defaultKeys.put(SectionKeymap.ITEM_COMMAND_PALETTE, -KeyEvent.KEYCODE_STAR); // negative means "hold"
defaultKeys.put(SectionKeymap.ITEM_EDIT_TEXT, KeyEvent.KEYCODE_UNKNOWN); defaultKeys.put(SectionKeymap.ITEM_EDIT_TEXT, KeyEvent.KEYCODE_UNKNOWN);
defaultKeys.put( defaultKeys.put(
@ -93,7 +93,7 @@ public class Hotkeys {
defaultKeys.put(SectionKeymap.ITEM_NEXT_INPUT_MODE, KeyEvent.KEYCODE_POUND); defaultKeys.put(SectionKeymap.ITEM_NEXT_INPUT_MODE, KeyEvent.KEYCODE_POUND);
defaultKeys.put(SectionKeymap.ITEM_NEXT_LANGUAGE, -KeyEvent.KEYCODE_POUND); // negative means "hold" defaultKeys.put(SectionKeymap.ITEM_NEXT_LANGUAGE, -KeyEvent.KEYCODE_POUND); // negative means "hold"
defaultKeys.put(SectionKeymap.ITEM_SELECT_KEYBOARD, KeyEvent.KEYCODE_UNKNOWN); defaultKeys.put(SectionKeymap.ITEM_SELECT_KEYBOARD, KeyEvent.KEYCODE_UNKNOWN);
defaultKeys.put(SectionKeymap.ITEM_SHIFT, -KeyEvent.KEYCODE_STAR); defaultKeys.put(SectionKeymap.ITEM_SHIFT, KeyEvent.KEYCODE_STAR);
defaultKeys.put(SectionKeymap.ITEM_SHOW_SETTINGS, KeyEvent.KEYCODE_UNKNOWN); defaultKeys.put(SectionKeymap.ITEM_SHOW_SETTINGS, KeyEvent.KEYCODE_UNKNOWN);
defaultKeys.put(SectionKeymap.ITEM_VOICE_INPUT, KeyEvent.KEYCODE_UNKNOWN); defaultKeys.put(SectionKeymap.ITEM_VOICE_INPUT, KeyEvent.KEYCODE_UNKNOWN);

6
app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsHotkeys.java
View file

@ -8,10 +8,12 @@ import java.util.HashMap;
import io.github.sspanak.tt9.preferences.screens.hotkeys.SectionKeymap; import io.github.sspanak.tt9.preferences.screens.hotkeys.SectionKeymap;
class SettingsHotkeys extends SettingsHacks { class SettingsHotkeys extends SettingsHacks {
private static final String HOTKEY_VERSION = "hotkeys_v5";
SettingsHotkeys(Context context) { super(context); } SettingsHotkeys(Context context) { super(context); }
public boolean areHotkeysInitialized() { public boolean areHotkeysInitialized() {
return !prefs.getBoolean("hotkeys_v4_initialized", false); return !prefs.getBoolean(HOTKEY_VERSION, false);
} }
public void setDefaultKeys(HashMap<String, Integer> defaultKeys) { public void setDefaultKeys(HashMap<String, Integer> defaultKeys) {
@ -19,7 +21,7 @@ class SettingsHotkeys extends SettingsHacks {
prefsEditor.putString(key, String.valueOf(defaultKeys.get(key))); prefsEditor.putString(key, String.valueOf(defaultKeys.get(key)));
} }
prefsEditor.putBoolean("hotkeys_v4_initialized", true).apply(); prefsEditor.putBoolean(HOTKEY_VERSION, true).apply();
} }

2
app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyShift.java
View file

@ -32,6 +32,6 @@ public class SoftKeyShift extends SoftKey {
setTextSize(30); setTextSize(30);
setTypeface(Typeface.DEFAULT_BOLD); setTypeface(Typeface.DEFAULT_BOLD);
super.render(); super.render();
setEnabled(tt9 != null && !tt9.isVoiceInputActive() && !tt9.isInputModeNumeric()); setEnabled(tt9 != null && !tt9.isVoiceInputActive() && !tt9.isInputModePhone() && !tt9.isNumericModeSigned());
} }
} }