From 315885173b8eca17f9a5b3fc85578dfbd5964053 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Thu, 3 Jul 2014 20:11:54 +0200
Subject: follow naming conventions

Use the namespace "app" instead of "cgeo" for custom attributes.
---
 main/res/layout/cacheslist_item.xml                |  4 +--
 main/res/menu/abstract_logging_activity.xml        | 14 ++++----
 main/res/menu/cache_list_context.xml               | 18 +++++-----
 main/res/menu/cache_list_options.xml               | 14 ++++----
 main/res/menu/cache_options.xml                    | 26 +++++++-------
 main/res/menu/compass_activity_options.xml         | 12 +++----
 main/res/menu/details_context.xml                  | 12 +++----
 main/res/menu/images_list_context.xml              |  6 ++--
 main/res/menu/logging_ui.xml                       |  6 ++--
 main/res/menu/main_activity_options.xml            | 18 +++++-----
 main/res/menu/map_activity.xml                     | 20 +++++------
 .../menu/navigate_any_point_activity_options.xml   | 10 +++---
 main/res/menu/search_activity_options.xml          |  4 +--
 main/res/menu/static_maps_activity_options.xml     |  4 +--
 main/res/menu/trackable_activity.xml               |  6 ++--
 main/res/menu/waypoint_options.xml                 |  2 +-
 main/res/xml/preferences.xml                       | 42 +++++++++++-----------
 17 files changed, 109 insertions(+), 109 deletions(-)

(limited to 'main/res')

diff --git a/main/res/layout/cacheslist_item.xml b/main/res/layout/cacheslist_item.xml
index b43310e..260b0d0 100644
--- a/main/res/layout/cacheslist_item.xml
+++ b/main/res/layout/cacheslist_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/one_cache"
     android:layout_width="fill_parent"
@@ -111,7 +111,7 @@
             android:minHeight="28px"
             android:minWidth="28px"
             android:visibility="gone"
-            cgeo:skin="?compass"
+            app:skin="?compass"
             tools:ignore="PxUsage" />
 
         <ImageView
diff --git a/main/res/menu/abstract_logging_activity.xml b/main/res/menu/abstract_logging_activity.xml
index 586b93e..aeb6720 100644
--- a/main/res/menu/abstract_logging_activity.xml
+++ b/main/res/menu/abstract_logging_activity.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res-auto" >
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <item
         android:id="@+id/menu_send"
         android:enabled="true"
         android:icon="@drawable/ic_menu_send"
         android:title="@string/send"
-        cgeo:showAsAction="ifRoom|withText"> <!-- enabled=true, we show a message if logging is not possible -->
+        app:showAsAction="ifRoom|withText"> <!-- enabled=true, we show a message if logging is not possible -->
     </item>
     <item
         android:id="@+id/menu_templates"
         android:icon="@drawable/ic_menu_add"
         android:title="@string/log_add"
-        cgeo:showAsAction="ifRoom|withText">
+        app:showAsAction="ifRoom|withText">
         <menu /> <!-- filled dynamically -->
     </item>
     <item
@@ -21,14 +21,14 @@
         android:icon="@drawable/ic_menu_attachment"
         android:title="@string/log_image_attach"
         android:visible="false"
-        cgeo:showAsAction="ifRoom|withText">
+        app:showAsAction="ifRoom|withText">
         <menu /> <!-- filled dynamically -->
     </item>
     <item
         android:id="@+id/menu_smilies"
         android:icon="@drawable/ic_menu_emoticons"
         android:title="@string/log_smilies"
-        cgeo:showAsAction="ifRoom|withText">
+        app:showAsAction="ifRoom|withText">
         <menu /> <!-- filled dynamically -->
     </item>
     <item
@@ -36,14 +36,14 @@
         android:icon="@drawable/ic_menu_save"
         android:title="@string/log_save"
         android:visible="false"
-        cgeo:showAsAction="ifRoom|withText">
+        app:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/clear"
         android:icon="@drawable/ic_menu_delete"
         android:title="@string/log_clear"
         android:visible="false"
-        cgeo:showAsAction="ifRoom|withText">
+        app:showAsAction="ifRoom|withText">
     </item>
 
 </menu>
\ No newline at end of file
diff --git a/main/res/menu/cache_list_context.xml b/main/res/menu/cache_list_context.xml
index 68a0699..bbcc014 100644
--- a/main/res/menu/cache_list_context.xml
+++ b/main/res/menu/cache_list_context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/menu_default_navigation"
@@ -11,45 +11,45 @@
         android:id="@+id/menu_navigate"
         android:icon="@drawable/ic_menu_mapmode"
         android:title="@string/cache_menu_navigate"
