Skip to content

Commit c8a449b

Browse files
tibbitibbi
authored
Merge pull request #186 from judemont/main
Added French BÉPO layouts
2 parents a9a9035 + 312f65d commit c8a449b

File tree

5 files changed

+187
-4
lines changed

5 files changed

+187
-4
lines changed

‎app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ fun Context.getKeyboardLanguages(): ArrayList<RadioItem> {
152152
RadioItem(LANGUAGE_ENGLISH_QWERTY, getKeyboardLanguageText(LANGUAGE_ENGLISH_QWERTY)),
153153
RadioItem(LANGUAGE_ENGLISH_QWERTZ, getKeyboardLanguageText(LANGUAGE_ENGLISH_QWERTZ)),
154154
RadioItem(LANGUAGE_ENGLISH_DVORAK, getKeyboardLanguageText(LANGUAGE_ENGLISH_DVORAK)),
155-
RadioItem(LANGUAGE_FRENCH, getKeyboardLanguageText(LANGUAGE_FRENCH)),
155+
RadioItem(LANGUAGE_FRENCH_AZERTY, getKeyboardLanguageText(LANGUAGE_FRENCH_AZERTY)),
156+
RadioItem(LANGUAGE_FRENCH_BEPO, getKeyboardLanguageText(LANGUAGE_FRENCH_BEPO)),
156157
RadioItem(LANGUAGE_GERMAN, getKeyboardLanguageText(LANGUAGE_GERMAN)),
157158
RadioItem(LANGUAGE_GREEK, getKeyboardLanguageText(LANGUAGE_GREEK)),
158159
RadioItem(LANGUAGE_LITHUANIAN, getKeyboardLanguageText(LANGUAGE_LITHUANIAN)),
@@ -173,7 +174,8 @@ fun Context.getKeyboardLanguageText(language: Int): String {
173174
LANGUAGE_DANISH -> getString(R.string.translation_danish)
174175
LANGUAGE_ENGLISH_DVORAK -> "${getString(R.string.translation_english)} (DVORAK)"
175176
LANGUAGE_ENGLISH_QWERTZ -> "${getString(R.string.translation_english)} (QWERTZ)"
176-
LANGUAGE_FRENCH -> getString(R.string.translation_french)
177+
LANGUAGE_FRENCH_AZERTY -> "${getString(R.string.translation_french)} (AZERTY)"
178+
LANGUAGE_FRENCH_BEPO -> "${getString(R.string.translation_french)} (BEPO)"
177179
LANGUAGE_GERMAN -> getString(R.string.translation_german)
178180
LANGUAGE_GREEK -> getString(R.string.translation_greek)
179181
LANGUAGE_LITHUANIAN -> getString(R.string.translation_lithuanian)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const val ITEM_CLIP = 1
2727

2828
const val LANGUAGE_ENGLISH_QWERTY = 0
2929
const val LANGUAGE_RUSSIAN = 1
30-
const val LANGUAGE_FRENCH = 2
30+
const val LANGUAGE_FRENCH_AZERTY = 2
3131
const val LANGUAGE_ENGLISH_QWERTZ = 3
3232
const val LANGUAGE_SPANISH = 4
3333
const val LANGUAGE_GERMAN = 5
@@ -42,6 +42,7 @@ const val LANGUAGE_GREEK = 13
4242
const val LANGUAGE_NORWEGIAN = 14
4343
const val LANGUAGE_SWEDISH = 15
4444
const val LANGUAGE_DANISH = 16
45+
const val LANGUAGE_FRENCH_BEPO = 17
4546

4647
// keyboard height multiplier options
4748
const val KEYBOARD_HEIGHT_MULTIPLIER_SMALL = 1

‎app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,8 @@ class SimpleKeyboardIME : InputMethodService(), OnKeyboardActionListener, Shared
279279
LANGUAGE_DANISH -> R.xml.keys_letters_danish
280280
LANGUAGE_ENGLISH_DVORAK -> R.xml.keys_letters_english_dvorak
281281
LANGUAGE_ENGLISH_QWERTZ -> R.xml.keys_letters_english_qwertz
282-
LANGUAGE_FRENCH -> R.xml.keys_letters_french
282+
LANGUAGE_FRENCH_AZERTY -> R.xml.keys_letters_french_azerty
283+
LANGUAGE_FRENCH_BEPO -> R.xml.keys_letters_french_bepo
283284
LANGUAGE_GERMAN -> R.xml.keys_letters_german
284285
LANGUAGE_GREEK -> R.xml.keys_letters_greek
285286
LANGUAGE_LITHUANIAN -> R.xml.keys_letters_lithuanian

‎app/src/main/res/xml/keys_letters_french.xml‎ renamed to ‎app/src/main/res/xml/keys_letters_french_azerty.xml‎

File renamed without changes.

‎app/src/main/res/xml/keys_letters_french_bepo.xml‎

Lines changed: 179 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,179 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
3+
<Row app:isNumbersRow="true">
4+
<Key
5+
app:keyEdgeFlags="left"
6+
app:keyLabel="1"
7+
app:topSmallNumber="1" />
8+
<Key
9+
app:keyLabel="2"
10+
app:topSmallNumber="2" />
11+
<Key
12+
app:keyLabel="3"
13+
app:topSmallNumber="3" />
14+
<Key
15+
app:keyLabel="4"
16+
app:topSmallNumber="4" />
17+
<Key
18+
app:keyLabel="5"
19+
app:topSmallNumber="5" />
20+
<Key
21+
app:keyLabel="6"
22+
app:topSmallNumber="6" />
23+
<Key
24+
app:keyLabel="7"
25+
app:topSmallNumber="7" />
26+
<Key
27+
app:keyLabel="8"
28+
app:topSmallNumber="8" />
29+
<Key
30+
app:keyLabel="9"
31+
app:topSmallNumber="9" />
32+
<Key
33+
app:keyEdgeFlags="right"
34+
app:keyLabel="0"
35+
app:topSmallNumber="0" />
36+
</Row>
37+
<Row>
38+
<Key
39+
app:keyEdgeFlags="left"
40+
app:keyLabel="b"
41+
app:popupCharacters="1|¦"
42+
app:popupKeyboard="@xml/keyboard_popup_template"
43+
app:topSmallNumber="1" />
44+
<Key
45+
app:keyLabel="é"
46+
app:popupCharacters="e2éèê"
47+
app:popupKeyboard="@xml/keyboard_popup_template"
48+
app:topSmallNumber="2" />
49+
<Key
50+
app:keyLabel="p"
51+
app:popupCharacters="&amp;3§"
52+
app:popupKeyboard="@xml/keyboard_popup_template"
53+
app:topSmallNumber="3" />
54+
<Key
55+
app:keyLabel="o"
56+
app:popupCharacters="ôœö4òóøõō"
57+
app:popupKeyboard="@xml/keyboard_popup_template"
58+
app:topSmallNumber="4" />
59+
<Key
60+
app:keyLabel="w"
61+
app:popupCharacters="5"
62+
app:popupKeyboard="@xml/keyboard_popup_template"
63+
app:topSmallNumber="5" />
64+
<Key
65+
app:keyLabel="v"
66+
app:popupCharacters="6"
67+
app:popupKeyboard="@xml/keyboard_popup_template"
68+
app:topSmallNumber="6" />
69+
<Key
70+
app:keyLabel="d"
71+
app:popupCharacters="ď7đ"
72+
app:popupKeyboard="@xml/keyboard_popup_template"
73+
app:topSmallNumber="7" />
74+
<Key
75+
app:keyLabel="l"
76+
app:popupCharacters="8"
77+
app:popupKeyboard="@xml/keyboard_popup_template"
78+
app:topSmallNumber="8" />
79+
<Key
80+
app:keyLabel="j"
81+
app:popupCharacters="9"
82+
app:popupKeyboard="@xml/keyboard_popup_template"
83+
app:topSmallNumber="9" />
84+
<Key
85+
app:keyEdgeFlags="right"
86+
app:keyLabel="z"
87+
app:popupCharacters="źžż0"
88+
app:popupKeyboard="@xml/keyboard_popup_template"
89+
app:topSmallNumber="0" />
90+
</Row>
91+
<Row>
92+
<Key
93+
app:keyEdgeFlags="left"
94+
app:keyLabel="a"
95+
app:popupCharacters="áàâãäåāæą"
96+
app:popupKeyboard="@xml/keyboard_popup_template" />
97+
<Key
98+
app:keyLabel="u"
99+
app:popupCharacters="űúùûüū"
100+
app:popupKeyboard="@xml/keyboard_popup_template" />
101+
<Key
102+
app:keyLabel="i"
103+
app:popupCharacters="íìîïī"
104+
app:popupKeyboard="@xml/keyboard_popup_template" />
105+
<Key
106+
app:keyLabel="e"
107+
app:popupCharacters="éèêëēę"
108+
app:popupKeyboard="@xml/keyboard_popup_template" />
109+
<Key
110+
app:keyLabel="c"
111+
app:popupCharacters="ćçç"
112+
app:popupKeyboard="@xml/keyboard_popup_template" />
113+
<Key
114+
app:keyLabel="t"
115+
app:popupCharacters="ť"
116+
app:popupKeyboard="@xml/keyboard_popup_template" />
117+
<Key app:keyLabel="s" />
118+
<Key app:keyLabel="r" />
119+
<Key
120+
app:keyLabel="n"
121+
app:popupCharacters="ňńñ"
122+
app:popupKeyboard="@xml/keyboard_popup_template" />
123+
<Key
124+
app:keyEdgeFlags="right"
125+
app:keyLabel="m" />
126+
</Row>
127+
<Row>
128+
<Key
129+
app:code="-1"
130+
app:keyEdgeFlags="left"
131+
app:keyIcon="@drawable/ic_caps_outline_vector" />
132+
<Key app:keyLabel="y" />
133+
<Key app:keyLabel="x" />
134+
<Key
135+
app:keyLabel="k"/>
136+
<Key app:keyLabel="-"
137+
app:popupCharacters="—_"
138+
app:popupKeyboard="@xml/keyboard_popup_template" />
139+
<Key app:keyLabel="q" />
140+
<Key app:keyLabel="g" />
141+
<Key app:keyLabel="h" />
142+
<Key app:keyLabel="f" />
143+
<Key
144+
app:code="-5"
145+
app:isRepeatable="true"
146+
app:keyEdgeFlags="right"
147+
app:keyIcon="@drawable/ic_clear_vector" />
148+
</Row>
149+
<Row>
150+
<Key
151+
app:code="-2"
152+
app:keyEdgeFlags="left"
153+
app:keyLabel="123"
154+
app:keyWidth="15%p" />
155+
<Key
156+
app:keyLabel=","
157+
app:keyWidth="10%p" />
158+
<Key
159+
app:code="-6"
160+
app:keyEdgeFlags="left"
161+
app:keyIcon="@drawable/ic_emoji_emotions_outline_vector"
162+
app:secondaryKeyIcon="@drawable/ic_language_outlined"
163+
app:keyWidth="10%p" />
164+
<Key
165+
app:code="32"
166+
app:isRepeatable="true"
167+
app:keyWidth="40%p" />
168+
<Key
169+
app:keyLabel="."
170+
app:popupCharacters=",?!;:…"
171+
app:popupKeyboard="@xml/keyboard_popup_template"
172+
app:keyWidth="10%p" />
173+
<Key
174+
app:code="-4"
175+
app:keyEdgeFlags="right"
176+
app:keyIcon="@drawable/ic_enter_vector"
177+
app:keyWidth="15%p" />
178+
</Row>
179+
</Keyboard>

0 commit comments

Comments
 (0)