refactoring: unify the action bar layout

41 files changed, 171 insertions, 424 deletions

diff --git a/main/res/layout-land/coords.xml b/main/res/layout-land/coords.xml
index 1388187..30cc6b5 100644
--- a/main/res/layout-land/coords.xml
+++ b/main/res/layout-land/coords.xml
@@ -11,12 +11,7 @@
             style="@style/action_bar_title"
             android:text="@string/cache_coordinates" />
 
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            android:id="@+id/actionBarManualbutton"
-            style="@style/action_bar_action"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/layout-land/navigate.xml b/main/res/layout-land/navigate.xml
index aa8b2b4..d2f39b1 100644
--- a/main/res/layout-land/navigate.xml
+++ b/main/res/layout-land/navigate.xml
@@ -5,23 +5,7 @@
     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" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
-    </LinearLayout>
+    <include layout="@layout/actionbar_with_manual" />
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/about_activity.xml b/main/res/layout/about_activity.xml
index 9325ea0..b0de7ea 100644
--- a/main/res/layout/about_activity.xml
+++ b/main/res/layout/about_activity.xml
@@ -5,16 +5,7 @@
     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/actionbar"/>
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/actionbar.xml b/main/res/layout/actionbar.xml
new file mode 100644
index 0000000..9a3efa0
--- /dev/null
+++ b/main/res/layout/actionbar.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/action_bar" >
+
+    <include layout="@layout/actionbar_title"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_button_compass.xml b/main/res/layout/actionbar_button_compass.xml
new file mode 100644
index 0000000..932444b
--- /dev/null
+++ b/main/res/layout/actionbar_button_compass.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <View style="@style/action_bar_separator" />
+
+    <ImageView
+        android:id="@+id/defaultNavigation"
+        style="@style/action_bar_action"
+        android:longClickable="true"
+        android:onClick="goDefaultNavigation"
+        android:src="@drawable/actionbar_compass_dark" />
+
+</merge>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_button_manual.xml b/main/res/layout/actionbar_button_manual.xml
new file mode 100644
index 0000000..86965f1
--- /dev/null
+++ b/main/res/layout/actionbar_button_manual.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <View style="@style/action_bar_separator" />
+
+    <ImageView
+        android:id="@+id/action_bar_manual"
+        style="@style/action_bar_action"
+        android:onClick="goManual"
+        android:src="@drawable/actionbar_manual" />
+
+</merge>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_button_map.xml b/main/res/layout/actionbar_button_map.xml
new file mode 100644
index 0000000..9b2138a
--- /dev/null
+++ b/main/res/layout/actionbar_button_map.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <View style="@style/action_bar_separator" />
+
+    <ImageView
+        style="@style/action_bar_action"
+        android:onClick="goMap"
+        android:src="@drawable/actionbar_map" />
+
+</merge>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_button_myposition.xml b/main/res/layout/actionbar_button_myposition.xml
new file mode 100644
index 0000000..3604345
--- /dev/null
+++ b/main/res/layout/actionbar_button_myposition.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+        <View style="@style/action_bar_separator" />
+
+        <ImageSwitcher
+            android:id="@+id/my_position"
+            style="@style/action_bar_action" />
+
+</merge>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_button_search.xml b/main/res/layout/actionbar_button_search.xml
new file mode 100644
index 0000000..2aa1a50
--- /dev/null
+++ b/main/res/layout/actionbar_button_search.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <View style="@style/action_bar_separator" />
+
+    <ImageView
+        style="@style/action_bar_action"
+        android:onClick="goSearch"
+        android:src="@drawable/actionbar_search" />
+
+</merge>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_progress.xml b/main/res/layout/actionbar_progress.xml
new file mode 100644
index 0000000..a39d103
--- /dev/null
+++ b/main/res/layout/actionbar_progress.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/action_bar_progress"
+    android:visibility="gone" android:id="@+id/actionbar_progress"/>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_title.xml b/main/res/layout/actionbar_title.xml
new file mode 100644
index 0000000..4fa5348
--- /dev/null
+++ b/main/res/layout/actionbar_title.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <ImageView
+        style="@style/action_bar_action"
+        android:onClick="goHome" />
+
+    <View style="@style/action_bar_separator" />
+
+    <TextView
+        android:id="@+id/actionbar_title"
+        style="@style/action_bar_title" />
+
+</merge>
\ No newline at end of file
diff --git a/main/res/layout/actionbar_with_manual.xml b/main/res/layout/actionbar_with_manual.xml
new file mode 100644
index 0000000..d56c14e
--- /dev/null
+++ b/main/res/layout/actionbar_with_manual.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/action_bar" >
+
+    <include layout="@layout/actionbar_title"/>
+
+    <include layout="@layout/actionbar_button_manual"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/addresses.xml b/main/res/layout/addresses.xml
index 2be131d..08f5bc1 100644
--- a/main/res/layout/addresses.xml
+++ b/main/res/layout/addresses.xml
@@ -4,16 +4,7 @@
     android:layout_height="fill_parent"
     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/actionbar"/>
 
     <ListView
         android:id="@android:id/list"