-        cgeo:showAsAction="ifRoom|withText">
+        app:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/menu_cache_details"
         android:title="@string/cache_menu_details"
-        cgeo:showAsAction="ifRoom|withText">
+        app:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/menu_log_visit_offline"
         android:icon="@drawable/ic_menu_edit"
-        cgeo:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         android:title="@string/cache_menu_visit_offline">
     </item>
     <item
         android:id="@+id/menu_log_visit"
         android:icon="@drawable/ic_menu_edit"
-        cgeo:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         android:title="@string/cache_menu_visit">
     </item>
     <item
         android:id="@+id/menu_drop_cache"
-        cgeo:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         android:icon="@drawable/ic_menu_delete"
         android:title="@string/cache_offline_drop">
     </item>
     <item
         android:id="@+id/menu_move_to_list"
-        cgeo:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         android:title="@string/cache_menu_move_list">
     </item>
     <item
         android:id="@+id/menu_refresh"
-        cgeo:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         android:icon="@drawable/ic_menu_refresh"
         android:title="@string/cache_menu_refresh">
     </item>
     <item
         android:id="@+id/menu_store_cache"
-        cgeo:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         android:icon="@drawable/ic_menu_save"
         android:title="@string/cache_offline_store">
     </item>
diff --git a/main/res/menu/cache_list_options.xml b/main/res/menu/cache_list_options.xml
index f10ab9b..3c0d0a6 100644
--- a/main/res/menu/cache_list_options.xml
+++ b/main/res/menu/cache_list_options.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res-auto" >
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <item
         android:id="@+id/menu_show_on_map"
         android:icon="@drawable/ic_menu_mapmode"
         android:title="@string/caches_on_map"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_filter"
         android:icon="@drawable/ic_menu_filter"
         android:title="@string/caches_filter"
-        cgeo:showAsAction="ifRoom|withText">
+        app:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/menu_sort"
@@ -20,8 +20,8 @@
         android:icon="@drawable/ic_menu_sort_alphabetically"
         android:showAsAction="always"
         android:title="@string/caches_sort"
-        cgeo:actionProviderClass="cgeo.geocaching.sorting.SortActionProvider"
-        cgeo:showAsAction="ifRoom|withText">
+        app:actionProviderClass="cgeo.geocaching.sorting.SortActionProvider"
+        app:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/menu_switch_select_mode"
@@ -97,7 +97,7 @@
     </item>
     <item
         android:title="@string/list_menu_import"
-        cgeo:showAsAction="never|withText">
+        app:showAsAction="never|withText">
         <menu>
             <item
                 android:id="@+id/menu_import_gpx"
@@ -115,7 +115,7 @@
     </item>
     <item
         android:title="@string/export"
-        cgeo:showAsAction="never|withText">
+        app:showAsAction="never|withText">
         <menu>
             <item
                 android:id="@+id/menu_export_gpx"
diff --git a/main/res/menu/cache_options.xml b/main/res/menu/cache_options.xml
index 9610836..cb32215 100644
--- a/main/res/menu/cache_options.xml
+++ b/main/res/menu/cache_options.xml
@@ -1,76 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res-auto" >
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <item
         android:id="@+id/menu_default_navigation"
         android:icon="@drawable/ic_menu_compass"
         android:title="@string/cache_menu_navigate"
-        cgeo:showAsAction="ifRoom"> <!-- will be replaced -->
+        app:showAsAction="ifRoom"> <!-- will be replaced -->
     </item>
     <item
         android:id="@+id/menu_navigate"
         android:icon="@drawable/ic_menu_mapmode"
         android:title="@string/cache_menu_navigate"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_log_visit_offline"
         android:icon="@drawable/ic_menu_edit"
         android:title="@string/cache_menu_visit_offline"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_log_visit"
         android:icon="@drawable/ic_menu_edit"
         android:title="@string/cache_menu_visit"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_calendar"
         android:icon="@drawable/ic_menu_my_calendar"
         android:title="@string/cache_menu_event"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_caches_around"
         android:icon="@drawable/ic_menu_rotate"
         android:title="@string/cache_menu_around"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_show_in_browser"
         android:icon="@drawable/ic_menu_info_details"
         android:title="@string/cache_menu_browser"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_store"
         android:icon="@drawable/ic_menu_save"
         android:title="@string/cache_offline_store"
         android:visible="false"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_refresh"
         android:icon="@drawable/ic_menu_refresh"
         android:title="@string/cache_offline_refresh"
         android:visible="false"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_delete"
         android:icon="@drawable/ic_menu_delete"
         android:title="@string/cache_offline_drop"
         android:visible="false"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_share"
         android:icon="@drawable/ic_menu_share"
         android:title="@string/cache_menu_share"
