mirror of
https://github.com/Helium314/HeliBoard.git
synced 2025-04-26 09:36:50 +00:00
Patched uncentered emoji key labels position fix
This commit is contained in:
parent
9cfda5805a
commit
56f363063d
12 changed files with 16 additions and 14 deletions
|
@ -45,6 +45,7 @@ final class DynamicGridKeyboard extends Keyboard {
|
|||
|
||||
private final SharedPreferences mPrefs;
|
||||
private final int mHorizontalStep;
|
||||
private final int mHorizontalGap;
|
||||
private final int mVerticalStep;
|
||||
private final int mColumnsNum;
|
||||
private final int mMaxKeyCount;
|
||||
|
@ -59,7 +60,8 @@ final class DynamicGridKeyboard extends Keyboard {
|
|||
super(templateKeyboard);
|
||||
final Key key0 = getTemplateKey(TEMPLATE_KEY_CODE_0);
|
||||
final Key key1 = getTemplateKey(TEMPLATE_KEY_CODE_1);
|
||||
mHorizontalStep = Math.abs(key1.getX() - key0.getX());
|
||||
mHorizontalGap = Math.abs(key1.getX() - key0.getX()) - key0.getWidth();
|
||||
mHorizontalStep = key0.getWidth() + mHorizontalGap;
|
||||
mVerticalStep = key0.getHeight() + mVerticalGap;
|
||||
mColumnsNum = mBaseWidth / mHorizontalStep;
|
||||
mMaxKeyCount = maxKeyCount;
|
||||
|
@ -208,12 +210,12 @@ final class DynamicGridKeyboard extends Keyboard {
|
|||
|
||||
private int getKeyX0(final int index) {
|
||||
final int column = index % mColumnsNum;
|
||||
return column * mHorizontalStep;
|
||||
return column * mHorizontalStep + mHorizontalGap / 2;
|
||||
}
|
||||
|
||||
private int getKeyX1(final int index) {
|
||||
final int column = index % mColumnsNum + 1;
|
||||
return column * mHorizontalStep;
|
||||
return column * mHorizontalStep + mHorizontalGap / 2;
|
||||
}
|
||||
|
||||
private int getKeyY0(final int index) {
|
||||
|
|
|
@ -27,6 +27,6 @@
|
|||
>
|
||||
<GridRows
|
||||
latin:codesArray="@array/emoji_smileys_emotion"
|
||||
latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
|
||||
latin:keyLabelFlags="fontNormal"
|
||||
latin:backgroundType="empty" />
|
||||
</Keyboard>
|
||||
|
|
|
@ -27,6 +27,6 @@
|
|||
>
|
||||
<GridRows
|
||||
latin:textsArray="@array/emoji_emoticons"
|
||||
latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
|
||||
latin:keyLabelFlags="fontNormal"
|
||||
latin:backgroundType="empty" />
|
||||
</Keyboard>
|
||||
|
|
|
@ -28,6 +28,6 @@
|
|||
<GridRows
|
||||
latin:codesArray="@array/emoji_people_body"
|
||||
latin:moreCodesArray="@array/emoji_people_body_more"
|
||||
latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
|
||||
latin:keyLabelFlags="fontNormal"
|
||||
latin:backgroundType="empty" />
|
||||
</Keyboard>
|
||||
|
|
|
@ -27,6 +27,6 @@
|
|||
>
|
||||
<GridRows
|
||||
latin:codesArray="@array/emoji_animals_nature"
|
||||
latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
|
||||
latin:keyLabelFlags="fontNormal"
|
||||
latin:backgroundType="empty" />
|
||||
</Keyboard>
|
||||
|
|
|
@ -27,6 +27,6 @@
|
|||
>
|
||||
<GridRows
|
||||
latin:codesArray="@array/emoji_food_drink"
|
||||
latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
|
||||
latin:keyLabelFlags="fontNormal"
|
||||
latin:backgroundType="empty" />
|
||||
</Keyboard>
|
||||
|
|
|
@ -27,6 +27,6 @@
|
|||
>
|
||||
<GridRows
|
||||
latin:codesArray="@array/emoji_travel_places"
|
||||
latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
|
||||
latin:keyLabelFlags="fontNormal"
|
||||
latin:backgroundType="empty" />
|
||||
</Keyboard>
|
||||
|
|
|
@ -27,6 +27,6 @@
|
|||
>
|
||||
<GridRows
|
||||
latin:codesArray="@array/emoji_activities"
|
||||
latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
|
||||
latin:keyLabelFlags="fontNormal"
|
||||
latin:backgroundType="empty" />
|
||||
</Keyboard>
|
||||
|
|
|
@ -27,6 +27,6 @@
|
|||
>
|
||||
<GridRows
|
||||
latin:codesArray="@array/emoji_objects"
|
||||
latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
|
||||
latin:keyLabelFlags="fontNormal"
|
||||
latin:backgroundType="empty" />
|
||||
</Keyboard>
|
||||
|
|
|
@ -27,6 +27,6 @@
|
|||
>
|
||||
<GridRows
|
||||
latin:codesArray="@array/emoji_symbols"
|
||||
latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
|
||||
latin:keyLabelFlags="fontNormal"
|
||||
latin:backgroundType="empty" />
|
||||
</Keyboard>
|
||||
|
|
|
@ -27,6 +27,6 @@
|
|||
>
|
||||
<GridRows
|
||||
latin:codesArray="@array/emoji_flags"
|
||||
latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
|
||||
latin:keyLabelFlags="fontNormal"
|
||||
latin:backgroundType="empty" />
|
||||
</Keyboard>
|
||||
|
|
|
@ -27,6 +27,6 @@
|
|||
>
|
||||
<GridRows
|
||||
latin:codesArray="@array/emoji_recents"
|
||||
latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
|
||||
latin:keyLabelFlags="fontNormal"
|
||||
latin:backgroundType="empty" />
|
||||
</Keyboard>
|
||||
|
|
Loading…
Add table
Reference in a new issue