diff --git a/main/res/layout/caches.xml b/main/res/layout/caches.xml
index 147a596..dea9357 100644
--- a/main/res/layout/caches.xml
+++ b/main/res/layout/caches.xml
@@ -6,34 +6,13 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
+        <include layout="@layout/actionbar_title" />
+        
+        <include layout="@layout/actionbar_progress" />
+        
+        <include layout="@layout/actionbar_button_map" />
 
-        <View style="@style/action_bar_separator" />
-
-        <TextView
-            style="@style/action_bar_title"
-            android:clickable="true"
-            android:onClick="selectList" />
-
-        <ProgressBar
-            style="@style/action_bar_progress"
-            android:visibility="gone" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goMap"
-            android:src="@drawable/actionbar_map" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_manual" />
     </LinearLayout>
 
     <include layout="@layout/filter_bar" />
diff --git a/main/res/layout/cacheview.xml b/main/res/layout/cacheview.xml
index 89d7152..ec30672 100644
--- a/main/res/layout/cacheview.xml
+++ b/main/res/layout/cacheview.xml
@@ -8,29 +8,11 @@
 

     <LinearLayout style="@style/action_bar" >

 

-        <ImageView

-            style="@style/action_bar_action"

-            android:onClick="goHome" />

+        <include layout="@layout/actionbar_title" />

 

-        <View style="@style/action_bar_separator" />

+        <include layout="@layout/actionbar_button_compass" />

 

-        <TextView style="@style/action_bar_title" />

-

-        <View style="@style/action_bar_separator" />

-

-        <ImageView

-            android:id="@+id/defaultNavigation"

-            style="@style/action_bar_action"

-            android:longClickable="true"

-            android:onClick="startDefaultNavigation"

-            android:src="@drawable/actionbar_compass_dark" />

-

-        <View style="@style/action_bar_separator" />

-

-        <ImageView

-            style="@style/action_bar_action"

-            android:onClick="goManual"

-            android:src="@drawable/actionbar_manual" />

+        <include layout="@layout/actionbar_button_manual" />

     </LinearLayout>

 

     <android.support.v4.view.ViewPager

diff --git a/main/res/layout/coords.xml b/main/res/layout/coords.xml
index ddb2f4e..229cffe 100644
--- a/main/res/layout/coords.xml
+++ b/main/res/layout/coords.xml
@@ -5,19 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical" >
 
-    <LinearLayout style="@style/action_bar" >
-
-        <TextView
-            style="@style/action_bar_title"
-            android:text="@string/cache_coordinates" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            android:id="@+id/actionBarManualbutton"
-            style="@style/action_bar_action"
-            android:src="@drawable/actionbar_manual" />
-    </LinearLayout>
+    <include layout="@layout/actionbar_with_manual"/>
 
     <ScrollView
         android:id="@+id/scroller"
diff --git a/main/res/layout/edit_waypoint_activity.xml b/main/res/layout/edit_waypoint_activity.xml
index 3fbd19e..c2751d1 100644
--- a/main/res/layout/edit_waypoint_activity.xml
+++ b/main/res/layout/edit_waypoint_activity.xml
@@ -5,23 +5,7 @@
     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" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
