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

Added Asset, Colemak, Colemak-DH, Niro, Soul, and Workman layouts #71

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Added Asset, Colemak, Colemak-DH, Niro, Soul, and Workman layouts #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e7ae14
added asset, colemak, colemak-dh, niro, soul, and workman layout
NaeemBolchhi Aug 18, 2024
c9a6240
Update app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt
NaeemBolchhi Aug 18, 2024
9482840
Added a space after WORKMAN in Context.kt
NaeemBolchhi Aug 18, 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
6 changes: 6 additions & 0 deletions app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,14 @@ fun Context.getKeyboardLanguageText(language: Int): String {
LANGUAGE_BULGARIAN -> getString(R.string.translation_bulgarian)
LANGUAGE_CHUVASH -> getString(R.string.translation_chuvash)
LANGUAGE_DANISH -> getString(R.string.translation_danish)
LANGUAGE_ENGLISH_ASSET -> "${getString(R.string.translation_english)} (Asset)"
LANGUAGE_ENGLISH_COLEMAK -> "${getString(R.string.translation_english)} (Colemak)"
LANGUAGE_ENGLISH_COLEMAKDH -> "${getString(R.string.translation_english)} (Colemak-DH)"
LANGUAGE_ENGLISH_DVORAK -> "${getString(R.string.translation_english)} (DVORAK)"
LANGUAGE_ENGLISH_NIRO -> "${getString(R.string.translation_english)} (Niro)"
LANGUAGE_ENGLISH_QWERTZ -> "${getString(R.string.translation_english)} (QWERTZ)"
LANGUAGE_ENGLISH_SOUL -> "${getString(R.string.translation_english)} (Soul)"
LANGUAGE_ENGLISH_WORKMAN -> "${getString(R.string.translation_english)} (Workman)"
LANGUAGE_ESPERANTO -> getString(R.string.translation_esperanto)
LANGUAGE_FRENCH_AZERTY -> "${getString(R.string.translation_french)} (AZERTY)"
LANGUAGE_FRENCH_BEPO -> "${getString(R.string.translation_french)} (BEPO)"
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/kotlin/org/fossify/keyboard/helpers/Constants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ const val LANGUAGE_CHUVASH = 22
const val LANGUAGE_ESPERANTO = 23
const val LANGUAGE_HEBREW = 24
const val LANGUAGE_ARABIC = 25
const val LANGUAGE_ENGLISH_ASSET = 26
const val LANGUAGE_ENGLISH_COLEMAK = 27
const val LANGUAGE_ENGLISH_COLEMAKDH = 28
const val LANGUAGE_ENGLISH_NIRO = 29
const val LANGUAGE_ENGLISH_SOUL = 30
const val LANGUAGE_ENGLISH_WORKMAN = 31

// Keep this sorted
val SUPPORTED_LANGUAGES = listOf(
Expand All @@ -63,7 +69,13 @@ val SUPPORTED_LANGUAGES = listOf(
LANGUAGE_DANISH,
LANGUAGE_ENGLISH_QWERTY,
LANGUAGE_ENGLISH_QWERTZ,
LANGUAGE_ENGLISH_ASSET,
LANGUAGE_ENGLISH_COLEMAK,
LANGUAGE_ENGLISH_COLEMAKDH,
LANGUAGE_ENGLISH_DVORAK,
LANGUAGE_ENGLISH_NIRO,
LANGUAGE_ENGLISH_SOUL,
LANGUAGE_ENGLISH_WORKMAN,
LANGUAGE_ESPERANTO,
LANGUAGE_FRENCH_AZERTY,
LANGUAGE_FRENCH_BEPO,
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,8 +443,14 @@ class SimpleKeyboardIME : InputMethodService(), OnKeyboardActionListener, Shared
LANGUAGE_BULGARIAN -> R.xml.keys_letters_bulgarian
LANGUAGE_CHUVASH -> R.xml.keys_letters_chuvash
LANGUAGE_DANISH -> R.xml.keys_letters_danish
LANGUAGE_ENGLISH_ASSET -> R.xml.keys_letters_english_asset
LANGUAGE_ENGLISH_COLEMAK -> R.xml.keys_letters_english_colemak
LANGUAGE_ENGLISH_COLEMAKDH -> R.xml.keys_letters_english_colemakdh
LANGUAGE_ENGLISH_DVORAK -> R.xml.keys_letters_english_dvorak
LANGUAGE_ENGLISH_NIRO -> R.xml.keys_letters_english_niro
LANGUAGE_ENGLISH_QWERTZ -> R.xml.keys_letters_english_qwertz
LANGUAGE_ENGLISH_SOUL -> R.xml.keys_letters_english_soul
LANGUAGE_ENGLISH_WORKMAN -> R.xml.keys_letters_english_workman
LANGUAGE_ESPERANTO -> R.xml.keys_letters_esperanto
LANGUAGE_FRENCH_AZERTY -> R.xml.keys_letters_french_azerty
LANGUAGE_FRENCH_BEPO -> R.xml.keys_letters_french_bepo
Expand Down
188 changes: 188 additions & 0 deletions app/src/main/res/xml/keys_letters_english_asset.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
<?xml version="1.0" encoding="utf-8"?>
<Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
<Row app:isNumbersRow="true">
<Key
app:keyEdgeFlags="left"
app:keyLabel="1"
app:topSmallNumber="1" />
<Key
app:keyLabel="2"
app:topSmallNumber="2" />
<Key
app:keyLabel="3"
app:topSmallNumber="3" />
<Key
app:keyLabel="4"
app:topSmallNumber="4" />
<Key
app:keyLabel="5"
app:topSmallNumber="5" />
<Key
app:keyLabel="6"
app:topSmallNumber="6" />
<Key
app:keyLabel="7"
app:topSmallNumber="7" />
<Key
app:keyLabel="8"
app:topSmallNumber="8" />
<Key
app:keyLabel="9"
app:topSmallNumber="9" />
<Key
app:keyEdgeFlags="right"
app:keyLabel="0"
app:topSmallNumber="0" />
</Row>
<Row>
<Key
app:keyEdgeFlags="left"
app:keyLabel="q"
app:popupCharacters="1"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="1" />
<Key
app:keyLabel="w"
app:popupCharacters="2"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="2" />
<Key
app:keyLabel="j"
app:popupCharacters="3"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="3" />
<Key
app:keyLabel="f"
app:popupCharacters="4₣"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="4" />
<Key
app:keyLabel="g"
app:popupCharacters="5"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="5" />
<Key
app:keyLabel="y"
app:popupCharacters="ý6ÿ¥"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="6" />
<Key
app:keyLabel="p"
app:popupCharacters="7"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="7" />
<Key
app:keyLabel="u"
app:popupCharacters="űúùûü8ūů"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="8" />
<Key
app:keyLabel="l"
app:popupCharacters="ĺľ9ł"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="9" />
<Key
app:keyEdgeFlags="right"
app:keyLabel=";"
app:popupCharacters="0"
app:popupKeyboard="@xml/keyboard_popup_template"
app:topSmallNumber="0" />
</Row>
<Row>
<Key
app:keyEdgeFlags="left"
app:keyLabel="a"
app:popupCharacters="áàâãäåāæą"
app:popupKeyboard="@xml/keyboard_popup_template" />
<Key
app:keyLabel="s"
app:popupCharacters="śßš"
app:popupKeyboard="@xml/keyboard_popup_template" />
<Key
app:keyLabel="e"
app:popupCharacters="éèêëēę"
app:popupKeyboard="@xml/keyboard_popup_template" />
<Key
app:keyLabel="t"
app:popupCharacters="ť"
app:popupKeyboard="@xml/keyboard_popup_template" />
<Key
app:keyLabel="d"
app:popupCharacters="ďđ"
app:popupKeyboard="@xml/keyboard_popup_template" />
<Key app:keyLabel="h" />
<Key
app:keyLabel="n"
app:popupCharacters="ňńñ"
app:popupKeyboard="@xml/keyboard_popup_template" />
<Key
app:keyLabel="i"
app:popupCharacters="íìîïīį"
app:popupKeyboard="@xml/keyboard_popup_template" />
<Key
app:keyLabel="o"
app:popupCharacters="őöøóôòõō"
app:popupKeyboard="@xml/keyboard_popup_template" />
<Key
app:keyEdgeFlags="right"
app:keyLabel="r"
app:popupCharacters="řŕ"
app:popupKeyboard="@xml/keyboard_popup_template" />
</Row>
<Row>
<Key
app:code="-1"
app:keyEdgeFlags="left"
app:keyIcon="@drawable/ic_caps_outline_vector"
app:keyWidth="15%p" />
<Key
app:keyLabel="z"
app:popupCharacters="źžż"
app:popupKeyboard="@xml/keyboard_popup_template" />
<Key app:keyLabel="x" />
<Key
app:keyLabel="c"
app:popupCharacters="çčć¢"
app:popupKeyboard="@xml/keyboard_popup_template" />
<Key app:keyLabel="v" />
<Key app:keyLabel="b" />
<Key app:keyLabel="k" />
<Key app:keyLabel="m" />
<Key
app:code="-5"
app:isRepeatable="true"
app:keyEdgeFlags="right"
app:keyIcon="@drawable/ic_clear_vector"
app:keyWidth="15%p" />
</Row>
<Row>
<Key
app:code="-2"
app:keyEdgeFlags="left"
app:keyLabel="\?123"
app:keyWidth="15%p" />
<Key
app:keyLabel=","
app:keyWidth="10%p" />
<Key
app:code="-6"
app:keyEdgeFlags="left"
app:keyIcon="@drawable/ic_emoji_emotions_outline_vector"
app:keyWidth="10%p"
app:secondaryKeyIcon="@drawable/ic_language_outlined" />
<Key
app:code="32"
app:isRepeatable="true"
app:keyWidth="40%p" />
<Key
app:keyLabel="."
app:keyWidth="10%p"
app:popupCharacters=",;:?!…"
app:popupKeyboard="@xml/keyboard_popup_template" />
<Key
app:code="-4"
app:keyEdgeFlags="right"
app:keyIcon="@drawable/ic_enter_vector"
app:keyWidth="15%p" />
</Row>
</Keyboard>
Loading