From 4decbe1cf829f7e45e0dad5f74b372c20b5305db Mon Sep 17 00:00:00 2001
From: Dmitry Kunin <dkunin@mapswithme.com>
Date: Mon, 14 Oct 2013 11:34:46 +0200
Subject: [PATCH 1/2] [build] Use icons in Android pipeline.

---
 android/gradle.properties     |  2 +-
 builder/wikivoyage/makeapk.sh | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/android/gradle.properties b/android/gradle.properties
index 720d81c..b3e03ed 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,4 +1,4 @@
-GWMvc=3
+GWMvc=4
 GWMvn=1.0.2
 GWMpn=com.guidewithme.any
 GWMapk=Any_Guide_With_Me
diff --git a/builder/wikivoyage/makeapk.sh b/builder/wikivoyage/makeapk.sh
index 0b8a680..5203edd 100644
--- a/builder/wikivoyage/makeapk.sh
+++ b/builder/wikivoyage/makeapk.sh
@@ -4,9 +4,20 @@ set -e -u
 
 cat countries_to_generate.txt | while read country; do
 
+    # copy index
     rm ../../android/assets/index.dat || echo "No previous index found."
     cp -f Countries/$country/index.dat ../../android/assets/
 
+    # copy resources
+    toCopy=(drawable-ldpi drawable-mdpi drawable-hdpi \
+	    drawable-xhdpi drawable-xxhdpi)
+
+    for resDir in ${toCopy[*]}
+    do
+	cp -f ../../android/icons/$country/$resDir/* ../../android/res/$resDir
+	echo "Copied $resDir for $country"
+    done
+
     rm  ../../android/build/apk/* || true
     rm Countries/$country/*.apk || true
 

From bcf8c320913fdff1364cfb760030ed3c1f128f2f Mon Sep 17 00:00:00 2001
From: Dmitry Kunin <dkunin@mapswithme.com>
Date: Mon, 14 Oct 2013 12:00:13 +0200
Subject: [PATCH 2/2] [cr] Fixes.

---
 android/gradle.properties     |  2 +-
 builder/wikivoyage/makeapk.sh | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/gradle.properties b/android/gradle.properties
index b3e03ed..11a3dac 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
 GWMvc=4
-GWMvn=1.0.2
+GWMvn=1.2
 GWMpn=com.guidewithme.any
 GWMapk=Any_Guide_With_Me
 GWMappName=Any Guide With Me
diff --git a/builder/wikivoyage/makeapk.sh b/builder/wikivoyage/makeapk.sh
index 5203edd..43e6cba 100644
--- a/builder/wikivoyage/makeapk.sh
+++ b/builder/wikivoyage/makeapk.sh
@@ -10,12 +10,12 @@ cat countries_to_generate.txt | while read country; do
 
     # copy resources
     toCopy=(drawable-ldpi drawable-mdpi drawable-hdpi \
-	    drawable-xhdpi drawable-xxhdpi)
+        drawable-xhdpi drawable-xxhdpi)
 
     for resDir in ${toCopy[*]}
     do
-	cp -f ../../android/icons/$country/$resDir/* ../../android/res/$resDir
-	echo "Copied $resDir for $country"
+        cp -f ../../android/icons/$country/$resDir/* ../../android/res/$resDir
+        echo "Copied $resDir for $country"
     done
 
     rm  ../../android/build/apk/* || true
@@ -23,7 +23,7 @@ cat countries_to_generate.txt | while read country; do
 
     # make packages lower case and dot-separated
     PACKAGE="com.guidewithme."$(echo "$country" | tr '[:upper:]' '[:lower:]' | \
-	     sed 's/_/\./g')
+        sed 's/_/\./g')
 
     # hack for UK
     if [[ "$PACKAGE" == *united.kingdom ]]
@@ -36,7 +36,7 @@ cat countries_to_generate.txt | while read country; do
 
     pushd ../../android/
     ./gradlew "-PGWMpn=$PACKAGE" "-PGWMapk=Guide With Me $country" \
-	      "-PGWMappName=$TITLE Guide With Me" clean assembleRelease
+        "-PGWMappName=$TITLE Guide With Me" clean assembleRelease
     popd
 
     cp  ../../android/build/apk/* Countries/$country/