-    </LinearLayout>
+    <include layout="@layout/actionbar_with_manual"/>
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/gpx.xml b/main/res/layout/gpx.xml
index 2be131d..08f5bc1 100644
--- a/main/res/layout/gpx.xml
+++ b/main/res/layout/gpx.xml
@@ -4,16 +4,7 @@
     android:layout_height="fill_parent"
     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/actionbar"/>
 
     <ListView
         android:id="@android:id/list"
diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml
index 26137fc..c948629 100644
--- a/main/res/layout/init.xml
+++ b/main/res/layout/init.xml
@@ -5,23 +5,7 @@
     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" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
-    </LinearLayout>
+    <include layout="@layout/actionbar_with_manual" />
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/main.xml b/main/res/layout/main.xml
index 0f9aff0..e4aa9cc 100644
--- a/main/res/layout/main.xml
+++ b/main/res/layout/main.xml
@@ -13,19 +13,9 @@
 
         <TextView style="@style/action_bar_title" />
 
-        <View style="@style/action_bar_separator" />
+        <include layout="@layout/actionbar_button_search"/>
 
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goSearch"
-            android:src="@drawable/actionbar_search" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <fragment
diff --git a/main/res/layout/map_google.xml b/main/res/layout/map_google.xml
index 723b7157..7b116c9 100644
--- a/main/res/layout/map_google.xml
+++ b/main/res/layout/map_google.xml
@@ -6,30 +6,13 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
+        <include layout="@layout/actionbar_title"/>
 
-        <View style="@style/action_bar_separator" />
+        <include layout="@layout/actionbar_progress" />
 
-        <TextView style="@style/action_bar_title" />
-
-        <ProgressBar
-            style="@style/action_bar_progress"
-            android:visibility="gone" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageSwitcher
-            android:id="@+id/my_position"
-            style="@style/action_bar_action" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_myposition"/>
+        
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <include layout="@layout/filter_bar" />
diff --git a/main/res/layout/map_mapsforge.xml b/main/res/layout/map_mapsforge.xml
index f3b183e..27d6e0d 100644
--- a/main/res/layout/map_mapsforge.xml
+++ b/main/res/layout/map_mapsforge.xml
@@ -6,30 +6,13 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
+        <include layout="@layout/actionbar_title"/>
 
-        <View style="@style/action_bar_separator" />
+        <include layout="@layout/actionbar_progress" />
 
-        <TextView style="@style/action_bar_title" />
+        <include layout="@layout/actionbar_button_myposition"/>
 
-        <ProgressBar
-            style="@style/action_bar_progress"
-            android:visibility="gone" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageSwitcher
-            android:id="@+id/my_position"
-            style="@style/action_bar_action" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <include layout="@layout/filter_bar" />
diff --git a/main/res/layout/map_mapsforge_old.xml b/main/res/layout/map_mapsforge_old.xml
index 44b3387..f2cb175 100644
--- a/main/res/layout/map_mapsforge_old.xml
+++ b/main/res/layout/map_mapsforge_old.xml
@@ -6,30 +6,13 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
+        <include layout="@layout/actionbar_title"/>
 
-        <View style="@style/action_bar_separator" />
+        <include layout="@layout/actionbar_progress" />
 
-        <TextView style="@style/action_bar_title" />
-
-        <ProgressBar
-            style="@style/action_bar_progress"
-            android:visibility="gone" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageSwitcher
-            android:id="@+id/my_position"
-            style="@style/action_bar_action" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_myposition"/>
+        
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <include layout="@layout/filter_bar" />
diff --git a/main/res/layout/map_static.xml b/main/res/layout/map_static.xml
index ff0435c..edf6c6e 100644
--- a/main/res/layout/map_static.xml
+++ b/main/res/layout/map_static.xml
@@ -4,16 +4,7 @@
     android:layout_height="fill_parent"
     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/actionbar"/>
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/navigate.xml b/main/res/layout/navigate.xml
index 0c95958..4486884 100644
--- a/main/res/layout/navigate.xml
+++ b/main/res/layout/navigate.xml
@@ -5,23 +5,7 @@
     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" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
