Skip to content

Commit 8d54967

Browse files
author
literacyapp
authored
Merge pull request #9 from jogrimst/master
#8 Add keys programmatically instead of using XML
2 parents df0f9b1 + eb71626 commit 8d54967

File tree

11 files changed

+644
-2
lines changed

11 files changed

+644
-2
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);
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:keyWidth="25%p"
3+
android:horizontalGap="10px"
4+
android:verticalGap="10px"
5+
android:keyHeight="100dp">
6+
7+
<Row android:rowEdgeFlags="top">
8+
<!--<Key android:codes="48" android:keyLabel="0" android:keyEdgeFlags="left"/>-->
9+
<Key android:codes="49" android:keyLabel="1" android:keyEdgeFlags="left"/>
10+
<Key android:codes="50" android:keyLabel="2"/>
11+
<Key android:codes="51" android:keyLabel="3"/>
12+
<Key android:codes="52" android:keyLabel="4"/>
13+
<!--<Key android:codes="53" android:keyLabel="5"/>-->
14+
<!--<Key android:codes="54" android:keyLabel="6"/>-->
15+
<!--<Key android:codes="55" android:keyLabel="7"/>-->
16+
<!--<Key android:codes="56" android:keyLabel="8"/>-->
17+
<!--<Key android:codes="57" android:keyLabel="9"/>-->
18+
<Key android:codes="-5" android:keyIcon="@drawable/ic_backspace_grey_60dp" android:isRepeatable="true" android:keyEdgeFlags="right" />
19+
</Row>
20+
<Row>
21+
<Key android:codes="97" android:keyLabel="a" android:keyEdgeFlags="left" />
22+
<Key android:codes="105" android:keyLabel="i" />
23+
<Key android:codes="117" android:keyLabel="u" />
24+
<Key android:codes="110" android:keyLabel="n"/>
25+
<!--<Key android:codes="119" android:keyLabel="w" android:keyEdgeFlags="left" />-->
26+
<!--<Key android:codes="101" android:keyLabel="e"/>-->
27+
<!--<Key android:codes="114" android:keyLabel="r"/>-->
28+
<!--<Key android:codes="116" android:keyLabel="t"/>-->
29+
<!--<Key android:codes="121" android:keyLabel="y"/>-->
30+
<!--<Key android:codes="111" android:keyLabel="o"/>-->
31+
<!--<Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>-->
32+
</Row>
33+
<!--<Row>-->
34+
<!--<Key android:codes="115" android:keyLabel="s"/>-->
35+
<!--<Key android:codes="100" android:keyLabel="d"/>-->
36+
<!--<Key android:codes="102" android:keyLabel="f"/>-->
37+
<!--<Key android:codes="103" android:keyLabel="g"/>-->
38+
<!--<Key android:codes="104" android:keyLabel="h"/>-->
39+
<!--<Key android:codes="106" android:keyLabel="j"/>-->
40+
<!--<Key android:codes="107" android:keyLabel="k"/>-->
41+
<!--<Key android:codes="108" android:keyLabel="l"/>-->
42+
<!--<Key android:codes="35,64" android:keyLabel="\# \@" android:keyEdgeFlags="right"/>-->
43+
<!--</Row>-->
44+
<!--<Row>-->
45+
<!--<Key android:codes="-1" android:keyLabel="CAPS" android:keyEdgeFlags="left"/>-->
46+
<!--<Key android:codes="122" android:keyLabel="z"/>-->
47+
<!--<Key android:codes="99" android:keyLabel="c"/>-->
48+
<!--<Key android:codes="118" android:keyLabel="v"/>-->
49+
<!--<Key android:codes="98" android:keyLabel="b"/>-->
50+
<!--<Key android:codes="109" android:keyLabel="m"/>-->
51+
<!--<Key android:codes="46" android:keyLabel="."/>-->
52+
<!--<Key android:codes="63,33,58" android:keyLabel="\? ! :" android:keyEdgeFlags="right"/>-->
53+
<!--</Row>-->
54+
<Row android:rowEdgeFlags="bottom">
55+
<!--<Key android:codes="44" android:keyLabel="," android:keyWidth="10%p" android:keyEdgeFlags="left"/>-->
56+
<!--<Key android:codes="47" android:keyLabel="/" android:keyWidth="10%p" />-->
57+
<Key android:codes="32" android:keyIcon="@drawable/ic_space_bar_grey_60dp" android:keyWidth="100%p" android:isRepeatable="true"/>
58+
<!--<Key android:codes="-4" android:keyLabel="DONE" android:keyWidth="20%p" android:keyEdgeFlags="right"/>-->
59+
<!--<Key android:codes="0" android:keyIcon="@drawable/ic_mood_grey_60dp" android:keyWidth="25%p" android:keyEdgeFlags="right"/>-->
60+
</Row>
61+
</Keyboard>
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:keyWidth="25%p"
3+
android:horizontalGap="10px"
4+
android:verticalGap="10px"
5+
android:keyHeight="100dp">
6+
7+
<Row android:rowEdgeFlags="top">
8+
<!--<Key android:codes="48" android:keyLabel="0" android:keyEdgeFlags="left"/>-->
9+
<Key android:codes="49" android:keyLabel="1" android:keyEdgeFlags="left"/>
10+
<Key android:codes="50" android:keyLabel="2"/>
11+
<Key android:codes="51" android:keyLabel="3"/>
12+
<Key android:codes="52" android:keyLabel="4"/>
13+
<Key android:codes="53" android:keyLabel="5"/>
14+
<!--<Key android:codes="54" android:keyLabel="6"/>-->
15+
<!--<Key android:codes="55" android:keyLabel="7"/>-->
16+
<!--<Key android:codes="56" android:keyLabel="8"/>-->
17+
<!--<Key android:codes="57" android:keyLabel="9"/>-->
18+
<Key android:codes="-5" android:keyIcon="@drawable/ic_backspace_grey_60dp" android:isRepeatable="true" android:keyEdgeFlags="right" />
19+
</Row>
20+
<Row>
21+
<Key android:codes="97" android:keyLabel="a" android:keyEdgeFlags="left" />
22+
<Key android:codes="105" android:keyLabel="i" />
23+
<Key android:codes="117" android:keyLabel="u" />
24+
<Key android:codes="110" android:keyLabel="n"/>
25+
<Key android:codes="107" android:keyLabel="k"/>
26+
<!--<Key android:codes="119" android:keyLabel="w" android:keyEdgeFlags="left" />-->
27+
<!--<Key android:codes="101" android:keyLabel="e"/>-->
28+
<!--<Key android:codes="114" android:keyLabel="r"/>-->
29+
<!--<Key android:codes="116" android:keyLabel="t"/>-->
30+
<!--<Key android:codes="121" android:keyLabel="y"/>-->
31+
<!--<Key android:codes="111" android:keyLabel="o"/>-->
32+
<!--<Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>-->
33+
</Row>
34+
<!--<Row>-->
35+
<!--<Key android:codes="115" android:keyLabel="s"/>-->
36+
<!--<Key android:codes="100" android:keyLabel="d"/>-->
37+
<!--<Key android:codes="102" android:keyLabel="f"/>-->
38+
<!--<Key android:codes="103" android:keyLabel="g"/>-->
39+
<!--<Key android:codes="104" android:keyLabel="h"/>-->
40+
<!--<Key android:codes="106" android:keyLabel="j"/>-->
41+
<!--<Key android:codes="108" android:keyLabel="l"/>-->
42+
<!--<Key android:codes="35,64" android:keyLabel="\# \@" android:keyEdgeFlags="right"/>-->
43+
<!--</Row>-->
44+
<!--<Row>-->
45+
<!--<Key android:codes="-1" android:keyLabel="CAPS" android:keyEdgeFlags="left"/>-->
46+
<!--<Key android:codes="122" android:keyLabel="z"/>-->
47+
<!--<Key android:codes="99" android:keyLabel="c"/>-->
48+
<!--<Key android:codes="118" android:keyLabel="v"/>-->
49+
<!--<Key android:codes="98" android:keyLabel="b"/>-->
50+
<!--<Key android:codes="109" android:keyLabel="m"/>-->
51+
<!--<Key android:codes="46" android:keyLabel="."/>-->
52+
<!--<Key android:codes="63,33,58" android:keyLabel="\? ! :" android:keyEdgeFlags="right"/>-->
53+
<!--</Row>-->
54+
<Row android:rowEdgeFlags="bottom">
55+
<!--<Key android:codes="44" android:keyLabel="," android:keyWidth="10%p" android:keyEdgeFlags="left"/>-->
56+
<!--<Key android:codes="47" android:keyLabel="/" android:keyWidth="10%p" />-->
57+
<Key android:codes="32" android:keyIcon="@drawable/ic_space_bar_grey_60dp" android:keyWidth="100%p" android:isRepeatable="true"/>
58+
<!--<Key android:codes="-4" android:keyLabel="DONE" android:keyWidth="20%p" android:keyEdgeFlags="right"/>-->
59+
<!--<Key android:codes="0" android:keyIcon="@drawable/ic_mood_grey_60dp" android:keyWidth="25%p" android:keyEdgeFlags="right"/>-->
60+
</Row>
61+
</Keyboard>
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:keyWidth="25%p"
3+
android:horizontalGap="10px"
4+
android:verticalGap="10px"
5+
android:keyHeight="100dp">
6+
7+
<Row android:rowEdgeFlags="top">
8+
<!--<Key android:codes="48" android:keyLabel="0" android:keyEdgeFlags="left"/>-->
9+
<Key android:codes="49" android:keyLabel="1" android:keyEdgeFlags="left"/>
10+
<Key android:codes="50" android:keyLabel="2"/>
11+
<Key android:codes="51" android:keyLabel="3"/>
12+
<Key android:codes="52" android:keyLabel="4"/>
13+
<Key android:codes="53" android:keyLabel="5"/>
14+
<Key android:codes="54" android:keyLabel="6"/>
15+
<!--<Key android:codes="55" android:keyLabel="7"/>-->
16+
<!--<Key android:codes="56" android:keyLabel="8"/>-->
17+
<!--<Key android:codes="57" android:keyLabel="9"/>-->
18+
<Key android:codes="-5" android:keyIcon="@drawable/ic_backspace_grey_60dp" android:isRepeatable="true" android:keyEdgeFlags="right" />
19+
</Row>
20+
<Row>
21+
<Key android:codes="97" android:keyLabel="a" android:keyEdgeFlags="left" />
22+
<Key android:codes="105" android:keyLabel="i" />
23+
<Key android:codes="117" android:keyLabel="u" />
24+
<Key android:codes="110" android:keyLabel="n"/>
25+
<Key android:codes="107" android:keyLabel="k"/>
26+
<Key android:codes="109" android:keyLabel="m"/>
27+
<!--<Key android:codes="119" android:keyLabel="w" android:keyEdgeFlags="left" />-->
28+
<!--<Key android:codes="101" android:keyLabel="e"/>-->
29+
<!--<Key android:codes="114" android:keyLabel="r"/>-->
30+
<!--<Key android:codes="116" android:keyLabel="t"/>-->
31+
<!--<Key android:codes="121" android:keyLabel="y"/>-->
32+
<!--<Key android:codes="111" android:keyLabel="o"/>-->
33+
<!--<Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>-->
34+
</Row>
35+
<!--<Row>-->
36+
<!--<Key android:codes="115" android:keyLabel="s"/>-->
37+
<!--<Key android:codes="100" android:keyLabel="d"/>-->
38+
<!--<Key android:codes="102" android:keyLabel="f"/>-->
39+
<!--<Key android:codes="103" android:keyLabel="g"/>-->
40+
<!--<Key android:codes="104" android:keyLabel="h"/>-->
41+
<!--<Key android:codes="106" android:keyLabel="j"/>-->
42+
<!--<Key android:codes="108" android:keyLabel="l"/>-->
43+
<!--<Key android:codes="35,64" android:keyLabel="\# \@" android:keyEdgeFlags="right"/>-->
44+
<!--</Row>-->
45+
<!--<Row>-->
46+
<!--<Key android:codes="-1" android:keyLabel="CAPS" android:keyEdgeFlags="left"/>-->
47+
<!--<Key android:codes="122" android:keyLabel="z"/>-->
48+
<!--<Key android:codes="99" android:keyLabel="c"/>-->
49+
<!--<Key android:codes="118" android:keyLabel="v"/>-->
50+
<!--<Key android:codes="98" android:keyLabel="b"/>-->
51+
<!--<Key android:codes="46" android:keyLabel="."/>-->
52+
<!--<Key android:codes="63,33,58" android:keyLabel="\? ! :" android:keyEdgeFlags="right"/>-->
53+
<!--</Row>-->
54+
<Row android:rowEdgeFlags="bottom">
55+
<!--<Key android:codes="44" android:keyLabel="," android:keyWidth="10%p" android:keyEdgeFlags="left"/>-->
56+
<!--<Key android:codes="47" android:keyLabel="/" android:keyWidth="10%p" />-->
57+
<Key android:codes="32" android:keyIcon="@drawable/ic_space_bar_grey_60dp" android:keyWidth="100%p" android:isRepeatable="true"/>
58+
<!--<Key android:codes="-4" android:keyLabel="DONE" android:keyWidth="20%p" android:keyEdgeFlags="right"/>-->
59+
<!--<Key android:codes="0" android:keyIcon="@drawable/ic_mood_grey_60dp" android:keyWidth="25%p" android:keyEdgeFlags="right"/>-->
60+
</Row>
61+
</Keyboard>
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:keyWidth="25%p"
3+
android:horizontalGap="10px"
4+
android:verticalGap="10px"
5+
android:keyHeight="100dp">
6+
7+
<Row android:rowEdgeFlags="top">
8+
<!--<Key android:codes="48" android:keyLabel="0" android:keyEdgeFlags="left"/>-->
9+
<Key android:codes="49" android:keyLabel="1" android:keyEdgeFlags="left"/>
10+
<Key android:codes="50" android:keyLabel="2"/>
11+
<Key android:codes="51" android:keyLabel="3"/>
12+
<Key android:codes="52" android:keyLabel="4"/>
13+
<Key android:codes="53" android:keyLabel="5"/>
14+
<Key android:codes="54" android:keyLabel="6"/>
15+
<Key android:codes="55" android:keyLabel="7"/>
16+
<!--<Key android:codes="56" android:keyLabel="8"/>-->
17+
<!--<Key android:codes="57" android:keyLabel="9"/>-->
18+
<Key android:codes="-5" android:keyIcon="@drawable/ic_backspace_grey_60dp" android:isRepeatable="true" android:keyEdgeFlags="right" />
19+
</Row>
20+
<Row>
21+
<Key android:codes="97" android:keyLabel="a" android:keyEdgeFlags="left" />
22+
<Key android:codes="105" android:keyLabel="i" />
23+
<Key android:codes="117" android:keyLabel="u" />
24+
<Key android:codes="110" android:keyLabel="n"/>
25+
<Key android:codes="107" android:keyLabel="k"/>
26+
<Key android:codes="109" android:keyLabel="m"/>
27+
<Key android:codes="101" android:keyLabel="e"/>
28+
<!--<Key android:codes="119" android:keyLabel="w" android:keyEdgeFlags="left" />-->
29+
<!--<Key android:codes="114" android:keyLabel="r"/>-->
30+
<!--<Key android:codes="116" android:keyLabel="t"/>-->
31+
<!--<Key android:codes="121" android:keyLabel="y"/>-->
32+
<!--<Key android:codes="111" android:keyLabel="o"/>-->
33+
<!--<Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>-->
34+
</Row>
35+
<!--<Row>-->
36+
<!--<Key android:codes="115" android:keyLabel="s"/>-->
37+
<!--<Key android:codes="100" android:keyLabel="d"/>-->
38+
<!--<Key android:codes="102" android:keyLabel="f"/>-->
39+
<!--<Key android:codes="103" android:keyLabel="g"/>-->
40+
<!--<Key android:codes="104" android:keyLabel="h"/>-->
41+
<!--<Key android:codes="106" android:keyLabel="j"/>-->
42+
<!--<Key android:codes="108" android:keyLabel="l"/>-->
43+
<!--<Key android:codes="35,64" android:keyLabel="\# \@" android:keyEdgeFlags="right"/>-->
44+
<!--</Row>-->
45+
<!--<Row>-->
46+
<!--<Key android:codes="-1" android:keyLabel="CAPS" android:keyEdgeFlags="left"/>-->
47+
<!--<Key android:codes="122" android:keyLabel="z"/>-->
48+
<!--<Key android:codes="99" android:keyLabel="c"/>-->
49+
<!--<Key android:codes="118" android:keyLabel="v"/>-->
50+
<!--<Key android:codes="98" android:keyLabel="b"/>-->
51+
<!--<Key android:codes="46" android:keyLabel="."/>-->
52+
<!--<Key android:codes="63,33,58" android:keyLabel="\? ! :" android:keyEdgeFlags="right"/>-->
53+
<!--</Row>-->
54+
<Row android:rowEdgeFlags="bottom">
55+
<!--<Key android:codes="44" android:keyLabel="," android:keyWidth="10%p" android:keyEdgeFlags="left"/>-->
56+
<!--<Key android:codes="47" android:keyLabel="/" android:keyWidth="10%p" />-->
57+
<Key android:codes="32" android:keyIcon="@drawable/ic_space_bar_grey_60dp" android:keyWidth="100%p" android:isRepeatable="true"/>
58+
<!--<Key android:codes="-4" android:keyLabel="DONE" android:keyWidth="20%p" android:keyEdgeFlags="right"/>-->
59+
<!--<Key android:codes="0" android:keyIcon="@drawable/ic_mood_grey_60dp" android:keyWidth="25%p" android:keyEdgeFlags="right"/>-->
60+
</Row>
61+
</Keyboard>

0 commit comments

Comments
 (0)