aboutsummaryrefslogtreecommitdiffstats
path: root/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'main/res')
-rw-r--r--main/res/layout/caches_images.xml15
-rw-r--r--main/res/layout/spoilers.xml39
-rw-r--r--main/res/values-de/strings.xml3
-rw-r--r--main/res/values/strings.xml5
4 files changed, 39 insertions, 23 deletions
diff --git a/main/res/layout/caches_images.xml b/main/res/layout/caches_images.xml
new file mode 100644
index 0000000..2360dd0
--- /dev/null
+++ b/main/res/layout/caches_images.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical"
+ android:padding="4dip" >
+
+ <LinearLayout
+ android:id="@+id/spoiler_list"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical" >
+ </LinearLayout>
+
+</ScrollView> \ No newline at end of file
diff --git a/main/res/layout/spoilers.xml b/main/res/layout/spoilers.xml
index ef6bb39..233972a 100644
--- a/main/res/layout/spoilers.xml
+++ b/main/res/layout/spoilers.xml
@@ -1,24 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:orientation="vertical"
- android:background="?background_color" >
- <LinearLayout style="@style/action_bar">
- <ImageView style="@style/action_bar_action"
- android:onClick="goHome" />
- <View style="@style/action_bar_separator" />
- <TextView style="@style/action_bar_title" />
- </LinearLayout>
- <ScrollView
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:padding="4dip"
- android:orientation="vertical" >
- <LinearLayout android:id="@+id/spoiler_list"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
- </LinearLayout>
- </ScrollView>
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:background="?background_color"
+ android:orientation="vertical" >
+
+ <LinearLayout style="@style/action_bar" >
+
+ <ImageView
+ style="@style/action_bar_action"
+ android:onClick="goHome" />
+
+ <View style="@style/action_bar_separator" />
+
+ <TextView style="@style/action_bar_title" />
+ </LinearLayout>
+
+ <include layout="@layout/caches_images" />
+
</LinearLayout> \ No newline at end of file
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 9501763..ffa5fa7 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -527,7 +527,8 @@
<string name="cache_favpoint_not_on">Dieser Cache ist kein Favorit.</string>
<string name="cache_favpoint_add">Hinzufügen</string>
<string name="cache_favpoint_remove">Entfernen</string>
-
+ <string name="cache_images">Bilder</string>
+
<string name="cache_waypoints">Wegpunkte</string>
<plurals name="waypoints">
<item quantity="one">1 Wegpunkt</item>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 64ffe97..45c09de 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -537,7 +537,8 @@
<string name="cache_favpoint_not_on">This cache is not one of your favorites.</string>
<string name="cache_favpoint_add">Add</string>
<string name="cache_favpoint_remove">Remove</string>
-
+ <string name="cache_images">Images</string>
+
<string name="cache_waypoints">Waypoints</string>
<plurals name="waypoints">
<item quantity="one">1 Waypoint</item>
@@ -614,6 +615,8 @@
<string name="cache_coordinates_original">Original Coordinates</string>
<string name="cache_spoiler_images_title">Spoiler images</string>
<string name="cache_spoiler_images_loading">Loading spoiler images…</string>
+ <string name="cache_images_title">Images</string>
+ <string name="cache_images_loading">Loading images…</string>
<string name="cache_log_types">Log types</string>
<string name="cache_coordinates_no">This cache has no coordinates.</string>
<string name="cache_export_fieldnote">Export as Field Notes</string>