-    </LinearLayout>
+    <include layout="@layout/actionbar_with_manual" />
 
     <RelativeLayout
         android:layout_width="fill_parent"
diff --git a/main/res/layout/point.xml b/main/res/layout/point.xml
index 3c133d8..5297d6d 100644
--- a/main/res/layout/point.xml
+++ b/main/res/layout/point.xml
@@ -5,23 +5,7 @@
     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" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
-    </LinearLayout>
+    <include layout="@layout/actionbar_with_manual" />
 
     <ListView
         android:id="@+id/historyList"
diff --git a/main/res/layout/popup.xml b/main/res/layout/popup.xml
index ff64c91..9db6c5f 100644
--- a/main/res/layout/popup.xml
+++ b/main/res/layout/popup.xml
@@ -9,23 +9,9 @@
 
         <TextView style="@style/action_bar_title" />
 
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            android:id="@+id/defaultNavigation"
-            style="@style/action_bar_action"
-            android:longClickable="true"
-            android:onClick="goDefaultNavigation"
-            android:src="@drawable/actionbar_compass_dark" />
-
-        <View
-            android:id="@+id/separator"
-            style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_compass"/>
+        
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/layout/search.xml b/main/res/layout/search.xml
index 6d0bf91..449ad5d 100644
--- a/main/res/layout/search.xml
+++ b/main/res/layout/search.xml
@@ -6,23 +6,7 @@
     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" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
-    </LinearLayout>
+    <include layout="@layout/actionbar_with_manual" />
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/spoilers.xml b/main/res/layout/spoilers.xml
index 233972a..2027b7a 100644
--- a/main/res/layout/spoilers.xml
+++ b/main/res/layout/spoilers.xml
@@ -5,16 +5,7 @@
     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/actionbar"/>
 
     <include layout="@layout/caches_images" />
 
diff --git a/main/res/layout/touch.xml b/main/res/layout/touch.xml
index 09a8033..17553d1 100644
--- a/main/res/layout/touch.xml
+++ b/main/res/layout/touch.xml
@@ -7,24 +7,11 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
+        <include layout="@layout/actionbar_title"/>
 
-        <View style="@style/action_bar_separator" />
+        <include layout="@layout/actionbar_progress" />
 
-        <TextView style="@style/action_bar_title" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ProgressBar
-            style="@style/action_bar_progress"
-            android:visibility="gone" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/layout/trackable_activity.xml b/main/res/layout/trackable_activity.xml
index fe61409..f0176fc 100644
--- a/main/res/layout/trackable_activity.xml
+++ b/main/res/layout/trackable_activity.xml
@@ -6,23 +6,7 @@
     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" />

-

-        <View style="@style/action_bar_separator" />

-

-        <ImageView

-            style="@style/action_bar_action"

-            android:onClick="goManual"

-            android:src="@drawable/actionbar_manual" />

-    </LinearLayout>

+    <include layout="@layout/actionbar_with_manual" />

 

     <android.support.v4.view.ViewPager

         android:id="@+id/viewpager"

diff --git a/main/res/layout/twitter_authorization_activity.xml b/main/res/layout/twitter_authorization_activity.xml
index 97c2236..ec9aa8a 100644
--- a/main/res/layout/twitter_authorization_activity.xml
+++ b/main/res/layout/twitter_authorization_activity.xml
@@ -5,16 +5,7 @@
     android:orientation="vertical"
     android:visibility="visible" >
 
-    <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/actionbar"/>
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/useful_apps.xml b/main/res/layout/useful_apps.xml
index 2a3d14e..8fd73bf 100644
--- a/main/res/layout/useful_apps.xml
+++ b/main/res/layout/useful_apps.xml
@@ -5,16 +5,7 @@
     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/actionbar"/>
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/main/res/layout/visit.xml b/main/res/layout/visit.xml
index 43a3308..ed32d25 100644
--- a/main/res/layout/visit.xml
+++ b/main/res/layout/visit.xml
@@ -7,24 +7,11 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
+        <include layout="@layout/actionbar_title"/>
 
