From 60171130baf711b619668d773aa1ba6a1f02a025 Mon Sep 17 00:00:00 2001
From: Michael Keppler <bananeweizen@gmx.de>
Date: Sun, 22 Dec 2013 23:12:50 +0100
Subject: build: have only one resource file with keys

---
 README.md                     | 11 +++++------
 main/res/values/.gitignore    |  1 +
 main/templates/keys.xml       | 13 +++++++++++++
 main/templates/mapsapikey.xml |  4 ----
 main/templates/ocde_okapi.xml |  5 -----
 main/templates/ocpl_okapi.xml |  5 -----
 6 files changed, 19 insertions(+), 20 deletions(-)
 create mode 100644 main/templates/keys.xml
 delete mode 100644 main/templates/mapsapikey.xml
 delete mode 100644 main/templates/ocde_okapi.xml
 delete mode 100644 main/templates/ocpl_okapi.xml

diff --git a/README.md b/README.md
index 37e40ca..14c07f5 100644
--- a/README.md
+++ b/README.md
@@ -51,12 +51,11 @@ If the workspace directory name contains a space and leads to errors in the -dex
 3. copy `./main/templates/local.properties` to `./main/`
 4. copy `./main/templates/local.properties` to `./tests/`
 5. edit `local.properties` (see comments in the file)
-6. copy `./main/templates/mapsapikey.xml` to `./main/res/values/`
-7. edit `./main/res/values/mapsapikey.xml` and insert your Maps API key (see comments in the file)
-8. copy `./main/templates/ocde_okapi.xml` to `./main/res/values/`
-9. request your personal ConsumerKey and -Secret at [opencaching.de OKAPI signup](http://www.opencaching.de/okapi/signup.html)
-10. edit `./main/res/values/ocde_okapi.xml` and insert your keys there.
-11. Repeat steps 8-10 with `ocpl_okapi.xml` and [opencaching.pl OKAPI signup](http://www.opencaching.pl/okapi/signup.html)
+6. copy `./main/templates/keys.xml` to `./main/res/values/`
+7. edit `./main/res/values/keys.xml` and insert several keys (see comments in the file)
+7.a) Google Maps API key 
+7.b) request your personal consumer key and secret at [opencaching.de OKAPI signup](http://www.opencaching.de/okapi/signup.html)
+7.c) request your personal consumer key and secret at [opencaching.pl OKAPI signup](http://www.opencaching.pl/okapi/signup.html)
 
 ### Building with Ant ###
 
diff --git a/main/res/values/.gitignore b/main/res/values/.gitignore
index ade2b6e..891c98f 100644
--- a/main/res/values/.gitignore
+++ b/main/res/values/.gitignore
@@ -1,2 +1,3 @@
 /ocde_okapi.xml
 /ocpl_okapi.xml
+/keys.xml
\ No newline at end of file
diff --git a/main/templates/keys.xml b/main/templates/keys.xml
new file mode 100644
index 0000000..e667df5
--- /dev/null
+++ b/main/templates/keys.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <!-- Google Maps -->
+    <string name="maps_api_key" translatable="false">@maps.api.key@</string>
+
+    <!-- Opencaching.de -->
+    <string name="oc_de_okapi_consumer_key" translatable="false">@ocde.okapi.consumer.key@</string>
+    <string name="oc_de_okapi_consumer_secret" translatable="false">@ocde.okapi.consumer.secret@</string>
+
+    <!-- Opencaching.pl -->
+    <string name="oc_pl_okapi_consumer_key" translatable="false">@ocpl.okapi.consumer.key@</string>
+    <string name="oc_pl_okapi_consumer_secret" translatable="false">@ocpl.okapi.consumer.secret@</string>
+</resources>
diff --git a/main/templates/mapsapikey.xml b/main/templates/mapsapikey.xml
deleted file mode 100644
index 3655b5e..0000000
--- a/main/templates/mapsapikey.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-    <string name="maps_api_key" translatable="false">@maps.api.key@</string>
-</resources>
diff --git a/main/templates/ocde_okapi.xml b/main/templates/ocde_okapi.xml
deleted file mode 100644
index 9ca39b3..0000000
--- a/main/templates/ocde_okapi.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-    <string name="oc_de_okapi_consumer_key" translatable="false">@ocde.okapi.consumer.key@</string>
-    <string name="oc_de_okapi_consumer_secret" translatable="false">@ocde.okapi.consumer.secret@</string>
-</resources>
diff --git a/main/templates/ocpl_okapi.xml b/main/templates/ocpl_okapi.xml
deleted file mode 100644
index 6903ce7..0000000
--- a/main/templates/ocpl_okapi.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-    <string name="oc_pl_okapi_consumer_key" translatable="false">@ocpl.okapi.consumer.key@</string>
-    <string name="oc_pl_okapi_consumer_secret" translatable="false">@ocpl.okapi.consumer.secret@</string>
-</resources>
-- 
cgit v1.1