Merge remote-tracking branch 'origin/master'

OsmAnd/.gitignore

@@ -1,5 +1,6 @@
 bin/
 dist/
+res/values/no_translate.xml
 assets/specialphrases/*
 assets/voice/*
 gen/

OsmAnd/build.gradle

@@ -1,23 +1,26 @@
 apply plugin: 'com.android.application'
 
+// Global Paramers accepted
+// APK_NUMBER_VERSION - version number of apk
+// APK_VERSION - version name like 2.1 (subsitute of app_version in no_translate.xml)
+// APP_NAME - app name
+// APP_EDITION - used for build numbers
+// APP_FEATURES - features +play_market +gps_status -parking_plugin -blackberry -free_version -amazon
+    
+
 // TODO
-// 0. Update! OsmAndCore_wrapper for build ()
+// 0. Update OsmAndCore_wrapper for build (implement )
-// 1. no_translate.xml (versionFeatures, app.edition, build.version  )
+// 1. Filter fonts
-//    <condition>
-//                <isset property="versionFeatures" />
-//            </condition>
-//            <then>
-//                <replaceregexp file="res/values/no_translate.xml" match='versionFeatures"&gt;(.*)&lt;  
-//                replace='versionFeatures"&gt;${versionFeatures}&lt;' byline="true" />
-// 2. Filter fonts
 // <unzip src="OsmAndCore_android.aar" dest=".">
 //            <patternset>
 //                <include name="assets/**/map/fonts/OpenSans/*"/>
 //                <include name="assets/**/map/fonts/NotoSans/*"/>
 //            </patternset>
 //        </unzip>
-// 3. fix_apostrophe_issues (replace match="[^=]([^\\])'" replace="\1\\\\'") res/**/strings.xml
+// 2. fix_apostrophe_issues (replace match="[^=]([^\\])'" replace="\1\\\\'") res/**/strings.xml
-// 4. sherpafy/free/paid
+// 3. sherpafy/free/paid
+// 4. Release signature
+// 5. APP_NAME, APP_EDITION uses flavor
 
 android {
     compileSdkVersion 21
@@ -71,17 +74,18 @@ android {
             aidl.srcDirs = ["src"]
             java.srcDirs = [
                     "src",
-                    fileTree(dir: "../OsmAnd-java/src", exclude: "**/PlatformUtil.java"),
+                    fileTree(dir: "../OsmAnd-java/src", exclude: "**/PlatformUtil.java")
-                    "resourcesSrc"
+              //      "resourcesSrc"
             ]
             resources.srcDirs = [
-                    "src",
+                    "src"
-                    "../OsmAnd-java/src",
+             //      "../OsmAnd-java/src"    
-                    "resourcesSrc"
+             //       "resourcesSrc"
             ]
             renderscript.srcDirs = ["src"]
             res.srcDirs = [
-                "res"                    
+                'res'
+
             ]
             assets.srcDirs = [
                 'assets'
@@ -155,44 +159,42 @@ android {
             signingConfig signingConfigs.publishing
         }
 
-
     }
 }
 
+def replaceNoTranslate(line) {
+    if(line.contains("\"app_name\"") && System.getenv("APP_NAME")) {
+        return line.replaceAll(">[^<]*<", " >"+System.getenv("APP_NAME")+"<")
+    }
+    if(line.contains("\"app_edition\"") && System.getenv("APP_EDITION")) {
+        return line.replaceAll(">[^<]*<", " >"+System.getenv("APP_EDITION")+"<")
+    }
+    if(line.contains("\"versionFeatures\"") && System.getenv("APP_FEATURES")) {
+        return line.replaceAll(">[^<]*<", " >"+System.getenv("APP_FEATURES")+"<")
+    }
+    return line;
+}
+
+task updateNoTranslate(type: Copy) {
+    from('.') {
+        include 'no_translate.xml'
+        filter {
+            line -> replaceNoTranslate(line);
+        }
+    }
+    into 'res/values/'
+}
+
 task collectVoiceAssets(type: Sync) {
     from "../../resources/voice"
     into "assets/voice"
-    include "voice/**/*.p"
+    include "**/*.p"
 }
 
 task collectSpecialPhrasesAssets(type: Sync) {
-    from "../../resources/voice"
+    from "../../resources/specialphrases"
     into "assets/specialphrases"
-    include "specialphrases/*.txt"
+    include "*.txt"
-}
-
-task collectRoutingResources(type: Sync) {
-    from "../../resources/routing"
-    into "resourcesSrc/net/osmand/router"
-    include "*.xml"
-}
-
-task collectRenderingStylesResources(type: Sync) {
-    from "../../resources/rendering_styles"
-    into "resourcesSrc/net/osmand/render"
-    include "*.xml"
-}
-
-task copyStyleIcons(type: Copy) {
-    from "../../resources/rendering_styles/style-icons/"
-    into "res/"
-    include "**/*.png"
-}
-
-task collectRegionsInfoResources(type: Copy) {
-    from "../../resources/countries-info"
-    into "resourcesSrc/net/osmand/map"
-    include "regions.ocbf"
 }
 
 task collectHelpContentsAssets(type: Sync) {
@@ -206,17 +208,44 @@ task collectHelpContentsAssets(type: Sync) {
     include "style.css"
 }
 
+task collectRoutingResources(type: Sync) {
+    from "../../resources/routing"
+    into "src/net/osmand/router"
+    include "*.xml"
+}
+
+
 task collectMiscResources(type: Copy) {
-    into "resourcesSrc/net/osmand/osm"
+    into "src/net/osmand/osm"
     from("../../resources/obf_creation") {
         include "rendering_types.xml"
     }
     from("../../resources/poi") {
         include "poi_types.xml"
     }   
-    
 }
 
+task collectRenderingStylesResources(type: Sync) {
+    from "../../resources/rendering_styles"
+    into "src/net/osmand/render"
+    include "*.xml"
+}
+
+
+task collectRegionsInfoResources(type: Copy) {
+    from "../../resources/countries-info"
+    into "src/net/osmand/map"
+    include "regions.ocbf"
+}
+
+
+task copyStyleIcons(type: Copy) {
+    from "../../resources/rendering_styles/style-icons/"
+    into "res/"
+    include "**/*.png"
+}
+
+
 task collectExternalResources << {}
 collectExternalResources.dependsOn collectVoiceAssets,
         collectSpecialPhrasesAssets,
@@ -225,12 +254,14 @@ collectExternalResources.dependsOn collectVoiceAssets,
         collectRenderingStylesResources,
         collectRegionsInfoResources,
         collectMiscResources,
-        copyStyleIcons
+        copyStyleIcons,
+        updateNoTranslate
 
 tasks.withType(JavaCompile) {
     compileTask -> compileTask.dependsOn << collectExternalResources
 }
 
+
 task downloadAAR {
     def f = new File("libs/OsmAndCore_wrapper.jar")
     if (!f.exists()) {

OsmAnd/no_translate.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">OsmAnd~</string>
-    <string name="app_name_ver">OsmAnd 2.0.0</string>
     <string name="app_version">2.0.0</string>
     <!--
     Note: For our dev build apk's, the above "app_version" is provided (via osmand/build.xml) as the base version prefix to our build number in the format: