Fix row heights for layout without number keys

This commit is contained in:
Lee0701 2021-05-15 06:16:40 +09:00
parent a5f773619b
commit 1a7cec304b
4 changed files with 352 additions and 158 deletions

View file

@ -22,49 +22,101 @@
xmlns:latin="http://schemas.android.com/apk/res-auto" xmlns:latin="http://schemas.android.com/apk/res-auto"
> >
<include latin:keyboardLayout="@xml/key_styles_common" /> <include latin:keyboardLayout="@xml/key_styles_common" />
<Row <switch>
latin:keyWidth="10%p" <case
latin:rowHeight="25%p" latin:numberRowEnabled="true"
> >
<include <Row
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_0" /> latin:keyWidth="10%p"
</Row> latin:rowHeight="25%p"
<Row latin:keyWidth="9%p" >
latin:rowHeight="25%p" > <include
<include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_1" /> latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_0" />
<Key </Row>
latin:keyStyle="deleteKeyStyle" <Row latin:keyWidth="9%p"
latin:keyWidth="fillRight" /> latin:rowHeight="25%p" >
</Row> <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_1" />
<Row latin:keyWidth="9%p"
latin:rowHeight="25%p" >
<include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_2"
latin:keyXPos="4%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row latin:keyWidth="9%p"
latin:rowHeight="25%p" >
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
<include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_3" />
<switch>
<case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<Key <Key
latin:keySpec="&#x003f;" /> latin:keyStyle="deleteKeyStyle"
</case> latin:keyWidth="fillRight" />
<default> </Row>
<Row latin:keyWidth="9%p"
latin:rowHeight="25%p" >
<include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_2"
latin:keyXPos="4%p" />
<Key <Key
latin:keySpec="&#x1169;" latin:keyStyle="enterKeyStyle"
latin:keyHintLabel="&#x003f;" latin:keyWidth="fillRight" />
latin:additionalMoreKeys="&#x003f;" /> </Row>
</default> <Row latin:keyWidth="9%p"
</switch> latin:rowHeight="25%p" >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="10.0%p" />
</Row> <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_3" />
<switch>
<case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<Key
latin:keySpec="&#x003f;" />
</case>
<default>
<Key
latin:keySpec="&#x1169;"
latin:keyHintLabel="&#x003f;"
latin:additionalMoreKeys="&#x003f;" />
</default>
</switch>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="fillRight" />
</Row>
</case>
<default>
<Row
latin:keyWidth="10%p"
latin:rowHeight="15%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_0" />
</Row>
<Row latin:keyWidth="9%p"
latin:rowHeight="20%p" >
<include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row latin:keyWidth="9%p"
latin:rowHeight="20%p" >
<include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_2"
latin:keyXPos="4%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row latin:keyWidth="9%p"
latin:rowHeight="20%p" >
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
<include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_3" />
<switch>
<case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<Key
latin:keySpec="&#x003f;" />
</case>
<default>
<Key
latin:keySpec="&#x1169;"
latin:keyHintLabel="&#x003f;"
latin:additionalMoreKeys="&#x003f;" />
</default>
</switch>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="fillRight" />
</Row>
</default>
</switch>
<include latin:keyboardLayout="@xml/row_qwerty4" /> <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge> </merge>

View file

@ -20,51 +20,103 @@
<merge <merge
xmlns:latin="http://schemas.android.com/apk/res-auto" xmlns:latin="http://schemas.android.com/apk/res-auto"
> >
<include latin:keyboardLayout="@xml/key_styles_common" /> <include latin:keyboardLayout="@xml/key_styles_common" />
<Row <switch>
latin:keyWidth="10%p" <case
latin:rowHeight="25%p" latin:numberRowEnabled="true"
> >
<include <Row
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_0" /> latin:keyWidth="10%p"
</Row> latin:rowHeight="25%p"
<Row latin:keyWidth="9%p" >
latin:rowHeight="25%p" > <include
<include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_1" /> latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_0" />
<Key </Row>
latin:keyStyle="deleteKeyStyle" <Row latin:keyWidth="9%p"
latin:keyWidth="fillRight" /> latin:rowHeight="25%p" >
</Row> <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_1" />
<Row latin:keyWidth="9%p"
latin:rowHeight="25%p" >
<include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_2"
latin:keyXPos="4%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row latin:keyWidth="9%p"
latin:rowHeight="25%p" >
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
<include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_3" />
<switch>
<case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<Key <Key
latin:keySpec="&#x0021;" /> latin:keyStyle="deleteKeyStyle"
</case> latin:keyWidth="fillRight" />
<default> </Row>
<Row latin:keyWidth="9%p"
latin:rowHeight="25%p" >
<include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_2"
latin:keyXPos="4%p" />
<Key <Key
latin:keySpec="&#x1169;" latin:keyStyle="enterKeyStyle"
latin:keyHintLabel="&#x0021;" latin:keyWidth="fillRight" />
latin:additionalMoreKeys="&#x0021;" /> </Row>
</default> <Row latin:keyWidth="9%p"
</switch> latin:rowHeight="25%p" >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="10.0%p" />
</Row> <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_3" />
<switch>
<case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<Key
latin:keySpec="&#x0021;" />
</case>
<default>
<Key
latin:keySpec="&#x1169;"
latin:keyHintLabel="&#x0021;"
latin:additionalMoreKeys="&#x0021;" />
</default>
</switch>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="fillRight" />
</Row>
</case>
<default>
<Row
latin:keyWidth="10%p"
latin:rowHeight="15%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_0" />
</Row>
<Row latin:keyWidth="9%p"
latin:rowHeight="20%p" >
<include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row latin:keyWidth="9%p"
latin:rowHeight="20%p" >
<include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_2"
latin:keyXPos="4%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row latin:keyWidth="9%p"
latin:rowHeight="20%p" >
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
<include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_3" />
<switch>
<case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<Key
latin:keySpec="&#x0021;" />
</case>
<default>
<Key
latin:keySpec="&#x1169;"
latin:keyHintLabel="&#x0021;"
latin:additionalMoreKeys="&#x0021;" />
</default>
</switch>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="fillRight" />
</Row>
</default>
</switch>
<include latin:keyboardLayout="@xml/row_qwerty4" /> <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge> </merge>