-        cgeo:actionProviderClass="android.support.v7.widget.ShareActionProvider"
-        cgeo:showAsAction="ifRoom">
+        app:actionProviderClass="android.support.v7.widget.ShareActionProvider"
+        app:showAsAction="ifRoom">
     </item>
 
 </menu>
\ No newline at end of file
diff --git a/main/res/menu/compass_activity_options.xml b/main/res/menu/compass_activity_options.xml
index 3f7f1ad..30861dd 100644
--- a/main/res/menu/compass_activity_options.xml
+++ b/main/res/menu/compass_activity_options.xml
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res-auto" >
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <item
         android:id="@+id/menu_map"
         android:icon="@drawable/ic_menu_mapmode"
         android:title="@string/caches_on_map"
-        cgeo:showAsAction="ifRoom|withText">
+        app:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/menu_tts_start"
         android:icon="@drawable/ic_menu_start_conversation"
         android:title="@string/tts_start"
-        cgeo:showAsAction="ifRoom|withText">
+        app:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/menu_tts_stop"
         android:icon="@drawable/ic_menu_start_conversation"
         android:title="@string/tts_stop"
         android:visible="false"
-        cgeo:showAsAction="ifRoom|withText">
+        app:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/menu_select_destination"
         android:icon="@drawable/ic_menu_myplaces"
         android:title="@string/destination_select"
-        cgeo:showAsAction="ifRoom|withText">
+        app:showAsAction="ifRoom|withText">
         <menu /> <!-- filled dynamically -->
     </item>
     <item
         android:id="@+id/menu_compass_sensor"
         android:icon="@drawable/ic_menu_compass"
         android:title="@string/compass_sensors"
-        cgeo:showAsAction="never|withText"> <!-- will be replaced in code -->
+        app:showAsAction="never|withText"> <!-- will be replaced in code -->
         <menu>
             <group android:checkableBehavior="single" >
                 <item
diff --git a/main/res/menu/details_context.xml b/main/res/menu/details_context.xml
index fc61d5d..3c16e1e 100644
--- a/main/res/menu/details_context.xml
+++ b/main/res/menu/details_context.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res-auto" >
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <item
         android:id="@+id/menu_copy"
         android:icon="@drawable/ic_menu_copy"
         android:title="@android:string/copy"
-        cgeo:showAsAction="always|withText">
+        app:showAsAction="always|withText">
     </item>
     <item
         android:id="@+id/menu_translate_to_sys_lang"
         android:title="@string/translate_to_sys_lang"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_translate_to_english"
         android:title="@string/translate_to_english"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_cache_share_field"
         android:title="@string/cache_share_field"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_calendar"
         android:icon="@drawable/ic_menu_my_calendar"
         android:title="@string/cache_menu_event"
         android:visible="false"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
 
 </menu>
\ No newline at end of file
diff --git a/main/res/menu/images_list_context.xml b/main/res/menu/images_list_context.xml
index 0726267..8d3869b 100644
--- a/main/res/menu/images_list_context.xml
+++ b/main/res/menu/images_list_context.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/image_open_file"
-        cgeo:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         android:title="@string/cache_image_open_file">
     </item>
     <item
         android:id="@+id/image_open_browser"
-        cgeo:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         android:title="@string/cache_image_open_browser">
     </item>
 
diff --git a/main/res/menu/logging_ui.xml b/main/res/menu/logging_ui.xml
index 5baacfc..921b350 100644
--- a/main/res/menu/logging_ui.xml
+++ b/main/res/menu/logging_ui.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/menu_log_visit_offline"
         android:icon="@drawable/ic_menu_edit"
-        cgeo:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         android:title="@string/cache_menu_visit_offline">
     </item>
     <item
         android:id="@+id/menu_log_visit"
         android:icon="@drawable/ic_menu_edit"
-        cgeo:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         android:title="@string/cache_menu_visit">
     </item>
 
