From 725d99e2cbf19ce174f366e7003743f67bd5be6a Mon Sep 17 00:00:00 2001
From: AoEiuV020 <490674483@qq.com>
Date: Mon, 13 Feb 2017 11:18:48 +0800
Subject: [PATCH] release 3.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加一个KeyStore,用来签名release版本，
虽然原作者有在google play发行，
但似乎不打算更新，
这个KeyStore签名的release只发在github上，不发行在市场，
---
 app/build.gradle                           |  19 ++++++++++--
 app/keystore.properties                    |   4 +++
 app/proguard-rules.txt                     |  31 ++++++++++++++++++++
 app/src/main/AndroidManifest.xml           |   2 +-
 app/src/main/res/raw/key.html              |  32 ++++++++++-----------
 app/src/main/res/values-es/strings.xml     |   1 +
 app/src/main/res/values-it/strings.xml     |   1 +
 app/src/main/res/values-nl/strings.xml     |   1 +
 app/src/main/res/values-ru/strings.xml     |   1 +
 app/src/main/res/values-sv-rSE/strings.xml |   1 +
 app/src/main/res/values-zh-rCN/strings.xml |   1 +
 app/src/main/res/values-zh-rTW/strings.xml |   1 +
 app/src/main/res/values/strings.xml        |   1 +
 app/tmptmp.jks                             | Bin 0 -> 2223 bytes
 make_template.py                           |   2 ++
 15 files changed, 79 insertions(+), 19 deletions(-)
 create mode 100644 app/keystore.properties
 create mode 100644 app/proguard-rules.txt
 create mode 100644 app/tmptmp.jks

diff --git a/app/build.gradle b/app/build.gradle
index fd0b5fb..793d382 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,19 @@
 apply plugin: 'com.android.application'
+def keystorePropertiesFile = project.file("keystore.properties")
+def keystoreProperties = new Properties()
+keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 android {
+    lintOptions {
+        abortOnError false
+    }
+    signingConfigs {
+        config {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+        }
+    }
     compileSdkVersion 25
     buildToolsVersion "25.0.2"
 
@@ -11,12 +25,13 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            signingConfig signingConfigs.config
         }
     }
 }
 
 dependencies {
     compile 'com.android.support:support-v4:25.1.1'
-}
\ No newline at end of file
+}
diff --git a/app/keystore.properties b/app/keystore.properties
new file mode 100644
index 0000000..e96907f
--- /dev/null
+++ b/app/keystore.properties
@@ -0,0 +1,4 @@
+storeFile=tmptmp.jks
+storePassword=tmptmp
+keyAlias=tmptmp
+keyPassword=tmptmp
diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt
new file mode 100644
index 0000000..8bf108e
--- /dev/null
+++ b/app/proguard-rules.txt
@@ -0,0 +1,31 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in D:\aoeiuv020\development\android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+#apk 包内所有 class 的内部结构
+-dump class_files.txt
+#未混淆的类和成员
+-printseeds seeds.txt
+#列出从 apk 中删除的代码
+-printusage unused.txt
+#混淆前后的映射
+-printmapping mapping.txt
+#各种问题通通无视
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-verbose
+-ignorewarnings
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 360d13a..af66a8e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.volosyukivan"
-      android:versionName="2.3.5" android:versionCode="30">
+      android:versionName="3.0.0" android:versionCode="40">
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
diff --git a/app/src/main/res/raw/key.html b/app/src/main/res/raw/key.html
index 0083fe0..6de347f 100644
--- a/app/src/main/res/raw/key.html
+++ b/app/src/main/res/raw/key.html
@@ -292,13 +292,13 @@
         stat["color"] = "red";
         xcomment.innerHTML = "$7f060001";
       } else if (newState == "problem") {
-        stat.innerHTML = "$7f060019";
+        stat.innerHTML = "$7f06001a";
         stat["color"] = "red";
-        xcomment.innerHTML = '$7f060016 <a href="$7f060018">$7f060017</a>';
+        xcomment.innerHTML = '$7f060017 <a href="$7f060019">$7f060018</a>';
       } else if (newState == "multi") {
-        stat.innerHTML = "$7f06001d";
+        stat.innerHTML = "$7f06001e";
         stat["color"] = "red";
-        xcomment.innerHTML = "$7f06001c";
+        xcomment.innerHTML = "$7f06001d";
       }
     }
 