View file

@ -23,42 +23,87 @@
> >
<include <include
latin:keyboardLayout="@xml/key_styles_common" /> latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="10%p" <switch>
latin:rowHeight="25%p" <case
> latin:numberRowEnabled="true"
<include >
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_0" /> <Row
</Row> latin:keyWidth="10%p"
<Row latin:rowHeight="25%p"
latin:keyWidth="10%p" >
latin:rowHeight="25%p" <include
> latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_0" />
<include </Row>
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_1" /> <Row
</Row> latin:keyWidth="10%p"
<Row latin:rowHeight="25%p"
latin:keyWidth="10%p" >
latin:rowHeight="25%p" <include
> latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_1" />
<include </Row>
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_2" /> <Row
</Row> latin:keyWidth="10%p"
<Row latin:rowHeight="25%p"
latin:keyWidth="10%p" >
latin:rowHeight="25%p" <include
> latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_2" />
<Key </Row>
latin:keyStyle="shiftKeyStyle" <Row
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:visualInsetsRight="1%p" /> latin:rowHeight="25%p"
<include >
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_3" /> <Key
<Key latin:keyStyle="shiftKeyStyle"
latin:keyStyle="deleteKeyStyle" latin:keyWidth="10%p"
latin:keyWidth="fillRight" latin:visualInsetsRight="1%p" />
latin:visualInsetsLeft="1%p" /> <include
</Row> latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"
latin:visualInsetsLeft="1%p" />
</Row>
</case>
<default>
<Row
latin:keyWidth="10%p"
latin:rowHeight="15%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_0" />
</Row>
<Row
latin:keyWidth="10%p"
latin:rowHeight="20%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_1" />
</Row>
<Row
latin:keyWidth="10%p"
latin:rowHeight="20%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_2" />
</Row>
<Row
latin:keyWidth="10%p"
latin:rowHeight="20%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10%p"
latin:visualInsetsRight="1%p" />
<include
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"
latin:visualInsetsLeft="1%p" />
</Row>
</default>
</switch>
<include <include
latin:keyboardLayout="@xml/row_qwerty4" /> latin:keyboardLayout="@xml/row_qwerty4" />
</merge> </merge>

View file

@ -20,45 +20,90 @@
<merge <merge
xmlns:latin="http://schemas.android.com/apk/res-auto" xmlns:latin="http://schemas.android.com/apk/res-auto"
> >
<include <include
latin:keyboardLayout="@xml/key_styles_common" /> latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="10%p" <switch>
latin:rowHeight="25%p" <case
> latin:numberRowEnabled="true"
<include >
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_0" /> <Row
</Row> latin:keyWidth="10%p"
<Row latin:rowHeight="25%p"
latin:keyWidth="10%p" >
latin:rowHeight="25%p" <include
> latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_0" />
<include </Row>
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_1" /> <Row
</Row> latin:keyWidth="10%p"
<Row latin:rowHeight="25%p"
latin:keyWidth="10%p" >
latin:rowHeight="25%p" <include
> latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_1" />
<include </Row>
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_2" /> <Row
</Row> latin:keyWidth="10%p"
<Row latin:rowHeight="25%p"
latin:keyWidth="10%p" >
latin:rowHeight="25%p" <include
> latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_2" />
<Key </Row>
latin:keyStyle="shiftKeyStyle" <Row
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:visualInsetsRight="1%p" /> latin:rowHeight="25%p"
<include >
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_3" /> <Key
<Key latin:keyStyle="shiftKeyStyle"
latin:keyStyle="deleteKeyStyle" latin:keyWidth="10%p"
latin:keyWidth="fillRight" latin:visualInsetsRight="1%p" />
latin:visualInsetsLeft="1%p" /> <include
</Row> latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"
latin:visualInsetsLeft="1%p" />
</Row>
</case>
<default>
<Row
latin:keyWidth="10%p"
latin:rowHeight="15%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_0" />
</Row>
<Row
latin:keyWidth="10%p"
latin:rowHeight="20%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_1" />
</Row>
<Row
latin:keyWidth="10%p"
latin:rowHeight="20%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_2" />
</Row>
<Row
latin:keyWidth="10%p"
latin:rowHeight="20%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10%p"
latin:visualInsetsRight="1%p" />
<include
latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"
latin:visualInsetsLeft="1%p" />
</Row>
</default>
</switch>
<include <include
latin:keyboardLayout="@xml/row_qwerty4" /> latin:keyboardLayout="@xml/row_qwerty4" />
</merge> </merge>