diff --git a/main/res/menu/main_activity_options.xml b/main/res/menu/main_activity_options.xml
index 6e5a198..b17080b 100644
--- a/main/res/menu/main_activity_options.xml
+++ b/main/res/menu/main_activity_options.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res-auto" >
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <!-- TODO: use ic_action_search -->
     <item
@@ -8,43 +8,43 @@
         style="@style/action_bar_action"
         android:icon="@drawable/abc_ic_search"
         android:title="@string/search_bar_hint"
-        cgeo:actionViewClass="android.support.v7.widget.SearchView"
-        cgeo:showAsAction="collapseActionView|always"/>
+        app:actionViewClass="android.support.v7.widget.SearchView"
+        app:showAsAction="collapseActionView|always"/>
     <item
         android:id="@+id/menu_history"
         android:icon="@drawable/ic_menu_recent_history"
         android:title="@string/menu_history"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_pocket_queries"
         android:icon="@drawable/ic_menu_account_list"
         android:title="@string/menu_pocket_queries"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_settings"
         android:icon="@drawable/ic_menu_preferences"
         android:title="@string/menu_settings"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_helpers"
         android:icon="@drawable/ic_menu_shopping"
         android:title="@string/menu_helpers"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_scan"
         android:icon="@drawable/ic_menu_barcode"
         android:title="@string/menu_scan_geo"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_about"
         android:icon="@drawable/ic_menu_info_details"
         android:title="@string/menu_about"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
 
 </menu>
\ No newline at end of file
diff --git a/main/res/menu/map_activity.xml b/main/res/menu/map_activity.xml
index 4c1dfd7..f232fc4 100644
--- a/main/res/menu/map_activity.xml
+++ b/main/res/menu/map_activity.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res-auto" >
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <item
         android:id="@+id/menu_toggle_mypos"
         android:icon="@drawable/ic_menu_myposition"
         android:showAsAction="always"
         android:title="@string/menu_centerposition"
-        cgeo:showAsAction="always"/>
+        app:showAsAction="always"/>
     <item
         android:id="@+id/menu_select_mapview"
         android:icon="@drawable/ic_menu_mapmode"
         android:title="@string/map_view_map"
-        cgeo:showAsAction="ifRoom|withText">
+        app:showAsAction="ifRoom|withText">
         <menu>
             <group
                 android:id="@+id/menu_group_map_sources"
@@ -24,40 +24,40 @@
         android:id="@+id/menu_map_live"
         android:icon="@drawable/ic_menu_refresh"
         android:title="@string/map_live_disable"
-        cgeo:showAsAction="ifRoom|withText">
+        app:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/menu_store_caches"
         android:icon="@drawable/ic_menu_set_as"
         android:title="@string/caches_store_offline"
-        cgeo:showAsAction="ifRoom|withText">
+        app:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/submenu_modes"
         android:icon="@drawable/ic_menu_mark"
         android:title="@string/map_modes"
-        cgeo:showAsAction="ifRoom|withText">
+        app:showAsAction="ifRoom|withText">
         <menu>
             <item
                 android:id="@+id/menu_trail_mode"
                 android:checkable="true"
                 android:icon="@drawable/ic_menu_trail"
                 android:title="@string/map_trail_show"
-                cgeo:showAsAction="ifRoom|withText">
+                app:showAsAction="ifRoom|withText">
             </item>
             <item
                 android:id="@+id/menu_circle_mode"
                 android:checkable="true"
                 android:icon="@drawable/ic_menu_circle"
                 android:title="@string/map_circles_show"
-                cgeo:showAsAction="ifRoom|withText">
+                app:showAsAction="ifRoom|withText">
             </item>
             <item
                 android:id="@+id/menu_mycaches_mode"
                 android:checkable="true"
                 android:icon="@android:drawable/ic_menu_myplaces"
                 android:title="@string/map_mycaches_hide"
-                cgeo:showAsAction="ifRoom|withText">
+                app:showAsAction="ifRoom|withText">
             </item>
         </menu>
     </item>
@@ -65,7 +65,7 @@
         android:id="@+id/menu_theme_mode"
         android:icon="@drawable/ic_menu_preferences"
         android:title="@string/map_theme_select"