@@ -463,12 +463,12 @@
 <tr valign="top">
 <td class="main" width="450">
 <!-- Main Window -->
-<h1>$7f060023</h1>
+<h1>$7f060024</h1>
   <table border="0"><tbody><tr><td cellspacing="50" cellpadding="50">
   <form name="f">
-  <h2>$7f060022</h2>
-  <div class="mode"><input type="radio" name="mode" value="i" checked>$7f060021</div>
-  <div class="mode"><input type="radio" name="mode" value="c">$7f060020</div>
+  <h2>$7f060023</h2>
+  <div class="mode"><input type="radio" name="mode" value="i" checked>$7f060022</div>
+  <div class="mode"><input type="radio" name="mode" value="c">$7f060021</div>
   </form>
   </td></tr></tbody></table>
 
@@ -478,17 +478,17 @@ <h2>$7f060022</h2>
   <table border="0"><tbody><tr><td cellspacing="50" cellpadding="50">
   <tr>
   <td>
-  <h2>$7f06002b</h2>
+  <h2>$7f06002c</h2>
   <ul>
-  <li>$7f060029</li>
-  <li>$7f060024</li>
+  <li>$7f06002a</li>
   <li>$7f060025</li>
-  <li>$7f060027</li>
+  <li>$7f060026</li>
   <li>$7f060028</li>
+  <li>$7f060029</li>
   <li>F3 = Search</li>
   <li>Escape,F5 = BACK</li>
   <li>F6 = Home</li>
-  <li>$7f06002a</li>
+  <li>$7f06002b</li>
   <li><font color="red">F4 = Edit locally/ submit (alpha)</font></li>
   </ul>
   </td></tr></tbody></table>
@@ -496,7 +496,7 @@ <h2>$7f06002b</h2>
 <td align="right" width="200">
 <!-- Side bar -->
   <table border="1" cellpadding="20"><tbody><tr><td cellspacing="50" cellpadding="50">
-  <h2>$7f06001f <font color="black" id="status">$7f06001e</font></h2>
+  <h2>$7f060020 <font color="black" id="status">$7f06001f</font></h2>
   <div id="comment"></div>
   </td></tr></tbody></table>
 
@@ -505,7 +505,7 @@ <h2>$7f06001f <font color="black" id="status">$7f06001e</font></h2>
 </tr>
 <tr>
 <td colspan="3">
-  <h2>$7f06001b</h2>
+  <h2>$7f06001c</h2>
   <form method="post" action="/form">
       <input type="hidden" name="name" value="value">
       <textarea name="text" cols="100" rows="20" id="in"></textarea>
@@ -515,7 +515,7 @@ <h2>$7f06001b</h2>
 </tr>
 <tr>
 <td colspan="3">
-  <div class="footer"><a href="http://code.google.com/p/wifikeyboard/">$7f060014</a><br>$7f060013</div>
+  <div class="footer"><a href="http://code.google.com/p/wifikeyboard/">$7f060015</a><br>$7f060014</div>
 <!-- <div id="keys">Debug: key presses:</div> -->
 <!-- <div id="debug">New event placeholder.</div> -->
 <td>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7ee768a..502f17b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -77,4 +77,5 @@ Para activar !WiFiKeyboard en tu dispositivo:
 <string name="special_key_volume_mapping">F9, F10 = Control de volumen</string>
 <string name="footer_source_code">Código fuente disponible (licencia GPL v2).</string>
 <string name="footer_author">Creado por Ivan Volosyuk en 2010.</string>
+    <string name="desc_toch_input_field_honeycomb">Seleccione cualquier campo de entrada de texto, eche un vistazo en el área de notificación para el selector de método de entrada</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d390663..95b4193 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -59,4 +59,5 @@ Per abilitare !WiFiKeyboard sul tuo telefono:
 <string name="special_key_volume_mapping">F9, F10 = Controllo voloume</string>
 <string name="footer_source_code">Codice sorgente disponibile (licenza GPL v2).</string>
 <string name="footer_author">Creato da Ivan Volosyuk nel 2010.</string>
