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

allow customizing text on space bar

Browse source 
fixes #956
fixes #875 (set text to space)
This commit is contained in:
Helium314 2024-08-28 22:08:00 +02:00
parent 4ddfd2d5a9
commit 8ca65aebc9
6 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/helium314/keyboard/keyboard/MainKeyboardView.java
View file

@ -659,6 +659,7 @@ public final class MainKeyboardView extends KeyboardView implements DrawingProxy
invalidateKey(shortcutKey);
}
// the whole language on spacebar thing could probably be simplified quite a bit
public void startDisplayLanguageOnSpacebar(final boolean subtypeChanged,
final int languageOnSpacebarFormatType,
final boolean hasMultipleEnabledIMEsOrSubtypes) {
@ -799,13 +800,16 @@ public final class MainKeyboardView extends KeyboardView implements DrawingProxy
paint.setTextAlign(Align.CENTER);
paint.setTypeface(Typeface.DEFAULT);
paint.setTextSize(mLanguageOnSpacebarTextSize);
final String languageText;
if (DebugFlags.DEBUG_ENABLED) {
final String customText = Settings.getInstance().getCurrent().mSpaceBarText;
final String spaceText;
if (!customText.isEmpty()) {
spaceText = customText;
} else if (DebugFlags.DEBUG_ENABLED) {
final String l = KeyboardSwitcher.getInstance().getLocaleAndConfidenceInfo();
languageText = l != null ? l : layoutLanguageOnSpacebar(paint, keyboard.mId.mSubtype, width);
spaceText = l != null ? l : layoutLanguageOnSpacebar(paint, keyboard.mId.mSubtype, width);
}
else
languageText = layoutLanguageOnSpacebar(paint, keyboard.mId.mSubtype, width);
spaceText = layoutLanguageOnSpacebar(paint, keyboard.mId.mSubtype, width);
// Draw language text with shadow
final float descent = paint.descent();
final float textHeight = -paint.ascent() + descent;
@ -818,7 +822,11 @@ public final class MainKeyboardView extends KeyboardView implements DrawingProxy
}
paint.setColor(mLanguageOnSpacebarTextColor);
paint.setAlpha(mLanguageOnSpacebarAnimAlpha);
canvas.drawText(languageText, width / 2f, baseline - descent, paint);
if (!fitsTextIntoWidth(width, spaceText, paint)) {
final float textWidth = TypefaceUtils.getStringWidth(spaceText, paint);
paint.setTextScaleX((width - mLanguageOnSpacebarHorizontalMargin * 2) / textWidth);
}
canvas.drawText(spaceText, width / 2f, baseline - descent, paint);
paint.clearShadowLayer();
paint.setTextScaleX(1.0f);
}

1
app/src/main/java/helium314/keyboard/latin/settings/Settings.java
View file

@ -164,6 +164,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
public static final String PREF_ABC_AFTER_CLIP = "abc_after_clip";
public static final String PREF_ABC_AFTER_SYMBOL_SPACE = "abc_after_symbol_space";
public static final String PREF_REMOVE_REDUNDANT_POPUPS = "remove_redundant_popups";
public static final String PREF_SPACE_BAR_TEXT = "space_bar_text";
// Emoji
public static final String PREF_EMOJI_RECENT_KEYS = "emoji_recent_keys";

2
app/src/main/java/helium314/keyboard/latin/settings/SettingsValues.java
View file

@ -117,6 +117,7 @@ public class SettingsValues {
public final boolean mAlphaAfterClipHistoryEntry;
public final boolean mAlphaAfterSymbolAndSpace;
public final boolean mRemoveRedundantPopups;
public final String mSpaceBarText;
// From the input box
@NonNull
@ -264,6 +265,7 @@ public class SettingsValues {
mAlphaAfterClipHistoryEntry = prefs.getBoolean(Settings.PREF_ABC_AFTER_CLIP, false);
mAlphaAfterSymbolAndSpace = prefs.getBoolean(Settings.PREF_ABC_AFTER_SYMBOL_SPACE, true);
mRemoveRedundantPopups = prefs.getBoolean(Settings.PREF_REMOVE_REDUNDANT_POPUPS, true);
mSpaceBarText = prefs.getString(Settings.PREF_SPACE_BAR_TEXT, "");
}
public boolean isApplicationSpecifiedCompletionsOn() {

5
app/src/main/java/helium314/keyboard/latin/utils/LanguageOnSpacebarUtils.java
View file

@ -32,8 +32,9 @@ public final class LanguageOnSpacebarUtils {
// This utility class is not publicly instantiable.
}
public static int getLanguageOnSpacebarFormatType(
@NonNull final RichInputMethodSubtype subtype) {
public static int getLanguageOnSpacebarFormatType(@NonNull final RichInputMethodSubtype subtype) {
if (!Settings.getInstance().getCurrent().mSpaceBarText.isEmpty())
return FORMAT_TYPE_FULL_LOCALE;
if (subtype.isNoLanguage()) {
return FORMAT_TYPE_FULL_LOCALE;
}