-        <View style="@style/action_bar_separator" />
+        <include layout="@layout/actionbar_progress" />
 
-        <TextView style="@style/action_bar_title" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ProgressBar
-            style="@style/action_bar_progress"
-            android:visibility="gone" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/layout/visit_image.xml b/main/res/layout/visit_image.xml
index c9d4be2..d39d5ae 100644
--- a/main/res/layout/visit_image.xml
+++ b/main/res/layout/visit_image.xml
@@ -7,24 +7,11 @@
 
     <LinearLayout style="@style/action_bar" >
 
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goHome" />
+        <include layout="@layout/actionbar_title"/>
 
-        <View style="@style/action_bar_separator" />
+        <include layout="@layout/actionbar_progress" />
 
-        <TextView style="@style/action_bar_title" />
-
-        <View style="@style/action_bar_separator" />
-
-        <ProgressBar
-            style="@style/action_bar_progress"
-            android:visibility="gone" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/layout/waypoint_popup.xml b/main/res/layout/waypoint_popup.xml
index 869ffa0..e5b4e6b 100644
--- a/main/res/layout/waypoint_popup.xml
+++ b/main/res/layout/waypoint_popup.xml
@@ -9,23 +9,9 @@
 
         <TextView style="@style/action_bar_title" />
 
-        <View style="@style/action_bar_separator" />
-
-        <ImageView
-            android:id="@+id/defaultNavigation"
-            style="@style/action_bar_action"
-            android:longClickable="true"
-            android:onClick="goDefaultNavigation"
-            android:src="@drawable/actionbar_compass_dark" />
-
-        <View
-            android:id="@+id/separator"
-            style="@style/action_bar_separator" />
-
-        <ImageView
-            style="@style/action_bar_action"
-            android:onClick="goManual"
-            android:src="@drawable/actionbar_manual" />
+        <include layout="@layout/actionbar_button_compass"/>
+        
+        <include layout="@layout/actionbar_button_manual"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/main/res/values/ids.xml b/main/res/values/ids.xml
deleted file mode 100644
index cfb09cd..0000000
--- a/main/res/values/ids.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<item type="id" name="actionbar_title" />
-	<item type="id" name="actionbar_progress" />
-</resources>
diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml
index caa884a..0116577 100644
--- a/main/res/values/styles.xml
+++ b/main/res/values/styles.xml
@@ -81,7 +81,6 @@
     </style>
 
     <style name="action_bar_progress" parent="@android:style/Widget.ProgressBar.Small">
-        <item name="android:id">@id/actionbar_progress</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginLeft">15dip</item>
@@ -90,7 +89,6 @@
     </style>
 
     <style name="action_bar_title">
-        <item name="android:id">@id/actionbar_title</item>
         <item name="android:layout_width">0dip</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_weight">1</item>
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index fd42f07..1e2377b 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -795,7 +795,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
     /**
      * Wrapper for the referenced method in the xml-layout.
      */
-    public void startDefaultNavigation(@SuppressWarnings("unused") View view) {
+    public void goDefaultNavigation(@SuppressWarnings("unused") View view) {
         startDefaultNavigation();
     }
 
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 097aef3..811425c 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -427,6 +427,17 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
             }
         }
 
+        // Add the list selection in code. This way we can leave the XML layout the same as for other activities.
+        final View titleBar = findViewById(R.id.actionbar_title);
+        titleBar.setClickable(true);
+        titleBar.setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                selectList(v);
+            }
+        });
+
         setTitle(title);
         setAdapter();
 
diff --git a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
index dada8fd..63a9b09 100644
--- a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
+++ b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
@@ -74,7 +74,7 @@ public class CoordinatesInputDialog extends Dialog {
 
         setContentView(R.layout.coords);
 
-        findViewById(R.id.actionBarManualbutton).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.action_bar_manual).setOnClickListener(new View.OnClickListener() {
 
             @Override
             public void onClick(View view) {