Skip to content

Commit ec7dd28

Browse files
committed
Extracted languages enum to the Language.kt file
1 parent 9646907 commit ec7dd28

File tree

2 files changed

+72
-67
lines changed

2 files changed

+72
-67
lines changed

app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -25,73 +25,6 @@ const val SHOW_NUMBERS_ROW = "show_numbers_row"
2525
const val ITEM_SECTION_LABEL = 0
2626
const val ITEM_CLIP = 1
2727

28-
enum class Language(@StringRes private val stringRes: Int, private val layout: Int) {
29-
ENGLISH_QWERTY(
30-
R.string.translation_english, R.xml.keys_letters_english_qwerty
31-
),
32-
RUSSIAN(
33-
R.string.translation_russian, R.xml.keys_letters_russian
34-
),
35-
FRENCH(
36-
R.string.translation_french, R.xml.keys_letters_french
37-
),
38-
ENGLISH_QWERTZ(
39-
R.string.translation_english, R.xml.keys_letters_english_qwertz
40-
),
41-
SPANISH(
42-
R.string.translation_spanish, R.string.translation_spanish
43-
),
44-
GERMAN(
45-
R.string.translation_german, R.xml.keys_letters_german
46-
),
47-
ENGLISH_DVORAK(
48-
R.string.translation_english, R.xml.keys_letters_english_dvorak
49-
),
50-
ROMANIAN(
51-
R.string.translation_romanian, R.xml.keys_letters_romanian
52-
),
53-
SLOVENIAN(
54-
R.string.translation_slovenian, R.xml.keys_letters_slovenian
55-
),
56-
BULGARIAN(
57-
R.string.translation_bulgarian, R.xml.keys_letters_bulgarian
58-
),
59-
TURKISH_Q(
60-
R.string.translation_turkish, R.xml.keys_letters_turkish_q
61-
),
62-
LITHUANIAN(
63-
R.string.translation_lithuanian, R.xml.keys_letters_lithuanian
64-
),
65-
BENGALI(
66-
R.string.translation_bengali, R.xml.keys_letters_bengali
67-
),
68-
GREEK(
69-
R.string.translation_greek, R.xml.keys_letters_greek
70-
);
71-
72-
fun getName(context: Context): String {
73-
with(context) {
74-
return when (val language = this@Language) {
75-
ENGLISH_DVORAK -> "${getString(language.stringRes)} (DVORAK)"
76-
ENGLISH_QWERTY -> "${getString(language.stringRes)} (QWERTY)"
77-
ENGLISH_QWERTZ -> "${getString(language.stringRes)} (QWERTZ)"
78-
else -> getString(language.stringRes)
79-
}
80-
}
81-
}
82-
83-
companion object {
84-
fun getKeyboardLayout(keyboardLanguage: Int): Int {
85-
return Language.values().getOrElse(keyboardLanguage) { ENGLISH_QWERTY }.layout
86-
}
87-
88-
fun getKeyboardName(context: Context, language: Int): String {
89-
return Language.values().getOrElse(language) { ENGLISH_QWERTY }.getName(context)
90-
}
91-
}
92-
93-
}
94-
9528
// keyboard height multiplier options
9629
const val KEYBOARD_HEIGHT_MULTIPLIER_SMALL = 1
9730
const val KEYBOARD_HEIGHT_MULTIPLIER_MEDIUM = 2
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
package com.simplemobiletools.keyboard.helpers
2+
3+
import android.content.Context
4+
import androidx.annotation.StringRes
5+
import com.simplemobiletools.keyboard.R
6+
7+
enum class Language(@StringRes private val stringRes: Int, private val layout: Int) {
8+
ENGLISH_QWERTY(
9+
R.string.translation_english, R.xml.keys_letters_english_qwerty
10+
),
11+
RUSSIAN(
12+
R.string.translation_russian, R.xml.keys_letters_russian
13+
),
14+
FRENCH(
15+
R.string.translation_french, R.xml.keys_letters_french
16+
),
17+
ENGLISH_QWERTZ(
18+
R.string.translation_english, R.xml.keys_letters_english_qwertz
19+
),
20+
SPANISH(
21+
R.string.translation_spanish, R.string.translation_spanish
22+
),
23+
GERMAN(
24+
R.string.translation_german, R.xml.keys_letters_german
25+
),
26+
ENGLISH_DVORAK(
27+
R.string.translation_english, R.xml.keys_letters_english_dvorak
28+
),
29+
ROMANIAN(
30+
R.string.translation_romanian, R.xml.keys_letters_romanian
31+
),
32+
SLOVENIAN(
33+
R.string.translation_slovenian, R.xml.keys_letters_slovenian
34+
),
35+
BULGARIAN(
36+
R.string.translation_bulgarian, R.xml.keys_letters_bulgarian
37+
),
38+
TURKISH_Q(
39+
R.string.translation_turkish, R.xml.keys_letters_turkish_q
40+
),
41+
LITHUANIAN(
42+
R.string.translation_lithuanian, R.xml.keys_letters_lithuanian
43+
),
44+
BENGALI(
45+
R.string.translation_bengali, R.xml.keys_letters_bengali
46+
),
47+
GREEK(
48+
R.string.translation_greek, R.xml.keys_letters_greek
49+
);
50+
51+
fun getName(context: Context): String {
52+
with(context) {
53+
return when (val language = this@Language) {
54+
ENGLISH_DVORAK -> "${getString(language.stringRes)} (DVORAK)"
55+
ENGLISH_QWERTY -> "${getString(language.stringRes)} (QWERTY)"
56+
ENGLISH_QWERTZ -> "${getString(language.stringRes)} (QWERTZ)"
57+
else -> getString(language.stringRes)
58+
}
59+
}
60+
}
61+
62+
companion object {
63+
fun getKeyboardLayout(keyboardLanguage: Int): Int {
64+
return Language.values().getOrElse(keyboardLanguage) { ENGLISH_QWERTY }.layout
65+
}
66+
67+
fun getKeyboardName(context: Context, language: Int): String {
68+
return Language.values().getOrElse(language) { ENGLISH_QWERTY }.getName(context)
69+
}
70+
}
71+
72+
}

0 commit comments

Comments
 (0)