Merge pull request #88 from OpenTaal/Dutch

friesenkiwi · web-flow · commit f6afd786d52f · 2017-07-25T11:46:20.000+02:00
Update to Dutch pack
diff --git a/README.md b/README.md
@@ -189,5 +189,8 @@ use voice input, leave it as **Regular**.
 See also
 --------
 
+* https://www.opentaal.org/het-laatste-nieuws/projectnieuws/51-publicaties/221-anysoftkeyboard
 * https://gitlab.com/fdroid/fdroiddata/blob/master/metadata/com.anysoftkeyboard.languagepack.dutch.txt
 * https://f-droid.org/wiki/page/com.anysoftkeyboard.languagepack.dutch
+* https://play.google.com/store/apps/details?id=com.anysoftkeyboard.languagepack.dutch
+* https://f-droid.org/packages/com.anysoftkeyboard.languagepack.dutch
diff --git a/build.gradle b/build.gradle
@@ -23,8 +23,8 @@ android {
         applicationId "com.anysoftkeyboard.languagepack.dutch"
         minSdkVersion 7
         targetSdkVersion 25
-        versionCode 5
-        versionName "1.4"
+        versionCode 6
+        versionName "1.5"
     }
 
     signingConfigs {
diff --git a/dictionary/words.xml b/dictionary/words.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-** The data in this file has a dual-license MIT/BSD and is allowed to be
+** The data in this file has a dual-license MIT/BSD and is intended to be
 ** distributed ONLY in the Dutch language pack for AnySoftKeyboard.
 **
 ** The word list below is a highly customised export from the collection
diff --git a/src/main/res/drawable-hdpi/flag_be.png b/src/main/res/drawable-hdpi/flag_be.png
diff --git a/src/main/res/drawable-hdpi/flag_nl.png b/src/main/res/drawable-hdpi/flag_nl.png
diff --git a/src/main/res/drawable-xhdpi/flag_be.png b/src/main/res/drawable-xhdpi/flag_be.png
diff --git a/src/main/res/drawable-xhdpi/flag_nl.png b/src/main/res/drawable-xhdpi/flag_nl.png
diff --git a/src/main/res/drawable/flag_be.png b/src/main/res/drawable/flag_be.png
diff --git a/src/main/res/drawable/flag_nl.png b/src/main/res/drawable/flag_nl.png
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">AnySoftKeyboard - Nederlands Taalpakket</string>
-    <string name="keyboard_name">Nederlands</string>
     <string name="dictionary_name">Nederlands</string>
-    <string name="description">Nederlandse ondersteuning door Stichting OpenTaal</string>
+    <string name="dictionary_description">Nederlandstalige ondersteuning door Stichting OpenTaal</string>
+    <string name="keyboard_name">Nederlands</string>
+    <string name="keyboard_description_nl">QWERTY voor Nederland en Surinamed door OpenTaal</string>
+    <string name="keyboard_description_be">AZERTY voor België door OpenTaal</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">AnySoftKeyboard - Dutch Language Pack</string>
-    <string name="keyboard_name">Dutch</string>
     <string name="dictionary_name">Dutch</string>
-    <string name="description">Dutch support by Stichting OpenTaal</string>
+    <string name="dictionary_description">Dutch support by Stichting OpenTaal</string>
+    <string name="keyboard_name">Dutch</string>
+    <string name="keyboard_description_nl">QWERTY for Netherlands and Suriname by OpenTaal</string>
+    <string name="keyboard_description_be">AZERTY for Belgium by OpenTaal</string>
 </resources>
diff --git a/src/main/res/xml/be_azerty.xml b/src/main/res/xml/be_azerty.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:ask="http://schemas.android.com/apk/res-auto"
+          android:keyWidth="10%p"
+          android:keyHeight="@integer/key_normal_height"><!-- "android:keyWidth" specify the default width of a key. In this example, 10% of parent (the whole keyboard) -->
+
+    <Row>
+        <!-- Key attributes:
+         "android:codes" : a comma separated unicode values of the keys. If you specify more than one code, then the other codes are accessible via multi-tap.
+         "android:popupCharacters" : characters to show on long-press popup keyboard
+         "android:keyLabel" : the text to show on the key. If this attribute is missing, the first code in "android:codes" will be used.
+         "android:horizontalGap" : gap to add to the left of this key.
+         "android:isModifier" : true/false (default is false) whether this key is a modifier key. Means it will be rendered with a differnt background (shift, delete are example of modifier key)
+         "android:isRepeatable" : true/false (default is false) whether this key repeats printing on long press (like the backspace). Setting this to true will disable the long-press (android:popupCharacters) functionality
+         "android:keyWidth" : specify the width of this key
+         -->
+        <Key android:codes="97" android:keyLabel="a" android:popupCharacters="1₁¹&amp;|àáâäåα" ask:hintLabel="1&amp;|" android:keyEdgeFlags="left"/>
+        <Key android:codes="122" android:keyLabel="z" android:popupCharacters="2₂²é@√" ask:hintLabel="2é@"/>
+        <Key android:codes="101" android:keyLabel="e" android:popupCharacters="3₃³&quot;#èéêëᵉ€" ask:hintLabel="3&quot;#"/>
+        <Key android:codes="114" android:keyLabel="r" android:popupCharacters="4₄⁴&apos;{ρ®" ask:hintLabel="4&apos;{"/>
+        <Key android:codes="116" android:keyLabel="t" android:popupCharacters="5₅⁵(τ" ask:hintLabel="5 ("/>
+        <Key android:codes="121" android:keyLabel="y" android:popupCharacters="6₆⁶§^¥" ask:hintLabel="6§^"/>
+        <Key android:codes="117" android:keyLabel="u" android:popupCharacters="7₇⁷èùúûü" ask:hintLabel="7 è"/>
+        <Key android:codes="105" android:keyLabel="i" android:popupCharacters="8₈⁸!ìíîï" ask:hintLabel="8 !"/>
+        <Key android:codes="111" android:keyLabel="o" android:popupCharacters="9₉⁹Ç{òóôöøω" ask:hintLabel="9Ç{"/>
+        <Key android:codes="112" android:keyLabel="p" android:popupCharacters="0₀⁰à}^[]*$π" ask:hintLabel="0à}" android:keyEdgeFlags="right"/>
+    </Row>
+     
+    <Row>
+        <Key android:horizontalGap="5%p" android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/>
+        <Key android:codes="115" android:keyLabel="s" android:popupCharacters="ßσ" ask:hintLabel="ß"/>
+        <Key android:codes="100" android:keyLabel="d" android:popupCharacters="δ"/>
+        <Key android:codes="102" android:keyLabel="f" android:popupCharacters="φ"/>
+        <Key android:codes="103" android:keyLabel="g" android:popupCharacters="°γ" ask:hintLabel="°"/>
+        <Key android:codes="104" android:keyLabel="h"/>
+        <Key android:codes="106" android:keyLabel="j"/>
+        <Key android:codes="107" android:keyLabel="k"/>
+        <Key android:codes="108" android:keyLabel="l" android:popupCharacters="%ù£λ" ask:hintLabel="%ù£" android:keyEdgeFlags="right"/>
+    </Row>
+    
+    <Row>
+        <Key android:codes="-1" android:keyWidth="15%p"
+                android:isModifier="true" android:isSticky="true" android:keyEdgeFlags="left"/>
+        <Key android:codes="119" android:keyLabel="w" android:popupCharacters="&lt;&gt;≤≥\" ask:hintLabel="&lt;&gt;\"/>
+        <Key android:codes="120" android:keyLabel="x" android:popupCharacters="×" ask:hintLabel="×"/>
+        <Key android:codes="99" android:keyLabel="c" android:popupCharacters="ç©" ask:hintLabel="ç"/>
+        <Key android:codes="118" android:keyLabel="v"/>
+        <Key android:codes="98" android:keyLabel="b" android:popupCharacters="β"/>
+        <Key android:codes="110" android:keyLabel="n" android:popupCharacters="ñ~-+±=≠" ask:hintLabel="ñ~+"/>
+        <Key android:codes="109" android:keyLabel="m" android:popupCharacters="µ" ask:hintLabel="µ"/>
+        <Key android:keyWidth="15%p" android:codes="-5" android:keyEdgeFlags="right" android:isRepeatable="true"/>
+    </Row>
+</Keyboard>
+    
diff --git a/src/main/res/xml/dictionaries.xml b/src/main/res/xml/dictionaries.xml
@@ -8,6 +8,6 @@
      "autoTextResourceId" : a reference to a common typing mistakes XML.
      -->
 	<Dictionary nameResId="@string/dictionary_name" locale="nl" id="a1beccb0-5b65-11e7-9598-0800200c9a66" type="binary_resource"
-	dictionaryResourceId="@array/words_dict_array" autoTextResourceId="@xml/autotext" 
-	description="@string/description"/>
+	dictionaryResourceId="@array/words_dict_array" autoTextResourceId="@xml/nl_autotext" 
+	description="@string/dictionary_description"/>
 </Dictionaries>
diff --git a/src/main/res/xml/keyboards.xml b/src/main/res/xml/keyboards.xml
@@ -7,6 +7,8 @@
      "iconResId" : a reference to a drawable which can be used to show a flag in the notification bar.
      "layoutResId" : a reference to a keyboard layout XML. See res/xml/qwerty.xml
      -->
-	<Keyboard nameResId="@string/keyboard_name" iconResId="@drawable/flag" layoutResId="@xml/nl_qwerty" 
-	    id="18e2df10-5b67-11e7-9598-0800200c9a66" defaultDictionaryLocale="nl" description="@string/description" index="1"/>
+	<Keyboard nameResId="@string/keyboard_name" iconResId="@drawable/flag_nl" layoutResId="@xml/nl_qwerty" 
+	    id="18e2df10-5b67-11e7-9598-0800200c9a66" defaultDictionaryLocale="nl" description="@string/keyboard_description_nl" index="1"/>
+	<Keyboard nameResId="@string/keyboard_name" iconResId="@drawable/flag_be" layoutResId="@xml/be_azerty" 
+	    id="c844c6f0-7073-11e7-9598-0800200c9a66" defaultDictionaryLocale="nl" description="@string/keyboard_description_be" index="1"/>
 </Keyboards>
diff --git a/src/main/res/xml/nl_autotext.xml b/src/main/res/xml/nl_autotext.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-** The data in this file has a dual-license MIT/BSD and is allowed to be
+** The data in this file has a dual-license MIT/BSD and is intended to be
 ** distributed ONLY in the Dutch language pack for AnySoftKeyboard.
 **
 ** The word list below is a highly customised export from the collection
diff --git a/src/main/res/xml/nl_qwerty.xml b/src/main/res/xml/nl_qwerty.xml
@@ -20,7 +20,7 @@
         <Key android:codes="101" android:keyLabel="e" android:popupCharacters="3₃³#èéêëᵉ" ask:hintLabel="3 #"/>
         <Key android:codes="114" android:keyLabel="r" android:popupCharacters="4₄⁴$ρ®" ask:hintLabel="4 $"/>
         <Key android:codes="116" android:keyLabel="t" android:popupCharacters="5₅⁵%τ€" ask:hintLabel="5€%"/>
-        <Key android:codes="121" android:keyLabel="y" android:popupCharacters="6₆⁶^`¥" ask:hintLabel="6¥^"/>
+        <Key android:codes="121" android:keyLabel="y" android:popupCharacters="6₆⁶^¥" ask:hintLabel="6¥^"/>
         <Key android:codes="117" android:keyLabel="u" android:popupCharacters="7₇⁷&amp;ùúûü" ask:hintLabel="7 &amp;"/>
         <Key android:codes="105" android:keyLabel="i" android:popupCharacters="8₈⁸*ìíîï" ask:hintLabel="8 *"/>
         <Key android:codes="111" android:keyLabel="o" android:popupCharacters="9₉⁹(òóôöøω" ask:hintLabel="9 ("/>
diff --git a/update-dutch/resources/autotext-header.xml b/update-dutch/resources/autotext-header.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-** The data in this file has a dual-license MIT/BSD and is allowed to be
+** The data in this file has a dual-license MIT/BSD and is intended to be
 ** distributed ONLY in the Dutch language pack for AnySoftKeyboard.
 **
 ** The word list below is a highly customised export from the collection
diff --git a/update-dutch/resources/words-header.xml b/update-dutch/resources/words-header.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-** The data in this file has a dual-license MIT/BSD and is allowed to be
+** The data in this file has a dual-license MIT/BSD and is intended to be
 ** distributed ONLY in the Dutch language pack for AnySoftKeyboard.
 **
 ** The word list below is a highly customised export from the collection