-        cgeo:showAsAction="ifRoom|withText">
+        app:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/submenu_strategy"
diff --git a/main/res/menu/navigate_any_point_activity_options.xml b/main/res/menu/navigate_any_point_activity_options.xml
index a17405b..e3fd79c 100644
--- a/main/res/menu/navigate_any_point_activity_options.xml
+++ b/main/res/menu/navigate_any_point_activity_options.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/menu_navigate"
         android:icon="@drawable/ic_menu_mapmode"
         android:title="@string/cache_menu_navigate"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_default_navigation"
         android:icon="@drawable/ic_menu_compass"
         android:title="@string/cache_menu_navigate"
-        cgeo:showAsAction="ifRoom"> <!-- will be replaced in code -->
+        app:showAsAction="ifRoom"> <!-- will be replaced in code -->
     </item>
     <item
         android:id="@+id/menu_caches_around"
         android:icon="@drawable/ic_menu_rotate"
         android:title="@string/cache_menu_around"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_clear_history"
         android:icon="@drawable/ic_menu_delete"
         android:title="@string/search_clear_history"
-        cgeo:showAsAction="ifRoom">
+        app:showAsAction="ifRoom">
     </item>
 
 </menu>
\ No newline at end of file
diff --git a/main/res/menu/search_activity_options.xml b/main/res/menu/search_activity_options.xml
index c4ee62b..300be94 100644
--- a/main/res/menu/search_activity_options.xml
+++ b/main/res/menu/search_activity_options.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/menu_search_own_caches"
         android:icon="@drawable/ic_menu_myplaces"
         android:title="@string/search_own_caches"
-        cgeo:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         >
     </item>
 
diff --git a/main/res/menu/static_maps_activity_options.xml b/main/res/menu/static_maps_activity_options.xml
index 8621153..fb98f54 100644
--- a/main/res/menu/static_maps_activity_options.xml
+++ b/main/res/menu/static_maps_activity_options.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/menu_refresh"
         android:icon="@drawable/ic_menu_refresh"
-        cgeo:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
         android:title="@string/cache_offline_refresh">
     </item>
 
diff --git a/main/res/menu/trackable_activity.xml b/main/res/menu/trackable_activity.xml
index 60eaa9e..22487c4 100644
--- a/main/res/menu/trackable_activity.xml
+++ b/main/res/menu/trackable_activity.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/menu_log_touch"
         android:icon="@drawable/ic_menu_agenda"
-        cgeo:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         android:title="@string/trackable_log_touch">
     </item>
     <item
         android:id="@+id/menu_browser_trackable"
         android:icon="@drawable/ic_menu_info_details"
-        cgeo:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom|withText"
         android:title="@string/trackable_browser_open">
     </item>
 
diff --git a/main/res/menu/waypoint_options.xml b/main/res/menu/waypoint_options.xml
index 5aaeac2..7df48f8 100644
--- a/main/res/menu/waypoint_options.xml
+++ b/main/res/menu/waypoint_options.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     
     <item
         android:id="@+id/menu_waypoint_reset_cache_coords"
diff --git a/main/res/xml/preferences.xml b/main/res/xml/preferences.xml
index e406988..49f0515 100644
--- a/main/res/xml/preferences.xml
+++ b/main/res/xml/preferences.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res/cgeo.geocaching"
+    xmlns:app="http://schemas.android.com/apk/res/cgeo.geocaching"
     android:key="@string/preference_screen_main" >
 
     <PreferenceScreen
@@ -16,10 +16,10 @@
                         android:defaultValue="true"
                         android:key="@string/pref_connectorGCActive"
                         android:title="@string/settings_activate_gc"
-                        cgeo:text="@string/settings_gc_legal_note"
-                        cgeo:title="@string/settings_title_gc"
-                        cgeo:url="@string/settings_gc_legal_note_url"
-                        cgeo:urlButton="@string/settings_goto_url_button" />
+                        app:text="@string/settings_gc_legal_note"
+                        app:title="@string/settings_title_gc"
+                        app:url="@string/settings_gc_legal_note_url"
+                        app:urlButton="@string/settings_goto_url_button" />
 
                     <EditTextPreference
                         android:dependency="@string/pref_connectorGCActive"
@@ -63,13 +63,13 @@
                 <PreferenceCategory android:title="@string/settings_information" >
                     <cgeo.geocaching.settings.CapabilitiesPreference
                         android:title="@string/settings_features"
-                        cgeo:connector="GC" />
+                        app:connector="GC" />
 
                     <cgeo.geocaching.settings.InfoPreference
                         android:text="@string/settings_info_facebook_login"
                         android:title="@string/settings_info_facebook_login_title"
