From 96085791963ff0bfb1e50dc5769800648d887cdb Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Thu, 2 May 2013 18:37:09 +0200
Subject: refactoring: use menu resources instead of code

---
 main/res/menu/abstract_logging_activity.xml        | 22 ++++++
 main/res/menu/abstract_popup_activity.xml          | 35 +++++++++
 main/res/menu/compass_activity_options.xml         | 25 +++++++
 main/res/menu/logging_ui.xml                       | 13 ++++
 main/res/menu/main_activity_options.xml            | 30 ++++++++
 main/res/menu/main_options.xml                     | 30 --------
 main/res/menu/map_activity.xml                     | 85 ++++++++++++++++++++++
 .../menu/navigate_any_point_activity_options.xml   | 24 ++++++
 main/res/menu/search_activity_options.xml          | 10 +++
 main/res/menu/settings_activity_options.xml        |  8 ++
 main/res/menu/static_maps_activity_options.xml     |  8 ++
 main/res/menu/trackable_activity.xml               | 15 ++++
 12 files changed, 275 insertions(+), 30 deletions(-)
 create mode 100644 main/res/menu/abstract_logging_activity.xml
 create mode 100644 main/res/menu/abstract_popup_activity.xml
 create mode 100644 main/res/menu/compass_activity_options.xml
 create mode 100644 main/res/menu/logging_ui.xml
 create mode 100644 main/res/menu/main_activity_options.xml
 delete mode 100644 main/res/menu/main_options.xml
 create mode 100644 main/res/menu/map_activity.xml
 create mode 100644 main/res/menu/navigate_any_point_activity_options.xml
 create mode 100644 main/res/menu/search_activity_options.xml
 create mode 100644 main/res/menu/settings_activity_options.xml
 create mode 100644 main/res/menu/static_maps_activity_options.xml
 create mode 100644 main/res/menu/trackable_activity.xml

(limited to 'main/res/menu')

