Skip to content

Commit eb71626

Browse files
author
Jo Grimstad
committed
#8 Add keys programmatically instead of using XML
1 parent ad42a0d commit eb71626

File tree

11 files changed

+40
-22
lines changed

11 files changed

+40
-22
lines changed

‎app/src/main/java/org/literacyapp/keyboard/ImeService.java‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,27 @@ public View onCreateInputView() {
4141
Log.d(getClass().getName(), "availableLettersSet: " + availableLettersSet);
4242
Set<String> availableNumbersSet = sharedPreferences.getStringSet(StudentUpdatedReceiver.PREF_STUDENT_NUMBERS, null);
4343
Log.d(getClass().getName(), "availableNumbersSet: " + availableNumbersSet);
44-
// TODO
44+
45+
// TODO: add custom Keyboard
46+
if (availableLettersSet == null) {
47+
keyboard = new Keyboard(this, R.xml.qwerty);
48+
} else if (availableLettersSet.size() <= 3) {
49+
keyboard = new Keyboard(this, R.xml.qwerty);
50+
} else if (availableLettersSet.size() == 4) {
51+
keyboard = new Keyboard(this, R.xml.qwerty_4);
52+
} else if (availableLettersSet.size() == 5) {
53+
keyboard = new Keyboard(this, R.xml.qwerty_5);
54+
} else if (availableLettersSet.size() == 6) {
55+
keyboard = new Keyboard(this, R.xml.qwerty_6);
56+
} else if (availableLettersSet.size() == 7) {
57+
keyboard = new Keyboard(this, R.xml.qwerty_7);
58+
} else if (availableLettersSet.size() == 8) {
59+
keyboard = new Keyboard(this, R.xml.qwerty_8);
60+
} else {
61+
keyboard = new Keyboard(this, R.xml.qwerty_8);
62+
}
4563

4664
keyboardView = (KeyboardView) getLayoutInflater().inflate(R.layout.keyboard, null);
47-
keyboard = new Keyboard(this, R.xml.qwerty);
4865
keyboardView.setKeyboard(keyboard);
4966
keyboardView.setPreviewEnabled(false);
5067
keyboardView.setOnKeyboardActionListener(this);

‎app/src/main/res/xml-sw/qwerty_4.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Key android:codes="49" android:keyLabel="1" android:keyEdgeFlags="left"/>
1010
<Key android:codes="50" android:keyLabel="2"/>
1111
<Key android:codes="51" android:keyLabel="3"/>
12-
<!--<Key android:codes="52" android:keyLabel="4"/>-->
12+
<Key android:codes="52" android:keyLabel="4"/>
1313
<!--<Key android:codes="53" android:keyLabel="5"/>-->
1414
<!--<Key android:codes="54" android:keyLabel="6"/>-->
1515
<!--<Key android:codes="55" android:keyLabel="7"/>-->
@@ -21,6 +21,7 @@
2121
<Key android:codes="97" android:keyLabel="a" android:keyEdgeFlags="left" />
2222
<Key android:codes="105" android:keyLabel="i" />
2323
<Key android:codes="117" android:keyLabel="u" />
24+
<Key android:codes="110" android:keyLabel="n"/>
2425
<!--<Key android:codes="119" android:keyLabel="w" android:keyEdgeFlags="left" />-->
2526
<!--<Key android:codes="101" android:keyLabel="e"/>-->
2627
<!--<Key android:codes="114" android:keyLabel="r"/>-->
@@ -46,7 +47,6 @@
4647
<!--<Key android:codes="99" android:keyLabel="c"/>-->
4748
<!--<Key android:codes="118" android:keyLabel="v"/>-->
4849
<!--<Key android:codes="98" android:keyLabel="b"/>-->
49-
<!--<Key android:codes="110" android:keyLabel="n"/>-->
5050
<!--<Key android:codes="109" android:keyLabel="m"/>-->
5151
<!--<Key android:codes="46" android:keyLabel="."/>-->
5252
<!--<Key android:codes="63,33,58" android:keyLabel="\? ! :" android:keyEdgeFlags="right"/>-->

‎app/src/main/res/xml-sw/qwerty_5.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Key android:codes="50" android:keyLabel="2"/>
1111
<Key android:codes="51" android:keyLabel="3"/>
1212
<Key android:codes="52" android:keyLabel="4"/>
13-
<!--<Key android:codes="53" android:keyLabel="5"/>-->
13+
<Key android:codes="53" android:keyLabel="5"/>
1414
<!--<Key android:codes="54" android:keyLabel="6"/>-->
1515
<!--<Key android:codes="55" android:keyLabel="7"/>-->
1616
<!--<Key android:codes="56" android:keyLabel="8"/>-->
@@ -22,6 +22,7 @@
2222
<Key android:codes="105" android:keyLabel="i" />
2323
<Key android:codes="117" android:keyLabel="u" />
2424
<Key android:codes="110" android:keyLabel="n"/>
25+
<Key android:codes="107" android:keyLabel="k"/>
2526
<!--<Key android:codes="119" android:keyLabel="w" android:keyEdgeFlags="left" />-->
2627
<!--<Key android:codes="101" android:keyLabel="e"/>-->
2728
<!--<Key android:codes="114" android:keyLabel="r"/>-->
@@ -37,7 +38,6 @@
3738
<!--<Key android:codes="103" android:keyLabel="g"/>-->
3839
<!--<Key android:codes="104" android:keyLabel="h"/>-->
3940
<!--<Key android:codes="106" android:keyLabel="j"/>-->
40-
<!--<Key android:codes="107" android:keyLabel="k"/>-->
4141
<!--<Key android:codes="108" android:keyLabel="l"/>-->
4242
<!--<Key android:codes="35,64" android:keyLabel="\# \@" android:keyEdgeFlags="right"/>-->
4343
<!--</Row>-->

‎app/src/main/res/xml-sw/qwerty_6.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Key android:codes="51" android:keyLabel="3"/>
1212
<Key android:codes="52" android:keyLabel="4"/>
1313
<Key android:codes="53" android:keyLabel="5"/>
14-
<!--<Key android:codes="54" android:keyLabel="6"/>-->
14+
<Key android:codes="54" android:keyLabel="6"/>
1515
<!--<Key android:codes="55" android:keyLabel="7"/>-->
1616
<!--<Key android:codes="56" android:keyLabel="8"/>-->
1717
<!--<Key android:codes="57" android:keyLabel="9"/>-->
@@ -23,6 +23,7 @@
2323
<Key android:codes="117" android:keyLabel="u" />
2424
<Key android:codes="110" android:keyLabel="n"/>
2525
<Key android:codes="107" android:keyLabel="k"/>
26+
<Key android:codes="109" android:keyLabel="m"/>
2627
<!--<Key android:codes="119" android:keyLabel="w" android:keyEdgeFlags="left" />-->
2728
<!--<Key android:codes="101" android:keyLabel="e"/>-->
2829
<!--<Key android:codes="114" android:keyLabel="r"/>-->
@@ -47,7 +48,6 @@
4748
<!--<Key android:codes="99" android:keyLabel="c"/>-->
4849
<!--<Key android:codes="118" android:keyLabel="v"/>-->
4950
<!--<Key android:codes="98" android:keyLabel="b"/>-->
50-
<!--<Key android:codes="109" android:keyLabel="m"/>-->
5151
<!--<Key android:codes="46" android:keyLabel="."/>-->
5252
<!--<Key android:codes="63,33,58" android:keyLabel="\? ! :" android:keyEdgeFlags="right"/>-->
5353
<!--</Row>-->

‎app/src/main/res/xml-sw/qwerty_7.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Key android:codes="52" android:keyLabel="4"/>
1313
<Key android:codes="53" android:keyLabel="5"/>
1414
<Key android:codes="54" android:keyLabel="6"/>
15-
<!--<Key android:codes="55" android:keyLabel="7"/>-->
15+
<Key android:codes="55" android:keyLabel="7"/>
1616
<!--<Key android:codes="56" android:keyLabel="8"/>-->
1717
<!--<Key android:codes="57" android:keyLabel="9"/>-->
1818
<Key android:codes="-5" android:keyIcon="@drawable/ic_backspace_grey_60dp" android:isRepeatable="true" android:keyEdgeFlags="right" />
@@ -24,8 +24,8 @@
2424
<Key android:codes="110" android:keyLabel="n"/>
2525
<Key android:codes="107" android:keyLabel="k"/>
2626
<Key android:codes="109" android:keyLabel="m"/>
27+
<Key android:codes="101" android:keyLabel="e"/>
2728
<!--<Key android:codes="119" android:keyLabel="w" android:keyEdgeFlags="left" />-->
28-
<!--<Key android:codes="101" android:keyLabel="e"/>-->
2929
<!--<Key android:codes="114" android:keyLabel="r"/>-->
3030
<!--<Key android:codes="116" android:keyLabel="t"/>-->
3131
<!--<Key android:codes="121" android:keyLabel="y"/>-->

‎app/src/main/res/xml-sw/qwerty_8.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Key android:codes="53" android:keyLabel="5"/>
1414
<Key android:codes="54" android:keyLabel="6"/>
1515
<Key android:codes="55" android:keyLabel="7"/>
16-
<!--<Key android:codes="56" android:keyLabel="8"/>-->
16+
<Key android:codes="56" android:keyLabel="8"/>
1717
<!--<Key android:codes="57" android:keyLabel="9"/>-->
1818
<Key android:codes="-5" android:keyIcon="@drawable/ic_backspace_grey_60dp" android:isRepeatable="true" android:keyEdgeFlags="right" />
1919
</Row>
@@ -25,6 +25,7 @@
2525
<Key android:codes="107" android:keyLabel="k"/>
2626
<Key android:codes="109" android:keyLabel="m"/>
2727
<Key android:codes="101" android:keyLabel="e"/>
28+
<Key android:codes="108" android:keyLabel="l"/>
2829
<!--<Key android:codes="119" android:keyLabel="w" android:keyEdgeFlags="left" />-->
2930
<!--<Key android:codes="114" android:keyLabel="r"/>-->
3031
<!--<Key android:codes="116" android:keyLabel="t"/>-->
@@ -39,7 +40,6 @@
3940
<!--<Key android:codes="103" android:keyLabel="g"/>-->
4041
<!--<Key android:codes="104" android:keyLabel="h"/>-->
4142
<!--<Key android:codes="106" android:keyLabel="j"/>-->
42-
<!--<Key android:codes="108" android:keyLabel="l"/>-->
4343
<!--<Key android:codes="35,64" android:keyLabel="\# \@" android:keyEdgeFlags="right"/>-->
4444
<!--</Row>-->
4545
<!--<Row>-->

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Key android:codes="49" android:keyLabel="1" android:keyEdgeFlags="left"/>
1010
<Key android:codes="50" android:keyLabel="2"/>
1111
<Key android:codes="51" android:keyLabel="3"/>
12-
<!--<Key android:codes="52" android:keyLabel="4"/>-->
12+
<Key android:codes="52" android:keyLabel="4"/>
1313
<!--<Key android:codes="53" android:keyLabel="5"/>-->
1414
<!--<Key android:codes="54" android:keyLabel="6"/>-->
1515
<!--<Key android:codes="55" android:keyLabel="7"/>-->
@@ -21,13 +21,14 @@
2121
<Key android:codes="101" android:keyLabel="e" android:keyEdgeFlags="left" />
2222
<Key android:codes="116" android:keyLabel="t" />
2323
<Key android:codes="97" android:keyLabel="a" />
24+
<Key android:codes="111" android:keyLabel="o"/>
2425
<!--<Key android:codes="105" android:keyLabel="i" />-->
2526
<!--<Key android:codes="117" android:keyLabel="u" />-->
2627
<!--<Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/>-->
2728
<!--<Key android:codes="119" android:keyLabel="w"/>-->
2829
<!--<Key android:codes="114" android:keyLabel="r"/>-->
2930
<!--<Key android:codes="121" android:keyLabel="y"/>-->
30-
<!--<Key android:codes="111" android:keyLabel="o"/>-->
31+
3132
<!--<Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>-->
3233
</Row>
3334
<!--<Row>-->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Key android:codes="50" android:keyLabel="2"/>
1111
<Key android:codes="51" android:keyLabel="3"/>
1212
<Key android:codes="52" android:keyLabel="4"/>
13-
<!--<Key android:codes="53" android:keyLabel="5"/>-->
13+
<Key android:codes="53" android:keyLabel="5"/>
1414
<!--<Key android:codes="54" android:keyLabel="6"/>-->
1515
<!--<Key android:codes="55" android:keyLabel="7"/>-->
1616
<!--<Key android:codes="56" android:keyLabel="8"/>-->
@@ -22,7 +22,7 @@
2222
<Key android:codes="116" android:keyLabel="t" />
2323
<Key android:codes="97" android:keyLabel="a" />
2424
<Key android:codes="111" android:keyLabel="o"/>
25-
<!--<Key android:codes="105" android:keyLabel="i" />-->
25+
<Key android:codes="105" android:keyLabel="i" />
2626
<!--<Key android:codes="117" android:keyLabel="u" />-->
2727
<!--<Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/>-->
2828
<!--<Key android:codes="119" android:keyLabel="w"/>-->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Key android:codes="51" android:keyLabel="3"/>
1212
<Key android:codes="52" android:keyLabel="4"/>
1313
<Key android:codes="53" android:keyLabel="5"/>
14-
<!--<Key android:codes="54" android:keyLabel="6"/>-->
14+
<Key android:codes="54" android:keyLabel="6"/>
1515
<!--<Key android:codes="55" android:keyLabel="7"/>-->
1616
<!--<Key android:codes="56" android:keyLabel="8"/>-->
1717
<!--<Key android:codes="57" android:keyLabel="9"/>-->
@@ -23,6 +23,7 @@
2323
<Key android:codes="97" android:keyLabel="a" />
2424
<Key android:codes="111" android:keyLabel="o"/>
2525
<Key android:codes="105" android:keyLabel="i" />
26+
<Key android:codes="104" android:keyLabel="h"/>
2627
<!--<Key android:codes="117" android:keyLabel="u" />-->
2728
<!--<Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/>-->
2829
<!--<Key android:codes="119" android:keyLabel="w"/>-->
@@ -36,7 +37,6 @@
3637
<!--<Key android:codes="100" android:keyLabel="d"/>-->
3738
<!--<Key android:codes="102" android:keyLabel="f"/>-->
3839
<!--<Key android:codes="103" android:keyLabel="g"/>-->
39-
<!--<Key android:codes="104" android:keyLabel="h"/>-->
4040
<!--<Key android:codes="106" android:keyLabel="j"/>-->
4141
<!--<Key android:codes="107" android:keyLabel="k"/>-->
4242
<!--<Key android:codes="108" android:keyLabel="l"/>-->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Key android:codes="52" android:keyLabel="4"/>
1313
<Key android:codes="53" android:keyLabel="5"/>
1414
<Key android:codes="54" android:keyLabel="6"/>
15-
<!--<Key android:codes="55" android:keyLabel="7"/>-->
15+
<Key android:codes="55" android:keyLabel="7"/>
1616
<!--<Key android:codes="56" android:keyLabel="8"/>-->
1717
<!--<Key android:codes="57" android:keyLabel="9"/>-->
1818
<Key android:codes="-5" android:keyIcon="@drawable/ic_backspace_grey_60dp" android:isRepeatable="true" android:keyEdgeFlags="right" />
@@ -24,6 +24,7 @@
2424
<Key android:codes="111" android:keyLabel="o"/>
2525
<Key android:codes="105" android:keyLabel="i" />
2626
<Key android:codes="104" android:keyLabel="h"/>
27+
<Key android:codes="115" android:keyLabel="s"/>
2728
<!--<Key android:codes="117" android:keyLabel="u" />-->
2829
<!--<Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/>-->
2930
<!--<Key android:codes="119" android:keyLabel="w"/>-->
@@ -33,7 +34,6 @@
3334
<!--<Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>-->
3435
</Row>
3536
<!--<Row>-->
36-
<!--<Key android:codes="115" android:keyLabel="s"/>-->
3737
<!--<Key android:codes="100" android:keyLabel="d"/>-->
3838
<!--<Key android:codes="102" android:keyLabel="f"/>-->
3939
<!--<Key android:codes="103" android:keyLabel="g"/>-->

0 commit comments

Comments
 (0)