aboutsummaryrefslogtreecommitdiffstats
path: root/main/res/menu
diff options
context:
space:
mode:
Diffstat (limited to 'main/res/menu')
-rw-r--r--main/res/menu/abstract_logging_activity.xml39
-rw-r--r--main/res/menu/cache_list_context.xml22
-rw-r--r--main/res/menu/cache_list_options.xml85
-rw-r--r--main/res/menu/cache_options.xml59
-rw-r--r--main/res/menu/compass_activity_options.xml53
-rw-r--r--main/res/menu/details_context.xml20
-rw-r--r--main/res/menu/images_list_context.xml5
-rw-r--r--main/res/menu/logging_ui.xml5
-rw-r--r--main/res/menu/main_activity_options.xml36
-rw-r--r--main/res/menu/map_activity.xml49
-rw-r--r--main/res/menu/navigate_any_point_activity_options.xml15
-rw-r--r--main/res/menu/search_activity_options.xml7
-rw-r--r--main/res/menu/static_maps_activity_options.xml4
-rw-r--r--main/res/menu/trackable_activity.xml5
-rw-r--r--main/res/menu/waypoint_options.xml3
15 files changed, 280 insertions, 127 deletions
diff --git a/main/res/menu/abstract_logging_activity.xml b/main/res/menu/abstract_logging_activity.xml
index b926dd1..586b93e 100644
--- a/main/res/menu/abstract_logging_activity.xml
+++ b/main/res/menu/abstract_logging_activity.xml
@@ -1,22 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cgeo="http://schemas.android.com/apk/res-auto" >
<item
- android:id="@+id/menu_signature"
- android:icon="@drawable/ic_menu_edit"
- android:title="@string/init_signature">
+ 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 -->
</item>
<item
android:id="@+id/menu_templates"
android:icon="@drawable/ic_menu_add"
- android:title="@string/log_add">
+ android:title="@string/log_add"
+ cgeo:showAsAction="ifRoom|withText">
+ <menu /> <!-- filled dynamically -->
+ </item>
+ <item
+ android:id="@+id/menu_image"
+ android:icon="@drawable/ic_menu_attachment"
+ android:title="@string/log_image_attach"
+ android:visible="false"
+ cgeo:showAsAction="ifRoom|withText">
<menu /> <!-- filled dynamically -->
</item>
<item
android:id="@+id/menu_smilies"
android:icon="@drawable/ic_menu_emoticons"
- android:title="@string/log_smilies">
+ android:title="@string/log_smilies"
+ cgeo:showAsAction="ifRoom|withText">
<menu /> <!-- filled dynamically -->
</item>
+ <item
+ android:id="@+id/save"
+ android:icon="@drawable/ic_menu_save"
+ android:title="@string/log_save"
+ android:visible="false"
+ cgeo: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">
+ </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 2767a2e..68a0699 100644
--- a/main/res/menu/cache_list_context.xml
+++ b/main/res/menu/cache_list_context.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cgeo="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_default_navigation"
@@ -9,40 +10,47 @@
<item
android:id="@+id/menu_navigate"
android:icon="@drawable/ic_menu_mapmode"
- android:title="@string/cache_menu_navigate">
+ android:title="@string/cache_menu_navigate"
+ cgeo:showAsAction="ifRoom|withText">
</item>
<item
android:id="@+id/menu_cache_details"
- android:title="@string/cache_menu_details">
+ android:title="@string/cache_menu_details"
+ cgeo:showAsAction="ifRoom|withText">
</item>
<item
android:id="@+id/menu_log_visit_offline"
android:icon="@drawable/ic_menu_edit"
+ cgeo: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"
android:title="@string/cache_menu_visit">
</item>
<item
android:id="@+id/menu_drop_cache"
+ cgeo: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"
android:title="@string/cache_menu_move_list">
</item>
<item
- android:id="@+id/menu_export"
- android:title="@string/export">
- </item>
- <item
android:id="@+id/menu_refresh"
+ cgeo: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"
+ 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 418d2de..f10ab9b 100644
--- a/main/res/menu/cache_list_options.xml
+++ b/main/res/menu/cache_list_options.xml
@@ -1,15 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cgeo="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">
+ </item>
+ <item
android:id="@+id/menu_filter"
android:icon="@drawable/ic_menu_filter"
- android:title="@string/caches_filter">
+ android:title="@string/caches_filter"
+ cgeo:showAsAction="ifRoom|withText">
</item>
<item
android:id="@+id/menu_sort"
+ android:actionProviderClass="cgeo.geocaching.sorting.SortActionProvider"
android:icon="@drawable/ic_menu_sort_alphabetically"
- android:title="@string/caches_sort">
+ android:showAsAction="always"
+ android:title="@string/caches_sort"
+ cgeo:actionProviderClass="cgeo.geocaching.sorting.SortActionProvider"
+ cgeo:showAsAction="ifRoom|withText">
</item>
<item
android:id="@+id/menu_switch_select_mode"
@@ -36,11 +48,7 @@
</item>
<item
android:id="@+id/menu_drop_caches"
- android:title="@string/caches_drop_all">
- </item>
- <item
- android:id="@+id/menu_drop_caches_and_list"
- android:title="@string/caches_drop_all_and_list">
+ android:title="@string/caches_remove_all">
</item>
<item
android:id="@+id/menu_delete_events"
@@ -51,22 +59,6 @@
android:title="@string/caches_clear_offlinelogs">
</item>
<item
- android:id="@+id/menu_import_gpx"
- android:title="@string/gpx_import_title">
- </item>
- <item
- android:id="@+id/menu_import_web"
- android:title="@string/web_import_title">
- </item>
- <item
- android:id="@+id/menu_import_android"
- android:title="@string/gpx_import_android">
- </item>
- <item
- android:id="@+id/menu_export"
- android:title="@string/export">
- </item>
- <item
android:id="@+id/menu_remove_from_history"
android:title="@string/cache_clear_history">
</item>
@@ -88,29 +80,50 @@
android:icon="@drawable/ic_menu_mapmode"
android:title="@string/caches_on_map"
android:visible="false">
- <menu >
+ <menu>
</menu>
</item>
<item
- android:id="@+id/submenu_manage_lists"
- android:icon="@drawable/ic_menu_more"
- android:title="@string/list_menu">
+ android:id="@+id/menu_create_list"
+ android:title="@string/list_menu_create">
+ </item>
+ <item
+ android:id="@+id/menu_drop_list"
+ android:title="@string/list_menu_drop">
+ </item>
+ <item
+ android:id="@+id/menu_rename_list"
+ android:title="@string/list_menu_rename">
+ </item>
+ <item
+ android:title="@string/list_menu_import"
+ cgeo:showAsAction="never|withText">
<menu>
<item
- android:id="@+id/menu_create_list"
- android:title="@string/list_menu_create">
+ android:id="@+id/menu_import_gpx"
+ android:title="@string/gpx_import_title">
</item>
<item
- android:id="@+id/menu_drop_list"
- android:title="@string/list_menu_drop">
+ android:id="@+id/menu_import_web"
+ android:title="@string/web_import_title">
+ </item>
+ <item
+ android:id="@+id/menu_import_android"
+ android:title="@string/gpx_import_android">
</item>
+ </menu>
+ </item>
+ <item
+ android:title="@string/export"
+ cgeo:showAsAction="never|withText">
+ <menu>
<item
- android:id="@+id/menu_rename_list"
- android:title="@string/list_menu_rename">
+ android:id="@+id/menu_export_gpx"
+ android:title="@string/export_gpx">
</item>
<item
- android:id="@+id/menu_switch_list"
- android:title="@string/list_menu_change">
+ android:id="@+id/menu_export_fieldnotes"
+ android:title="@string/export_fieldnotes">
</item>
</menu>
</item>
diff --git a/main/res/menu/cache_options.xml b/main/res/menu/cache_options.xml
index d2951f4..9610836 100644
--- a/main/res/menu/cache_options.xml
+++ b/main/res/menu/cache_options.xml
@@ -1,45 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cgeo="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"> <!-- will be replaced -->
+ android:title="@string/cache_menu_navigate"
+ cgeo:showAsAction="ifRoom"> <!-- will be replaced -->
</item>
<item
android:id="@+id/menu_navigate"
android:icon="@drawable/ic_menu_mapmode"
- android:title="@string/cache_menu_navigate">
- </item>
- <item
- android:id="@+id/menu_calendar"
- android:icon="@drawable/ic_menu_agenda"
- android:title="@string/cache_menu_event">
+ android:title="@string/cache_menu_navigate"
+ cgeo:showAsAction="ifRoom">
</item>
<item
android:id="@+id/menu_log_visit_offline"
android:icon="@drawable/ic_menu_edit"
- android:title="@string/cache_menu_visit_offline">
+ android:title="@string/cache_menu_visit_offline"
+ cgeo:showAsAction="ifRoom">
</item>
<item
android:id="@+id/menu_log_visit"
android:icon="@drawable/ic_menu_edit"
- android:title="@string/cache_menu_visit">
+ android:title="@string/cache_menu_visit"
+ cgeo: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">
</item>
<item
android:id="@+id/menu_caches_around"
android:icon="@drawable/ic_menu_rotate"
- android:title="@string/cache_menu_around">
+ android:title="@string/cache_menu_around"
+ cgeo:showAsAction="ifRoom">
</item>
<item
android:id="@+id/menu_show_in_browser"
android:icon="@drawable/ic_menu_info_details"
- android:title="@string/cache_menu_browser">
+ android:title="@string/cache_menu_browser"
+ cgeo: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">
+ </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">
+ </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">
</item>
<item
android:id="@+id/menu_share"
android:icon="@drawable/ic_menu_share"
- android:title="@string/cache_menu_share">
+ android:title="@string/cache_menu_share"
+ cgeo:actionProviderClass="android.support.v7.widget.ShareActionProvider"
+ cgeo: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 01c7d36..3f7f1ad 100644
--- a/main/res/menu/compass_activity_options.xml
+++ b/main/res/menu/compass_activity_options.xml
@@ -1,37 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cgeo="http://schemas.android.com/apk/res-auto" >
<item
- android:id="@+id/menu_switch_compass_gps"
- android:icon="@drawable/ic_menu_compass"
- android:title="@string/use_gps"> <!-- will be replaced in code -->
- </item>
- <item
android:id="@+id/menu_map"
android:icon="@drawable/ic_menu_mapmode"
- android:title="@string/caches_on_map">
- </item>
- <item
- android:id="@+id/menu_edit_destination"
- android:icon="@drawable/ic_menu_edit"
- android:title="@string/destination_set">
- </item>
- <item
- android:id="@+id/menu_select_destination"
- android:icon="@drawable/ic_menu_myplaces"
- android:title="@string/destination_select">
- <menu /> <!-- filled dynamically -->
+ android:title="@string/caches_on_map"
+ cgeo:showAsAction="ifRoom|withText">
</item>
<item
android:id="@+id/menu_tts_start"
android:icon="@drawable/ic_menu_start_conversation"
- android:title="@string/tts_start">
+ android:title="@string/tts_start"
+ cgeo: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">
+ android:visible="false"
+ cgeo: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">
+ <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 -->
+ <menu>
+ <group android:checkableBehavior="single" >
+ <item
+ android:id="@+id/menu_compass_sensor_gps"
+ android:title="@string/use_gps">
+ </item>
+ <item
+ android:id="@+id/menu_compass_sensor_magnetic"
+ android:title="@string/use_compass">
+ </item>
+ </group>
+ </menu>
</item>
</menu> \ No newline at end of file
diff --git a/main/res/menu/details_context.xml b/main/res/menu/details_context.xml
index 3125459..fc61d5d 100644
--- a/main/res/menu/details_context.xml
+++ b/main/res/menu/details_context.xml
@@ -1,26 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cgeo="http://schemas.android.com/apk/res-auto" >
<item
android:id="@+id/menu_copy"
- android:title="@android:string/copy">
+ android:icon="@drawable/ic_menu_copy"
+ android:title="@android:string/copy"
+ cgeo:showAsAction="always|withText">
</item>
<item
android:id="@+id/menu_translate_to_sys_lang"
- android:title="@string/translate_to_sys_lang">
+ android:title="@string/translate_to_sys_lang"
+ cgeo:showAsAction="ifRoom">
</item>
<item
android:id="@+id/menu_translate_to_english"
- android:title="@string/translate_to_english">
+ android:title="@string/translate_to_english"
+ cgeo:showAsAction="ifRoom">
</item>
<item
android:id="@+id/menu_cache_share_field"
- android:title="@string/cache_share_field">
+ android:title="@string/cache_share_field"
+ cgeo: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">
+ android:visible="false"
+ cgeo: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 75d0ca0..0726267 100644
--- a/main/res/menu/images_list_context.xml
+++ b/main/res/menu/images_list_context.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cgeo="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/image_open_file"
+ cgeo:showAsAction="ifRoom|withText"
android:title="@string/cache_image_open_file">
</item>
<item
android:id="@+id/image_open_browser"
+ cgeo: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 a8622c5..5baacfc 100644
--- a/main/res/menu/logging_ui.xml
+++ b/main/res/menu/logging_ui.xml
@@ -1,14 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cgeo="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"
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"
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 fc949dc..6e5a198 100644
--- a/main/res/menu/main_activity_options.xml
+++ b/main/res/menu/main_activity_options.xml
@@ -1,34 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cgeo="http://schemas.android.com/apk/res-auto" >
+ <!-- TODO: use ic_action_search -->
<item
- android:id="@+id/menu_settings"
- android:icon="@drawable/ic_menu_preferences"
- android:title="@string/menu_settings">
- </item>
+ android:id="@+id/menu_gosearch"
+ 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"/>
<item
android:id="@+id/menu_history"
android:icon="@drawable/ic_menu_recent_history"
- android:title="@string/menu_history">
+ android:title="@string/menu_history"
+ cgeo:showAsAction="ifRoom">
</item>
<item
android:id="@+id/menu_pocket_queries"
android:icon="@drawable/ic_menu_account_list"
- android:title="@string/menu_pocket_queries">
+ android:title="@string/menu_pocket_queries"
+ cgeo:showAsAction="ifRoom">
+ </item>
+ <item
+ android:id="@+id/menu_settings"
+ android:icon="@drawable/ic_menu_preferences"
+ android:title="@string/menu_settings"
+ cgeo:showAsAction="ifRoom">
</item>
<item
android:id="@+id/menu_helpers"
android:icon="@drawable/ic_menu_shopping"
- android:title="@string/menu_helpers">
+ android:title="@string/menu_helpers"
+ cgeo:showAsAction="ifRoom">
</item>
<item
android:id="@+id/menu_scan"
android:icon="@drawable/ic_menu_barcode"
- android:title="@string/menu_scan_geo">
+ android:title="@string/menu_scan_geo"
+ cgeo:showAsAction="ifRoom">
</item>
<item
android:id="@+id/menu_about"
android:icon="@drawable/ic_menu_info_details"
- android:title="@string/menu_about">
+ android:title="@string/menu_about"
+ cgeo: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 d81a49b..4c1dfd7 100644
--- a/main/res/menu/map_activity.xml
+++ b/main/res/menu/map_activity.xml
@@ -1,10 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cgeo="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"/>
+ <item
android:id="@+id/menu_select_mapview"
android:icon="@drawable/ic_menu_mapmode"
- android:title="@string/map_view_map">
+ android:title="@string/map_view_map"
+ cgeo:showAsAction="ifRoom|withText">
<menu>
<group
android:id="@+id/menu_group_map_sources"
@@ -15,42 +23,51 @@
<item
android:id="@+id/menu_map_live"
android:icon="@drawable/ic_menu_refresh"
- android:title="@string/map_live_disable">
+ android:title="@string/map_live_disable"
+ cgeo:showAsAction="ifRoom|withText">
</item>
<item
android:id="@+id/menu_store_caches"
- android:enabled="false"
android:icon="@drawable/ic_menu_set_as"
- android:title="@string/caches_store_offline">
+ android:title="@string/caches_store_offline"
+ cgeo:showAsAction="ifRoom|withText">
</item>
<item
android:id="@+id/submenu_modes"
android:icon="@drawable/ic_menu_mark"
- android:title="@string/map_modes">
+ android:title="@string/map_modes"
+ cgeo: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_hide">
+ android:title="@string/map_trail_show"
+ cgeo: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_hide">
- </item>
- <item
- android:id="@+id/menu_mycaches_mode"
- android:icon="@android:drawable/ic_menu_myplaces"
- android:title="@string/map_mycaches_hide">
+ android:title="@string/map_circles_show"
+ cgeo:showAsAction="ifRoom|withText">
</item>
<item
- android:id="@+id/menu_theme_mode"
- android:icon="@drawable/ic_menu_preferences"
- android:title="@string/map_theme_select">
+ 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">
</item>
</menu>
</item>
<item
+ android:id="@+id/menu_theme_mode"
+ android:icon="@drawable/ic_menu_preferences"
+ android:title="@string/map_theme_select"
+ cgeo:showAsAction="ifRoom|withText">
+ </item>
+ <item
android:id="@+id/submenu_strategy"
android:icon="@drawable/ic_menu_preferences"
android:title="@string/map_strategy">
diff --git a/main/res/menu/navigate_any_point_activity_options.xml b/main/res/menu/navigate_any_point_activity_options.xml
index 4f199e2..a17405b 100644
--- a/main/res/menu/navigate_any_point_activity_options.xml
+++ b/main/res/menu/navigate_any_point_activity_options.xml
@@ -1,25 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cgeo="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">
+ android:title="@string/cache_menu_navigate"
+ cgeo:showAsAction="ifRoom">
</item>
<item
android:id="@+id/menu_default_navigation"
android:icon="@drawable/ic_menu_compass"
- android:title="@string/cache_menu_navigate"> <!-- will be replaced in code -->
+ android:title="@string/cache_menu_navigate"
+ cgeo: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">
+ android:title="@string/cache_menu_around"
+ cgeo:showAsAction="ifRoom">
</item>
<item
android:id="@+id/menu_clear_history"
android:icon="@drawable/ic_menu_delete"
- android:title="@string/search_clear_history">
+ android:title="@string/search_clear_history"
+ cgeo: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 fcd7401..c4ee62b 100644
--- a/main/res/menu/search_activity_options.xml
+++ b/main/res/menu/search_activity_options.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cgeo="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">
+ android:title="@string/search_own_caches"
+ cgeo:showAsAction="ifRoom|withText"
+ >
</item>
</menu> \ No newline at end of file
diff --git a/main/res/menu/static_maps_activity_options.xml b/main/res/menu/static_maps_activity_options.xml
index 7850c92..8621153 100644
--- a/main/res/menu/static_maps_activity_options.xml
+++ b/main/res/menu/static_maps_activity_options.xml
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cgeo="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
android:icon="@drawable/ic_menu_refresh"
+ cgeo: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 ddf45f6..60eaa9e 100644
--- a/main/res/menu/trackable_activity.xml
+++ b/main/res/menu/trackable_activity.xml
@@ -1,14 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cgeo="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_log_touch"
android:icon="@drawable/ic_menu_agenda"
+ cgeo: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"
android:title="@string/trackable_browser_open">
</item>
diff --git a/main/res/menu/waypoint_options.xml b/main/res/menu/waypoint_options.xml
index f03cca6..5aaeac2 100644
--- a/main/res/menu/waypoint_options.xml
+++ b/main/res/menu/waypoint_options.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cgeo="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_waypoint_reset_cache_coords"
generated by cgit v1.1 at 2025-11-10 13:52:14 +0000