Implements #1676, custom themes

- Adds the selection of a base folder for map themes to settings
- Reworks the map menu to allow selection of a custom theme
- Implements a reusable version of listDir to get a list of files

3 files changed, 48 insertions, 7 deletions

diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml
index d0617fe..c2887e3 100644
--- a/main/res/layout/init.xml
+++ b/main/res/layout/init.xml
@@ -709,6 +709,31 @@
 						android:scrollHorizontally="true"
 						android:inputType="textNoSuggestions" />
 			</LinearLayout>
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="left"
+                    android:padding="3dip"
+                    android:textSize="14dip"
+                    android:textColor="?text_color"
+                    android:text="@string/init_rendertheme_folder" />
+			<LinearLayout
+					android:id="@+id/init_themefilegroup"
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:orientation="horizontal" >
+				<Button style="@style/button_full"
+						android:id="@+id/select_themefolder"
+						android:text="@string/init_select_themefolder"
+						android:layout_width="wrap_content" />
+				<EditText style="@style/edittext_full"
+						android:id="@+id/themefolder"
+						android:singleLine="true"
+						android:lines="1"
+						android:scrollHorizontally="true"
+						android:inputType="textNoSuggestions" />
+			</LinearLayout>
 <!-- ** -->
 			<RelativeLayout style="@style/separator_horizontal_layout" >
 				<View style="@style/separator_horizontal" />
@@ -818,7 +843,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentLeft="true"
 					android:layout_gravity="left"
 					android:padding="3dip"
 					android:textSize="14dip"
@@ -836,7 +860,6 @@
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
 					android:layout_marginBottom="5dip"
-					android:layout_alignParentLeft="true"
 					android:layout_gravity="left"
 					android:padding="3dip"
 					android:textSize="14dip"
@@ -871,11 +894,11 @@
 					android:id="@+id/webDeviceName"
 					android:singleLine="true"
 					android:lines="1"
-                    android:maxLength="15"
+					android:maxLength="15"
 					android:scrollHorizontally="true"
 					android:inputType="textNoSuggestions" />
 			<TextView
-                                        android:layout_width="wrap_content"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginLeft="10dip"
 					android:layout_marginRight="10dip"
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index cf21e28..a1f54a1 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -224,8 +224,9 @@
   <string name="warn_load_images">c:geo konnte die Bilder nicht laden.</string>
   <string name="warn_invalid_mapfile">Die gewählte Datei ist keine gültige Mapsforge-Karte in der Version 0.3.0.\nOffline Karte ist nicht verfügbar.</string>
   <string name="warn_deprecated_mapfile">Es wird eine veraltete Offline-Karte v0.2.4 verwendet.\nBitte zukünftig Offline-Karten in der Version 0.3.0 verwenden.\nDer Support für die alte Version wird im nächsten Release eingestellt.</string>
-    <string name="warn_nonexistant_mapfile">Die gewählte Datei existiert nicht.\nOffline Karte ist nicht verfügbar.</string>
-
+  <string name="warn_nonexistant_mapfile">Die gewählte Datei existiert nicht.\nOffline Karte ist nicht verfügbar.</string>
+  <string name="warn_rendertheme_missing">Das gewählte Karten-Theme wurde nicht gefunden.</string>
+  
   <string name="info_log_posted">Log erfolgreich gesendet.</string>
   <string name="info_log_saved">Log erfolgreich gespeichert.</string>
   <string name="info_log_cleared">Log wurde geleert.</string>
