diff options
Diffstat (limited to 'main/res')
35 files changed, 115 insertions, 137 deletions
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 754a9e1..2b2f1eb 100644 --- a/main/res/menu/map_activity.xml +++ b/main/res/menu/map_activity.xml @@ -1,18 +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_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" android:showAsAction="ifRoom|withText" - cgeo:showAsAction="ifRoom|withText"> + android:title="@string/map_view_map" + app:showAsAction="ifRoom|withText"> <menu> <group android:id="@+id/menu_group_map_sources" @@ -20,58 +21,56 @@ </group> </menu> </item> - - <item android:id="@+id/menu_map_live" android:icon="@drawable/ic_menu_refresh" - android:title="@string/map_live_disable" android:showAsAction="ifRoom|withText" - cgeo:showAsAction="ifRoom|withText"> + android:title="@string/map_live_disable" + 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" android:showAsAction="ifRoom|withText" - cgeo:showAsAction="ifRoom|withText"> + android:title="@string/caches_store_offline" + app:showAsAction="ifRoom|withText"> </item> <item android:id="@+id/submenu_modes" android:icon="@drawable/ic_menu_mark" - android:title="@string/map_modes" android:showAsAction="ifRoom|withText" - cgeo:showAsAction="ifRoom|withText"> + android:title="@string/map_modes" + 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> <item android:id="@+id/menu_theme_mode" android:icon="@drawable/ic_menu_preferences" - android:title="@string/map_theme_select" android:showAsAction="ifRoom|withText" - cgeo:showAsAction="ifRoom|withText"> + android:title="@string/map_theme_select" + 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/values-ca/strings.xml b/main/res/values-ca/strings.xml index ddc2bcb..f72f2ea 100644 --- a/main/res/values-ca/strings.xml +++ b/main/res/values-ca/strings.xml @@ -246,7 +246,6 @@ <string name="caches_history">Historial</string> <string name="caches_on_map">Mostra al mapa</string> <string name="caches_sort">Ordena</string> - <string name="caches_sort_title">Ordena per</string> <string name="caches_sort_distance">Distància</string> <string name="caches_sort_difficulty">Dificultat</string> <string name="caches_sort_terrain">Terreny</string> diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index 66af8e6..da33de2 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -246,7 +246,6 @@ <string name="caches_history">Verlauf</string> <string name="caches_on_map">Zeige auf Karte</string> <string name="caches_sort">Sortierung</string> - <string name="caches_sort_title">Sortieren nach</string> <string name="caches_sort_distance">Entfernung</string> <string name="caches_sort_difficulty">Schwierigkeit</string> <string name="caches_sort_terrain">Gelände</string> diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml index 8915376..b459881 100644 --- a/main/res/values-es/strings.xml +++ b/main/res/values-es/strings.xml @@ -242,7 +242,6 @@ <string name="caches_history">Historial</string> <string name="caches_on_map">Ver en mapa</string> <string name="caches_sort">Ordenar</string> - <string name="caches_sort_title">Ordenar por</string> <string name="caches_sort_distance">distancia</string> <string name="caches_sort_difficulty">dificultad</string> <string name="caches_sort_terrain">terreno</string> diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml index 3c77839..827d5ae 100644 --- a/main/res/values-fr/strings.xml +++ b/main/res/values-fr/strings.xml @@ -245,7 +245,6 @@ <string name="caches_history">Historique</string> <string name="caches_on_map">Voir sur la carte</string> <string name="caches_sort">Trier</string> - <string name="caches_sort_title">Trier par</string> <string name="caches_sort_distance">Distance</string> <string name="caches_sort_difficulty">Difficulté</string> <string name="caches_sort_terrain">Terrain</string> diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml index e9c9d23..8df057b 100644 --- a/main/res/values-hu/strings.xml +++ b/main/res/values-hu/strings.xml @@ -199,7 +199,6 @@ <string name="caches_history">Előzmények</string> <string name="caches_on_map">Mutasd meg térképen</string> <string name="caches_sort">Rendezés</string> - <string name="caches_sort_title">Rendezés eszerint</string> <string name="caches_sort_distance">távolság</string> <string name="caches_sort_difficulty">nehézség</string> <string name="caches_sort_terrain">terep</string> diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml index f2433f2..f70ccde 100644 --- a/main/res/values-it/strings.xml +++ b/main/res/values-it/strings.xml @@ -246,7 +246,6 @@ <string name="caches_history">Cronologia</string> <string name="caches_on_map">Visualizza sulla mappa</string> <string name="caches_sort">Ordina</string> - <string name="caches_sort_title">Ordina per</string> <string name="caches_sort_distance">Distanza</string> <string name="caches_sort_difficulty">Difficoltà</string> <string name="caches_sort_terrain">Terreno</string> diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml index c5caa60..4f3a804 100644 --- a/main/res/values-ja/strings.xml +++ b/main/res/values-ja/strings.xml @@ -236,7 +236,6 @@ <string name="caches_history">履歴</string> <string name="caches_on_map">地図で表示</string> <string name="caches_sort">並び替え</string> - <string name="caches_sort_title">並び替え</string> <string name="caches_sort_distance">距離</string> <string name="caches_sort_difficulty">難易度</string> <string name="caches_sort_terrain">地形</string> diff --git a/main/res/values-lt/strings.xml b/main/res/values-lt/strings.xml index 174f75b..9065d43 100644 --- a/main/res/values-lt/strings.xml +++ b/main/res/values-lt/strings.xml @@ -247,7 +247,6 @@ <string name="caches_history">Istorija</string> <string name="caches_on_map">Rodyti žemėlapyje</string> <string name="caches_sort">Rūšiuoti</string> - <string name="caches_sort_title">Rūšiuoti pagal</string> <string name="caches_sort_distance">Atstumą</string> <string name="caches_sort_difficulty">Sudėtingumą</string> <string name="caches_sort_terrain">Vietovę</string> diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml index 1a84609..07ef9da 100644 --- a/main/res/values-nb/strings.xml +++ b/main/res/values-nb/strings.xml @@ -243,7 +243,6 @@ <string name="caches_history">Historikk</string> <string name="caches_on_map">Vis på kartet</string> <string name="caches_sort">Sorter</string> - <string name="caches_sort_title">Sorter etter</string> <string name="caches_sort_distance">Avstand</string> <string name="caches_sort_difficulty">Vanskelighet</string> <string name="caches_sort_terrain">Terreng</string> diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml index a2fec76..4f4f9e9 100644 --- a/main/res/values-nl/strings.xml +++ b/main/res/values-nl/strings.xml @@ -246,7 +246,6 @@ <string name="caches_history">Geschiedenis</string> <string name="caches_on_map">Toon op kaart</string> <string name="caches_sort">Sorteren</string> - <string name="caches_sort_title">Sorteer op</string> <string name="caches_sort_distance">Afstand</string> <string name="caches_sort_difficulty">Moeilijkheid</string> <string name="caches_sort_terrain">Terrein</string> diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml index c1751cf..adc689a 100644 --- a/main/res/values-pl/strings.xml +++ b/main/res/values-pl/strings.xml @@ -245,7 +245,6 @@ <string name="caches_history">Historia</string> <string name="caches_on_map">Pokaż na mapie</string> <string name="caches_sort">Sortuj</string> - <string name="caches_sort_title">Sortuj według</string> <string name="caches_sort_distance">Odległość</string> <string name="caches_sort_difficulty">Trudność</string> <string name="caches_sort_terrain">Teren</string> diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml index fa31708..56d94fd 100644 --- a/main/res/values-pt/strings.xml +++ b/main/res/values-pt/strings.xml @@ -243,7 +243,6 @@ <string name="caches_history">Histórico</string> <string name="caches_on_map">Mostrar no mapa</string> <string name="caches_sort">Ordenar</string> - <string name="caches_sort_title">Ordenar por</string> <string name="caches_sort_distance">Distância</string> <string name="caches_sort_difficulty">Dificuldade</string> <string name="caches_sort_terrain">Terreno</string> diff --git a/main/res/values-ro/strings.xml b/main/res/values-ro/strings.xml index f292d36..5f75f85 100644 --- a/main/res/values-ro/strings.xml +++ b/main/res/values-ro/strings.xml @@ -241,7 +241,6 @@ <string name="caches_history">Istoric</string> <string name="caches_on_map">Arată pe hartă</string> <string name="caches_sort">Sortare</string> - <string name="caches_sort_title">Sortare după</string> <string name="caches_sort_distance">Distanţă</string> <string name="caches_sort_difficulty">Dificultate</string> <string name="caches_sort_terrain">Teren</string> diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml index 7d342ad..80f93b4 100644 --- a/main/res/values-sk/strings.xml +++ b/main/res/values-sk/strings.xml @@ -242,7 +242,6 @@ <string name="caches_history">História</string> <string name="caches_on_map">Zobraziť na mape</string> <string name="caches_sort">Zoradiť</string> - <string name="caches_sort_title">Zoradiť podľa</string> <string name="caches_sort_distance">vzdialenosti</string> <string name="caches_sort_difficulty">náročnosti</string> <string name="caches_sort_terrain">terénu</string> diff --git a/main/res/values-sl/strings.xml b/main/res/values-sl/strings.xml index fe97481..12821ec 100644 --- a/main/res/values-sl/strings.xml +++ b/main/res/values-sl/strings.xml @@ -245,7 +245,6 @@ <string name="caches_history">Zgodovina</string> <string name="caches_on_map">Pokaži na zemljevidu</string> <string name="caches_sort">Razvrsti</string> - <string name="caches_sort_title">Razvrsti po</string> <string name="caches_sort_distance">Razdalja</string> <string name="caches_sort_difficulty">Težavnost</string> <string name="caches_sort_terrain">Teren</string> diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml index 1a01c1a..c9b8e97 100644 --- a/main/res/values-sv/strings.xml +++ b/main/res/values-sv/strings.xml @@ -244,7 +244,6 @@ <string name="caches_history">Senast hittade cacher</string> <string name="caches_on_map">Visa på karta</string> <string name="caches_sort">Sortering</string> - <string name="caches_sort_title">Sortera efter</string> <string name="caches_sort_distance">Avstånd</string> <string name="caches_sort_difficulty">Svårighet</string> <string name="caches_sort_terrain">Terräng</string> diff --git a/main/res/values/dimens.xml b/main/res/values/dimens.xml index ab09412..9ef3b56 100644 --- a/main/res/values/dimens.xml +++ b/main/res/values/dimens.xml @@ -5,8 +5,4 @@ <dimen name="actionbar_separator_height">37dip</dimen> <dimen name="actionbar_separator_width">2dip</dimen> - <!-- Dimensions for Samsung Multi-Window support --> - <dimen name="app_defaultsize_w">632.0dip</dimen> - <dimen name="app_defaultsize_h">598.0dip</dimen> - </resources>
\ No newline at end of file diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 86067cc..74b2ab7 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -274,7 +274,6 @@ <string name="caches_history">History</string> <string name="caches_on_map">Show on map</string> <string name="caches_sort">Sort</string> - <string name="caches_sort_title">Sort by</string> <string name="caches_sort_distance">Distance</string> <string name="caches_sort_difficulty">Difficulty</string> <string name="caches_sort_terrain">Terrain</string> 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" |