Merge branch 'master' into Norwegian

Author: menny

.gitignore

@@ -2,10 +2,15 @@
 .gradle
 /local.properties
 .idea
+/key.store
 .DS_Store
 /build
 /captures
 /dictionary/words_from_aosp.xml
 src/main/res/raw/*
 src/main/res/values/words_dict_array.xml
 LanguagePack-release.apk
+dictionary/words_merged.xml
+dictionary/words_from_texts.xml
+
+*.apk

README.md

@@ -0,0 +1,43 @@
+This is the common template for language Packs for the [AnySoftKeyboard](https://github.com/AnySoftKeyboard/AnySoftKeyboard) app for Android devices.
+Each pack can contain and provide multiple keyboards or dictionaries for auto correction.
+Most packs are maintained here as [branches of the repository](https://github.com/AnySoftKeyboard/LanguagePack/branches) and published to Google Play Store and F-Droid repository. There are some packs maintained as community forks, here on GitHub or not open source at all. Some of these are:
+
+* [NEO2](https://github.com/kertase/neo_anysoftkeyboard)
+* [Magyar (Hungarian)](https://github.com/rhornig/anysoftkeyboard-hungarian)
+* [Swiss](https://play.google.com/store/apps/details?id=ch.masshardt.anysoftkeyboard.swisslanguagepack)
+* [Pali (Indian)](https://github.com/yuttadhammo/ask-pali-keyboard)
+* [Malayalam, Kannada and other Indian](https://sriandroid.wordpress.com/)
+* [SSH](https://github.com/pi3ch/ssh_anysoftkeyboard)
+* [Dutch](https://github.com/OpenTaal/LanguagePack/tree/Dutch)
+
+To start a new pack, follow this checklist:
+
+1. Fork this repository.
+1. Create a new branch, name it after the language.
+1. In Android Studio, Refactor->Rename the folder/package com.anysoftkeyboard.languagepack.languagepack in the project tree, replacing the last `languagepack` with the name of the language. This will automatically change it at a couple of other locations.
+1. Change `applicationId` in `build.gradle` in the same way.
+1. Edit `src/main/res/xml/keyboards.xml` according to the comments in it. It references `src/main/res/xml/qwerty.xml`, so edit this as well. Have a look at all the other Language Pack branches, to get an idea, what is possible and how to correctly configure a keyboard.
+1. If you want to add more keyboards, you can do this by copying `qwerty.xml` and add a <keyboard> element in `keyboards.xml`. The user can pre-select in the ASK settings, which keyboards she would like to have available for toggling through.
+1. Edit `src/main/res/xml/dictionaries.xml`
+1. Edit `src/main/res/values/strings.xml`, change the strings there and possibly add some more which are referenced in the other xml files. Also, create a new folder `src/main/res/values-XX`, where `XX` is the correspondent two-letter ISO 639-1 language code.
+1. Edit (e.g. via Inkscape) one of the files in `src/main/svg-png/flag/` to represent the language, e.g. by using the flag from Wikipedia (the flag has to be placed on the right edge of the document and have the full height).
+1. Rebuild the drawables with `./gradlew svgToDrawablePng` or "Build" -> "Rebuild Project" in Android Studio. Drawables will be generated at `src/main/res/mipmap-*/`.
+1. Choose whether you like the standard or the broad variant and set that as application's `android:icon` in `src/main/AndroidManifest.xml`.
+1. You can also add a new `src/main/res/drawable/flag.png` and reference it in the `iconResId=""` attribute in the keyboards.xml.
+1. Put the source files for the dictionary into the dictionary/ directory. Take special care to take the conditions of the license into account, under which you obtained the data.
+1. Change the build.gradle to use and configure the tasks necessary. There are several different variants ([more Information](https://github.com/AnySoftKeyboard/AnySoftKeyboardTools/blob/master/README.md)):
+    * `GenerateWordsListTask`
+    * `GenerateWordsListFromAOSPTask`
+    * `MergeWordsListTask`
+1. Change the README.md to reflect the characteristics of your pack
+1. Make some screenshots and replace the files in the `src/main/play/` folder. One of them should be a 1024x500 banner.
+1. If a branch of the language does not exist, [open an issue](https://github.com/AnySoftKeyboard/LanguagePack/issues/new) to request the creation of a new branch. As soon, as it is created, you can make a Pull Request from your forked branch to the one in the original repository. Provide translations of the following strings to your language:
+    * title: "LANGUAGE Language Pack"
+    * promo: "LANGUAGE language pack for AnySoftKeyboard"
+    * description: "AnySoftKeyboard keyboards pack:
+      LANGUAGE keyboard and dictionary.
+
+      This is an expansion pack for AnySoftKeyboard.
+      Install AnySoftKeyboard first, and then select the desired layout from AnySoftKeyboard's Settings->Keyboards menu."
+
+    When it is merged, it can take a couple of days, until it is also distributed via Play Store and F-Droid.

StoreStuff/feature_graphics.png

@@ -1,37 +1,76 @@
 import com.anysoftkeyboard.tools.generatewordslist.GenerateWordsListFromAOSPTask
+import com.anysoftkeyboard.tools.generatewordslist.GenerateWordsListTask
+import com.anysoftkeyboard.tools.generatewordslist.MergeWordsListTask
 import com.anysoftkeyboard.tools.makedictionary.MakeDictionaryTask
+import fr.avianey.androidsvgdrawable.gradle.SvgDrawableTask
+import net.evendanan.versiongenerator.generators.EnvBuildVersionGenerator
+import net.evendanan.versiongenerator.generators.GitBuildVersionGenerator
+import net.evendanan.versiongenerator.generators.StaticVersionGenerator
+
+System.setProperty("file.encoding", "UTF-8")
 
 buildscript {
     repositories {
+        google()
         jcenter()
+        mavenCentral()
         maven { url 'https://jitpack.io' }
+        maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.1.0-beta4'
 
-        classpath 'com.github.AnySoftKeyboard.AnySoftKeyboardTools:makedictionary:99bd3e6'
-        classpath 'com.github.AnySoftKeyboard.AnySoftKeyboardTools:generatewordslist:99bd3e6'
+        classpath 'com.github.AnySoftKeyboard.AnySoftKeyboardTools:makedictionary:287fe7812294918636359e4d28dbcbc931f3dab8'
+        classpath 'com.github.AnySoftKeyboard.AnySoftKeyboardTools:generatewordslist:287fe7812294918636359e4d28dbcbc931f3dab8'
+        //classpath files('english_dictionary/generatewordslist-1.0-SNAPSHOT.jar')
         classpath 'org.jsoup:jsoup:1.9.1'
+
+        classpath 'com.github.Triple-T:gradle-play-publisher:8cda31a5d0e3c4f2d7f47ffde6fc3b370e59dd8a'
+
+        classpath 'com.github.menny:GradleVersion:0.0.4'
+
+        classpath('fr.avianey.androidsvgdrawable:gradle-plugin:3.0.0') {
+            exclude group: 'xerces'
+        }
     }
 }
 
+apply plugin: 'checkstyle'
 apply plugin: 'com.android.application'
+apply plugin: 'com.github.triplet.play'
+apply plugin: 'net.evendanan.versiongenerator'
+apply plugin: "androidsvgdrawable"
+
+
+def generators = [
+    new EnvBuildVersionGenerator.CircleCi(0,0),
+    new GitBuildVersionGenerator(0,0),
+    new StaticVersionGenerator()
+]
+
+def versionData = versionGenerator.generateVersion(1, 0, 0, generators)
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         applicationId "com.anysoftkeyboard.languagepack.norwegian"
-        minSdkVersion 7
-        targetSdkVersion 25
-        versionCode 101
-        versionName "2.0.1"
+        minSdkVersion 9
+        targetSdkVersion 27
+        versionName versionData.versionName
+        versionCode versionData.versionCode
+
+        // change name of generated apk to make previews and testing of multiple packs easier
+        def packName = applicationId.substring(applicationId.lastIndexOf(".") + 1)
+        setProperty("archivesBaseName", "ASKLangPack-${packName}-${versionCode}")
+
+        println "Building ${applicationId} v${versionName}, version-code ${versionCode}..."
     }
 
     signingConfigs {
         release {
-            storeFile file("key.store")
+            storeFile file("/tmp/language_pack.keystore")
             storePassword System.getenv("PACK_KEYSTORE_PASSWORD")
             keyAlias System.getenv("PACK_KEYSTORE_ALIAS")
             keyPassword System.getenv("PACK_KEYSTORE_KEY_PASSWORD")
@@ -57,12 +96,26 @@ task parseAospForDictionary(type: GenerateWordsListFromAOSPTask) {
     maxWordsInList 300000
 }
 
-task makeDictionary(type: MakeDictionaryTask) {
-    doFirst {
-        mkdir 'src/main/res/raw'
-    }
+play {
+    track = 'alpha'
+    serviceAccountEmail = System.getenv("PUBLISH_APK_SERVICE_ACCOUNT_EMAIL")
+    pk12File = file('/tmp/apk_upload_key.p12')
+    uploadImages = true
+}
+
+task mergeAllWordLists(type: MergeWordsListTask) {
     dependsOn parseAospForDictionary
-    inputWordsListFile new File(project.getProjectDir(), "dictionary/words_from_aosp.xml")
+
+    inputWordsListFiles = [
+            new File(project.getProjectDir(), "dictionary/words_from_aosp.xml"),
+    ] as File[]
+    outputWordsListFile new File(project.getProjectDir(), "dictionary/words_merged.xml")
+    maxWordsInList 300000
+}
+
+task makeDictionary(type: MakeDictionaryTask) {
+    dependsOn mergeAllWordLists
+    inputWordsListFile new File(project.getProjectDir(), "dictionary/words_merged.xml")
 }
 
 afterEvaluate { proj ->
@@ -75,9 +128,58 @@ afterEvaluate { proj ->
 
 dependencies {
     repositories {
+        google()
         jcenter()
         maven { url "https://jitpack.io" }
     }
-    compile 'com.github.AnySoftKeyboard:AnySoftKeyboard-API:1.7.0'
+    api 'com.github.AnySoftKeyboard:AnySoftKeyboard-API:1.10.0'
+}
+
+task checkstyle(type: Checkstyle) {
+    configFile file("${projectDir}/checkstyle/checkstyle.xml")
+    source 'src'
+    classpath = files()
+}
+
+// create app icon in all necessary sizes, automatically adding flag
+task svgToDrawablePng(type: SvgDrawableTask) {
+    // specify where to pick SVG from
+    from = files('src/main/svg-png/dummy')
+    // specify the android res folder
+    to = file('src/main/res')
+    // create qualified directories if missing
+    createMissingDirectories = true
+    // override files only if necessary
+    overwriteMode = 'ifModified'
+    // generate PNGs for the following densities
+    targetedDensities = ['ldpi', 'hdpi', 'mdpi', 'xhdpi', 'xxhdpi', 'xxxhdpi']
+
+    outputFormat = 'PNG'
+    outputType = 'mipmap'
+
+    // composition of SVGs
+    svgMaskFiles = files('src/main/svg-png/mask-launcher')
+    svgMaskResourceFiles = files('src/main/svg-png/flag')
 }
 
+// create app icon in all necessary sizes, automatically adding flag
+task svgToDrawablePngPlay(type: SvgDrawableTask) {
+    // specify where to pick SVG from
+    from = files('src/main/svg-png/dummy')
+    // specify the android res folder
+    to = file('src/main/play/en-US/listing/icon')
+    // create qualified directories if missing
+    createMissingDirectories = true
+    // override files only if necessary
+    overwriteMode = 'ifModified'
+
+    outputFormat = 'PNG'
+    outputType = 'raw'
+
+    // composition of SVGs
+    svgMaskFiles = files('src/main/svg-png/mask-play')
+    svgMaskResourceFiles = files('src/main/svg-png/flag')
+    doLast {
+        file('src/main/play/en-US/listing/icon/logo_launcher.png').renameTo(file('src/main/play/en-US/listing/icon/ask_logo.png'))
+    }
+}