@@ -427,6 +428,7 @@
   <string name="init_mapsources_description">Hier kann die Quelle der benutzen Karte gewählt werden. Alternativ zu Google Maps stehen verschiedene OpenStreetMap-Stile zur Verfügung und daneben auch Karten-Dateien für die Offline-Nutzung (siehe http://code.google.com/p/mapsforge/ für die Details).</string>
   <string name="init_mapsource_select">Kartenquelle wählen</string>
   <string name="init_select_mapfile">…</string>
+  <string name="init_select_themefolder">…</string>
   <string name="init_select_gpx_exportdir">…</string>
   <string name="init_select_gpx_importdir">…</string>
   <string name="init_gpx_exportdir">Verzeichnis für GPX-Exporte</string>
@@ -457,6 +459,7 @@
   <string name="init_dbmove_failed">Fehler beim Verschieben der Datenbank.</string>
   <string name="init_plain_logs">Logeinträge ohne Farben anzeigen</string>
   <string name="init_use_native_ua">Als Android Browser identifizieren. Löst Login-Probleme einiger Netzanbieter.</string>
+  <string name="init_rendertheme_folder">Wähle den Basisordner für offline Karten Themes</string>
   
   <!-- map sources -->
   <string name="map_source_google_map">Google: Karte</string>
@@ -653,6 +656,9 @@
   <!-- map file select -->
   <string name="map_file_select_title">Kartendatei wählen</string>
 
+  <!-- theme file select -->
+  <string name="theme_file_select_title">Karten-Theme wählen</string>
+
   <!--  import -->
   <string name="import_title">Importiere…</string>
   <string name="web_import_title">Aus dem Internet importieren</string>
@@ -706,10 +712,13 @@
   <string name="map_map">Karte</string>
   <string name="map_live">Live-Karte</string>
   <string name="map_view_map">Karte</string>
+  <string name="map_modes">Karteneinstellungen</string>
   <string name="map_trail_show">Spur einblenden</string>
   <string name="map_trail_hide">Spur ausblenden</string>
   <string name="map_circles_show">Kreise anzeigen</string>
   <string name="map_circles_hide">Kreise verbergen</string>
+  <string name="map_theme_builtin">Eingebaute Kartendarstellung</string>
+  <string name="map_theme_select">Kartendarstellung wählen</string>
   <string name="map_live_enable">Aktualisierung einschalten</string>
   <string name="map_live_disable">Aktualisierung ausschalten</string>
   <string name="map_static_title">Statische Karte</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index a61918a..2e48af3 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -224,7 +224,8 @@
   <string name="warn_load_images">c:geo failed to load images.</string>
   <string name="warn_invalid_mapfile">The selected map file is not a valid mapsforge version 0.3.0 map file.\nOffline maps are not available.</string>
   <string name="warn_deprecated_mapfile">You are using a deprecated version 0.2.4 map file.\nConsider switching to a version 0.3.0 map.\nWe will drop support for version 0.2.4 in the next release.</string>
-   <string name="warn_nonexistant_mapfile">The selected map file does not exist.\nOffline maps are not available.</string>
+  <string name="warn_nonexistant_mapfile">The selected map file does not exist.\nOffline maps are not available.</string>
+  <string name="warn_rendertheme_missing">Map theme not found.</string>
 
 
   <string name="info_log_posted">c:geo successfully submitted the log.</string>
@@ -428,6 +429,7 @@
   <string name="init_mapsources_description">Here you can select the source for your maps. As an alternative to Google maps various OpenStreetMap styles are available and even offline map files (See <a href="http://code.google.com/p/mapsforge/">http://code.google.com/p/mapsforge/</a> for details).</string>
   <string name="init_mapsource_select">Select Map Source</string>
   <string name="init_select_mapfile">…</string>
+  <string name="init_select_themefolder">…</string>
   <string name="init_select_gpx_exportdir">…</string>
   <string name="init_select_gpx_importdir">…</string>
   <string name="init_gpx_exportdir">GPX Export Directory</string>
@@ -458,6 +460,7 @@
   <string name="init_dbmove_failed">Failed to move database</string>
   <string name="init_plain_logs">Display log entries without colors</string>
   <string name="init_use_native_ua">Identify as Android browser. Solves login problems of some network providers.</string>
+  <string name="init_rendertheme_folder">Select base folder for custom off-line map themes</string>
   
   <!-- map sources -->
   <string-array name="map_sources">
@@ -666,6 +669,9 @@
   <!-- map file select -->
   <string name="map_file_select_title">Select map file</string>
 
+  <!-- theme file select -->
+  <string name="theme_file_select_title">Select custom map theme file</string>
+
   <!--  import -->
   <string name="import_title">Import…</string>
   <string name="web_import_title">Import from web</string>
@@ -732,10 +738,13 @@
   <string name="map_map">Map</string>
   <string name="map_live">Live map</string>
   <string name="map_view_map">Map view</string>
+  <string name="map_modes">Map modes</string>
   <string name="map_trail_show">Show trail</string>
   <string name="map_trail_hide">Hide trail</string>
   <string name="map_circles_show">Show circles</string>
   <string name="map_circles_hide">Hide circles</string>
+  <string name="map_theme_builtin">Builtin map theme</string>
+  <string name="map_theme_select">Select map theme</string>
   <string name="map_live_enable">Enable live</string>
   <string name="map_live_disable">Disable live</string>
   <string name="map_static_title">Static maps</string>