luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-04-28 18:48:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Patched uncentered emoji key labels position fix

Browse source
This commit is contained in:
pdroidandroid@gmail.com 2022-02-19 21:50:26 +01:00
parent 9cfda5805a
commit 56f363063d
12 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/dslul/openboard/inputmethod/keyboard/emoji/DynamicGridKeyboard.java
View file

@ -45,6 +45,7 @@ final class DynamicGridKeyboard extends Keyboard {
private final SharedPreferences mPrefs; private final SharedPreferences mPrefs;
private final int mHorizontalStep; private final int mHorizontalStep;
private final int mHorizontalGap;
private final int mVerticalStep; private final int mVerticalStep;
private final int mColumnsNum; private final int mColumnsNum;
private final int mMaxKeyCount; private final int mMaxKeyCount;
@ -59,7 +60,8 @@ final class DynamicGridKeyboard extends Keyboard {
super(templateKeyboard); super(templateKeyboard);
final Key key0 = getTemplateKey(TEMPLATE_KEY_CODE_0); final Key key0 = getTemplateKey(TEMPLATE_KEY_CODE_0);
final Key key1 = getTemplateKey(TEMPLATE_KEY_CODE_1); 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; mVerticalStep = key0.getHeight() + mVerticalGap;
mColumnsNum = mBaseWidth / mHorizontalStep; mColumnsNum = mBaseWidth / mHorizontalStep;
mMaxKeyCount = maxKeyCount; mMaxKeyCount = maxKeyCount;
@ -208,12 +210,12 @@ final class DynamicGridKeyboard extends Keyboard {
private int getKeyX0(final int index) { private int getKeyX0(final int index) {
final int column = index % mColumnsNum; final int column = index % mColumnsNum;
return column * mHorizontalStep; return column * mHorizontalStep + mHorizontalGap / 2;
} }
private int getKeyX1(final int index) { private int getKeyX1(final int index) {
final int column = index % mColumnsNum + 1; final int column = index % mColumnsNum + 1;
return column * mHorizontalStep; return column * mHorizontalStep + mHorizontalGap / 2;
} }
private int getKeyY0(final int index) { private int getKeyY0(final int index) {

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

@ -27,6 +27,6 @@
> >
<GridRows <GridRows
latin:codesArray="@array/emoji_smileys_emotion" latin:codesArray="@array/emoji_smileys_emotion"
latin:keyLabelFlags="fontNormal|alignLabelOffCenter" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>

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

@ -27,6 +27,6 @@
> >
<GridRows <GridRows
latin:textsArray="@array/emoji_emoticons" latin:textsArray="@array/emoji_emoticons"
latin:keyLabelFlags="fontNormal|alignLabelOffCenter" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>

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

@ -28,6 +28,6 @@
<GridRows <GridRows
latin:codesArray="@array/emoji_people_body" latin:codesArray="@array/emoji_people_body"
latin:moreCodesArray="@array/emoji_people_body_more" latin:moreCodesArray="@array/emoji_people_body_more"
latin:keyLabelFlags="fontNormal|alignLabelOffCenter" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>

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

@ -27,6 +27,6 @@
> >
<GridRows <GridRows
latin:codesArray="@array/emoji_animals_nature" latin:codesArray="@array/emoji_animals_nature"
latin:keyLabelFlags="fontNormal|alignLabelOffCenter" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>

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

@ -27,6 +27,6 @@
> >
<GridRows <GridRows
latin:codesArray="@array/emoji_food_drink" latin:codesArray="@array/emoji_food_drink"
latin:keyLabelFlags="fontNormal|alignLabelOffCenter" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>

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

@ -27,6 +27,6 @@
> >
<GridRows <GridRows
latin:codesArray="@array/emoji_travel_places" latin:codesArray="@array/emoji_travel_places"
latin:keyLabelFlags="fontNormal|alignLabelOffCenter" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>

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

@ -27,6 +27,6 @@
> >
<GridRows <GridRows
latin:codesArray="@array/emoji_activities" latin:codesArray="@array/emoji_activities"
latin:keyLabelFlags="fontNormal|alignLabelOffCenter" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>

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

@ -27,6 +27,6 @@
> >
<GridRows <GridRows
latin:codesArray="@array/emoji_objects" latin:codesArray="@array/emoji_objects"
latin:keyLabelFlags="fontNormal|alignLabelOffCenter" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>

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

@ -27,6 +27,6 @@
> >
<GridRows <GridRows
latin:codesArray="@array/emoji_symbols" latin:codesArray="@array/emoji_symbols"
latin:keyLabelFlags="fontNormal|alignLabelOffCenter" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>

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

@ -27,6 +27,6 @@
> >
<GridRows <GridRows
latin:codesArray="@array/emoji_flags" latin:codesArray="@array/emoji_flags"
latin:keyLabelFlags="fontNormal|alignLabelOffCenter" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>

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

@ -27,6 +27,6 @@
> >
<GridRows <GridRows
latin:codesArray="@array/emoji_recents" latin:codesArray="@array/emoji_recents"
latin:keyLabelFlags="fontNormal|alignLabelOffCenter" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>