Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import org.fossify.keyboard.helpers.LANGUAGE_CHUVASH
import org.fossify.keyboard.helpers.LANGUAGE_CZECH_QWERTY
import org.fossify.keyboard.helpers.LANGUAGE_CZECH_QWERTZ
import org.fossify.keyboard.helpers.LANGUAGE_DANISH
import org.fossify.keyboard.helpers.LANGUAGE_DHIVEHI
import org.fossify.keyboard.helpers.LANGUAGE_DUTCH
import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_ASSET
import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_COLEMAK
Expand Down Expand Up @@ -74,6 +75,7 @@ fun Context.getKeyboardLanguageText(language: Int): String {
LANGUAGE_CZECH_QWERTY -> "${getString(R.string.translation_czech)} (QWERTY)"
LANGUAGE_CZECH_QWERTZ -> "${getString(R.string.translation_czech)} (QWERTZ)"
LANGUAGE_DANISH -> getString(R.string.translation_danish)
LANGUAGE_DHIVEHI -> "Dhivehi"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Strings shouldn't be hardcoded. Please add this to Fossify Commons lib for reusability: https://github.com/FossifyOrg/commons

LANGUAGE_DUTCH -> getString(R.string.translation_dutch)
LANGUAGE_ENGLISH_ASSET -> "${getString(R.string.translation_english)} (Asset)"
LANGUAGE_ENGLISH_COLEMAK -> "${getString(R.string.translation_english)} (Colemak)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ const val LANGUAGE_ENGLISH_COLEMAKDH = 41
const val LANGUAGE_ENGLISH_NIRO = 42
const val LANGUAGE_ENGLISH_SOUL = 43
const val LANGUAGE_ENGLISH_WORKMAN = 44
const val LANGUAGE_DHIVEHI = 45

Comment on lines +83 to +84
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary empty line

Suggested change
const val LANGUAGE_DHIVEHI = 45
const val LANGUAGE_DHIVEHI = 45


// Keep this sorted
val SUPPORTED_LANGUAGES = listOf(
Expand All @@ -103,6 +105,7 @@ val SUPPORTED_LANGUAGES = listOf(
LANGUAGE_ENGLISH_NIRO,
LANGUAGE_ENGLISH_SOUL,
LANGUAGE_ENGLISH_WORKMAN,
LANGUAGE_DHIVEHI,
LANGUAGE_ESPERANTO,
LANGUAGE_FRENCH_AZERTY,
LANGUAGE_FRENCH_BEPO,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ import org.fossify.keyboard.helpers.LANGUAGE_DUTCH
import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_ASSET
import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_COLEMAK
import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_COLEMAKDH
import org.fossify.keyboard.helpers.LANGUAGE_DHIVEHI
import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_DVORAK
import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_NIRO
import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_QWERTZ
Expand Down Expand Up @@ -551,6 +552,7 @@ class SimpleKeyboardIME : InputMethodService(), OnKeyboardActionListener, Shared
LANGUAGE_CZECH_QWERTZ -> R.xml.keys_letters_czech_qwertz
LANGUAGE_DANISH -> R.xml.keys_letters_danish
LANGUAGE_DUTCH -> R.xml.keys_letters_dutch
LANGUAGE_DHIVEHI -> R.xml.keys_letters_dhivehi
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
Expand Down
61 changes: 61 additions & 0 deletions app/src/main/res/xml/keys_letters_dhivehi.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?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="ް" app:popupCharacters="ޤ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="1" />
<Key app:keyLabel="ޢ" app:popupCharacters="އ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="2" />
<Key app:keyLabel="ެ" app:popupCharacters="ޭ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="3" />
<Key app:keyLabel="ރ" app:popupCharacters="ޜ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="4" />
<Key app:keyLabel="ތ" app:popupCharacters="ޓ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="5" />
<Key app:keyLabel="ޔ" app:popupCharacters="ޘ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="6" />
<Key app:keyLabel="ު" app:popupCharacters="ޫ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="7" />
<Key app:keyLabel="ި" app:popupCharacters="ީ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="8" />
<Key app:keyLabel="ޮ" app:popupCharacters="ޯ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="9" />
<Key app:keyEdgeFlags="right" app:keyLabel="ޕ" app:popupCharacters="÷" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="0" />
</Row>

<Row>
<Key app:horizontalGap="5%" app:keyEdgeFlags="left" app:keyLabel="ަ" app:popupCharacters="ާ" app:popupKeyboard="@xml/keyboard_popup_template" />
<Key app:keyLabel="ސ" app:popupCharacters="ށ" app:popupKeyboard="@xml/keyboard_popup_template" />
<Key app:keyLabel="ދ" app:popupCharacters="ޑ" app:popupKeyboard="@xml/keyboard_popup_template" />
<Key app:keyLabel="ފ" app:popupCharacters="ﷲ" app:popupKeyboard="@xml/keyboard_popup_template" />
<Key app:keyLabel="ގ" app:popupCharacters="ޣ" app:popupKeyboard="@xml/keyboard_popup_template" />
<Key app:keyLabel="ހ" app:popupCharacters="ޙ" app:popupKeyboard="@xml/keyboard_popup_template" />
<Key app:keyLabel="ޖ" app:popupCharacters="ޛ" app:popupKeyboard="@xml/keyboard_popup_template" />
<Key app:keyLabel="ކ" app:popupCharacters="ޚ" app:popupKeyboard="@xml/keyboard_popup_template" />
<Key app:keyEdgeFlags="right" app:keyLabel="ލ" 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="ޒ" app:popupCharacters="ޜ" app:popupKeyboard="@xml/keyboard_popup_template" />
<Key app:keyLabel="ޘ" app:popupCharacters="×" app:popupKeyboard="@xml/keyboard_popup_template" />
<Key app:keyLabel="ޝ" app:popupCharacters="ޗ" app:popupKeyboard="@xml/keyboard_popup_template" />
<Key app:keyLabel="ވ" />
<Key app:keyLabel="ބ" app:popupCharacters="ޟ" app:popupKeyboard="@xml/keyboard_popup_template" />
<Key app:keyLabel="ނ" app:popupCharacters="ޏ" app:popupKeyboard="@xml/keyboard_popup_template" />
<Key app:keyLabel="މ" />
<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" app:keyRole="tools" app:popupKeyboard="@xml/popup_tools_with_emoji_key" app:secondaryKeyIcon="@drawable/ic_emoji_emotions_outline_vector" />
<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>
Comment on lines +1 to +61
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is unformatted. Please format it in Android Studio.

Loading