mirror of
https://github.com/Helium314/HeliBoard.git
synced 2025-04-20 14:19:08 +00:00
add setting from bottom padding scale
This commit is contained in:
parent
fec5bc97b4
commit
c2a48b27fe
9 changed files with 27 additions and 14 deletions
|
@ -21,6 +21,7 @@ Might end up on F-Droid...
|
||||||
* Number pad
|
* Number pad
|
||||||
* Show all available extra characters on long pressing a key
|
* Show all available extra characters on long pressing a key
|
||||||
* Backup your learned word / history data
|
* Backup your learned word / history data
|
||||||
|
* Adjustable bottom padding
|
||||||
|
|
||||||
## Hidden functionality
|
## Hidden functionality
|
||||||
Features that may go unnoticed
|
Features that may go unnoticed
|
||||||
|
|
|
@ -40,8 +40,8 @@ class ClipboardLayoutParams(res: Resources) {
|
||||||
keyHorizontalGap = res.getFraction(R.fraction.config_key_horizontal_gap_holo,
|
keyHorizontalGap = res.getFraction(R.fraction.config_key_horizontal_gap_holo,
|
||||||
defaultKeyboardWidth, defaultKeyboardWidth).toInt()
|
defaultKeyboardWidth, defaultKeyboardWidth).toInt()
|
||||||
}
|
}
|
||||||
bottomPadding = res.getFraction(R.fraction.config_keyboard_bottom_padding_holo,
|
bottomPadding = (res.getFraction(R.fraction.config_keyboard_bottom_padding_holo,
|
||||||
defaultKeyboardHeight, defaultKeyboardHeight).toInt()
|
defaultKeyboardHeight, defaultKeyboardHeight) * Settings.getInstance().current.mBottomPaddingScale).toInt()
|
||||||
topPadding = res.getFraction(R.fraction.config_keyboard_top_padding_holo,
|
topPadding = res.getFraction(R.fraction.config_keyboard_top_padding_holo,
|
||||||
defaultKeyboardHeight, defaultKeyboardHeight).toInt()
|
defaultKeyboardHeight, defaultKeyboardHeight).toInt()
|
||||||
|
|
||||||
|
|
|
@ -42,18 +42,14 @@ final class EmojiLayoutParams {
|
||||||
mKeyHorizontalGap = (int) (res.getFraction(R.fraction.config_key_horizontal_gap_holo,
|
mKeyHorizontalGap = (int) (res.getFraction(R.fraction.config_key_horizontal_gap_holo,
|
||||||
defaultKeyboardWidth, defaultKeyboardWidth));
|
defaultKeyboardWidth, defaultKeyboardWidth));
|
||||||
}
|
}
|
||||||
mBottomPadding = (int) res.getFraction(R.fraction.config_keyboard_bottom_padding_holo,
|
mBottomPadding = (int) (res.getFraction(R.fraction.config_keyboard_bottom_padding_holo,
|
||||||
defaultKeyboardHeight, defaultKeyboardHeight);
|
defaultKeyboardHeight, defaultKeyboardHeight) * Settings.getInstance().getCurrent().mBottomPaddingScale);
|
||||||
mTopPadding = (int) res.getFraction(R.fraction.config_keyboard_top_padding_holo,
|
mTopPadding = (int) res.getFraction(R.fraction.config_keyboard_top_padding_holo,
|
||||||
defaultKeyboardHeight, defaultKeyboardHeight);
|
defaultKeyboardHeight, defaultKeyboardHeight);
|
||||||
mEmojiCategoryPageIdViewHeight =
|
mEmojiCategoryPageIdViewHeight = (int) (res.getDimension(R.dimen.config_emoji_category_page_id_height));
|
||||||
(int) (res.getDimension(R.dimen.config_emoji_category_page_id_height));
|
final int baseheight = defaultKeyboardHeight - mBottomPadding - mTopPadding + mKeyVerticalGap;
|
||||||
final int baseheight = defaultKeyboardHeight - mBottomPadding - mTopPadding
|
mEmojiActionBarHeight = baseheight / DEFAULT_KEYBOARD_ROWS - (mKeyVerticalGap - mBottomPadding) / 2;
|
||||||
+ mKeyVerticalGap;
|
mEmojiListHeight = defaultKeyboardHeight - mEmojiActionBarHeight - mEmojiCategoryPageIdViewHeight;
|
||||||
mEmojiActionBarHeight = baseheight / DEFAULT_KEYBOARD_ROWS
|
|
||||||
- (mKeyVerticalGap - mBottomPadding) / 2;
|
|
||||||
mEmojiListHeight = defaultKeyboardHeight - mEmojiActionBarHeight
|
|
||||||
- mEmojiCategoryPageIdViewHeight;
|
|
||||||
mEmojiListBottomMargin = 0;
|
mEmojiListBottomMargin = 0;
|
||||||
mEmojiKeyboardHeight = mEmojiListHeight - mEmojiListBottomMargin - 1;
|
mEmojiKeyboardHeight = mEmojiListHeight - mEmojiListBottomMargin - 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -210,8 +210,9 @@ public class KeyboardParams {
|
||||||
mOccupiedWidth = width;
|
mOccupiedWidth = width;
|
||||||
mTopPadding = (int) keyboardAttr.getFraction(
|
mTopPadding = (int) keyboardAttr.getFraction(
|
||||||
R.styleable.Keyboard_keyboardTopPadding, height, height, 0);
|
R.styleable.Keyboard_keyboardTopPadding, height, height, 0);
|
||||||
mBottomPadding = (int) keyboardAttr.getFraction(
|
mBottomPadding = (int) (keyboardAttr.getFraction(
|
||||||
R.styleable.Keyboard_keyboardBottomPadding, height, height, 0);
|
R.styleable.Keyboard_keyboardBottomPadding, height, height, 0)
|
||||||
|
* Settings.getInstance().getCurrent().mBottomPaddingScale);
|
||||||
mLeftPadding = (int) keyboardAttr.getFraction(
|
mLeftPadding = (int) keyboardAttr.getFraction(
|
||||||
R.styleable.Keyboard_keyboardLeftPadding, width, width, 0);
|
R.styleable.Keyboard_keyboardLeftPadding, width, width, 0);
|
||||||
mRightPadding = (int) keyboardAttr.getFraction(
|
mRightPadding = (int) keyboardAttr.getFraction(
|
||||||
|
|
|
@ -41,6 +41,7 @@ class AppearanceSettingsFragment : SubScreenFragment() {
|
||||||
setColorPrefs(sharedPreferences.getString(Settings.PREF_THEME_STYLE, KeyboardTheme.STYLE_MATERIAL)!!)
|
setColorPrefs(sharedPreferences.getString(Settings.PREF_THEME_STYLE, KeyboardTheme.STYLE_MATERIAL)!!)
|
||||||
|
|
||||||
setupScalePrefs(Settings.PREF_KEYBOARD_HEIGHT_SCALE, SettingsValues.DEFAULT_SIZE_SCALE)
|
setupScalePrefs(Settings.PREF_KEYBOARD_HEIGHT_SCALE, SettingsValues.DEFAULT_SIZE_SCALE)
|
||||||
|
setupScalePrefs(Settings.PREF_BOTTOM_PADDING_SCALE, SettingsValues.DEFAULT_SIZE_SCALE)
|
||||||
if (splitScalePref != null) {
|
if (splitScalePref != null) {
|
||||||
setupScalePrefs(Settings.PREF_SPLIT_SPACER_SCALE, SettingsValues.DEFAULT_SIZE_SCALE)
|
setupScalePrefs(Settings.PREF_SPLIT_SPACER_SCALE, SettingsValues.DEFAULT_SIZE_SCALE)
|
||||||
splitScalePref?.isVisible = splitPref?.isChecked == true
|
splitScalePref?.isVisible = splitPref?.isChecked == true
|
||||||
|
|
|
@ -85,6 +85,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
|
||||||
public static final String PREF_ENABLE_SPLIT_KEYBOARD = "pref_split_keyboard";
|
public static final String PREF_ENABLE_SPLIT_KEYBOARD = "pref_split_keyboard";
|
||||||
public static final String PREF_SPLIT_SPACER_SCALE = "pref_split_spacer_scale";
|
public static final String PREF_SPLIT_SPACER_SCALE = "pref_split_spacer_scale";
|
||||||
public static final String PREF_KEYBOARD_HEIGHT_SCALE = "pref_keyboard_height_scale";
|
public static final String PREF_KEYBOARD_HEIGHT_SCALE = "pref_keyboard_height_scale";
|
||||||
|
public static final String PREF_BOTTOM_PADDING_SCALE = "pref_bottom_padding_scale";
|
||||||
public static final String PREF_SPACE_TRACKPAD = "pref_space_trackpad";
|
public static final String PREF_SPACE_TRACKPAD = "pref_space_trackpad";
|
||||||
public static final String PREF_DELETE_SWIPE = "pref_delete_swipe";
|
public static final String PREF_DELETE_SWIPE = "pref_delete_swipe";
|
||||||
public static final String PREF_AUTOSPACE_AFTER_PUNCTUATION = "pref_autospace_after_punctuation";
|
public static final String PREF_AUTOSPACE_AFTER_PUNCTUATION = "pref_autospace_after_punctuation";
|
||||||
|
|
|
@ -103,6 +103,7 @@ public class SettingsValues {
|
||||||
public final float mKeyboardHeightScale;
|
public final float mKeyboardHeightScale;
|
||||||
public final boolean mUrlDetectionEnabled;
|
public final boolean mUrlDetectionEnabled;
|
||||||
public final List<String> mPinnedKeys;
|
public final List<String> mPinnedKeys;
|
||||||
|
public final float mBottomPaddingScale;
|
||||||
|
|
||||||
// From the input box
|
// From the input box
|
||||||
@NonNull
|
@NonNull
|
||||||
|
@ -228,6 +229,7 @@ public class SettingsValues {
|
||||||
mUrlDetectionEnabled = prefs.getBoolean(Settings.PREF_URL_DETECTION, false);
|
mUrlDetectionEnabled = prefs.getBoolean(Settings.PREF_URL_DETECTION, false);
|
||||||
mPinnedKeys = Settings.readPinnedKeys(prefs);
|
mPinnedKeys = Settings.readPinnedKeys(prefs);
|
||||||
mSpacingAndPunctuations = new SpacingAndPunctuations(res, mUrlDetectionEnabled);
|
mSpacingAndPunctuations = new SpacingAndPunctuations(res, mUrlDetectionEnabled);
|
||||||
|
mBottomPaddingScale = prefs.getFloat(Settings.PREF_BOTTOM_PADDING_SCALE, DEFAULT_SIZE_SCALE);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isApplicationSpecifiedCompletionsOn() {
|
public boolean isApplicationSpecifiedCompletionsOn() {
|
||||||
|
|
|
@ -236,6 +236,10 @@
|
||||||
<string name="prefs_narrow_key_gaps">Narrow key gaps</string>
|
<string name="prefs_narrow_key_gaps">Narrow key gaps</string>
|
||||||
<!-- Title of the settings for setting keyboard height -->
|
<!-- Title of the settings for setting keyboard height -->
|
||||||
<string name="prefs_keyboard_height_scale">Keyboard height scale</string>
|
<string name="prefs_keyboard_height_scale">Keyboard height scale</string>
|
||||||
|
<!-- Title of the settings for setting bottom padding height -->
|
||||||
|
<string name="prefs_bottom_padding_scale">Bottom padding scale</string>
|
||||||
|
<!-- Description of prefs_bottom_padding_scale -->
|
||||||
|
<string name="prefs_bottom_padding_scale_summary">Set size of the empty space below the keyboard</string>
|
||||||
<!-- Description for English (UK) keyboard subtype [CHAR LIMIT=25]
|
<!-- Description for English (UK) keyboard subtype [CHAR LIMIT=25]
|
||||||
(UK) should be an abbreviation of United Kingdom to fit in the CHAR LIMIT. -->
|
(UK) should be an abbreviation of United Kingdom to fit in the CHAR LIMIT. -->
|
||||||
<string name="subtype_en_GB">English (UK)</string>
|
<string name="subtype_en_GB">English (UK)</string>
|
||||||
|
|
|
@ -81,6 +81,13 @@
|
||||||
latin:minValue="50"
|
latin:minValue="50"
|
||||||
latin:maxValue="150" /> <!-- percentage -->
|
latin:maxValue="150" /> <!-- percentage -->
|
||||||
|
|
||||||
|
<org.dslul.openboard.inputmethod.latin.settings.SeekBarDialogPreference
|
||||||
|
android:key="pref_bottom_padding_scale"
|
||||||
|
android:title="@string/prefs_bottom_padding_scale"
|
||||||
|
android:summary="@string/prefs_bottom_padding_scale_summary"
|
||||||
|
latin:minValue="0"
|
||||||
|
latin:maxValue="500" /> <!-- percentage -->
|
||||||
|
|
||||||
</PreferenceCategory>
|
</PreferenceCategory>
|
||||||
|
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
||||||
|
|
Loading…
Add table
Reference in a new issue