Adds exclamation point. Also fixes font of iota subscript to default.

jeremymarch · jeremymarch · commit ca99a106ea60 · 2018-03-03T11:44:29.000-05:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.philolog.hoplitekeyboard"
-    android:versionCode="18"
-    android:versionName="1.2">
+    android:versionCode="20"
+    android:versionName="1.2.2">
 
     <application
         android:label="@string/app_name"
diff --git a/app/src/main/java/com/philolog/hoplitekeyboard/HKLocalOnKeyboardActionListener.java b/app/src/main/java/com/philolog/hoplitekeyboard/HKLocalOnKeyboardActionListener.java
@@ -370,6 +370,8 @@ else if( primaryCode == 125 ) {
             s = "|";
         } else if (primaryCode == 219) {
             s = "‖";
+        } else if (primaryCode == 225) {
+            s = "!";
         } else if (primaryCode == 26) { //parentheses
             localAccentLetter(editable, start, SURROUNDING_PARENTHESES);
         } else if (primaryCode == 27) { //rough breathing
diff --git a/app/src/main/java/com/philolog/hoplitekeyboard/HopliteKeyboard.java b/app/src/main/java/com/philolog/hoplitekeyboard/HopliteKeyboard.java
@@ -508,6 +508,8 @@ else if( primaryCode == 125 ) {
                     s = "|";
                 } else if (primaryCode == 219) {
                     s = "‖";
+                } else if (primaryCode == 225) {
+                    s = "!";
                 } else if (primaryCode == 86) {
                     //s = "̆";
                     localAccentLetter(ic, 0, BREVE);
diff --git a/app/src/main/java/com/philolog/hoplitekeyboard/HopliteKeyboardView.java b/app/src/main/java/com/philolog/hoplitekeyboard/HopliteKeyboardView.java
@@ -81,7 +81,7 @@ else if ((key.codes[0] > 26 && key.codes[0] < 35) || key.codes[0] == 86) {
                 dr.setBounds(key.x, key.y + 6, key.x + key.width, key.y + key.height);
                 dr.draw(canvas);
             }
-            else if (key.codes[0] == 36 || key.codes[0] == 37 || key.codes[0] == 40 || key.codes[0] == 41 || key.codes[0] == 75 || key.codes[0] == 76 || key.codes[0] == 77 || key.codes[0] == 78 || key.codes[0] == 79 || key.codes[0] == 82 || key.codes[0] == 83 || key.codes[0] == 84 || key.codes[0] == 85 || key.codes[0] == 87 || key.codes[0] == 88 || key.codes[0] == 89  || key.codes[0] == 92 || key.codes[0] == 93  || key.codes[0] == 94 || key.codes[0] == 95  || key.codes[0] == 98 || key.codes[0] == 99 || key.codes[0] == 90 || key.codes[0] == 91){
+            else if (key.codes[0] == 36 || key.codes[0] == 37 || key.codes[0] == 40 || key.codes[0] == 41 || key.codes[0] == 75 || key.codes[0] == 76 || key.codes[0] == 77 || key.codes[0] == 78 || key.codes[0] == 79 || key.codes[0] == 82 || key.codes[0] == 83 || key.codes[0] == 84 || key.codes[0] == 85 || key.codes[0] == 87 || key.codes[0] == 88 || key.codes[0] == 89  || key.codes[0] == 92 || key.codes[0] == 93  || key.codes[0] == 94 || key.codes[0] == 95  || key.codes[0] == 98 || key.codes[0] == 99 || key.codes[0] == 90 || key.codes[0] == 91 || key.codes[0] == 225){
                 Drawable dr;
                 if (key.pressed) {
                     dr = ContextCompat.getDrawable(context, R.drawable.puncbuttondown);
@@ -259,6 +259,7 @@ else if (key.codes[0] == 29 || key.codes[0] == 34)
             else if (key.codes[0] == 32)
             {
                 FONT_SIZE = 23.0f; //or 26.0?
+                paint.setTypeface(Typeface.DEFAULT);
                 //paint.setTypeface(tf);
             }
             else if (key.codes[0] == 33 && mMFPressed)
@@ -270,6 +271,10 @@ else if (key.codes[0] == 35)
             {
                 FONT_SIZE = 23.0f; //or 26.0?
             }
+            else if (key.codes[0] == 31 || key.codes[0] == 86)
+            {
+                FONT_SIZE = 32.0f; //or 26.0?
+            }
             else
             {
                 FONT_SIZE = 23.0f; //or 26.0?
@@ -318,12 +323,20 @@ else if (key.codes[0] == 33) {
                 }
                 else if (key.codes[0] == 32) {
                     s = "ι";//"ι";//"ͺ";
-                    offset = 14;
+                    offset = 13;
                 }
                 else if (key.codes[0] == 33 && mMFPressed) {
                     s = ",";
                     offset = 5;
                 }
+                else if (key.codes[0] == 31) {
+                    s = "¨";
+                    offset = 14;
+                }
+                else if (key.codes[0] == 86) {
+                    s = "˘";
+                    offset = 18;
+                }
                 else {
                     s = key.label.toString();
                     /*
diff --git a/app/src/main/res/xml/hoplitekeyboard.xml b/app/src/main/res/xml/hoplitekeyboard.xml
@@ -12,7 +12,7 @@
         <Key android:codes="34"    android:keyLabel="\\"  />
         <Key android:codes="30"    android:keyLabel="~"   />
         <Key android:codes="33"    android:keyLabel="-"   />
-        <Key android:codes="32"    android:keyLabel="i"   />
+        <Key android:codes="32"    android:keyLabel="ι"   />
         <Key android:codes="40"    android:keyLabel=","   />
         <Key android:codes="41"    android:keyLabel="·"   android:keyEdgeFlags="right" />
 
diff --git a/app/src/main/res/xml/hoplitekeyboardupper.xml b/app/src/main/res/xml/hoplitekeyboardupper.xml
@@ -11,12 +11,12 @@
         <Key android:codes="34"    android:keyLabel="\\"   />
         <Key android:codes="31"    android:keyLabel="¨"   />
         <Key android:codes="86"    android:keyLabel="˘"   />
-        <Key android:codes="32"    android:keyLabel="i"   />
+        <Key android:codes="32"    android:keyLabel="ι"   />
         <Key android:codes="77"    android:keyLabel="’" />
         <Key android:codes="79"    android:keyLabel="—"   android:keyEdgeFlags="right"/>
     </Row>
     <Row>
-        <Key android:codes="25"    android:keyLabel="ς" android:keyEdgeFlags="left"  />
+        <Key android:codes="225"    android:keyLabel="!" android:keyEdgeFlags="left"  />
         <Key android:codes="55"    android:keyLabel="Ε"  />
         <Key android:codes="67"    android:keyLabel="Ρ" />
         <Key android:codes="69"    android:keyLabel="Τ"  />

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ else if ((key.codes[0] > 26 && key.codes[0] < 35) \|\| key.codes[0] == 86) {`
`81`	`81`	`dr.setBounds(key.x, key.y + 6, key.x + key.width, key.y + key.height);`
`82`	`82`	`dr.draw(canvas);`
`83`	`83`	`}`
`84`		- else if (key.codes[0] == 36 \|\| key.codes[0] == 37 \|\| key.codes[0] == 40 \|\| key.codes[0] == 41 \|\| key.codes[0] == 75 \|\| key.codes[0] == 76 \|\| key.codes[0] == 77 \|\| key.codes[0] == 78 \|\| key.codes[0] == 79 \|\| key.codes[0] == 82 \|\| key.codes[0] == 83 \|\| key.codes[0] == 84 \|\| key.codes[0] == 85 \|\| key.codes[0] == 87 \|\| key.codes[0] == 88 \|\| key.codes[0] == 89 \|\| key.codes[0] == 92 \|\| key.codes[0] == 93 \|\| key.codes[0] == 94 \|\| key.codes[0] == 95 \|\| key.codes[0] == 98 \|\| key.codes[0] == 99 \|\| key.codes[0] == 90 \|\| key.codes[0] == 91){
	`84`	+ else if (key.codes[0] == 36 \|\| key.codes[0] == 37 \|\| key.codes[0] == 40 \|\| key.codes[0] == 41 \|\| key.codes[0] == 75 \|\| key.codes[0] == 76 \|\| key.codes[0] == 77 \|\| key.codes[0] == 78 \|\| key.codes[0] == 79 \|\| key.codes[0] == 82 \|\| key.codes[0] == 83 \|\| key.codes[0] == 84 \|\| key.codes[0] == 85 \|\| key.codes[0] == 87 \|\| key.codes[0] == 88 \|\| key.codes[0] == 89 \|\| key.codes[0] == 92 \|\| key.codes[0] == 93 \|\| key.codes[0] == 94 \|\| key.codes[0] == 95 \|\| key.codes[0] == 98 \|\| key.codes[0] == 99 \|\| key.codes[0] == 90 \|\| key.codes[0] == 91 \|\| key.codes[0] == 225){
`85`	`85`	`Drawable dr;`
`86`	`86`	`if (key.pressed) {`
`87`	`87`	`dr = ContextCompat.getDrawable(context, R.drawable.puncbuttondown);`
`@@ -259,6 +259,7 @@ else if (key.codes[0] == 29 \|\| key.codes[0] == 34)`
`259`	`259`	`else if (key.codes[0] == 32)`
`260`	`260`	`{`
`261`	`261`	`FONT_SIZE = 23.0f; //or 26.0?`
	`262`	`+ paint.setTypeface(Typeface.DEFAULT);`
`262`	`263`	`//paint.setTypeface(tf);`
`263`	`264`	`}`
`264`	`265`	`else if (key.codes[0] == 33 && mMFPressed)`
`@@ -270,6 +271,10 @@ else if (key.codes[0] == 35)`
`270`	`271`	`{`
`271`	`272`	`FONT_SIZE = 23.0f; //or 26.0?`
`272`	`273`	`}`
	`274`	`+ else if (key.codes[0] == 31 \|\| key.codes[0] == 86)`
	`275`	`+ {`
	`276`	`+ FONT_SIZE = 32.0f; //or 26.0?`
	`277`	`+ }`
`273`	`278`	`else`
`274`	`279`	`{`
`275`	`280`	`FONT_SIZE = 23.0f; //or 26.0?`
`@@ -318,12 +323,20 @@ else if (key.codes[0] == 33) {`
`318`	`323`	`}`
`319`	`324`	`else if (key.codes[0] == 32) {`
`320`	`325`	`s = "ι";//"ι";//"ͺ";`
`321`		`- offset = 14;`
	`326`	`+ offset = 13;`
`322`	`327`	`}`
`323`	`328`	`else if (key.codes[0] == 33 && mMFPressed) {`
`324`	`329`	`s = ",";`
`325`	`330`	`offset = 5;`
`326`	`331`	`}`
	`332`	`+ else if (key.codes[0] == 31) {`
	`333`	`+ s = "¨";`
	`334`	`+ offset = 14;`
	`335`	`+ }`
	`336`	`+ else if (key.codes[0] == 86) {`
	`337`	`+ s = "˘";`
	`338`	`+ offset = 18;`
	`339`	`+ }`
`327`	`340`	`else {`
`328`	`341`	`s = key.label.toString();`
`329`	`342`	`/*`