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

Jump to bottom

Add left handed EN messagease #696

Merged
merged 9 commits into from
Feb 12, 2024
Merged

Add left handed EN messagease #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4680958
Add left-handed messageease variants
Feb 8, 2024
3864ebe
Apply common ABC_KEY_ITEM to other boards
Feb 8, 2024
c1e60a4
Add function to flip board to left-handed
Feb 9, 2024
7faf64b
Simplify messageease_left definitions
Feb 9, 2024
924294b
Update definitions
Feb 12, 2024
42e1f3e
gradle format
Feb 12, 2024
f18d630
Extra uses of dedicated ABC key
Feb 9, 2024
e747e8c
gradle format
Feb 12, 2024
25a3420
Add layout to enum
Feb 12, 2024
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
13 changes: 1 addition & 12 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/DoubleNumeric.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.dessalines.thumbkey.keyboards

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Abc
import com.dessalines.thumbkey.utils.ColorVariant
import com.dessalines.thumbkey.utils.FontSizeVariant
import com.dessalines.thumbkey.utils.KeyAction
Expand Down Expand Up @@ -591,16 +589,7 @@ val DOUBLE_NUMERIC_KEYBOARD =
),
),
listOf(
KeyItemC(
center =
KeyC(
display = KeyDisplay.IconDisplay(Icons.Outlined.Abc),
action = KeyAction.ToggleNumericMode(false),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
backgroundColor = ColorVariant.SURFACE_VARIANT,
),
ABC_KEY_ITEM,
KeyItemC(
center =
KeyC(
Expand Down
12 changes: 1 addition & 11 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/ENFRMessagEaseSymbols.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.dessalines.thumbkey.keyboards

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Abc
import androidx.compose.material.icons.outlined.ArrowDropDown
import androidx.compose.material.icons.outlined.ArrowDropUp
import androidx.compose.material.icons.outlined.Copyright
Expand Down Expand Up @@ -1006,16 +1005,7 @@ val KB_EN_FR_NUMERIC =
),
),
),
KeyItemC(
center =
KeyC(
display = KeyDisplay.IconDisplay(Icons.Outlined.Abc),
action = KeyAction.ToggleNumericMode(false),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
backgroundColor = ColorVariant.SURFACE_VARIANT,
),
ABC_KEY_ITEM,
),
listOf(
KeyItemC(
Expand Down
23 changes: 23 additions & 0 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessagEaseLeft.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.dessalines.thumbkey.keyboards

import com.dessalines.thumbkey.utils.KeyboardDefinition
import com.dessalines.thumbkey.utils.KeyboardDefinitionModes
import com.dessalines.thumbkey.utils.KeyboardDefinitionSettings
import com.dessalines.thumbkey.utils.autoCapitalizeI
import com.dessalines.thumbkey.utils.autoCapitalizeIApostrophe
import com.dessalines.thumbkey.utils.lastColKeysToFirst

val KB_EN_MESSAGEASE_LEFT: KeyboardDefinition =
KeyboardDefinition(
title = "english MessagEase left-handed",
modes =
KeyboardDefinitionModes(
main = lastColKeysToFirst(KB_EN_MESSAGEASE_MAIN),
shifted = lastColKeysToFirst(KB_EN_MESSAGEASE_SHIFTED),
numeric = lastColKeysToFirst(KB_EN_MESSAGEASE_NUMERIC),
),
settings =
KeyboardDefinitionSettings(
autoCapitalizers = arrayOf(::autoCapitalizeI, ::autoCapitalizeIApostrophe),
),
)
23 changes: 23 additions & 0 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessagEaseLeftSymbols.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.dessalines.thumbkey.keyboards

import com.dessalines.thumbkey.utils.KeyboardDefinition
import com.dessalines.thumbkey.utils.KeyboardDefinitionModes
import com.dessalines.thumbkey.utils.KeyboardDefinitionSettings
import com.dessalines.thumbkey.utils.autoCapitalizeI
import com.dessalines.thumbkey.utils.autoCapitalizeIApostrophe
import com.dessalines.thumbkey.utils.lastColKeysToFirst

val KB_EN_MESSAGEASE_SYMBOLS_LEFT: KeyboardDefinition =
KeyboardDefinition(
title = "english symbols MessagEase left-handed",
modes =
KeyboardDefinitionModes(
main = lastColKeysToFirst(KB_EN_MESSAGEASE_SYMBOLS_MAIN),
shifted = lastColKeysToFirst(KB_EN_MESSAGEASE_SYMBOLS_SHIFTED),
numeric = lastColKeysToFirst(KB_EN_MESSAGEASE_NUMERIC),
),
settings =
KeyboardDefinitionSettings(
autoCapitalizers = arrayOf(::autoCapitalizeI, ::autoCapitalizeIApostrophe),
),
)
12 changes: 1 addition & 11 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/ENThumbKeyProgrammerWide.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.dessalines.thumbkey.keyboards

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.KeyboardTab
import androidx.compose.material.icons.outlined.Abc
import androidx.compose.material.icons.outlined.ArrowDropDown
import androidx.compose.material.icons.outlined.ArrowDropUp
import androidx.compose.material.icons.outlined.Copyright
Expand Down Expand Up @@ -943,16 +942,7 @@ val NUMERIC_KEYBOARD_WIDE =
),
),
),
KeyItemC(
center =
KeyC(
display = KeyDisplay.IconDisplay(Icons.Outlined.Abc),
action = KeyAction.ToggleNumericMode(false),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
backgroundColor = ColorVariant.SURFACE_VARIANT,
),
ABC_KEY_ITEM,
),
listOf(
SPACEBAR_ALL_SYMBOLS,
Expand Down
13 changes: 1 addition & 12 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/ESMessagEaseNumeric.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.dessalines.thumbkey.keyboards

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Abc
import com.dessalines.thumbkey.utils.ColorVariant
import com.dessalines.thumbkey.utils.FontSizeVariant
import com.dessalines.thumbkey.utils.KeyAction
Expand Down Expand Up @@ -226,16 +224,7 @@ val KB_ES_MESSAGEASE_NUMERIC =
),
),
),
KeyItemC(
center =
KeyC(
display = KeyDisplay.IconDisplay(Icons.Outlined.Abc),
action = KeyAction.ToggleNumericMode(false),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
backgroundColor = ColorVariant.SURFACE_VARIANT,
),
ABC_KEY_ITEM,
),
listOf(
KeyItemC(
Expand Down
13 changes: 1 addition & 12 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/FarsiNumeric.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.dessalines.thumbkey.keyboards

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Abc
import com.dessalines.thumbkey.utils.ColorVariant
import com.dessalines.thumbkey.utils.FontSizeVariant
import com.dessalines.thumbkey.utils.KeyAction
Expand Down Expand Up @@ -220,16 +218,7 @@ val FARSI_NUMERIC_KEYBOARD =
),
),
),
KeyItemC(
center =
KeyC(
display = KeyDisplay.IconDisplay(Icons.Outlined.Abc),
action = KeyAction.ToggleNumericMode(false),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
backgroundColor = ColorVariant.SURFACE_VARIANT,
),
ABC_KEY_ITEM,
),
listOf(
KeyItemC(
Expand Down
13 changes: 1 addition & 12 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/Numeric.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.dessalines.thumbkey.keyboards

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Abc
import com.dessalines.thumbkey.utils.ColorVariant
import com.dessalines.thumbkey.utils.FontSizeVariant
import com.dessalines.thumbkey.utils.KeyAction
Expand Down Expand Up @@ -211,16 +209,7 @@ val NUMERIC_KEYBOARD =
),
),
),
KeyItemC(
center =
KeyC(
display = KeyDisplay.IconDisplay(Icons.Outlined.Abc),
action = KeyAction.ToggleNumericMode(false),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
backgroundColor = ColorVariant.SURFACE_VARIANT,
),
ABC_KEY_ITEM,
),
listOf(
KeyItemC(
Expand Down
13 changes: 1 addition & 12 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/TwoHandsNumeric.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.dessalines.thumbkey.keyboards

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Abc
import com.dessalines.thumbkey.utils.ColorVariant
import com.dessalines.thumbkey.utils.FontSizeVariant
import com.dessalines.thumbkey.utils.KeyAction
Expand Down Expand Up @@ -293,16 +291,7 @@ val TWO_HANDS_NUMERIC_KEYBOARD =
),
),
),
KeyItemC(
center =
KeyC(
display = KeyDisplay.IconDisplay(Icons.Outlined.Abc),
action = KeyAction.ToggleNumericMode(false),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
backgroundColor = ColorVariant.SURFACE_VARIANT,
),
ABC_KEY_ITEM,
KeyItemC(
center =
KeyC(
Expand Down
12 changes: 1 addition & 11 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/TypeSplitNumeric.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.dessalines.thumbkey.keyboards

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Abc
import androidx.compose.material.icons.outlined.Settings
import com.dessalines.thumbkey.utils.ColorVariant
import com.dessalines.thumbkey.utils.FontSizeVariant
Expand Down Expand Up @@ -353,16 +352,7 @@ val TYPESPLIT_NUMERIC_KEYBOARD =
),
),
listOf(
KeyItemC(
center =
KeyC(
display = KeyDisplay.IconDisplay(Icons.Outlined.Abc),
action = KeyAction.ToggleNumericMode(false),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
backgroundColor = ColorVariant.SURFACE_VARIANT,
),
ABC_KEY_ITEM,
BACKSPACE_TYPESPLIT_SHIFTED_KEY_ITEM,
RETURN_KEY_ITEM,
),
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ import com.dessalines.thumbkey.keyboards.KB_EN_EE_THUMBKEY
import com.dessalines.thumbkey.keyboards.KB_EN_FR_MESSAGEASE_SYMBOLS
import com.dessalines.thumbkey.keyboards.KB_EN_IT_THUMBKEY
import com.dessalines.thumbkey.keyboards.KB_EN_MESSAGEASE
import com.dessalines.thumbkey.keyboards.KB_EN_MESSAGEASE_LEFT
import com.dessalines.thumbkey.keyboards.KB_EN_MESSAGEASE_SYMBOLS
import com.dessalines.thumbkey.keyboards.KB_EN_MESSAGEASE_SYMBOLS_LEFT
import com.dessalines.thumbkey.keyboards.KB_EN_MI_THUMBKEY
import com.dessalines.thumbkey.keyboards.KB_EN_MI_THUMBKEY_SYMBOLS
import com.dessalines.thumbkey.keyboards.KB_EN_NO_MESSAGEASE_SYMBOLS
Expand Down Expand Up @@ -200,4 +202,6 @@ enum class KeyboardLayout(val keyboardDefinition: KeyboardDefinition) {
HEMessageEaseSymbols(KB_HE_MESSAGEEASE_SYMBOLS),
ENNOMessagEaseSymbols(KB_EN_NO_MESSAGEASE_SYMBOLS),
SLMessagEaseSymbols(KB_SL_MESSAGEEASE_SYMBOLS),
ENMessagEaseLeft(KB_EN_MESSAGEASE_LEFT),
ENMessagEaseSymbolsLeft(KB_EN_MESSAGEASE_SYMBOLS_LEFT),
}
12 changes: 12 additions & 0 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 @@ -941,3 +941,15 @@ fun getLocalCurrency(): String? {
).currency?.symbol
}
}

fun lastColKeysToFirst(board: KeyboardC): KeyboardC {
val newArr =
board.arr.map { row ->
if (row.isNotEmpty()) {
listOf(row.last()) + row.dropLast(1)
} else {
row
}
}
return KeyboardC(newArr)
}