diff --git a/main/res/menu/abstract_logging_activity.xml b/main/res/menu/abstract_logging_activity.xml
new file mode 100644
index 0000000..e041b37
--- /dev/null
+++ b/main/res/menu/abstract_logging_activity.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/menu_signature"
+        android:icon="@drawable/ic_menu_edit"
+        android:title="@string/init_signature">
+    </item>
+    <item
+        android:id="@+id/menu_templates"
+        android:icon="@drawable/ic_menu_add"
+        android:title="@string/log_add">
+        <menu/> <!-- filled dynamically -->
+    </item>
+    <item
+        android:id="@+id/menu_smilies"
+        android:icon="@drawable/ic_menu_emoticons"
+        android:title="@string/log_smilies">
+        <menu/> <!-- filled dynamically -->
+    </item>
+
+</menu>
\ No newline at end of file
diff --git a/main/res/menu/abstract_popup_activity.xml b/main/res/menu/abstract_popup_activity.xml
new file mode 100644
index 0000000..855a756
--- /dev/null
+++ b/main/res/menu/abstract_popup_activity.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/menu_default_navigation"
+        android:icon="@drawable/ic_menu_compass"
+        android:title="@string/cache_menu_navigate"> <!-- 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_log_visit_offline"
+        android:icon="@drawable/ic_menu_edit"
+        android:title="@string/cache_menu_visit_offline">
+    </item>
+    <item
+        android:id="@+id/menu_log_visit"
+        android:icon="@drawable/ic_menu_edit"
+        android:title="@string/cache_menu_visit">
+    </item>
+    <item
+        android:id="@+id/menu_caches_around"
+        android:icon="@drawable/ic_menu_rotate"
+        android:title="@string/cache_menu_around">
+    </item>
+    <item
+        android:id="@+id/menu_show_in_browser"
+        android:icon="@drawable/ic_menu_info_details"
+        android:title="@string/cache_menu_browser">
+    </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
new file mode 100644
index 0000000..7a6d570
--- /dev/null
+++ b/main/res/menu/compass_activity_options.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <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 -->
+    </item>
+</menu>
\ No newline at end of file
diff --git a/main/res/menu/logging_ui.xml b/main/res/menu/logging_ui.xml
new file mode 100644
index 0000000..f345d4a
--- /dev/null
+++ b/main/res/menu/logging_ui.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:id="@+id/menu_log_visit_offline"
+        android:icon="@drawable/ic_menu_edit"
+        android:title="@string/cache_menu_visit_offline">
+    </item>
+    <item
+        android:id="@+id/menu_log_visit"
+        android:icon="@drawable/ic_menu_edit"
+        android:title="@string/cache_menu_visit">
+    </item>
+</menu>
\ No newline at end of file
diff --git a/main/res/menu/main_activity_options.xml b/main/res/menu/main_activity_options.xml
new file mode 100644
index 0000000..e06e948
--- /dev/null
+++ b/main/res/menu/main_activity_options.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/menu_settings"
+        android:icon="@drawable/ic_menu_preferences"
+        android:title="@string/menu_settings">
+    </item>
+    <item
+        android:id="@+id/menu_history"
+        android:icon="@drawable/ic_menu_recent_history"
+        android:title="@string/menu_history">
+    </item>
+    <item
+        android:id="@+id/menu_helpers"
+        android:icon="@drawable/ic_menu_shopping"
+        android:title="@string/menu_helpers">
+    </item>
+    <item
+        android:id="@+id/menu_scan"
+        android:icon="@drawable/ic_menu_barcode"
+        android:title="@string/menu_scan_geo">
+    </item>
+    <item
+        android:id="@+id/menu_about"
+        android:icon="@drawable/ic_menu_info_details"
+        android:title="@string/menu_about">
+    </item>
+
+</menu>
\ No newline at end of file
diff --git a/main/res/menu/main_options.xml b/main/res/menu/main_options.xml
deleted file mode 100644
index e06e948..0000000
--- a/main/res/menu/main_options.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/menu_settings"
-        android:icon="@drawable/ic_menu_preferences"
-        android:title="@string/menu_settings">
-    </item>
-    <item
-        android:id="@+id/menu_history"
-        android:icon="@drawable/ic_menu_recent_history"
-        android:title="@string/menu_history">
-    </item>
-    <item
-        android:id="@+id/menu_helpers"
-        android:icon="@drawable/ic_menu_shopping"
-        android:title="@string/menu_helpers">
-    </item>
-    <item
-        android:id="@+id/menu_scan"
-        android:icon="@drawable/ic_menu_barcode"
-        android:title="@string/menu_scan_geo">
-    </item>
-    <item
-        android:id="@+id/menu_about"
-        android:icon="@drawable/ic_menu_info_details"
-        android:title="@string/menu_about">
-    </item>
-
-</menu>
\ No newline at end of file
diff --git a/main/res/menu/map_activity.xml b/main/res/menu/map_activity.xml
new file mode 100644
index 0000000..d76f5ca
--- /dev/null
+++ b/main/res/menu/map_activity.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/menu_select_mapview"
+        android:icon="@drawable/ic_menu_mapmode"
+        android:title="@string/map_view_map">
+        <menu>
+            <group
+                android:id="@+id/menu_group_map_sources"
+                android:checkableBehavior="single" >
+            </group>
+        </menu>
+    </item>
+    <item
+        android:id="@+id/menu_map_live"
+        android:icon="@drawable/ic_menu_refresh"
+        android:title="@string/map_live_disable">
+    </item>
+    <item
+        android:id="@+id/menu_store_caches"
+        android:enabled="false"
+        android:icon="@drawable/ic_menu_set_as"
+        android:title="@string/caches_store_offline">
+    </item>
+    <item
+        android:id="@+id/submenu_modes"
+        android:icon="@drawable/ic_menu_mark"
+        android:title="@string/map_modes">
+        <menu>
+            <item
+                android:id="@+id/menu_trail_mode"
+                android:icon="@drawable/ic_menu_trail"
+                android:title="@string/map_trail_hide">
+            </item>
+            <item
+                android:id="@+id/menu_circle_mode"
+                android:icon="@drawable/ic_menu_circle"
+                android:title="@string/map_circles_hide">
+            </item>
+            <item
+                android:id="@+id/menu_theme_mode"
+                android:icon="@drawable/ic_menu_preferences"
+                android:title="@string/map_theme_select">
+            </item>
+        </menu>
+    </item>
+    <item
+        android:id="@+id/submenu_strategy"
+        android:icon="@drawable/ic_menu_preferences"
+        android:title="@string/map_strategy">
+        <menu>
+            <group
+                android:id="@+id/menu_group_strategy"
+                android:checkableBehavior="single" >
+                <item
+                    android:id="@+id/menu_strategy_fastest"
+                    android:checkable="true"
+                    android:title="@string/map_strategy_fastest">
+                </item>
+                <item
+                    android:id="@+id/menu_strategy_fast"
+                    android:checkable="true"
+                    android:title="@string/map_strategy_fast">
+                </item>
+                <item
+                    android:id="@+id/menu_strategy_auto"
+                    android:checkable="true"
+                    android:title="@string/map_strategy_auto">
+                </item>
+                <item
+                    android:id="@+id/menu_strategy_detailed"
+                    android:checkable="true"
+                    android:title="@string/map_strategy_detailed">
+                </item>
+            </group>
+        </menu>
+    </item>
+    <item
+        android:id="@+id/menu_as_list"
+        android:icon="@drawable/ic_menu_agenda"
+        android:title="@string/map_as_list">
+    </item>
+
+</menu>
\ No newline at end of file
diff --git a/main/res/menu/navigate_any_point_activity_options.xml b/main/res/menu/navigate_any_point_activity_options.xml
new file mode 100644
index 0000000..9207e94
--- /dev/null
+++ b/main/res/menu/navigate_any_point_activity_options.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:id="@+id/menu_navigate"
+        android:icon="@drawable/ic_menu_mapmode"
+        android:title="@string/cache_menu_navigate">
+    </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 -->
+    </item>
+        <item
+        android:id="@+id/menu_caches_around"
+        android:icon="@drawable/ic_menu_rotate"
+        android:title="@string/cache_menu_around">
+    </item>
+        <item
+        android:id="@+id/menu_clear_history"
+        android:icon="@drawable/ic_menu_delete"
+        android:title="@string/search_clear_history">
+    </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
new file mode 100644
index 0000000..68eb569
--- /dev/null
+++ b/main/res/menu/search_activity_options.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:id="@+id/menu_search_own_caches"
+        android:icon="@drawable/ic_menu_myplaces"
+        android:title="@string/search_own_caches">
+    </item>
+    
+
+</menu>
\ No newline at end of file
diff --git a/main/res/menu/settings_activity_options.xml b/main/res/menu/settings_activity_options.xml
new file mode 100644
index 0000000..ba75f91
--- /dev/null
+++ b/main/res/menu/settings_activity_options.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:id="@+id/menu_clear"
+        android:icon="@drawable/ic_menu_delete"
+        android:title="@string/init_clear">
+    </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
new file mode 100644
index 0000000..29410dd
--- /dev/null
+++ b/main/res/menu/static_maps_activity_options.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:id="@+id/menu_refresh"
+        android:icon="@drawable/ic_menu_refresh"
+        android:title="@string/cache_offline_refresh">
+    </item>
+</menu>
\ No newline at end of file
diff --git a/main/res/menu/trackable_activity.xml b/main/res/menu/trackable_activity.xml
new file mode 100644
index 0000000..ddf45f6
--- /dev/null
+++ b/main/res/menu/trackable_activity.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/menu_log_touch"
+        android:icon="@drawable/ic_menu_agenda"
+        android:title="@string/trackable_log_touch">
+    </item>
+    <item
+        android:id="@+id/menu_browser_trackable"
+        android:icon="@drawable/ic_menu_info_details"
+        android:title="@string/trackable_browser_open">
+    </item>
+
+</menu>
\ No newline at end of file
-- 
cgit v1.1