Skip to content
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.

Sign up for GitHub

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

Add Emoji to Wide Layout #448

Merged
merged 4 commits into from
Sep 27, 2023
Merged

Add Emoji to Wide Layout #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d139957
added Emoji to Wide Layout, renamed layout to match convention of oth…
thedroppedpocket Sep 27, 2023
053f89c
changed text in setting to match name conventions
thedroppedpocket Sep 27, 2023
df046da
changed text in setting to match name conventions
thedroppedpocket Sep 27, 2023
5919475
changed text in settings because the pipeline failed for no reason
thedroppedpocket Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ...mbkey/keyboards/WideLayoutENProgrammer.kt → ...key/keyboards/ThumbKeyENProgrammerWide.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import com.dessalines.thumbkey.utils.SwipeDirection
import com.dessalines.thumbkey.utils.SwipeNWay

// uses programmer layout but moves spacebar to the left column in order to make a more aspect ration friendly layout. this grid is 5x3 which is closer to the average phone aspect ration of 16:9 than 4x4 keyboard.
val WIDE_LAYOUT_EN_PROGRAMMER = KeyboardC(
val THUMBKEY_EN_PROGRAMMER_WIDE = KeyboardC(
listOf(
listOf(
SPACEBAR_TYPESPLIT_TOP_KEY_ITEM,
EMOJI_KEY_ITEM,
KeyItemC(
center = KeyC(
display = KeyDisplay.TextDisplay("s"),
Expand Down Expand Up @@ -351,10 +351,10 @@ val WIDE_LAYOUT_EN_PROGRAMMER = KeyboardC(
),
)

val WIDE_LAYOUT_EN_PROGRAMMER_SHIFTED = KeyboardC(
val THUMBKEY_EN_PROGRAMMER_WIDE_SHIFTED = KeyboardC(
listOf(
listOf(
SPACEBAR_TYPESPLIT_TOP_KEY_ITEM,
EMOJI_BACK_KEY_ITEM,
KeyItemC(
center = KeyC(
display = KeyDisplay.TextDisplay("S"),
Expand Down Expand Up @@ -958,8 +958,8 @@ val NUMERIC_KEYBOARD_WIDE = KeyboardC(
),
)

val WIDE_LAYOUT_EN_PROGRAMMER_KEYBOARD_MODES: Map<KeyboardMode, KeyboardC> = mapOf(
KeyboardMode.MAIN to WIDE_LAYOUT_EN_PROGRAMMER,
KeyboardMode.SHIFTED to WIDE_LAYOUT_EN_PROGRAMMER_SHIFTED,
val THUMBKEY_EN_PROGRAMMER_WIDE_KEYBOARD_MODES: Map<KeyboardMode, KeyboardC> = mapOf(
KeyboardMode.MAIN to THUMBKEY_EN_PROGRAMMER_WIDE,
KeyboardMode.SHIFTED to THUMBKEY_EN_PROGRAMMER_WIDE_SHIFTED,
KeyboardMode.NUMERIC to NUMERIC_KEYBOARD_WIDE,
)
2 changes: 1 addition & 1 deletion app/src/main/java/com/dessalines/thumbkey/utils/Types.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ enum class KeyboardLayout(val title: String, val index: Int) {
TypeSplitPTv1("Type-Split português v1", 41),
TypeSplitPLv1("Type-Split polski v1", 42),
TwoHandsENv1("Two Hands english v1", 43),
WideLayoutENProgrammer("Wide Layout English Programmer", 44),
ThumbKeyEnProgrammerWide("Wide programmer (Thumb-Key english)", 44),
ThumbKeyHUv1("Thumb-Key magyar nyelv v1", 45),
ThumbKeyESEOv1("Thumb-Key español esperanto v1", 46),
MessageEaseIT("MessageEase italiano", 47),
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ import com.dessalines.thumbkey.keyboards.THUMBKEY_CZ_V1_KEYBOARD_MODES
import com.dessalines.thumbkey.keyboards.THUMBKEY_DA_V1_KEYBOARD_MODES
import com.dessalines.thumbkey.keyboards.THUMBKEY_DE_V2_KEYBOARD_MODES
import com.dessalines.thumbkey.keyboards.THUMBKEY_DE_V2_MULTILINGUAL_KEYBOARD_MODES
import com.dessalines.thumbkey.keyboards.THUMBKEY_EN_PROGRAMMER_WIDE_KEYBOARD_MODES
import com.dessalines.thumbkey.keyboards.THUMBKEY_EN_V4_KEYBOARD_MODES
import com.dessalines.thumbkey.keyboards.THUMBKEY_EN_V4_MULTI_KEYBOARD_MODES
import com.dessalines.thumbkey.keyboards.THUMBKEY_EN_V4_PROGRAMMER_KEYBOARD_MODES
Expand Down Expand Up @@ -98,7 +99,6 @@ import com.dessalines.thumbkey.keyboards.TYPESPLIT_FR_V1_KEYBOARD_MODES
import com.dessalines.thumbkey.keyboards.TYPESPLIT_IT_V1_KEYBOARD_MODES
import com.dessalines.thumbkey.keyboards.TYPESPLIT_PL_V1_KEYBOARD_MODES
import com.dessalines.thumbkey.keyboards.TYPESPLIT_PT_V1_KEYBOARD_MODES
import com.dessalines.thumbkey.keyboards.WIDE_LAYOUT_EN_PROGRAMMER_KEYBOARD_MODES
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
Expand Down Expand Up @@ -181,7 +181,7 @@ fun keyboardLayoutToModes(layout: KeyboardLayout): Map<KeyboardMode, KeyboardC>
KeyboardLayout.TypeSplitPTv1 -> TYPESPLIT_PT_V1_KEYBOARD_MODES
KeyboardLayout.TypeSplitPLv1 -> TYPESPLIT_PL_V1_KEYBOARD_MODES
KeyboardLayout.TwoHandsENv1 -> TWO_HANDS_EN_V1_KEYBOARD_MODES
KeyboardLayout.WideLayoutENProgrammer -> WIDE_LAYOUT_EN_PROGRAMMER_KEYBOARD_MODES
KeyboardLayout.ThumbKeyEnProgrammerWide -> THUMBKEY_EN_PROGRAMMER_WIDE_KEYBOARD_MODES
KeyboardLayout.ThumbKeyHUv1 -> THUMBKEY_HU_V1_KEYBOARD_MODES
KeyboardLayout.ThumbKeyESEOv1 -> THUMBKEY_ES_EO_V1_KEYBOARD_MODES
KeyboardLayout.MessageEaseIT -> MESSAGEEASE_IT_KEYBOARD_MODES
Expand Down