luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-05-14 14:02:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made keyboard layout aware of one-handed mode (e.g. hides one-handed key when one-handed mode is enabled)

Browse source
This commit is contained in:
pdroidandroid@gmail.com 2022-02-21 13:19:47 +01:00
parent d27659de4f
commit 1b1dc96a3d
10 changed files with 81 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardId.java
View file

@ -85,6 +85,7 @@ public final class KeyboardId {
public final String mCustomActionLabel;
public final boolean mHasShortcutKey;
public final boolean mIsSplitLayout;
public final boolean mOneHandedModeEnabled;
private final int mHashCode;
@ -103,6 +104,7 @@ public final class KeyboardId {
? mEditorInfo.actionLabel.toString() : null;
mHasShortcutKey = params.mVoiceInputKeyEnabled;
mIsSplitLayout = params.mIsSplitLayoutEnabled;
mOneHandedModeEnabled = params.mOneHandedModeEnabled;
mHashCode = computeHashCode(this);
}

6
app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardLayoutSet.java
View file

@ -122,6 +122,7 @@ public final class KeyboardLayoutSet {
boolean mNumberRowEnabled;
boolean mLanguageSwitchKeyEnabled;
boolean mEmojiKeyEnabled;
boolean mOneHandedModeEnabled;
RichInputMethodSubtype mSubtype;
boolean mIsSpellChecker;
int mKeyboardWidth;
@ -351,6 +352,11 @@ public final class KeyboardLayoutSet {
return this;
}
public Builder setOneHandedModeEnabled(boolean enabled) {
mParams.mOneHandedModeEnabled = enabled;
return this;
}
// Super redux version of reading the script ID for some subtype from Xml.
static int readScriptId(final Resources resources, final InputMethodSubtype subtype) {
final String layoutSetName = KEYBOARD_LAYOUT_SET_RESOURCE_PREFIX

4
app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardSwitcher.java
View file

@ -129,10 +129,12 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
builder.setEmojiKeyEnabled(settingsValues.mShowsEmojiKey);
builder.setSplitLayoutEnabledByUser(ProductionFlags.IS_SPLIT_KEYBOARD_SUPPORTED
&& settingsValues.mIsSplitKeyboardEnabled);
final boolean oneHandedModeEnabled = settingsValues.mOneHandedModeEnabled;
builder.setOneHandedModeEnabled(oneHandedModeEnabled);
mKeyboardLayoutSet = builder.build();
try {
mState.onLoadKeyboard(currentAutoCapsState, currentRecapitalizeState,
settingsValues.mOneHandedModeEnabled);
oneHandedModeEnabled);
mKeyboardTextsSet.setLocale(mRichImm.getCurrentSubtypeLocale(), mThemeContext);
} catch (KeyboardLayoutSetException e) {
Log.w(TAG, "loading keyboard failed: " + e.mKeyboardId, e.getCause());

7
app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardBuilder.java
View file

@ -700,13 +700,16 @@ public class KeyboardBuilder<KP extends KeyboardParams> {
final boolean countryCodeMatched = matchCountryCodes(caseAttr, locale);
final boolean splitLayoutMatched = matchBoolean(caseAttr,
R.styleable.Keyboard_Case_isSplitLayout, id.mIsSplitLayout);
final boolean oneHandedModeEnabledMatched = matchBoolean(caseAttr,
R.styleable.Keyboard_Case_oneHandedModeEnabled,
id.mOneHandedModeEnabled);
final boolean selected = keyboardLayoutSetMatched && keyboardLayoutSetElementMatched
&& keyboardThemeMacthed && modeMatched && navigateNextMatched
&& navigatePreviousMatched && passwordInputMatched && clobberSettingsKeyMatched
&& hasShortcutKeyMatched && numberRowEnabledMatched && languageSwitchKeyEnabledMatched
&& emojiKeyEnabledMatched && isMultiLineMatched && imeActionMatched && isIconDefinedMatched
&& localeCodeMatched && languageCodeMatched && countryCodeMatched
&& splitLayoutMatched;
&& splitLayoutMatched && oneHandedModeEnabledMatched;
if (DEBUG) {
startTag("<%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s>%s", TAG_CASE,
@ -748,6 +751,8 @@ public class KeyboardBuilder<KP extends KeyboardParams> {
"languageCode"),
textAttr(caseAttr.getString(R.styleable.Keyboard_Case_countryCode),
"countryCode"),
booleanAttr(caseAttr, R.styleable.Keyboard_Case_oneHandedModeEnabled,
"oneHandedModeEnabled"),
selected ? "" : " skipped");
}

4
app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardTextsTable.java
View file

@ -261,6 +261,7 @@ public final class KeyboardTextsTable {
/* 177: 0 */ "keyspec_clipboard_action_key",
/* 178: 0 */ "keyspec_clipboard_normal_key",
/* 179: 0 */ "keyspec_start_onehanded_mode",
/* 180: 0 */ "keyspec_language_switch",
};
private static final String EMPTY = "";
@ -489,6 +490,7 @@ public final class KeyboardTextsTable {
/* keyspec_clipboard_action_key */ "!icon/clipboard_action_key|!code/key_clipboard",
/* keyspec_clipboard_normal_key */ "!icon/clipboard_normal_key|!code/key_clipboard",
/* keyspec_start_onehanded_mode */ "!icon/start_onehanded_mode_key|!code/key_start_onehanded",
/* keyspec_language_switch */ "!icon/language_switch_key|!code/key_language_switch",
};
/* Locale af: Afrikaans */
@ -4251,7 +4253,7 @@ public final class KeyboardTextsTable {
private static final Object[] LOCALES_AND_TEXTS = {
// "locale", TEXT_ARRAY, /* numberOfNonNullText/lengthOf_TEXT_ARRAY localeName */
"DEFAULT", TEXTS_DEFAULT, /* 180/180 DEFAULT */
"DEFAULT", TEXTS_DEFAULT, /* 181/181 DEFAULT */
"af" , TEXTS_af, /* 7/ 13 Afrikaans */
"ar" , TEXTS_ar, /* 55/110 Arabic */
"az" , TEXTS_az, /* 11/ 18 Azerbaijani */

1
app/src/main/res/values/attrs.xml
View file

@ -515,6 +515,7 @@
<attr name="hasShortcutKey" format="boolean" />
<attr name="languageSwitchKeyEnabled" format="boolean" />
<attr name="emojiKeyEnabled" format="boolean" />
<attr name="oneHandedModeEnabled" format="boolean" />
<attr name="numberRowEnabled" format="boolean" />
<attr name="isMultiLine" format="boolean" />
<attr name="imeAction" format="enum">

2
app/src/main/res/xml-sw600dp/key_styles_common.xml
View file

@ -100,7 +100,7 @@
latin:backgroundType="functional" />
<key-style
latin:styleName="languageSwitchKeyStyle"
latin:keySpec="!icon/language_switch_key|!code/key_language_switch"
latin:keySpec="!text/keyspec_language_switch"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping|enableLongPress"
latin:altCode="!code/key_space"
latin:backgroundType="functional" />

2
app/src/main/res/xml/key_styles_common.xml
View file

@ -126,7 +126,7 @@
latin:backgroundType="functional" />
<key-style
latin:styleName="languageSwitchKeyStyle"
latin:keySpec="!icon/language_switch_key|!code/key_language_switch"
latin:keySpec="!text/keyspec_language_switch"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping|enableLongPress"
latin:altCode="!code/key_space"
latin:backgroundType="functional" />

74
app/src/main/res/xml/key_styles_settings.xml
View file

@ -20,52 +20,92 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res-auto"
>
>
<!-- Key style for the key which may have settings key as more keys. -->
<switch>
<case
latin:clobberSettingsKey="true"
>
>
<key-style
latin:styleName="settingsMoreKeysStyle"
latin:backgroundType="functional" />
latin:backgroundType="functional"/>
</case>
<case
latin:emojiKeyEnabled="true"
latin:oneHandedModeEnabled="true"
latin:languageSwitchKeyEnabled="true"
>
latin:emojiKeyEnabled="true">
<key-style
latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key,!text/keyspec_start_onehanded_mode"
latin:backgroundType="functional" />
latin:backgroundType="functional"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key"/>
</case>
<case
latin:emojiKeyEnabled="false"
latin:oneHandedModeEnabled="true"
latin:languageSwitchKeyEnabled="true"
>
latin:emojiKeyEnabled="false">
<key-style
latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key,!text/keyspec_emoji_normal_key,!text/keyspec_start_onehanded_mode"
latin:backgroundType="functional" />
latin:backgroundType="functional"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key,!text/keyspec_emoji_normal_key"/>
</case>
<case
latin:emojiKeyEnabled="true"
latin:oneHandedModeEnabled="true"
latin:languageSwitchKeyEnabled="false"
>
latin:emojiKeyEnabled="true">
<key-style
latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:additionalMoreKeys="!text/keyspec_settings,!icon/language_switch_key|!code/key_language_switch,!text/keyspec_clipboard_normal_key,!text/keyspec_start_onehanded_mode"
latin:backgroundType="functional" />
latin:backgroundType="functional"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key,!text/keyspec_language_switch"/>
</case>
<case
latin:oneHandedModeEnabled="true"
latin:languageSwitchKeyEnabled="false"
latin:emojiKeyEnabled="false">
<key-style
latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:backgroundType="functional"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key,!text/keyspec_language_switch,!text/keyspec_emoji_normal_key"/>
</case>
<case
latin:oneHandedModeEnabled="false"
latin:languageSwitchKeyEnabled="true"
latin:emojiKeyEnabled="true">
<key-style
latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:backgroundType="functional"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key,!text/keyspec_start_onehanded_mode"/>
</case>
<case
latin:oneHandedModeEnabled="false"
latin:languageSwitchKeyEnabled="true"
latin:emojiKeyEnabled="false">
<key-style
latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:backgroundType="functional"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key,!text/keyspec_start_onehanded_mode,!text/keyspec_emoji_normal_key"/>
</case>
<case
latin:oneHandedModeEnabled="false"
latin:languageSwitchKeyEnabled="false"
latin:emojiKeyEnabled="true">
<key-style
latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:backgroundType="functional"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key,!text/keyspec_start_onehanded_mode,!text/keyspec_language_switch"/>
</case>
<default>
<key-style
latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:additionalMoreKeys="!text/keyspec_settings,!icon/language_switch_key|!code/key_language_switch,!text/keyspec_clipboard_normal_key,!text/keyspec_emoji_normal_key,!text/keyspec_start_onehanded_mode"
latin:backgroundType="functional" />
latin:backgroundType="functional"
latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_normal_key,!text/keyspec_start_onehanded_mode,!text/keyspec_language_switch,!text/keyspec_emoji_normal_key"/>
</default>
</switch>
</merge>

1
tools/make-keyboard-text/src/main/resources/values/donottranslate-more-keys.xml
View file

@ -263,6 +263,7 @@
<string name="keyspec_clipboard_action_key">!icon/clipboard_action_key|!code/key_clipboard</string>
<string name="keyspec_clipboard_normal_key">!icon/clipboard_normal_key|!code/key_clipboard</string>
<string name="keyspec_start_onehanded_mode">!icon/start_onehanded_mode_key|!code/key_start_onehanded</string>
<string name="keyspec_language_switch">!icon/language_switch_key|!code/key_language_switch</string>
<string name="label_go_key">!string/label_go_key</string>
<string name="label_send_key">!string/label_send_key</string>
<string name="label_next_key">!string/label_next_key</string>