Move parameters

rkkr · Nov 2, 2019 · bf0485a · bf0485a
1 parent ea3ae92
commit bf0485a
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 21 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "rkr.tinykeyboard.inputmethod"
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 2
-        versionName "0.2"
+        versionCode 3
+        versionName "0.3"
     }
     buildTypes {
         release {

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -20,5 +20,6 @@
 
 <resources>
     <dimen name="key_height">50dp</dimen>
+    <dimen name="key_width">10%p</dimen>
     <dimen name="key_text_size">18dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -25,7 +25,4 @@
     <string name="label_go_key">Go</string>
     <string name="label_next_key">Next</string>
     <string name="label_send_key">Send</string>
-
-    <!-- Labels for subtype -->
-    <string name="label_subtype_generic">%s</string>
 </resources>
diff --git a/app/src/main/res/xml/method.xml b/app/src/main/res/xml/method.xml
@@ -24,7 +24,7 @@
         android:supportsSwitchingToNextInputMethod="true"
 >
     <subtype
-        android:label="@string/label_subtype_generic"
+        android:label="%s"
         android:imeSubtypeLocale="en_US"
         android:imeSubtypeMode="keyboard" />
 </input-method>
diff --git a/app/src/main/res/xml/qwerty.xml b/app/src/main/res/xml/qwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
-    android:keyWidth="10%p"
+    android:keyWidth="@dimen/key_width"
     android:keyHeight="@dimen/key_height"
     >
 
@@ -62,10 +62,10 @@
 
     <Row android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="123" android:keyWidth="15%p" android:keyEdgeFlags="left"/>
-        <Key android:codes="44" android:keyLabel="," android:keyWidth="10%p"/>
-        <Key android:codes="-101" android:keyLabel="@string/language" android:keyWidth="10%p"/>
-        <Key android:codes="32" android:keyLabel=" " android:keyWidth="35%p" android:isRepeatable="true"/>
-        <Key android:codes="46" android:keyLabel="." android:keyWidth="10%p"/>
+        <Key android:codes="44" android:keyLabel=","/>
+        <Key android:codes="-101" android:keyLabel="@string/language"/>
+        <Key android:codes="32" android:keyLabel="" android:keyWidth="35%p" android:isRepeatable="true"/>
+        <Key android:codes="46" android:keyLabel="."/>
         <Key android:codes="-4" android:keyLabel="@string/enter" android:keyWidth="20%p" android:keyEdgeFlags="right"/>
     </Row>
 </Keyboard>

diff --git a/app/src/main/res/xml/symbols.xml b/app/src/main/res/xml/symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
-    android:keyWidth="10%p"
+    android:keyWidth="@dimen/key_width"
     android:keyHeight="@dimen/key_height"
     >
 
@@ -63,10 +63,10 @@
 
     <Row android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="ABC" android:keyWidth="15%p" android:keyEdgeFlags="left"/>
-        <Key android:codes="44" android:keyLabel="," android:keyWidth="10%p"/>
-        <Key android:codes="-101" android:keyLabel="@string/language" android:keyWidth="10%p"/>
-        <Key android:codes="32" android:keyLabel=" " android:keyWidth="35%p" android:isRepeatable="true"/>
-        <Key android:codes="46" android:keyLabel="." android:keyWidth="10%p"/>
+        <Key android:codes="44" android:keyLabel=","/>
+        <Key android:codes="-101" android:keyLabel="@string/language"/>
+        <Key android:codes="32" android:keyLabel="" android:keyWidth="35%p" android:isRepeatable="true"/>
+        <Key android:codes="46" android:keyLabel="."/>
         <Key android:codes="-4" android:keyLabel="@string/enter" android:keyWidth="20%p" android:keyEdgeFlags="right"/>
     </Row>
 </Keyboard>
diff --git a/app/src/main/res/xml/symbols_shift.xml b/app/src/main/res/xml/symbols_shift.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
-    android:keyWidth="10%p"
+    android:keyWidth="@dimen/key_width"
     android:keyHeight="@dimen/key_height"
     >
 
@@ -63,10 +63,10 @@
 
     <Row android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyLabel="ABC" android:keyWidth="15%p" android:keyEdgeFlags="left"/>
-        <Key android:codes="44" android:keyLabel="," android:keyWidth="10%p"/>
-        <Key android:codes="-101" android:keyLabel="@string/language" android:keyWidth="10%p"/>
-        <Key android:codes="32" android:keyLabel=" " android:keyWidth="35%p" android:isRepeatable="true"/>
-        <Key android:codes="8230" android:keyLabel="…" android:keyWidth="10%p"/>
+        <Key android:codes="44" android:keyLabel=","/>
+        <Key android:codes="-101" android:keyLabel="@string/language"/>
+        <Key android:codes="32" android:keyLabel="" android:keyWidth="35%p" android:isRepeatable="true"/>
+        <Key android:codes="8230" android:keyLabel="…"/>
         <Key android:codes="-4" android:keyLabel="@string/enter" android:keyWidth="20%p" android:keyEdgeFlags="right"/>
     </Row>
 </Keyboard>