+    <string name="desc_toch_input_field_honeycomb">Selezionare qualsiasi campo di inserimento testo, date un\'occhiata nell\'area di notifica per il selettore metodo di input</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 7e37c42..eac44dc 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -59,4 +59,5 @@ Om !WiFiKeyboard te activeren op uw toestel::
 <string name="special_key_volume_mapping">F9, F10 = Volume knoppen</string>
 <string name="footer_source_code">Bron code si beschikbaar (licentie GPL v2).</string>
 <string name="footer_author">Gecreëerd door Ivan Volosyuk in 2010.</string>
+    <string name="desc_toch_input_field_honeycomb">De keuze van een tekst, gezien de input voor de regio \'s - Kennisgeving</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9653651..62a05f1 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -59,4 +59,5 @@
 <string name="special_key_volume_mapping">F9, F10 = Управление громкостью</string>
 <string name="footer_source_code">Доступен исходный код (лицензия GPL v2).</string>
 <string name="footer_author">Разработка Ивана Волосюка, 2010 год</string>
+    <string name="desc_toch_input_field_honeycomb">Выберите любое поле ввода текста, посмотрите в области уведомлений для выбора метода ввода</string>
 </resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 237ce6c..251d583 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -59,4 +59,5 @@ För att aktivera !WiFiKeyboard på din enhet:
 <string name="special_key_volume_mapping">F9, F10 = Volymkontroll</string>
 <string name="footer_source_code">Källkod tillgänglig (licens GPL v2).</string>
 <string name="footer_author">Skapad av Ivan Volosyuk 2010.</string>
+    <string name="desc_toch_input_field_honeycomb">Välj ett textinmatningsfält , ta en titt i meddelandefältet för inmatningsmetod väljare</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 0bf00cd..42c1573 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -59,4 +59,5 @@
 <string name="special_key_volume_mapping">F9, F10 = 音量控制</string>
 <string name="footer_source_code">源码可用(基于GPL v2协议)。</string>
 <string name="footer_author">由 Ivan Volosyuk 于 2010 创建。&lt;br/&gt;安智网汉化（&lt;a href="http://goapk.com"&gt;http://goapk.com&lt;/a&gt;）</string>
+    <string name="desc_toch_input_field_honeycomb">选择任何输入框，在通知栏中查看输入法选择器</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index c77dceb..7fade5b 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -59,4 +59,5 @@
 <string name="special_key_volume_mapping">F9, F10 = 音量控制</string>
 <string name="footer_source_code">源碼可用(基於GPL v2協議)。</string>
 <string name="footer_author">由 Ivan Volosyuk 於 2010 建立。&lt;br/&gt;安智網中文化（&lt;a href="http://goapk.com"&gt;http://goapk.com&lt;/a&gt;）</string>
+    <string name="desc_toch_input_field_honeycomb">選擇任何輸入框，在通知欄中查看輸入法選擇器</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4cf0804..8e374cb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,6 +24,7 @@
 <string name="desc_goto_settings">Go to Settings->Language &amp; Keyboard</string>
 <string name="desc_enable_kbd">Enable WiFiKeyboard in the list</string>
 <string name="desc_toch_input_field">On any text input touch and hold for a second</string>
+    <!--TODO 下面这个之前没翻译，简单使用google translate，-->
 <string name="desc_toch_input_field_honeycomb">Select any text input field, take a look in notification area for the input method selector</string>
 <string name="desc_change_input_method">Change \"InputMethod\" to \"WiFiKeyboard\"</string>
 <string name="desc_enable_network">Ensure you have enabled WiFi or GPRS/3G network</string>
diff --git a/app/tmptmp.jks b/app/tmptmp.jks
new file mode 100644
index 0000000000000000000000000000000000000000..6f9f71feb038d06bf7911c5ee024ad0312ca4acd
GIT binary patch
literal 2223
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
ZSVS{t{`&gwO#jk%De}8(_vW+K{|hGP*Bt-=

literal 0
HcmV?d00001

diff --git a/make_template.py b/make_template.py
index 4aec2ad..ef9b4b6 100755
--- a/make_template.py
+++ b/make_template.py
@@ -1,5 +1,7 @@
 #!/usr/bin/python2
+#coding=utf-8
 
+#TODO 用python处理感觉有点蠢，明明可以用java处理的，
 import xml.parsers.expat;
 import sys;
 import re;