-                        cgeo:url="@string/settings_facebook_login_url"
-                        cgeo:urlButton="@string/settings_goto_url_button" />
+                        app:url="@string/settings_facebook_login_url"
+                        app:urlButton="@string/settings_goto_url_button" />
 
                     <Preference
                         android:key="@string/pref_fakekey_gc_website"
@@ -97,7 +97,7 @@
                 <PreferenceCategory android:title="@string/settings_information" >
                     <cgeo.geocaching.settings.CapabilitiesPreference
                         android:title="@string/settings_features"
-                        cgeo:connector="OC" />
+                        app:connector="OC" />
 
                     <Preference
                         android:key="@string/pref_fakekey_ocde_website"
@@ -125,7 +125,7 @@
                 <PreferenceCategory android:title="@string/settings_information" >
                     <cgeo.geocaching.settings.CapabilitiesPreference
                         android:title="@string/settings_features"
-                        cgeo:connector="OP" />
+                        app:connector="OP" />
 
                     <Preference
                         android:key="@string/pref_fakekey_ocpl_website"
@@ -153,7 +153,7 @@
                 <PreferenceCategory android:title="@string/settings_information" >
                     <cgeo.geocaching.settings.CapabilitiesPreference
                         android:title="@string/settings_features"
-                        cgeo:connector="OB" />
+                        app:connector="OB" />
 
                     <Preference
                         android:key="@string/pref_fakekey_ocnl_website"
@@ -181,7 +181,7 @@
                 <PreferenceCategory android:title="@string/settings_information" >
                     <cgeo.geocaching.settings.CapabilitiesPreference
                         android:title="@string/settings_features"
-                        cgeo:connector="OU" />
+                        app:connector="OU" />
 
                     <Preference
                         android:key="@string/pref_fakekey_ocus_website"
@@ -209,7 +209,7 @@
                 <PreferenceCategory android:title="@string/settings_information" >
                     <cgeo.geocaching.settings.CapabilitiesPreference
                         android:title="@string/settings_features"
-                        cgeo:connector="OR" />
+                        app:connector="OR" />
 
                     <Preference
                         android:key="@string/pref_fakekey_ocro_website"
@@ -261,7 +261,7 @@
                 <PreferenceCategory android:title="@string/settings_information" >
                     <cgeo.geocaching.settings.CapabilitiesPreference
                         android:title="@string/settings_features"
-                        cgeo:connector="EC" />
+                        app:connector="EC" />
 
                     <Preference
                         android:key="@string/pref_fakekey_ec_website"
@@ -280,7 +280,7 @@
                 <PreferenceCategory android:title="@string/settings_information" >
                     <cgeo.geocaching.settings.CapabilitiesPreference
                         android:title="@string/settings_features"
-                        cgeo:connector="OX" />
+                        app:connector="OX" />
 
                     <Preference
                         android:key="@string/pref_fakekey_ox_website"
@@ -327,8 +327,8 @@
                     <cgeo.geocaching.settings.InfoPreference
                         android:text="@string/init_sendToCgeo_description"
                         android:title="@string/settings_info_send2cgeo_title"
-                        cgeo:url="@string/settings_send2cgeo_url"
-                        cgeo:urlButton="@string/settings_goto_url_button" />
+                        app:url="@string/settings_send2cgeo_url"
+                        app:urlButton="@string/settings_goto_url_button" />
 
                     <Preference
                         android:key="@string/pref_fakekey_sendtocgeo_website"
@@ -451,8 +451,8 @@
             <cgeo.geocaching.settings.InfoPreference
                 android:text="@string/settings_info_offline_maps"
                 android:title="@string/settings_info_offline_maps_title"
-                cgeo:url="@string/settings_offline_maps_url"
-                cgeo:urlButton="@string/settings_goto_url_button" />
+                app:url="@string/settings_offline_maps_url"
+                app:urlButton="@string/settings_goto_url_button" />
 
             <Preference
                 android:key="@string/pref_mapDirectory"
@@ -461,8 +461,8 @@
             <cgeo.geocaching.settings.InfoPreference
                 android:text="@string/settings_info_themes"
                 android:title="@string/settings_info_themes_title"
-                cgeo:url="@string/settings_themes_url"
-                cgeo:urlButton="@string/settings_goto_url_button" />
+                app:url="@string/settings_themes_url"
+                app:urlButton="@string/settings_goto_url_button" />
 
             <Preference
                 android:key="@string/pref_renderthemepath"
-- 
cgit v1.1