diff options
39 files changed, 228 insertions, 242 deletions
diff --git a/main/lint.xml b/main/lint.xml index 29006d6..75569d2 100644 --- a/main/lint.xml +++ b/main/lint.xml @@ -11,6 +11,7 @@ </issue> <issue id="MissingTranslation" severity="ignore" /> <issue id="Registered" severity="ignore" /> + <issue id="UnusedAttribute" severity="ignore" /> <issue id="UnusedResources"> <ignore path="res/drawable-mdpi/attribute_maintenance.png" /> <ignore path="res/values/vpi__colors.xml" /> 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" diff --git a/main/src/cgeo/geocaching/ui/CacheListAdapter.java b/main/src/cgeo/geocaching/ui/CacheListAdapter.java index 2de1140..f132bda 100644 --- a/main/src/cgeo/geocaching/ui/CacheListAdapter.java +++ b/main/src/cgeo/geocaching/ui/CacheListAdapter.java @@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.eclipse.jdt.annotation.NonNull; +import android.annotation.SuppressLint; import android.app.Activity; import android.content.res.Resources; import android.graphics.drawable.Drawable; @@ -572,6 +573,7 @@ public class CacheListAdapter extends ArrayAdapter<Geocache> { } // Swipe on item + @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(final View view, final MotionEvent event) { return gestureDetector.onTouchEvent(event); diff --git a/main/thirdparty/android/support/v4/app/FragmentListActivity.java b/main/thirdparty/android/support/v4/app/FragmentListActivity.java index fa425ab..a7f8880 100644 --- a/main/thirdparty/android/support/v4/app/FragmentListActivity.java +++ b/main/thirdparty/android/support/v4/app/FragmentListActivity.java @@ -18,6 +18,8 @@ package android.support.v4.app; import org.eclipse.jdt.annotation.NonNull; +import android.annotation.SuppressLint; +import android.app.Activity; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -51,31 +53,31 @@ import android.widget.ListView; * The following code demonstrates an (ugly) custom screen layout. It has a list * with a green background, and an alternate red "no data" message. * </p> - * + * * <pre> * <?xml version="1.0" encoding="utf-8"?> * <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" * android:orientation="vertical" - * android:layout_width="fill_parent" + * android:layout_width="fill_parent" * android:layout_height="fill_parent" * android:paddingLeft="8dp" * android:paddingRight="8dp"> - * + * * <ListView android:id="@id/android:list" - * android:layout_width="fill_parent" + * android:layout_width="fill_parent" * android:layout_height="fill_parent" * android:background="#00FF00" * android:layout_weight="1" * android:drawSelectorOnTop="false"/> - * + * * <TextView android:id="@id/android:empty" - * android:layout_width="fill_parent" + * android:layout_width="fill_parent" * android:layout_height="fill_parent" * android:background="#FF0000" * android:text="No data"/> * </LinearLayout> * </pre> - * + * * <p> * <strong>Row Layout</strong> * </p> @@ -96,27 +98,27 @@ import android.widget.ListView; * source for the resource two_line_list_item, which displays two data * fields,one above the other, for each list row. * </p> - * + * * <pre> * <?xml version="1.0" encoding="utf-8"?> * <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" * android:layout_width="fill_parent" * android:layout_height="wrap_content" * android:orientation="vertical"> - * + * * <TextView android:id="@+id/text1" * android:textSize="16sp" * android:textStyle="bold" * android:layout_width="fill_parent" * android:layout_height="wrap_content"/> - * + * * <TextView android:id="@+id/text2" * android:textSize="16sp" * android:layout_width="fill_parent" * android:layout_height="wrap_content"/> * </LinearLayout> * </pre> - * + * * <p> * You must identify the data bound to each TextView object in this layout. The * syntax for this is discussed in the next section. @@ -137,40 +139,40 @@ import android.widget.ListView; * Contacts provider for all contacts, then binding the Name and Company fields * to a two line row layout in the activity's ListView. * </p> - * + * * <pre> * public class MyListAdapter extends FragmentListActivity { - * + * * @Override * protected void onCreate(Bundle savedInstanceState){ * super.onCreate(savedInstanceState); - * + * * // We'll define a custom screen layout here (the one shown above), but * // typically, you could just use the standard FragmentListActivity layout. * setContentView(R.layout.custom_list_activity_view); - * + * * // Query for all people contacts using the {@link android.provider.Contacts.People} convenience class. * // Put a managed wrapper around the retrieved cursor so we don't have to worry about * // requerying or closing it as the activity changes state. * mCursor = this.getContentResolver().query(People.CONTENT_URI, null, null, null, null); * startManagingCursor(mCursor); - * - * // Now create a new list adapter bound to the cursor. + * + * // Now create a new list adapter bound to the cursor. * // SimpleListAdapter is designed for binding to a Cursor. * ListAdapter adapter = new SimpleCursorAdapter( * this, // Context. - * android.R.layout.two_line_list_item, // Specify the row template to use (here, two columns bound to the two retrieved cursor + * android.R.layout.two_line_list_item, // Specify the row template to use (here, two columns bound to the two retrieved cursor * rows). * mCursor, // Pass in the cursor to bind to. * new String[] {People.NAME, People.COMPANY}, // Array of cursor columns to bind to. * new int[] {android.R.id.text1, android.R.id.text2}); // Parallel array of which template objects to bind to those columns. - * + * * // Bind to our new adapter. * setListAdapter(adapter); * } * } * </pre> - * + * * @see #setListAdapter * @see android.widget.ListView */ @@ -186,38 +188,38 @@ public class FragmentListActivity extends FragmentActivity { */ protected ListView mList; - private Handler mHandler = new Handler(); + private final Handler mHandler = new Handler(); private boolean mFinishedStart = false; - private Runnable mRequestFocus = new Runnable() { + private final Runnable mRequestFocus = new Runnable() { @Override public void run() { mList.focusableViewAvailable(mList); } }; - + /** * This method will be called when an item in the list is selected. * Subclasses should override. Subclasses can call * getListView().getItemAtPosition(position) if they need to access the * data associated with the selected item. - * + * * @param l The ListView where the click happened * @param v The view that was clicked within the ListView * @param position The position of the view in the list * @param id The row id of the item that was clicked */ - protected void onListItemClick(ListView l, View v, int position, long id) { + protected void onListItemClick(final ListView l, final View v, final int position, final long id) { } - + /** * Ensures the list view has been created before Activity restores all * of the view states. - * + * *@see Activity#onRestoreInstanceState(Bundle) */ @Override - protected void onRestoreInstanceState(@NonNull Bundle state) { + protected void onRestoreInstanceState(@NonNull final Bundle state) { ensureList(); super.onRestoreInstanceState(state); } @@ -225,13 +227,13 @@ public class FragmentListActivity extends FragmentActivity { /** * Updates the screen state (current list and other views) when the * content changes. - * + * * @see Activity#onContentChanged() */ @Override public void onContentChanged() { super.onContentChanged(); - View emptyView = findViewById(android.R.id.empty); + final View emptyView = findViewById(android.R.id.empty); mList = (ListView)findViewById(android.R.id.list); if (mList == null) { throw new RuntimeException( @@ -252,7 +254,7 @@ public class FragmentListActivity extends FragmentActivity { /** * Provide the cursor for the list view. */ - public void setListAdapter(ListAdapter adapter) { + public void setListAdapter(final ListAdapter adapter) { synchronized (this) { ensureList(); mAdapter = adapter; @@ -263,10 +265,10 @@ public class FragmentListActivity extends FragmentActivity { /** * Set the currently selected list item to the specified * position with the adapter's data - * + * * @param position */ - public void setSelection(int position) { + public void setSelection(final int position) { mList.setSelection(position); } @@ -291,7 +293,7 @@ public class FragmentListActivity extends FragmentActivity { ensureList(); return mList; } - + /** * Get the ListAdapter associated with this activity's ListView. */ @@ -299,17 +301,18 @@ public class FragmentListActivity extends FragmentActivity { return mAdapter; } + @SuppressLint("InlinedApi") private void ensureList() { if (mList != null) { return; } setContentView(android.R.layout.list_content); - + } - private AdapterView.OnItemClickListener mOnClickListener = new AdapterView.OnItemClickListener() { + private final AdapterView.OnItemClickListener mOnClickListener = new AdapterView.OnItemClickListener() { @Override - public void onItemClick(AdapterView<?> parent, View v, int position, long id) + public void onItemClick(final AdapterView<?> parent, final View v, final int position, final long id) { onListItemClick((ListView)parent, v, position, id); } diff --git a/main/thirdparty/com/viewpagerindicator/TitlePageIndicator.java b/main/thirdparty/com/viewpagerindicator/TitlePageIndicator.java index 0f922c5..49181a2 100644 --- a/main/thirdparty/com/viewpagerindicator/TitlePageIndicator.java +++ b/main/thirdparty/com/viewpagerindicator/TitlePageIndicator.java @@ -21,6 +21,7 @@ import cgeo.geocaching.R; import org.eclipse.jdt.annotation.NonNull; +import android.annotation.SuppressLint; import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; @@ -67,12 +68,12 @@ public class TitlePageIndicator extends View implements PageIndicator { public final int value; - IndicatorStyle(int value) { + IndicatorStyle(final int value) { this.value = value; } - public static IndicatorStyle fromValue(int value) { - for (IndicatorStyle style : IndicatorStyle.values()) { + public static IndicatorStyle fromValue(final int value) { + for (final IndicatorStyle style : IndicatorStyle.values()) { if (style.value == value) { return style; } @@ -91,12 +92,12 @@ public class TitlePageIndicator extends View implements PageIndicator { private boolean mBoldText; private int mColorText; private int mColorSelected; - private Path mPath = new Path(); + private final Path mPath = new Path(); private final Paint mPaintFooterLine; private IndicatorStyle mFooterIndicatorStyle; private final Paint mPaintFooterIndicator; private float mFooterIndicatorHeight; - private float mFooterIndicatorUnderlinePadding; + private final float mFooterIndicatorUnderlinePadding; private float mFooterPadding; private float mTitlePadding; private float mTopPadding; @@ -106,21 +107,21 @@ public class TitlePageIndicator extends View implements PageIndicator { private static final int INVALID_POINTER = -1; - private int mTouchSlop; + private final int mTouchSlop; private float mLastMotionX = -1; private int mActivePointerId = INVALID_POINTER; private boolean mIsDragging; - public TitlePageIndicator(Context context) { + public TitlePageIndicator(final Context context) { this(context, null); } - public TitlePageIndicator(Context context, AttributeSet attrs) { + public TitlePageIndicator(final Context context, final AttributeSet attrs) { this(context, attrs, R.attr.vpiTitlePageIndicatorStyle); } - public TitlePageIndicator(Context context, AttributeSet attrs, int defStyle) { + public TitlePageIndicator(final Context context, final AttributeSet attrs, final int defStyle) { super(context, attrs, defStyle); //Load defaults from resources @@ -140,7 +141,7 @@ public class TitlePageIndicator extends View implements PageIndicator { final float defaultTopPadding = res.getDimension(R.dimen.default_title_indicator_top_padding); //Retrieve styles attributes - TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.TitlePageIndicator, defStyle, R.style.Widget_TitlePageIndicator); + final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.TitlePageIndicator, defStyle, R.style.Widget_TitlePageIndicator); //Retrieve the colors to be used for this view and apply them. mFooterLineHeight = a.getDimension(R.styleable.TitlePageIndicator_footerLineHeight, defaultFooterLineHeight); @@ -179,7 +180,7 @@ public class TitlePageIndicator extends View implements PageIndicator { return mPaintFooterLine.getColor(); } - public void setFooterColor(int footerColor) { + public void setFooterColor(final int footerColor) { mPaintFooterLine.setColor(footerColor); mPaintFooterIndicator.setColor(footerColor); invalidate(); @@ -189,7 +190,7 @@ public class TitlePageIndicator extends View implements PageIndicator { return mFooterLineHeight; } - public void setFooterLineHeight(float footerLineHeight) { + public void setFooterLineHeight(final float footerLineHeight) { mFooterLineHeight = footerLineHeight; mPaintFooterLine.setStrokeWidth(mFooterLineHeight); invalidate(); @@ -199,7 +200,7 @@ public class TitlePageIndicator extends View implements PageIndicator { return mFooterIndicatorHeight; } - public void setFooterIndicatorHeight(float footerTriangleHeight) { + public void setFooterIndicatorHeight(final float footerTriangleHeight) { mFooterIndicatorHeight = footerTriangleHeight; invalidate(); } @@ -208,7 +209,7 @@ public class TitlePageIndicator extends View implements PageIndicator { return mFooterPadding; } - public void setFooterIndicatorPadding(float footerIndicatorPadding) { + public void setFooterIndicatorPadding(final float footerIndicatorPadding) { mFooterPadding = footerIndicatorPadding; invalidate(); } @@ -217,7 +218,7 @@ public class TitlePageIndicator extends View implements PageIndicator { return mFooterIndicatorStyle; } - public void setFooterIndicatorStyle(IndicatorStyle indicatorStyle) { + public void setFooterIndicatorStyle(final IndicatorStyle indicatorStyle) { mFooterIndicatorStyle = indicatorStyle; invalidate(); } @@ -226,7 +227,7 @@ public class TitlePageIndicator extends View implements PageIndicator { return mColorSelected; } - public void setSelectedColor(int selectedColor) { + public void setSelectedColor(final int selectedColor) { mColorSelected = selectedColor; invalidate(); } @@ -235,7 +236,7 @@ public class TitlePageIndicator extends View implements PageIndicator { return mBoldText; } - public void setSelectedBold(boolean selectedBold) { + public void setSelectedBold(final boolean selectedBold) { mBoldText = selectedBold; invalidate(); } @@ -244,7 +245,7 @@ public class TitlePageIndicator extends View implements PageIndicator { return mColorText; } - public void setTextColor(int textColor) { + public void setTextColor(final int textColor) { mPaintText.setColor(textColor); mColorText = textColor; invalidate(); @@ -254,7 +255,7 @@ public class TitlePageIndicator extends View implements PageIndicator { return mPaintText.getTextSize(); } - public void setTextSize(float textSize) { + public void setTextSize(final float textSize) { mPaintText.setTextSize(textSize); invalidate(); } @@ -263,7 +264,7 @@ public class TitlePageIndicator extends View implements PageIndicator { return this.mTitlePadding; } - public void setTitlePadding(float titlePadding) { + public void setTitlePadding(final float titlePadding) { mTitlePadding = titlePadding; invalidate(); } @@ -272,7 +273,7 @@ public class TitlePageIndicator extends View implements PageIndicator { return this.mTopPadding; } - public void setTopPadding(float topPadding) { + public void setTopPadding(final float topPadding) { mTopPadding = topPadding; invalidate(); } @@ -281,7 +282,7 @@ public class TitlePageIndicator extends View implements PageIndicator { return this.mClipPadding; } - public void setClipPadding(float clipPadding) { + public void setClipPadding(final float clipPadding) { mClipPadding = clipPadding; invalidate(); } @@ -292,7 +293,7 @@ public class TitlePageIndicator extends View implements PageIndicator { * @see android.view.View#onDraw(android.graphics.Canvas) */ @Override - protected void onDraw(Canvas canvas) { + protected void onDraw(final Canvas canvas) { super.onDraw(canvas); if (mViewPager == null) { @@ -304,7 +305,7 @@ public class TitlePageIndicator extends View implements PageIndicator { } //Calculate views bounds - ArrayList<RectF> bounds = calculateAllBounds(mPaintText); + final ArrayList<RectF> bounds = calculateAllBounds(mPaintText); //Make sure we're on a page that still exists if (mCurrentPage >= bounds.size()) { @@ -333,8 +334,8 @@ public class TitlePageIndicator extends View implements PageIndicator { final float selectedPercent = (SELECTION_FADE_PERCENTAGE - offsetPercent) / SELECTION_FADE_PERCENTAGE; //Verify if the current view must be clipped to the screen - RectF curPageBound = bounds.get(mCurrentPage); - float curPageWidth = curPageBound.right - curPageBound.left; + final RectF curPageBound = bounds.get(mCurrentPage); + final float curPageWidth = curPageBound.right - curPageBound.left; if (curPageBound.left < leftClip) { //Try to clip to the screen (left side) clipViewOnTheLeft(curPageBound, curPageWidth, left); @@ -347,14 +348,14 @@ public class TitlePageIndicator extends View implements PageIndicator { //Left views starting from the current position if (mCurrentPage > 0) { for (int i = mCurrentPage - 1; i >= 0; i--) { - RectF bound = bounds.get(i); + final RectF bound = bounds.get(i); //Is left side is outside the screen if (bound.left < leftClip) { - float w = bound.right - bound.left; + final float w = bound.right - bound.left; //Try to clip to the screen (left side) clipViewOnTheLeft(bound, w, left); //Except if there's an intersection with the right view - RectF rightBound = bounds.get(i + 1); + final RectF rightBound = bounds.get(i + 1); //Intersection if (bound.right + mTitlePadding > rightBound.left) { bound.left = rightBound.left - w - mTitlePadding; @@ -366,14 +367,14 @@ public class TitlePageIndicator extends View implements PageIndicator { //Right views starting from the current position if (mCurrentPage < countMinusOne) { for (int i = mCurrentPage + 1 ; i < count; i++) { - RectF bound = bounds.get(i); + final RectF bound = bounds.get(i); //If right side is outside the screen if (bound.right > rightClip) { - float w = bound.right - bound.left; + final float w = bound.right - bound.left; //Try to clip to the screen (right side) clipViewOnTheRight(bound, w, right); //Except if there's an intersection with the left view - RectF leftBound = bounds.get(i - 1); + final RectF leftBound = bounds.get(i - 1); //Intersection if (bound.left - mTitlePadding < leftBound.right) { bound.left = leftBound.right + mTitlePadding; @@ -386,7 +387,7 @@ public class TitlePageIndicator extends View implements PageIndicator { //Now draw views for (int i = 0; i < count; i++) { //Get the title - RectF bound = bounds.get(i); + final RectF bound = bounds.get(i); //Only if one side is visible if ((bound.left > left && bound.left < right) || (bound.right > left && bound.right < right)) { final boolean currentPage = (i == page); @@ -428,7 +429,7 @@ public class TitlePageIndicator extends View implements PageIndicator { break; } - RectF underlineBounds = bounds.get(page); + final RectF underlineBounds = bounds.get(page); mPath.reset(); mPath.moveTo(underlineBounds.left - mFooterIndicatorUnderlinePadding, height - mFooterLineHeight); mPath.lineTo(underlineBounds.right + mFooterIndicatorUnderlinePadding, height - mFooterLineHeight); @@ -446,8 +447,9 @@ public class TitlePageIndicator extends View implements PageIndicator { } } + @SuppressLint("ClickableViewAccessibility") @Override - public boolean onTouchEvent(@NonNull android.view.MotionEvent ev) { + public boolean onTouchEvent(@NonNull final android.view.MotionEvent ev) { if ((mViewPager == null) || (mViewPager.getAdapter().getCount() == 0)) { return false; } @@ -537,7 +539,7 @@ public class TitlePageIndicator extends View implements PageIndicator { * @param curViewWidth * width of the view. */ - private void clipViewOnTheRight(RectF curViewBound, float curViewWidth, int right) { + private void clipViewOnTheRight(final RectF curViewBound, final float curViewWidth, final int right) { curViewBound.right = right - mClipPadding; curViewBound.left = curViewBound.right - curViewWidth; } @@ -550,7 +552,7 @@ public class TitlePageIndicator extends View implements PageIndicator { * @param curViewWidth * width of the view. */ - private void clipViewOnTheLeft(RectF curViewBound, float curViewWidth, int left) { + private void clipViewOnTheLeft(final RectF curViewBound, final float curViewWidth, final int left) { curViewBound.left = left + mClipPadding; curViewBound.right = mClipPadding + curViewWidth; } @@ -562,16 +564,16 @@ public class TitlePageIndicator extends View implements PageIndicator { * @param currentIndex * @return */ - private ArrayList<RectF> calculateAllBounds(Paint paint) { - ArrayList<RectF> list = new ArrayList<RectF>(); + private ArrayList<RectF> calculateAllBounds(final Paint paint) { + final ArrayList<RectF> list = new ArrayList<RectF>(); //For each views (If no values then add a fake one) final int count = mViewPager.getAdapter().getCount(); final int width = getWidth(); final int halfWidth = width / 2; for (int i = 0; i < count; i++) { - RectF bounds = calcBounds(i, paint); - float w = (bounds.right - bounds.left); - float h = (bounds.bottom - bounds.top); + final RectF bounds = calcBounds(i, paint); + final float w = (bounds.right - bounds.left); + final float h = (bounds.bottom - bounds.top); bounds.left = (halfWidth) - (w / 2) - mCurrentOffset + ((i - mCurrentPage) * width); bounds.right = bounds.left + w; bounds.top = 0; @@ -589,16 +591,16 @@ public class TitlePageIndicator extends View implements PageIndicator { * @param paint * @return */ - private RectF calcBounds(int index, Paint paint) { + private RectF calcBounds(final int index, final Paint paint) { //Calculate the text bounds - RectF bounds = new RectF(); + final RectF bounds = new RectF(); bounds.right = paint.measureText(mTitleProvider.getTitle(index)); bounds.bottom = paint.descent() - paint.ascent(); return bounds; } @Override - public void setViewPager(ViewPager view) { + public void setViewPager(final ViewPager view) { final PagerAdapter adapter = view.getAdapter(); if (adapter == null) { throw new IllegalStateException("ViewPager does not have adapter instance."); @@ -613,7 +615,7 @@ public class TitlePageIndicator extends View implements PageIndicator { } @Override - public void setViewPager(ViewPager view, int initialPosition) { + public void setViewPager(final ViewPager view, final int initialPosition) { setViewPager(view); setCurrentItem(initialPosition); } @@ -624,7 +626,7 @@ public class TitlePageIndicator extends View implements PageIndicator { } @Override - public void setCurrentItem(int item) { + public void setCurrentItem(final int item) { if (mViewPager == null) { throw new IllegalStateException("ViewPager has not been bound."); } @@ -634,7 +636,7 @@ public class TitlePageIndicator extends View implements PageIndicator { } @Override - public void onPageScrollStateChanged(int state) { + public void onPageScrollStateChanged(final int state) { mScrollState = state; if (mListener != null) { @@ -643,7 +645,7 @@ public class TitlePageIndicator extends View implements PageIndicator { } @Override - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + public void onPageScrolled(final int position, final float positionOffset, final int positionOffsetPixels) { mCurrentPage = position; mCurrentOffset = positionOffsetPixels; invalidate(); @@ -654,7 +656,7 @@ public class TitlePageIndicator extends View implements PageIndicator { } @Override - public void onPageSelected(int position) { + public void onPageSelected(final int position) { if (mScrollState == ViewPager.SCROLL_STATE_IDLE) { mCurrentPage = position; invalidate(); @@ -666,7 +668,7 @@ public class TitlePageIndicator extends View implements PageIndicator { } @Override - public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener) { + public void setOnPageChangeListener(final ViewPager.OnPageChangeListener listener) { mListener = listener; } @@ -676,7 +678,7 @@ public class TitlePageIndicator extends View implements PageIndicator { * @see android.view.View#onMeasure(int, int) */ @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) { setMeasuredDimension(measureWidth(widthMeasureSpec), measureHeight(heightMeasureSpec)); } @@ -687,9 +689,9 @@ public class TitlePageIndicator extends View implements PageIndicator { * A measureSpec packed into an int * @return The width of the view, honoring constraints from measureSpec */ - private int measureWidth(int measureSpec) { - int specMode = MeasureSpec.getMode(measureSpec); - int specSize = MeasureSpec.getSize(measureSpec); + private int measureWidth(final int measureSpec) { + final int specMode = MeasureSpec.getMode(measureSpec); + final int specSize = MeasureSpec.getSize(measureSpec); if (specMode != MeasureSpec.EXACTLY) { throw new IllegalStateException(getClass().getSimpleName() + " can only be used in EXACTLY mode."); @@ -704,17 +706,17 @@ public class TitlePageIndicator extends View implements PageIndicator { * A measureSpec packed into an int * @return The height of the view, honoring constraints from measureSpec */ - private int measureHeight(int measureSpec) { + private int measureHeight(final int measureSpec) { float result; - int specMode = MeasureSpec.getMode(measureSpec); - int specSize = MeasureSpec.getSize(measureSpec); + final int specMode = MeasureSpec.getMode(measureSpec); + final int specSize = MeasureSpec.getSize(measureSpec); if (specMode == MeasureSpec.EXACTLY) { //We were told how big to be result = specSize; } else { //Calculate the text bounds - RectF bounds = new RectF(); + final RectF bounds = new RectF(); bounds.bottom = mPaintText.descent()-mPaintText.ascent(); result = bounds.bottom - bounds.top + mFooterLineHeight + mFooterPadding + mTopPadding; if (mFooterIndicatorStyle != IndicatorStyle.None) { @@ -725,8 +727,8 @@ public class TitlePageIndicator extends View implements PageIndicator { } @Override - public void onRestoreInstanceState(Parcelable state) { - SavedState savedState = (SavedState)state; + public void onRestoreInstanceState(final Parcelable state) { + final SavedState savedState = (SavedState)state; super.onRestoreInstanceState(savedState.getSuperState()); mCurrentPage = savedState.currentPage; requestLayout(); @@ -734,8 +736,8 @@ public class TitlePageIndicator extends View implements PageIndicator { @Override public Parcelable onSaveInstanceState() { - Parcelable superState = super.onSaveInstanceState(); - SavedState savedState = new SavedState(superState); + final Parcelable superState = super.onSaveInstanceState(); + final SavedState savedState = new SavedState(superState); savedState.currentPage = mCurrentPage; return savedState; } @@ -743,29 +745,29 @@ public class TitlePageIndicator extends View implements PageIndicator { static class SavedState extends BaseSavedState { int currentPage; - public SavedState(Parcelable superState) { + public SavedState(final Parcelable superState) { super(superState); } - private SavedState(Parcel in) { + private SavedState(final Parcel in) { super(in); currentPage = in.readInt(); } @Override - public void writeToParcel(@NonNull Parcel dest, int flags) { + public void writeToParcel(@NonNull final Parcel dest, final int flags) { super.writeToParcel(dest, flags); dest.writeInt(currentPage); } public static final Parcelable.Creator<SavedState> CREATOR = new Parcelable.Creator<SavedState>() { @Override - public SavedState createFromParcel(Parcel in) { + public SavedState createFromParcel(final Parcel in) { return new SavedState(in); } @Override - public SavedState[] newArray(int size) { + public SavedState[] newArray(final int size) { return new SavedState[size]; } }; |