-
Notifications
You must be signed in to change notification settings - Fork 188
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix inconsistent layout naming #497
Changes from 11 commits
3f06cd3
00ee18d
fa5d488
374c9fb
80275f2
e5cc5ad
988452d
6af300d
2dce7be
c73d543
1d5db4f
3ff65e1
af57bc1
7eef36b
6ecd54d
b61c7f6
d627a89
78a627e
1f088d0
592bdec
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ import com.dessalines.thumbkey.utils.KeyboardDefinitionModes | |
import com.dessalines.thumbkey.utils.SwipeDirection | ||
import com.dessalines.thumbkey.utils.SwipeNWay | ||
|
||
val KB_UK_THUMBKEY_MAIN = KeyboardC( | ||
val KB_UA_THUMBKEY_MAIN = KeyboardC( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same |
||
listOf( | ||
listOf( | ||
KeyItemC( | ||
|
@@ -250,7 +250,7 @@ val KB_UK_THUMBKEY_MAIN = KeyboardC( | |
), | ||
) | ||
|
||
val KB_UK_THUMBKEY_SHIFTED = KeyboardC( | ||
val KB_UA_THUMBKEY_SHIFTED = KeyboardC( | ||
listOf( | ||
listOf( | ||
KeyItemC( | ||
|
@@ -489,11 +489,11 @@ val KB_UK_THUMBKEY_SHIFTED = KeyboardC( | |
), | ||
) | ||
|
||
val KB_UK_THUMBKEY: KeyboardDefinition = KeyboardDefinition( | ||
title = "UK Thumb-Key українська", | ||
val KB_UA_THUMBKEY: KeyboardDefinition = KeyboardDefinition( | ||
title = "UA Thumb-Key українська", | ||
modes = KeyboardDefinitionModes( | ||
main = KB_UK_THUMBKEY_MAIN, | ||
shifted = KB_UK_THUMBKEY_SHIFTED, | ||
main = KB_UA_THUMBKEY_MAIN, | ||
shifted = KB_UA_THUMBKEY_SHIFTED, | ||
numeric = NUMERIC_KEYBOARD, | ||
), | ||
) |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,6 @@ import com.dessalines.thumbkey.keyboards.KB_BG_THUMBKEY_SYMBOLS | |
import com.dessalines.thumbkey.keyboards.KB_BY_THUMBKEY | ||
import com.dessalines.thumbkey.keyboards.KB_BY_THUMBKEY_SYMBOLS | ||
import com.dessalines.thumbkey.keyboards.KB_CA_THUMBKEY | ||
import com.dessalines.thumbkey.keyboards.KB_CZ_THUMBKEY | ||
import com.dessalines.thumbkey.keyboards.KB_DA_THUMBKEY | ||
import com.dessalines.thumbkey.keyboards.KB_DE_MESSAGEEASE | ||
import com.dessalines.thumbkey.keyboards.KB_DE_MESSAGEEASE_SYMBOLS | ||
|
@@ -16,12 +15,15 @@ import com.dessalines.thumbkey.keyboards.KB_EN_MESSAGEEASE | |
import com.dessalines.thumbkey.keyboards.KB_EN_MESSAGEEASE_SYMBOLS | ||
import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY | ||
import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_MULTI | ||
import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_MULTI_CZ | ||
import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_MULTI_EE | ||
import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_MULTI_IT | ||
import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_PROGRAMMER | ||
import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_PROGRAMMER_WIDE | ||
import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_SYMBOLS | ||
import com.dessalines.thumbkey.keyboards.KB_EN_TWO_HANDS | ||
import com.dessalines.thumbkey.keyboards.KB_EN_TYPESPLIT | ||
import com.dessalines.thumbkey.keyboards.KB_EOENDE_THUMBKEY | ||
import com.dessalines.thumbkey.keyboards.KB_ES_CA_THUMBKEY | ||
import com.dessalines.thumbkey.keyboards.KB_ES_EO_THUMBKEY | ||
import com.dessalines.thumbkey.keyboards.KB_ES_MESSAGEEASE | ||
|
@@ -32,6 +34,7 @@ import com.dessalines.thumbkey.keyboards.KB_FA_THUMBKEY | |
import com.dessalines.thumbkey.keyboards.KB_FI_THUMBKEY | ||
import com.dessalines.thumbkey.keyboards.KB_FI_THUMBKEY_WIDE | ||
import com.dessalines.thumbkey.keyboards.KB_FI_TYPESPLIT | ||
import com.dessalines.thumbkey.keyboards.KB_FR_MESSAGEEASE | ||
import com.dessalines.thumbkey.keyboards.KB_FR_THUMBKEY_V1 | ||
import com.dessalines.thumbkey.keyboards.KB_FR_THUMBKEY_V2 | ||
import com.dessalines.thumbkey.keyboards.KB_FR_TYPESPLIT | ||
|
@@ -69,7 +72,7 @@ import com.dessalines.thumbkey.keyboards.KB_SV_THUMBKEY | |
import com.dessalines.thumbkey.keyboards.KB_T9 | ||
import com.dessalines.thumbkey.keyboards.KB_TR_THUMBKEY | ||
import com.dessalines.thumbkey.keyboards.KB_UA_RU_MESSAGEEASE_SYMBOLS | ||
import com.dessalines.thumbkey.keyboards.KB_UK_THUMBKEY | ||
import com.dessalines.thumbkey.keyboards.KB_UA_THUMBKEY | ||
|
||
// Make sure new keyboards have a new index, even if they are in the middle | ||
// Keyboards are placed in alphabetical order | ||
|
@@ -78,7 +81,6 @@ enum class KeyboardLayout(val index: Int, val keyboardDefinition: KeyboardDefini | |
BYThumbKey(19, KB_BY_THUMBKEY), | ||
BYThumbKeySymbols(20, KB_BY_THUMBKEY_SYMBOLS), | ||
CAThumbKey(69, KB_CA_THUMBKEY), | ||
CZThumbKey(52, KB_CZ_THUMBKEY), | ||
DAThumbKey(3, KB_DA_THUMBKEY), | ||
DEThumbKey(2, KB_DE_THUMBKEY), | ||
DEThumbKeyMultiLingual(25, KB_DE_THUMBKEY_MULTILINGUAL), | ||
|
@@ -88,15 +90,16 @@ enum class KeyboardLayout(val index: Int, val keyboardDefinition: KeyboardDefini | |
ENThumbKey(0, KB_EN_THUMBKEY), | ||
ENThumbKeySymbols(21, KB_EN_THUMBKEY_SYMBOLS), | ||
ENThumbKeyProgrammer(1, KB_EN_THUMBKEY_PROGRAMMER), | ||
ENThumbKeyProgrammerWide(44, KB_EN_THUMBKEY_PROGRAMMER), | ||
ENThumbKeyProgrammerWide(44, KB_EN_THUMBKEY_PROGRAMMER_WIDE), | ||
ENThumbKeyMulti(48, KB_EN_THUMBKEY_MULTI), | ||
ENThumbKeyMultiCZ(52, KB_EN_THUMBKEY_MULTI_CZ), | ||
ENMessageEase(15, KB_EN_MESSAGEEASE), | ||
ENMessageEaseSymbols(16, KB_EN_MESSAGEEASE_SYMBOLS), | ||
ENTypeSplit(36, KB_EN_TYPESPLIT), | ||
ENTwoHands(43, KB_EN_TWO_HANDS), | ||
ENThumbKeyMultiIT(65, KB_EN_THUMBKEY_MULTI_IT), | ||
ENEOMessageEaseSymbols(66, KB_ENEO_MESSAGEEASE_SYMBOLS), | ||
EOENDEThumbKey(50, KB_ES_EO_THUMBKEY), | ||
EOENDEThumbKey(50, KB_EOENDE_THUMBKEY), | ||
ESThumbKey(4, KB_ES_THUMBKEY), | ||
ESMessageEase(53, KB_ES_MESSAGEEASE), | ||
ESTypeSplit(37, KB_ES_TYPESPLIT), | ||
|
@@ -109,7 +112,7 @@ enum class KeyboardLayout(val index: Int, val keyboardDefinition: KeyboardDefini | |
FITypeSplit(59, KB_FI_TYPESPLIT), | ||
FRThumbKeyV1(8, KB_FR_THUMBKEY_V1), | ||
FRThumbKeyV2(33, KB_FR_THUMBKEY_V2), | ||
FRMessageEase(28, KB_FR_THUMBKEY_V1), | ||
FRMessageEase(28, KB_FR_MESSAGEEASE), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thx for getting this one. Eventually I'm going to put all these back in order by index, because people adding to this file need to see the last number anyway. |
||
FRTypeSplit(39, KB_FR_TYPESPLIT), | ||
GRThumbKey(51, KB_GR_THUMBKEY), | ||
HEThumbKey(49, KB_HE_THUMBKEY), | ||
|
@@ -140,9 +143,9 @@ enum class KeyboardLayout(val index: Int, val keyboardDefinition: KeyboardDefini | |
RUMessageEase(54, KB_RU_MESSAGEEASE), | ||
RUMessageEaseSymbols(29, KB_RU_MESSAGEEASE_SYMBOLS), | ||
SVThumbKey(34, KB_SV_THUMBKEY), | ||
T9v1(30, KB_T9), | ||
T9(30, KB_T9), | ||
TRThumbKey(35, KB_TR_THUMBKEY), | ||
UKThumbKeyUKv1(14, KB_UK_THUMBKEY), | ||
UAThumbKey(14, KB_UA_THUMBKEY), | ||
UKRUMessageEaseSymbols(67, KB_UA_RU_MESSAGEEASE_SYMBOLS), | ||
MATHThumbKey(70, KB_MATH_THUMBKEY), | ||
ENThumbKeyMultiEE(71, KB_EN_THUMBKEY_MULTI_EE), | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The ukrainian language code is UK : https://en.m.wikipedia.org/wiki/Ukrainian_language
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah, okay. i see - i got confused, because i was using the ISO country codes, and not the language codes. i guess language codes make more sense, due to stuff like esperanto which is not tied to a country. will fix